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_4F/scripts.inc | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/SilphCo_4F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_4F/scripts.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index c72ba7ed8..595f42ab6 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -3,17 +3,15 @@ SilphCo_4F_MapScripts:: @ 8161736 .byte 0 SilphCo_4F_OnLoad:: @ 816173C - checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_Close4FDoor1 - checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_Close4FDoor2 + call_if_unset FLAG_SILPH_4F_DOOR_1, EventScript_Close4FDoor1 + call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161766 + goto_if_ge EventScript_161766 msgbox gUnknown_81759F5 release end @@ -28,16 +26,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770 end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0 + trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 msgbox gUnknown_8175AC8, 6 end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B msgbox gUnknown_8175A62, 6 end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B msgbox gUnknown_8175B38, 6 end |