Sync/update trainer classes

1 files changed, 10 insertions, 10 deletions

diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h
index 9d94103ef..c2ad6ac9e 100644
--- a/src/data/trainer_graphics/front_pic_tables.h
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -159,7 +159,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
     TRAINER_SPRITE(RS_RUIN_MANIAC, gTrainerFrontPic_RSRuinManiac, 0x800),
     TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, 0x800),
     TRAINER_SPRITE(RS_TUBER_F, gTrainerFrontPic_RSTuberF, 0x800),
-    TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, 0x800),
+    TRAINER_SPRITE(RS_TUBER_M, gTrainerFrontPic_TuberM, 0x800),
     TRAINER_SPRITE(RS_COOLTRAINER_M, gTrainerFrontPic_RSCooltrainerM, 0x800),
     TRAINER_SPRITE(RS_COOLTRAINER_F, gTrainerFrontPic_RSCooltrainerF, 0x800),
     TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, 0x800),
@@ -210,7 +210,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
     TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, 0x800),
     TRAINER_SPRITE(RS_BRENDAN_1, gTrainerFrontPic_RSBrendan1, 0x800),
     TRAINER_SPRITE(RS_MAY_1, gTrainerFrontPic_RSMay1, 0x800),
-    TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, 0x800),
+    TRAINER_SPRITE(RS_POKEMON_BREEDER_M, gTrainerFrontPic_RSPokemonBreederM, 0x800),
     TRAINER_SPRITE(RS_POKEMON_BREEDER_F, gTrainerFrontPic_RSPokemonBreederF, 0x800),
     TRAINER_SPRITE(RS_POKEMON_RANGER_M, gTrainerFrontPic_RSPokemonRangerM, 0x800),
     TRAINER_SPRITE(RS_POKEMON_RANGER_F, gTrainerFrontPic_RSPokemonRangerF, 0x800),
@@ -258,7 +258,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
     TRAINER_SPRITE(TAMER, gTrainerFrontPic_Tamer, 0x800),
     TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, 0x800),
     TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, 0x800),
-    TRAINER_SPRITE(RIVAL_1, gTrainerFrontPic_Rival1, 0x800),
+    TRAINER_SPRITE(RIVAL_EARLY, gTrainerFrontPic_RivalEarly, 0x800),
     TRAINER_SPRITE(SCIENTIST, gTrainerFrontPic_Scientist, 0x800),
     TRAINER_SPRITE(LEADER_GIOVANNI, gTrainerFrontPic_LeaderGiovanni, 0x800),
     TRAINER_SPRITE(ROCKET_GRUNT_M, gTrainerFrontPic_RocketGruntM, 0x800),
@@ -276,7 +276,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
     TRAINER_SPRITE(LEADER_BLAINE, gTrainerFrontPic_LeaderBlaine, 0x800),
     TRAINER_SPRITE(LEADER_SABRINA, gTrainerFrontPic_LeaderSabrina, 0x800),
     TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, 0x800),
-    TRAINER_SPRITE(RIVAL_2, gTrainerFrontPic_Rival2, 0x800),
+    TRAINER_SPRITE(RIVAL_LATE, gTrainerFrontPic_RivalLate, 0x800),
     TRAINER_SPRITE(CHAMPION_RIVAL, gTrainerFrontPic_ChampionRival, 0x800),
     TRAINER_SPRITE(CHANNELER, gTrainerFrontPic_Channeler, 0x800),
     TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, 0x800),
@@ -293,7 +293,7 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
     TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, 0x800),
     TRAINER_SPRITE(CRUSH_GIRL, gTrainerFrontPic_CrushGirl, 0x800),
     TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, 0x800),
-    TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, 0x800),
+    TRAINER_SPRITE(POKEMON_BREEDER, gTrainerFrontPic_PokemonBreeder, 0x800),
     TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, 0x800),
     TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, 0x800),
     TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, 0x800),
@@ -311,7 +311,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
     TRAINER_PAL(RS_RUIN_MANIAC, gTrainerPalette_RSRuinManiac),
     TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer),
     TRAINER_PAL(RS_TUBER_F, gTrainerPalette_RSTuberF),
-    TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM),
+    TRAINER_PAL(RS_TUBER_M, gTrainerPalette_TuberM),
     TRAINER_PAL(RS_COOLTRAINER_M, gTrainerPalette_RSCooltrainerM),
     TRAINER_PAL(RS_COOLTRAINER_F, gTrainerPalette_RSCooltrainerF),
     TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac),
@@ -362,7 +362,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
     TRAINER_PAL(WALLY, gTrainerPalette_Wally),
     TRAINER_PAL(RS_BRENDAN_1, gTrainerPalette_RSBrendan1),
     TRAINER_PAL(RS_MAY_1, gTrainerPalette_RSMay1),
-    TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM),
+    TRAINER_PAL(RS_POKEMON_BREEDER_M, gTrainerPalette_RSPokemonBreederM),
     TRAINER_PAL(RS_POKEMON_BREEDER_F, gTrainerPalette_RSPokemonBreederF),
     TRAINER_PAL(RS_POKEMON_RANGER_M, gTrainerPalette_RSPokemonRangerM),
     TRAINER_PAL(RS_POKEMON_RANGER_F, gTrainerPalette_RSPokemonRangerF),
@@ -410,7 +410,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
     TRAINER_PAL(TAMER, gTrainerPalette_Tamer),
     TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper),
     TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt),
-    TRAINER_PAL(RIVAL_1, gTrainerPalette_Rival1),
+    TRAINER_PAL(RIVAL_EARLY, gTrainerPalette_RivalEarly),
     TRAINER_PAL(SCIENTIST, gTrainerPalette_Scientist),
     TRAINER_PAL(LEADER_GIOVANNI, gTrainerPalette_LeaderGiovanni),
     TRAINER_PAL(ROCKET_GRUNT_M, gTrainerPalette_RocketGruntM),
@@ -428,7 +428,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
     TRAINER_PAL(LEADER_BLAINE, gTrainerPalette_LeaderBlaine),
     TRAINER_PAL(LEADER_SABRINA, gTrainerPalette_LeaderSabrina),
     TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman),
-    TRAINER_PAL(RIVAL_2, gTrainerPalette_Rival2),
+    TRAINER_PAL(RIVAL_LATE, gTrainerPalette_RivalLate),
     TRAINER_PAL(CHAMPION_RIVAL, gTrainerPalette_ChampionRival),
     TRAINER_PAL(CHANNELER, gTrainerPalette_Channeler),
     TRAINER_PAL(TWINS, gTrainerPalette_Twins),
@@ -445,7 +445,7 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
     TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF),
     TRAINER_PAL(CRUSH_GIRL, gTrainerPalette_CrushGirl),
     TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF),
-    TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF),
+    TRAINER_PAL(POKEMON_BREEDER, gTrainerPalette_PokemonBreeder),
     TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM),
     TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF),
     TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady),