diff options
Diffstat (limited to 'data/maps/SilphCo_3F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_3F/scripts.inc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 8187e8e45..a5e62b667 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -1,19 +1,17 @@ SilphCo_3F_MapScripts:: @ 81616C5 - map_script 1, SilphCo_3F_MapScript1_1616CB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_3F_OnLoad .byte 0 -SilphCo_3F_MapScript1_1616CB:: @ 81616CB - checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_1A81A5 - checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_1A81DC +SilphCo_3F_OnLoad:: @ 81616CB + call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1 + call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1616F5 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1616F5 msgbox gUnknown_81758AD release end @@ -24,15 +22,15 @@ EventScript_1616F5:: @ 81616F5 end SilphCo_3F_EventScript_1616FF:: @ 81616FF - msgbox gUnknown_81759DC, 3 + msgbox gUnknown_81759DC, MSGBOX_SIGN end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D - msgbox gUnknown_8175990, 6 + trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D + msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 - msgbox gUnknown_817591C, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 + msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE end |