Sync/update trainer classes

1 files changed, 112 insertions, 112 deletions

diff --git a/src/battle_main.c b/src/battle_main.c
index f53fc2bce..5e870c6e7 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -42,7 +42,7 @@
 #include "constants/moves.h"
 #include "constants/pokemon.h"
 #include "constants/songs.h"
-#include "constants/trainer_classes.h"
+#include "constants/trainers.h"
 
 static void SpriteCB_UnusedDebugSprite(struct Sprite *sprite);
 static void HandleAction_UseMove(void);
@@ -450,110 +450,110 @@ const u8 gTypeNames[][TYPE_NAME_LENGTH + 1] =
 // This is a factor in how much money you get for beating a trainer.
 const struct TrainerMoney gTrainerMoneyTable[] =
 {
-    { CLASS_LEADER_2, 25 },
-    { CLASS_ELITE_FOUR_2, 25 },
-    { CLASS_PKMN_PROF, 25 },
-    { CLASS_RIVAL, 4 },
-    { CLASS_RIVAL_2, 9 },
-    { CLASS_CHAMPION_2, 25 },
-    { CLASS_YOUNGSTER_2, 4 },
-    { CLASS_BUG_CATCHER_2, 3 },
-    { CLASS_HIKER_2, 9 },
-    { CLASS_BIRD_KEEPER_2, 6 },
-    { CLASS_PICNICKER_2, 5 },
-    { CLASS_SUPER_NERD, 6 },
-    { CLASS_FISHERMAN_2, 9 },
-    { CLASS_TEAM_ROCKET, 8 },
-    { CLASS_LASS_2, 4 },
-    { CLASS_BEAUTY_2, 18 },
-    { CLASS_BLACK_BELT_2, 6 },
-    { CLASS_CUE_BALL, 6 },
-    { CLASS_CHANNELER, 8 },
-    { CLASS_ROCKER, 6 },
-    { CLASS_GENTLEMAN_2, 18 },
-    { CLASS_BURGLAR, 22 },
-    { CLASS_SWIMMER_MALE_2, 1 },
-    { CLASS_ENGINEER, 12 },
-    { CLASS_JUGGLER, 10 },
-    { CLASS_SAILOR_2, 8 },
-    { CLASS_COOLTRAINER_2, 9 },
-    { CLASS_POKEMANIAC_2, 12 },
-    { CLASS_TAMER, 10 },
-    { CLASS_CAMPER_2, 5 },
-    { CLASS_PSYCHIC_2, 5 },
-    { CLASS_BIKER, 5 },
-    { CLASS_GAMER, 18 },
-    { CLASS_SCIENTIST, 12 },
-    { CLASS_CRUSH_GIRL, 6 },
-    { CLASS_TUBER_3, 1 },
-    { CLASS_PKMN_BREEDER_2, 7 },
-    { CLASS_PKMN_RANGER_2, 9 },
-    { CLASS_AROMA_LADY_2, 7 },
-    { CLASS_RUIN_MANIAC_2, 12 },
-    { CLASS_LADY_2, 50 },
-    { CLASS_PAINTER, 4 },
-    { CLASS_TWINS_2, 3 },
-    { CLASS_YOUNG_COUPLE_2, 7 },
-    { CLASS_SIS_AND_BRO_2, 1 },
-    { CLASS_COOL_COUPLE, 6 },
-    { CLASS_CRUSH_KIN, 6 },
-    { CLASS_SWIMMER_FEMALE_2, 1 },
-    { CLASS_PLAYER, 1 },
-    { CLASS_LEADER, 25 },
-    { CLASS_ELITE_FOUR, 25 },
-    { CLASS_LASS, 4 },
-    { CLASS_YOUNGSTER, 4 },
-    { CLASS_PKMN_TRAINER_3, 15 },
-    { CLASS_HIKER, 10 },
-    { CLASS_BEAUTY, 20 },
-    { CLASS_FISHERMAN, 10 },
-    { CLASS_LADY, 50 },
-    { CLASS_TRIATHLETE, 10 },
-    { CLASS_TEAM_AQUA, 5 },
-    { CLASS_TWINS, 3 },
-    { CLASS_SWIMMER_FEMALE, 2 },
-    { CLASS_BUG_CATCHER, 4 },
-    { CLASS_SCHOOL_KID, 5 },
-    { CLASS_RICH_BOY, 50 },
-    { CLASS_SR_AND_JR, 4 },
-    { CLASS_BLACK_BELT, 8 },
-    { CLASS_TUBER, 1 },
-    { CLASS_HEX_MANIAC, 6 },
-    { CLASS_PKMN_BREEDER, 10 },
-    { CLASS_TEAM_MAGMA, 5 },
-    { CLASS_INTERVIEWER, 12 },
-    { CLASS_TUBER_2, 1 },
-    { CLASS_YOUNG_COUPLE, 8 },
-    { CLASS_GUITARIST, 8 },
-    { CLASS_GENTLEMAN, 20 },
-    { CLASS_CHAMPION, 50 },
-    { CLASS_MAGMA_LEADER, 20 },
-    { CLASS_BATTLE_GIRL, 6 },
-    { CLASS_SWIMMER_MALE, 2 },
-    { CLASS_POKEFAN, 20 },
-    { CLASS_EXPERT, 10 },
-    { CLASS_DRAGON_TAMER, 12 },
-    { CLASS_BIRD_KEEPER, 8 },
-    { CLASS_NINJA_BOY, 3 },
-    { CLASS_PARASOL_LADY, 10 },
-    { CLASS_BUG_MANIAC, 15 },
-    { CLASS_SAILOR, 8 },
-    { CLASS_COLLECTOR, 15 },
-    { CLASS_PKMN_RANGER, 12 },
-    { CLASS_MAGMA_ADMIN, 10 },
-    { CLASS_AROMA_LADY, 10 },
-    { CLASS_RUIN_MANIAC, 15 },
-    { CLASS_COOLTRAINER, 12 },
-    { CLASS_POKEMANIAC, 15 },
-    { CLASS_KINDLER, 8 },
-    { CLASS_CAMPER, 4 },
-    { CLASS_PICNICKER, 4 },
-    { CLASS_PSYCHIC, 6 },
-    { CLASS_SIS_AND_BRO, 3 },
-    { CLASS_OLD_COUPLE, 10 },
-    { CLASS_AQUA_ADMIN, 10 },
-    { CLASS_AQUA_LEADER, 20 },
-    { CLASS_BOSS, 25 },
+    { TRAINER_CLASS_LEADER, 25 },
+    { TRAINER_CLASS_ELITE_FOUR, 25 },
+    { TRAINER_CLASS_PKMN_PROF, 25 },
+    { TRAINER_CLASS_RIVAL_EARLY, 4 },
+    { TRAINER_CLASS_RIVAL_LATE, 9 },
+    { TRAINER_CLASS_CHAMPION, 25 },
+    { TRAINER_CLASS_YOUNGSTER, 4 },
+    { TRAINER_CLASS_BUG_CATCHER, 3 },
+    { TRAINER_CLASS_HIKER, 9 },
+    { TRAINER_CLASS_BIRD_KEEPER, 6 },
+    { TRAINER_CLASS_PICNICKER, 5 },
+    { TRAINER_CLASS_SUPER_NERD, 6 },
+    { TRAINER_CLASS_FISHERMAN, 9 },
+    { TRAINER_CLASS_TEAM_ROCKET, 8 },
+    { TRAINER_CLASS_LASS, 4 },
+    { TRAINER_CLASS_BEAUTY, 18 },
+    { TRAINER_CLASS_BLACK_BELT, 6 },
+    { TRAINER_CLASS_CUE_BALL, 6 },
+    { TRAINER_CLASS_CHANNELER, 8 },
+    { TRAINER_CLASS_ROCKER, 6 },
+    { TRAINER_CLASS_GENTLEMAN, 18 },
+    { TRAINER_CLASS_BURGLAR, 22 },
+    { TRAINER_CLASS_SWIMMER_M, 1 },
+    { TRAINER_CLASS_ENGINEER, 12 },
+    { TRAINER_CLASS_JUGGLER, 10 },
+    { TRAINER_CLASS_SAILOR, 8 },
+    { TRAINER_CLASS_COOLTRAINER, 9 },
+    { TRAINER_CLASS_POKEMANIAC, 12 },
+    { TRAINER_CLASS_TAMER, 10 },
+    { TRAINER_CLASS_CAMPER, 5 },
+    { TRAINER_CLASS_PSYCHIC, 5 },
+    { TRAINER_CLASS_BIKER, 5 },
+    { TRAINER_CLASS_GAMER, 18 },
+    { TRAINER_CLASS_SCIENTIST, 12 },
+    { TRAINER_CLASS_CRUSH_GIRL, 6 },
+    { TRAINER_CLASS_TUBER, 1 },
+    { TRAINER_CLASS_PKMN_BREEDER, 7 },
+    { TRAINER_CLASS_PKMN_RANGER, 9 },
+    { TRAINER_CLASS_AROMA_LADY, 7 },
+    { TRAINER_CLASS_RUIN_MANIAC, 12 },
+    { TRAINER_CLASS_LADY, 50 },
+    { TRAINER_CLASS_PAINTER, 4 },
+    { TRAINER_CLASS_TWINS, 3 },
+    { TRAINER_CLASS_YOUNG_COUPLE, 7 },
+    { TRAINER_CLASS_SIS_AND_BRO, 1 },
+    { TRAINER_CLASS_COOL_COUPLE, 6 },
+    { TRAINER_CLASS_CRUSH_KIN, 6 },
+    { TRAINER_CLASS_SWIMMER_F, 1 },
+    { TRAINER_CLASS_PLAYER, 1 },
+    { TRAINER_CLASS_RS_LEADER, 25 },
+    { TRAINER_CLASS_RS_ELITE_FOUR, 25 },
+    { TRAINER_CLASS_RS_LASS, 4 },
+    { TRAINER_CLASS_RS_YOUNGSTER, 4 },
+    { TRAINER_CLASS_PKMN_TRAINER, 15 },
+    { TRAINER_CLASS_RS_HIKER, 10 },
+    { TRAINER_CLASS_RS_BEAUTY, 20 },
+    { TRAINER_CLASS_RS_FISHERMAN, 10 },
+    { TRAINER_CLASS_RS_LADY, 50 },
+    { TRAINER_CLASS_TRIATHLETE, 10 },
+    { TRAINER_CLASS_TEAM_AQUA, 5 },
+    { TRAINER_CLASS_RS_TWINS, 3 },
+    { TRAINER_CLASS_RS_SWIMMER_F, 2 },
+    { TRAINER_CLASS_RS_BUG_CATCHER, 4 },
+    { TRAINER_CLASS_SCHOOL_KID, 5 },
+    { TRAINER_CLASS_RICH_BOY, 50 },
+    { TRAINER_CLASS_SR_AND_JR, 4 },
+    { TRAINER_CLASS_RS_BLACK_BELT, 8 },
+    { TRAINER_CLASS_RS_TUBER_F, 1 },
+    { TRAINER_CLASS_HEX_MANIAC, 6 },
+    { TRAINER_CLASS_RS_PKMN_BREEDER, 10 },
+    { TRAINER_CLASS_TEAM_MAGMA, 5 },
+    { TRAINER_CLASS_INTERVIEWER, 12 },
+    { TRAINER_CLASS_RS_TUBER_M, 1 },
+    { TRAINER_CLASS_RS_YOUNG_COUPLE, 8 },
+    { TRAINER_CLASS_GUITARIST, 8 },
+    { TRAINER_CLASS_RS_GENTLEMAN, 20 },
+    { TRAINER_CLASS_RS_CHAMPION, 50 },
+    { TRAINER_CLASS_MAGMA_LEADER, 20 },
+    { TRAINER_CLASS_BATTLE_GIRL, 6 },
+    { TRAINER_CLASS_RS_SWIMMER_M, 2 },
+    { TRAINER_CLASS_POKEFAN, 20 },
+    { TRAINER_CLASS_EXPERT, 10 },
+    { TRAINER_CLASS_DRAGON_TAMER, 12 },
+    { TRAINER_CLASS_RS_BIRD_KEEPER, 8 },
+    { TRAINER_CLASS_NINJA_BOY, 3 },
+    { TRAINER_CLASS_PARASOL_LADY, 10 },
+    { TRAINER_CLASS_BUG_MANIAC, 15 },
+    { TRAINER_CLASS_RS_SAILOR, 8 },
+    { TRAINER_CLASS_COLLECTOR, 15 },
+    { TRAINER_CLASS_RS_PKMN_RANGER, 12 },
+    { TRAINER_CLASS_MAGMA_ADMIN, 10 },
+    { TRAINER_CLASS_RS_AROMA_LADY, 10 },
+    { TRAINER_CLASS_RS_RUIN_MANIAC, 15 },
+    { TRAINER_CLASS_RS_COOLTRAINER, 12 },
+    { TRAINER_CLASS_RS_POKEMANIAC, 15 },
+    { TRAINER_CLASS_KINDLER, 8 },
+    { TRAINER_CLASS_RS_CAMPER, 4 },
+    { TRAINER_CLASS_RS_PICNICKER, 4 },
+    { TRAINER_CLASS_RS_PSYCHIC, 6 },
+    { TRAINER_CLASS_RS_SIS_AND_BRO, 3 },
+    { TRAINER_CLASS_OLD_COUPLE, 10 },
+    { TRAINER_CLASS_AQUA_ADMIN, 10 },
+    { TRAINER_CLASS_AQUA_LEADER, 20 },
+    { TRAINER_CLASS_BOSS, 25 },
     { 0xFF, 5 },
 };
 
@@ -3644,15 +3644,15 @@ static void HandleEndTurn_BattleWon(void)
         gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
         switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
         {
-        case CLASS_LEADER_2:
-        case CLASS_CHAMPION_2:
+        case TRAINER_CLASS_LEADER:
+        case TRAINER_CLASS_CHAMPION:
             PlayBGM(MUS_VICTORY_GYM_LEADER);
             break;
-        case CLASS_BOSS:
-        case CLASS_TEAM_ROCKET:
-        case CLASS_COOLTRAINER_2:
-        case CLASS_ELITE_FOUR_2:
-        case CLASS_GENTLEMAN_2:
+        case TRAINER_CLASS_BOSS:
+        case TRAINER_CLASS_TEAM_ROCKET:
+        case TRAINER_CLASS_COOLTRAINER:
+        case TRAINER_CLASS_ELITE_FOUR:
+        case TRAINER_CLASS_GENTLEMAN:
         default:
             PlayBGM(MUS_VICTORY_TRAINER);
             break;