index trainer front anims ptr table

1 files changed, 95 insertions, 93 deletions

diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h
index 11fb1797f..371e5a300 100644
--- a/src/data/trainer_graphics/front_pic_anims.h
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -1,3 +1,5 @@
+#include "constants/trainers.h"
+
 const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
     gAnimCmd_General_Frame0,
 };
@@ -372,97 +374,97 @@ const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
 
 const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
 {
-    gTrainerFrontAnims_Hiker,                 // TRAINER_PIC_HIKER
-    gTrainerFrontAnims_AquaGruntM,            // TRAINER_PIC_AQUA_GRUNT_M
-    gTrainerFrontAnims_PokemonBreederF,       // TRAINER_PIC_POKEMON_BREEDER_F
-    gTrainerFrontAnims_CoolTrainerM,          // TRAINER_PIC_COOLTRAINER_M
-    gTrainerFrontAnims_BirdKeeper,            // TRAINER_PIC_BIRD_KEEPER
-    gTrainerFrontAnims_Collector,             // TRAINER_PIC_COLLECTOR
-    gTrainerFrontAnims_AquaGruntF,            // TRAINER_PIC_AQUA_GRUNT_F
-    gTrainerFrontAnims_SwimmerM,              // TRAINER_PIC_SWIMMER_M
-    gTrainerFrontAnims_MagmaGruntM,           // TRAINER_PIC_MAGMA_GRUNT_M
-    gTrainerFrontAnims_ExpertM,               // TRAINER_PIC_EXPERT_M
-    gTrainerFrontAnims_AquaAdminM,            // TRAINER_PIC_AQUA_ADMIN_M
-    gTrainerFrontAnims_BlackBelt,             // TRAINER_PIC_BLACK_BELT
-    gTrainerFrontAnims_AquaAdminF,            // TRAINER_PIC_AQUA_ADMIN_F
-    gTrainerFrontAnims_AquaLeaderArchie,      // TRAINER_PIC_AQUA_LEADER_ARCHIE
-    gTrainerFrontAnims_HexManiac,             // TRAINER_PIC_HEX_MANIAC
-    gTrainerFrontAnims_AromaLady,             // TRAINER_PIC_AROMA_LADY
-    gTrainerFrontAnims_RuinManiac,            // TRAINER_PIC_RUIN_MANIAC
-    gTrainerFrontAnims_Interviewer,           // TRAINER_PIC_INTERVIEWER
-    gTrainerFrontAnims_TuberF,                // TRAINER_PIC_TUBER_F
-    gTrainerFrontAnims_TuberM,                // TRAINER_PIC_TUBER_M
-    gTrainerFrontAnims_CoolTrainerF,          // TRAINER_PIC_COOLTRAINER_F
-    gTrainerFrontAnims_Lady,                  // TRAINER_PIC_LADY
-    gTrainerFrontAnims_Beauty,                // TRAINER_PIC_BEAUTY
-    gTrainerFrontAnims_RichBoy,               // TRAINER_PIC_RICH_BOY
-    gTrainerFrontAnims_ExpertF,               // TRAINER_PIC_EXPERT_F
-    gTrainerFrontAnims_Pokemaniac,            // TRAINER_PIC_POKEMANIAC
-    gTrainerFrontAnims_MagmaGruntF,           // TRAINER_PIC_MAGMA_GRUNT_F
-    gTrainerFrontAnims_Guitarist,             // TRAINER_PIC_GUITARIST
-    gTrainerFrontAnims_Kindler,               // TRAINER_PIC_KINDLER
-    gTrainerFrontAnims_Camper,                // TRAINER_PIC_CAMPER
-    gTrainerFrontAnims_Picnicker,             // TRAINER_PIC_PICNICKER
-    gTrainerFrontAnims_BugManiac,             // TRAINER_PIC_BUG_MANIAC
-    gTrainerFrontAnims_PokemonBreederM,       // TRAINER_PIC_POKEMON_BREEDER_M
-    gTrainerFrontAnims_PsychicM,              // TRAINER_PIC_PSYCHIC_M
-    gTrainerFrontAnims_PsychicF,              // TRAINER_PIC_PSYCHIC_F
-    gTrainerFrontAnims_Gentleman,             // TRAINER_PIC_GENTLEMAN
-    gTrainerFrontAnims_EliteFourSidney,       // TRAINER_PIC_ELITE_FOUR_SIDNEY
-    gTrainerFrontAnims_EliteFourPhoebe,       // TRAINER_PIC_ELITE_FOUR_PHOEBE
-    gTrainerFrontAnims_EliteFourGlacia,       // TRAINER_PIC_ELITE_FOUR_GLACIA
-    gTrainerFrontAnims_EliteFourDrake,        // TRAINER_PIC_ELITE_FOUR_DRAKE
-    gTrainerFrontAnims_LeaderRoxanne,         // TRAINER_PIC_LEADER_ROXANNE
-    gTrainerFrontAnims_LeaderBrawly,          // TRAINER_PIC_LEADER_BRAWLY
-    gTrainerFrontAnims_LeaderWattson,         // TRAINER_PIC_LEADER_WATTSON
-    gTrainerFrontAnims_LeaderFlannery,        // TRAINER_PIC_LEADER_FLANNERY
-    gTrainerFrontAnims_LeaderNorman,          // TRAINER_PIC_LEADER_NORMAN
-    gTrainerFrontAnims_LeaderWinona,          // TRAINER_PIC_LEADER_WINONA
-    gTrainerFrontAnims_LeaderTateAndLiza,     // TRAINER_PIC_LEADER_TATE_AND_LIZA
-    gTrainerFrontAnims_LeaderJuan,            // TRAINER_PIC_LEADER_JUAN
-    gTrainerFrontAnims_SchoolKidM,            // TRAINER_PIC_SCHOOL_KID_M
-    gTrainerFrontAnims_SchoolKidF,            // TRAINER_PIC_SCHOOL_KID_F
-    gTrainerFrontAnims_SrAndJr,               // TRAINER_PIC_SR_AND_JR
-    gTrainerFrontAnims_PokefanM,              // TRAINER_PIC_POKEFAN_M
-    gTrainerFrontAnims_PokefanF,              // TRAINER_PIC_POKEFAN_F 
-    gTrainerFrontAnims_Youngster,             // TRAINER_PIC_YOUNGSTER
-    gTrainerFrontAnims_ChampionWallace,       // TRAINER_PIC_CHAMPION_WALLACE
-    gTrainerFrontAnims_Fisherman,             // TRAINER_PIC_FISHERMAN
-    gTrainerFrontAnims_CyclingTriathleteM,    // TRAINER_PIC_CYCLING_TRIATHLETE_M
-    gTrainerFrontAnims_CyclingTriathleteF,    // TRAINER_PIC_CYCLING_TRIATHLETE_F
-    gTrainerFrontAnims_RunningTriathleteM,    // TRAINER_PIC_RUNNING_TRIATHLETE_M
-    gTrainerFrontAnims_RunningTriathleteF,    // TRAINER_PIC_RUNNING_TRIATHLETE_F
-    gTrainerFrontAnims_SwimmingTriathleteM,   // TRAINER_PIC_SWIMMING_TRIATHLETE_M
-    gTrainerFrontAnims_SwimmingTriathleteF,   // TRAINER_PIC_SWIMMING_TRIATHLETE_F
-    gTrainerFrontAnims_DragonTamer,           // TRAINER_PIC_DRAGON_TAMER
-    gTrainerFrontAnims_NinjaBoy,              // TRAINER_PIC_NINJA_BOY
-    gTrainerFrontAnims_BattleGirl,            // TRAINER_PIC_BATTLE_GIRL
-    gTrainerFrontAnims_ParasolLady,           // TRAINER_PIC_PARASOL_LADY
-    gTrainerFrontAnims_SwimmerF,              // TRAINER_PIC_SWIMMER_F
-    gTrainerFrontAnims_Twins,                 // TRAINER_PIC_TWINS
-    gTrainerFrontAnims_Sailor,                // TRAINER_PIC_SAILOR
-    gTrainerFrontAnims_MagmaAdmin,            // TRAINER_PIC_MAGMA_ADMIN
-    gTrainerFrontAnims_Wally,                 // TRAINER_PIC_WALLY
-    gTrainerFrontAnims_Brendan,               // TRAINER_PIC_BRENDAN
-    gTrainerFrontAnims_May,                   // TRAINER_PIC_MAY
-    gTrainerFrontAnims_BugCatcher,            // TRAINER_PIC_BUG_CATCHER
-    gTrainerFrontAnims_PokemonRangerM,        // TRAINER_PIC_POKEMON_RANGER_M
-    gTrainerFrontAnims_PokemonRangerF,        // TRAINER_PIC_POKEMON_RANGER_F
-    gTrainerFrontAnims_MagmaLeaderMaxie,      // TRAINER_PIC_MAGMA_LEADER_MAXIE
-    gTrainerFrontAnims_Lass,                  // TRAINER_PIC_LASS
-    gTrainerFrontAnims_YoungCouple,           // TRAINER_PIC_YOUNG_COUPLE
-    gTrainerFrontAnims_OldCouple,             // TRAINER_PIC_OLD_COUPLE
-    gTrainerFrontAnims_SisAndBro,             // TRAINER_PIC_SIS_AND_BRO
-    gTrainerFrontAnims_Steven,                // TRAINER_PIC_STEVEN
-    gTrainerFrontAnims_SalonMaidenAnabel,     // TRAINER_PIC_SALON_MAIDEN_ANABEL
-    gTrainerFrontAnims_DomeAceTucker,         // TRAINER_PIC_DOME_ACE_TUCKER
-    gTrainerFrontAnims_PalaceMavenSpenser,    // TRAINER_PIC_PALACE_MAVEN_SPENSER
-    gTrainerFrontAnims_ArenaTycoonGreta,      // TRAINER_PIC_ARENA_TYCOON_GRETA
-    gTrainerFrontAnims_FactoryHeadNoland,     // TRAINER_PIC_FACTORY_HEAD_NOLAND
-    gTrainerFrontAnims_PikeQueenLucy,         // TRAINER_PIC_PIKE_QUEEN_LUCY
-    gTrainerFrontAnims_PyramidKingBrandon,    // TRAINER_PIC_PYRAMID_KING_BRANDON
-    gTrainerFrontAnims_Red,                   // TRAINER_PIC_RED
-    gTrainerFrontAnims_Leaf,                  // TRAINER_PIC_LEAF
-    gTrainerFrontAnims_RubySapphireBrendan,   // TRAINER_PIC_RS_BRENDAN
-    gTrainerFrontAnims_RubySapphireMay,       // TRAINER_PIC_RS_MAY
+    [TRAINER_PIC_HIKER] = gTrainerFrontAnims_Hiker,
+    [TRAINER_PIC_AQUA_GRUNT_M] = gTrainerFrontAnims_AquaGruntM,
+    [TRAINER_PIC_POKEMON_BREEDER_F] = gTrainerFrontAnims_PokemonBreederF,
+    [TRAINER_PIC_COOLTRAINER_M] = gTrainerFrontAnims_CoolTrainerM,
+    [TRAINER_PIC_BIRD_KEEPER] = gTrainerFrontAnims_BirdKeeper,
+    [TRAINER_PIC_COLLECTOR] = gTrainerFrontAnims_Collector,
+    [TRAINER_PIC_AQUA_GRUNT_F] = gTrainerFrontAnims_AquaGruntF,
+    [TRAINER_PIC_SWIMMER_M] = gTrainerFrontAnims_SwimmerM,
+    [TRAINER_PIC_MAGMA_GRUNT_M] = gTrainerFrontAnims_MagmaGruntM,
+    [TRAINER_PIC_EXPERT_M] = gTrainerFrontAnims_ExpertM,
+    [TRAINER_PIC_AQUA_ADMIN_M] = gTrainerFrontAnims_AquaAdminM,
+    [TRAINER_PIC_BLACK_BELT] = gTrainerFrontAnims_BlackBelt,
+    [TRAINER_PIC_AQUA_ADMIN_F] = gTrainerFrontAnims_AquaAdminF,
+    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = gTrainerFrontAnims_AquaLeaderArchie,
+    [TRAINER_PIC_HEX_MANIAC] = gTrainerFrontAnims_HexManiac,
+    [TRAINER_PIC_AROMA_LADY] = gTrainerFrontAnims_AromaLady,
+    [TRAINER_PIC_RUIN_MANIAC] = gTrainerFrontAnims_RuinManiac,
+    [TRAINER_PIC_INTERVIEWER] = gTrainerFrontAnims_Interviewer,
+    [TRAINER_PIC_TUBER_F] = gTrainerFrontAnims_TuberF,
+    [TRAINER_PIC_TUBER_M] = gTrainerFrontAnims_TuberM,
+    [TRAINER_PIC_COOLTRAINER_F] = gTrainerFrontAnims_CoolTrainerF,
+    [TRAINER_PIC_LADY] = gTrainerFrontAnims_Lady,
+    [TRAINER_PIC_BEAUTY] = gTrainerFrontAnims_Beauty,
+    [TRAINER_PIC_RICH_BOY] = gTrainerFrontAnims_RichBoy,
+    [TRAINER_PIC_EXPERT_F] = gTrainerFrontAnims_ExpertF,
+    [TRAINER_PIC_POKEMANIAC] = gTrainerFrontAnims_Pokemaniac,
+    [TRAINER_PIC_MAGMA_GRUNT_F] = gTrainerFrontAnims_MagmaGruntF,
+    [TRAINER_PIC_GUITARIST] = gTrainerFrontAnims_Guitarist,
+    [TRAINER_PIC_KINDLER] = gTrainerFrontAnims_Kindler,
+    [TRAINER_PIC_CAMPER] = gTrainerFrontAnims_Camper,
+    [TRAINER_PIC_PICNICKER] = gTrainerFrontAnims_Picnicker,
+    [TRAINER_PIC_BUG_MANIAC] = gTrainerFrontAnims_BugManiac,
+    [TRAINER_PIC_POKEMON_BREEDER_M] = gTrainerFrontAnims_PokemonBreederM,
+    [TRAINER_PIC_PSYCHIC_M] = gTrainerFrontAnims_PsychicM,
+    [TRAINER_PIC_PSYCHIC_F] = gTrainerFrontAnims_PsychicF,
+    [TRAINER_PIC_GENTLEMAN] = gTrainerFrontAnims_Gentleman,
+    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = gTrainerFrontAnims_EliteFourSidney,
+    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = gTrainerFrontAnims_EliteFourPhoebe,
+    [TRAINER_PIC_ELITE_FOUR_GLACIA] = gTrainerFrontAnims_EliteFourGlacia,
+    [TRAINER_PIC_ELITE_FOUR_DRAKE] = gTrainerFrontAnims_EliteFourDrake,
+    [TRAINER_PIC_LEADER_ROXANNE] = gTrainerFrontAnims_LeaderRoxanne,
+    [TRAINER_PIC_LEADER_BRAWLY] = gTrainerFrontAnims_LeaderBrawly,
+    [TRAINER_PIC_LEADER_WATTSON] = gTrainerFrontAnims_LeaderWattson,
+    [TRAINER_PIC_LEADER_FLANNERY] = gTrainerFrontAnims_LeaderFlannery,
+    [TRAINER_PIC_LEADER_NORMAN] = gTrainerFrontAnims_LeaderNorman,
+    [TRAINER_PIC_LEADER_WINONA] = gTrainerFrontAnims_LeaderWinona,
+    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = gTrainerFrontAnims_LeaderTateAndLiza,
+    [TRAINER_PIC_LEADER_JUAN] = gTrainerFrontAnims_LeaderJuan,
+    [TRAINER_PIC_SCHOOL_KID_M] = gTrainerFrontAnims_SchoolKidM,
+    [TRAINER_PIC_SCHOOL_KID_F] = gTrainerFrontAnims_SchoolKidF,
+    [TRAINER_PIC_SR_AND_JR] = gTrainerFrontAnims_SrAndJr,
+    [TRAINER_PIC_POKEFAN_M] = gTrainerFrontAnims_PokefanM,
+    [TRAINER_PIC_POKEFAN_F] = gTrainerFrontAnims_PokefanF,
+    [TRAINER_PIC_YOUNGSTER] = gTrainerFrontAnims_Youngster,
+    [TRAINER_PIC_CHAMPION_WALLACE] = gTrainerFrontAnims_ChampionWallace,
+    [TRAINER_PIC_FISHERMAN] = gTrainerFrontAnims_Fisherman,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = gTrainerFrontAnims_CyclingTriathleteM,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = gTrainerFrontAnims_CyclingTriathleteF,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = gTrainerFrontAnims_RunningTriathleteM,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = gTrainerFrontAnims_RunningTriathleteF,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = gTrainerFrontAnims_SwimmingTriathleteM,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = gTrainerFrontAnims_SwimmingTriathleteF,
+    [TRAINER_PIC_DRAGON_TAMER] = gTrainerFrontAnims_DragonTamer,
+    [TRAINER_PIC_NINJA_BOY] = gTrainerFrontAnims_NinjaBoy,
+    [TRAINER_PIC_BATTLE_GIRL] = gTrainerFrontAnims_BattleGirl,
+    [TRAINER_PIC_PARASOL_LADY] = gTrainerFrontAnims_ParasolLady,
+    [TRAINER_PIC_SWIMMER_F] = gTrainerFrontAnims_SwimmerF,
+    [TRAINER_PIC_TWINS] = gTrainerFrontAnims_Twins,
+    [TRAINER_PIC_SAILOR] = gTrainerFrontAnims_Sailor,
+    [TRAINER_PIC_MAGMA_ADMIN] = gTrainerFrontAnims_MagmaAdmin,
+    [TRAINER_PIC_WALLY] = gTrainerFrontAnims_Wally,
+    [TRAINER_PIC_BRENDAN] = gTrainerFrontAnims_Brendan,
+    [TRAINER_PIC_MAY] = gTrainerFrontAnims_May,
+    [TRAINER_PIC_BUG_CATCHER] = gTrainerFrontAnims_BugCatcher,
+    [TRAINER_PIC_POKEMON_RANGER_M] = gTrainerFrontAnims_PokemonRangerM,
+    [TRAINER_PIC_POKEMON_RANGER_F] = gTrainerFrontAnims_PokemonRangerF,
+    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = gTrainerFrontAnims_MagmaLeaderMaxie,
+    [TRAINER_PIC_LASS] = gTrainerFrontAnims_Lass,
+    [TRAINER_PIC_YOUNG_COUPLE] = gTrainerFrontAnims_YoungCouple,
+    [TRAINER_PIC_OLD_COUPLE] = gTrainerFrontAnims_OldCouple,
+    [TRAINER_PIC_SIS_AND_BRO] = gTrainerFrontAnims_SisAndBro,
+    [TRAINER_PIC_STEVEN] = gTrainerFrontAnims_Steven,
+    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = gTrainerFrontAnims_SalonMaidenAnabel,
+    [TRAINER_PIC_DOME_ACE_TUCKER] = gTrainerFrontAnims_DomeAceTucker,
+    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = gTrainerFrontAnims_PalaceMavenSpenser,
+    [TRAINER_PIC_ARENA_TYCOON_GRETA] = gTrainerFrontAnims_ArenaTycoonGreta,
+    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = gTrainerFrontAnims_FactoryHeadNoland,
+    [TRAINER_PIC_PIKE_QUEEN_LUCY] = gTrainerFrontAnims_PikeQueenLucy,
+    [TRAINER_PIC_PYRAMID_KING_BRANDON] = gTrainerFrontAnims_PyramidKingBrandon,
+    [TRAINER_PIC_RED] = gTrainerFrontAnims_Red,
+    [TRAINER_PIC_LEAF] = gTrainerFrontAnims_Leaf,
+    [TRAINER_PIC_RS_BRENDAN] = gTrainerFrontAnims_RubySapphireBrendan,
+    [TRAINER_PIC_RS_MAY] = gTrainerFrontAnims_RubySapphireMay,
 };