diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 00:44:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 01:26:20 -0500 |
| commit | 4a6f15ba24c159ad6cc1be1d7c8c636e416e80d6 (patch) | |
| tree | 823b6f7b6fb71cbfe54add5696b831a9f78a6703 /data/maps/SilphCo_3F/scripts.inc | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/SilphCo_3F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_3F/scripts.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index c5fd6d320..2b321225a 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -3,17 +3,15 @@ SilphCo_3F_MapScripts:: @ 81616C5 .byte 0 SilphCo_3F_OnLoad:: @ 81616CB - checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_Close3FDoor1 - checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_Close3FDoor2 + 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_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1616F5 + goto_if_ge EventScript_1616F5 msgbox gUnknown_81758AD release end @@ -28,11 +26,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D + trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D msgbox gUnknown_8175990, 6 end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 msgbox gUnknown_817591C, 6 end |