diff options
Diffstat (limited to 'data/maps/SilphCo_10F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_10F/scripts.inc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 0b8e0e2cb..a0ab7219b 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -1,17 +1,16 @@ SilphCo_10F_MapScripts:: @ 8161D86 - map_script 1, SilphCo_10F_MapScript1_161D8C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_10F_OnLoad .byte 0 -SilphCo_10F_MapScript1_161D8C:: @ 8161D8C - checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_1A84D6 +SilphCo_10F_OnLoad:: @ 8161D8C + call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161DAD + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161DAD msgbox gUnknown_8176DBA release end @@ -22,15 +21,15 @@ EventScript_161DAD:: @ 8161DAD end SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, 3 + msgbox gUnknown_8176DF8, MSGBOX_SIGN end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, 6 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 + msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 + msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE end |