Sync with pokered

1 files changed, 26 insertions, 27 deletions

diff --git a/scripts/mtmoon3.asm b/scripts/MtMoonB2F.asm
index aaa29825..cf4583d3 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/MtMoonB2F.asm
@@ -1,10 +1,10 @@
-MtMoon3Script:
+MtMoonB2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, MtMoon3TrainerHeaders
-	ld de, MtMoon3ScriptPointers
-	ld a, [wMtMoon3CurScript]
+	ld hl, MtMoon3TrainerHeader0
+	ld de, MtMoonB2F_ScriptPointers
+	ld a, [wMtMoonB2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	ret z
 	ld hl, CoordsData_49d37
@@ -43,18 +43,18 @@ MtMoon3Script_49cd7:
 	xor a
 	ld [wJoyIgnore], a
 MtMoon3Script_49ce5:
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 MtMoon3Script_49cec:
-	ld a, HS_MT_MOON_JESSIE
+	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoon3Script_49f93
-	ld a, HS_MT_MOON_JAMES
+	ld a, HS_MT_MOON_B2F_JAMES
 	call MtMoon3Script_49f93
 	ret
 
-MtMoon3ScriptPointers:
+MtMoonB2F_ScriptPointers:
 	dw MtMoon3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -204,10 +204,10 @@ MtMoon3Script5:
 	call DisplayTextID
 	CheckEvent EVENT_GOT_HELIX_FOSSIL
 	jr z, .asm_49e1d
-	ld a, HS_MT_MOON_3_FOSSIL_1
+	ld a, HS_MT_MOON_B2F_FOSSIL_1
 	jr .asm_49e1f
 .asm_49e1d
-	ld a, HS_MT_MOON_3_FOSSIL_2
+	ld a, HS_MT_MOON_B2F_FOSSIL_2
 .asm_49e1f
 	ld [wMissableObjectIndex], a
 	predef HideObject
@@ -232,9 +232,9 @@ MtMoon3Script_49e15:
 	ld [hJoyHeld], a
 	ld a, $FF ^ (A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
-	ld a, HS_MT_MOON_JESSIE
+	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoon3Script_49f84
-	ld a, HS_MT_MOON_JAMES
+	ld a, HS_MT_MOON_B2F_JAMES
 	call MtMoon3Script_49f84
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -374,9 +374,9 @@ MtMoon3Script14:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_MT_MOON_JESSIE
+	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoon3Script_49f93
-	ld a, HS_MT_MOON_JAMES
+	ld a, HS_MT_MOON_B2F_JAMES
 	call MtMoon3Script_49f93
 	call UpdateSprites
 	call Delay3
@@ -408,7 +408,7 @@ MtMoon3Script_49f93:
 	predef HideObject
 	ret
 
-MtMoon3TextPointers:
+MtMoonB2F_TextPointers:
 	dw MtMoon3Text1
 	dw MtMoon3Text2
 	dw MtMoon3Text3
@@ -424,29 +424,28 @@ MtMoon3TextPointers:
 	dw MtMoon3Text13
 	dw MtMoon3Text14
 
-MtMoon3TrainerHeaders:
 MtMoon3TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1
 	db ($4 << 4)
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1
 	dw MtMoon3BattleText3
 	dw MtMoon3AfterBattleText3
 	dw MtMoon3EndBattleText3
 	dw MtMoon3EndBattleText3
 
 MtMoon3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
 	db ($4 << 4)
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
 	dw MtMoon3BattleText4
 	dw MtMoon3AfterBattleText4
 	dw MtMoon3EndBattleText4
 	dw MtMoon3EndBattleText4
 
 MtMoon3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
 	db ($4 << 4)
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
 	dw MtMoon3BattleText5
 	dw MtMoon3AfterBattleText5
 	dw MtMoon3EndBattleText5
@@ -555,7 +554,7 @@ MtMoon3Text7:
 	call GiveItem
 	jp nc, MtMoon3Script_4a0fd
 	call MtMoon3Script_4a0f0
-	ld a, HS_MT_MOON_3_FOSSIL_1
+	ld a, HS_MT_MOON_B2F_FOSSIL_1
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_DOME_FOSSIL
@@ -582,7 +581,7 @@ MtMoon3Text8:
 	call GiveItem
 	jp nc, MtMoon3Script_4a0fd
 	call MtMoon3Script_4a0f0
-	ld a, HS_MT_MOON_3_FOSSIL_2
+	ld a, HS_MT_MOON_B2F_FOSSIL_2
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_HELIX_FOSSIL
@@ -602,7 +601,7 @@ MtMoon3Script_4a0f0:
 MtMoon3Text_4a0f6:
 	TX_FAR _MtMoon3Text_49f6f
 	TX_SFX_KEY_ITEM
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 MtMoon3Script_4a0fd:
@@ -612,7 +611,7 @@ MtMoon3Script_4a0fd:
 
 MtMoon3Text_4a106:
 	TX_FAR _MtMoon3Text_49f7f
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 MtMoon3Text_4a10c: