Sync with pokered

1 files changed, 28 insertions, 29 deletions

diff --git a/scripts/rockethideout4.asm b/scripts/RocketHideoutB4F.asm
index 1781b12e..89fd37e1 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -1,10 +1,10 @@
-RocketHideout4Script:
+RocketHideoutB4F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout4TrainerHeader0
-	ld de, RocketHideout4ScriptPointers
-	ld a, [wRocketHideout4CurScript]
+	ld de, RocketHideoutB4F_ScriptPointers
+	ld a, [wRocketHideoutB4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ret
 
 RocketHideout4Script_45510:
@@ -13,18 +13,18 @@ RocketHideout4Script_45510:
 	xor a
 	ld [wJoyIgnore], a
 RocketHideout4Script_4551e:
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 RocketHideout4Script_45525:
-	ld a, HS_ROCKET_HIDEOUT_4_JAMES
+	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideout4Script_45756
-	ld a, HS_ROCKET_HIDEOUT_4_JESSIE
+	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideout4Script_45756
 	ret
 
-RocketHideout4ScriptPointers:
+RocketHideoutB4F_ScriptPointers:
 	dw RocketHideout4Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -51,10 +51,10 @@ RocketHideout4Script3:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI
+	ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, HS_ROCKET_HIDEOUT_4_ITEM_4
+	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
@@ -64,14 +64,14 @@ RocketHideout4Script3:
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, $0
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 RocketHideout4Script0:
 	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
 	call z, RocketHideout4Script_455a5
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	call z, CheckFightingMapTrainers
 	ret
 
@@ -79,14 +79,14 @@ RocketHideout4Script_455a5:
 	ld a, [wYCoord]
 	cp $e
 	ret nz
-	ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	ld a, [wXCoord]
 	cp $18
 	jr z, .asm_455c2
 	ld a, [wXCoord]
 	cp $19
 	ret nz
-	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 .asm_455c2
 	xor a
 	ld [hJoyHeld], a
@@ -109,9 +109,9 @@ RocketHideout4Script_455a5:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld a, HS_ROCKET_HIDEOUT_4_JAMES
+	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideout4Script_45747
-	ld a, HS_ROCKET_HIDEOUT_4_JESSIE
+	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideout4Script_45747
 	ld a, $4
 	call RocketHideout4Script_4551e
@@ -127,7 +127,7 @@ RocketHideout4JessieJamesMovementData_45606:
 
 RocketHideout4Script4:
 	ld de, RocketHideout4JessieJamesMovementData_45605
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_45617
 	ld de, RocketHideout4JessieJamesMovementData_45606
 .asm_45617
@@ -151,7 +151,7 @@ RocketHideout4Script6:
 	ld [wSpriteStateData1 + 2 * $10 + 1], a
 	ld a, SPRITE_FACING_LEFT
 	ld [wSpriteStateData1 + 2 * $10 + 9], a
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_4564a
 	ld a, SPRITE_FACING_DOWN
 	ld [wSpriteStateData1 + 2 * $10 + 9], a
@@ -161,7 +161,7 @@ RocketHideout4Script6:
 	ld [wJoyIgnore], a
 RocketHideout4Script7:
 	ld de, RocketHideout4JessieJamesMovementData_45606
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_4565f
 	ld de, RocketHideout4JessieJamesMovementData_45605
 .asm_4565f
@@ -187,7 +187,7 @@ RocketHideout4Script9:
 	ld [wSpriteStateData1 + 3 * $10 + 1], a
 	ld a, SPRITE_FACING_DOWN
 	ld [wSpriteStateData1 + 3 * $10 + 9], a
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_45697
 	ld a, SPRITE_FACING_RIGHT
 	ld [wSpriteStateData1 + 3 * $10 + 9], a
@@ -250,9 +250,9 @@ RocketHideout4Script12:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_4_JAMES
+	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideout4Script_45756
-	ld a, HS_ROCKET_HIDEOUT_4_JESSIE
+	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideout4Script_45756
 	call UpdateSprites
 	call Delay3
@@ -283,7 +283,7 @@ RocketHideout4Script_45756:
 	predef HideObject
 	ret
 
-RocketHideout4TextPointers:
+RocketHideoutB4F_TextPointers:
 	dw RocketHideout4Text0
 	dw RocketHideout4Text1
 	dw RocketHideout4Text2
@@ -298,11 +298,10 @@ RocketHideout4TextPointers:
 	dw RocketHideout4Text11
 	dw RocketHideout4Text12
 
-RocketHideout4TrainerHeaders:
 RocketHideout4TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	db ($1 << 4)
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	dw RocketHideout4Trainer0BeforeText
 	dw RocketHideout4Trainer0AfterText
 	dw RocketHideout4Trainer0EndBattleText
@@ -363,7 +362,7 @@ RocketHideout4Text0:
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	jr .asm_45801
 
@@ -397,10 +396,10 @@ RocketHideout4Trainer0BeforeText:
 
 RocketHideout4Trainer0EndBattleText:
 	TX_FAR _RocketHideout4EndBattleText4
-	TX_BUTTON_SOUND
+	TX_BLINK
 	TX_ASM
 	SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
-	ld a, HS_ROCKET_HIDEOUT_4_ITEM_5
+	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	jp TextScriptEnd