diff options
Diffstat (limited to 'data/maps/SilphCo_8F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_8F/scripts.inc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 30b19804b..f96188c3f 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -1,17 +1,16 @@ SilphCo_8F_MapScripts:: @ 8161C5F - map_script 1, SilphCo_8F_MapScript1_161C65 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_8F_OnLoad .byte 0 -SilphCo_8F_MapScript1_161C65:: @ 8161C65 - checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_1A83D5 +SilphCo_8F_OnLoad:: @ 8161C65 + call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161C86 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161C86 msgbox gUnknown_817696D release end @@ -22,20 +21,20 @@ EventScript_161C86:: @ 8161C86 end SilphCo_8F_EventScript_161C90:: @ 8161C90 - msgbox gUnknown_8176AB2, 3 + msgbox gUnknown_8176AB2, MSGBOX_SIGN end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 - msgbox gUnknown_8176A26, 6 + trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 + msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE - msgbox gUnknown_81769CF, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE + msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C - msgbox gUnknown_8176A90, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C + msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE end |