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/PokemonMansion_1F/scripts.inc | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/PokemonMansion_1F/scripts.inc')
| -rw-r--r-- | data/maps/PokemonMansion_1F/scripts.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index cacbe77da..42fe1d0b1 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -4,8 +4,7 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 .byte 0 PokemonMansion_1F_OnLoad:: @ 8162204 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7B7A + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B7A end PokemonMansion_1F_OnTransition:: @ 816220E @@ -23,11 +22,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391 + trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391 msgbox gUnknown_8177397, 6 end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD + trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD msgbox gUnknown_8177418, 6 end |