diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 03:19:11 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 03:50:11 -0500 |
| commit | 9fafa122851dc4eecdefde2b36b88be6572656f0 (patch) | |
| tree | 7b74f475c0a2b01169c9aec62d04a85cc1103ad3 /data/maps/PokemonLeague_ChampionsRoom | |
| parent | 29e4446a03b83a822f5dd8b11b60728cadbcb0f6 (diff) | |
More basic script constants
Diffstat (limited to 'data/maps/PokemonLeague_ChampionsRoom')
| -rw-r--r-- | data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 010dd4402..a0f5b8379 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -16,24 +16,18 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 end EventScript_162B1E:: @ 8162B1E - checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE - goto_if_eq EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE - goto_if_eq EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57 return EventScript_162B31:: @ 8162B31 - checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR - goto_if_eq EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR - goto_if_eq EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57 return EventScript_162B44:: @ 8162B44 - checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER - goto_if_eq EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER - goto_if_eq EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57 return EventScript_162B57:: @ 8162B57 |