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_9F/scripts.inc | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/SilphCo_9F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_9F/scripts.inc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 919d700b0..737cf5f71 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -3,21 +3,17 @@ SilphCo_9F_MapScripts:: @ 8161CDE .byte 0 SilphCo_9F_OnLoad:: @ 8161CE4 - checkflag FLAG_SILPH_9F_DOOR_1 - call_if FALSE, EventScript_Close9FDoor1 - checkflag FLAG_SILPH_9F_DOOR_2 - call_if FALSE, EventScript_Close9FDoor2 - checkflag FLAG_SILPH_9F_DOOR_3 - call_if FALSE, EventScript_Close9FDoor3 - checkflag FLAG_SILPH_9F_DOOR_4 - call_if FALSE, EventScript_Close9FDoor4 + call_if_unset FLAG_SILPH_9F_DOOR_1, EventScript_Close9FDoor1 + call_if_unset FLAG_SILPH_9F_DOOR_2, EventScript_Close9FDoor2 + call_if_unset FLAG_SILPH_9F_DOOR_3, EventScript_Close9FDoor3 + call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161D2E + goto_if_ge EventScript_161D2E msgbox gUnknown_8176B54 closemessage call EventScript_FadeOut_Heal_FadeIn @@ -35,16 +31,16 @@ SilphCo_9F_EventScript_161D38:: @ 8161D38 end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B + trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B msgbox gUnknown_8176C3C, 6 end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 msgbox gUnknown_8176BD0, 6 end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 msgbox gUnknown_8176CB8, 6 end |