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_2F/scripts.inc | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/SilphCo_2F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_2F/scripts.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 60d2a39e2..53e9c8129 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -3,10 +3,8 @@ SilphCo_2F_MapScripts:: @ 8161641 .byte 0 SilphCo_2F_OnLoad:: @ 8161647 - checkflag FLAG_SILPH_2F_DOOR_1 - call_if FALSE, EventScript_Close2FDoor1 - checkflag FLAG_SILPH_2F_DOOR_2 - call_if FALSE, EventScript_Close2FDoor2 + call_if_unset FLAG_SILPH_2F_DOOR_1, EventScript_Close2FDoor1 + call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2 end SilphCo_2F_EventScript_16165A:: @ 816165A @@ -20,21 +18,21 @@ SilphCo_2F_EventScript_161660:: @ 8161660 end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E + trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E msgbox gUnknown_817559F, 6 end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5 + trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 msgbox gUnknown_81755F2, 6 end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A msgbox gUnknown_8175651, 6 end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 msgbox gUnknown_81756E2, 6 end |