diff options
Diffstat (limited to 'data/maps/RocketHideout_B1F/scripts.inc')
| -rw-r--r-- | data/maps/RocketHideout_B1F/scripts.inc | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6e2f8eeb3..874e0b8e9 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -1,40 +1,39 @@ RocketHideout_B1F_MapScripts:: @ 8161195 - map_script 1, RocketHideout_B1F_MapScript1_1611A0 - map_script 3, RocketHideout_B1F_MapScript2_1611AA + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, RocketHideout_B1F_OnTransition .byte 0 -RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if lt, EventScript_161233 +RocketHideout_B1F_OnLoad:: @ 81611A0 + call_if_undefeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233 end -RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA +RocketHideout_B1F_OnTransition:: @ 81611AA setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED - msgbox gUnknown_8174EFA, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED + msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60 - msgbox gUnknown_8174F66, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 + msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4 - msgbox gUnknown_8174FB3, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 + msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8 - msgbox gUnknown_8175007, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 + msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225 - msgbox gUnknown_8175060, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 + msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE end EventScript_161225:: @ 8161225 |