Merge remote-tracking branch 'upstream/master'

4 files changed, 922 insertions, 0 deletions

diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h
new file mode 100644
index 000000000..21dbda597
--- /dev/null
+++ b/src/data/trainer_graphics/back_pic_anims.h
@@ -0,0 +1,129 @@
+const union AnimCmd gAnimCmd_Brendan_1[] =
+{
+    ANIMCMD_FRAME(0, 24),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 24),
+    ANIMCMD_FRAME(0, 9),
+    ANIMCMD_FRAME(3, 50),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gAnimCmd_May_Steven_1[] =
+{
+    ANIMCMD_FRAME(0, 24),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 24),
+    ANIMCMD_FRAME(0, 9),
+    ANIMCMD_FRAME(3, 50),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gAnimCmd_Wally_1[] =
+{
+    ANIMCMD_FRAME(0, 24),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 24),
+    ANIMCMD_FRAME(0, 9),
+    ANIMCMD_FRAME(3, 50),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gAnimCmd_Red_1[] =
+{
+    ANIMCMD_FRAME(1, 20),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(4, 24),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gAnimCmd_Leaf_1[] =
+{
+    ANIMCMD_FRAME(1, 20),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(4, 24),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
+{
+    ANIMCMD_FRAME(0, 24),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 24),
+    ANIMCMD_FRAME(0, 9),
+    ANIMCMD_FRAME(3, 50),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
+{
+    ANIMCMD_FRAME(0, 24),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 24), 
+    ANIMCMD_FRAME(0, 9),
+    ANIMCMD_FRAME(3, 50),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gTrainerBackAnims_Brendan[] =
+{
+    AnimCmd_82FF540,
+    gAnimCmd_Brendan_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_May[] =
+{
+    AnimCmd_82FF540,
+    gAnimCmd_May_Steven_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_Red[] =
+{
+    gAnimCmd_General_Frame0,
+    gAnimCmd_Red_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_Leaf[] =
+{
+    gAnimCmd_General_Frame0,
+    gAnimCmd_Leaf_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
+{
+    AnimCmd_82FF540,
+    gAnimCmd_RubySapphireBrendan_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
+{
+    AnimCmd_82FF540,
+    gAnimCmd_RubySapphireMay_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_Wally[] =
+{
+    AnimCmd_82FF540,
+    gAnimCmd_Wally_1,
+};
+
+const union AnimCmd *const gTrainerBackAnims_Steven[] =
+{
+    AnimCmd_82FF540,
+    gAnimCmd_May_Steven_1,
+};
+
+const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] =
+{
+    gTrainerBackAnims_Brendan,
+    gTrainerBackAnims_May,
+    gTrainerBackAnims_Red,
+    gTrainerBackAnims_Leaf,
+    gTrainerBackAnims_RubySapphireBrendan,
+    gTrainerBackAnims_RubySapphireMay,
+    gTrainerBackAnims_Wally,
+    gTrainerBackAnims_Steven,
+};
diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h
new file mode 100644
index 000000000..3e74902d8
--- /dev/null
+++ b/src/data/trainer_graphics/back_pic_tables.h
@@ -0,0 +1,35 @@
+const struct MonCoords gTrainerBackPicCoords[] =
+{
+    {8, 4},
+    {8, 4},
+    {8, 5},
+    {8, 5},
+    {8, 4},
+    {8, 4},
+    {8, 4},
+    {8, 4},
+};
+
+const struct CompressedSpriteSheet gTrainerBackPicTable[] =
+{
+    gTrainerBackPic_Brendan, 0x2000, 0,
+    gTrainerBackPic_May, 0x2000, 1,
+    gTrainerBackPic_Red, 0x2800, 2,
+    gTrainerBackPic_Leaf, 0x2800, 3,
+    gTrainerBackPic_RubySapphireBrendan, 0x2000, 4,
+    gTrainerBackPic_RubySapphireMay, 0x2000, 5,
+    gTrainerBackPic_Wally, 0x2000, 6,
+    gTrainerBackPic_Steven, 0x2000, 7,
+};
+
+const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = 
+{
+    gTrainerPalette_Brendan, 0,
+    gTrainerPalette_May, 1,
+    gTrainerBackPicPalette_Red, 2,
+    gTrainerBackPicPalette_Leaf, 3,
+    gTrainerPalette_RubySapphireBrendan, 4,
+    gTrainerPalette_RubySapphireMay, 5,
+    gTrainerPalette_Wally, 6,
+    gTrainerPalette_Steven, 7,
+};
diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h
new file mode 100644
index 000000000..b72726506
--- /dev/null
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -0,0 +1,468 @@
+const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_AquaGruntM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PokemonBreederF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_CoolTrainerM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_BirdKeeper[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Collector[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_AquaGruntF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SwimmerM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_MagmaGruntM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_ExpertM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_AquaAdminM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_BlackBelt[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_AquaAdminF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_AquaLeaderArchie[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_HexManiac[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_AromaLady[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_RuinManiac[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Interviewer[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_TuberF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_TuberM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_CoolTrainerF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Lady[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Beauty[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_RichBoy[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_ExpertF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Pokemaniac[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_MagmaGruntF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Guitarist[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Kindler[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Camper[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Picnicker[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_BugManiac[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PokemonBreederM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PsychicM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PsychicF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Gentleman[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_EliteFourSidney[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_EliteFourPhoebe[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_EliteFourGlacia[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_EliteFourDrake[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderRoxanne[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderBrawly[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderWattson[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderFlannery[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderNorman[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderWinona[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderTateAndLiza[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_LeaderJuan[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SchoolKidM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SchoolKidF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_WinstrateM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_WinstrateF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Youngster[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_ChampionWallace[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Fisherman[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_DragonTamer[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_NinjaBoy[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_BattleGirl[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_ParasolLady[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SwimmerF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Twins[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Sailor[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_MagmaAdmin[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Wally[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Brendan[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_May[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_BugCatcher[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PokemonRangerM[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PokemonRangerF[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_MagmaLeaderMaxie[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Lass[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_YoungCouple[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_OldCouple[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SisAndBro[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Steven[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_SalonMaidenAnabel[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_DomeAceTucker[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PalaceMavenSpenser[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_ArenaTycoonGreta[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_FactoryHeadNoland[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PikeQueenLucy[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_PyramidKingBrandon[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Red[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_Leaf[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_RubySapphireBrendan[] ={
+    gAnimCmd_General_Frame0,
+};
+
+const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
+    gAnimCmd_General_Frame0,
+};
+
+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_COOL_TRAINER_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_COOL_TRAINER_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_WinstrateM,            // TRAINER_PIC_WINSTRATE_M 
+    gTrainerFrontAnims_WinstrateF,            // TRAINER_PIC_WINSTRATE_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_RUBY_SAPPHIRE_BRENDAN 
+    gTrainerFrontAnims_RubySapphireMay,       // TRAINER_PIC_RUBY_SAPPHIRE_MAY 
+};
diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h
new file mode 100644
index 000000000..db80c9d4f
--- /dev/null
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -0,0 +1,290 @@
+const struct MonCoords gTrainerFrontPicCoords[] =
+{
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 2},
+    {8, 2},
+    {8, 1},
+    {8, 1},
+    {8, 2},
+    {8, 1},
+    {8, 2},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 2},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 2},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+    {8, 1},
+};
+
+const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
+{
+    gTrainerFrontPic_Hiker, 0x800, 0,
+    gTrainerFrontPic_AquaGruntM, 0x800, 1,
+    gTrainerFrontPic_PokemonBreederF, 0x800, 2,
+    gTrainerFrontPic_CoolTrainerM, 0x800, 3,
+    gTrainerFrontPic_BirdKeeper, 0x800, 4,
+    gTrainerFrontPic_Collector, 0x800, 5,
+    gTrainerFrontPic_AquaGruntF, 0x800, 6,
+    gTrainerFrontPic_SwimmerM, 0x800, 7,
+    gTrainerFrontPic_MagmaGruntM, 0x800, 8,
+    gTrainerFrontPic_ExpertM, 0x800, 9,
+    gTrainerFrontPic_AquaAdminM, 0x800, 10,
+    gTrainerFrontPic_BlackBelt, 0x800, 11,
+    gTrainerFrontPic_AquaAdminF, 0x800, 12,
+    gTrainerFrontPic_AquaLeaderArchie, 0x800, 13,
+    gTrainerFrontPic_HexManiac, 0x800, 14,
+    gTrainerFrontPic_AromaLady, 0x800, 15,
+    gTrainerFrontPic_RuinManiac, 0x800, 16,
+    gTrainerFrontPic_Interviewer, 0x800, 17,
+    gTrainerFrontPic_TuberF, 0x800, 18,
+    gTrainerFrontPic_TuberM, 0x800, 19,
+    gTrainerFrontPic_CoolTrainerF, 0x800, 20,
+    gTrainerFrontPic_Lady, 0x800, 21,
+    gTrainerFrontPic_Beauty, 0x800, 22,
+    gTrainerFrontPic_RichBoy, 0x800, 23,
+    gTrainerFrontPic_ExpertF, 0x800, 24,
+    gTrainerFrontPic_Pokemaniac, 0x800, 25,
+    gTrainerFrontPic_MagmaGruntF, 0x800, 26,
+    gTrainerFrontPic_Guitarist, 0x800, 27,
+    gTrainerFrontPic_Kindler, 0x800, 28,
+    gTrainerFrontPic_Camper, 0x800, 29,
+    gTrainerFrontPic_Picnicker, 0x800, 30,
+    gTrainerFrontPic_BugManiac, 0x800, 31,
+    gTrainerFrontPic_PokemonBreederM, 0x800, 32,
+    gTrainerFrontPic_PsychicM, 0x800, 33,
+    gTrainerFrontPic_PsychicF, 0x800, 34,
+    gTrainerFrontPic_Gentleman, 0x800, 35,
+    gTrainerFrontPic_EliteFourSidney, 0x800, 36,
+    gTrainerFrontPic_EliteFourPhoebe, 0x800, 37,
+    gTrainerFrontPic_EliteFourGlacia, 0x800, 38,
+    gTrainerFrontPic_EliteFourDrake, 0x800, 39,
+    gTrainerFrontPic_LeaderRoxanne, 0x800, 40,
+    gTrainerFrontPic_LeaderBrawly, 0x800, 41,
+    gTrainerFrontPic_LeaderWattson, 0x800, 42,
+    gTrainerFrontPic_LeaderFlannery, 0x800, 43,
+    gTrainerFrontPic_LeaderNorman, 0x800, 44,
+    gTrainerFrontPic_LeaderWinona, 0x800, 45,
+    gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46,
+    gTrainerFrontPic_LeaderJuan, 0x800, 47,
+    gTrainerFrontPic_SchoolKidM, 0x800, 48,
+    gTrainerFrontPic_SchoolKidF, 0x800, 49,
+    gTrainerFrontPic_SrAndJr, 0x1000, 50,
+    gTrainerFrontPic_WinstrateM, 0x1000, 51,
+    gTrainerFrontPic_WinstrateF, 0x800, 52,
+    gTrainerFrontPic_Youngster, 0x800, 53,
+    gTrainerFrontPic_ChampionWallace, 0x1000, 54,
+    gTrainerFrontPic_Fisherman, 0x800, 55,
+    gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56,
+    gTrainerFrontPic_CyclingTriathleteF, 0x800, 57,
+    gTrainerFrontPic_RunningTriathleteM, 0x800, 58,
+    gTrainerFrontPic_RunningTriathleteF, 0x800, 59,
+    gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60,
+    gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61,
+    gTrainerFrontPic_DragonTamer, 0x800, 62,
+    gTrainerFrontPic_NinjaBoy, 0x800, 63,
+    gTrainerFrontPic_BattleGirl, 0x1000, 64,
+    gTrainerFrontPic_ParasolLady, 0x800, 65,
+    gTrainerFrontPic_SwimmerF, 0x800, 66,
+    gTrainerFrontPic_Twins, 0x800, 67,
+    gTrainerFrontPic_Sailor, 0x800, 68,
+    gTrainerFrontPic_MagmaAdmin, 0x800, 69,
+    gTrainerFrontPic_Wally, 0x800, 70,
+    gTrainerFrontPic_Brendan, 0x800, 71,
+    gTrainerFrontPic_May, 0x800, 72,
+    gTrainerFrontPic_BugCatcher, 0x800, 73,
+    gTrainerFrontPic_PokemonRangerM, 0x800, 74,
+    gTrainerFrontPic_PokemonRangerF, 0x800, 75,
+    gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76,
+    gTrainerFrontPic_Lass, 0x800, 77,
+    gTrainerFrontPic_YoungCouple, 0x800, 78,
+    gTrainerFrontPic_OldCouple, 0x800, 79,
+    gTrainerFrontPic_SisAndBro, 0x800, 80,
+    gTrainerFrontPic_Steven, 0x800, 81,
+    gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82,
+    gTrainerFrontPic_DomeAceTucker, 0x800, 83,
+    gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84,
+    gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85,
+    gTrainerFrontPic_FactoryHeadNoland, 0x800, 86,
+    gTrainerFrontPic_PikeQueenLucy, 0x800, 87,
+    gTrainerFrontPic_PyramidKingBrandon, 0x800, 88,
+    gTrainerFrontPic_Red, 0x800, 89,
+    gTrainerFrontPic_Leaf, 0x800, 90,
+    gTrainerFrontPic_RubySapphireBrendan, 0x800, 91,
+    gTrainerFrontPic_RubySapphireMay, 0x800, 92,
+};
+
+const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
+{
+    gTrainerPalette_Hiker, 0,
+    gTrainerPalette_AquaGruntM, 1,
+    gTrainerPalette_PokemonBreederF, 2,
+    gTrainerPalette_CoolTrainerM, 3,
+    gTrainerPalette_BirdKeeper, 4,
+    gTrainerPalette_Collector, 5,
+    gTrainerPalette_AquaGruntF, 6,
+    gTrainerPalette_SwimmerM, 7,
+    gTrainerPalette_MagmaGruntM, 8,
+    gTrainerPalette_ExpertM, 9,
+    gTrainerPalette_AquaAdminM, 10,
+    gTrainerPalette_BlackBelt, 11,
+    gTrainerPalette_AquaAdminF, 12,
+    gTrainerPalette_AquaLeaderArchie, 13,
+    gTrainerPalette_HexManiac, 14,
+    gTrainerPalette_AromaLady, 15,
+    gTrainerPalette_RuinManiac, 16,
+    gTrainerPalette_Interviewer, 17,
+    gTrainerPalette_TuberF, 18,
+    gTrainerPalette_TuberM, 19,
+    gTrainerPalette_CoolTrainerF, 20,
+    gTrainerPalette_Lady, 21,
+    gTrainerPalette_Beauty, 22,
+    gTrainerPalette_RichBoy, 23,
+    gTrainerPalette_ExpertF, 24,
+    gTrainerPalette_Pokemaniac, 25,
+    gTrainerPalette_MagmaGruntF, 26,
+    gTrainerPalette_Guitarist, 27,
+    gTrainerPalette_Kindler, 28,
+    gTrainerPalette_Camper, 29,
+    gTrainerPalette_Picnicker, 30,
+    gTrainerPalette_BugManiac, 31,
+    gTrainerPalette_PokemonBreederM, 32,
+    gTrainerPalette_PsychicM, 33,
+    gTrainerPalette_PsychicF, 34,
+    gTrainerPalette_Gentleman, 35,
+    gTrainerPalette_EliteFourSidney, 36,
+    gTrainerPalette_EliteFourPhoebe, 37,
+    gTrainerPalette_EliteFourGlacia, 38,
+    gTrainerPalette_EliteFourDrake, 39,
+    gTrainerPalette_LeaderRoxanne, 40,
+    gTrainerPalette_LeaderBrawly, 41,
+    gTrainerPalette_LeaderWattson, 42,
+    gTrainerPalette_LeaderFlannery, 43,
+    gTrainerPalette_LeaderNorman, 44,
+    gTrainerPalette_LeaderWinona, 45,
+    gTrainerPalette_LeaderTateAndLiza, 46,
+    gTrainerPalette_LeaderJuan, 47,
+    gTrainerPalette_SchoolKidM, 48,
+    gTrainerPalette_SchoolKidF, 49,
+    gTrainerPalette_SrAndJr, 50,
+    gTrainerPalette_WinstrateM, 51,
+    gTrainerPalette_WinstrateF, 52,
+    gTrainerPalette_Youngster, 53,
+    gTrainerPalette_ChampionWallace, 54,
+    gTrainerPalette_Fisherman, 55,
+    gTrainerPalette_CyclingTriathleteM, 56,
+    gTrainerPalette_CyclingTriathleteF, 57,
+    gTrainerPalette_RunningTriathleteM, 58,
+    gTrainerPalette_RunningTriathleteF, 59,
+    gTrainerPalette_SwimmingTriathleteM, 60,
+    gTrainerPalette_SwimmingTriathleteF, 61,
+    gTrainerPalette_DragonTamer, 62,
+    gTrainerPalette_NinjaBoy, 63,
+    gTrainerPalette_BattleGirl, 64,
+    gTrainerPalette_ParasolLady, 65,
+    gTrainerPalette_SwimmerF, 66,
+    gTrainerPalette_Twins, 67,
+    gTrainerPalette_Sailor, 68,
+    gTrainerPalette_MagmaAdmin, 69,
+    gTrainerPalette_Wally, 70,
+    gTrainerPalette_Brendan, 71,
+    gTrainerPalette_May, 72,
+    gTrainerPalette_BugCatcher, 73,
+    gTrainerPalette_PokemonRangerM, 74,
+    gTrainerPalette_PokemonRangerF, 75,
+    gTrainerPalette_MagmaLeaderMaxie, 76,
+    gTrainerPalette_Lass, 77,
+    gTrainerPalette_YoungCouple, 78,
+    gTrainerPalette_OldCouple, 79,
+    gTrainerPalette_SisAndBro, 80,
+    gTrainerPalette_Steven, 81,
+    gTrainerPalette_SalonMaidenAnabel, 82,
+    gTrainerPalette_DomeAceTucker, 83,
+    gTrainerPalette_PalaceMavenSpenser, 84,
+    gTrainerPalette_ArenaTycoonGreta, 85,
+    gTrainerPalette_FactoryHeadNoland, 86,
+    gTrainerPalette_PikeQueenLucy, 87,
+    gTrainerPalette_PyramidKingBrandon, 88,
+    gTrainerPalette_Red, 89,
+    gTrainerPalette_Leaf, 90,
+    gTrainerPalette_RubySapphireBrendan, 91,
+    gTrainerPalette_RubySapphireMay, 92,
+};