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_bg.c | |
| parent | 7fb97f9e2579b5b61c8c141d38c43ff07a24a393 (diff) | |
| parent | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (diff) | |
Merge pull request #481 from GriffinRichards/sync-classes
Sync/update trainer classes
Diffstat (limited to 'src/battle_bg.c')
| -rw-r--r-- | src/battle_bg.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c index f3480bd45..7a4aa9d12 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -12,7 +12,7 @@ #include "trig.h" #include "constants/maps.h" #include "constants/songs.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" #define TAG_VS_LETTERS 10000 @@ -992,12 +992,12 @@ void DrawBattleEntryBackground(void) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; - if (trainerClass == CLASS_LEADER_2) + if (trainerClass == TRAINER_CLASS_LEADER) { LoadBattleTerrainEntryGfx(BATTLE_TERRAIN_BUILDING); return; } - else if (trainerClass == CLASS_CHAMPION_2) + else if (trainerClass == TRAINER_CLASS_CHAMPION) { LoadBattleTerrainEntryGfx(BATTLE_TERRAIN_BUILDING); return; @@ -1029,14 +1029,10 @@ static u8 GetBattleTerrainOverride(void) } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { - if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER_2) - { + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER) return BATTLE_TERRAIN_LEADER; - } - else if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION_2) - { + else if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) return BATTLE_TERRAIN_CHAMPION; - } } battleScene = GetCurrentMapBattleScene(); if (battleScene == MAP_BATTLE_SCENE_NORMAL) |