diff options
Diffstat (limited to 'data/maps/scripts/AquaHideout_B2F.s')
| -rw-r--r-- | data/maps/scripts/AquaHideout_B2F.s | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/data/maps/scripts/AquaHideout_B2F.s b/data/maps/scripts/AquaHideout_B2F.s index 40cce160b..a0bf90151 100644 --- a/data/maps/scripts/AquaHideout_B2F.s +++ b/data/maps/scripts/AquaHideout_B2F.s @@ -21,14 +21,18 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, 596, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD setvar 0x8008, 1 + .ifdef SAPPHIRE + setvar 0x8009, 4 + .else setvar 0x8009, 3 + .endif move 0x8008, AquaHideout_B2F_Movement_1A0843 waitmove 0 pause 20 @@ -37,7 +41,11 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD msgbox AquaHideout_B2F_Text_197162, 4 closebutton move 0x8008, AquaHideout_B2F_Movement_1A0843 + .ifdef SAPPHIRE + move 0x8009, AquaHideout_B2F_Movement_15D958 + .else move 0x8009, AquaHideout_B2F_Movement_15D95D + .endif waitmove 0 disappear 0x8009 pause 20 @@ -49,7 +57,12 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD release end - .incbin "baserom.gba", 0x15d958, 0x5 +AquaHideout_B2F_Movement_15D958:: @ 815D958 + step_left + step_left + step_left + step_left + step_end AquaHideout_B2F_Movement_15D95D:: @ 815D95D step_right @@ -60,7 +73,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, 570, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -71,7 +84,7 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, 593, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end |