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_8F/scripts.inc | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/SilphCo_8F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_8F/scripts.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 5570c4be9..84993bf67 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_8F_MapScripts:: @ 8161C5F .byte 0 SilphCo_8F_OnLoad:: @ 8161C65 - checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_Close8FDoor + call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161C86 + goto_if_ge EventScript_161C86 msgbox gUnknown_817696D release end @@ -26,16 +25,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90 end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 + trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 msgbox gUnknown_8176A26, 6 end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE msgbox gUnknown_81769CF, 6 end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C msgbox gUnknown_8176A90, 6 end |