diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-09 15:49:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-10 13:48:08 -0500 |
| commit | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (patch) | |
| tree | 44d3ad18d681d6e3328c411cf8fc7e23cbd9a2f6 /src/battle_message.c | |
| parent | d0c79e4e479d633b65cb5a821de882416946a975 (diff) | |
Sync/update trainer classes
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 20b7f9c75..73735d49c 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -18,7 +18,7 @@ #include "graphics.h" #include "constants/moves.h" #include "constants/items.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" struct BattleWindowText { @@ -2021,9 +2021,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } else { - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_RIVAL_2 - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2) + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_RIVAL_EARLY + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_RIVAL_LATE + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) toCpy = GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL); else toCpy = gTrainers[gTrainerBattleOpponent_A].trainerName; |