diff options
Diffstat (limited to 'data/maps/SilphCo_6F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_6F/scripts.inc | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index fd4d470eb..6bc5cd545 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -1,17 +1,16 @@ SilphCo_6F_MapScripts:: @ 8161881 - map_script 1, SilphCo_6F_MapScript1_161887 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_6F_OnLoad .byte 0 -SilphCo_6F_MapScript1_161887:: @ 8161887 - checkflag FLAG_SILPH_6F_DOOR - call_if FALSE, EventScript_1A8314 +SilphCo_6F_OnLoad:: @ 8161887 + call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618A8 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1618A8 msgbox gUnknown_817607E release end @@ -24,8 +23,8 @@ EventScript_1618A8:: @ 81618A8 SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618C9 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -38,8 +37,8 @@ EventScript_1618C9:: @ 81618C9 SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618EA + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -52,8 +51,8 @@ EventScript_1618EA:: @ 81618EA SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16190B + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_16190B msgbox gUnknown_8175FAA release end @@ -66,8 +65,8 @@ EventScript_16190B:: @ 816190B SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16192C + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_16192C msgbox gUnknown_8176012 release end @@ -78,20 +77,20 @@ EventScript_16192C:: @ 816192C end SilphCo_6F_EventScript_161936:: @ 8161936 - msgbox gUnknown_817624D, 3 + msgbox gUnknown_817624D, MSGBOX_SIGN end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD - msgbox gUnknown_81761C4, 6 + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD + msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104 - msgbox gUnknown_817610F, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 + msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E - msgbox gUnknown_817621B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E + msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE end |