Merge remote-tracking branch 'upstream/master'

7 files changed, 0 insertions, 1098 deletions

diff --git a/data/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc
deleted file mode 100644
index 57a45c71e..000000000
--- a/data/graphics/trainers/back_pic_coords.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-	.align 2
-gTrainerBackPicCoords:: @ 8305D2C
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x05, 0x00, 0x00
-	.byte 0x08, 0x05, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
diff --git a/data/graphics/trainers/back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc
deleted file mode 100644
index 46e56f2ac..000000000
--- a/data/graphics/trainers/back_pic_palette_table.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-	.align 2
-gTrainerBackPicPaletteTable:: @ 8305D8C
-	obj_pal gTrainerPalette_Brendan, 0
-	obj_pal gTrainerPalette_May, 1
-	obj_pal gTrainerBackPicPalette_Red, 2
-	obj_pal gTrainerBackPicPalette_Leaf, 3
-	obj_pal gTrainerPalette_RubySapphireBrendan, 4
-	obj_pal gTrainerPalette_RubySapphireMay, 5
-	obj_pal gTrainerPalette_Wally, 6
-	obj_pal gTrainerPalette_Steven, 7
diff --git a/data/graphics/trainers/back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc
deleted file mode 100644
index e67c2a073..000000000
--- a/data/graphics/trainers/back_pic_table.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-	.align 2
-gTrainerBackPicTable:: @ 8305D4C
-	obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
-	obj_tiles gTrainerBackPic_May, 0x2000, 1
-	obj_tiles gTrainerBackPic_Red, 0x2800, 2
-	obj_tiles gTrainerBackPic_Leaf, 0x2800, 3
-	obj_tiles gTrainerBackPic_RubySapphireBrendan, 0x2000, 4
-	obj_tiles gTrainerBackPic_RubySapphireMay, 0x2000, 5
-	obj_tiles gTrainerBackPic_Wally, 0x2000, 6
-	obj_tiles gTrainerBackPic_Steven, 0x2000, 7
diff --git a/data/graphics/trainers/front_pic_coords.inc b/data/graphics/trainers/front_pic_coords.inc
deleted file mode 100644
index 8d20f0a9e..000000000
--- a/data/graphics/trainers/front_pic_coords.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-	.align 2
-gTrainerFrontPicCoords:: @ 83054E0
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
diff --git a/data/graphics/trainers/front_pic_palette_table.inc b/data/graphics/trainers/front_pic_palette_table.inc
deleted file mode 100644
index 44cf98dab..000000000
--- a/data/graphics/trainers/front_pic_palette_table.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-	.align 2
-gTrainerFrontPicPaletteTable:: @ 830593C
-	obj_pal gTrainerPalette_Hiker, 0
-	obj_pal gTrainerPalette_AquaGruntM, 1
-	obj_pal gTrainerPalette_PokemonBreederF, 2
-	obj_pal gTrainerPalette_CoolTrainerM, 3
-	obj_pal gTrainerPalette_BirdKeeper, 4
-	obj_pal gTrainerPalette_Collector, 5
-	obj_pal gTrainerPalette_AquaGruntF, 6
-	obj_pal gTrainerPalette_SwimmerM, 7
-	obj_pal gTrainerPalette_MagmaGruntM, 8
-	obj_pal gTrainerPalette_ExpertM, 9
-	obj_pal gTrainerPalette_AquaAdminM, 10
-	obj_pal gTrainerPalette_BlackBelt, 11
-	obj_pal gTrainerPalette_AquaAdminF, 12
-	obj_pal gTrainerPalette_AquaLeaderArchie, 13
-	obj_pal gTrainerPalette_HexManiac, 14
-	obj_pal gTrainerPalette_AromaLady, 15
-	obj_pal gTrainerPalette_RuinManiac, 16
-	obj_pal gTrainerPalette_Interviewer, 17
-	obj_pal gTrainerPalette_TuberF, 18
-	obj_pal gTrainerPalette_TuberM, 19
-	obj_pal gTrainerPalette_CoolTrainerF, 20
-	obj_pal gTrainerPalette_Lady, 21
-	obj_pal gTrainerPalette_Beauty, 22
-	obj_pal gTrainerPalette_RichBoy, 23
-	obj_pal gTrainerPalette_ExpertF, 24
-	obj_pal gTrainerPalette_Pokemaniac, 25
-	obj_pal gTrainerPalette_MagmaGruntF, 26
-	obj_pal gTrainerPalette_Guitarist, 27
-	obj_pal gTrainerPalette_Kindler, 28
-	obj_pal gTrainerPalette_Camper, 29
-	obj_pal gTrainerPalette_Picnicker, 30
-	obj_pal gTrainerPalette_BugManiac, 31
-	obj_pal gTrainerPalette_PokemonBreederM, 32
-	obj_pal gTrainerPalette_PsychicM, 33
-	obj_pal gTrainerPalette_PsychicF, 34
-	obj_pal gTrainerPalette_Gentleman, 35
-	obj_pal gTrainerPalette_EliteFourSidney, 36
-	obj_pal gTrainerPalette_EliteFourPhoebe, 37
-	obj_pal gTrainerPalette_EliteFourGlacia, 38
-	obj_pal gTrainerPalette_EliteFourDrake, 39
-	obj_pal gTrainerPalette_LeaderRoxanne, 40
-	obj_pal gTrainerPalette_LeaderBrawly, 41
-	obj_pal gTrainerPalette_LeaderWattson, 42
-	obj_pal gTrainerPalette_LeaderFlannery, 43
-	obj_pal gTrainerPalette_LeaderNorman, 44
-	obj_pal gTrainerPalette_LeaderWinona, 45
-	obj_pal gTrainerPalette_LeaderTateAndLiza, 46
-	obj_pal gTrainerPalette_LeaderJuan, 47
-	obj_pal gTrainerPalette_SchoolKidM, 48
-	obj_pal gTrainerPalette_SchoolKidF, 49
-	obj_pal gTrainerPalette_SrAndJr, 50
-	obj_pal gTrainerPalette_WinstrateM, 51
-	obj_pal gTrainerPalette_WinstrateF, 52
-	obj_pal gTrainerPalette_Youngster, 53
-	obj_pal gTrainerPalette_ChampionWallace, 54
-	obj_pal gTrainerPalette_Fisherman, 55
-	obj_pal gTrainerPalette_CyclingTriathleteM, 56
-	obj_pal gTrainerPalette_CyclingTriathleteF, 57
-	obj_pal gTrainerPalette_RunningTriathleteM, 58
-	obj_pal gTrainerPalette_RunningTriathleteF, 59
-	obj_pal gTrainerPalette_SwimmingTriathleteM, 60
-	obj_pal gTrainerPalette_SwimmingTriathleteF, 61
-	obj_pal gTrainerPalette_DragonTamer, 62
-	obj_pal gTrainerPalette_NinjaBoy, 63
-	obj_pal gTrainerPalette_BattleGirl, 64
-	obj_pal gTrainerPalette_ParasolLady, 65
-	obj_pal gTrainerPalette_SwimmerF, 66
-	obj_pal gTrainerPalette_Twins, 67
-	obj_pal gTrainerPalette_Sailor, 68
-	obj_pal gTrainerPalette_MagmaAdmin, 69
-	obj_pal gTrainerPalette_Wally, 70
-	obj_pal gTrainerPalette_Brendan, 71
-	obj_pal gTrainerPalette_May, 72
-	obj_pal gTrainerPalette_BugCatcher, 73
-	obj_pal gTrainerPalette_PokemonRangerM, 74
-	obj_pal gTrainerPalette_PokemonRangerF, 75
-	obj_pal gTrainerPalette_MagmaLeaderMaxie, 76
-	obj_pal gTrainerPalette_Lass, 77
-	obj_pal gTrainerPalette_YoungCouple, 78
-	obj_pal gTrainerPalette_OldCouple, 79
-	obj_pal gTrainerPalette_SisAndBro, 80
-	obj_pal gTrainerPalette_Steven, 81
-	obj_pal gTrainerPalette_SalonMaidenAnabel, 82
-	obj_pal gTrainerPalette_DomeAceTucker, 83
-	obj_pal gTrainerPalette_PalaceMavenSpenser, 84
-	obj_pal gTrainerPalette_ArenaTycoonGreta, 85
-	obj_pal gTrainerPalette_FactoryHeadNoland, 86
-	obj_pal gTrainerPalette_PikeQueenLucy, 87
-	obj_pal gTrainerPalette_PyramidKingBrandon, 88
-	obj_pal gTrainerPalette_Red, 89
-	obj_pal gTrainerPalette_Leaf, 90
-	obj_pal gTrainerPalette_RubySapphireBrendan, 91
-	obj_pal gTrainerPalette_RubySapphireMay, 92
diff --git a/data/graphics/trainers/front_pic_table.inc b/data/graphics/trainers/front_pic_table.inc
deleted file mode 100644
index 91294d170..000000000
--- a/data/graphics/trainers/front_pic_table.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-	.align 2
-gTrainerFrontPicTable:: @ 8305654
-	obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
-	obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1
-	obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2
-	obj_tiles gTrainerFrontPic_CoolTrainerM, 0x800, 3
-	obj_tiles gTrainerFrontPic_BirdKeeper, 0x800, 4
-	obj_tiles gTrainerFrontPic_Collector, 0x800, 5
-	obj_tiles gTrainerFrontPic_AquaGruntF, 0x800, 6
-	obj_tiles gTrainerFrontPic_SwimmerM, 0x800, 7
-	obj_tiles gTrainerFrontPic_MagmaGruntM, 0x800, 8
-	obj_tiles gTrainerFrontPic_ExpertM, 0x800, 9
-	obj_tiles gTrainerFrontPic_AquaAdminM, 0x800, 10
-	obj_tiles gTrainerFrontPic_BlackBelt, 0x800, 11
-	obj_tiles gTrainerFrontPic_AquaAdminF, 0x800, 12
-	obj_tiles gTrainerFrontPic_AquaLeaderArchie, 0x800, 13
-	obj_tiles gTrainerFrontPic_HexManiac, 0x800, 14
-	obj_tiles gTrainerFrontPic_AromaLady, 0x800, 15
-	obj_tiles gTrainerFrontPic_RuinManiac, 0x800, 16
-	obj_tiles gTrainerFrontPic_Interviewer, 0x800, 17
-	obj_tiles gTrainerFrontPic_TuberF, 0x800, 18
-	obj_tiles gTrainerFrontPic_TuberM, 0x800, 19
-	obj_tiles gTrainerFrontPic_CoolTrainerF, 0x800, 20
-	obj_tiles gTrainerFrontPic_Lady, 0x800, 21
-	obj_tiles gTrainerFrontPic_Beauty, 0x800, 22
-	obj_tiles gTrainerFrontPic_RichBoy, 0x800, 23
-	obj_tiles gTrainerFrontPic_ExpertF, 0x800, 24
-	obj_tiles gTrainerFrontPic_Pokemaniac, 0x800, 25
-	obj_tiles gTrainerFrontPic_MagmaGruntF, 0x800, 26
-	obj_tiles gTrainerFrontPic_Guitarist, 0x800, 27
-	obj_tiles gTrainerFrontPic_Kindler, 0x800, 28
-	obj_tiles gTrainerFrontPic_Camper, 0x800, 29
-	obj_tiles gTrainerFrontPic_Picnicker, 0x800, 30
-	obj_tiles gTrainerFrontPic_BugManiac, 0x800, 31
-	obj_tiles gTrainerFrontPic_PokemonBreederM, 0x800, 32
-	obj_tiles gTrainerFrontPic_PsychicM, 0x800, 33
-	obj_tiles gTrainerFrontPic_PsychicF, 0x800, 34
-	obj_tiles gTrainerFrontPic_Gentleman, 0x800, 35
-	obj_tiles gTrainerFrontPic_EliteFourSidney, 0x800, 36
-	obj_tiles gTrainerFrontPic_EliteFourPhoebe, 0x800, 37
-	obj_tiles gTrainerFrontPic_EliteFourGlacia, 0x800, 38
-	obj_tiles gTrainerFrontPic_EliteFourDrake, 0x800, 39
-	obj_tiles gTrainerFrontPic_LeaderRoxanne, 0x800, 40
-	obj_tiles gTrainerFrontPic_LeaderBrawly, 0x800, 41
-	obj_tiles gTrainerFrontPic_LeaderWattson, 0x800, 42
-	obj_tiles gTrainerFrontPic_LeaderFlannery, 0x800, 43
-	obj_tiles gTrainerFrontPic_LeaderNorman, 0x800, 44
-	obj_tiles gTrainerFrontPic_LeaderWinona, 0x800, 45
-	obj_tiles gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46
-	obj_tiles gTrainerFrontPic_LeaderJuan, 0x800, 47
-	obj_tiles gTrainerFrontPic_SchoolKidM, 0x800, 48
-	obj_tiles gTrainerFrontPic_SchoolKidF, 0x800, 49
-	obj_tiles gTrainerFrontPic_SrAndJr, 0x1000, 50
-	obj_tiles gTrainerFrontPic_WinstrateM, 0x1000, 51
-	obj_tiles gTrainerFrontPic_WinstrateF, 0x800, 52
-	obj_tiles gTrainerFrontPic_Youngster, 0x800, 53
-	obj_tiles gTrainerFrontPic_ChampionWallace, 0x1000, 54
-	obj_tiles gTrainerFrontPic_Fisherman, 0x800, 55
-	obj_tiles gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56
-	obj_tiles gTrainerFrontPic_CyclingTriathleteF, 0x800, 57
-	obj_tiles gTrainerFrontPic_RunningTriathleteM, 0x800, 58
-	obj_tiles gTrainerFrontPic_RunningTriathleteF, 0x800, 59
-	obj_tiles gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60
-	obj_tiles gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61
-	obj_tiles gTrainerFrontPic_DragonTamer, 0x800, 62
-	obj_tiles gTrainerFrontPic_NinjaBoy, 0x800, 63
-	obj_tiles gTrainerFrontPic_BattleGirl, 0x1000, 64
-	obj_tiles gTrainerFrontPic_ParasolLady, 0x800, 65
-	obj_tiles gTrainerFrontPic_SwimmerF, 0x800, 66
-	obj_tiles gTrainerFrontPic_Twins, 0x800, 67
-	obj_tiles gTrainerFrontPic_Sailor, 0x800, 68
-	obj_tiles gTrainerFrontPic_MagmaAdmin, 0x800, 69
-	obj_tiles gTrainerFrontPic_Wally, 0x800, 70
-	obj_tiles gTrainerFrontPic_Brendan, 0x800, 71
-	obj_tiles gTrainerFrontPic_May, 0x800, 72
-	obj_tiles gTrainerFrontPic_BugCatcher, 0x800, 73
-	obj_tiles gTrainerFrontPic_PokemonRangerM, 0x800, 74
-	obj_tiles gTrainerFrontPic_PokemonRangerF, 0x800, 75
-	obj_tiles gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76
-	obj_tiles gTrainerFrontPic_Lass, 0x800, 77
-	obj_tiles gTrainerFrontPic_YoungCouple, 0x800, 78
-	obj_tiles gTrainerFrontPic_OldCouple, 0x800, 79
-	obj_tiles gTrainerFrontPic_SisAndBro, 0x800, 80
-	obj_tiles gTrainerFrontPic_Steven, 0x800, 81
-	obj_tiles gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82
-	obj_tiles gTrainerFrontPic_DomeAceTucker, 0x800, 83
-	obj_tiles gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84
-	obj_tiles gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85
-	obj_tiles gTrainerFrontPic_FactoryHeadNoland, 0x800, 86
-	obj_tiles gTrainerFrontPic_PikeQueenLucy, 0x800, 87
-	obj_tiles gTrainerFrontPic_PyramidKingBrandon, 0x800, 88
-	obj_tiles gTrainerFrontPic_Red, 0x800, 89
-	obj_tiles gTrainerFrontPic_Leaf, 0x800, 90
-	obj_tiles gTrainerFrontPic_RubySapphireBrendan, 0x800, 91
-	obj_tiles gTrainerFrontPic_RubySapphireMay, 0x800, 92
diff --git a/data/graphics/trainers/graphics.inc b/data/graphics/trainers/graphics.inc
deleted file mode 100644
index 897cb9ffb..000000000
--- a/data/graphics/trainers/graphics.inc
+++ /dev/null
@@ -1,783 +0,0 @@
-	.align 2
-gTrainerFrontPic_Hiker:: @ 8D51DC8
-	.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Hiker:: @ 8D52248
-	.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaGruntM:: @ 8D52270
-	.incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaGruntM:: @ 8D525D0
-	.incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonBreederF:: @ 8D525F8
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonBreederF:: @ 8D5292C
-	.incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CoolTrainerM:: @ 8D52954
-	.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CoolTrainerM:: @ 8D52C3C
-	.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BirdKeeper:: @ 8D52C64
-	.incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BirdKeeper:: @ 8D52F9C
-	.incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Collector:: @ 8D52FC4
-	.incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Collector:: @ 8D533C8
-	.incbin "graphics/trainers/palettes/collector.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaGruntF:: @ 8D533F0
-	.incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaGruntF:: @ 8D5372C
-	.incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmerM:: @ 8D53754
-	.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmerM:: @ 8D53A14
-	.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaGruntM:: @ 8D53A3C
-	.incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaGruntM:: @ 8D53DBC
-	.incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ExpertM:: @ 8D53DE4
-	.incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ExpertM:: @ 8D54124
-	.incbin "graphics/trainers/palettes/expert_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaAdminM:: @ 8D5414C
-	.incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaAdminM:: @ 8D54500
-	.incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BlackBelt:: @ 8D54528
-	.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BlackBelt:: @ 8D5488C
-	.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaAdminF:: @ 8D548B4
-	.incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaAdminF:: @ 8D54C78
-	.incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaLeaderArchie:: @ 8D54CA0
-	.incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaLeaderArchie:: @ 8D54FDC
-	.incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_HexManiac:: @ 8D55004
-	.incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_HexManiac:: @ 8D55370
-	.incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AromaLady:: @ 8D55398
-	.incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AromaLady:: @ 8D5565C
-	.incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RuinManiac:: @ 8D55684
-	.incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RuinManiac:: @ 8D55A20
-	.incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Interviewer:: @ 8D55A48
-	.incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Interviewer:: @ 8D55EEC
-	.incbin "graphics/trainers/palettes/interviewer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_TuberF:: @ 8D55F14
-	.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_TuberF:: @ 8D561B8
-	.incbin "graphics/trainers/palettes/tuber_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_TuberM:: @ 8D561E0
-	.incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_TuberM:: @ 8D5646C
-	.incbin "graphics/trainers/palettes/tuber_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CoolTrainerF:: @ 8D56494
-	.incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CoolTrainerF:: @ 8D567A8
-	.incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Lady:: @ 8D567D0
-	.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Lady:: @ 8D56B84
-	.incbin "graphics/trainers/palettes/lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Beauty:: @ 8D56BAC
-	.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Beauty:: @ 8D56E94
-	.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RichBoy:: @ 8D56EBC
-	.incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RichBoy:: @ 8D57170
-	.incbin "graphics/trainers/palettes/rich_boy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ExpertF:: @ 8D57198
-	.incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ExpertF:: @ 8D574B4
-	.incbin "graphics/trainers/palettes/expert_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Pokemaniac:: @ 8D574DC
-	.incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Pokemaniac:: @ 8D5784C
-	.incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaGruntF:: @ 8D57874
-	.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaGruntF:: @ 8D57C00
-	.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Guitarist:: @ 8D57C28
-	.incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Guitarist:: @ 8D57FAC
-	.incbin "graphics/trainers/palettes/guitarist.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Kindler:: @ 8D57FD4
-	.incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Kindler:: @ 8D58340
-	.incbin "graphics/trainers/palettes/kindler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Camper:: @ 8D58368
-	.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Camper:: @ 8D58650
-	.incbin "graphics/trainers/palettes/camper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Picnicker:: @ 8D58678
-	.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Picnicker:: @ 8D58958
-	.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BugManiac:: @ 8D58980
-	.incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BugManiac:: @ 8D58DD0
-	.incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonBreederM:: @ 8D58DF8
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonBreederM:: @ 8D59128
-	.incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PsychicM:: @ 8D59150
-	.incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PsychicM:: @ 8D5947C
-	.incbin "graphics/trainers/palettes/psychic_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PsychicF:: @ 8D594A4
-	.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PsychicF:: @ 8D597CC
-	.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Gentleman:: @ 8D597F4
-	.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Gentleman:: @ 8D59AF4
-	.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourSidney:: @ 8D59B1C
-	.incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourSidney:: @ 8D59E50
-	.incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourPhoebe:: @ 8D59E78
-	.incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourPhoebe:: @ 8D5A178
-	.incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourGlacia:: @ 8D5A1A0
-	.incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourGlacia:: @ 8D5A524
-	.incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourDrake:: @ 8D5A54C
-	.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourDrake:: @ 8D5A8F4
-	.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderRoxanne:: @ 8D5A91C
-	.incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderRoxanne:: @ 8D5AC08
-	.incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBrawly:: @ 8D5AC30
-	.incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBrawly:: @ 8D5AFC4
-	.incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWattson:: @ 8D5AFEC
-	.incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWattson:: @ 8D5B334
-	.incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderFlannery:: @ 8D5B35C
-	.incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderFlannery:: @ 8D5B6DC
-	.incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderNorman:: @ 8D5B704
-	.incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderNorman:: @ 8D5BA40
-	.incbin "graphics/trainers/palettes/leader_norman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWinona:: @ 8D5BA68
-	.incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWinona:: @ 8D5BDE8
-	.incbin "graphics/trainers/palettes/leader_winona.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderTateAndLiza:: @ 8D5BE10
-	.incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderTateAndLiza:: @ 8D5C254
-	.incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderJuan:: @ 8D5C27C
-	.incbin "graphics/trainers/front_pics/leader_juan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderJuan:: @ 8D5C624
-	.incbin "graphics/trainers/palettes/leader_juan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SchoolKidM:: @ 8D5C64C
-	.incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SchoolKidM:: @ 8D5C90C
-	.incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SchoolKidF:: @ 8D5C934
-	.incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SchoolKidF:: @ 8D5CBD0
-	.incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SrAndJr:: @ 8D5CBF8
-	.incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SrAndJr:: @ 8D5D068
-	.incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_WinstrateM:: @ 8D5D090
-	.incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_WinstrateM:: @ 8D5D44C
-	.incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_WinstrateF:: @ 8D5D474
-	.incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_WinstrateF:: @ 8D5D840
-	.incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Youngster:: @ 8D5D868
-	.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Youngster:: @ 8D5DB10
-	.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ChampionWallace:: @ 8D5DB38
-	.incbin "graphics/trainers/front_pics/champion_wallace_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ChampionWallace:: @ 8D5DF8C
-	.incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Fisherman:: @ 8D5DFB4
-	.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Fisherman:: @ 8D5E398
-	.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CyclingTriathleteM:: @ 8D5E3C0
-	.incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CyclingTriathleteM:: @ 8D5E7D0
-	.incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CyclingTriathleteF:: @ 8D5E7F8
-	.incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CyclingTriathleteF:: @ 8D5EC04
-	.incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RunningTriathleteM:: @ 8D5EC2C
-	.incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RunningTriathleteM:: @ 8D5EEE4
-	.incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RunningTriathleteF:: @ 8D5EF0C
-	.incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RunningTriathleteF:: @ 8D5F1B0
-	.incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmingTriathleteM:: @ 8D5F1D8
-	.incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmingTriathleteM:: @ 8D5F504
-	.incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmingTriathleteF:: @ 8D5F52C
-	.incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmingTriathleteF:: @ 8D5F808
-	.incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_DragonTamer:: @ 8D5F830
-	.incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_DragonTamer:: @ 8D5FB84
-	.incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_NinjaBoy:: @ 8D5FBAC
-	.incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_NinjaBoy:: @ 8D5FE88
-	.incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BattleGirl:: @ 8D5FEB0
-	.incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BattleGirl:: @ 8D601D0
-	.incbin "graphics/trainers/palettes/battle_girl.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ParasolLady:: @ 8D601F8
-	.incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ParasolLady:: @ 8D60530
-	.incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmerF:: @ 8D60558
-	.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmerF:: @ 8D60828
-	.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Twins:: @ 8D60850
-	.incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Twins:: @ 8D60C14
-	.incbin "graphics/trainers/palettes/twins.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Sailor:: @ 8D60C3C
-	.incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Sailor:: @ 8D60FEC
-	.incbin "graphics/trainers/palettes/sailor.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaAdmin:: @ 8D61014
-	.incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaAdmin:: @ 8D613EC
-	.incbin "graphics/trainers/palettes/magma_admin.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Wally:: @ 8D61414
-	.incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Wally:: @ 8D616E4
-	.incbin "graphics/trainers/palettes/wally.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Brendan:: @ 8D6170C
-	.incbin "graphics/trainers/front_pics/brendan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Brendan:: @ 8D61A30
-	.incbin "graphics/trainers/palettes/brendan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_May:: @ 8D61A58
-	.incbin "graphics/trainers/front_pics/may_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_May:: @ 8D61D58
-	.incbin "graphics/trainers/palettes/may.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BugCatcher:: @ 8D61D80
-	.incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BugCatcher:: @ 8D620AC
-	.incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonRangerM:: @ 8D620D4
-	.incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonRangerM:: @ 8D6241C
-	.incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonRangerF:: @ 8D62444
-	.incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonRangerF:: @ 8D62778
-	.incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaLeaderMaxie:: @ 8D627A0
-	.incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaLeaderMaxie:: @ 8D62A94
-	.incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Lass:: @ 8D62ABC
-	.incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Lass:: @ 8D62D94
-	.incbin "graphics/trainers/palettes/lass.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_YoungCouple:: @ 8D62DBC
-	.incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_YoungCouple:: @ 8D6317C
-	.incbin "graphics/trainers/palettes/young_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_OldCouple:: @ 8D631A4
-	.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_OldCouple:: @ 8D636B4
-	.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SisAndBro:: @ 8D636DC
-	.incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SisAndBro:: @ 8D63B28
-	.incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Steven:: @ 8D63B50
-	.incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Steven:: @ 8D63E88
-	.incbin "graphics/trainers/palettes/steven.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SalonMaidenAnabel:: @ 8D63EB0
-	.incbin "graphics/trainers/front_pics/salon_maiden_anabel_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SalonMaidenAnabel:: @ 8D641B8
-	.incbin "graphics/trainers/palettes/salon_maiden_anabel.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_DomeAceTucker:: @ 8D641E0
-	.incbin "graphics/trainers/front_pics/dome_ace_tucker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_DomeAceTucker:: @ 8D645E4
-	.incbin "graphics/trainers/palettes/dome_ace_tucker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PalaceMavenSpenser:: @ 8D6460C
-	.incbin "graphics/trainers/front_pics/palace_maven_spenser_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PalaceMavenSpenser:: @ 8D649B0
-	.incbin "graphics/trainers/palettes/palace_maven_spenser.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ArenaTycoonGreta:: @ 8D649D8
-	.incbin "graphics/trainers/front_pics/arena_tycoon_greta_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ArenaTycoonGreta:: @ 8D64D08
-	.incbin "graphics/trainers/palettes/arena_tycoon_greta.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_FactoryHeadNoland:: @ 8D64D30
-	.incbin "graphics/trainers/front_pics/factory_head_noland_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_FactoryHeadNoland:: @ 8D650AC
-	.incbin "graphics/trainers/palettes/factory_head_noland.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PikeQueenLucy:: @ 8D650D4
-	.incbin "graphics/trainers/front_pics/pike_queen_lucy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PikeQueenLucy:: @ 8D653C8
-	.incbin "graphics/trainers/palettes/pike_queen_lucy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PyramidKingBrandon:: @ 8D653F0
-	.incbin "graphics/trainers/front_pics/pyramid_king_brandon_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PyramidKingBrandon:: @ 8D6575C
-	.incbin "graphics/trainers/palettes/pyramid_king_brandon.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Red:: @ 8D65784
-	.incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Red:: @ 8D65A90
-	.incbin "graphics/trainers/palettes/red.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Leaf:: @ 8D65AB8
-	.incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Leaf:: @ 8D65DF4
-	.incbin "graphics/trainers/palettes/leaf.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RubySapphireBrendan:: @ 8D65E1C
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RubySapphireBrendan:: @ 8D66130
-	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RubySapphireMay:: @ 8D66158
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RubySapphireMay:: @ 8D66458
-	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
-
-	.align 2
-gTrainerBackPic_Brendan:: @ 8D66480
-	.incbin "graphics/trainers/back_pics/brendan_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_May:: @ 8D68480
-	.incbin "graphics/trainers/back_pics/may_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Red:: @ 8D6A480
-	.incbin "graphics/trainers/back_pics/red_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Leaf:: @ 8D6CC80
-	.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_RubySapphireBrendan:: @ 8D6F480
-	.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_RubySapphireMay:: @ 8D71480
-	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Wally:: @ 8D73480
-	.incbin "graphics/trainers/back_pics/wally_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Steven:: @ 8D75480
-	.incbin "graphics/trainers/back_pics/steven_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPicPalette_Red:: @ 8D77480
-	.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerBackPicPalette_Leaf:: @ 8D774A8
-	.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"