From c93c8aedbc118f8258d05d10e0aead55191e93b4 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Tue, 15 Oct 2019 20:37:48 -0700
Subject: [PATCH 1/8] Dump trainer front_pic_anims

---
 data/data.s                                 |   6 -
 src/data.c                                  |   2 +
 src/data/trainer_graphics/front_pic_anims.h | 891 ++++++++++++++++++++
 3 files changed, 893 insertions(+), 6 deletions(-)
 create mode 100644 src/data/trainer_graphics/front_pic_anims.h

diff --git a/data/data.s b/data/data.s
index 97800a72d..e8123863f 100644
--- a/data/data.s
+++ b/data/data.s
@@ -7,12 +7,6 @@
 
 	.section .rodata
 
-gUnknown_8238E8C:: @ 8238E8C
-	.incbin "baserom.gba", 0x238E8C, 0x250
-
-gTrainerFrontAnimsPtrTable:: @ 82390DC
-	.incbin "baserom.gba", 0x2390DC, 0x250
-
 gTrainerFrontPicCoords:: @ 823932C
 	.incbin "baserom.gba", 0x23932C, 0x250
 
diff --git a/src/data.c b/src/data.c
index 0f3c7ea67..d75f05b68 100644
--- a/src/data.c
+++ b/src/data.c
@@ -281,3 +281,5 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] =
 #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"
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..090c5b994
--- /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,
+};

From cb192791eb4def67ab50480a7ace9a89737ad324 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Tue, 15 Oct 2019 22:49:41 -0700
Subject: [PATCH 2/8] Dump gTrainerFrontPicCoords

---
 data/data.s                                  |   3 -
 include/data.h                               |  14 +-
 src/data.c                                   |   1 +
 src/data/trainer_graphics/front_pic_tables.h | 151 +++++++++++++++++++
 4 files changed, 158 insertions(+), 11 deletions(-)
 create mode 100644 src/data/trainer_graphics/front_pic_tables.h

diff --git a/data/data.s b/data/data.s
index e8123863f..97d3775fa 100644
--- a/data/data.s
+++ b/data/data.s
@@ -7,9 +7,6 @@
 
 	.section .rodata
 
-gTrainerFrontPicCoords:: @ 823932C
-	.incbin "baserom.gba", 0x23932C, 0x250
-
 gTrainerFrontPicTable:: @ 823957C
 	.incbin "baserom.gba", 0x23957C, 0x4A0
 
diff --git a/include/data.h b/include/data.h
index be34f64c2..9f1a10f47 100644
--- a/include/data.h
+++ b/include/data.h
@@ -14,9 +14,6 @@ struct MonCoords
     u8 y_offset;
 };
 
-extern struct MonCoords gTrainerBackPicCoords[];
-extern struct MonCoords gTrainerFrontPicCoords[];
-
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const u8 gMoveNames[][13];
 extern const u8 gAbilityNames[][13];
@@ -26,15 +23,19 @@ extern const u16 gUnknown_8251FEE[];
 extern const u16 gUnknown_8252324[];
 extern const u16 gUnknown_82539D4[];
 
+extern const struct MonCoords gMonFrontPicCoords[];
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
+extern const struct MonCoords gMonBackPicCoords[];
 extern const struct CompressedSpriteSheet gMonBackPicTable[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
+extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
+extern const struct MonCoords gTrainerFrontPicCoords[];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
+extern const struct MonCoords gTrainerBackPicCoords[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-extern const struct MonCoords gMonFrontPicCoords[];
-extern const struct MonCoords gMonBackPicCoords[];
 
 extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
 extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
@@ -44,9 +45,6 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES];
 extern const u8 *const gBattleAnims_General[];
 extern const u8 *const gBattleAnims_Special[];
 
-extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
-extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
-
 extern const struct OamData gUnknown_824F010;
 extern const struct OamData gUnknown_824F018;
 extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
diff --git a/src/data.c b/src/data.c
index d75f05b68..861bd57ec 100644
--- a/src/data.c
+++ b/src/data.c
@@ -283,3 +283,4 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] =
 #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_tables.h b/src/data/trainer_graphics/front_pic_tables.h
new file mode 100644
index 000000000..1a8f4e856
--- /dev/null
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -0,0 +1,151 @@
+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},
+};
\ No newline at end of file

From 29d7f1c73772c9340fb2bd380376a14404944b14 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Wed, 16 Oct 2019 00:04:07 -0700
Subject: [PATCH 3/8] Added TRAINER_PIC constants.

---
 include/constants/trainers.h | 149 +++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)

diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index 1aad499a1..a2392eda1 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -1,6 +1,155 @@
 #ifndef GUARD_TRAINERS_H
 #define GUARD_TRAINERS_H
 
+#define TRAINER_PIC_AQUA_LEADER_ARCHIE      0
+#define TRAINER_PIC_AQUA_GRUNT_M            1
+#define TRAINER_PIC_AQUA_GRUNT_F            2
+#define TRAINER_PIC_RS_AROMA_LADY           3
+#define TRAINER_PIC_RS_RUIN_MANIAC          4
+#define TRAINER_PIC_INTERVIEWER             5
+#define TRAINER_PIC_RS_TUBER_F              6
+#define TRAINER_PIC_TUBER_M                 7
+#define TRAINER_PIC_RS_COOLTRAINER_M        8
+#define TRAINER_PIC_RS_COOLTRAINER_F        9
+#define TRAINER_PIC_HEX_MANIAC             10
+#define TRAINER_PIC_RS_LADY                11
+#define TRAINER_PIC_RS_BEAUTY              12
+#define TRAINER_PIC_RICH_BOY               13
+#define TRAINER_PIC_RS_POKEMANIAC          14
+#define TRAINER_PIC_RS_SWIMMER_M           15
+#define TRAINER_PIC_RS_BLACK_BELT          16
+#define TRAINER_PIC_GUITARIST              17
+#define TRAINER_PIC_KINDLER                18
+#define TRAINER_PIC_RS_CAMPER              19
+#define TRAINER_PIC_BUG_MANIAC             20
+#define TRAINER_PIC_RS_PSYCHIC_M           21
+#define TRAINER_PIC_RS_PSYCHIC_F           22
+#define TRAINER_PIC_RS_GENTLEMAN           23
+#define TRAINER_PIC_ELITE_FOUR_SIDNEY      24
+#define TRAINER_PIC_ELITE_FOUR_PHOEBE      25
+#define TRAINER_PIC_LEADER_ROXANNE         26
+#define TRAINER_PIC_LEADER_BRAWLY          27
+#define TRAINER_PIC_LEADER_TATE_AND_LIZA   28
+#define TRAINER_PIC_SCHOOL_KID_M           29
+#define TRAINER_PIC_SCHOOL_KID_F           30
+#define TRAINER_PIC_SR_AND_JR              31
+#define TRAINER_PIC_POKEFAN_M              32
+#define TRAINER_PIC_POKEFAN_F              33
+#define TRAINER_PIC_EXPERT_M               34
+#define TRAINER_PIC_EXPERT_F               35
+#define TRAINER_PIC_RS_YOUNGSTER           36
+#define TRAINER_PIC_CHAMPION_STEVEN        37
+#define TRAINER_PIC_RS_FISHERMAN           38
+#define TRAINER_PIC_CYCLING_TRIATHLETE_M   39
+#define TRAINER_PIC_CYCLING_TRIATHLETE_F   40
+#define TRAINER_PIC_RUNNING_TRIATHLETE_M   41
+#define TRAINER_PIC_RUNNING_TRIATHLETE_F   42
+#define TRAINER_PIC_SWIMMING_TRIATHLETE_M  43
+#define TRAINER_PIC_SWIMMING_TRIATHLETE_F  44
+#define TRAINER_PIC_DRAGON_TAMER           45
+#define TRAINER_PIC_RS_BIRD_KEEPER         46
+#define TRAINER_PIC_NINJA_BOY              47
+#define TRAINER_PIC_BATTLE_GIRL            48
+#define TRAINER_PIC_PARASOL_LADY           49
+#define TRAINER_PIC_RS_SWIMMER_F           50
+#define TRAINER_PIC_RS_PICNICKER           51
+#define TRAINER_PIC_RS_TWINS               52
+#define TRAINER_PIC_RS_SAILOR              53
+#define TRAINER_PIC_COLLECTOR              54
+#define TRAINER_PIC_WALLY                  55
+#define TRAINER_PIC_RS_BRENDAN_1           56
+#define TRAINER_PIC_RS_MAY_1               57
+#define TRAINER_PIC_RS_POKEMON_BREEDER_M   58
+#define TRAINER_PIC_RS_POKEMON_BREEDER_F   59
+#define TRAINER_PIC_RS_POKEMON_RANGER_M    60
+#define TRAINER_PIC_RS_POKEMON_RANGER_F    61
+#define TRAINER_PIC_MAGMA_LEADER_MAXIE     62
+#define TRAINER_PIC_MAGMA_GRUNT_M          63
+#define TRAINER_PIC_MAGMA_GRUNT_F          64
+#define TRAINER_PIC_RS_LASS                65
+#define TRAINER_PIC_RS_BUG_CATCHER         66
+#define TRAINER_PIC_RS_HIKER               67
+#define TRAINER_PIC_RS_YOUNG_COUPLE        68
+#define TRAINER_PIC_OLD_COUPLE             69
+#define TRAINER_PIC_RS_SIS_AND_BRO         70
+#define TRAINER_PIC_AQUA_ADMIN_M           71
+#define TRAINER_PIC_AQUA_ADMIN_F           72
+#define TRAINER_PIC_MAGMA_ADMIN_M          73
+#define TRAINER_PIC_MAGMA_ADMIN_F          74
+#define TRAINER_PIC_LEADER_WATTSON         75
+#define TRAINER_PIC_LEADER_FLANNERY        76
+#define TRAINER_PIC_LEADER_NORMAN          77
+#define TRAINER_PIC_LEADER_WINONA          78
+#define TRAINER_PIC_LEADER_WALLACE         79
+#define TRAINER_PIC_ELITE_FOUR_GLACIA      80
+#define TRAINER_PIC_ELITE_FOUR_DRAKE       81
+#define TRAINER_PIC_YOUNGSTER              82
+#define TRAINER_PIC_BUG_CATCHER            83
+#define TRAINER_PIC_LASS                   84
+#define TRAINER_PIC_SAILOR                 85
+#define TRAINER_PIC_CAMPER                 86
+#define TRAINER_PIC_PICNICKER              87
+#define TRAINER_PIC_POKEMANIAC             88
+#define TRAINER_PIC_SUPER_NERD             89
+#define TRAINER_PIC_HIKER                  90
+#define TRAINER_PIC_BIKER                  91
+#define TRAINER_PIC_BURGLAR                92
+#define TRAINER_PIC_ENGINEER               93
+#define TRAINER_PIC_FISHERMAN              94
+#define TRAINER_PIC_SWIMMER_M              95
+#define TRAINER_PIC_CUE_BALL               96
+#define TRAINER_PIC_GAMER                  97
+#define TRAINER_PIC_BEAUTY                 98
+#define TRAINER_PIC_SWIMMER_F              99
+#define TRAINER_PIC_PSYCHIC_M             100
+#define TRAINER_PIC_ROCKER                101
+#define TRAINER_PIC_JUGGLER               102
+#define TRAINER_PIC_TAMER                 103
+#define TRAINER_PIC_BIRD_KEEPER           104
+#define TRAINER_PIC_BLACK_BELT            105
+#define TRAINER_PIC_RIVAL_1               106
+#define TRAINER_PIC_SCIENTIST             107
+#define TRAINER_PIC_LEADER_GIOVANNI       108
+#define TRAINER_PIC_ROCKET_GRUNT_M        109
+#define TRAINER_PIC_COOLTRAINER_M         110
+#define TRAINER_PIC_COOLTRAINER_F         111
+#define TRAINER_PIC_ELITE_FOUR_LORELEI    112
+#define TRAINER_PIC_ELITE_FOUR_BRUNO      113
+#define TRAINER_PIC_ELITE_FOUR_AGATHA     114
+#define TRAINER_PIC_ELITE_FOUR_LANCE      115
+#define TRAINER_PIC_LEADER_BROCK          116
+#define TRAINER_PIC_LEADER_MISTY          117
+#define TRAINER_PIC_LEADER_LT_SURGE       118
+#define TRAINER_PIC_LEADER_ERIKA          119
+#define TRAINER_PIC_LEADER_KOGA           120
+#define TRAINER_PIC_LEADER_BLAINE         121
+#define TRAINER_PIC_LEADER_SABRINA        122
+#define TRAINER_PIC_GENTLEMAN             123
+#define TRAINER_PIC_RIVAL_2               124
+#define TRAINER_PIC_CHAMPION_RIVAL        125
+#define TRAINER_PIC_CHANNELER             126
+#define TRAINER_PIC_TWINS                 127
+#define TRAINER_PIC_COOL_COUPLE           128
+#define TRAINER_PIC_YOUNG_COUPLE          129
+#define TRAINER_PIC_CRUSH_KIN             130
+#define TRAINER_PIC_SIS_AND_BRO           131
+#define TRAINER_PIC_PROFESSOR_OAK         132
+#define TRAINER_PIC_RS_BRENDAN_2          133
+#define TRAINER_PIC_RS_MAY_2              134
+#define TRAINER_PIC_RED                   135
+#define TRAINER_PIC_LEAF                  136
+#define TRAINER_PIC_ROCKET_GRUNT_F        137
+#define TRAINER_PIC_PSYCHIC_F             138
+#define TRAINER_PIC_CRUSH_GIRL            139
+#define TRAINER_PIC_TUBER_F               140
+#define TRAINER_PIC_POKEMON_BREEDER_F     141
+#define TRAINER_PIC_POKEMON_RANGER_M      142
+#define TRAINER_PIC_POKEMON_RANGER_F      143
+#define TRAINER_PIC_AROMA_LADY            144
+#define TRAINER_PIC_RUIN_MANIAC           145
+#define TRAINER_PIC_LADY                  146
+#define TRAINER_PIC_PAINTER               147
+
 #define F_TRAINER_FEMALE (1 << 7)
 
 // All trainer parties specify the IV, level, and species for each Pokémon in the

From 5f6672ee078d878fd089ed0d5925d46ee21511db Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Wed, 16 Oct 2019 22:52:41 -0700
Subject: [PATCH 4/8] Rename trainer front pics and palettes.

---
 data/graphics.s                               | 780 +++++++++---------
 .../arena_tycoon_greta_front_pic.png          | Bin 702 -> 0 bytes
 .../trainers/front_pics/brendan_front_pic.png | Bin 698 -> 0 bytes
 ...t_pic.png => champion_rival_front_pic.png} | Bin
 ..._pic.png => champion_steven_front_pic.png} | Bin
 .../front_pics/champion_wallace_front_pic.png | Bin 978 -> 0 bytes
 ...k_front_pic.png => cue_ball_front_pic.png} | Bin
 .../front_pics/dome_ace_tucker_front_pic.png  | Bin 906 -> 0 bytes
 .../factory_head_noland_front_pic.png         | Bin 736 -> 0 bytes
 ..._pic.png => leader_giovanni_front_pic.png} | Bin
 .../front_pics/leader_juan_front_pic.png      | Bin 820 -> 0 bytes
 ...t_pic.png => leader_wallace_front_pic.png} | Bin
 ...nt_pic.png => magma_admin_f_front_pic.png} | Bin
 ...nt_pic.png => magma_admin_m_front_pic.png} | Bin
 .../trainers/front_pics/may_front_pic.png     | Bin 689 -> 0 bytes
 .../palace_maven_spenser_front_pic.png        | Bin 802 -> 0 bytes
 .../front_pics/pike_queen_lucy_front_pic.png  | Bin 678 -> 0 bytes
 ..._front_pic.png => pokefan_f_front_pic.png} | Bin
 ..._front_pic.png => pokefan_m_front_pic.png} | Bin
 ...ic.png => pokemon_breeder_f_front_pic.png} | Bin
 ...ic.png => pokemon_breeder_m_front_pic.png} | Bin
 ...nt_pic.png => professor_oak_front_pic.png} | Bin
 .../pyramid_king_brandon_front_pic.png        | Bin 721 -> 0 bytes
 ..._1_front_pic.png => rival_1_front_pic.png} | Bin
 ..._2_front_pic.png => rival_2_front_pic.png} | Bin
 ...nt_pic.png => rs_aroma_lady_front_pic.png} | Bin
 ..._front_pic.png => rs_beauty_front_pic.png} | Bin
 ...t_pic.png => rs_bird_keeper_front_pic.png} | Bin
 ...nt_pic.png => rs_black_belt_front_pic.png} | Bin
 ...t_pic.png => rs_bug_catcher_front_pic.png} | Bin
 ..._front_pic.png => rs_camper_front_pic.png} | Bin
 ...ic.png => rs_cool_trainer_f_front_pic.png} | Bin
 ...ic.png => rs_cool_trainer_m_front_pic.png} | Bin
 ...ont_pic.png => rs_fisherman_front_pic.png} | Bin
 ...ont_pic.png => rs_gentleman_front_pic.png} | Bin
 ...r_front_pic.png => rs_hiker_front_pic.png} | Bin
 ...dy_front_pic.png => rs_lady_front_pic.png} | Bin
 ...ss_front_pic.png => rs_lass_front_pic.png} | Bin
 ...ont_pic.png => rs_picnicker_front_pic.png} | Bin
 ...nt_pic.png => rs_pokemaniac_front_pic.png} | Bin
 ...png => rs_pokemon_breeder_f_front_pic.png} | Bin
 ....png => rs_pokemon_ranger_f_front_pic.png} | Bin
 ....png => rs_pokemon_ranger_m_front_pic.png} | Bin
 ...ont_pic.png => rs_psychic_f_front_pic.png} | Bin
 ...ont_pic.png => rs_psychic_m_front_pic.png} | Bin
 ...t_pic.png => rs_ruin_maniac_front_pic.png} | Bin
 ..._front_pic.png => rs_sailor_front_pic.png} | Bin
 ...t_pic.png => rs_sis_and_bro_front_pic.png} | Bin
 ...ont_pic.png => rs_swimmer_f_front_pic.png} | Bin
 ...ont_pic.png => rs_swimmer_m_front_pic.png} | Bin
 ...front_pic.png => rs_tuber_f_front_pic.png} | Bin
 ...s_front_pic.png => rs_twins_front_pic.png} | Bin
 ..._pic.png => rs_young_couple_front_pic.png} | Bin
 ...ont_pic.png => rs_youngster_front_pic.png} | Bin
 .../salon_maiden_anabel_front_pic.png         | Bin 667 -> 0 bytes
 ...er_front_pic.png => tuber_f_front_pic.png} | Bin
 ..._m_front_pic.png => tuber_m_front_pic.png} | Bin
 .../trainers/palettes/arena_tycoon_greta.pal  |  19 -
 graphics/trainers/palettes/brendan.pal        |  19 -
 .../{blue_1.pal => champion_rival.pal}        |   0
 .../{steven.pal => champion_steven.pal}       |   0
 .../palettes/{roughneck.pal => cue_ball.pal}  |   0
 .../trainers/palettes/dome_ace_tucker.pal     |  19 -
 .../palettes/emerald_leaf_back_pic.pal        |  19 -
 .../palettes/emerald_red_back_pic.pal         |  19 -
 .../trainers/palettes/factory_head_noland.pal |  19 -
 .../{giovanni.pal => leader_giovanni.pal}     |   0
 graphics/trainers/palettes/leader_juan.pal    |  19 -
 ...hampion_wallace.pal => leader_wallace.pal} |   0
 .../{magma_admin.pal => magma_admin_f.pal}    |   0
 ...by_magma_admin_f.pal => magma_admin_m.pal} |   0
 graphics/trainers/palettes/may.pal            |  19 -
 .../palettes/palace_maven_spenser.pal         |  19 -
 .../trainers/palettes/pike_queen_lucy.pal     |  19 -
 .../{winstrate_f.pal => pokefan_f.pal}        |   0
 .../{winstrate_m.pal => pokefan_m.pal}        |   0
 ...emon_breeder.pal => pokemon_breeder_f.pal} |   0
 ...on_breeder_m.pal => pokemon_breeder_m.pal} |   0
 .../palettes/{oak.pal => professor_oak.pal}   |   0
 .../palettes/pyramid_king_brandon.pal         |  19 -
 .../palettes/{blue_2.pal => rival_1.pal}      |   0
 .../{champion_blue.pal => rival_2.pal}        |   0
 ...erald_aroma_lady.pal => rs_aroma_lady.pal} |   0
 .../{emerald_beauty.pal => rs_beauty.pal}     |   0
 ...ald_bird_keeper.pal => rs_bird_keeper.pal} |   0
 ...erald_black_belt.pal => rs_black_belt.pal} |   0
 ...ald_bug_catcher.pal => rs_bug_catcher.pal} |   0
 .../{emerald_camper.pal => rs_camper.pal}     |   0
 ...ol_trainer_f.pal => rs_cool_trainer_f.pal} |   0
 ...ol_trainer_m.pal => rs_cool_trainer_m.pal} |   0
 ...emerald_fisherman.pal => rs_fisherman.pal} |   0
 ...emerald_gentleman.pal => rs_gentleman.pal} |   0
 .../{emerald_hiker.pal => rs_hiker.pal}       |   0
 .../{emerald_lady.pal => rs_lady.pal}         |   0
 .../{emerald_lass.pal => rs_lass.pal}         |   0
 ...emerald_picnicker.pal => rs_picnicker.pal} |   0
 ...erald_pokemaniac.pal => rs_pokemaniac.pal} |   0
 ...breeder_f.pal => rs_pokemon_breeder_f.pal} |   0
 ...n_ranger_f.pal => rs_pokemon_ranger_f.pal} |   0
 ...n_ranger_m.pal => rs_pokemon_ranger_m.pal} |   0
 ...emerald_psychic_f.pal => rs_psychic_f.pal} |   0
 ...emerald_psychic_m.pal => rs_psychic_m.pal} |   0
 ...ald_ruin_maniac.pal => rs_ruin_maniac.pal} |   0
 .../{emerald_sailor.pal => rs_sailor.pal}     |   0
 ...ald_sis_and_bro.pal => rs_sis_and_bro.pal} |   0
 ...emerald_swimmer_f.pal => rs_swimmer_f.pal} |   0
 ...emerald_swimmer_m.pal => rs_swimmer_m.pal} |   0
 .../{emerald_tuber_f.pal => rs_tuber_f.pal}   |   0
 .../{emerald_twins.pal => rs_twins.pal}       |   0
 ...d_young_couple.pal => rs_young_couple.pal} |   0
 ...emerald_youngster.pal => rs_youngster.pal} |   0
 .../trainers/palettes/salon_maiden_anabel.pal |  19 -
 .../palettes/{tuber.pal => tuber_f.pal}       |   0
 .../{emerald_tuber_m.pal => tuber_m.pal}      |   0
 include/constants/trainers.h                  |   2 +-
 include/data.h                                |   4 +-
 include/graphics.h                            |   4 +-
 src/data.c                                    |  20 +-
 src/pokemon.c                                 |   4 +-
 119 files changed, 407 insertions(+), 635 deletions(-)
 delete mode 100644 graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png
 delete mode 100644 graphics/trainers/front_pics/brendan_front_pic.png
 rename graphics/trainers/front_pics/{champion_blue_front_pic.png => champion_rival_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{steven_front_pic.png => champion_steven_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/front_pics/champion_wallace_front_pic.png
 rename graphics/trainers/front_pics/{roughneck_front_pic.png => cue_ball_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/front_pics/dome_ace_tucker_front_pic.png
 delete mode 100644 graphics/trainers/front_pics/factory_head_noland_front_pic.png
 rename graphics/trainers/front_pics/{giovanni_front_pic.png => leader_giovanni_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/front_pics/leader_juan_front_pic.png
 rename graphics/trainers/front_pics/{ruby_sapphire_champion_wallace_front_pic.png => leader_wallace_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{ruby_magma_admin_f_front_pic.png => magma_admin_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{magma_admin_front_pic.png => magma_admin_m_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/front_pics/may_front_pic.png
 delete mode 100644 graphics/trainers/front_pics/palace_maven_spenser_front_pic.png
 delete mode 100644 graphics/trainers/front_pics/pike_queen_lucy_front_pic.png
 rename graphics/trainers/front_pics/{winstrate_f_front_pic.png => pokefan_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{winstrate_m_front_pic.png => pokefan_m_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{pokemon_breeder_front_pic.png => pokemon_breeder_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_pokemon_breeder_m_front_pic.png => pokemon_breeder_m_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{oak_front_pic.png => professor_oak_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png
 rename graphics/trainers/front_pics/{blue_1_front_pic.png => rival_1_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{blue_2_front_pic.png => rival_2_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_aroma_lady_front_pic.png => rs_aroma_lady_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_beauty_front_pic.png => rs_beauty_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_bird_keeper_front_pic.png => rs_bird_keeper_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_black_belt_front_pic.png => rs_black_belt_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_bug_catcher_front_pic.png => rs_bug_catcher_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_camper_front_pic.png => rs_camper_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_cool_trainer_f_front_pic.png => rs_cool_trainer_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_cool_trainer_m_front_pic.png => rs_cool_trainer_m_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_fisherman_front_pic.png => rs_fisherman_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_gentleman_front_pic.png => rs_gentleman_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_hiker_front_pic.png => rs_hiker_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_lady_front_pic.png => rs_lady_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_lass_front_pic.png => rs_lass_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_picnicker_front_pic.png => rs_picnicker_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_pokemaniac_front_pic.png => rs_pokemaniac_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_pokemon_breeder_f_front_pic.png => rs_pokemon_breeder_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_pokemon_ranger_f_front_pic.png => rs_pokemon_ranger_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_pokemon_ranger_m_front_pic.png => rs_pokemon_ranger_m_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_psychic_f_front_pic.png => rs_psychic_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_psychic_m_front_pic.png => rs_psychic_m_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_ruin_maniac_front_pic.png => rs_ruin_maniac_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_sailor_front_pic.png => rs_sailor_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_sis_and_bro_front_pic.png => rs_sis_and_bro_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_swimmer_f_front_pic.png => rs_swimmer_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_swimmer_m_front_pic.png => rs_swimmer_m_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_tuber_f_front_pic.png => rs_tuber_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_twins_front_pic.png => rs_twins_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_young_couple_front_pic.png => rs_young_couple_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_youngster_front_pic.png => rs_youngster_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png
 rename graphics/trainers/front_pics/{tuber_front_pic.png => tuber_f_front_pic.png} (100%)
 rename graphics/trainers/front_pics/{emerald_tuber_m_front_pic.png => tuber_m_front_pic.png} (100%)
 delete mode 100644 graphics/trainers/palettes/arena_tycoon_greta.pal
 delete mode 100644 graphics/trainers/palettes/brendan.pal
 rename graphics/trainers/palettes/{blue_1.pal => champion_rival.pal} (100%)
 rename graphics/trainers/palettes/{steven.pal => champion_steven.pal} (100%)
 rename graphics/trainers/palettes/{roughneck.pal => cue_ball.pal} (100%)
 delete mode 100644 graphics/trainers/palettes/dome_ace_tucker.pal
 delete mode 100644 graphics/trainers/palettes/emerald_leaf_back_pic.pal
 delete mode 100644 graphics/trainers/palettes/emerald_red_back_pic.pal
 delete mode 100644 graphics/trainers/palettes/factory_head_noland.pal
 rename graphics/trainers/palettes/{giovanni.pal => leader_giovanni.pal} (100%)
 delete mode 100644 graphics/trainers/palettes/leader_juan.pal
 rename graphics/trainers/palettes/{champion_wallace.pal => leader_wallace.pal} (100%)
 rename graphics/trainers/palettes/{magma_admin.pal => magma_admin_f.pal} (100%)
 rename graphics/trainers/palettes/{ruby_magma_admin_f.pal => magma_admin_m.pal} (100%)
 delete mode 100644 graphics/trainers/palettes/may.pal
 delete mode 100644 graphics/trainers/palettes/palace_maven_spenser.pal
 delete mode 100644 graphics/trainers/palettes/pike_queen_lucy.pal
 rename graphics/trainers/palettes/{winstrate_f.pal => pokefan_f.pal} (100%)
 rename graphics/trainers/palettes/{winstrate_m.pal => pokefan_m.pal} (100%)
 rename graphics/trainers/palettes/{pokemon_breeder.pal => pokemon_breeder_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_pokemon_breeder_m.pal => pokemon_breeder_m.pal} (100%)
 rename graphics/trainers/palettes/{oak.pal => professor_oak.pal} (100%)
 delete mode 100644 graphics/trainers/palettes/pyramid_king_brandon.pal
 rename graphics/trainers/palettes/{blue_2.pal => rival_1.pal} (100%)
 rename graphics/trainers/palettes/{champion_blue.pal => rival_2.pal} (100%)
 rename graphics/trainers/palettes/{emerald_aroma_lady.pal => rs_aroma_lady.pal} (100%)
 rename graphics/trainers/palettes/{emerald_beauty.pal => rs_beauty.pal} (100%)
 rename graphics/trainers/palettes/{emerald_bird_keeper.pal => rs_bird_keeper.pal} (100%)
 rename graphics/trainers/palettes/{emerald_black_belt.pal => rs_black_belt.pal} (100%)
 rename graphics/trainers/palettes/{emerald_bug_catcher.pal => rs_bug_catcher.pal} (100%)
 rename graphics/trainers/palettes/{emerald_camper.pal => rs_camper.pal} (100%)
 rename graphics/trainers/palettes/{emerald_cool_trainer_f.pal => rs_cool_trainer_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_cool_trainer_m.pal => rs_cool_trainer_m.pal} (100%)
 rename graphics/trainers/palettes/{emerald_fisherman.pal => rs_fisherman.pal} (100%)
 rename graphics/trainers/palettes/{emerald_gentleman.pal => rs_gentleman.pal} (100%)
 rename graphics/trainers/palettes/{emerald_hiker.pal => rs_hiker.pal} (100%)
 rename graphics/trainers/palettes/{emerald_lady.pal => rs_lady.pal} (100%)
 rename graphics/trainers/palettes/{emerald_lass.pal => rs_lass.pal} (100%)
 rename graphics/trainers/palettes/{emerald_picnicker.pal => rs_picnicker.pal} (100%)
 rename graphics/trainers/palettes/{emerald_pokemaniac.pal => rs_pokemaniac.pal} (100%)
 rename graphics/trainers/palettes/{emerald_pokemon_breeder_f.pal => rs_pokemon_breeder_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_pokemon_ranger_f.pal => rs_pokemon_ranger_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_pokemon_ranger_m.pal => rs_pokemon_ranger_m.pal} (100%)
 rename graphics/trainers/palettes/{emerald_psychic_f.pal => rs_psychic_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_psychic_m.pal => rs_psychic_m.pal} (100%)
 rename graphics/trainers/palettes/{emerald_ruin_maniac.pal => rs_ruin_maniac.pal} (100%)
 rename graphics/trainers/palettes/{emerald_sailor.pal => rs_sailor.pal} (100%)
 rename graphics/trainers/palettes/{emerald_sis_and_bro.pal => rs_sis_and_bro.pal} (100%)
 rename graphics/trainers/palettes/{emerald_swimmer_f.pal => rs_swimmer_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_swimmer_m.pal => rs_swimmer_m.pal} (100%)
 rename graphics/trainers/palettes/{emerald_tuber_f.pal => rs_tuber_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_twins.pal => rs_twins.pal} (100%)
 rename graphics/trainers/palettes/{emerald_young_couple.pal => rs_young_couple.pal} (100%)
 rename graphics/trainers/palettes/{emerald_youngster.pal => rs_youngster.pal} (100%)
 delete mode 100644 graphics/trainers/palettes/salon_maiden_anabel.pal
 rename graphics/trainers/palettes/{tuber.pal => tuber_f.pal} (100%)
 rename graphics/trainers/palettes/{emerald_tuber_m.pal => tuber_m.pal} (100%)

diff --git a/data/graphics.s b/data/graphics.s
index db441a1f6..3df819968 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -12212,1187 +12212,1187 @@ gMonIcon_UnownQuestionMark:: @ 8E48958
 	.incbin "graphics/pokemon/unown/question_mark/icon.4bpp"
 
 	.align 2
-gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58
+gTrainerFrontPic_AquaLeaderArchie:: @ 8E48D58
 	.incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_aqua_leader_archie:: @ 8E49094
+gTrainerPalette_AquaLeaderArchie:: @ 8E49094
 	.incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_aqua_grunt_m_front_pic:: @ 8E490BC
+gTrainerFrontPic_AquaGruntM:: @ 8E490BC
 	.incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_aqua_grunt_m:: @ 8E4941C
+gTrainerPalette_AquaGruntM:: @ 8E4941C
 	.incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_aqua_grunt_f_front_pic:: @ 8E49444
+gTrainerFrontPic_AquaGruntF:: @ 8E49444
 	.incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_aqua_grunt_f:: @ 8E49780
+gTrainerPalette_AquaGruntF:: @ 8E49780
 	.incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_aroma_lady_front_pic:: @ 8E497A8
-	.incbin "graphics/trainers/front_pics/emerald_aroma_lady_front_pic.4bpp.lz"
+gTrainerFrontPic_RSAromaLady:: @ 8E497A8
+	.incbin "graphics/trainers/front_pics/rs_aroma_lady_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_aroma_lady:: @ 8E49A6C
-	.incbin "graphics/trainers/palettes/emerald_aroma_lady.gbapal.lz"
+gTrainerPalette_RSAromaLady:: @ 8E49A6C
+	.incbin "graphics/trainers/palettes/rs_aroma_lady.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_ruin_maniac_front_pic:: @ 8E49A94
-	.incbin "graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.4bpp.lz"
+gTrainerFrontPic_RSRuinManiac:: @ 8E49A94
+	.incbin "graphics/trainers/front_pics/rs_ruin_maniac_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_ruin_maniac:: @ 8E49E30
-	.incbin "graphics/trainers/palettes/emerald_ruin_maniac.gbapal.lz"
+gTrainerPalette_RSRuinManiac:: @ 8E49E30
+	.incbin "graphics/trainers/palettes/rs_ruin_maniac.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_interviewer_front_pic:: @ 8E49E58
+gTrainerFrontPic_Interviewer:: @ 8E49E58
 	.incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_interviewer:: @ 8E4A2FC
+gTrainerPalette_Interviewer:: @ 8E4A2FC
 	.incbin "graphics/trainers/palettes/interviewer.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_tuber_f_front_pic:: @ 8E4A324
-	.incbin "graphics/trainers/front_pics/emerald_tuber_f_front_pic.4bpp.lz"
+gTrainerFrontPic_RSTuberF:: @ 8E4A324
+	.incbin "graphics/trainers/front_pics/rs_tuber_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_tuber_f:: @ 8E4A5C8
-	.incbin "graphics/trainers/palettes/emerald_tuber_f.gbapal.lz"
+gTrainerPalette_RSTuberF:: @ 8E4A5C8
+	.incbin "graphics/trainers/palettes/rs_tuber_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_tuber_m_front_pic:: @ 8E4A5F0
-	.incbin "graphics/trainers/front_pics/emerald_tuber_m_front_pic.4bpp.lz"
+gTrainerFrontPic_TuberM:: @ 8E4A5F0
+	.incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_tuber_m:: @ 8E4A87C
-	.incbin "graphics/trainers/palettes/emerald_tuber_m.gbapal.lz"
+gTrainerPalette_TuberM:: @ 8E4A87C
+	.incbin "graphics/trainers/palettes/tuber_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_cool_trainer_m_front_pic:: @ 8E4A8A4
-	.incbin "graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.4bpp.lz"
+gTrainerFrontPic_RSCooltrainerM:: @ 8E4A8A4
+	.incbin "graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_cool_trainer_m:: @ 8E4AB8C
-	.incbin "graphics/trainers/palettes/emerald_cool_trainer_m.gbapal.lz"
+gTrainerPalette_RSCooltrainerM:: @ 8E4AB8C
+	.incbin "graphics/trainers/palettes/rs_cool_trainer_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_cool_trainer_f_front_pic:: @ 8E4ABB4
-	.incbin "graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.4bpp.lz"
+gTrainerFrontPic_RSCooltrainerF:: @ 8E4ABB4
+	.incbin "graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_cool_trainer_f:: @ 8E4AEC8
-	.incbin "graphics/trainers/palettes/emerald_cool_trainer_f.gbapal.lz"
+gTrainerPalette_RSCooltrainerF:: @ 8E4AEC8
+	.incbin "graphics/trainers/palettes/rs_cool_trainer_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_hex_maniac_front_pic:: @ 8E4AEF0
+gTrainerFrontPic_HexManiac:: @ 8E4AEF0
 	.incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_hex_maniac:: @ 8E4B25C
+gTrainerPalette_HexManiac:: @ 8E4B25C
 	.incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_lady_front_pic:: @ 8E4B284
-	.incbin "graphics/trainers/front_pics/emerald_lady_front_pic.4bpp.lz"
+gTrainerFrontPic_RSLady:: @ 8E4B284
+	.incbin "graphics/trainers/front_pics/rs_lady_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_lady:: @ 8E4B638
-	.incbin "graphics/trainers/palettes/emerald_lady.gbapal.lz"
+gTrainerPalette_RSLady:: @ 8E4B638
+	.incbin "graphics/trainers/palettes/rs_lady.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_beauty_front_pic:: @ 8E4B660
-	.incbin "graphics/trainers/front_pics/emerald_beauty_front_pic.4bpp.lz"
+gTrainerFrontPic_RSBeauty:: @ 8E4B660
+	.incbin "graphics/trainers/front_pics/rs_beauty_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_beauty:: @ 8E4B948
-	.incbin "graphics/trainers/palettes/emerald_beauty.gbapal.lz"
+gTrainerPalette_RSBeauty:: @ 8E4B948
+	.incbin "graphics/trainers/palettes/rs_beauty.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_rich_boy_front_pic:: @ 8E4B970
+gTrainerFrontPic_RichBoy:: @ 8E4B970
 	.incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_rich_boy:: @ 8E4BC24
+gTrainerPalette_RichBoy:: @ 8E4BC24
 	.incbin "graphics/trainers/palettes/rich_boy.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_pokemaniac_front_pic:: @ 8E4BC4C
-	.incbin "graphics/trainers/front_pics/emerald_pokemaniac_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPokeManiac:: @ 8E4BC4C
+	.incbin "graphics/trainers/front_pics/rs_pokemaniac_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_pokemaniac:: @ 8E4BFBC
-	.incbin "graphics/trainers/palettes/emerald_pokemaniac.gbapal.lz"
+gTrainerPalette_RSPokeManiac:: @ 8E4BFBC
+	.incbin "graphics/trainers/palettes/rs_pokemaniac.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_swimmer_m_front_pic:: @ 8E4BFE4
-	.incbin "graphics/trainers/front_pics/emerald_swimmer_m_front_pic.4bpp.lz"
+gTrainerFrontPic_RSSwimmerM:: @ 8E4BFE4
+	.incbin "graphics/trainers/front_pics/rs_swimmer_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_swimmer_m:: @ 8E4C2A4
-	.incbin "graphics/trainers/palettes/emerald_swimmer_m.gbapal.lz"
+gTrainerPalette_RSSwimmerM:: @ 8E4C2A4
+	.incbin "graphics/trainers/palettes/rs_swimmer_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_black_belt_front_pic:: @ 8E4C2CC
-	.incbin "graphics/trainers/front_pics/emerald_black_belt_front_pic.4bpp.lz"
+gTrainerFrontPic_RSBlackBelt:: @ 8E4C2CC
+	.incbin "graphics/trainers/front_pics/rs_black_belt_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_black_belt:: @ 8E4C630
-	.incbin "graphics/trainers/palettes/emerald_black_belt.gbapal.lz"
+gTrainerPalette_RSBlackBelt:: @ 8E4C630
+	.incbin "graphics/trainers/palettes/rs_black_belt.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_guitarist_front_pic:: @ 8E4C658
+gTrainerFrontPic_Guitarist:: @ 8E4C658
 	.incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_guitarist:: @ 8E4C9DC
+gTrainerPalette_Guitarist:: @ 8E4C9DC
 	.incbin "graphics/trainers/palettes/guitarist.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_kindler_front_pic:: @ 8E4CA04
+gTrainerFrontPic_Kindler:: @ 8E4CA04
 	.incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_kindler:: @ 8E4CD70
+gTrainerPalette_Kindler:: @ 8E4CD70
 	.incbin "graphics/trainers/palettes/kindler.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_camper_front_pic:: @ 8E4CD98
-	.incbin "graphics/trainers/front_pics/emerald_camper_front_pic.4bpp.lz"
+gTrainerFrontPic_RSCamper:: @ 8E4CD98
+	.incbin "graphics/trainers/front_pics/rs_camper_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_camper:: @ 8E4D080
-	.incbin "graphics/trainers/palettes/emerald_camper.gbapal.lz"
+gTrainerPalette_RSCamper:: @ 8E4D080
+	.incbin "graphics/trainers/palettes/rs_camper.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_bug_maniac_front_pic:: @ 8E4D0A8
+gTrainerFrontPic_BugManiac:: @ 8E4D0A8
 	.incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_bug_maniac:: @ 8E4D4F8
+gTrainerPalette_BugManiac:: @ 8E4D4F8
 	.incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_psychic_m_front_pic:: @ 8E4D520
-	.incbin "graphics/trainers/front_pics/emerald_psychic_m_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPsychicM:: @ 8E4D520
+	.incbin "graphics/trainers/front_pics/rs_psychic_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_psychic_m:: @ 8E4D84C
-	.incbin "graphics/trainers/palettes/emerald_psychic_m.gbapal.lz"
+gTrainerPalette_RSPsychicM:: @ 8E4D84C
+	.incbin "graphics/trainers/palettes/rs_psychic_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_psychic_f_front_pic:: @ 8E4D874
-	.incbin "graphics/trainers/front_pics/emerald_psychic_f_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPsychicF:: @ 8E4D874
+	.incbin "graphics/trainers/front_pics/rs_psychic_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_psychic_f:: @ 8E4DB9C
-	.incbin "graphics/trainers/palettes/emerald_psychic_f.gbapal.lz"
+gTrainerPalette_RSPsychicF:: @ 8E4DB9C
+	.incbin "graphics/trainers/palettes/rs_psychic_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_gentleman_front_pic:: @ 8E4DBC4
-	.incbin "graphics/trainers/front_pics/emerald_gentleman_front_pic.4bpp.lz"
+gTrainerFrontPic_RSGentleman:: @ 8E4DBC4
+	.incbin "graphics/trainers/front_pics/rs_gentleman_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_gentleman:: @ 8E4DEC4
-	.incbin "graphics/trainers/palettes/emerald_gentleman.gbapal.lz"
+gTrainerPalette_RSGentleman:: @ 8E4DEC4
+	.incbin "graphics/trainers/palettes/rs_gentleman.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_sidney_front_pic:: @ 8E4DEEC
+gTrainerFrontPic_EliteFourSidney:: @ 8E4DEEC
 	.incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_sidney:: @ 8E4E220
+gTrainerPalette_EliteFourSidney:: @ 8E4E220
 	.incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_phoebe_front_pic:: @ 8E4E248
+gTrainerFrontPic_EliteFourPhoebe:: @ 8E4E248
 	.incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_phoebe:: @ 8E4E548
+gTrainerPalette_EliteFourPhoebe:: @ 8E4E548
 	.incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_roxanne_front_pic:: @ 8E4E570
+gTrainerFrontPic_LeaderRoxanne:: @ 8E4E570
 	.incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_roxanne:: @ 8E4E85C
+gTrainerPalette_LeaderRoxanne:: @ 8E4E85C
 	.incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_brawly_front_pic:: @ 8E4E884
+gTrainerFrontPic_LeaderBrawly:: @ 8E4E884
 	.incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_brawly:: @ 8E4EC18
+gTrainerPalette_LeaderBrawly:: @ 8E4EC18
 	.incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_tate_and_liza_front_pic:: @ 8E4EC40
+gTrainerFrontPic_LeaderTateAndLiza:: @ 8E4EC40
 	.incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_tate_and_liza:: @ 8E4F084
+gTrainerPalette_LeaderTateAndLiza:: @ 8E4F084
 	.incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_school_kid_m_front_pic:: @ 8E4F0AC
+gTrainerFrontPic_SchoolKidM:: @ 8E4F0AC
 	.incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_school_kid_m:: @ 8E4F36C
+gTrainerPalette_SchoolKidM:: @ 8E4F36C
 	.incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_school_kid_f_front_pic:: @ 8E4F394
+gTrainerFrontPic_SchoolKidF:: @ 8E4F394
 	.incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_school_kid_f:: @ 8E4F630
+gTrainerPalette_SchoolKidF:: @ 8E4F630
 	.incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_sr_and_jr_front_pic:: @ 8E4F658
+gTrainerFrontPic_SrAndJr:: @ 8E4F658
 	.incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_sr_and_jr:: @ 8E4FAC8
+gTrainerPalette_SrAndJr:: @ 8E4FAC8
 	.incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_winstrate_m_front_pic:: @ 8E4FAF0
-	.incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"
+gTrainerFrontPic_PokefanM:: @ 8E4FAF0
+	.incbin "graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_winstrate_m:: @ 8E4FEAC
-	.incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz"
+gTrainerPalette_PokefanM:: @ 8E4FEAC
+	.incbin "graphics/trainers/palettes/pokefan_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_winstrate_f_front_pic:: @ 8E4FED4
-	.incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"
+gTrainerFrontPic_PokefanF:: @ 8E4FED4
+	.incbin "graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_winstrate_f:: @ 8E502A0
-	.incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz"
+gTrainerPalette_PokefanF:: @ 8E502A0
+	.incbin "graphics/trainers/palettes/pokefan_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_expert_m_front_pic:: @ 8E502C8
+gTrainerFrontPic_ExpertM:: @ 8E502C8
 	.incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_expert_m:: @ 8E50608
+gTrainerPalette_ExpertM:: @ 8E50608
 	.incbin "graphics/trainers/palettes/expert_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_expert_f_front_pic:: @ 8E50630
+gTrainerFrontPic_ExpertF:: @ 8E50630
 	.incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_expert_f:: @ 8E5094C
+gTrainerPalette_ExpertF:: @ 8E5094C
 	.incbin "graphics/trainers/palettes/expert_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_youngster_front_pic:: @ 8E50974
-	.incbin "graphics/trainers/front_pics/emerald_youngster_front_pic.4bpp.lz"
+gTrainerFrontPic_RSYoungster:: @ 8E50974
+	.incbin "graphics/trainers/front_pics/rs_youngster_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_youngster:: @ 8E50C1C
-	.incbin "graphics/trainers/palettes/emerald_youngster.gbapal.lz"
+gTrainerPalette_RSYoungster:: @ 8E50C1C
+	.incbin "graphics/trainers/palettes/rs_youngster.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_steven_front_pic:: @ 8E50C44
-	.incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz"
+gTrainerFrontPic_ChampionSteven:: @ 8E50C44
+	.incbin "graphics/trainers/front_pics/champion_steven_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_steven:: @ 8E50F7C
-	.incbin "graphics/trainers/palettes/steven.gbapal.lz"
+gTrainerPalette_ChampionSteven:: @ 8E50F7C
+	.incbin "graphics/trainers/palettes/champion_steven.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_fisherman_front_pic:: @ 8E50FA4
-	.incbin "graphics/trainers/front_pics/emerald_fisherman_front_pic.4bpp.lz"
+gTrainerFrontPic_RSFisherman:: @ 8E50FA4
+	.incbin "graphics/trainers/front_pics/rs_fisherman_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_fisherman:: @ 8E51388
-	.incbin "graphics/trainers/palettes/emerald_fisherman.gbapal.lz"
+gTrainerPalette_RSFisherman:: @ 8E51388
+	.incbin "graphics/trainers/palettes/rs_fisherman.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_cycling_triathlete_m_front_pic:: @ 8E513B0
+gTrainerFrontPic_CyclingTriathleteM:: @ 8E513B0
 	.incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_cycling_triathlete_m:: @ 8E517C0
+gTrainerPalette_CyclingTriathleteM:: @ 8E517C0
 	.incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_cycling_triathlete_f_front_pic:: @ 8E517E8
+gTrainerFrontPic_CyclingTriathleteF:: @ 8E517E8
 	.incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_cycling_triathlete_f:: @ 8E51BF4
+gTrainerPalette_CyclingTriathleteF:: @ 8E51BF4
 	.incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_running_triathlete_m_front_pic:: @ 8E51C1C
+gTrainerFrontPic_RunningTriathleteM:: @ 8E51C1C
 	.incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_running_triathlete_m:: @ 8E51ED4
+gTrainerPalette_RunningTriathleteM:: @ 8E51ED4
 	.incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_running_triathlete_f_front_pic:: @ 8E51EFC
+gTrainerFrontPic_RunningTriathleteF:: @ 8E51EFC
 	.incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_running_triathlete_f:: @ 8E521A0
+gTrainerPalette_RunningTriathleteF:: @ 8E521A0
 	.incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_swimming_triathlete_m_front_pic:: @ 8E521C8
+gTrainerFrontPic_SwimmingTriathleteM:: @ 8E521C8
 	.incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_swimming_triathlete_m:: @ 8E524F4
+gTrainerPalette_SwimmingTriathleteM:: @ 8E524F4
 	.incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_swimming_triathlete_f_front_pic:: @ 8E5251C
+gTrainerFrontPic_SwimmingTriathleteF:: @ 8E5251C
 	.incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_swimming_triathlete_f:: @ 8E527F8
+gTrainerPalette_SwimmingTriathleteF:: @ 8E527F8
 	.incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_dragon_tamer_front_pic:: @ 8E52820
+gTrainerFrontPic_DragonTamer:: @ 8E52820
 	.incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_dragon_tamer:: @ 8E52B74
+gTrainerPalette_DragonTamer:: @ 8E52B74
 	.incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_bird_keeper_front_pic:: @ 8E52B9C
-	.incbin "graphics/trainers/front_pics/emerald_bird_keeper_front_pic.4bpp.lz"
+gTrainerFrontPic_RSBirdKeeper:: @ 8E52B9C
+	.incbin "graphics/trainers/front_pics/rs_bird_keeper_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_bird_keeper:: @ 8E52ED4
-	.incbin "graphics/trainers/palettes/emerald_bird_keeper.gbapal.lz"
+gTrainerPalette_RSBirdKeeper:: @ 8E52ED4
+	.incbin "graphics/trainers/palettes/rs_bird_keeper.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ninja_boy_front_pic:: @ 8E52EFC
+gTrainerFrontPic_NinjaBoy:: @ 8E52EFC
 	.incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ninja_boy:: @ 8E531D8
+gTrainerPalette_NinjaBoy:: @ 8E531D8
 	.incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_battle_girl_front_pic:: @ 8E53200
+gTrainerFrontPic_BattleGirl:: @ 8E53200
 	.incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_battle_girl:: @ 8E53520
+gTrainerPalette_BattleGirl:: @ 8E53520
 	.incbin "graphics/trainers/palettes/battle_girl.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_parasol_lady_front_pic:: @ 8E53548
+gTrainerFrontPic_ParasolLady:: @ 8E53548
 	.incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_parasol_lady:: @ 8E53880
+gTrainerPalette_ParasolLady:: @ 8E53880
 	.incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_swimmer_f_front_pic:: @ 8E538A8
-	.incbin "graphics/trainers/front_pics/emerald_swimmer_f_front_pic.4bpp.lz"
+gTrainerFrontPic_RSSwimmerF:: @ 8E538A8
+	.incbin "graphics/trainers/front_pics/rs_swimmer_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_swimmer_f:: @ 8E53B78
-	.incbin "graphics/trainers/palettes/emerald_swimmer_f.gbapal.lz"
+gTrainerPalette_RSSwimmerF:: @ 8E53B78
+	.incbin "graphics/trainers/palettes/rs_swimmer_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_picnicker_front_pic:: @ 8E53BA0
-	.incbin "graphics/trainers/front_pics/emerald_picnicker_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPicnicker:: @ 8E53BA0
+	.incbin "graphics/trainers/front_pics/rs_picnicker_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_picnicker:: @ 8E53E80
-	.incbin "graphics/trainers/palettes/emerald_picnicker.gbapal.lz"
+gTrainerPalette_RSPicnicker:: @ 8E53E80
+	.incbin "graphics/trainers/palettes/rs_picnicker.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_twins_front_pic:: @ 8E53EA8
-	.incbin "graphics/trainers/front_pics/emerald_twins_front_pic.4bpp.lz"
+gTrainerFrontPic_RSTwins:: @ 8E53EA8
+	.incbin "graphics/trainers/front_pics/rs_twins_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_twins:: @ 8E5426C
-	.incbin "graphics/trainers/palettes/emerald_twins.gbapal.lz"
+gTrainerPalette_RSTwins:: @ 8E5426C
+	.incbin "graphics/trainers/palettes/rs_twins.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_sailor_front_pic:: @ 8E54294
-	.incbin "graphics/trainers/front_pics/emerald_sailor_front_pic.4bpp.lz"
+gTrainerFrontPic_RSSailor:: @ 8E54294
+	.incbin "graphics/trainers/front_pics/rs_sailor_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_sailor:: @ 8E54644
-	.incbin "graphics/trainers/palettes/emerald_sailor.gbapal.lz"
+gTrainerPalette_RSSailor:: @ 8E54644
+	.incbin "graphics/trainers/palettes/rs_sailor.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_collector_front_pic:: @ 8E5466C
+gTrainerFrontPic_Collector:: @ 8E5466C
 	.incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_collector:: @ 8E54A70
+gTrainerPalette_Collector:: @ 8E54A70
 	.incbin "graphics/trainers/palettes/collector.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_wally_front_pic:: @ 8E54A98
+gTrainerFrontPic_Wally:: @ 8E54A98
 	.incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_wally:: @ 8E54D68
+gTrainerPalette_Wally:: @ 8E54D68
 	.incbin "graphics/trainers/palettes/wally.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic:: @ 8E54D90
+gTrainerFrontPic_RSBrendan1:: @ 8E54D90
 	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ruby_sapphire_brendan:: @ 8E550A4
+gTrainerPalette_RSBrendan1:: @ 8E550A4
 	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic:: @ 8E550CC
+gTrainerFrontPic_RSMay1:: @ 8E550CC
 	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ruby_sapphire_may:: @ 8E553CC
+gTrainerPalette_RSMay1:: @ 8E553Cc
 	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_m_front_pic:: @ 8E553F4
-	.incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.4bpp.lz"
+gTrainerFrontPic_PokemonBreederM:: @ 8E553F4
+	.incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_pokemon_breeder_m:: @ 8E55724
-	.incbin "graphics/trainers/palettes/emerald_pokemon_breeder_m.gbapal.lz"
+gTrainerPalette_PokemonBreederM:: @ 8E55724
+	.incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_f_front_pic:: @ 8E5574C
-	.incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPokemonBreederF:: @ 8E5574C
+	.incbin "graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_pokemon_breeder_f:: @ 8E55A80
-	.incbin "graphics/trainers/palettes/emerald_pokemon_breeder_f.gbapal.lz"
+gTrainerPalette_RSPokemonBreederF:: @ 8E55A80
+	.incbin "graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_m_front_pic:: @ 8E55AA8
-	.incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPokemonRangerM:: @ 8E55AA8
+	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_pokemon_ranger_m:: @ 8E55DF0
-	.incbin "graphics/trainers/palettes/emerald_pokemon_ranger_m.gbapal.lz"
+gTrainerPalette_RSPokemonRangerM:: @ 8E55Df0
+	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_f_front_pic:: @ 8E55E18
-	.incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.4bpp.lz"
+gTrainerFrontPic_RSPokemonRangerF:: @ 8E55E18
+	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_pokemon_ranger_f:: @ 8E5614C
-	.incbin "graphics/trainers/palettes/emerald_pokemon_ranger_f.gbapal.lz"
+gTrainerPalette_RSPokemonRangerF:: @ 8E5614C
+	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_magma_leader_maxie_front_pic:: @ 8E56174
+gTrainerFrontPic_MagmaLeaderMaxie:: @ 8E56174
 	.incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_magma_leader_maxie:: @ 8E56468
+gTrainerPalette_MagmaLeaderMaxie:: @ 8E56468
 	.incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_magma_grunt_m_front_pic:: @ 8E56490
+gTrainerFrontPic_MagmaGruntM:: @ 8E56490
 	.incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_magma_grunt_m:: @ 8E56810
+gTrainerPalette_MagmaGruntM:: @ 8E56810
 	.incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_magma_grunt_f_front_pic:: @ 8E56838
+gTrainerFrontPic_MagmaGruntF:: @ 8E56838
 	.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_magma_grunt_f:: @ 8E56BC4
+gTrainerPalette_MagmaGruntF:: @ 8E56Bc4
 	.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_lass_front_pic:: @ 8E56BEC
-	.incbin "graphics/trainers/front_pics/emerald_lass_front_pic.4bpp.lz"
+gTrainerFrontPic_RSLass:: @ 8E56BEC
+	.incbin "graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_lass:: @ 8E56EC4
-	.incbin "graphics/trainers/palettes/emerald_lass.gbapal.lz"
+gTrainerPalette_RSLass:: @ 8E56Ec4
+	.incbin "graphics/trainers/palettes/rs_lass.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_bug_catcher_front_pic:: @ 8E56EEC
-	.incbin "graphics/trainers/front_pics/emerald_bug_catcher_front_pic.4bpp.lz"
+gTrainerFrontPic_RSBugCatcher:: @ 8E56EEC
+	.incbin "graphics/trainers/front_pics/rs_bug_catcher_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_bug_catcher:: @ 8E57218
-	.incbin "graphics/trainers/palettes/emerald_bug_catcher.gbapal.lz"
+gTrainerPalette_RSBugCatcher:: @ 8E57218
+	.incbin "graphics/trainers/palettes/rs_bug_catcher.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_hiker_front_pic:: @ 8E57240
-	.incbin "graphics/trainers/front_pics/emerald_hiker_front_pic.4bpp.lz"
+gTrainerFrontPic_RSHiker:: @ 8E57240
+	.incbin "graphics/trainers/front_pics/rs_hiker_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_hiker:: @ 8E576C0
-	.incbin "graphics/trainers/palettes/emerald_hiker.gbapal.lz"
+gTrainerPalette_RSHiker:: @ 8E576C0
+	.incbin "graphics/trainers/palettes/rs_hiker.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_young_couple_front_pic:: @ 8E576E8
-	.incbin "graphics/trainers/front_pics/emerald_young_couple_front_pic.4bpp.lz"
+gTrainerFrontPic_RSYoungCouple:: @ 8E576E8
+	.incbin "graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_young_couple:: @ 8E57AA8
-	.incbin "graphics/trainers/palettes/emerald_young_couple.gbapal.lz"
+gTrainerPalette_RSYoungCouple:: @ 8E57Aa8
+	.incbin "graphics/trainers/palettes/rs_young_couple.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_old_couple_front_pic:: @ 8E57AD0
+gTrainerFrontPic_OldCouple:: @ 8E57AD0
 	.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_old_couple:: @ 8E57FE0
+gTrainerPalette_OldCouple:: @ 8E57Fe0
 	.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_emerald_sis_and_bro_front_pic:: @ 8E58008
-	.incbin "graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.4bpp.lz"
+gTrainerFrontPic_RSSisAndBro:: @ 8E58008
+	.incbin "graphics/trainers/front_pics/rs_sis_and_bro_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_emerald_sis_and_bro:: @ 8E58454
-	.incbin "graphics/trainers/palettes/emerald_sis_and_bro.gbapal.lz"
+gTrainerPalette_RSSisAndBro:: @ 8E58454
+	.incbin "graphics/trainers/palettes/rs_sis_and_bro.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_aqua_admin_m_front_pic:: @ 8E5847C
+gTrainerFrontPic_AquaAdminM:: @ 8E5847C
 	.incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_aqua_admin_m:: @ 8E58830
+gTrainerPalette_AquaAdminM:: @ 8E58830
 	.incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_aqua_admin_f_front_pic:: @ 8E58858
+gTrainerFrontPic_AquaAdminF:: @ 8E58858
 	.incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_aqua_admin_f:: @ 8E58C1C
+gTrainerPalette_AquaAdminF:: @ 8E58C1C
 	.incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_magma_admin_front_pic:: @ 8E58C44
-	.incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz"
+gTrainerFrontPic_MagmaAdminM:: @ 8E58C44
+	.incbin "graphics/trainers/front_pics/magma_admin_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_magma_admin:: @ 8E5901C
-	.incbin "graphics/trainers/palettes/magma_admin.gbapal.lz"
+gTrainerPalette_MagmaAdminM:: @ 8E5901C
+	.incbin "graphics/trainers/palettes/magma_admin_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruby_magma_admin_f_front_pic:: @ 8E59044
-	.incbin "graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.4bpp.lz"
+gTrainerFrontPic_MagmaAdminF:: @ 8E59044
+	.incbin "graphics/trainers/front_pics/magma_admin_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ruby_magma_admin_f:: @ 8E593F4
-	.incbin "graphics/trainers/palettes/ruby_magma_admin_f.gbapal.lz"
+gTrainerPalette_MagmaAdminF:: @ 8E593F4
+	.incbin "graphics/trainers/palettes/magma_admin_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_wattson_front_pic:: @ 8E5941C
+gTrainerFrontPic_LeaderWattson:: @ 8E5941C
 	.incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_wattson:: @ 8E59764
+gTrainerPalette_LeaderWattson:: @ 8E59764
 	.incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_flannery_front_pic:: @ 8E5978C
+gTrainerFrontPic_LeaderFlannery:: @ 8E5978C
 	.incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_flannery:: @ 8E59B0C
+gTrainerPalette_LeaderFlannery:: @ 8E59B0C
 	.incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_norman_front_pic:: @ 8E59B34
+gTrainerFrontPic_LeaderNorman:: @ 8E59B34
 	.incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_norman:: @ 8E59E70
+gTrainerPalette_LeaderNorman:: @ 8E59E70
 	.incbin "graphics/trainers/palettes/leader_norman.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_winona_front_pic:: @ 8E59E98
+gTrainerFrontPic_LeaderWinona:: @ 8E59E98
 	.incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_winona:: @ 8E5A218
+gTrainerPalette_LeaderWinona:: @ 8E5A218
 	.incbin "graphics/trainers/palettes/leader_winona.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruby_sapphire_champion_wallace_front_pic:: @ 8E5A240
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.4bpp.lz"
+gTrainerFrontPic_LeaderWallace:: @ 8E5A240
+	.incbin "graphics/trainers/front_pics/leader_wallace_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_champion_wallace:: @ 8E5A5B8
-	.incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz"
+gTrainerPalette_LeaderWallace:: @ 8E5A5B8
+	.incbin "graphics/trainers/palettes/leader_wallace.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_glacia_front_pic:: @ 8E5A5E0
+gTrainerFrontPic_EliteFourGlacia:: @ 8E5A5E0
 	.incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_glacia:: @ 8E5A964
+gTrainerPalette_EliteFourGlacia:: @ 8E5A964
 	.incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_drake_front_pic:: @ 8E5A98C
+gTrainerFrontPic_EliteFourDrake:: @ 8E5A98C
 	.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_drake:: @ 8E5AD34
+gTrainerPalette_EliteFourDrake:: @ 8E5Ad34
 	.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_youngster_front_pic:: @ 8E5AD5C
+gTrainerFrontPic_Youngster:: @ 8E5AD5C
 	.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_youngster:: @ 8E5AFFC
+gTrainerPalette_Youngster:: @ 8E5Affc
 	.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_bug_catcher_front_pic:: @ 8E5B024
+gTrainerFrontPic_BugCatcher:: @ 8E5B024
 	.incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_bug_catcher:: @ 8E5B36C
+gTrainerPalette_BugCatcher:: @ 8E5B36C
 	.incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_lass_front_pic:: @ 8E5B394
+gTrainerFrontPic_Lass:: @ 8E5B394
 	.incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_lass:: @ 8E5B680
+gTrainerPalette_Lass:: @ 8E5B680
 	.incbin "graphics/trainers/palettes/lass.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_sailor_front_pic:: @ 8E5B6A8
+gTrainerFrontPic_Sailor:: @ 8E5B6A8
 	.incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_sailor:: @ 8E5B9C8
+gTrainerPalette_Sailor:: @ 8E5B9C8
 	.incbin "graphics/trainers/palettes/sailor.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_camper_front_pic:: @ 8E5B9F0
+gTrainerFrontPic_Camper:: @ 8E5B9F0
 	.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_camper:: @ 8E5BCD0
+gTrainerPalette_Camper:: @ 8E5Bcd0
 	.incbin "graphics/trainers/palettes/camper.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_picnicker_front_pic:: @ 8E5BCF8
+gTrainerFrontPic_Picnicker:: @ 8E5BCF8
 	.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_picnicker:: @ 8E5BFE0
+gTrainerPalette_Picnicker:: @ 8E5Bfe0
 	.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_pokemaniac_front_pic:: @ 8E5C008
+gTrainerFrontPic_PokeManiac:: @ 8E5C008
 	.incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_pokemaniac:: @ 8E5C3C4
+gTrainerPalette_PokeManiac:: @ 8E5C3C4
 	.incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_super_nerd_front_pic:: @ 8E5C3EC
+gTrainerFrontPic_SuperNerd:: @ 8E5C3EC
 	.incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_super_nerd:: @ 8E5C704
+gTrainerPalette_SuperNerd:: @ 8E5C704
 	.incbin "graphics/trainers/palettes/super_nerd.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_hiker_front_pic:: @ 8E5C72C
+gTrainerFrontPic_Hiker:: @ 8E5C72C
 	.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_hiker:: @ 8E5CB9C
+gTrainerPalette_Hiker:: @ 8E5Cb9C
 	.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_biker_front_pic:: @ 8E5CBC4
+gTrainerFrontPic_Biker:: @ 8E5CBC4
 	.incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_biker:: @ 8E5D12C
+gTrainerPalette_Biker:: @ 8E5D12C
 	.incbin "graphics/trainers/palettes/biker.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_burglar_front_pic:: @ 8E5D154
+gTrainerFrontPic_Burglar:: @ 8E5D154
 	.incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_burglar:: @ 8E5D4A0
+gTrainerPalette_Burglar:: @ 8E5D4A0
 	.incbin "graphics/trainers/palettes/burglar.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_engineer_front_pic:: @ 8E5D4C8
+gTrainerFrontPic_Engineer:: @ 8E5D4C8
 	.incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_engineer:: @ 8E5D8D4
+gTrainerPalette_Engineer:: @ 8E5D8D4
 	.incbin "graphics/trainers/palettes/engineer.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_fisherman_front_pic:: @ 8E5D8FC
+gTrainerFrontPic_Fisherman:: @ 8E5D8FC
 	.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_fisherman:: @ 8E5DCA8
+gTrainerPalette_Fisherman:: @ 8E5Dca8
 	.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_swimmer_m_front_pic:: @ 8E5DCD0
+gTrainerFrontPic_SwimmerM:: @ 8E5DCD0
 	.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_swimmer_m:: @ 8E5DFA8
+gTrainerPalette_SwimmerM:: @ 8E5Dfa8
 	.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_roughneck_front_pic:: @ 8E5DFD0
-	.incbin "graphics/trainers/front_pics/roughneck_front_pic.4bpp.lz"
+gTrainerFrontPic_CueBall:: @ 8E5DFD0
+	.incbin "graphics/trainers/front_pics/cue_ball_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_roughneck:: @ 8E5E598
-	.incbin "graphics/trainers/palettes/roughneck.gbapal.lz"
+gTrainerPalette_CueBall:: @ 8E5E598
+	.incbin "graphics/trainers/palettes/cue_ball.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_gamer_front_pic:: @ 8E5E5C0
+gTrainerFrontPic_Gamer:: @ 8E5E5C0
 	.incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_gamer:: @ 8E5E954
+gTrainerPalette_Gamer:: @ 8E5E954
 	.incbin "graphics/trainers/palettes/gamer.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_beauty_front_pic:: @ 8E5E97C
+gTrainerFrontPic_Beauty:: @ 8E5E97C
 	.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_beauty:: @ 8E5ECD8
+gTrainerPalette_Beauty:: @ 8E5Ecd8
 	.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_swimmer_f_front_pic:: @ 8E5ED00
+gTrainerFrontPic_SwimmerF:: @ 8E5ED00
 	.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_swimmer_f:: @ 8E5EFEC
+gTrainerPalette_SwimmerF:: @ 8E5Efec
 	.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_psychic_m_front_pic:: @ 8E5F014
+gTrainerFrontPic_PsychicM:: @ 8E5F014
 	.incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_psychic_m:: @ 8E5F374
+gTrainerPalette_PsychicM:: @ 8E5F374
 	.incbin "graphics/trainers/palettes/psychic_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_rocker_front_pic:: @ 8E5F39C
+gTrainerFrontPic_Rocker:: @ 8E5F39C
 	.incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_rocker:: @ 8E5F7F8
+gTrainerPalette_Rocker:: @ 8E5F7F8
 	.incbin "graphics/trainers/palettes/rocker.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_juggler_front_pic:: @ 8E5F820
+gTrainerFrontPic_Juggler:: @ 8E5F820
 	.incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_juggler:: @ 8E5FC5C
+gTrainerPalette_Juggler:: @ 8E5Fc5C
 	.incbin "graphics/trainers/palettes/juggler.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_tamer_front_pic:: @ 8E5FC84
+gTrainerFrontPic_Tamer:: @ 8E5FC84
 	.incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_tamer:: @ 8E60038
+gTrainerPalette_Tamer:: @ 8E60038
 	.incbin "graphics/trainers/palettes/tamer.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_bird_keeper_front_pic:: @ 8E60060
+gTrainerFrontPic_BirdKeeper:: @ 8E60060
 	.incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_bird_keeper:: @ 8E60424
+gTrainerPalette_BirdKeeper:: @ 8E60424
 	.incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_black_belt_front_pic:: @ 8E6044C
+gTrainerFrontPic_BlackBelt:: @ 8E6044C
 	.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_black_belt:: @ 8E6086C
+gTrainerPalette_BlackBelt:: @ 8E6086C
 	.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_blue_1_front_pic:: @ 8E60894
-	.incbin "graphics/trainers/front_pics/blue_1_front_pic.4bpp.lz"
+gTrainerFrontPic_Rival1:: @ 8E60894
+	.incbin "graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_blue_1:: @ 8E60B4C
-	.incbin "graphics/trainers/palettes/blue_1.gbapal.lz"
+gTrainerPalette_Rival1:: @ 8E60B4C
+	.incbin "graphics/trainers/palettes/rival_1.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_scientist_front_pic:: @ 8E60B74
+gTrainerFrontPic_Scientist:: @ 8E60B74
 	.incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_scientist:: @ 8E60F50
+gTrainerPalette_Scientist:: @ 8E60F50
 	.incbin "graphics/trainers/palettes/scientist.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_giovanni_front_pic:: @ 8E60F78
-	.incbin "graphics/trainers/front_pics/giovanni_front_pic.4bpp.lz"
+gTrainerFrontPic_LeaderGiovanni:: @ 8E60F78
+	.incbin "graphics/trainers/front_pics/leader_giovanni_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_giovanni:: @ 8E61288
-	.incbin "graphics/trainers/palettes/giovanni.gbapal.lz"
+gTrainerPalette_LeaderGiovanni:: @ 8E61288
+	.incbin "graphics/trainers/palettes/leader_giovanni.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_rocket_grunt_m_front_pic:: @ 8E612B0
+gTrainerFrontPic_RocketGruntM:: @ 8E612B0
 	.incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_rocket_grunt_m:: @ 8E615E4
+gTrainerPalette_RocketGruntM:: @ 8E615E4
 	.incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_cool_trainer_m_front_pic:: @ 8E6160C
+gTrainerFrontPic_CooltrainerM:: @ 8E6160C
 	.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_cool_trainer_m:: @ 8E618DC
+gTrainerPalette_CooltrainerM:: @ 8E618Dc
 	.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_cool_trainer_f_front_pic:: @ 8E61904
+gTrainerFrontPic_CooltrainerF:: @ 8E61904
 	.incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_cool_trainer_f:: @ 8E61C1C
+gTrainerPalette_CooltrainerF:: @ 8E61C1C
 	.incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_lorelei_front_pic:: @ 8E61C44
+gTrainerFrontPic_EliteFourLorelei:: @ 8E61C44
 	.incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_lorelei:: @ 8E61F70
+gTrainerPalette_EliteFourLorelei:: @ 8E61F70
 	.incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_bruno_front_pic:: @ 8E61F98
+gTrainerFrontPic_EliteFourBruno:: @ 8E61F98
 	.incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_bruno:: @ 8E623E4
+gTrainerPalette_EliteFourBruno:: @ 8E623E4
 	.incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_agatha_front_pic:: @ 8E6240C
+gTrainerFrontPic_EliteFourAgatha:: @ 8E6240C
 	.incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_agatha:: @ 8E62728
+gTrainerPalette_EliteFourAgatha:: @ 8E62728
 	.incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_elite_four_lance_front_pic:: @ 8E62750
+gTrainerFrontPic_EliteFourLance:: @ 8E62750
 	.incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_elite_four_lance:: @ 8E62B18
+gTrainerPalette_EliteFourLance:: @ 8E62B18
 	.incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_brock_front_pic:: @ 8E62B40
+gTrainerFrontPic_LeaderBrock:: @ 8E62B40
 	.incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_brock:: @ 8E62E8C
+gTrainerPalette_LeaderBrock:: @ 8E62E8C
 	.incbin "graphics/trainers/palettes/leader_brock.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_misty_front_pic:: @ 8E62EB4
+gTrainerFrontPic_LeaderMisty:: @ 8E62EB4
 	.incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_misty:: @ 8E631B4
+gTrainerPalette_LeaderMisty:: @ 8E631B4
 	.incbin "graphics/trainers/palettes/leader_misty.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_lt_surge_front_pic:: @ 8E631DC
+gTrainerFrontPic_LeaderLtSurge:: @ 8E631DC
 	.incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_lt_surge:: @ 8E6356C
+gTrainerPalette_LeaderLtSurge:: @ 8E6356C
 	.incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_erika_front_pic:: @ 8E63594
+gTrainerFrontPic_LeaderErika:: @ 8E63594
 	.incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_erika:: @ 8E63888
+gTrainerPalette_LeaderErika:: @ 8E63888
 	.incbin "graphics/trainers/palettes/leader_erika.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_koga_front_pic:: @ 8E638B0
+gTrainerFrontPic_LeaderKoga:: @ 8E638B0
 	.incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_koga:: @ 8E63C18
+gTrainerPalette_LeaderKoga:: @ 8E63C18
 	.incbin "graphics/trainers/palettes/leader_koga.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_blaine_front_pic:: @ 8E63C40
+gTrainerFrontPic_LeaderBlaine:: @ 8E63C40
 	.incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_blaine:: @ 8E6404C
+gTrainerPalette_LeaderBlaine:: @ 8E6404C
 	.incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leader_sabrina_front_pic:: @ 8E64074
+gTrainerFrontPic_LeaderSabrina:: @ 8E64074
 	.incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leader_sabrina:: @ 8E6437C
+gTrainerPalette_LeaderSabrina:: @ 8E6437C
 	.incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_gentleman_front_pic:: @ 8E643A4
+gTrainerFrontPic_Gentleman:: @ 8E643A4
 	.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_gentleman:: @ 8E646DC
+gTrainerPalette_Gentleman:: @ 8E646Dc
 	.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_blue_2_front_pic:: @ 8E64704
-	.incbin "graphics/trainers/front_pics/blue_2_front_pic.4bpp.lz"
+gTrainerFrontPic_Rival2:: @ 8E64704
+	.incbin "graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_blue_2:: @ 8E649F8
-	.incbin "graphics/trainers/palettes/blue_2.gbapal.lz"
+gTrainerPalette_Rival2:: @ 8E649F8
+	.incbin "graphics/trainers/palettes/rival_2.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_champion_blue_front_pic:: @ 8E64A20
-	.incbin "graphics/trainers/front_pics/champion_blue_front_pic.4bpp.lz"
+gTrainerFrontPic_ChampionRival:: @ 8E64A20
+	.incbin "graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_champion_blue:: @ 8E64D1C
-	.incbin "graphics/trainers/palettes/champion_blue.gbapal.lz"
+gTrainerPalette_ChampionRival:: @ 8E64D1C
+	.incbin "graphics/trainers/palettes/champion_rival.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_channeler_front_pic:: @ 8E64D44
+gTrainerFrontPic_Channeler:: @ 8E64D44
 	.incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_channeler:: @ 8E6511C
+gTrainerPalette_Channeler:: @ 8E6511C
 	.incbin "graphics/trainers/palettes/channeler.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_twins_front_pic:: @ 8E65144
+gTrainerFrontPic_Twins:: @ 8E65144
 	.incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_twins:: @ 8E65494
+gTrainerPalette_Twins:: @ 8E65494
 	.incbin "graphics/trainers/palettes/twins.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_cool_couple_front_pic:: @ 8E654BC
+gTrainerFrontPic_CoolCouple:: @ 8E654BC
 	.incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_cool_couple:: @ 8E6599C
+gTrainerPalette_CoolCouple:: @ 8E6599C
 	.incbin "graphics/trainers/palettes/cool_couple.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_young_couple_front_pic:: @ 8E659C4
+gTrainerFrontPic_YoungCouple:: @ 8E659C4
 	.incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_young_couple:: @ 8E65E10
+gTrainerPalette_YoungCouple:: @ 8E65E10
 	.incbin "graphics/trainers/palettes/young_couple.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_crush_kin_front_pic:: @ 8E65E38
+gTrainerFrontPic_CrushKin:: @ 8E65E38
 	.incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_crush_kin:: @ 8E663D8
+gTrainerPalette_CrushKin:: @ 8E663D8
 	.incbin "graphics/trainers/palettes/crush_kin.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_sis_and_bro_front_pic:: @ 8E66400
+gTrainerFrontPic_SisAndBro:: @ 8E66400
 	.incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_sis_and_bro:: @ 8E66860
+gTrainerPalette_SisAndBro:: @ 8E66860
 	.incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_oak_front_pic:: @ 8E66888
+gTrainerFrontPic_ProfessorOak:: @ 8E66888
 	.incbin "graphics/trainers/front_pics/oak_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_oak:: @ 8E66BF4
+gTrainerPalette_ProfessorOak:: @ 8E66Bf4
 	.incbin "graphics/trainers/palettes/oak.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic2:: @ 8E66C1C
+gTrainerFrontPic_RSBrendan2:: @ 8E66C1C
 	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ruby_sapphire_brendan2:: @ 8E66F30
+gTrainerPalette_RSBrendan2:: @ 8E66F30
 	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic2:: @ 8E66F58
+gTrainerFrontPic_RSMay2:: @ 8E66F58
 	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ruby_sapphire_may2:: @ 8E67258
+gTrainerPalette_RSMay2:: @ 8E67258
 	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_red_front_pic:: @ 8E67280
+gTrainerFrontPic_Red:: @ 8E67280
 	.incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_red:: @ 8E6758C
+gTrainerPalette_Red:: @ 8E6758C
 	.incbin "graphics/trainers/palettes/red.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_leaf_front_pic:: @ 8E675B4
+gTrainerFrontPic_Leaf:: @ 8E675B4
 	.incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_leaf:: @ 8E678F0
+gTrainerPalette_Leaf:: @ 8E678F0
 	.incbin "graphics/trainers/palettes/leaf.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_rocket_grunt_f_front_pic:: @ 8E67918
+gTrainerFrontPic_RocketGruntF:: @ 8E67918
 	.incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_rocket_grunt_f:: @ 8E67C30
+gTrainerPalette_RocketGruntF:: @ 8E67C30
 	.incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_psychic_f_front_pic:: @ 8E67C58
+gTrainerFrontPic_PsychicF:: @ 8E67C58
 	.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_psychic_f:: @ 8E67FF8
+gTrainerPalette_PsychicF:: @ 8E67Ff8
 	.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_crush_girl_front_pic:: @ 8E68020
+gTrainerFrontPic_CrushGirl:: @ 8E68020
 	.incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_crush_girl:: @ 8E6832C
+gTrainerPalette_CrushGirl:: @ 8E6832C
 	.incbin "graphics/trainers/palettes/crush_girl.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_tuber_front_pic:: @ 8E68354
-	.incbin "graphics/trainers/front_pics/tuber_front_pic.4bpp.lz"
+gTrainerFrontPic_TubeFr:: @ 8E68354
+	.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_tuber:: @ 8E68658
-	.incbin "graphics/trainers/palettes/tuber.gbapal.lz"
+gTrainerPalette_TuberF:: @ 8E68658
+	.incbin "graphics/trainers/palettes/tuber_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_pokemon_breeder_front_pic:: @ 8E68680
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_front_pic.4bpp.lz"
+gTrainerFrontPic_PokemonBreederF:: @ 8E68680
+	.incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_pokemon_breeder:: @ 8E689C0
-	.incbin "graphics/trainers/palettes/pokemon_breeder.gbapal.lz"
+gTrainerPalette_PokemonBreederF:: @ 8E689C0
+	.incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_pokemon_ranger_m_front_pic:: @ 8E689E8
+gTrainerFrontPic_PokemonRangerM:: @ 8E689E8
 	.incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_pokemon_ranger_m:: @ 8E68D48
+gTrainerPalette_PokemonRangerM:: @ 8E68D48
 	.incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_pokemon_ranger_f_front_pic:: @ 8E68D70
+gTrainerFrontPic_PokemonRangerF:: @ 8E68D70
 	.incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_pokemon_ranger_f:: @ 8E690A4
+gTrainerPalette_PokemonRangerF:: @ 8E690A4
 	.incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_aroma_lady_front_pic:: @ 8E690CC
+gTrainerFrontPic_AromaLady:: @ 8E690CC
 	.incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_aroma_lady:: @ 8E6941C
+gTrainerPalette_AromaLady:: @ 8E6941C
 	.incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_ruin_maniac_front_pic:: @ 8E69444
+gTrainerFrontPic_RuinManiac:: @ 8E69444
 	.incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_ruin_maniac:: @ 8E69850
+gTrainerPalette_RuinManiac:: @ 8E69850
 	.incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_lady_front_pic:: @ 8E69878
+gTrainerFrontPic_Lady:: @ 8E69878
 	.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_lady:: @ 8E69BA0
+gTrainerPalette_Lady:: @ 8E69Ba0
 	.incbin "graphics/trainers/palettes/lady.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_front_pics_painter_front_pic:: @ 8E69BC8
+gTrainerFrontPic_Painter:: @ 8E69BC8
 	.incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_painter:: @ 8E69E94
+gTrainerPalette_Painter:: @ 8E69E94
 	.incbin "graphics/trainers/palettes/painter.gbapal.lz"
 
 	.align 2
@@ -13412,27 +13412,27 @@ gTrainerBackPic_OldMan:: @ 8E70EBC
 	.incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp"
 
 	.align 2
-gTrainerBackPic_RubySapphireBrendan:: @ 8E72EBC
+gTrainerBackPic_RSBrendan:: @ 8E72EBC
 	.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
 
 	.align 2
-gTrainerBackPic_RubySapphireMay:: @ 8E74EBC
+gTrainerBackPic_RSMay:: @ 8E74EBC
 	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
 
 	.align 2
-gFile_graphics_trainers_palettes_leaf_back_pic:: @ 8E76EBC
+gTrainerPalette_LeafBackPic:: @ 8E76Ebc
 	.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_red_back_pic:: @ 8E76EE4
+gTrainerPalette_RedBackPic:: @ 8E76Ee4
 	.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_pokedude_back_pic:: @ 8E76F0C
+gTrainerPalette_PokeDudeBackPic:: @ 8E76F0C
 	.incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34
+gTrainerPalette_OldManBackPic:: @ 8E76F34
 	.incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz"
 
 	.align 2
diff --git a/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png b/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png
deleted file mode 100644
index a15872c611d348e8efe7a28673cd943860d0ed7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p%f`l*Nl`YD!9rtkqhBz5nKF)xBEP-sVA4d%c`m|8tbpQgi?R{{R30jfWTn00001
zbW%=J06^y0W&i*JJV``BR7i>K)G=$@KokJrqcJAda;TX@Kn|U2D-e$cmo!6+m!1bh
z>&XZ5P!BH1Qz^-yo7%|+EsdeI!CLeuG8GS{Xsj?Tlyq`UE32uf`+71I+tHnWL2uFH
z-goak2}ub3UxKyE*o&=s%d|T8w*brJODuMDzP)RjFP~fOwji(P?mj^1`1)(dEL?Yr
z$@7|)+e161$(Wfntz?fonszYbK+o$e%Z{H3DrEVoo3?eX<<#uMP6A*}+vDKEY~TB=
z=1YPhzE>)<B{=w`{`q-2OMnzKYW)<mE>u;0dMW@2ap5v{&Vg3Y1$l%*+PYySb^pU5
zdnE*T=y;II?`s7n>JSTe46{`J2!lA!#~4S^q9V)2;N!#%u8MLHl;1^gb`^&yA;aZ~
z3&A)JOELfeW#B^|9g2s52w>qkF8mM!UIZZU9p{ZM9Th|1@iMyPS@9J)UffKUPSYpT
zuJkZM)aV(nzsSo|yJtjiJ!ySpP~#GOuO$_RZS%W4p&)BAvM*ubht!pUGzaBLvr#Wf
zfMUB&a6(B<I;Eo!+8PidztJ?Q&XsLoKx$nyC-v<>*)l|fjJgPus;mcZ&jGI^eGsH>
zb1;|o7<7Nd087EJI_mb8S8)%8x|t;in_@6*wlcl`612pC_A@jNFcku2wH;DXk2Ro3
zK>uHeSK$U&9UF><Sl<i<0Q+lym(US_>HAgO^pjKmCX=;l<WT|y(^U)n*q?s84L061
kAj$U*Z+uW7{k(3izs#fgaJ`J~s{jB107*qoM6N<$f-v4g0ssI2

diff --git a/graphics/trainers/front_pics/brendan_front_pic.png b/graphics/trainers/front_pics/brendan_front_pic.png
deleted file mode 100644
index b0c65b4be4be81fbfa0e694675372415e8b5ccaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p$^ml+A;4ds<Rrdz?yIgE2vB7%5WT=I)E$b7GuY|6*FjK|%lj{{R30^1GJQ00001
zbW%=J06^y0W&i*JI7vi7R7i>K)IV$6KokJ*gDS>Qg0S2#5H~}%)_*A8>L?jZo8S&P
zV|TE<NXSi1ze4)Q;t~~ZazJ!1L7~tg7`Ga{bm)+5!MKCzlp%|7TP27V=Xz(4(o?@c
zAIQu5>D_yelM(tKp=d4PCvo}2VZ*zK5xCv(Ji7<xm%N_sUD`HWqHWt3W!J)R3-w<8
zQn!aNXg)pu<h^sJ5YU>AGa$P#X#e?q^inBXAV>s*OjgO2L4bb#XsjqV#S#eA>`h8(
z6k@>oN=nJBf_WtQsZ=_%2?LbOrq#Rf2|QRXJ}+y&{~`|DzJC3H#pI>m?~UR)yeA|(
z&Zsk?3mgTmss|rVCq$Hx)Tm~!w3_pLT;o96`Vs*WRZ}}S>Nfct>h@U#$mz7Z<8+&^
z?jyCaaVHGci>#wP8qj<Rz1iOhZ(LFyRwg6MrTIenZJ<`d1=9Y>_Q-Hsztpw<`DSPx
zw^FOJJDV78U&^oT((po)W<dbm>Z6T3*$cP$4DZQqXX2hrkrZ_$68N};7}0gJ6_FKy
zR7*%E8a9n+@c1heePFBu7h>y_&lPkrHX(3!Zw{!gM@+y&Rw|-}>NNzAKji?&08xct
zgAWSdxxkzQ_+IlKjpV<8Y{EbcG39`QAkb>D05Qg<GJn7d2IV;xfCc1v@qn~oAYLX>
zw`mcU{&5b#9;j=IIur!6;dlPKTp<wfhvH-L$KV{y7sY3^;zu7MjfpryX7wHbzV(`m
gO3>d_%#!2cFYg}gqVLu}z5oCK07*qoM6N<$f|piEqyPW_

diff --git a/graphics/trainers/front_pics/champion_blue_front_pic.png b/graphics/trainers/front_pics/champion_rival_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/champion_blue_front_pic.png
rename to graphics/trainers/front_pics/champion_rival_front_pic.png
diff --git a/graphics/trainers/front_pics/steven_front_pic.png b/graphics/trainers/front_pics/champion_steven_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/steven_front_pic.png
rename to graphics/trainers/front_pics/champion_steven_front_pic.png
diff --git a/graphics/trainers/front_pics/champion_wallace_front_pic.png b/graphics/trainers/front_pics/champion_wallace_front_pic.png
deleted file mode 100644
index 24c43eca869e7f1421769f292a268a4e88f5a789..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmV;@11<cCP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p$^$l)Z~;VmU#*ga4FjtaF3^Qfjot#nm}VbBl|lIVm|}Ib#3+{{R30`wz|r00001
zbW%=J06^y0W&i*KP)S5VR7i=<)jv!VQ5XR5m)L={7;?zqW;hm!iCDTA9psO@Q%M}u
ziJMAvd!>WmbdM_3#GyV8uQixZE)i?u;Bm3t2m_5yEZQ`|0S>~mMiL4{>i4d_-nAZe
z^-Y(4zkc6$@4k13(0{as+D6X}`Fh&MgFT~dfv-ClYzu}3K^UlC8(FUmBVzZJX?_(j
zs8aS4zxr}}{6eRcro4)D-DD=@4loA7D+M}b>^VX?Mh!jg31%2GQ9v~f;UbQE#5*Ws
zdr(1v`;lXwKxI29V7?CtkRt8TB!v{ybGyRjQQ?B@0niDgn3_vIxwJLhlX>LT<p~9V
zUqcVw$6ml-M`}uri2!b-JW3dh{ZO|nZw7^+a4Uf@X^F!QGIq3mY>bFkzYk<^tfK|w
z_!g&<Q~IJPie*1Z`=_T{5}2zRJ)C0sQE?!RG=!RK09efs?GRV;p*wV*_t=yGD(n$h
z@9^nC=)|}`U;EYP20I)i@Z%SueyZHHZqxU(@l*pU`^W(~d~6Q(QB~n7jFE0Pu;Qc=
zodFO(qG_b;_BvzS00|u35(!zR=>S^{3Zo9#X#lgIkQklMu|@HMaLop^4v0L*`d`X;
zSz+wMU~lMeu!QIOWf{l#Y#xjVLv{__0nzI?fiY~nQTE+#bg8R^;HU+#j4Q{JF#ApC
zC!i7;V*qgrkV9OpR$XCef?yk90Eue4=}Baf&OwxeBnO1dH$BQdq{|MN%(MfO6i-gI
z0GOt%&TB&x2@X;%K!-!OZ3B}gDa#Ww<8&E-BgJg+l$lAD?QaxH4&cX@$#rnbr<-j`
z;d^BlQ2zqs;c&?XsQMB+AjkG401uodmnoI&AOU}0seuWni6v{Ft$lC<=QZPxVjFyh
zJ2u#>LO4A3kTg>G>v3q|o67RXrZNj)ox~er$xiSrLh0u?{Rlu>hkds}#=gnf2vtfo
zFi~*<KdFz)T7)iCh`#zZJXRvE5=g60<Yt6^s*vUE`EdZQxGkPZ5n9M=E7{HQiHDjy
z4uX?eDWVkfFo7JP)}?7$L6R0MuqI7NUhnI|rc?lc&IFysV)1L)0+Ed`9svC=maNmT
zRxsXq#Zgzambeo}#PgfcSSM$Eb)4lsc>h{|01?VMZ7a`Lga7~l07*qoM6N<$f(2H+
A8~^|S

diff --git a/graphics/trainers/front_pics/roughneck_front_pic.png b/graphics/trainers/front_pics/cue_ball_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/roughneck_front_pic.png
rename to graphics/trainers/front_pics/cue_ball_front_pic.png
diff --git a/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png b/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png
deleted file mode 100644
index 78b92b0c96686d2b25fb362b59bc1ccc7bd1ef83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 906
zcmV;519kj~P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p%f`l*Nl`YD!A>l;-Ah)xBD*i%N6V&GzQiYMhkC?(U1#v||7N{{R30uvh?H00001
zbW%=J06^y0W&i*K2uVaiR7i=flrd=AKomd^9I%Q9BWKB0B6slC#4a>L2q}07ZK)@_
z-n!Iswl<LH)G2O<=#sW^#vBG^DI|C@G|-BJXf44>_dupD5uw7+Qac!;{*!DIOG0g-
ze~|2ZPyhcreH)?w7(#9EfoLy7xl;8Efvi=-gble;t|hw!A*J{<Oi<*ay!@+JB5}D`
z3aKH;m6BW~$}++5i3<~pV?ta30aw-bnWj`QUwJSyWIOz#;YtZ(W$WboL0RPs6RF%#
zFg&5|5WMmJ<m902uEwP4p<(b8nuCnJ=9km+^D{SftSO1oph$w!9VGOSLAQ=i+s945
z9Gh>~e@vp0U|IaWht<q{Gt2qx)YlH`jGEAOO5vVVwYwL&9_Qli5#^6smc<QW<&7v#
zW;(#dn;Z<t0DZ()=B7n)uAY@d$9IkigBuzyr^VFLTS@YB2nGt#$gG^sUxsn6(A^`O
zWbav*A)I%BD6{l$d0jUHnD3HOX4tl6f7sSrK75P1yQH-7alzK#%uydVsP1KGv`A{f
zx|rGxG{+buXt0(bifMayYLA6%fUy>eWhE)MKo9HG--H*OJ3sHgdVD||VLS)CKtFHD
zPxi0;ZRTcTId}(m9C$P?Kiuyd<27Qb^t<+JvCxN3VYr{;TEf>vR?IZ>4vY=&PLc6C
z@@1G7GY%gsS5P$&#$#4W4>)u$Y}*<h9~P9I?0B3f0HHznsoX5l;pffY7JMPs)P}Iw
z_;DsioLt+3XtaC+=K>)|L&3hhAsE#4ffHlMtueu?2%Pjog~W&x^9r_W_L&_RERWZj
z={R_k8Z_|Ic>|=@ce+@SH(`GKqwDeH6~?k$RjC;meU}UML#$z}I!?#Wc>=ifO%MtJ
z>L#ec1wAscS`WdT@klb(!;4{D@NRv^x=X8}8N39ryDp9v4hvdXi-YJH4HJd`H@MNo
z#Ef_xB{B9-qd!4lp8qXDGWdfSj~<Cm00N1wu&TU>OpyGPFGLE7E?$o=(OoM(i>~p9
gb3!O&5dS8A1NJhS_yw}W>i_@%07*qoM6N<$g1G~*A^-pY

diff --git a/graphics/trainers/front_pics/factory_head_noland_front_pic.png b/graphics/trainers/front_pics/factory_head_noland_front_pic.png
deleted file mode 100644
index df420adf3481fda887bf9ace9ebc70e471357c8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 736
zcmV<60w4W}P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p%f`l*Nl`YD!A1ti6MSq+()wK|xyH)%NbyYW9PB)mmD#IYIyb{{R30{0Uk`00001
zbW%=J06^y0W&i*JUP(kjR7i=H)v=4(P#g#Ffc82a;aNJDi$a%ztvcMMc<*Q(4xuzi
zmUihyoGdO+m$SpQiBqQFy(Rr8x<$8cRp`*|e3Vw9-V%<xtH$A)zQj!B_fncAkne}@
z`{nUMB<cSy#=a!xv(e{|m4tlPbw}sp1Tk}6ckF%@7mPV@XA@z??v&@FBrusxCez8M
zgc+s`A2BS<Wn9Gvk6c%@6*8_@vp8G2Wx|H)Rer8u;f#`WRn6?7-;c#JTwf!El!S(!
z^Btk$n<Vg~RCq|m;;yq$aw;7P!P=hVL)8{G1k|3FR8^Q4?o&D}sxL}{JcTkEbr$<{
zSP_CAeYq%VLqSCfDLtw!_Xk3ta6p%)7!-0R)IQ^&cqwSeN5HTPFsLd|PcAqx>2ncS
zdmarzr;-eMojeE%O3m{wI2gbntz@a=c^tg!<Up`@F9zmo@IBKgQ{!OC!KzpWKnkH6
z-GadZ1f(Y%INtJ5JGDLtKsdy*W_PV72-4_*=6FBJ+UU0W5Rh~AfJT69Kp@><yzv^u
zBxD7jYYu{cfwI>yd=8GmlU>5~jYABBkoPcXm&&R`EDrj50|NT5nr(LjG0-SKaWQBD
z`3?<%)#h(u>N+q)2(&Xx_YGpKAaExFD=|1$V_*^!1TCtnl!LZuTHp*Vz65=xN1#bW
zz#_!w0NltOoo|FCNg;r8ejs>s837ai_GE*EiJSoXVK)apyoPW1TVM%>;2`SuEel>E
zFk^7a-h$wUJqsdu%f5kvKacN6xDMp$b9ejGm3<b|zW`&b5>FF=QwBi*JpBU~wOohQ
S3Fg@V0000<MNUMnLSTY1rAk8p

diff --git a/graphics/trainers/front_pics/giovanni_front_pic.png b/graphics/trainers/front_pics/leader_giovanni_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/giovanni_front_pic.png
rename to graphics/trainers/front_pics/leader_giovanni_front_pic.png
diff --git a/graphics/trainers/front_pics/leader_juan_front_pic.png b/graphics/trainers/front_pics/leader_juan_front_pic.png
deleted file mode 100644
index ecd9f087b9b0c53a4fc7d3bbd19fa51c8146b188..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p$^$l(d6lds<S}bKaCev}%<9Qfj?QN|dCuy<&5FVli6P)!zUA{{R30Wy9an00001
zbW%=J06^y0W&i*JvPnciR7i=1)z3@YP#gg8hk6N9!gF4Bl149{#2<(4ByqiX5dVq!
z7^9=d#DUu}&w@I(LmS){Pm*P5$8M!ecM4-<c-SbZk`{I>H0Cg@sSR&0wu9Nc*X5GZ
zeER*7_kFJbB(6Kjul~7o-8lX@w$FcVm5!UAYg{0d%kP>;euEoe>_N#p@~`<B&QlPM
zpAvqF=Q4!wo)K`t@N^79J{Xc<3eF6OFmwSI(@SJP3J7O^Ee$AggqAS=dYTVPsT7oq
zSv~-|q<>oCmjHxU3-eP0N&tfPTuN65MZi1h`&Gh?5r%mCz+BOFP7F~~Ht_o6yDPfE
z1}#ldHr5}>6CnrWRYg%NKc-S4d$~k~f*tSY99%nLhM*v?`nCG<+@u>aGblL!tm)Tf
zIN_0(3{b#Z+D^mw$?~L^f02AXit(<dnn%9(d$rnPfUg(_Ev43IwChpW+D!BzHt{Z?
z;G!70p@I9s!sr!t0}3`TNQ5cK-3G&O?XYkIlo$|#i+u^w(yCbp;7U>IBr-|c>dUYw
zNpH>lxYNyICo%)EZ^4Hr((}`1K*u5H7f++J<Vwi$!<nlt=yam9-2@ns<uxN7C|o0i
zFaQ`K@sJcS-lo9aN&-4=K^NGz<6_>}QeYw5<^oy*uKX8dvdF@$Y3OFiRWg_88)md|
z15~;#DEQ6;c@1x)tc{*>fS{^>0rN%BovUd%bZVm~Cc6z9K|Mr)jWQgNrxDIjaEUT5
zyUzlRP|1Kxgj{x&qORo*vY^8S@o!NUjPilwAoK-@2$@^#-Hnjr1VD70jKd5dIyOQ<
z>^J~~ZyYCfj>7@h-NQ>PaZVtid~)l~1z?X0dM|jd!~;R^US`jvu-5}0N**(Y;dN68
y)}iOImNW9IJ=wM_7HC`Vd!I!1c`q{m?fw9{P<eQ<WXR9}0000<MNUMnLSTXm>wgvi

diff --git a/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png b/graphics/trainers/front_pics/leader_wallace_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png
rename to graphics/trainers/front_pics/leader_wallace_front_pic.png
diff --git a/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png b/graphics/trainers/front_pics/magma_admin_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png
rename to graphics/trainers/front_pics/magma_admin_f_front_pic.png
diff --git a/graphics/trainers/front_pics/magma_admin_front_pic.png b/graphics/trainers/front_pics/magma_admin_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/magma_admin_front_pic.png
rename to graphics/trainers/front_pics/magma_admin_m_front_pic.png
diff --git a/graphics/trainers/front_pics/may_front_pic.png b/graphics/trainers/front_pics/may_front_pic.png
deleted file mode 100644
index 47ebca40fb9ed02618aa32754fa395ebea95ae88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p$^ml+A;4ds<RrVsj}uL8NL@N-;Uj&EAXNb7GuY|6*FjK|%lj{{R30^#U*j00001
zbW%=J06^y0W&i*JFG)l}R7i>K)IW&RP#g#FhZjq?@Y(~Xf|s1&;GrfFx*Sc<hYkLr
zf;Lc)i$e?kL0k&SD0hW~>)_HG<f!fyI-Lm3>fn$f+#re<MYqD8<Y-bjIE^noaPj@(
z;OcL98NQ$X^2^I>5c*$#RLy;ons@qxtrX#8hlB6qEjV{O{qZyH8q^}|x>pBX$FwwX
zfLFt=S!|gEY~j4DSfXvWRj5VwwPjtlowfynN^4yxN{vMbaHe+V8$Q%bXo$)w=loZ^
zdKLt>spK&hiYD}+c57{cf|d<TNoVAw!j2f&gnf@J(Ga&R2B@6^(9_`f%B;2)RGm_c
z93ZDZ=L&C~l>p2UDi=mOYXBfKaL)Vuo(;l1mF~5q?2h)|v2y;7_kpf*Y1iw0VRo2C
zFA$o@vG211Zy2#8<Vxs<zZ3%C@Bm{K9eGO=l_lc1POzxnJ9?u`6sF)~MAS^*?YrAD
zc%;ySheNVlm4s>pfKKDO*V`mg^wVH(SEs(`^*#pG==tVjCfHc@ynX*B;&sDdf~J=M
zx>J0>z6D>`8*vna4}mguJ&0=T?!Q4Z4b0{B;A9#&f%7O+n}@+gJdfruz5s$UUQB@c
zFMxJmNC7K3nw4{>p_~(B3M3Kiz=;Z7LzzI}KrGRfCs!a4-MTab?6W|tsoza5QxHUY
zkPfCg`U^OIkI`))=SQDV>X7{OelkPoZUf(tN8aq?@xvzo2*=$d;bZ3idzPe}=al*d
XF6qp(ho0W700000NkvXXu0mjf_zOqw

diff --git a/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png b/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png
deleted file mode 100644
index 0b33649a22f7c9aa44c77d255603640c07d10514..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|Q
z&78fYbEJb(YD!A1tkrviy;@?FIYC<9)%NbyYWC)|=5tEkv||7N{{R309#IsD00001
zbW%=J06^y0W&i*Jph-kQR7i=<)X$3&Q5*p9$uY;9j4pNPu)WbBS=e<|SPGVvb?Dcn
zla(Eepj>ZTi8|57iUu=>79o;tF8%?6hl)=90Uf)<62cG>yW3nI6SnLSh|PPWF7$ol
zxp&a-_&)Q#@0VYW`~R9GouAo{L@}J0(eFF=Rum&{Tw{S#1cYfA%+=W$oJMm9dyl+8
zI77mn=bH?$_#Gkqih`G048X@RS~R7Y3qCV|B%_Et0ox3)Oy&@!An=K`3JPKr1h*^(
zxGsjn((7yV-7Eu~?x3)=ZeCTK*#9mI!3CVm%28aZIYank3*b<EAMg)Jx`f{-1js1>
z77AF8$94Quu^pg&1mKwibiIQQ%1<oL{~`^h@VJ2Uy57bI%@t>x*WUwxDg@|wqnRpO
zp)4HXOa<@jdciEU2IcfGEdv%&T`8Cj*e!9PE0Wj(1NiP|j&Qzh7M(7?Bq|Vy*1&W?
zl^kO>wgEuk0oRD<+iisae+B|H&owH#ep{{6M<%eJn)+_dJ;o9M(Ts5KsMArmZTbkV
zBrjRQ9nCcDmNy9GMi|>IHwQ@JfJ#omcy#Onun&BUtK_P9UmXMR$4V}7RR<iZ#|pU!
zLLCDBt4cs?=Nkdw&L$Ilx2qjGz#t$103x8fy6Odd;yeM}o;MJO1awtx$OK44e_UV>
zzpy5W(DG#pG!NiIQ5P8Y(6Cs`<P$FF83qOQe*wo$L7%+M0R0K*5de!E-G-A9U?DvL
zy_ujp9syQC;qC<VJV3GdkQigH#s>VYB5k!=l>k^K`Tlg4Y`~3fP|!DSa%_-Y`z_OE
zd4SZ~_}c>rWz7vVm3+biBA=~~Q>B?8SZuf{LKn3<3k>EW?r)*y+!71eTFaV7ED#z^
gFBy%3V3O?i7jRKdMk+6@4*&oF07*qoM6N<$f|JT*5&!@I

diff --git a/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png b/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png
deleted file mode 100644
index e57260e28fa49bddf08b8e2ba10df9eb85ca1fd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 678
zcmV;X0$KfuP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p%f`l*Nl`YD!AYd)1U$lyf<1IXOAi-sY@9LI1^Cb836lQgi?R{{R307D(OB00001
zbW%=J06^y0W&i*JBuPX;R7i=HmCtJvK@`Ua_K>|jChbA=5Rw%1BADbNc!*YzTzcH-
zEeG4J2ogb>JtkU^0hKxT>dBjwTnhdJ6$W}K=%w~wSWHNUnDU(ckyJDLwmPt|v+uLt
z_kBA%Zy5XE;mYue_*~@?FrO=Rk^^XoN`1|dz_}6!IXOV7<9#h82^a&fxfVzQ@0H;E
z8q$C|e#3c_2HX?<fIlor8qhyK7JqC=q{;wSS2({eNPw|%mGj#z8gOTuXT_~gv`d(M
z-fUicr(MGA9QzSKx*VVP{EHTnfTO?d_09xRCY*9<Yo~oGk&>wKTOW2_v__Ofov%;v
z`6)Jxgw9y<dSxRl_&$y*Q4V{}ol0O5iy)BP#8Hb?8_vy+c~rkE!WhU%g6)p+S*$XC
zKPD^*n0PN)nU`4k4ueQSuS&q~V}~1{wjNCo?Lq?YRh2hbZ7oTOgH>SS?H>-mgtcyJ
z%KDts?!Crv81_2J)ZWJMGzRvbq*HrAe!aVKblB|erc)cxVkkyf@Io5ULdb%jL|hv%
z(FpJcIe^*Q<LzgONh@wrgdoJYod5$02p?_Rp(PMqZ!_Ng1JHDPhyjpv2QpO{AV&e>
z_C@cje+59(K>Q~I-6yXGk_zcE^a7wvqyUm<O4`OX*~C%+$R@S`NE4R|`2bl)^fSdb
zR2fTvDg*j@p^yzs{eE&obV2a?=}vHiZl=Q0yFoL7%Q4A6;Qt!G0hlL3u+<%;TL1t6
M07*qoM6N<$f>UEM`2YX_

diff --git a/graphics/trainers/front_pics/winstrate_f_front_pic.png b/graphics/trainers/front_pics/pokefan_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/winstrate_f_front_pic.png
rename to graphics/trainers/front_pics/pokefan_f_front_pic.png
diff --git a/graphics/trainers/front_pics/winstrate_m_front_pic.png b/graphics/trainers/front_pics/pokefan_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/winstrate_m_front_pic.png
rename to graphics/trainers/front_pics/pokefan_m_front_pic.png
diff --git a/graphics/trainers/front_pics/pokemon_breeder_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/pokemon_breeder_front_pic.png
rename to graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png
rename to graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png
diff --git a/graphics/trainers/front_pics/oak_front_pic.png b/graphics/trainers/front_pics/professor_oak_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/oak_front_pic.png
rename to graphics/trainers/front_pics/professor_oak_front_pic.png
diff --git a/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png b/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png
deleted file mode 100644
index 2f936092ad4fcae2104a382b2a5f4926847e5b0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p%f`l*Nl`YD!9^)mnS3K~i%mIZ`Rr&DE@XT8oQ&gJMC|YD)kA{{R30mggU_00001
zbW%=J06^y0W&i*JPf0{UR7i=v)xV1qK@<n@EdrN9SaR_%*aWT=oq$asXEHX!fz|Hj
zAK16)&L%U{C7@*2;@C!zU~%B38Uor|2;Noq7hDr8`~wUcl8D9l^5eQUv2&XZybs^E
zZ)PX!dH?%*VA%9v{faTh4}fc|v+GlL06RnQ;Q*MjfHi}L8{A%<HJi<e6L528ro!Ah
zdx)tqU+ZpA62jcn+uRK}=QYlof(8u5uOC6{yPy+Fl~b?uvr;(@#0{MvaIe&^96JH)
zu-xMqP^0&vRIN6iTkmnF(Xb@wRBO*3rgrh9#=p^^-f7oC&+d3@HYZzj80Vlaa@Lv^
zwBURR@*;b+zSEi%D<whpq|UOQB86`ug*41mzpFA**i0elj{9A$)PT$Yxdl<Klsu;%
zV<{o&$`}fz6wnbM!+tD>b_CJ|u#FnxkJJg?yi;~1Y2Yn)U?o%NQFV++Aye8uP043O
zP*^)2+sO&gd%gvi*4h(t74Xt|u}LtNZs2+SupcUw@`a;*6e5smY92X36h%0q_~-yK
zjFUtH2v>p*<LzQQ6UsWz5$M<MAz~bKJ#wuAf=Cr>02jb1qqI;50q!zxH4NS0+&chd
zlE47ZhZ{sOmNwue-2oE7_oR#`tZ)EO_@eoEC|n@bIH0eU9*|%JYV;2Pqxq&qrf5(e
z?cU`TMv%Ze%JU7dHh1jipU?CC{Sys-kLUaQkgWUfzuYG|0KeQPy`}$b7v{wdPQ-*d
zdH#g&K32XlA|U4Q+rd8BE`*_gG54Q4-;#&hl1KJ0G2|AOTn9aQ00000NkvXXu0mjf
Du6|FG

diff --git a/graphics/trainers/front_pics/blue_1_front_pic.png b/graphics/trainers/front_pics/rival_1_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/blue_1_front_pic.png
rename to graphics/trainers/front_pics/rival_1_front_pic.png
diff --git a/graphics/trainers/front_pics/blue_2_front_pic.png b/graphics/trainers/front_pics/rival_2_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/blue_2_front_pic.png
rename to graphics/trainers/front_pics/rival_2_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png b/graphics/trainers/front_pics/rs_aroma_lady_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png
rename to graphics/trainers/front_pics/rs_aroma_lady_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_beauty_front_pic.png b/graphics/trainers/front_pics/rs_beauty_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_beauty_front_pic.png
rename to graphics/trainers/front_pics/rs_beauty_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png b/graphics/trainers/front_pics/rs_bird_keeper_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png
rename to graphics/trainers/front_pics/rs_bird_keeper_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_black_belt_front_pic.png b/graphics/trainers/front_pics/rs_black_belt_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_black_belt_front_pic.png
rename to graphics/trainers/front_pics/rs_black_belt_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png b/graphics/trainers/front_pics/rs_bug_catcher_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png
rename to graphics/trainers/front_pics/rs_bug_catcher_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_camper_front_pic.png b/graphics/trainers/front_pics/rs_camper_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_camper_front_pic.png
rename to graphics/trainers/front_pics/rs_camper_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png
rename to graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png
rename to graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_fisherman_front_pic.png b/graphics/trainers/front_pics/rs_fisherman_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_fisherman_front_pic.png
rename to graphics/trainers/front_pics/rs_fisherman_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_gentleman_front_pic.png b/graphics/trainers/front_pics/rs_gentleman_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_gentleman_front_pic.png
rename to graphics/trainers/front_pics/rs_gentleman_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_hiker_front_pic.png b/graphics/trainers/front_pics/rs_hiker_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_hiker_front_pic.png
rename to graphics/trainers/front_pics/rs_hiker_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_lady_front_pic.png b/graphics/trainers/front_pics/rs_lady_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_lady_front_pic.png
rename to graphics/trainers/front_pics/rs_lady_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_lass_front_pic.png b/graphics/trainers/front_pics/rs_lass_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_lass_front_pic.png
rename to graphics/trainers/front_pics/rs_lass_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_picnicker_front_pic.png b/graphics/trainers/front_pics/rs_picnicker_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_picnicker_front_pic.png
rename to graphics/trainers/front_pics/rs_picnicker_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png b/graphics/trainers/front_pics/rs_pokemaniac_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png
rename to graphics/trainers/front_pics/rs_pokemaniac_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png
rename to graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png
rename to graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png
rename to graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png b/graphics/trainers/front_pics/rs_psychic_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_psychic_f_front_pic.png
rename to graphics/trainers/front_pics/rs_psychic_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png b/graphics/trainers/front_pics/rs_psychic_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_psychic_m_front_pic.png
rename to graphics/trainers/front_pics/rs_psychic_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png b/graphics/trainers/front_pics/rs_ruin_maniac_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png
rename to graphics/trainers/front_pics/rs_ruin_maniac_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_sailor_front_pic.png b/graphics/trainers/front_pics/rs_sailor_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_sailor_front_pic.png
rename to graphics/trainers/front_pics/rs_sailor_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png b/graphics/trainers/front_pics/rs_sis_and_bro_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png
rename to graphics/trainers/front_pics/rs_sis_and_bro_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png b/graphics/trainers/front_pics/rs_swimmer_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png
rename to graphics/trainers/front_pics/rs_swimmer_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png b/graphics/trainers/front_pics/rs_swimmer_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png
rename to graphics/trainers/front_pics/rs_swimmer_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png b/graphics/trainers/front_pics/rs_tuber_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_tuber_f_front_pic.png
rename to graphics/trainers/front_pics/rs_tuber_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_twins_front_pic.png b/graphics/trainers/front_pics/rs_twins_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_twins_front_pic.png
rename to graphics/trainers/front_pics/rs_twins_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_young_couple_front_pic.png b/graphics/trainers/front_pics/rs_young_couple_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_young_couple_front_pic.png
rename to graphics/trainers/front_pics/rs_young_couple_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_youngster_front_pic.png b/graphics/trainers/front_pics/rs_youngster_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_youngster_front_pic.png
rename to graphics/trainers/front_pics/rs_youngster_front_pic.png
diff --git a/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png b/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png
deleted file mode 100644
index 28fedca384ff86e7ecb409558402742003422a84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-sbH$|p
z-p%f`l*Nl`YD!Axi~qfI)s$MSdrFJd&G!GrTAY-{|K4-eYD)kA{{R30D8Rk*00001
zbW%=J06^y0W&i*J8A(JzR7i=vl`(4+K@`Ua5^pD55%v_pN^%!CECkt$g-sGq0)By+
zy-o|~?MB4JBD2@IT-e!-2x)9q;Zg)ril5+GAw@og2%ceG8xbtx>>W0_d2^|J#j^1K
z&3kX&%>I{<{~y<O=K)XV01kU?*CPp~4cKED*iz6GK<!uxq!365@fv%H&v*a<3iMbc
ze8q6U=MwsDk)Xqpst<!UNED!H2>YGTGKqnwyrxnX;HTSeWE-eXy06^Z?qC%M7F^eD
zcrgwvx+`w$@gWY7?%n3bq2)O9FW%Z8i@sD8?;ho!EETe1?Lqzl*B$=STmOcqa72$c
zzCwuWtjBK&V6j<`1mlX|WFdQM)FopqQv5!TMbD(y1k*R^-~_hI#8jiRE;#Ix(dqlV
ztTBFBUT_<CK=_1=&c;WCve_;=t>%`mFWT@_14PZHAP-j^t=GrJ_&XtqnC)V5vwGIY
z=jTO9YMdE2q7UoyusADq6Tl4{(J?v+qL2C{61Hsy-pT-;>n^Dpw(gmLH$e(7G(c##
zdBX%Kh!h-GZ_C#=&A>AUrr(uOuK)@*3%UYO5(%*#P+;*WxC%gRKxLv-qPO}VVA)1A
z4@fH@vI6mx!a~WN3h3JbC2_l-3`xldt)cX{qbG#}d8JT=_CSlt()te!$POk3xKtn|
zmLZ$~^$Y{DsYCt(%t<e%D}QG;tF1C!SpS@t;xC+Y$$G9*0?GgY002ovPDHLkV1kvG
BFZ}=j

diff --git a/graphics/trainers/front_pics/tuber_front_pic.png b/graphics/trainers/front_pics/tuber_f_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/tuber_front_pic.png
rename to graphics/trainers/front_pics/tuber_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_tuber_m_front_pic.png b/graphics/trainers/front_pics/tuber_m_front_pic.png
similarity index 100%
rename from graphics/trainers/front_pics/emerald_tuber_m_front_pic.png
rename to graphics/trainers/front_pics/tuber_m_front_pic.png
diff --git a/graphics/trainers/palettes/arena_tycoon_greta.pal b/graphics/trainers/palettes/arena_tycoon_greta.pal
deleted file mode 100644
index 60c45e8e9..000000000
--- a/graphics/trainers/palettes/arena_tycoon_greta.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-139 172 213
-90 131 189
-255 230 106
-213 189 90
-213 222 230
-65 82 123
-189 156 90
-255 115 148
-213 82 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/brendan.pal b/graphics/trainers/palettes/brendan.pal
deleted file mode 100644
index 7274e303e..000000000
--- a/graphics/trainers/palettes/brendan.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 164 148
-205 131 115
-123 90 82
-98 123 156
-74 90 131
-49 65 106
-24 41 82
-222 230 238
-139 222 115
-98 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/blue_1.pal b/graphics/trainers/palettes/champion_rival.pal
similarity index 100%
rename from graphics/trainers/palettes/blue_1.pal
rename to graphics/trainers/palettes/champion_rival.pal
diff --git a/graphics/trainers/palettes/steven.pal b/graphics/trainers/palettes/champion_steven.pal
similarity index 100%
rename from graphics/trainers/palettes/steven.pal
rename to graphics/trainers/palettes/champion_steven.pal
diff --git a/graphics/trainers/palettes/roughneck.pal b/graphics/trainers/palettes/cue_ball.pal
similarity index 100%
rename from graphics/trainers/palettes/roughneck.pal
rename to graphics/trainers/palettes/cue_ball.pal
diff --git a/graphics/trainers/palettes/dome_ace_tucker.pal b/graphics/trainers/palettes/dome_ace_tucker.pal
deleted file mode 100644
index 33bb1aa68..000000000
--- a/graphics/trainers/palettes/dome_ace_tucker.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-246 148 230
-230 115 213
-189 90 172
-139 74 115
-213 205 246
-230 213 106
-156 148 197
-238 238 139
-213 180 98
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/emerald_leaf_back_pic.pal b/graphics/trainers/palettes/emerald_leaf_back_pic.pal
deleted file mode 100644
index 27436be92..000000000
--- a/graphics/trainers/palettes/emerald_leaf_back_pic.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-172 123 65
-255 197 148
-222 148 115
-123 65 65
-65 65 213
-57 57 123
-115 164 197
-106 41 41
-238 238 255
-180 180 213
-255 106 74
-197 57 57
-255 222 90
-189 156 57
-0 0 0
diff --git a/graphics/trainers/palettes/emerald_red_back_pic.pal b/graphics/trainers/palettes/emerald_red_back_pic.pal
deleted file mode 100644
index 3097a6556..000000000
--- a/graphics/trainers/palettes/emerald_red_back_pic.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-131 123 164
-172 123 65
-255 197 148
-222 148 115
-123 65 65
-65 65 213
-57 57 123
-115 164 197
-106 41 41
-238 238 255
-180 180 213
-255 106 74
-197 57 57
-255 222 90
-189 156 57
-0 0 0
diff --git a/graphics/trainers/palettes/factory_head_noland.pal b/graphics/trainers/palettes/factory_head_noland.pal
deleted file mode 100644
index 03bce8c77..000000000
--- a/graphics/trainers/palettes/factory_head_noland.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-172 172 189
-131 131 164
-98 98 123
-65 65 90
-222 213 246
-238 213 106
-246 131 123
-213 90 90
-180 57 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/giovanni.pal b/graphics/trainers/palettes/leader_giovanni.pal
similarity index 100%
rename from graphics/trainers/palettes/giovanni.pal
rename to graphics/trainers/palettes/leader_giovanni.pal
diff --git a/graphics/trainers/palettes/leader_juan.pal b/graphics/trainers/palettes/leader_juan.pal
deleted file mode 100644
index 96467bdc3..000000000
--- a/graphics/trainers/palettes/leader_juan.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 180 148
-180 131 98
-123 90 82
-213 115 222
-148 65 180
-106 148 255
-82 106 189
-74 74 148
-164 180 189
-98 115 123
-98 49 90
-213 213 222
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/champion_wallace.pal b/graphics/trainers/palettes/leader_wallace.pal
similarity index 100%
rename from graphics/trainers/palettes/champion_wallace.pal
rename to graphics/trainers/palettes/leader_wallace.pal
diff --git a/graphics/trainers/palettes/magma_admin.pal b/graphics/trainers/palettes/magma_admin_f.pal
similarity index 100%
rename from graphics/trainers/palettes/magma_admin.pal
rename to graphics/trainers/palettes/magma_admin_f.pal
diff --git a/graphics/trainers/palettes/ruby_magma_admin_f.pal b/graphics/trainers/palettes/magma_admin_m.pal
similarity index 100%
rename from graphics/trainers/palettes/ruby_magma_admin_f.pal
rename to graphics/trainers/palettes/magma_admin_m.pal
diff --git a/graphics/trainers/palettes/may.pal b/graphics/trainers/palettes/may.pal
deleted file mode 100644
index fd706c07f..000000000
--- a/graphics/trainers/palettes/may.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 164 148
-205 131 115
-123 90 82
-98 98 115
-41 57 65
-164 106 82
-74 49 57
-205 205 222
-139 222 115
-98 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/palace_maven_spenser.pal b/graphics/trainers/palettes/palace_maven_spenser.pal
deleted file mode 100644
index 40a634974..000000000
--- a/graphics/trainers/palettes/palace_maven_spenser.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-230 205 156
-189 164 115
-164 131 82
-106 74 74
-172 172 213
-123 131 189
-90 98 148
-57 65 90
-222 213 246
-238 213 106
-246 230 180
-230 115 74
-222 180 98
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/pike_queen_lucy.pal b/graphics/trainers/palettes/pike_queen_lucy.pal
deleted file mode 100644
index fd3b46b8b..000000000
--- a/graphics/trainers/palettes/pike_queen_lucy.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-205 123 213
-148 90 148
-115 57 106
-57 57 57
-213 222 230
-172 65 65
-255 197 90
-115 106 123
-213 82 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/winstrate_f.pal b/graphics/trainers/palettes/pokefan_f.pal
similarity index 100%
rename from graphics/trainers/palettes/winstrate_f.pal
rename to graphics/trainers/palettes/pokefan_f.pal
diff --git a/graphics/trainers/palettes/winstrate_m.pal b/graphics/trainers/palettes/pokefan_m.pal
similarity index 100%
rename from graphics/trainers/palettes/winstrate_m.pal
rename to graphics/trainers/palettes/pokefan_m.pal
diff --git a/graphics/trainers/palettes/pokemon_breeder.pal b/graphics/trainers/palettes/pokemon_breeder_f.pal
similarity index 100%
rename from graphics/trainers/palettes/pokemon_breeder.pal
rename to graphics/trainers/palettes/pokemon_breeder_f.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_breeder_m.pal b/graphics/trainers/palettes/pokemon_breeder_m.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_pokemon_breeder_m.pal
rename to graphics/trainers/palettes/pokemon_breeder_m.pal
diff --git a/graphics/trainers/palettes/oak.pal b/graphics/trainers/palettes/professor_oak.pal
similarity index 100%
rename from graphics/trainers/palettes/oak.pal
rename to graphics/trainers/palettes/professor_oak.pal
diff --git a/graphics/trainers/palettes/pyramid_king_brandon.pal b/graphics/trainers/palettes/pyramid_king_brandon.pal
deleted file mode 100644
index 77b5483b8..000000000
--- a/graphics/trainers/palettes/pyramid_king_brandon.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-164 213 90
-123 172 65
-82 115 41
-57 82 41
-213 205 213
-172 123 90
-139 139 123
-131 98 65
-213 106 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/blue_2.pal b/graphics/trainers/palettes/rival_1.pal
similarity index 100%
rename from graphics/trainers/palettes/blue_2.pal
rename to graphics/trainers/palettes/rival_1.pal
diff --git a/graphics/trainers/palettes/champion_blue.pal b/graphics/trainers/palettes/rival_2.pal
similarity index 100%
rename from graphics/trainers/palettes/champion_blue.pal
rename to graphics/trainers/palettes/rival_2.pal
diff --git a/graphics/trainers/palettes/emerald_aroma_lady.pal b/graphics/trainers/palettes/rs_aroma_lady.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_aroma_lady.pal
rename to graphics/trainers/palettes/rs_aroma_lady.pal
diff --git a/graphics/trainers/palettes/emerald_beauty.pal b/graphics/trainers/palettes/rs_beauty.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_beauty.pal
rename to graphics/trainers/palettes/rs_beauty.pal
diff --git a/graphics/trainers/palettes/emerald_bird_keeper.pal b/graphics/trainers/palettes/rs_bird_keeper.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_bird_keeper.pal
rename to graphics/trainers/palettes/rs_bird_keeper.pal
diff --git a/graphics/trainers/palettes/emerald_black_belt.pal b/graphics/trainers/palettes/rs_black_belt.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_black_belt.pal
rename to graphics/trainers/palettes/rs_black_belt.pal
diff --git a/graphics/trainers/palettes/emerald_bug_catcher.pal b/graphics/trainers/palettes/rs_bug_catcher.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_bug_catcher.pal
rename to graphics/trainers/palettes/rs_bug_catcher.pal
diff --git a/graphics/trainers/palettes/emerald_camper.pal b/graphics/trainers/palettes/rs_camper.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_camper.pal
rename to graphics/trainers/palettes/rs_camper.pal
diff --git a/graphics/trainers/palettes/emerald_cool_trainer_f.pal b/graphics/trainers/palettes/rs_cool_trainer_f.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_cool_trainer_f.pal
rename to graphics/trainers/palettes/rs_cool_trainer_f.pal
diff --git a/graphics/trainers/palettes/emerald_cool_trainer_m.pal b/graphics/trainers/palettes/rs_cool_trainer_m.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_cool_trainer_m.pal
rename to graphics/trainers/palettes/rs_cool_trainer_m.pal
diff --git a/graphics/trainers/palettes/emerald_fisherman.pal b/graphics/trainers/palettes/rs_fisherman.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_fisherman.pal
rename to graphics/trainers/palettes/rs_fisherman.pal
diff --git a/graphics/trainers/palettes/emerald_gentleman.pal b/graphics/trainers/palettes/rs_gentleman.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_gentleman.pal
rename to graphics/trainers/palettes/rs_gentleman.pal
diff --git a/graphics/trainers/palettes/emerald_hiker.pal b/graphics/trainers/palettes/rs_hiker.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_hiker.pal
rename to graphics/trainers/palettes/rs_hiker.pal
diff --git a/graphics/trainers/palettes/emerald_lady.pal b/graphics/trainers/palettes/rs_lady.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_lady.pal
rename to graphics/trainers/palettes/rs_lady.pal
diff --git a/graphics/trainers/palettes/emerald_lass.pal b/graphics/trainers/palettes/rs_lass.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_lass.pal
rename to graphics/trainers/palettes/rs_lass.pal
diff --git a/graphics/trainers/palettes/emerald_picnicker.pal b/graphics/trainers/palettes/rs_picnicker.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_picnicker.pal
rename to graphics/trainers/palettes/rs_picnicker.pal
diff --git a/graphics/trainers/palettes/emerald_pokemaniac.pal b/graphics/trainers/palettes/rs_pokemaniac.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_pokemaniac.pal
rename to graphics/trainers/palettes/rs_pokemaniac.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_breeder_f.pal b/graphics/trainers/palettes/rs_pokemon_breeder_f.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_pokemon_breeder_f.pal
rename to graphics/trainers/palettes/rs_pokemon_breeder_f.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_ranger_f.pal b/graphics/trainers/palettes/rs_pokemon_ranger_f.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_pokemon_ranger_f.pal
rename to graphics/trainers/palettes/rs_pokemon_ranger_f.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_ranger_m.pal b/graphics/trainers/palettes/rs_pokemon_ranger_m.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_pokemon_ranger_m.pal
rename to graphics/trainers/palettes/rs_pokemon_ranger_m.pal
diff --git a/graphics/trainers/palettes/emerald_psychic_f.pal b/graphics/trainers/palettes/rs_psychic_f.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_psychic_f.pal
rename to graphics/trainers/palettes/rs_psychic_f.pal
diff --git a/graphics/trainers/palettes/emerald_psychic_m.pal b/graphics/trainers/palettes/rs_psychic_m.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_psychic_m.pal
rename to graphics/trainers/palettes/rs_psychic_m.pal
diff --git a/graphics/trainers/palettes/emerald_ruin_maniac.pal b/graphics/trainers/palettes/rs_ruin_maniac.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_ruin_maniac.pal
rename to graphics/trainers/palettes/rs_ruin_maniac.pal
diff --git a/graphics/trainers/palettes/emerald_sailor.pal b/graphics/trainers/palettes/rs_sailor.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_sailor.pal
rename to graphics/trainers/palettes/rs_sailor.pal
diff --git a/graphics/trainers/palettes/emerald_sis_and_bro.pal b/graphics/trainers/palettes/rs_sis_and_bro.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_sis_and_bro.pal
rename to graphics/trainers/palettes/rs_sis_and_bro.pal
diff --git a/graphics/trainers/palettes/emerald_swimmer_f.pal b/graphics/trainers/palettes/rs_swimmer_f.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_swimmer_f.pal
rename to graphics/trainers/palettes/rs_swimmer_f.pal
diff --git a/graphics/trainers/palettes/emerald_swimmer_m.pal b/graphics/trainers/palettes/rs_swimmer_m.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_swimmer_m.pal
rename to graphics/trainers/palettes/rs_swimmer_m.pal
diff --git a/graphics/trainers/palettes/emerald_tuber_f.pal b/graphics/trainers/palettes/rs_tuber_f.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_tuber_f.pal
rename to graphics/trainers/palettes/rs_tuber_f.pal
diff --git a/graphics/trainers/palettes/emerald_twins.pal b/graphics/trainers/palettes/rs_twins.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_twins.pal
rename to graphics/trainers/palettes/rs_twins.pal
diff --git a/graphics/trainers/palettes/emerald_young_couple.pal b/graphics/trainers/palettes/rs_young_couple.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_young_couple.pal
rename to graphics/trainers/palettes/rs_young_couple.pal
diff --git a/graphics/trainers/palettes/emerald_youngster.pal b/graphics/trainers/palettes/rs_youngster.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_youngster.pal
rename to graphics/trainers/palettes/rs_youngster.pal
diff --git a/graphics/trainers/palettes/salon_maiden_anabel.pal b/graphics/trainers/palettes/salon_maiden_anabel.pal
deleted file mode 100644
index 91776562f..000000000
--- a/graphics/trainers/palettes/salon_maiden_anabel.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-230 139 255
-189 115 213
-148 90 172
-123 74 139
-213 205 246
-255 197 90
-156 148 197
-255 222 115
-213 106 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/tuber.pal b/graphics/trainers/palettes/tuber_f.pal
similarity index 100%
rename from graphics/trainers/palettes/tuber.pal
rename to graphics/trainers/palettes/tuber_f.pal
diff --git a/graphics/trainers/palettes/emerald_tuber_m.pal b/graphics/trainers/palettes/tuber_m.pal
similarity index 100%
rename from graphics/trainers/palettes/emerald_tuber_m.pal
rename to graphics/trainers/palettes/tuber_m.pal
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index a2392eda1..310965fa0 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -59,7 +59,7 @@
 #define TRAINER_PIC_WALLY                  55
 #define TRAINER_PIC_RS_BRENDAN_1           56
 #define TRAINER_PIC_RS_MAY_1               57
-#define TRAINER_PIC_RS_POKEMON_BREEDER_M   58
+#define TRAINER_PIC_POKEMON_BREEDER_M      58
 #define TRAINER_PIC_RS_POKEMON_BREEDER_F   59
 #define TRAINER_PIC_RS_POKEMON_RANGER_M    60
 #define TRAINER_PIC_RS_POKEMON_RANGER_F    61
diff --git a/include/data.h b/include/data.h
index 9f1a10f47..99594209b 100644
--- a/include/data.h
+++ b/include/data.h
@@ -58,7 +58,7 @@ extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_OldMan[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_RSMay[];
 
 #endif // GUARD_DATA_H
diff --git a/include/graphics.h b/include/graphics.h
index bd6c2c800..a82f200d3 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3453,8 +3453,8 @@ extern const u8 gTrainerBackPic_Red[];
 extern const u8 gTrainerBackPic_Leaf[];
 extern const u8 gTrainerBackPic_PokeDude[];
 extern const u8 gTrainerBackPic_OldMan[];
-extern const u8 gTrainerBackPic_RubySapphireBrendan[];
-extern const u8 gTrainerBackPic_RubySapphireMay[];
+extern const u8 gTrainerBackPic_RSBrendan[];
+extern const u8 gTrainerBackPic_RSMay[];
 
 // mail
 extern const u16 gFile_graphics_mail_orange_palette_pal[];
diff --git a/src/data.c b/src/data.c
index 861bd57ec..cc715bd15 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[] =
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,
     },

From 790966aec02d9e8540a1adcf39b7b6c0be55c0d5 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Thu, 17 Oct 2019 00:23:41 -0700
Subject: [PATCH 5/8] Dump gTrainerFrontPicTable and
 gTrainerFrontPicPaletteTable.

---
 data/data.s                                  |   7 +-
 data/graphics.s                              |   2 +-
 include/graphics.h                           | 299 ++++++++++++++++++
 src/data.c                                   |   3 +
 src/data/trainer_graphics/front_pic_tables.h | 306 ++++++++++++++++++-
 5 files changed, 610 insertions(+), 7 deletions(-)

diff --git a/data/data.s b/data/data.s
index 97d3775fa..7f266c872 100644
--- a/data/data.s
+++ b/data/data.s
@@ -7,11 +7,8 @@
 
 	.section .rodata
 
-gTrainerFrontPicTable:: @ 823957C
-	.incbin "baserom.gba", 0x23957C, 0x4A0
-
-gTrainerFrontPicPaletteTable:: @ 8239A1C
-	.incbin "baserom.gba", 0x239A1C, 0x558
+gAnimCmd_8239EBC:: @ 8239EBC
+	.incbin "baserom.gba", 0x239EBC, 0xB8
 
 gTrainerBackAnimsPtrTable:: @ 8239F74
 	.incbin "baserom.gba", 0x239F74, 0x18
diff --git a/data/graphics.s b/data/graphics.s
index 3df819968..23130b8df 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13332,7 +13332,7 @@ gTrainerPalette_CrushGirl:: @ 8E6832C
 	.incbin "graphics/trainers/palettes/crush_girl.gbapal.lz"
 
 	.align 2
-gTrainerFrontPic_TubeFr:: @ 8E68354
+gTrainerFrontPic_TuberF:: @ 8E68354
 	.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
 
 	.align 2
diff --git a/include/graphics.h b/include/graphics.h
index a82f200d3..4e24cf9d8 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2446,6 +2446,305 @@ extern const u32 gMonBackPic_DoubleQuestionMark[];
 extern const u32 gMonPalette_DoubleQuestionMark[];
 extern const u32 gMonShinyPalette_DoubleQuestionMark[];
 
+// trainer sprites
+extern const u32 gTrainerFrontPic_AquaLeaderArchie[];
+extern const u32 gTrainerFrontPic_AquaGruntM[];
+extern const u32 gTrainerFrontPic_AquaGruntF[];
+extern const u32 gTrainerFrontPic_RSAromaLady[];
+extern const u32 gTrainerFrontPic_RSRuinManiac[];
+extern const u32 gTrainerFrontPic_Interviewer[];
+extern const u32 gTrainerFrontPic_RSTuberF[];
+extern const u32 gTrainerFrontPic_TuberM[];
+extern const u32 gTrainerFrontPic_RSCooltrainerM[];
+extern const u32 gTrainerFrontPic_RSCooltrainerF[];
+extern const u32 gTrainerFrontPic_HexManiac[];
+extern const u32 gTrainerFrontPic_RSLady[];
+extern const u32 gTrainerFrontPic_RSBeauty[];
+extern const u32 gTrainerFrontPic_RichBoy[];
+extern const u32 gTrainerFrontPic_RSPokeManiac[];
+extern const u32 gTrainerFrontPic_RSSwimmerM[];
+extern const u32 gTrainerFrontPic_RSBlackBelt[];
+extern const u32 gTrainerFrontPic_Guitarist[];
+extern const u32 gTrainerFrontPic_Kindler[];
+extern const u32 gTrainerFrontPic_RSCamper[];
+extern const u32 gTrainerFrontPic_BugManiac[];
+extern const u32 gTrainerFrontPic_RSPsychicM[];
+extern const u32 gTrainerFrontPic_RSPsychicF[];
+extern const u32 gTrainerFrontPic_RSGentleman[];
+extern const u32 gTrainerFrontPic_EliteFourSidney[];
+extern const u32 gTrainerFrontPic_EliteFourPhoebe[];
+extern const u32 gTrainerFrontPic_LeaderRoxanne[];
+extern const u32 gTrainerFrontPic_LeaderBrawly[];
+extern const u32 gTrainerFrontPic_LeaderTateAndLiza[];
+extern const u32 gTrainerFrontPic_SchoolKidM[];
+extern const u32 gTrainerFrontPic_SchoolKidF[];
+extern const u32 gTrainerFrontPic_SrAndJr[];
+extern const u32 gTrainerFrontPic_PokefanM[];
+extern const u32 gTrainerFrontPic_PokefanF[];
+extern const u32 gTrainerFrontPic_ExpertM[];
+extern const u32 gTrainerFrontPic_ExpertF[];
+extern const u32 gTrainerFrontPic_RSYoungster[];
+extern const u32 gTrainerFrontPic_ChampionSteven[];
+extern const u32 gTrainerFrontPic_RSFisherman[];
+extern const u32 gTrainerFrontPic_CyclingTriathleteM[];
+extern const u32 gTrainerFrontPic_CyclingTriathleteF[];
+extern const u32 gTrainerFrontPic_RunningTriathleteM[];
+extern const u32 gTrainerFrontPic_RunningTriathleteF[];
+extern const u32 gTrainerFrontPic_SwimmingTriathleteM[];
+extern const u32 gTrainerFrontPic_SwimmingTriathleteF[];
+extern const u32 gTrainerFrontPic_DragonTamer[];
+extern const u32 gTrainerFrontPic_RSBirdKeeper[];
+extern const u32 gTrainerFrontPic_NinjaBoy[];
+extern const u32 gTrainerFrontPic_BattleGirl[];
+extern const u32 gTrainerFrontPic_ParasolLady[];
+extern const u32 gTrainerFrontPic_RSSwimmerF[];
+extern const u32 gTrainerFrontPic_RSPicnicker[];
+extern const u32 gTrainerFrontPic_RSTwins[];
+extern const u32 gTrainerFrontPic_RSSailor[];
+extern const u32 gTrainerFrontPic_Collector[];
+extern const u32 gTrainerFrontPic_Wally[];
+extern const u32 gTrainerFrontPic_RSBrendan1[];
+extern const u32 gTrainerFrontPic_RSMay1[];
+extern const u32 gTrainerFrontPic_PokemonBreederM[];
+extern const u32 gTrainerFrontPic_RSPokemonBreederF[];
+extern const u32 gTrainerFrontPic_RSPokemonRangerM[];
+extern const u32 gTrainerFrontPic_RSPokemonRangerF[];
+extern const u32 gTrainerFrontPic_MagmaLeaderMaxie[];
+extern const u32 gTrainerFrontPic_MagmaGruntM[];
+extern const u32 gTrainerFrontPic_MagmaGruntF[];
+extern const u32 gTrainerFrontPic_RSLass[];
+extern const u32 gTrainerFrontPic_RSBugCatcher[];
+extern const u32 gTrainerFrontPic_RSHiker[];
+extern const u32 gTrainerFrontPic_RSYoungCouple[];
+extern const u32 gTrainerFrontPic_OldCouple[];
+extern const u32 gTrainerFrontPic_RSSisAndBro[];
+extern const u32 gTrainerFrontPic_AquaAdminM[];
+extern const u32 gTrainerFrontPic_AquaAdminF[];
+extern const u32 gTrainerFrontPic_MagmaAdminM[];
+extern const u32 gTrainerFrontPic_MagmaAdminF[];
+extern const u32 gTrainerFrontPic_LeaderWattson[];
+extern const u32 gTrainerFrontPic_LeaderFlannery[];
+extern const u32 gTrainerFrontPic_LeaderNorman[];
+extern const u32 gTrainerFrontPic_LeaderWinona[];
+extern const u32 gTrainerFrontPic_LeaderWallace[];
+extern const u32 gTrainerFrontPic_EliteFourGlacia[];
+extern const u32 gTrainerFrontPic_EliteFourDrake[];
+extern const u32 gTrainerFrontPic_Youngster[];
+extern const u32 gTrainerFrontPic_BugCatcher[];
+extern const u32 gTrainerFrontPic_Lass[];
+extern const u32 gTrainerFrontPic_Sailor[];
+extern const u32 gTrainerFrontPic_Camper[];
+extern const u32 gTrainerFrontPic_Picnicker[];
+extern const u32 gTrainerFrontPic_PokeManiac[];
+extern const u32 gTrainerFrontPic_SuperNerd[];
+extern const u32 gTrainerFrontPic_Hiker[];
+extern const u32 gTrainerFrontPic_Biker[];
+extern const u32 gTrainerFrontPic_Burglar[];
+extern const u32 gTrainerFrontPic_Engineer[];
+extern const u32 gTrainerFrontPic_Fisherman[];
+extern const u32 gTrainerFrontPic_SwimmerM[];
+extern const u32 gTrainerFrontPic_CueBall[];
+extern const u32 gTrainerFrontPic_Gamer[];
+extern const u32 gTrainerFrontPic_Beauty[];
+extern const u32 gTrainerFrontPic_SwimmerF[];
+extern const u32 gTrainerFrontPic_PsychicM[];
+extern const u32 gTrainerFrontPic_Rocker[];
+extern const u32 gTrainerFrontPic_Juggler[];
+extern const u32 gTrainerFrontPic_Tamer[];
+extern const u32 gTrainerFrontPic_BirdKeeper[];
+extern const u32 gTrainerFrontPic_BlackBelt[];
+extern const u32 gTrainerFrontPic_Rival1[];
+extern const u32 gTrainerFrontPic_Scientist[];
+extern const u32 gTrainerFrontPic_LeaderGiovanni[];
+extern const u32 gTrainerFrontPic_RocketGruntM[];
+extern const u32 gTrainerFrontPic_CooltrainerM[];
+extern const u32 gTrainerFrontPic_CooltrainerF[];
+extern const u32 gTrainerFrontPic_EliteFourLorelei[];
+extern const u32 gTrainerFrontPic_EliteFourBruno[];
+extern const u32 gTrainerFrontPic_EliteFourAgatha[];
+extern const u32 gTrainerFrontPic_EliteFourLance[];
+extern const u32 gTrainerFrontPic_LeaderBrock[];
+extern const u32 gTrainerFrontPic_LeaderMisty[];
+extern const u32 gTrainerFrontPic_LeaderLtSurge[];
+extern const u32 gTrainerFrontPic_LeaderErika[];
+extern const u32 gTrainerFrontPic_LeaderKoga[];
+extern const u32 gTrainerFrontPic_LeaderBlaine[];
+extern const u32 gTrainerFrontPic_LeaderSabrina[];
+extern const u32 gTrainerFrontPic_Gentleman[];
+extern const u32 gTrainerFrontPic_Rival2[];
+extern const u32 gTrainerFrontPic_ChampionRival[];
+extern const u32 gTrainerFrontPic_Channeler[];
+extern const u32 gTrainerFrontPic_Twins[];
+extern const u32 gTrainerFrontPic_CoolCouple[];
+extern const u32 gTrainerFrontPic_YoungCouple[];
+extern const u32 gTrainerFrontPic_CrushKin[];
+extern const u32 gTrainerFrontPic_SisAndBro[];
+extern const u32 gTrainerFrontPic_ProfessorOak[];
+extern const u32 gTrainerFrontPic_RSBrendan2[];
+extern const u32 gTrainerFrontPic_RSMay2[];
+extern const u32 gTrainerFrontPic_Red[];
+extern const u32 gTrainerFrontPic_Leaf[];
+extern const u32 gTrainerFrontPic_RocketGruntF[];
+extern const u32 gTrainerFrontPic_PsychicF[];
+extern const u32 gTrainerFrontPic_CrushGirl[];
+extern const u32 gTrainerFrontPic_TuberF[];
+extern const u32 gTrainerFrontPic_PokemonBreederF[];
+extern const u32 gTrainerFrontPic_PokemonRangerM[];
+extern const u32 gTrainerFrontPic_PokemonRangerF[];
+extern const u32 gTrainerFrontPic_AromaLady[];
+extern const u32 gTrainerFrontPic_RuinManiac[];
+extern const u32 gTrainerFrontPic_Lady[];
+extern const u32 gTrainerFrontPic_Painter[];
+
+extern const u32 gTrainerPalette_AquaLeaderArchie[];
+extern const u32 gTrainerPalette_AquaGruntM[];
+extern const u32 gTrainerPalette_AquaGruntF[];
+extern const u32 gTrainerPalette_RSAromaLady[];
+extern const u32 gTrainerPalette_RSRuinManiac[];
+extern const u32 gTrainerPalette_Interviewer[];
+extern const u32 gTrainerPalette_RSTuberF[];
+extern const u32 gTrainerPalette_TuberM[];
+extern const u32 gTrainerPalette_RSCooltrainerM[];
+extern const u32 gTrainerPalette_RSCooltrainerF[];
+extern const u32 gTrainerPalette_HexManiac[];
+extern const u32 gTrainerPalette_RSLady[];
+extern const u32 gTrainerPalette_RSBeauty[];
+extern const u32 gTrainerPalette_RichBoy[];
+extern const u32 gTrainerPalette_RSPokeManiac[];
+extern const u32 gTrainerPalette_RSSwimmerM[];
+extern const u32 gTrainerPalette_RSBlackBelt[];
+extern const u32 gTrainerPalette_Guitarist[];
+extern const u32 gTrainerPalette_Kindler[];
+extern const u32 gTrainerPalette_RSCamper[];
+extern const u32 gTrainerPalette_BugManiac[];
+extern const u32 gTrainerPalette_RSPsychicM[];
+extern const u32 gTrainerPalette_RSPsychicF[];
+extern const u32 gTrainerPalette_RSGentleman[];
+extern const u32 gTrainerPalette_EliteFourSidney[];
+extern const u32 gTrainerPalette_EliteFourPhoebe[];
+extern const u32 gTrainerPalette_LeaderRoxanne[];
+extern const u32 gTrainerPalette_LeaderBrawly[];
+extern const u32 gTrainerPalette_LeaderTateAndLiza[];
+extern const u32 gTrainerPalette_SchoolKidM[];
+extern const u32 gTrainerPalette_SchoolKidF[];
+extern const u32 gTrainerPalette_SrAndJr[];
+extern const u32 gTrainerPalette_PokefanM[];
+extern const u32 gTrainerPalette_PokefanF[];
+extern const u32 gTrainerPalette_ExpertM[];
+extern const u32 gTrainerPalette_ExpertF[];
+extern const u32 gTrainerPalette_RSYoungster[];
+extern const u32 gTrainerPalette_ChampionSteven[];
+extern const u32 gTrainerPalette_RSFisherman[];
+extern const u32 gTrainerPalette_CyclingTriathleteM[];
+extern const u32 gTrainerPalette_CyclingTriathleteF[];
+extern const u32 gTrainerPalette_RunningTriathleteM[];
+extern const u32 gTrainerPalette_RunningTriathleteF[];
+extern const u32 gTrainerPalette_SwimmingTriathleteM[];
+extern const u32 gTrainerPalette_SwimmingTriathleteF[];
+extern const u32 gTrainerPalette_DragonTamer[];
+extern const u32 gTrainerPalette_RSBirdKeeper[];
+extern const u32 gTrainerPalette_NinjaBoy[];
+extern const u32 gTrainerPalette_BattleGirl[];
+extern const u32 gTrainerPalette_ParasolLady[];
+extern const u32 gTrainerPalette_RSSwimmerF[];
+extern const u32 gTrainerPalette_RSPicnicker[];
+extern const u32 gTrainerPalette_RSTwins[];
+extern const u32 gTrainerPalette_RSSailor[];
+extern const u32 gTrainerPalette_Collector[];
+extern const u32 gTrainerPalette_Wally[];
+extern const u32 gTrainerPalette_RSBrendan1[];
+extern const u32 gTrainerPalette_RSMay1[];
+extern const u32 gTrainerPalette_PokemonBreederM[];
+extern const u32 gTrainerPalette_RSPokemonBreederF[];
+extern const u32 gTrainerPalette_RSPokemonRangerM[];
+extern const u32 gTrainerPalette_RSPokemonRangerF[];
+extern const u32 gTrainerPalette_MagmaLeaderMaxie[];
+extern const u32 gTrainerPalette_MagmaGruntM[];
+extern const u32 gTrainerPalette_MagmaGruntF[];
+extern const u32 gTrainerPalette_RSLass[];
+extern const u32 gTrainerPalette_RSBugCatcher[];
+extern const u32 gTrainerPalette_RSHiker[];
+extern const u32 gTrainerPalette_RSYoungCouple[];
+extern const u32 gTrainerPalette_OldCouple[];
+extern const u32 gTrainerPalette_RSSisAndBro[];
+extern const u32 gTrainerPalette_AquaAdminM[];
+extern const u32 gTrainerPalette_AquaAdminF[];
+extern const u32 gTrainerPalette_MagmaAdminM[];
+extern const u32 gTrainerPalette_MagmaAdminF[];
+extern const u32 gTrainerPalette_LeaderWattson[];
+extern const u32 gTrainerPalette_LeaderFlannery[];
+extern const u32 gTrainerPalette_LeaderNorman[];
+extern const u32 gTrainerPalette_LeaderWinona[];
+extern const u32 gTrainerPalette_LeaderWallace[];
+extern const u32 gTrainerPalette_EliteFourGlacia[];
+extern const u32 gTrainerPalette_EliteFourDrake[];
+extern const u32 gTrainerPalette_Youngster[];
+extern const u32 gTrainerPalette_BugCatcher[];
+extern const u32 gTrainerPalette_Lass[];
+extern const u32 gTrainerPalette_Sailor[];
+extern const u32 gTrainerPalette_Camper[];
+extern const u32 gTrainerPalette_Picnicker[];
+extern const u32 gTrainerPalette_PokeManiac[];
+extern const u32 gTrainerPalette_SuperNerd[];
+extern const u32 gTrainerPalette_Hiker[];
+extern const u32 gTrainerPalette_Biker[];
+extern const u32 gTrainerPalette_Burglar[];
+extern const u32 gTrainerPalette_Engineer[];
+extern const u32 gTrainerPalette_Fisherman[];
+extern const u32 gTrainerPalette_SwimmerM[];
+extern const u32 gTrainerPalette_CueBall[];
+extern const u32 gTrainerPalette_Gamer[];
+extern const u32 gTrainerPalette_Beauty[];
+extern const u32 gTrainerPalette_SwimmerF[];
+extern const u32 gTrainerPalette_PsychicM[];
+extern const u32 gTrainerPalette_Rocker[];
+extern const u32 gTrainerPalette_Juggler[];
+extern const u32 gTrainerPalette_Tamer[];
+extern const u32 gTrainerPalette_BirdKeeper[];
+extern const u32 gTrainerPalette_BlackBelt[];
+extern const u32 gTrainerPalette_Rival1[];
+extern const u32 gTrainerPalette_Scientist[];
+extern const u32 gTrainerPalette_LeaderGiovanni[];
+extern const u32 gTrainerPalette_RocketGruntM[];
+extern const u32 gTrainerPalette_CooltrainerM[];
+extern const u32 gTrainerPalette_CooltrainerF[];
+extern const u32 gTrainerPalette_EliteFourLorelei[];
+extern const u32 gTrainerPalette_EliteFourBruno[];
+extern const u32 gTrainerPalette_EliteFourAgatha[];
+extern const u32 gTrainerPalette_EliteFourLance[];
+extern const u32 gTrainerPalette_LeaderBrock[];
+extern const u32 gTrainerPalette_LeaderMisty[];
+extern const u32 gTrainerPalette_LeaderLtSurge[];
+extern const u32 gTrainerPalette_LeaderErika[];
+extern const u32 gTrainerPalette_LeaderKoga[];
+extern const u32 gTrainerPalette_LeaderBlaine[];
+extern const u32 gTrainerPalette_LeaderSabrina[];
+extern const u32 gTrainerPalette_Gentleman[];
+extern const u32 gTrainerPalette_Rival2[];
+extern const u32 gTrainerPalette_ChampionRival[];
+extern const u32 gTrainerPalette_Channeler[];
+extern const u32 gTrainerPalette_Twins[];
+extern const u32 gTrainerPalette_CoolCouple[];
+extern const u32 gTrainerPalette_YoungCouple[];
+extern const u32 gTrainerPalette_CrushKin[];
+extern const u32 gTrainerPalette_SisAndBro[];
+extern const u32 gTrainerPalette_ProfessorOak[];
+extern const u32 gTrainerPalette_RSBrendan2[];
+extern const u32 gTrainerPalette_RSMay2[];
+extern const u32 gTrainerPalette_Red[];
+extern const u32 gTrainerPalette_Leaf[];
+extern const u32 gTrainerPalette_RocketGruntF[];
+extern const u32 gTrainerPalette_PsychicF[];
+extern const u32 gTrainerPalette_CrushGirl[];
+extern const u32 gTrainerPalette_TuberF[];
+extern const u32 gTrainerPalette_PokemonBreederF[];
+extern const u32 gTrainerPalette_PokemonRangerM[];
+extern const u32 gTrainerPalette_PokemonRangerF[];
+extern const u32 gTrainerPalette_AromaLady[];
+extern const u32 gTrainerPalette_RuinManiac[];
+extern const u32 gTrainerPalette_Lady[];
+extern const u32 gTrainerPalette_Painter[];
+
 extern const u8 gFireRedMenuElements_Gfx[];
 extern const u16 gFireRedMenuElements1_Pal[];
 extern const u16 gFireRedMenuElements2_Pal[];
diff --git a/src/data.c b/src/data.c
index cc715bd15..42c9cfaab 100644
--- a/src/data.c
+++ b/src/data.c
@@ -275,6 +275,9 @@ 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"
diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h
index 1a8f4e856..46746c213 100644
--- a/src/data/trainer_graphics/front_pic_tables.h
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -148,4 +148,308 @@ const struct MonCoords gTrainerFrontPicCoords[] =
     {.size = 8, .y_offset = 1},
     {.size = 8, .y_offset = 1},
     {.size = 8, .y_offset = 1},
-};
\ No newline at end of file
+};
+
+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),
+};

From bcbd4bcee2d3214d5d7a39b188ebb1639b05ae69 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Thu, 17 Oct 2019 13:16:42 -0700
Subject: [PATCH 6/8] Fix build and bump baserom.ips.

---
 baserom.ips     | Bin 1675622 -> 1671478 bytes
 data/graphics.s |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/baserom.ips b/baserom.ips
index 59846cc98218779bbe2454daee8e62977d7b5dd7..998959a174bf9119a36749504645fcff0c34e108 100644
GIT binary patch
delta 121
zcmaF1C~aF)T0;xt7A8{{mU(;J=1gx4VUlWZ4q*afW*}w(Vpbq#17da{<^W<&Am##M
sZXo6XVqPHT17dz4764*FAQl2*VIUR(Vo@L#17dL?me}4LBKg<`0OjQ@>;M1&

delta 4295
zcmc)Le@v8z9mnyHNcB{dtN7!bS3L_>TdhM2?XB9D>Q&L66$`beMT;x5wBGb)(W0Y$
zu9YgbCtll2Br7q*(d3%3jjY7kgrsC6+ihbBOISiOvXPDF!V;E|NH(&NW$$md{<Fj-
zOSWS2=Jjw7a?jm!e!TJKvF!C@@upebIi(?|C2^pCY*(RYhH_@=iU0My&WyeCe_nty
zb8r1;7vTKA?t7x8(37MTwNe|kQwOD~le$_89Zxq0H>rnusgE+$PXjbaLo`eyG)iMM
zP7^dqQ#4JwQs~Jg59N`UmXMG96rdtnPaCQD3irQ+gCK3AG73>Sg{gw7C_>d#L$y>#
zQHoJLHBckPsfn5?K}kwcE45KObx@i*smtL@H{GNj>ZLx)P(KaOAPvzljnF8K(Kt=e
zBu&vYDakuP9?ByxEg>KIDL_TEo;H$G%$E`h(l#oi5S3GyDyWJgR82KhOLY{b7}Zk)
zHBy|KsF@O!q!hJM8?{phrKvN?{qN$Sn{HAM^->>YsGkOCkcP-JOZwmD{1?A4ho7}>
zcM<>T+~<Gi-+#vW{KO3D-1gOcF&E_A{_XriE`a+VxjgETN9swMvlL31IZ9tOXDjtB
zGgpyo<{c{fwmC-=ADVO3kv2W*{*F0M6W=rEtLX>k0@d6w^A!8UT&Qr5xk#g*qT|U|
z|BvheuOdG&?^N#3&Bbc{rCFf#fVo70Uz<x+KV&Xb-*3$28vm{7Q~B@B6^gm$m((<7
zu2k8$=~w53d6!bR%vFl~Wz^%yyIK=};{k6#gMYUZYm~`x@op8*F$+~c&n!|X&s?jH
zeDfZ46`*&W#+KXn>*e>G_iB2Td7m<C%nkCdH8(1--n?IJ8_Z3b-sCzQd|BGU1Kwhl
zm)eQVN(ap?YTs%;p!B0=iBj9mQbl)~52|&K`H+%(&7k@#%&%y&(tKFqXU(ljA2PSe
zcf@=|^+(M|m8^B_;4ua3%rcE1Hy_vd33I#3PMJG2cE${8;GFq{JaKcU8k@{riZq+$
z3MI_l3MI`w@~6xvmAGn#Rq}zkSFP8~r&Q)#w}X8e`OvIT;v;jvs=sSKt)ecoQmK#4
zDy46j&uHQk^MIy$%xC54H6t4Tv3XD%e`+35-!IJPRP`&fTA4xfu%?I1BXS0Y?cjM0
z{LZXVuWKGv;~&khN`Eq6(2@zWR&BS;uPHEP9#hk_`J!r+#X5y^&6kw&m@lh-fq7gF
z`DRpIi_NbqZ<%?*QSJ&mIH{1|jHz|C`3>b2nWt2-&U{5>8_arjZ!%A7c(Zv%sZ#S*
zbp_1^m2ET6s=mxTr;Z)wH<i1~Y*b*6`I<s|P3Lum_J4Muo+>l0zJul)3LY`vlxofM
zYOXVz<d2$fDRR=hp!g~CqPkC;&GMZ!FDcS!zO6vqd`DI1&4l6?%*z_PgpQ|0vCH<r
z74;|0Bm-o=tA<wdJ!L*H-&e{8ia&k^ig8q&f#UxYMH#5sSj<4>;`H@VW=hI1P;;=6
zftrg62FiXxhJl)g)eMv~pMxL^wE)Xms5~rUp%!8f3$+M47^r+KW}v({{IgMJN{TU1
zi!shX72wq1C^IF68K|Y$#y~B@J_c$z1{f$GmNQT*uzGCNVW%V?3$+rPSSUY6S*W|P
zn1xz}83t-Kb}~=_Y-ga>pof9F8^a7#A^I7pB5Y)!)?#yk%S=hV4AeTDT<J1X(jWtM
zFSf7Y-~WAfqR3^Zcm?ZRc1o&eq3*}QO)fhn4Q+O9rW9bHiZRYWZN>%$YKwi(Ks|s_
z2C4)@3{)w`7^nxaj)8gzI~b@S_E);h6z{adLOskuoQ2wo6Ng=PidV!!J%V+$E;}W8
z8K}pwkAW&P8K}q6$3ShzUIuChrWvRZj_|^sz$yl6Cl)hMyU@=-m75IIZgeK!ciAaE
z<Sf*an8!keF~&meMIQt86y9W@_F*jpRe>c8)P9`)zROJU%0G6QDP9NzRfQP_>KPnh
zpbp^3r!F(ag)>kQ%w?bs^89LJp$_rDMi%NhY-gdWagc>NjA;hyh{-@bkF5+;4OTHw
zM{#J}wVBfRpIv5(TX)N4rnr@Vb(twXWDL|X3^GtJVi5yXhfxOVC7xel7V2dls9>Rv
zV>1gC#nGi%c8X8CFY7sheg^6!#u%uWoiEHXQ_}i%S!RlNih+6s6AV;6b~8|?G0H%l
z!Da^PRrE1X4H#yi&hq?fWTDRC@Xjnd#g*^QvQs=E3-y}GK)sGB2FiZEje&}zmw|c%
zhhE6qOsR%}I**gbv&<CtoPl}^BMj69OfXOvaiSs1OmUupdioLvQ%;th;uf$_?_h+5
zN?<Pwbs5VUs21#Cpst{wfl6Wp1NAPpGf?kg>ROhWy1Flv<G)xL%AwhmOLx#5noAy<
kNAqa`<<UY~MET^UJ83Z$&=Oio%V;_Iepne=@rP~y0Q96y!vFvP

diff --git a/data/graphics.s b/data/graphics.s
index 23130b8df..6b5d0c499 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13269,11 +13269,11 @@ gTrainerPalette_SisAndBro:: @ 8E66860
 
 	.align 2
 gTrainerFrontPic_ProfessorOak:: @ 8E66888
-	.incbin "graphics/trainers/front_pics/oak_front_pic.4bpp.lz"
+	.incbin "graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz"
 
 	.align 2
 gTrainerPalette_ProfessorOak:: @ 8E66Bf4
-	.incbin "graphics/trainers/palettes/oak.gbapal.lz"
+	.incbin "graphics/trainers/palettes/professor_oak.gbapal.lz"
 
 	.align 2
 gTrainerFrontPic_RSBrendan2:: @ 8E66C1C

From a5349dd82286543971b710090acf8b521f633754 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Thu, 17 Oct 2019 16:21:47 -0400
Subject: [PATCH 7/8] Finish music dump

---
 ld_script.txt                       |   8 +-
 songs.mk                            |   3 +
 sound/songs/midi/mus_battle20.mid   | Bin 15959 -> 15995 bytes
 sound/songs/midi/mus_battle32.mid   | Bin 13549 -> 13585 bytes
 sound/songs/midi/mus_fanfa1.mid     | Bin 0 -> 485 bytes
 sound/songs/midi/mus_fanfa4.mid     | Bin 0 -> 783 bytes
 sound/songs/midi/mus_fanfa5.mid     | Bin 0 -> 1109 bytes
 sound/songs/midi/mus_me_b_big.mid   | Bin 1330 -> 1362 bytes
 sound/songs/midi/mus_me_b_small.mid | Bin 783 -> 815 bytes
 sound/songs/midi/mus_me_bachi.mid   | Bin 1690 -> 1722 bytes
 sound/songs/midi/mus_me_kinomi.mid  | Bin 484 -> 508 bytes
 sound/songs/midi/mus_me_shinka.mid  | Bin 234 -> 254 bytes
 sound/songs/midi/mus_me_waza.mid    | Bin 973 -> 1005 bytes
 sound/songs/midi/mus_p_school.mid   | Bin 3106 -> 3126 bytes
 sound/songs/midi/mus_shinka.mid     | Bin 6474 -> 6506 bytes
 sound/songs/midi/mus_w_door.mid     | Bin 0 -> 168 bytes
 sound/songs/mus_fanfa1.s            | 180 --------------
 sound/songs/mus_fanfa4.s            | 283 ----------------------
 sound/songs/mus_fanfa5.s            | 350 ----------------------------
 sound/songs/mus_w_door.s            |  77 ------
 20 files changed, 7 insertions(+), 894 deletions(-)
 create mode 100644 sound/songs/midi/mus_fanfa1.mid
 create mode 100644 sound/songs/midi/mus_fanfa4.mid
 create mode 100644 sound/songs/midi/mus_fanfa5.mid
 create mode 100644 sound/songs/midi/mus_w_door.mid
 delete mode 100644 sound/songs/mus_fanfa1.s
 delete mode 100644 sound/songs/mus_fanfa4.s
 delete mode 100644 sound/songs/mus_fanfa5.s
 delete mode 100644 sound/songs/mus_w_door.s

diff --git a/ld_script.txt b/ld_script.txt
index 6ae4b85a6..551a63cef 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -768,7 +768,7 @@ SECTIONS {
         sound/songs/se_w287b.o(.rodata);
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
-        sound/songs/mus_w_door.o(.rodata);
+        sound/songs/midi/mus_w_door.o(.rodata);
         sound/songs/se_card1.o(.rodata);
         sound/songs/se_card2.o(.rodata);
         sound/songs/se_card3.o(.rodata);
@@ -784,9 +784,9 @@ SECTIONS {
         sound/songs/se_excellent.o(.rodata);
         sound/songs/se_nawamiss.o(.rodata);
         sound/songs/midi/mus_me_asa.o(.rodata);
-        sound/songs/mus_fanfa1.o(.rodata);
-        sound/songs/mus_fanfa4.o(.rodata);
-        sound/songs/mus_fanfa5.o(.rodata);
+        sound/songs/midi/mus_fanfa1.o(.rodata);
+        sound/songs/midi/mus_fanfa4.o(.rodata);
+        sound/songs/midi/mus_fanfa5.o(.rodata);
         sound/songs/midi/mus_me_bachi.o(.rodata);
         sound/songs/midi/mus_me_waza.o(.rodata);
         sound/songs/midi/mus_me_kinomi.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 53b697cc9..6458c2c9e 100644
--- a/songs.mk
+++ b/songs.mk
@@ -270,6 +270,9 @@ $(MID_SUBDIR)/mus_vs_tore.s: %.s: %.mid
 $(MID_SUBDIR)/mus_vs_yasei.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090
 
+$(MID_SUBDIR)/mus_w_door.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
 $(MID_SUBDIR)/mus_win_gym.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090
 
diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_battle20.mid
index a7140d9844b4502974739f93c6f0bf92ee55c5b6..531b5fba125566679d3c93a263115c2669539a4f 100644
GIT binary patch
delta 158
zcmca!^Sfq(D5LU3F?k+_|N0ERAw}5?4D4Sw+J0n565uf3Y{p^Cfg~biwYgBhObAJY
y&0zC-B^@>-5l-37k2NGYkwh52OlC3qfF!_TviXmZ0Sl4{yZUAmb7giGkZS-f!z;r8

delta 121
zcmexebG>GQD5LyDF?kN(kfLk`2KJ8|9Y3-|IUL5D?Kq4%pgbY7&9wq%LQo!?&gT6}
pI&4rLr{w1E8j_q)9>a&pGDaVu92SGk62=BBP#(MT<`8pbb^t<rAZ`Ev

diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_battle32.mid
index a52fc6b37a8ea06241f373d3ab4af121aaa01b8b..0b7c49bd762cb64c6c48a9a4f7c514c4b457eec6 100644
GIT binary patch
delta 159
zcmaExIWcR3D5LU3F?k+_|N0ERAw}5?46MQ%ZTVS|1XzA;4q^Sqf+WJ9v^j_?jvq;c
zt9kPd$$Bm%5tfe4_9`vNx|k9-pVo+FLQ=#0d$WP|cV;9J)<c{1_4l!|fSdyWFsCi6

delta 122
zcmbQ3^)_>YD5LyDF?kN(kfLk`23G!!j{K}p4$HUAF|6NMpgjJ#&2e0D{7@cO{pJ&r
p^;|HOEt`W?T3{-fVmCk5h-HGxF@N9eqy3#3%46NP*<XJjD*#YUBUJzZ

diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_fanfa1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..edf9c6e2880a9e3f701c6aa5d3c98a095cf91221
GIT binary patch
literal 485
zcmaiwO-chX7>3_WGA3qWyXc}IcIA4^35v)-KvIaz2<{s}a3fy8{vE*D9;DNm1E}>@
zF2<;X&a{gz^1XRJ!t+7~>74^`0OC(~kUrjfI!1ZJf}kr<UeWO4Q+Xsmc!ugpAFmNs
zJ%JN}-r@J;PmmAdSvxk;U^{7@T#@i-WYI4FESGqTkToqrD$I>zV*{2+Tf5iy=a?r>
zX5KhX>c&3aBdnW7$hLTiV>XGwcGARh?JW~iw+yjKkvA=3p%t5IV4*uz?qREBPD09W
uDUT^XrMwkPElAGM`u~C<KCV%0RV|HTGXpG5r^-E?C|PV(%@UB}x9SUqTx5g*

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_fanfa4.mid
new file mode 100644
index 0000000000000000000000000000000000000000..58cab9350d9d5fdb7d1fd2c76dd72ce8da624afe
GIT binary patch
literal 783
zcmZXPKTpC?6vYouc)gMi9UNF>>R{A>vkS%$L()i|SQ7^a2V+P~j4=+zMHCoKRP=j*
z!0z7<;3vZKOeOWP^z@wDbAPwnaq|d(Mg|@V+wu7cT^W=8Y*rP-rz$EYJ9F9ZyR{@f
zq-K8OGB7D4sh#?-CG@>(<d<-7jPx@(X&IoOf!s$%w<0L!nwgsVhLKi-b61TCY~Q=c
zdB>i&p7R#GWLJU2f7G`U29~;khqx&Nwr*lzKq|fFyPDCxrrhjt?rPi&Y(Gs+b~)4o
z|9u@Vq&}`*2Dhsas-~(LUA~mtWzPR}g?{Dt`@&0_!?MG;@;@3Fl2H^a3X1dgnGevb
zg)-!o?HVxTU-qh@Zdak0Yi4Tdw?b)eaqen03~WD5XW#Ccx!`jbBlm(cJXJ#(aYKi#
z5ifYEgt}9KVy>B~soxBxv&p%ul`ydV^abqOUCsrk{#Oa({62WZb7W-9RyP91q(0Y-
c?(%<`Yi4Td>qfeD&Rva6VEbumvg?of157fnmH+?%

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_fanfa5.mid
new file mode 100644
index 0000000000000000000000000000000000000000..519ebf29a60884929d65246374dba53222717cc9
GIT binary patch
literal 1109
zcma)(zi-+=7=~Zd6SmL|9y*|^LxxE45D}wFh(tv0;K3?N<hn%7;GqLUr7oybHw<+;
zLok`!{{RYQ?(ct#zDI0R;;QXnJ^tSN?(Vs}v(C#dfHE`~sGfCRzhY%!eJMn#YRHsW
zKfPCe5Dgx))|g{`1ofr;@8#zvW|aVXAES0?&h!^Te^iRvD9u#lZ6hy@+|Z0%VC015
z$U$k;B3q<Ox}-<4cXS?#=p5po4A>X2&*xTJc`x#TnTG1F=U9GeVqUS8=eW}~=eM4N
z4oY(s`P;}(qjp!$werJ38(=qYi3by^_o6EX7Z3#o%qcR?nDwdcD8{`oFNi&tUoY{I
z%U&P&a(Dn);J$AR_o2oOj^p}}JS1y=byy?oWSz8qYiMI{_uMP_Ex@8;s&h|#%XrJ%
znY2lsYT}U|u=vZ^-QJ1IIefirZeBag9p<OxDS1MkkPWgy)=66CdDiDx=7N`_<}M1C
zvy$JRVOi<XUL>@SX`j$OrhVdBV#z$_3H~r<Z1QdIZB6@__ME$0(>|s_LaUhe3GHLr
zC$x`gpU^(0eV%81jwP40S96yI`zP|p5kBets@`u-?Y?nk134S48!)GJk}FSZJ>!b6
znbYn|_P2Il^Mm{etoU3vRu9K-#5)W3(^CD58!NoSo~q?G-_+t5T;cy((>}GMS}L3O
K8#lR|iv9vt-U^BU

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_me_b_big.mid
index 2028f0016287b93f63ea382c1a0c954f199198a2..150a669b46e35bba967b52c69148589b8a7ad26e 100644
GIT binary patch
delta 135
zcmdnQb%|?&D5LsBF=ZZx|N0ERAw}5?3=BsmIvzmgZ=TG_xE@*H(BuP*`;Z0tC$}+m
fBMbCSmSpZk7RaBxia8refKhU@EQ=^33&>gkco8M5

delta 102
zcmcb_wTWwjD5LU3F=Y<lkfLk`28II@T@S$6>n95`u7`2<O+Lf8560=9JdLRv#_61_
X%iIa$WKTZCoDJnLif*=K5oH7b{yQ9N

diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_me_b_small.mid
index a51f48ed4169544b40b1385082101519fcd3311d..bf7aa33bee0d91c269bfd9088c5dbe966ecd789e 100644
GIT binary patch
delta 156
zcmeBYThBH@R70NOe*_B)lLQCD|3GH8=vfkQu08|9e|-kukfLk`28Kx!E&F(o_+Asw
ryP@zW%QB(}<WJ6K%tlsGJ^3DEIkJHL<X9$aWP#$z3z+g*K$ZXi#yu(4

delta 123
zcmZ3_*3ULUR7INMe*_B)lLQCD|3GH8=vfkQu0DfrNKrNe14G|L+dd8`+il`?H#mE;
iCL^4aJ-M1O8zxge`4eL~jAK2yl*t;#$)CK3DIWmK<{*{;

diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_me_bachi.mid
index 27b97f09c9e880012d7239347fc5c16cdb2514c6..05fe1516a2eae900077f818660462a6300569598 100644
GIT binary patch
delta 160
zcmbQmyNh>%sD?bl{|FWqCJ7E6D9!LckeMxd7Q=si1`zfQDavMGU^LulsmsWN5Ma1J
yIgjx+vcUAoflQN;1vX87!?X@bfH8UVBIbA$L#!rqvYH_)3E%9_8qCN7vIhX5Q7Ym9

delta 137
zcmdnRJBxRMsERbh{|FWqCJ7E6D9!LckeMxd7Q=si2H%jPYz78K-Ho=oj2sXS!|lms
zjJIK&$&+K5Cc`-ECjVht2jwuvZ{Efn57%TiS&`L@A8K4M&oKsuZS3`vKd{c9%*nPE
E0Nj`*z5oCK

diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_me_kinomi.mid
index 30fbd360749d9498d8ecbf3bb110dbd1bb5e4195..e7eb4afd11f064b8551a3e5ba44f4c3e7b369e61 100644
GIT binary patch
delta 121
zcmaFD{D*mhsD?bl{|FWqCJ7E6D9!LckeRJZn&H1b0|@(u6lF6oFjP&nEaO4q8%^A<
ahs?K{_|^=CKUtd*MWB9iCSx@V$OHhw(jY+q

delta 96
zcmeyv{DgUesERbh{|FWqCJ7E6D9!LckeRIuD6G%m8&Z_bz`#&8(YA~O%GR5>Uk}DM
UoA}cV&Yo<|2<KE!u4SwS0Mb+$IRF3v

diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_me_shinka.mid
index 81cd5d041b6df8523523b7853135881c1e5c4d67..231f2553314d8c3614a9931f6fb75ea85d716ae8 100644
GIT binary patch
delta 113
zcmaFG_>XadsDe1d{|FWqCJ7FP|AEZx3l$jt>ob6`Z%9!#0|SH9L_;wiB);85e=B6Z
i{ltmZYDn@@42KyQHnZ0=aD_8WwoWl<wg#I9QUL(0g&kM`

delta 111
zcmeyz_=<6YsFg6o{|FWqCJ7FP|AEZx3l$jt>ofR<6lF6oFo-c6&}Z1dUeCZ~!7#z7
sUZTN>K>{IbH8I?Z1FF(`;#_MvxURzt44Xl^!Wkx8rx-L_Gl0wl0AS=CQ~&?~

diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_me_waza.mid
index ac132f5ffda3a65b4b0a2e0847748817251b0c88..40f9c2ed8d5834def87904a00504d01f682c0792 100644
GIT binary patch
delta 133
zcmX@h{+4}$D5L&FF>M}(|N0ERAw}5?3=DA-J)=<ht5NvolX)49krgbN?7_GISzyKF
Z4~$EY1)L_&VX{LOct80O(`y!xr2x0dCM^H}

delta 100
zcmaFMewKZLD5Lg7F>MatkfLk`28O7KzEKGFW;ok;vLvH1Ok%<02*w34&XUP2OiN%K
RyUAOa>|mVNlm9Wj1^`SN8}0xA

diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_p_school.mid
index 55651dea57ca3f3532cae884bbb9cfc56c55c35d..4e6fd334076e72e06b508592a8663335c3ddcb58 100644
GIT binary patch
delta 85
zcmZ1^u}xxvD5KIuF*zQF|N0ERAw}5?3=H8DZGw^bEL%5D-^hY2(6BjxwFX&)DQNQ*
KPCq6VkRbs71s9b7

delta 64
zcmdlcu}ETqD5Km&F*y$3kfLk`28Q5?4#7}1%f^lKH?qJuHJf8tYhXMkzs*lL{g?nf
C;1RC?

diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_shinka.mid
index de8b2ab9127d2278de12cff174d602f4abd07628..375e6d5dbf729f4df6099e7e87f7a70bc49f0a3c 100644
GIT binary patch
delta 141
zcmX?Q^vY<0D5LU3F?k+_|N0ERAw}5?3{3tTZM~V01%ftDVDdv2VddZajD?#ONe#2r
m=AWEq%t#_ka+}S0rI2+oDQ%AAmqQj|Kfk$N@H9IM$Z`N%za+o_

delta 108
zcmaE5bjoOgD5LyDF?kN(kfLk`1}5)~j^0c#j^E}POnxvPEBEG4EZnS6IcBrXoLpwi
dFqKl9y?LczDw*Uq7xK%&c<iS)&lWt*4gkQj8i4=+

diff --git a/sound/songs/midi/mus_w_door.mid b/sound/songs/midi/mus_w_door.mid
new file mode 100644
index 0000000000000000000000000000000000000000..82ffd2ebe88ad323b6dcc68e26876d4f1c7e3b88
GIT binary patch
literal 168
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD&bS{10U22wKPRU!MUgrNeNbo?!!f
zJ;Mak6b7q$<_1#+1}g^U2~G)Y8`uk&8k`syH?X@hvxl=G^f)sdjA7U)!o$FB&hU`I
zfrWvOVPd=q(?bSfMg~nr20KQEFh+(LMutqrjqIvG6{U;}HH?k%3_z|pkXz3QGztLf
C)+CJp

literal 0
HcmV?d00001

diff --git a/sound/songs/mus_fanfa1.s b/sound/songs/mus_fanfa1.s
deleted file mode 100644
index 5987024ad..000000000
--- a/sound/songs/mus_fanfa1.s
+++ /dev/null
@@ -1,180 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_fanfa1_grp, voicegroup008
-	.equ	mus_fanfa1_pri, 5
-	.equ	mus_fanfa1_rev, reverb_set+50
-	.equ	mus_fanfa1_mvl, 90
-	.equ	mus_fanfa1_key, 0
-	.equ	mus_fanfa1_tbs, 1
-	.equ	mus_fanfa1_exg, 0
-	.equ	mus_fanfa1_cmp, 1
-
-	.section .rodata
-	.global	mus_fanfa1
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_fanfa1_1:
-	.byte	KEYSH , mus_fanfa1_key+0
-	.byte	TEMPO , 174*mus_fanfa1_tbs/2
-	.byte		VOICE , 46
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*mus_fanfa1_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte	W08
-	.byte		N04   , Bn3 , v100
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N24   , Gs4 
-	.byte	W10
-	.byte		MOD   , 5
-	.byte	W06
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_fanfa1_2:
-	.byte	KEYSH , mus_fanfa1_key+0
-	.byte		VOICE , 46
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*mus_fanfa1_mvl/mxv
-	.byte	W08
-	.byte		PAN   , c_v-16
-	.byte		N04   , En4 , v100
-	.byte	W08
-	.byte		PAN   , c_v+16
-	.byte		N04   
-	.byte	W08
-	.byte		PAN   , c_v-16
-	.byte		N04   
-	.byte	W08
-	.byte		PAN   , c_v+0
-	.byte		N24   , Bn4 
-	.byte	W10
-	.byte		MOD   , 5
-	.byte	W06
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_fanfa1_3:
-	.byte	KEYSH , mus_fanfa1_key+0
-	.byte		VOICE , 46
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*mus_fanfa1_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte	W08
-	.byte		N04   , Gs3 , v068
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N24   , En4 
-	.byte	W10
-	.byte		MOD   , 5
-	.byte	W06
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_fanfa1_4:
-	.byte	KEYSH , mus_fanfa1_key+0
-	.byte		VOICE , 84
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*mus_fanfa1_mvl/mxv
-	.byte	W08
-	.byte		N04   , Bn3 , v048
-	.byte	W04
-	.byte		        Bn3 , v020
-	.byte	W04
-	.byte		        Bn3 , v048
-	.byte	W04
-	.byte		        Bn3 , v020
-	.byte	W04
-	.byte		        Bn3 , v048
-	.byte	W04
-	.byte		        Bn3 , v020
-	.byte	W04
-	.byte		N24   , Gs4 , v048
-	.byte	W10
-	.byte		MOD   , 5
-	.byte	W03
-	.byte		VOL   , 101*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        68*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        36*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        15*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        0*mus_fanfa1_mvl/mxv
-	.byte	W15
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_fanfa1_5:
-	.byte	KEYSH , mus_fanfa1_key+0
-	.byte		VOICE , 85
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*mus_fanfa1_mvl/mxv
-	.byte	W08
-	.byte		N04   , En4 , v048
-	.byte	W04
-	.byte		        En4 , v020
-	.byte	W04
-	.byte		        En4 , v048
-	.byte	W04
-	.byte		        En4 , v020
-	.byte	W04
-	.byte		        En4 , v048
-	.byte	W04
-	.byte		        En4 , v020
-	.byte	W04
-	.byte		N24   , Bn4 , v048
-	.byte	W10
-	.byte		MOD   , 5
-	.byte	W03
-	.byte		VOL   , 101*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        68*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        36*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        15*mus_fanfa1_mvl/mxv
-	.byte	W03
-	.byte		        0*mus_fanfa1_mvl/mxv
-	.byte	W15
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_fanfa1:
-	.byte	5	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_fanfa1_pri	@ Priority
-	.byte	mus_fanfa1_rev	@ Reverb.
-
-	.word	mus_fanfa1_grp
-
-	.word	mus_fanfa1_1
-	.word	mus_fanfa1_2
-	.word	mus_fanfa1_3
-	.word	mus_fanfa1_4
-	.word	mus_fanfa1_5
-
-	.end
diff --git a/sound/songs/mus_fanfa4.s b/sound/songs/mus_fanfa4.s
deleted file mode 100644
index 58f52e0dd..000000000
--- a/sound/songs/mus_fanfa4.s
+++ /dev/null
@@ -1,283 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_fanfa4_grp, voicegroup008
-	.equ	mus_fanfa4_pri, 5
-	.equ	mus_fanfa4_rev, reverb_set+50
-.equ	mus_fanfa4_mvl, 90
-	.equ	mus_fanfa4_key, 0
-	.equ	mus_fanfa4_tbs, 1
-	.equ	mus_fanfa4_exg, 0
-	.equ	mus_fanfa4_cmp, 1
-
-	.section .rodata
-	.global	mus_fanfa4
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_fanfa4_1:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte	TEMPO , 190*mus_fanfa4_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 127*mus_fanfa4_mvl/mxv
-	.byte		PAN   , c_v-24
-	.byte		N16   , Gs4 , v080
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Ds4 
-	.byte	W08
-	.byte		        Gs4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		N08   , As4 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Gs4 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 116*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        102*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        58*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        20*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_fanfa4_2:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 46
-	.byte		VOL   , 127*mus_fanfa4_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		N16   , Cn5 , v104
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N08   , Cs5 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Cn5 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 116*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        102*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        58*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        20*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_fanfa4_3:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 58
-	.byte		VOL   , 127*mus_fanfa4_mvl/mxv
-	.byte		N16   , Gs1 , v120
-	.byte	W24
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N08   , Fs1 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		        Gn1 
-	.byte	W16
-	.byte		N48   , Gs1 
-	.byte	W24
-	.byte		VOL   , 116*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        102*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        58*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        20*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_fanfa4_4:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 82
-	.byte		VOL   , 127*mus_fanfa4_mvl/mxv
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v-48
-	.byte		N16   , Cn4 , v036
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		N08   , As3 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Gs3 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 116*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        102*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        58*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        20*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_fanfa4_5:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 83
-	.byte		VOL   , 127*mus_fanfa4_mvl/mxv
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+48
-	.byte		N16   , Gs3 , v036
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Ds3 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Ds3 
-	.byte	W08
-	.byte		N08   , Fs3 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Ds3 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 116*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        102*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        58*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        20*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_fanfa4_6:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 46
-	.byte		PAN   , c_v+24
-	.byte		VOL   , 127*mus_fanfa4_mvl/mxv
-	.byte		N16   , Ds4 , v080
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Cn4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		N08   , Fs4 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Ds4 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 116*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        102*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        58*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        20*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_fanfa4:
-	.byte	6	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_fanfa4_pri	@ Priority
-	.byte	mus_fanfa4_rev	@ Reverb.
-
-	.word	mus_fanfa4_grp
-
-	.word	mus_fanfa4_1
-	.word	mus_fanfa4_2
-	.word	mus_fanfa4_3
-	.word	mus_fanfa4_4
-	.word	mus_fanfa4_5
-	.word	mus_fanfa4_6
-
-	.end
diff --git a/sound/songs/mus_fanfa5.s b/sound/songs/mus_fanfa5.s
deleted file mode 100644
index 7ebd1e01d..000000000
--- a/sound/songs/mus_fanfa5.s
+++ /dev/null
@@ -1,350 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_fanfa5_grp, voicegroup008
-	.equ	mus_fanfa5_pri, 5
-	.equ	mus_fanfa5_rev, reverb_set+50
-	.equ	mus_fanfa5_mvl, 90
-	.equ	mus_fanfa5_key, 0
-	.equ	mus_fanfa5_tbs, 1
-	.equ	mus_fanfa5_exg, 0
-	.equ	mus_fanfa5_cmp, 1
-
-	.section .rodata
-	.global	mus_fanfa5
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_fanfa5_1:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte	TEMPO , 150*mus_fanfa5_tbs/2
-	.byte		VOICE , 56
-	.byte		PAN   , c_v+18
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N22   , Ds4 , v092
-	.byte	W16
-	.byte		VOL   , 96*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        51*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        127*mus_fanfa5_mvl/mxv
-	.byte		N22   , Cn4 
-	.byte	W16
-	.byte		VOL   , 96*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        51*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        127*mus_fanfa5_mvl/mxv
-	.byte		N16   , Gs3 
-	.byte	W16
-	.byte		N06   , Ds3 
-	.byte	W08
-	.byte		        Cn3 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		N04   , Fs4 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        As4 
-	.byte	W08
-	.byte		N48   , Gs4 
-	.byte	W16
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_fanfa5_2:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 56
-	.byte		PAN   , c_v-16
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N22   , Cn5 , v100
-	.byte	W16
-	.byte		VOL   , 96*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        51*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        127*mus_fanfa5_mvl/mxv
-	.byte		N22   , Gs4 
-	.byte	W16
-	.byte		VOL   , 96*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        51*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        127*mus_fanfa5_mvl/mxv
-	.byte		N40   , Ds4 
-	.byte	W12
-	.byte		MOD   , 6
-	.byte	W28
-	.byte		VOL   , 96*mus_fanfa5_mvl/mxv
-	.byte		MOD   , 0
-	.byte	W04
-	.byte		VOL   , 51*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        127*mus_fanfa5_mvl/mxv
-	.byte		N04   , Cs5 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        As4 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        Cs5 
-	.byte	W08
-	.byte		N48   , Cn5 
-	.byte	W16
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_fanfa5_3:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 88
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N12   , Ds1 , v080
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		N08   , Cn1 
-	.byte	W08
-	.byte		        Ds1 
-	.byte	W08
-	.byte		        Gs1 
-	.byte	W08
-	.byte		N24   , As1 
-	.byte	W24
-	.byte		        Cs2 
-	.byte	W24
-	.byte		N40   , Cn2 
-	.byte	W48
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_fanfa5_4:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 82
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N08   , Gs4 , v040
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N08   , Gs4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Ds3 
-	.byte	W08
-	.byte		        Cs3 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Fs2 
-	.byte	W08
-	.byte		        Cs2 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Cs3 
-	.byte	W08
-	.byte		N48   , Ds3 
-	.byte	W16
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_fanfa5_5:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 83
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		N08   , Gs4 , v040
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W04
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		N08   , Gs4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Ds3 
-	.byte	W04
-	.byte	W04
-	.byte		        Cs3 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Fs2 
-	.byte	W08
-	.byte		        Cs2 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Cs3 
-	.byte	W08
-	.byte		N44   , Ds3 
-	.byte	W12
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_fanfa5_6:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 47
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte	W24
-	.byte		        127*mus_fanfa5_mvl/mxv
-	.byte	W56
-	.byte		N08   , Cn2 , v127
-	.byte	W08
-	.byte		N08   
-	.byte	W08
-	.byte		        Fs2 
-	.byte	W24
-	.byte		        Cs2 
-	.byte	W08
-	.byte		        As1 , v112
-	.byte	W08
-	.byte		N08   
-	.byte	W08
-	.byte		N12   , Cn2 , v127
-	.byte	W48
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  7 **********************@
-
-mus_fanfa5_7:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 0
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N04   , En1 , v112
-	.byte		N80   , An2 , v120
-	.byte	W24
-	.byte		VOL   , 127*mus_fanfa5_mvl/mxv
-	.byte		N04   , En1 , v112
-	.byte	W08
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W16
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W08
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W16
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W08
-	.byte		        En1 , v092
-	.byte	W04
-	.byte		        En1 , v112
-	.byte	W04
-	.byte		        En1 , v092
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v112
-	.byte	W48
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_fanfa5:
-	.byte	7	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_fanfa5_pri	@ Priority
-	.byte	mus_fanfa5_rev	@ Reverb.
-
-	.word	mus_fanfa5_grp
-
-	.word	mus_fanfa5_1
-	.word	mus_fanfa5_2
-	.word	mus_fanfa5_3
-	.word	mus_fanfa5_4
-	.word	mus_fanfa5_5
-	.word	mus_fanfa5_6
-	.word	mus_fanfa5_7
-
-	.end
diff --git a/sound/songs/mus_w_door.s b/sound/songs/mus_w_door.s
deleted file mode 100644
index fc68d4e5b..000000000
--- a/sound/songs/mus_w_door.s
+++ /dev/null
@@ -1,77 +0,0 @@
-	.include "MPlayDef.s"
-	.section .rodata
-	.global mus_w_door
-	.align 2
-	.equ mus_w_door_grp, voicegroup129
-	.equ mus_w_door_pri, 5
-	.equ mus_w_door_rev, reverb_set+50
-
-mus_w_door_1: @ 86BC628
-	.byte KEYSH, 0x00
-	.byte TEMPO, 0x37
-	.byte VOICE, 0x7F
-	.byte VOL, 0x64
-	.byte N03
-	.byte Fn2
-	.byte v100
-	.byte N03
-	.byte As2
-	.byte v127
-	.byte W06
-	.byte N08
-	.byte Fs3
-	.byte v096
-	.byte W06
-	.byte VOL, 0x58
-	.byte W03
-	.byte Fs2
-	.byte W03
-	.byte Gs3
-	.byte W06
-	.byte FINE
-
-mus_w_door_2: @ 86BC643
-	.byte KEYSH, 0x00
-	.byte VOICE, 0x5C
-	.byte BENDR, 0x0C
-	.byte VOL, 0x2B
-	.byte BEND, 0x40
-	.byte W04
-	.byte DnM1
-	.byte N10
-	.byte Bn5
-	.byte v052
-	.byte W02
-	.byte BEND, 0x13
-	.byte W01
-	.byte Fn1
-	.byte W01
-	.byte Dn3
-	.byte W01
-	.byte Dn5
-	.byte W01
-	.byte Gs5
-	.byte W01
-	.byte An6
-	.byte W01
-	.byte VOL, 0x1D
-	.byte BEND, 0x75
-	.byte W01
-	.byte En8
-	.byte W02
-	.byte VOL, 0x12
-	.byte BEND, 0x7F
-	.byte W09
-	.byte FINE
-
-@ ***************************************
-	.align 2
-mus_w_door: @ 86BC670
-	.byte 2
-	.byte 0
-	.byte mus_w_door_pri
-	.byte mus_w_door_rev
-	.word mus_w_door_grp
-
-	.word mus_w_door_1
-	.word mus_w_door_2

From b0fc59cf5f319bf2219a0cdc6cb011bcffdb16d0 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Thu, 17 Oct 2019 14:45:29 -0700
Subject: [PATCH 8/8] Fix formatting.

---
 data/graphics.s                              |  46 +--
 src/data/trainer_graphics/front_pic_anims.h  | 296 +++++++-------
 src/data/trainer_graphics/front_pic_tables.h | 408 +++++++++----------
 3 files changed, 375 insertions(+), 375 deletions(-)

diff --git a/data/graphics.s b/data/graphics.s
index 6b5d0c499..721cc2a3e 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -12672,7 +12672,7 @@ gTrainerFrontPic_RSMay1:: @ 8E550CC
 	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_RSMay1:: @ 8E553Cc
+gTrainerPalette_RSMay1:: @ 8E553CC
 	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
 
 	.align 2
@@ -12696,7 +12696,7 @@ gTrainerFrontPic_RSPokemonRangerM:: @ 8E55AA8
 	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_RSPokemonRangerM:: @ 8E55Df0
+gTrainerPalette_RSPokemonRangerM:: @ 8E55DF0
 	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz"
 
 	.align 2
@@ -12728,7 +12728,7 @@ gTrainerFrontPic_MagmaGruntF:: @ 8E56838
 	.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_MagmaGruntF:: @ 8E56Bc4
+gTrainerPalette_MagmaGruntF:: @ 8E56BC4
 	.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
 
 	.align 2
@@ -12736,7 +12736,7 @@ gTrainerFrontPic_RSLass:: @ 8E56BEC
 	.incbin "graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_RSLass:: @ 8E56Ec4
+gTrainerPalette_RSLass:: @ 8E56EC4
 	.incbin "graphics/trainers/palettes/rs_lass.gbapal.lz"
 
 	.align 2
@@ -12760,7 +12760,7 @@ gTrainerFrontPic_RSYoungCouple:: @ 8E576E8
 	.incbin "graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_RSYoungCouple:: @ 8E57Aa8
+gTrainerPalette_RSYoungCouple:: @ 8E57AA8
 	.incbin "graphics/trainers/palettes/rs_young_couple.gbapal.lz"
 
 	.align 2
@@ -12768,7 +12768,7 @@ gTrainerFrontPic_OldCouple:: @ 8E57AD0
 	.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_OldCouple:: @ 8E57Fe0
+gTrainerPalette_OldCouple:: @ 8E57FE0
 	.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
 
 	.align 2
@@ -12864,7 +12864,7 @@ gTrainerFrontPic_EliteFourDrake:: @ 8E5A98C
 	.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_EliteFourDrake:: @ 8E5Ad34
+gTrainerPalette_EliteFourDrake:: @ 8E5AD34
 	.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
 
 	.align 2
@@ -12872,7 +12872,7 @@ gTrainerFrontPic_Youngster:: @ 8E5AD5C
 	.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Youngster:: @ 8E5Affc
+gTrainerPalette_Youngster:: @ 8E5AFFC
 	.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
 
 	.align 2
@@ -12904,7 +12904,7 @@ gTrainerFrontPic_Camper:: @ 8E5B9F0
 	.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Camper:: @ 8E5Bcd0
+gTrainerPalette_Camper:: @ 8E5BCD0
 	.incbin "graphics/trainers/palettes/camper.gbapal.lz"
 
 	.align 2
@@ -12912,7 +12912,7 @@ gTrainerFrontPic_Picnicker:: @ 8E5BCF8
 	.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Picnicker:: @ 8E5Bfe0
+gTrainerPalette_Picnicker:: @ 8E5BFE0
 	.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
 
 	.align 2
@@ -12936,7 +12936,7 @@ gTrainerFrontPic_Hiker:: @ 8E5C72C
 	.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Hiker:: @ 8E5Cb9C
+gTrainerPalette_Hiker:: @ 8E5CB9C
 	.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
 
 	.align 2
@@ -12968,7 +12968,7 @@ gTrainerFrontPic_Fisherman:: @ 8E5D8FC
 	.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Fisherman:: @ 8E5Dca8
+gTrainerPalette_Fisherman:: @ 8E5DCA8
 	.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
 
 	.align 2
@@ -12976,7 +12976,7 @@ gTrainerFrontPic_SwimmerM:: @ 8E5DCD0
 	.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_SwimmerM:: @ 8E5Dfa8
+gTrainerPalette_SwimmerM:: @ 8E5DFA8
 	.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
 
 	.align 2
@@ -13000,7 +13000,7 @@ gTrainerFrontPic_Beauty:: @ 8E5E97C
 	.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Beauty:: @ 8E5Ecd8
+gTrainerPalette_Beauty:: @ 8E5ECD8
 	.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
 
 	.align 2
@@ -13008,7 +13008,7 @@ gTrainerFrontPic_SwimmerF:: @ 8E5ED00
 	.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_SwimmerF:: @ 8E5Efec
+gTrainerPalette_SwimmerF:: @ 8E5EFEC
 	.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
 
 	.align 2
@@ -13032,7 +13032,7 @@ gTrainerFrontPic_Juggler:: @ 8E5F820
 	.incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Juggler:: @ 8E5Fc5C
+gTrainerPalette_Juggler:: @ 8E5FC5C
 	.incbin "graphics/trainers/palettes/juggler.gbapal.lz"
 
 	.align 2
@@ -13096,7 +13096,7 @@ gTrainerFrontPic_CooltrainerM:: @ 8E6160C
 	.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_CooltrainerM:: @ 8E618Dc
+gTrainerPalette_CooltrainerM:: @ 8E618DC
 	.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
 
 	.align 2
@@ -13200,7 +13200,7 @@ gTrainerFrontPic_Gentleman:: @ 8E643A4
 	.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Gentleman:: @ 8E646Dc
+gTrainerPalette_Gentleman:: @ 8E646DC
 	.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
 
 	.align 2
@@ -13272,7 +13272,7 @@ gTrainerFrontPic_ProfessorOak:: @ 8E66888
 	.incbin "graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_ProfessorOak:: @ 8E66Bf4
+gTrainerPalette_ProfessorOak:: @ 8E66BF4
 	.incbin "graphics/trainers/palettes/professor_oak.gbapal.lz"
 
 	.align 2
@@ -13320,7 +13320,7 @@ gTrainerFrontPic_PsychicF:: @ 8E67C58
 	.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_PsychicF:: @ 8E67Ff8
+gTrainerPalette_PsychicF:: @ 8E67FF8
 	.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
 
 	.align 2
@@ -13384,7 +13384,7 @@ gTrainerFrontPic_Lady:: @ 8E69878
 	.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
 
 	.align 2
-gTrainerPalette_Lady:: @ 8E69Ba0
+gTrainerPalette_Lady:: @ 8E69BA0
 	.incbin "graphics/trainers/palettes/lady.gbapal.lz"
 
 	.align 2
@@ -13420,11 +13420,11 @@ gTrainerBackPic_RSMay:: @ 8E74EBC
 	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
 
 	.align 2
-gTrainerPalette_LeafBackPic:: @ 8E76Ebc
+gTrainerPalette_LeafBackPic:: @ 8E76EBC
 	.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
 
 	.align 2
-gTrainerPalette_RedBackPic:: @ 8E76Ee4
+gTrainerPalette_RedBackPic:: @ 8E76EE4
 	.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
 
 	.align 2
diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h
index 090c5b994..32d38068a 100644
--- a/src/data/trainer_graphics/front_pic_anims.h
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -1,741 +1,741 @@
 static const union AnimCmd *const sAnims_8238E8C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238E90[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238E94[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238E98[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238E9C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EA0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EA4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EA8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EAC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EB0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EB4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EB8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EBC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EC0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EC4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EC8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238ECC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238ED0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238ED4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238ED8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EDC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EE0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EE4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EE8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EEC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EF0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EF4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EF8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238EFC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F00[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F04[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F08[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F0C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F10[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F14[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F18[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F1C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F20[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F24[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F28[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F2C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F30[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F34[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F38[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F3C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F40[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F44[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F48[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F4C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F50[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F54[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F58[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F5C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F60[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F64[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F68[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F6C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F70[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F74[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F78[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F7C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F80[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F84[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F88[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F8C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F90[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F94[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F98[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238F9C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FA0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FA4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FA8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FAC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FB0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FB4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FB8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FBC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FC0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FC4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FC8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FCC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FD0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FD4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FD8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FDC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FE0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FE4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FE8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FEC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FF0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FF4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FF8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8238FFC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239000[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239004[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239008[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823900C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239010[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239014[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239018[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823901C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239020[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239024[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239028[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823902C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239030[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239034[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239038[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823903C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239040[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239044[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239048[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823904C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239050[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239054[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239058[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823905C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239060[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239064[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239068[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823906C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239070[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239074[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239078[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823907C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239080[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239084[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239088[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823908C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239090[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239094[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_8239098[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_823909C[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390A0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390A4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390A8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390AC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390B0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390B4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390B8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390BC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390C0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390C4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390C8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390CC[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390D0[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390D4[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 static const union AnimCmd *const sAnims_82390D8[] =
 {
-	sAnim_GeneralFrame0,
+    sAnim_GeneralFrame0,
 };
 
 const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h
index 46746c213..9d94103ef 100644
--- a/src/data/trainer_graphics/front_pic_tables.h
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -152,149 +152,149 @@ const struct MonCoords gTrainerFrontPicCoords[] =
 
 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(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_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(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_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(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(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(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_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(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(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(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(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(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(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_AGATHA, gTrainerFrontPic_EliteFourAgatha, 0x800),
     TRAINER_SPRITE(ELITE_FOUR_LANCE, gTrainerFrontPic_EliteFourLance, 0x800),
-	TRAINER_SPRITE(LEADER_BROCK, gTrainerFrontPic_LeaderBrock, 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_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(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(RED, gTrainerFrontPic_Red, 0x800),
     TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, 0x800),
-	TRAINER_SPRITE(ROCKET_GRUNT_F, gTrainerFrontPic_RocketGruntF, 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_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),
@@ -304,149 +304,149 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
 
 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(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_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(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_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(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(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(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_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(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(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(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(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(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(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_AGATHA, gTrainerPalette_EliteFourAgatha),
     TRAINER_PAL(ELITE_FOUR_LANCE, gTrainerPalette_EliteFourLance),
-	TRAINER_PAL(LEADER_BROCK, gTrainerPalette_LeaderBrock),
+    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_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(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(RED, gTrainerPalette_Red),
     TRAINER_PAL(LEAF, gTrainerPalette_Leaf),
-	TRAINER_PAL(ROCKET_GRUNT_F, gTrainerPalette_RocketGruntF),
+    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_M, gTrainerPalette_PokemonRangerM),
     TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF),
     TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady),
     TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac),