diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-21 19:26:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 19:26:14 -0500 |
| commit | bef2668d8bf92f8d42e2d56b06260380d7175d93 (patch) | |
| tree | 688ee810f6df7c77f53f21eb23fcc059fb4f59d7 /src/battle_setup.c | |
| parent | 7fb97f9e2579b5b61c8c141d38c43ff07a24a393 (diff) | |
| parent | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (diff) | |
Merge pull request #481 from GriffinRichards/sync-classes
Sync/update trainer classes
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 62df9965d..49e2d9e01 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -31,7 +31,7 @@ #include "constants/maps.h" #include "constants/songs.h" #include "constants/pokemon.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" enum { @@ -613,7 +613,7 @@ static u8 GetTrainerBattleTransition(void) if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return B_TRANSITION_BLUE; - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR_2) + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) { if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI_2) return B_TRANSITION_LORELEI; @@ -625,7 +625,7 @@ static u8 GetTrainerBattleTransition(void) return B_TRANSITION_LANCE; return B_TRANSITION_BLUE; } - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2) + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) return B_TRANSITION_BLUE; if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE) minPartyCount = 2; // double battles always at least have 2 pokemon. |