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/CeruleanCave_B1F | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/CeruleanCave_B1F')
| -rw-r--r-- | data/maps/CeruleanCave_B1F/scripts.inc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 036f564a5..b252bf306 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,20 +4,18 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_OnResume:: @ 81624C9 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1624D3 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_OnTransition:: @ 81624E7 - checkflag FLAG_FOUGHT_MEWTWO - call_if FALSE, EventScript_1624F1 + call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 @@ -27,7 +25,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +44,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_162558 + goto_if_eq EventScript_162558 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_162561 + goto_if_eq EventScript_162561 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_162561 + goto_if_eq EventScript_162561 setflag FLAG_FOUGHT_MEWTWO release end |