Merge pull request #126 from ultima-soul/data_dump

Some more data dumping

4 files changed, 1364 insertions, 12 deletions

diff --git a/src/data.c b/src/data.c
index 0f3c7ea67..42c9cfaab 100644
--- a/src/data.c
+++ b/src/data.c
@@ -75,20 +75,20 @@ const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] =
     gTrainerBackPic_OldMan + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] =
+const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[] =
 {
-    gTrainerBackPic_RubySapphireBrendan, 0x0800,
-    gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800,
-    gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800,
-    gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800,
+    gTrainerBackPic_RSBrendan, 0x0800,
+    gTrainerBackPic_RSBrendan + 0x0800, 0x0800,
+    gTrainerBackPic_RSBrendan + 0x1000, 0x0800,
+    gTrainerBackPic_RSBrendan + 0x1800, 0x0800,
 };
 
-const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] =
+const struct SpriteFrameImage gTrainerBackPicTable_RSMay[] =
 {
-    gTrainerBackPic_RubySapphireMay, 0x0800,
-    gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800,
-    gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800,
-    gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800,
+    gTrainerBackPic_RSMay, 0x0800,
+    gTrainerBackPic_RSMay + 0x0800, 0x0800,
+    gTrainerBackPic_RSMay + 0x1000, 0x0800,
+    gTrainerBackPic_RSMay + 0x1800, 0x0800,
 };
 
 static const union AnimCmd sAnim_GeneralFrame0[] =
@@ -275,9 +275,15 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] =
 #define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
 #define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
 
+#define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic}
+#define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic}
+
 #include "data/pokemon_graphics/front_pic_coordinates.h"
 #include "data/pokemon_graphics/front_pic_table.h"
 #include "data/pokemon_graphics/back_pic_coordinates.h"
 #include "data/pokemon_graphics/back_pic_table.h"
 #include "data/pokemon_graphics/palette_table.h"
 #include "data/pokemon_graphics/shiny_palette_table.h"
+
+#include "data/trainer_graphics/front_pic_anims.h"
+#include "data/trainer_graphics/front_pic_tables.h"
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..32d38068a
--- /dev/null
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -0,0 +1,891 @@
+static const union AnimCmd *const sAnims_8238E8C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238E90[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238E94[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238E98[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238E9C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EA0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EA4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EA8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EAC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EB0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EB4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EB8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EBC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EC0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EC4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EC8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238ECC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238ED0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238ED4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238ED8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EDC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EE0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EE4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EE8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EEC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EF0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EF4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EF8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238EFC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F00[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F04[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F08[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F0C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F10[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F14[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F18[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F1C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F20[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F24[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F28[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F2C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F30[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F34[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F38[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F3C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F40[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F44[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F48[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F4C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F50[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F54[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F58[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F5C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F60[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F64[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F68[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F6C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F70[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F74[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F78[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F7C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F80[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F84[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F88[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F8C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F90[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F94[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F98[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238F9C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FA0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FA4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FA8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FAC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FB0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FB4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FB8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FBC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FC0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FC4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FC8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FCC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FD0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FD4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FD8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FDC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FE0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FE4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FE8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FEC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FF0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FF4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FF8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8238FFC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239000[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239004[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239008[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823900C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239010[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239014[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239018[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823901C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239020[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239024[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239028[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823902C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239030[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239034[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239038[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823903C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239040[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239044[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239048[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823904C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239050[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239054[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239058[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823905C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239060[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239064[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239068[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823906C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239070[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239074[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239078[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823907C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239080[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239084[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239088[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823908C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239090[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239094[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_8239098[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_823909C[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390A0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390A4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390A8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390AC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390B0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390B4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390B8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390BC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390C0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390C4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390C8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390CC[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390D0[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390D4[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+static const union AnimCmd *const sAnims_82390D8[] =
+{
+    sAnim_GeneralFrame0,
+};
+
+const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
+{
+    sAnims_8238E8C,
+    sAnims_8238E90,
+    sAnims_8238E94,
+    sAnims_8238E98,
+    sAnims_8238E9C,
+    sAnims_8238EA0,
+    sAnims_8238EA4,
+    sAnims_8238EA8,
+    sAnims_8238EAC,
+    sAnims_8238EB0,
+    sAnims_8238EB4,
+    sAnims_8238EB8,
+    sAnims_8238EBC,
+    sAnims_8238EC0,
+    sAnims_8238EC4,
+    sAnims_8238EC8,
+    sAnims_8238ECC,
+    sAnims_8238ED0,
+    sAnims_8238ED4,
+    sAnims_8238ED8,
+    sAnims_8238EDC,
+    sAnims_8238EE0,
+    sAnims_8238EE4,
+    sAnims_8238EE8,
+    sAnims_8238EEC,
+    sAnims_8238EF0,
+    sAnims_8238EF4,
+    sAnims_8238EF8,
+    sAnims_8238EFC,
+    sAnims_8238F00,
+    sAnims_8238F04,
+    sAnims_8238F08,
+    sAnims_8238F0C,
+    sAnims_8238F10,
+    sAnims_8238F14,
+    sAnims_8238F18,
+    sAnims_8238F1C,
+    sAnims_8238F20,
+    sAnims_8238F24,
+    sAnims_8238F28,
+    sAnims_8238F2C,
+    sAnims_8238F30,
+    sAnims_8238F34,
+    sAnims_8238F38,
+    sAnims_8238F3C,
+    sAnims_8238F40,
+    sAnims_8238F44,
+    sAnims_8238F48,
+    sAnims_8238F4C,
+    sAnims_8238F50,
+    sAnims_8238F54,
+    sAnims_8238F58,
+    sAnims_8238F5C,
+    sAnims_8238F60,
+    sAnims_8238F64,
+    sAnims_8238F68,
+    sAnims_8238F6C,
+    sAnims_8238F70,
+    sAnims_8238F74,
+    sAnims_8238F78,
+    sAnims_8238F7C,
+    sAnims_8238F80,
+    sAnims_8238F84,
+    sAnims_8238F88,
+    sAnims_8238F8C,
+    sAnims_8238F90,
+    sAnims_8238F94,
+    sAnims_8238F98,
+    sAnims_8238F9C,
+    sAnims_8238FA0,
+    sAnims_8238FA4,
+    sAnims_8238FA8,
+    sAnims_8238FAC,
+    sAnims_8238FB0,
+    sAnims_8238FB4,
+    sAnims_8238FB8,
+    sAnims_8238FBC,
+    sAnims_8238FC0,
+    sAnims_8238FC4,
+    sAnims_8238FC8,
+    sAnims_8238FCC,
+    sAnims_8238FD0,
+    sAnims_8238FD4,
+    sAnims_8238FD8,
+    sAnims_8238FDC,
+    sAnims_8238FE0,
+    sAnims_8238FE4,
+    sAnims_8238FE8,
+    sAnims_8238FEC,
+    sAnims_8238FF0,
+    sAnims_8238FF4,
+    sAnims_8238FF8,
+    sAnims_8238FFC,
+    sAnims_8239000,
+    sAnims_8239004,
+    sAnims_8239008,
+    sAnims_823900C,
+    sAnims_8239010,
+    sAnims_8239014,
+    sAnims_8239018,
+    sAnims_823901C,
+    sAnims_8239020,
+    sAnims_8239024,
+    sAnims_8239028,
+    sAnims_823902C,
+    sAnims_8239030,
+    sAnims_8239034,
+    sAnims_8239038,
+    sAnims_823903C,
+    sAnims_8239040,
+    sAnims_8239044,
+    sAnims_8239048,
+    sAnims_823904C,
+    sAnims_8239050,
+    sAnims_8239054,
+    sAnims_8239058,
+    sAnims_823905C,
+    sAnims_8239060,
+    sAnims_8239064,
+    sAnims_8239068,
+    sAnims_823906C,
+    sAnims_8239070,
+    sAnims_8239074,
+    sAnims_8239078,
+    sAnims_823907C,
+    sAnims_8239080,
+    sAnims_8239084,
+    sAnims_8239088,
+    sAnims_823908C,
+    sAnims_8239090,
+    sAnims_8239094,
+    sAnims_8239098,
+    sAnims_823909C,
+    sAnims_82390A0,
+    sAnims_82390A4,
+    sAnims_82390A8,
+    sAnims_82390AC,
+    sAnims_82390B0,
+    sAnims_82390B4,
+    sAnims_82390B8,
+    sAnims_82390BC,
+    sAnims_82390C0,
+    sAnims_82390C4,
+    sAnims_82390C8,
+    sAnims_82390CC,
+    sAnims_82390D0,
+    sAnims_82390D4,
+    sAnims_82390D8,
+};
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..9d94103ef
--- /dev/null
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -0,0 +1,455 @@
+const struct MonCoords gTrainerFrontPicCoords[] =
+{
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 2},
+    {.size = 8, .y_offset = 2},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 2},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 2},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+    {.size = 8, .y_offset = 1},
+};
+
+const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
+{
+    TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, 0x800),
+    TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, 0x800),
+    TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, 0x800),
+    TRAINER_SPRITE(RS_AROMA_LADY, gTrainerFrontPic_RSAromaLady, 0x800),
+    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_COOLTRAINER_M, gTrainerFrontPic_RSCooltrainerM, 0x800),
+    TRAINER_SPRITE(RS_COOLTRAINER_F, gTrainerFrontPic_RSCooltrainerF, 0x800),
+    TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, 0x800),
+    TRAINER_SPRITE(RS_LADY, gTrainerFrontPic_RSLady, 0x800),
+    TRAINER_SPRITE(RS_BEAUTY, gTrainerFrontPic_RSBeauty, 0x800),
+    TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, 0x800),
+    TRAINER_SPRITE(RS_POKEMANIAC, gTrainerFrontPic_RSPokeManiac, 0x800),
+    TRAINER_SPRITE(RS_SWIMMER_M, gTrainerFrontPic_RSSwimmerM, 0x800),
+    TRAINER_SPRITE(RS_BLACK_BELT, gTrainerFrontPic_RSBlackBelt, 0x800),
+    TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, 0x800),
+    TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, 0x800),
+    TRAINER_SPRITE(RS_CAMPER, gTrainerFrontPic_RSCamper, 0x800),
+    TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, 0x800),
+    TRAINER_SPRITE(RS_PSYCHIC_M, gTrainerFrontPic_RSPsychicM, 0x800),
+    TRAINER_SPRITE(RS_PSYCHIC_F, gTrainerFrontPic_RSPsychicF, 0x800),
+    TRAINER_SPRITE(RS_GENTLEMAN, gTrainerFrontPic_RSGentleman, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, 0x800),
+    TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, 0x800),
+    TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, 0x800),
+    TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, 0x800),
+    TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, 0x800),
+    TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, 0x800),
+    TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, 0x1000),
+    TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, 0x1000),
+    TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, 0x800),
+    TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, 0x800),
+    TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, 0x800),
+    TRAINER_SPRITE(RS_YOUNGSTER, gTrainerFrontPic_RSYoungster, 0x800),
+    TRAINER_SPRITE(CHAMPION_STEVEN, gTrainerFrontPic_ChampionSteven, 0x800),
+    TRAINER_SPRITE(RS_FISHERMAN, gTrainerFrontPic_RSFisherman, 0x800),
+    TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, 0x1000),
+    TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, 0x800),
+    TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, 0x800),
+    TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, 0x800),
+    TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, 0x800),
+    TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, 0x800),
+    TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, 0x800),
+    TRAINER_SPRITE(RS_BIRD_KEEPER, gTrainerFrontPic_RSBirdKeeper, 0x800),
+    TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, 0x800),
+    TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, 0x1000),
+    TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, 0x800),
+    TRAINER_SPRITE(RS_SWIMMER_F, gTrainerFrontPic_RSSwimmerF, 0x800),
+    TRAINER_SPRITE(RS_PICNICKER, gTrainerFrontPic_RSPicnicker, 0x800),
+    TRAINER_SPRITE(RS_TWINS, gTrainerFrontPic_RSTwins, 0x800),
+    TRAINER_SPRITE(RS_SAILOR, gTrainerFrontPic_RSSailor, 0x800),
+    TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, 0x800),
+    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_F, gTrainerFrontPic_RSPokemonBreederF, 0x800),
+    TRAINER_SPRITE(RS_POKEMON_RANGER_M, gTrainerFrontPic_RSPokemonRangerM, 0x800),
+    TRAINER_SPRITE(RS_POKEMON_RANGER_F, gTrainerFrontPic_RSPokemonRangerF, 0x800),
+    TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, 0x800),
+    TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, 0x800),
+    TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, 0x800),
+    TRAINER_SPRITE(RS_LASS, gTrainerFrontPic_RSLass, 0x800),
+    TRAINER_SPRITE(RS_BUG_CATCHER, gTrainerFrontPic_RSBugCatcher, 0x800),
+    TRAINER_SPRITE(RS_HIKER, gTrainerFrontPic_RSHiker, 0x800),
+    TRAINER_SPRITE(RS_YOUNG_COUPLE, gTrainerFrontPic_RSYoungCouple, 0x800),
+    TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, 0x800),
+    TRAINER_SPRITE(RS_SIS_AND_BRO, gTrainerFrontPic_RSSisAndBro, 0x800),
+    TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, 0x800),
+    TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, 0x800),
+    TRAINER_SPRITE(MAGMA_ADMIN_M, gTrainerFrontPic_MagmaAdminM, 0x800),
+    TRAINER_SPRITE(MAGMA_ADMIN_F, gTrainerFrontPic_MagmaAdminF, 0x800),
+    TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, 0x800),
+    TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, 0x800),
+    TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, 0x800),
+    TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, 0x800),
+    TRAINER_SPRITE(LEADER_WALLACE, gTrainerFrontPic_LeaderWallace, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, 0x800),
+    TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, 0x800),
+    TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, 0x800),
+    TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, 0x800),
+    TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, 0x800),
+    TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, 0x800),
+    TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, 0x800),
+    TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_PokeManiac, 0x800),
+    TRAINER_SPRITE(SUPER_NERD, gTrainerFrontPic_SuperNerd, 0x800),
+    TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, 0x800),
+    TRAINER_SPRITE(BIKER, gTrainerFrontPic_Biker, 0x800),
+    TRAINER_SPRITE(BURGLAR, gTrainerFrontPic_Burglar, 0x800),
+    TRAINER_SPRITE(ENGINEER, gTrainerFrontPic_Engineer, 0x800),
+    TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, 0x800),
+    TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, 0x800),
+    TRAINER_SPRITE(CUE_BALL, gTrainerFrontPic_CueBall, 0x800),
+    TRAINER_SPRITE(GAMER, gTrainerFrontPic_Gamer, 0x800),
+    TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, 0x800),
+    TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, 0x800),
+    TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, 0x800),
+    TRAINER_SPRITE(ROCKER, gTrainerFrontPic_Rocker, 0x800),
+    TRAINER_SPRITE(JUGGLER, gTrainerFrontPic_Juggler, 0x800),
+    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(SCIENTIST, gTrainerFrontPic_Scientist, 0x800),
+    TRAINER_SPRITE(LEADER_GIOVANNI, gTrainerFrontPic_LeaderGiovanni, 0x800),
+    TRAINER_SPRITE(ROCKET_GRUNT_M, gTrainerFrontPic_RocketGruntM, 0x800),
+    TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CooltrainerM, 0x800),
+    TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CooltrainerF, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_LORELEI, gTrainerFrontPic_EliteFourLorelei, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_BRUNO, gTrainerFrontPic_EliteFourBruno, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_AGATHA, gTrainerFrontPic_EliteFourAgatha, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_LANCE, gTrainerFrontPic_EliteFourLance, 0x800),
+    TRAINER_SPRITE(LEADER_BROCK, gTrainerFrontPic_LeaderBrock, 0x800),
+    TRAINER_SPRITE(LEADER_MISTY, gTrainerFrontPic_LeaderMisty, 0x800),
+    TRAINER_SPRITE(LEADER_LT_SURGE, gTrainerFrontPic_LeaderLtSurge, 0x800),
+    TRAINER_SPRITE(LEADER_ERIKA, gTrainerFrontPic_LeaderErika, 0x800),
+    TRAINER_SPRITE(LEADER_KOGA, gTrainerFrontPic_LeaderKoga, 0x800),
+    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(CHAMPION_RIVAL, gTrainerFrontPic_ChampionRival, 0x800),
+    TRAINER_SPRITE(CHANNELER, gTrainerFrontPic_Channeler, 0x800),
+    TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, 0x800),
+    TRAINER_SPRITE(COOL_COUPLE, gTrainerFrontPic_CoolCouple, 0x800),
+    TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, 0x800),
+    TRAINER_SPRITE(CRUSH_KIN, gTrainerFrontPic_CrushKin, 0x800),
+    TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, 0x800),
+    TRAINER_SPRITE(PROFESSOR_OAK, gTrainerFrontPic_ProfessorOak, 0x800),
+    TRAINER_SPRITE(RS_BRENDAN_2, gTrainerFrontPic_RSBrendan2, 0x800),
+    TRAINER_SPRITE(RS_MAY_2, gTrainerFrontPic_RSMay2, 0x800),
+    TRAINER_SPRITE(RED, gTrainerFrontPic_Red, 0x800),
+    TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, 0x800),
+    TRAINER_SPRITE(ROCKET_GRUNT_F, gTrainerFrontPic_RocketGruntF, 0x800),
+    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_RANGER_M, gTrainerFrontPic_PokemonRangerM, 0x800),
+    TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, 0x800),
+    TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, 0x800),
+    TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, 0x800),
+    TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, 0x800),
+    TRAINER_SPRITE(PAINTER, gTrainerFrontPic_Painter, 0x800),
+};
+
+const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
+{
+    TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie),
+    TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM),
+    TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF),
+    TRAINER_PAL(RS_AROMA_LADY, gTrainerPalette_RSAromaLady),
+    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_COOLTRAINER_M, gTrainerPalette_RSCooltrainerM),
+    TRAINER_PAL(RS_COOLTRAINER_F, gTrainerPalette_RSCooltrainerF),
+    TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac),
+    TRAINER_PAL(RS_LADY, gTrainerPalette_RSLady),
+    TRAINER_PAL(RS_BEAUTY, gTrainerPalette_RSBeauty),
+    TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy),
+    TRAINER_PAL(RS_POKEMANIAC, gTrainerPalette_RSPokeManiac),
+    TRAINER_PAL(RS_SWIMMER_M, gTrainerPalette_RSSwimmerM),
+    TRAINER_PAL(RS_BLACK_BELT, gTrainerPalette_RSBlackBelt),
+    TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist),
+    TRAINER_PAL(KINDLER, gTrainerPalette_Kindler),
+    TRAINER_PAL(RS_CAMPER, gTrainerPalette_RSCamper),
+    TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac),
+    TRAINER_PAL(RS_PSYCHIC_M, gTrainerPalette_RSPsychicM),
+    TRAINER_PAL(RS_PSYCHIC_F, gTrainerPalette_RSPsychicF),
+    TRAINER_PAL(RS_GENTLEMAN, gTrainerPalette_RSGentleman),
+    TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney),
+    TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe),
+    TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne),
+    TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly),
+    TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza),
+    TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM),
+    TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF),
+    TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr),
+    TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM),
+    TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF),
+    TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM),
+    TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF),
+    TRAINER_PAL(RS_YOUNGSTER, gTrainerPalette_RSYoungster),
+    TRAINER_PAL(CHAMPION_STEVEN, gTrainerPalette_ChampionSteven),
+    TRAINER_PAL(RS_FISHERMAN, gTrainerPalette_RSFisherman),
+    TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM),
+    TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF),
+    TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM),
+    TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF),
+    TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM),
+    TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF),
+    TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer),
+    TRAINER_PAL(RS_BIRD_KEEPER, gTrainerPalette_RSBirdKeeper),
+    TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy),
+    TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl),
+    TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady),
+    TRAINER_PAL(RS_SWIMMER_F, gTrainerPalette_RSSwimmerF),
+    TRAINER_PAL(RS_PICNICKER, gTrainerPalette_RSPicnicker),
+    TRAINER_PAL(RS_TWINS, gTrainerPalette_RSTwins),
+    TRAINER_PAL(RS_SAILOR, gTrainerPalette_RSSailor),
+    TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector),
+    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_F, gTrainerPalette_RSPokemonBreederF),
+    TRAINER_PAL(RS_POKEMON_RANGER_M, gTrainerPalette_RSPokemonRangerM),
+    TRAINER_PAL(RS_POKEMON_RANGER_F, gTrainerPalette_RSPokemonRangerF),
+    TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie),
+    TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM),
+    TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF),
+    TRAINER_PAL(RS_LASS, gTrainerPalette_RSLass),
+    TRAINER_PAL(RS_BUG_CATCHER, gTrainerPalette_RSBugCatcher),
+    TRAINER_PAL(RS_HIKER, gTrainerPalette_RSHiker),
+    TRAINER_PAL(RS_YOUNG_COUPLE, gTrainerPalette_RSYoungCouple),
+    TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple),
+    TRAINER_PAL(RS_SIS_AND_BRO, gTrainerPalette_RSSisAndBro),
+    TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM),
+    TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF),
+    TRAINER_PAL(MAGMA_ADMIN_M, gTrainerPalette_MagmaAdminM),
+    TRAINER_PAL(MAGMA_ADMIN_F, gTrainerPalette_MagmaAdminF),
+    TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson),
+    TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery),
+    TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman),
+    TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona),
+    TRAINER_PAL(LEADER_WALLACE, gTrainerPalette_LeaderWallace),
+    TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia),
+    TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake),
+    TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster),
+    TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher),
+    TRAINER_PAL(LASS, gTrainerPalette_Lass),
+    TRAINER_PAL(SAILOR, gTrainerPalette_Sailor),
+    TRAINER_PAL(CAMPER, gTrainerPalette_Camper),
+    TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker),
+    TRAINER_PAL(POKEMANIAC, gTrainerPalette_PokeManiac),
+    TRAINER_PAL(SUPER_NERD, gTrainerPalette_SuperNerd),
+    TRAINER_PAL(HIKER, gTrainerPalette_Hiker),
+    TRAINER_PAL(BIKER, gTrainerPalette_Biker),
+    TRAINER_PAL(BURGLAR, gTrainerPalette_Burglar),
+    TRAINER_PAL(ENGINEER, gTrainerPalette_Engineer),
+    TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman),
+    TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM),
+    TRAINER_PAL(CUE_BALL, gTrainerPalette_CueBall),
+    TRAINER_PAL(GAMER, gTrainerPalette_Gamer),
+    TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty),
+    TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF),
+    TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM),
+    TRAINER_PAL(ROCKER, gTrainerPalette_Rocker),
+    TRAINER_PAL(JUGGLER, gTrainerPalette_Juggler),
+    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(SCIENTIST, gTrainerPalette_Scientist),
+    TRAINER_PAL(LEADER_GIOVANNI, gTrainerPalette_LeaderGiovanni),
+    TRAINER_PAL(ROCKET_GRUNT_M, gTrainerPalette_RocketGruntM),
+    TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CooltrainerM),
+    TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CooltrainerF),
+    TRAINER_PAL(ELITE_FOUR_LORELEI, gTrainerPalette_EliteFourLorelei),
+    TRAINER_PAL(ELITE_FOUR_BRUNO, gTrainerPalette_EliteFourBruno),
+    TRAINER_PAL(ELITE_FOUR_AGATHA, gTrainerPalette_EliteFourAgatha),
+    TRAINER_PAL(ELITE_FOUR_LANCE, gTrainerPalette_EliteFourLance),
+    TRAINER_PAL(LEADER_BROCK, gTrainerPalette_LeaderBrock),
+    TRAINER_PAL(LEADER_MISTY, gTrainerPalette_LeaderMisty),
+    TRAINER_PAL(LEADER_LT_SURGE, gTrainerPalette_LeaderLtSurge),
+    TRAINER_PAL(LEADER_ERIKA, gTrainerPalette_LeaderErika),
+    TRAINER_PAL(LEADER_KOGA, gTrainerPalette_LeaderKoga),
+    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(CHAMPION_RIVAL, gTrainerPalette_ChampionRival),
+    TRAINER_PAL(CHANNELER, gTrainerPalette_Channeler),
+    TRAINER_PAL(TWINS, gTrainerPalette_Twins),
+    TRAINER_PAL(COOL_COUPLE, gTrainerPalette_CoolCouple),
+    TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple),
+    TRAINER_PAL(CRUSH_KIN, gTrainerPalette_CrushKin),
+    TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro),
+    TRAINER_PAL(PROFESSOR_OAK, gTrainerPalette_ProfessorOak),
+    TRAINER_PAL(RS_BRENDAN_2, gTrainerPalette_RSBrendan2),
+    TRAINER_PAL(RS_MAY_2, gTrainerPalette_RSMay2),
+    TRAINER_PAL(RED, gTrainerPalette_Red),
+    TRAINER_PAL(LEAF, gTrainerPalette_Leaf),
+    TRAINER_PAL(ROCKET_GRUNT_F, gTrainerPalette_RocketGruntF),
+    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_RANGER_M, gTrainerPalette_PokemonRangerM),
+    TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF),
+    TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady),
+    TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac),
+    TRAINER_PAL(LADY, gTrainerPalette_Lady),
+    TRAINER_PAL(PAINTER, gTrainerPalette_Painter),
+};
diff --git a/src/pokemon.c b/src/pokemon.c
index 5433dd593..33413acab 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1527,7 +1527,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
         .paletteTag = 0,
         .oam = &gUnknown_824F018,
         .anims = NULL, 
-        .images = gTrainerBackPicTable_RubySapphireBrendan,
+        .images = gTrainerBackPicTable_RSBrendan,
         .affineAnims = gSpriteAffineAnimTable_82348C8,
         .callback = sub_80120C4,
     },
@@ -1536,7 +1536,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
         .paletteTag = 0,
         .oam = &gUnknown_824F018,
         .anims = NULL, 
-        .images = gTrainerBackPicTable_RubySapphireMay,
+        .images = gTrainerBackPicTable_RSMay,
         .affineAnims = gSpriteAffineAnimTable_82348C8,
         .callback = sub_80120C4,
     },