170 files changed, 169 insertions, 1746 deletions

diff --git a/data/graphics/trainers/graphics.inc b/data/graphics/trainers/graphics.inc
index 09f34ca31..3a2be8723 100644
--- a/data/graphics/trainers/graphics.inc
+++ b/data/graphics/trainers/graphics.inc
@@ -1,675 +1,675 @@
 	.align 2
 gTrainerFrontPic_Lass:: @ 8E48D38
-	.incbin "graphics/trainers/lass/front.4bpp.lz"
+	.incbin "graphics/trainers/lass.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Youngster:: @ 8E49010
-	.incbin "graphics/trainers/youngster/front.4bpp.lz"
+	.incbin "graphics/trainers/youngster.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Brendan:: @ 8E492B8
-	.incbin "graphics/trainers/brendan/front.4bpp.lz"
+	.incbin "graphics/trainers/brendan.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_May:: @ 8E495CC
-	.incbin "graphics/trainers/may/front.4bpp.lz"
+	.incbin "graphics/trainers/may.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Hiker:: @ 8E498CC
-	.incbin "graphics/trainers/hiker/front.4bpp.lz"
+	.incbin "graphics/trainers/hiker.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Beauty:: @ 8E49D4C
-	.incbin "graphics/trainers/beauty/front.4bpp.lz"
+	.incbin "graphics/trainers/beauty.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Fisherman:: @ 8E4A034
-	.incbin "graphics/trainers/fisherman/front.4bpp.lz"
+	.incbin "graphics/trainers/fisherman.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Lady:: @ 8E4A418
-	.incbin "graphics/trainers/lady/front.4bpp.lz"
+	.incbin "graphics/trainers/lady.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_CyclingTriathleteM:: @ 8E4A7CC
-	.incbin "graphics/trainers/cycling_triathlete_m/front.4bpp.lz"
+	.incbin "graphics/trainers/cycling_triathlete_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_AquaGruntM:: @ 8E4ABDC
-	.incbin "graphics/trainers/aqua_grunt_m/front.4bpp.lz"
+	.incbin "graphics/trainers/aqua_grunt_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Twins:: @ 8E4AF3C
-	.incbin "graphics/trainers/twins/front.4bpp.lz"
+	.incbin "graphics/trainers/twins.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SwimmerF:: @ 8E4B300
-	.incbin "graphics/trainers/swimmer_f/front.4bpp.lz"
+	.incbin "graphics/trainers/swimmer_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_BugCatcher:: @ 8E4B5D0
-	.incbin "graphics/trainers/bug_catcher/front.4bpp.lz"
+	.incbin "graphics/trainers/bug_catcher.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SchoolKidM:: @ 8E4B8FC
-	.incbin "graphics/trainers/school_kid_m/front.4bpp.lz"
+	.incbin "graphics/trainers/school_kid_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_RichBoy:: @ 8E4BBBC
-	.incbin "graphics/trainers/rich_boy/front.4bpp.lz"
+	.incbin "graphics/trainers/rich_boy.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SrAndJr:: @ 8E4BE70
-	.incbin "graphics/trainers/sr_and_jr/front.4bpp.lz"
+	.incbin "graphics/trainers/sr_and_jr.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_BlackBelt:: @ 8E4C2E0
-	.incbin "graphics/trainers/black_belt/front.4bpp.lz"
+	.incbin "graphics/trainers/black_belt.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Wally:: @ 8E4C644
-	.incbin "graphics/trainers/wally/front.4bpp.lz"
+	.incbin "graphics/trainers/wally.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_AquaGruntF:: @ 8E4C914
-	.incbin "graphics/trainers/aqua_grunt_f/front.4bpp.lz"
+	.incbin "graphics/trainers/aqua_grunt_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_TuberF:: @ 8E4CC50
-	.incbin "graphics/trainers/tuber_f/front.4bpp.lz"
+	.incbin "graphics/trainers/tuber_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_HexManiac:: @ 8E4CEF4
-	.incbin "graphics/trainers/hex_maniac/front.4bpp.lz"
+	.incbin "graphics/trainers/hex_maniac.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PokemonBreederF:: @ 8E4D260
-	.incbin "graphics/trainers/pokemon_breeder_f/front.4bpp.lz"
+	.incbin "graphics/trainers/pokemon_breeder_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_MagmaGruntM:: @ 8E4D594
-	.incbin "graphics/trainers/magma_grunt_m/front.4bpp.lz"
+	.incbin "graphics/trainers/magma_grunt_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_MagmaGruntF:: @ 8E4D914
-	.incbin "graphics/trainers/magma_grunt_f/front.4bpp.lz"
+	.incbin "graphics/trainers/magma_grunt_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Interviewer:: @ 8E4DCA0
-	.incbin "graphics/trainers/interviewer/front.4bpp.lz"
+	.incbin "graphics/trainers/interviewer.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_TuberM:: @ 8E4E144
-	.incbin "graphics/trainers/tuber_m/front.4bpp.lz"
+	.incbin "graphics/trainers/tuber_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_YoungCouple:: @ 8E4E3D0
-	.incbin "graphics/trainers/young_couple/front.4bpp.lz"
+	.incbin "graphics/trainers/young_couple.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Guitarist:: @ 8E4E790
-	.incbin "graphics/trainers/guitarist/front.4bpp.lz"
+	.incbin "graphics/trainers/guitarist.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Gentleman:: @ 8E4EB14
-	.incbin "graphics/trainers/gentleman/front.4bpp.lz"
+	.incbin "graphics/trainers/gentleman.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Steven:: @ 8E4EE14
-	.incbin "graphics/trainers/steven/front.4bpp.lz"
+	.incbin "graphics/trainers/steven.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Maxie:: @ 8E4F14C
-	.incbin "graphics/trainers/maxie/front.4bpp.lz"
+	.incbin "graphics/trainers/maxie.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_RunningTriathleteF:: @ 8E4F440
-	.incbin "graphics/trainers/running_triathlete_f/front.4bpp.lz"
+	.incbin "graphics/trainers/running_triathlete_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_RunningTriathleteM:: @ 8E4F6E4
-	.incbin "graphics/trainers/running_triathlete_m/front.4bpp.lz"
+	.incbin "graphics/trainers/running_triathlete_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_BattleGirl:: @ 8E4F99C
-	.incbin "graphics/trainers/battle_girl/front.4bpp.lz"
+	.incbin "graphics/trainers/battle_girl.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_CyclingTriathleteF:: @ 8E4FCBC
-	.incbin "graphics/trainers/cycling_triathlete_f/front.4bpp.lz"
+	.incbin "graphics/trainers/cycling_triathlete_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SwimmerM:: @ 8E500C8
-	.incbin "graphics/trainers/swimmer_m/front.4bpp.lz"
+	.incbin "graphics/trainers/swimmer_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PokefanF:: @ 8E50388
-	.incbin "graphics/trainers/pokefan_f/front.4bpp.lz"
+	.incbin "graphics/trainers/pokefan_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_ExpertM:: @ 8E50754
-	.incbin "graphics/trainers/expert_m/front.4bpp.lz"
+	.incbin "graphics/trainers/expert_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_ExpertF:: @ 8E50A94
-	.incbin "graphics/trainers/expert_f/front.4bpp.lz"
+	.incbin "graphics/trainers/expert_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SwimmingTriathleteM:: @ 8E50DB0
-	.incbin "graphics/trainers/swimming_triathlete_m/front.4bpp.lz"
+	.incbin "graphics/trainers/swimming_triathlete_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SwimmingTriathleteF:: @ 8E510DC
-	.incbin "graphics/trainers/swimming_triathlete_f/front.4bpp.lz"
+	.incbin "graphics/trainers/swimming_triathlete_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_DragonTamer:: @ 8E513B8
-	.incbin "graphics/trainers/dragon_tamer/front.4bpp.lz"
+	.incbin "graphics/trainers/dragon_tamer.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_BirdKeeper:: @ 8E5170C
-	.incbin "graphics/trainers/bird_keeper/front.4bpp.lz"
+	.incbin "graphics/trainers/bird_keeper.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_NinjaBoy:: @ 8E51A44
-	.incbin "graphics/trainers/ninja_boy/front.4bpp.lz"
+	.incbin "graphics/trainers/ninja_boy.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_ParasolLady:: @ 8E51D20
-	.incbin "graphics/trainers/parasol_lady/front.4bpp.lz"
+	.incbin "graphics/trainers/parasol_lady.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_BugManiac:: @ 8E52058
-	.incbin "graphics/trainers/bug_maniac/front.4bpp.lz"
+	.incbin "graphics/trainers/bug_maniac.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Sailor:: @ 8E524A8
-	.incbin "graphics/trainers/sailor/front.4bpp.lz"
+	.incbin "graphics/trainers/sailor.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Collector:: @ 8E52858
-	.incbin "graphics/trainers/collector/front.4bpp.lz"
+	.incbin "graphics/trainers/collector.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PokemonBreederM:: @ 8E52C5C
-	.incbin "graphics/trainers/pokemon_breeder_m/front.4bpp.lz"
+	.incbin "graphics/trainers/pokemon_breeder_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PokemonRangerM:: @ 8E52F8C
-	.incbin "graphics/trainers/pokemon_ranger_m/front.4bpp.lz"
+	.incbin "graphics/trainers/pokemon_ranger_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PokemonRangerF:: @ 8E532D4
-	.incbin "graphics/trainers/pokemon_ranger_f/front.4bpp.lz"
+	.incbin "graphics/trainers/pokemon_ranger_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_MagmaAdminM:: @ 8E53608
-	.incbin "graphics/trainers/magma_admin_m/front.4bpp.lz"
+	.incbin "graphics/trainers/magma_admin_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_MagmaAdminF:: @ 8E539E0
-	.incbin "graphics/trainers/magma_admin_f/front.4bpp.lz"
+	.incbin "graphics/trainers/magma_admin_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_AromaLady:: @ 8E53D90
-	.incbin "graphics/trainers/aroma_lady/front.4bpp.lz"
+	.incbin "graphics/trainers/aroma_lady.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_RuinManiac:: @ 8E54054
-	.incbin "graphics/trainers/ruin_maniac/front.4bpp.lz"
+	.incbin "graphics/trainers/ruin_maniac.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_CoolTrainerM:: @ 8E543F0
-	.incbin "graphics/trainers/cool_trainer_m/front.4bpp.lz"
+	.incbin "graphics/trainers/cool_trainer_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_CoolTrainerF:: @ 8E546D8
-	.incbin "graphics/trainers/cool_trainer_f/front.4bpp.lz"
+	.incbin "graphics/trainers/cool_trainer_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Pokemaniac:: @ 8E549EC
-	.incbin "graphics/trainers/pokemaniac/front.4bpp.lz"
+	.incbin "graphics/trainers/pokemaniac.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Kindler:: @ 8E54D5C
-	.incbin "graphics/trainers/kindler/front.4bpp.lz"
+	.incbin "graphics/trainers/kindler.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Camper:: @ 8E550C8
-	.incbin "graphics/trainers/camper/front.4bpp.lz"
+	.incbin "graphics/trainers/camper.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Picnicker:: @ 8E553B0
-	.incbin "graphics/trainers/picnicker/front.4bpp.lz"
+	.incbin "graphics/trainers/picnicker.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PsychicM:: @ 8E55690
-	.incbin "graphics/trainers/psychic_m/front.4bpp.lz"
+	.incbin "graphics/trainers/psychic_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PsychicF:: @ 8E559BC
-	.incbin "graphics/trainers/psychic_f/front.4bpp.lz"
+	.incbin "graphics/trainers/psychic_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SchoolKidF:: @ 8E55CE4
-	.incbin "graphics/trainers/school_kid_f/front.4bpp.lz"
+	.incbin "graphics/trainers/school_kid_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_PokefanM:: @ 8E55F80
-	.incbin "graphics/trainers/pokefan_m/front.4bpp.lz"
+	.incbin "graphics/trainers/pokefan_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_SisAndBro:: @ 8E5633C
-	.incbin "graphics/trainers/sis_and_bro/front.4bpp.lz"
+	.incbin "graphics/trainers/sis_and_bro.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_OldCouple:: @ 8E56788
-	.incbin "graphics/trainers/old_couple/front.4bpp.lz"
+	.incbin "graphics/trainers/old_couple.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_AquaAdminM:: @ 8E56C98
-	.incbin "graphics/trainers/aqua_admin_m/front.4bpp.lz"
+	.incbin "graphics/trainers/aqua_admin_m.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_AquaAdminF:: @ 8E5704C
-	.incbin "graphics/trainers/aqua_admin_f/front.4bpp.lz"
+	.incbin "graphics/trainers/aqua_admin_f.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_UnusedAqua:: @ 8E57410
-	.incbin "graphics/trainers/unused_aqua/front.4bpp.lz"
+	.incbin "graphics/trainers/unused_aqua.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Archie:: @ 8E5778C
-	.incbin "graphics/trainers/archie/front.4bpp.lz"
+	.incbin "graphics/trainers/archie.4bpp.lz"
 
 	.align 2
 gTrainerBackPic_Brendan:: @ 8E57AC8
-	.incbin "graphics/trainers/brendan/back.4bpp.lz"
+	.incbin "graphics/trainers/brendan_back.4bpp.lz"
 
 	.align 2
 gTrainerBackPic_May:: @ 8E5889C
-	.incbin "graphics/trainers/may/back.4bpp.lz"
+	.incbin "graphics/trainers/may_back.4bpp.lz"
 
 	.align 2
 gTrainerBackPic_Wally:: @ 8E59588
-	.incbin "graphics/trainers/wally/back.4bpp.lz"
+	.incbin "graphics/trainers/wally_back.4bpp.lz"
 
 	.align 2
 gTrainerPalette_Lass:: @ 8E59FD8
-	.incbin "graphics/trainers/lass/palette.gbapal.lz"
+	.incbin "graphics/trainers/lass.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Youngster:: @ 8E5A000
-	.incbin "graphics/trainers/youngster/palette.gbapal.lz"
+	.incbin "graphics/trainers/youngster.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Brendan:: @ 8E5A028
-	.incbin "graphics/trainers/brendan/palette.gbapal.lz"
+	.incbin "graphics/trainers/brendan.gbapal.lz"
 
 	.align 2
 gTrainerPalette_May:: @ 8E5A050
-	.incbin "graphics/trainers/may/palette.gbapal.lz"
+	.incbin "graphics/trainers/may.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Hiker:: @ 8E5A078
-	.incbin "graphics/trainers/hiker/palette.gbapal.lz"
+	.incbin "graphics/trainers/hiker.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Beauty:: @ 8E5A0A0
-	.incbin "graphics/trainers/beauty/palette.gbapal.lz"
+	.incbin "graphics/trainers/beauty.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Fisherman:: @ 8E5A0C8
-	.incbin "graphics/trainers/fisherman/palette.gbapal.lz"
+	.incbin "graphics/trainers/fisherman.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Lady:: @ 8E5A0F0
-	.incbin "graphics/trainers/lady/palette.gbapal.lz"
+	.incbin "graphics/trainers/lady.gbapal.lz"
 
 	.align 2
 gTrainerPalette_CyclingTriathleteM:: @ 8E5A118
-	.incbin "graphics/trainers/cycling_triathlete_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/cycling_triathlete_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_AquaGruntM:: @ 8E5A140
-	.incbin "graphics/trainers/aqua_grunt_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/aqua_grunt_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Twins:: @ 8E5A168
-	.incbin "graphics/trainers/twins/palette.gbapal.lz"
+	.incbin "graphics/trainers/twins.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SwimmerF:: @ 8E5A190
-	.incbin "graphics/trainers/swimmer_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/swimmer_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_BugCatcher:: @ 8E5A1B8
-	.incbin "graphics/trainers/bug_catcher/palette.gbapal.lz"
+	.incbin "graphics/trainers/bug_catcher.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SchoolKidM:: @ 8E5A1E0
-	.incbin "graphics/trainers/school_kid_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/school_kid_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_RichBoy:: @ 8E5A208
-	.incbin "graphics/trainers/rich_boy/palette.gbapal.lz"
+	.incbin "graphics/trainers/rich_boy.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SrAndJr:: @ 8E5A230
-	.incbin "graphics/trainers/sr_and_jr/palette.gbapal.lz"
+	.incbin "graphics/trainers/sr_and_jr.gbapal.lz"
 
 	.align 2
 gTrainerPalette_BlackBelt:: @ 8E5A258
-	.incbin "graphics/trainers/black_belt/palette.gbapal.lz"
+	.incbin "graphics/trainers/black_belt.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Wally:: @ 8E5A280
-	.incbin "graphics/trainers/wally/palette.gbapal.lz"
+	.incbin "graphics/trainers/wally.gbapal.lz"
 
 	.align 2
 gTrainerPalette_AquaGruntF:: @ 8E5A2A8
-	.incbin "graphics/trainers/aqua_grunt_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/aqua_grunt_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_TuberF:: @ 8E5A2D0
-	.incbin "graphics/trainers/tuber_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/tuber_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_HexManiac:: @ 8E5A2F8
-	.incbin "graphics/trainers/hex_maniac/palette.gbapal.lz"
+	.incbin "graphics/trainers/hex_maniac.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PokemonBreederF:: @ 8E5A320
-	.incbin "graphics/trainers/pokemon_breeder_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokemon_breeder_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_MagmaGruntM:: @ 8E5A348
-	.incbin "graphics/trainers/magma_grunt_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/magma_grunt_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_MagmaGruntF:: @ 8E5A370
-	.incbin "graphics/trainers/magma_grunt_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/magma_grunt_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Interviewer:: @ 8E5A398
-	.incbin "graphics/trainers/interviewer/palette.gbapal.lz"
+	.incbin "graphics/trainers/interviewer.gbapal.lz"
 
 	.align 2
 gTrainerPalette_TuberM:: @ 8E5A3C0
-	.incbin "graphics/trainers/tuber_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/tuber_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_YoungCouple:: @ 8E5A3E8
-	.incbin "graphics/trainers/young_couple/palette.gbapal.lz"
+	.incbin "graphics/trainers/young_couple.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Guitarist:: @ 8E5A410
-	.incbin "graphics/trainers/guitarist/palette.gbapal.lz"
+	.incbin "graphics/trainers/guitarist.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Gentleman:: @ 8E5A438
-	.incbin "graphics/trainers/gentleman/palette.gbapal.lz"
+	.incbin "graphics/trainers/gentleman.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Steven:: @ 8E5A460
-	.incbin "graphics/trainers/steven/palette.gbapal.lz"
+	.incbin "graphics/trainers/steven.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Maxie:: @ 8E5A488
-	.incbin "graphics/trainers/maxie/palette.gbapal.lz"
+	.incbin "graphics/trainers/maxie.gbapal.lz"
 
 	.align 2
 gTrainerPalette_RunningTriathleteF:: @ 8E5A4B0
-	.incbin "graphics/trainers/running_triathlete_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/running_triathlete_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_RunningTriathleteM:: @ 8E5A4D8
-	.incbin "graphics/trainers/running_triathlete_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/running_triathlete_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_BattleGirl:: @ 8E5A500
-	.incbin "graphics/trainers/battle_girl/palette.gbapal.lz"
+	.incbin "graphics/trainers/battle_girl.gbapal.lz"
 
 	.align 2
 gTrainerPalette_CyclingTriathleteF:: @ 8E5A528
-	.incbin "graphics/trainers/cycling_triathlete_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/cycling_triathlete_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SwimmerM:: @ 8E5A550
-	.incbin "graphics/trainers/swimmer_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/swimmer_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PokefanF:: @ 8E5A578
-	.incbin "graphics/trainers/pokefan_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokefan_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_ExpertM:: @ 8E5A5A0
-	.incbin "graphics/trainers/expert_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/expert_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_ExpertF:: @ 8E5A5C8
-	.incbin "graphics/trainers/expert_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/expert_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SwimmingTriathleteM:: @ 8E5A5F0
-	.incbin "graphics/trainers/swimming_triathlete_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/swimming_triathlete_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SwimmingTriathleteF:: @ 8E5A618
-	.incbin "graphics/trainers/swimming_triathlete_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/swimming_triathlete_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_DragonTamer:: @ 8E5A640
-	.incbin "graphics/trainers/dragon_tamer/palette.gbapal.lz"
+	.incbin "graphics/trainers/dragon_tamer.gbapal.lz"
 
 	.align 2
 gTrainerPalette_BirdKeeper:: @ 8E5A668
-	.incbin "graphics/trainers/bird_keeper/palette.gbapal.lz"
+	.incbin "graphics/trainers/bird_keeper.gbapal.lz"
 
 	.align 2
 gTrainerPalette_NinjaBoy:: @ 8E5A690
-	.incbin "graphics/trainers/ninja_boy/palette.gbapal.lz"
+	.incbin "graphics/trainers/ninja_boy.gbapal.lz"
 
 	.align 2
 gTrainerPalette_ParasolLady:: @ 8E5A6B8
-	.incbin "graphics/trainers/parasol_lady/palette.gbapal.lz"
+	.incbin "graphics/trainers/parasol_lady.gbapal.lz"
 
 	.align 2
 gTrainerPalette_BugManiac:: @ 8E5A6E0
-	.incbin "graphics/trainers/bug_maniac/palette.gbapal.lz"
+	.incbin "graphics/trainers/bug_maniac.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Sailor:: @ 8E5A708
-	.incbin "graphics/trainers/sailor/palette.gbapal.lz"
+	.incbin "graphics/trainers/sailor.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Collector:: @ 8E5A730
-	.incbin "graphics/trainers/collector/palette.gbapal.lz"
+	.incbin "graphics/trainers/collector.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PokemonBreederM:: @ 8E5A758
-	.incbin "graphics/trainers/pokemon_breeder_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokemon_breeder_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PokemonRangerM:: @ 8E5A780
-	.incbin "graphics/trainers/pokemon_ranger_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokemon_ranger_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PokemonRangerF:: @ 8E5A7A8
-	.incbin "graphics/trainers/pokemon_ranger_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokemon_ranger_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_MagmaAdminM:: @ 8E5A7D0
-	.incbin "graphics/trainers/magma_admin_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/magma_admin_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_MagmaAdminF:: @ 8E5A7F8
-	.incbin "graphics/trainers/magma_admin_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/magma_admin_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_AromaLady:: @ 8E5A820
-	.incbin "graphics/trainers/aroma_lady/palette.gbapal.lz"
+	.incbin "graphics/trainers/aroma_lady.gbapal.lz"
 
 	.align 2
 gTrainerPalette_RuinManiac:: @ 8E5A848
-	.incbin "graphics/trainers/ruin_maniac/palette.gbapal.lz"
+	.incbin "graphics/trainers/ruin_maniac.gbapal.lz"
 
 	.align 2
 gTrainerPalette_CoolTrainerM:: @ 8E5A870
-	.incbin "graphics/trainers/cool_trainer_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/cool_trainer_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_CoolTrainerF:: @ 8E5A898
-	.incbin "graphics/trainers/cool_trainer_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/cool_trainer_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Pokemaniac:: @ 8E5A8C0
-	.incbin "graphics/trainers/pokemaniac/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokemaniac.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Kindler:: @ 8E5A8E8
-	.incbin "graphics/trainers/kindler/palette.gbapal.lz"
+	.incbin "graphics/trainers/kindler.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Camper:: @ 8E5A910
-	.incbin "graphics/trainers/camper/palette.gbapal.lz"
+	.incbin "graphics/trainers/camper.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Picnicker:: @ 8E5A938
-	.incbin "graphics/trainers/picnicker/palette.gbapal.lz"
+	.incbin "graphics/trainers/picnicker.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PsychicM:: @ 8E5A960
-	.incbin "graphics/trainers/psychic_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/psychic_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PsychicF:: @ 8E5A988
-	.incbin "graphics/trainers/psychic_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/psychic_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SchoolKidF:: @ 8E5A9B0
-	.incbin "graphics/trainers/school_kid_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/school_kid_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_PokefanM:: @ 8E5A9D8
-	.incbin "graphics/trainers/pokefan_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/pokefan_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_SisAndBro:: @ 8E5AA00
-	.incbin "graphics/trainers/sis_and_bro/palette.gbapal.lz"
+	.incbin "graphics/trainers/sis_and_bro.gbapal.lz"
 
 	.align 2
 gTrainerPalette_OldCouple:: @ 8E5AA28
-	.incbin "graphics/trainers/old_couple/palette.gbapal.lz"
+	.incbin "graphics/trainers/old_couple.gbapal.lz"
 
 	.align 2
 gTrainerPalette_AquaAdminM:: @ 8E5AA50
-	.incbin "graphics/trainers/aqua_admin_m/palette.gbapal.lz"
+	.incbin "graphics/trainers/aqua_admin_m.gbapal.lz"
 
 	.align 2
 gTrainerPalette_AquaAdminF:: @ 8E5AA78
-	.incbin "graphics/trainers/aqua_admin_f/palette.gbapal.lz"
+	.incbin "graphics/trainers/aqua_admin_f.gbapal.lz"
 
 	.align 2
 gTrainerPalette_UnusedAqua:: @ 8E5AAA0
-	.incbin "graphics/trainers/unused_aqua/palette.gbapal.lz"
+	.incbin "graphics/trainers/unused_aqua.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Archie:: @ 8E5AAC8
-	.incbin "graphics/trainers/archie/palette.gbapal.lz"
+	.incbin "graphics/trainers/archie.gbapal.lz"
 
 	.align 2
 gTrainerFrontPic_Roxanne:: @ 8E5AAF0
-	.incbin "graphics/trainers/roxanne/front.4bpp.lz"
+	.incbin "graphics/trainers/roxanne.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Brawly:: @ 8E5ADDC
-	.incbin "graphics/trainers/brawly/front.4bpp.lz"
+	.incbin "graphics/trainers/brawly.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Wattson:: @ 8E5B170
-	.incbin "graphics/trainers/wattson/front.4bpp.lz"
+	.incbin "graphics/trainers/wattson.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Flannery:: @ 8E5B4B8
-	.incbin "graphics/trainers/flannery/front.4bpp.lz"
+	.incbin "graphics/trainers/flannery.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Norman:: @ 8E5B838
-	.incbin "graphics/trainers/norman/front.4bpp.lz"
+	.incbin "graphics/trainers/norman.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Winona:: @ 8E5BB74
-	.incbin "graphics/trainers/winona/front.4bpp.lz"
+	.incbin "graphics/trainers/winona.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_TateAndLiza:: @ 8E5BEF4
-	.incbin "graphics/trainers/tate_and_liza/front.4bpp.lz"
+	.incbin "graphics/trainers/tate_and_liza.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Wallace:: @ 8E5C338
-	.incbin "graphics/trainers/wallace/front.4bpp.lz"
+	.incbin "graphics/trainers/wallace.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Sidney:: @ 8E5C6B0
-	.incbin "graphics/trainers/sidney/front.4bpp.lz"
+	.incbin "graphics/trainers/sidney.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Phoebe:: @ 8E5C9E4
-	.incbin "graphics/trainers/phoebe/front.4bpp.lz"
+	.incbin "graphics/trainers/phoebe.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Glacia:: @ 8E5CCE4
-	.incbin "graphics/trainers/glacia/front.4bpp.lz"
+	.incbin "graphics/trainers/glacia.4bpp.lz"
 
 	.align 2
 gTrainerFrontPic_Drake:: @ 8E5D068
-	.incbin "graphics/trainers/drake/front.4bpp.lz"
+	.incbin "graphics/trainers/drake.4bpp.lz"
 
 	.align 2
 gTrainerPalette_Roxanne:: @ 8E5D410
-	.incbin "graphics/trainers/roxanne/palette.gbapal.lz"
+	.incbin "graphics/trainers/roxanne.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Brawly:: @ 8E5D438
-	.incbin "graphics/trainers/brawly/palette.gbapal.lz"
+	.incbin "graphics/trainers/brawly.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Wattson:: @ 8E5D460
-	.incbin "graphics/trainers/wattson/palette.gbapal.lz"
+	.incbin "graphics/trainers/wattson.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Flannery:: @ 8E5D488
-	.incbin "graphics/trainers/flannery/palette.gbapal.lz"
+	.incbin "graphics/trainers/flannery.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Norman:: @ 8E5D4B0
-	.incbin "graphics/trainers/norman/palette.gbapal.lz"
+	.incbin "graphics/trainers/norman.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Winona:: @ 8E5D4D8
-	.incbin "graphics/trainers/winona/palette.gbapal.lz"
+	.incbin "graphics/trainers/winona.gbapal.lz"
 
 	.align 2
 gTrainerPalette_TateAndLiza:: @ 8E5D500
-	.incbin "graphics/trainers/tate_and_liza/palette.gbapal.lz"
+	.incbin "graphics/trainers/tate_and_liza.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Wallace:: @ 8E5D528
-	.incbin "graphics/trainers/wallace/palette.gbapal.lz"
+	.incbin "graphics/trainers/wallace.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Sidney:: @ 8E5D550
-	.incbin "graphics/trainers/sidney/palette.gbapal.lz"
+	.incbin "graphics/trainers/sidney.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Phoebe:: @ 8E5D578
-	.incbin "graphics/trainers/phoebe/palette.gbapal.lz"
+	.incbin "graphics/trainers/phoebe.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Glacia:: @ 8E5D5A0
-	.incbin "graphics/trainers/glacia/palette.gbapal.lz"
+	.incbin "graphics/trainers/glacia.gbapal.lz"
 
 	.align 2
 gTrainerPalette_Drake:: @ 8E5D5C8
-	.incbin "graphics/trainers/drake/palette.gbapal.lz"
+	.incbin "graphics/trainers/drake.gbapal.lz"
diff --git a/graphics/trainers/aqua_admin_f/front.png b/graphics/trainers/aqua_admin_f.png
index 3428944b6..3428944b6 100644
--- a/graphics/trainers/aqua_admin_f/front.png
+++ b/graphics/trainers/aqua_admin_f.png
diff --git a/graphics/trainers/aqua_admin_f/palette.pal b/graphics/trainers/aqua_admin_f/palette.pal
deleted file mode 100644
index 4bad68770..000000000
--- a/graphics/trainers/aqua_admin_f/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 131 41
-189 156 90
-238 98 41
-180 65 41
-255 255 255
-0 0 0
diff --git a/graphics/trainers/aqua_admin_m/front.png b/graphics/trainers/aqua_admin_m.png
index 91a434ec8..91a434ec8 100644
--- a/graphics/trainers/aqua_admin_m/front.png
+++ b/graphics/trainers/aqua_admin_m.png
diff --git a/graphics/trainers/aqua_admin_m/palette.pal b/graphics/trainers/aqua_admin_m/palette.pal
deleted file mode 100644
index 2a7a46d46..000000000
--- a/graphics/trainers/aqua_admin_m/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 131 41
-189 156 90
-222 82 24
-164 49 24
-255 255 255
-0 0 0
diff --git a/graphics/trainers/aqua_grunt_f/front.png b/graphics/trainers/aqua_grunt_f.png
index 5455700db..5455700db 100644
--- a/graphics/trainers/aqua_grunt_f/front.png
+++ b/graphics/trainers/aqua_grunt_f.png
diff --git a/graphics/trainers/aqua_grunt_f/palette.pal b/graphics/trainers/aqua_grunt_f/palette.pal
deleted file mode 100644
index 4563eba48..000000000
--- a/graphics/trainers/aqua_grunt_f/palette.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
-65 90 139
-57 57 57
-213 222 230
-164 74 65
-189 156 90
-255 106 98
-205 82 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/aqua_grunt_m/front.png b/graphics/trainers/aqua_grunt_m.png
index 77ead55fd..77ead55fd 100644
--- a/graphics/trainers/aqua_grunt_m/front.png
+++ b/graphics/trainers/aqua_grunt_m.png
diff --git a/graphics/trainers/aqua_grunt_m/palette.pal b/graphics/trainers/aqua_grunt_m/palette.pal
deleted file mode 100644
index c2b28ead9..000000000
--- a/graphics/trainers/aqua_grunt_m/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 164 197
-189 156 90
-255 115 148
-213 82 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/archie/front.png b/graphics/trainers/archie.png
index e7593b0f0..e7593b0f0 100644
--- a/graphics/trainers/archie/front.png
+++ b/graphics/trainers/archie.png
diff --git a/graphics/trainers/archie/palette.pal b/graphics/trainers/archie/palette.pal
deleted file mode 100644
index a778ea6bb..000000000
--- a/graphics/trainers/archie/palette.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
-131 156 180
-106 123 148
-82 90 115
-57 65 98
-213 213 222
-82 90 156
-24 32 49
-148 156 222
-106 115 213
-255 255 255
-0 0 0
diff --git a/graphics/trainers/aroma_lady/front.png b/graphics/trainers/aroma_lady.png
index 9f6eb814c..9f6eb814c 100644
--- a/graphics/trainers/aroma_lady/front.png
+++ b/graphics/trainers/aroma_lady.png
diff --git a/graphics/trainers/aroma_lady/palette.pal b/graphics/trainers/aroma_lady/palette.pal
deleted file mode 100644
index eb9f3dfd4..000000000
--- a/graphics/trainers/aroma_lady/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 213 172
-238 197 148
-205 156 115
-115 82 65
-238 230 255
-205 197 213
-156 164 205
-106 98 148
-74 222 148
-172 115 41
-115 65 24
-238 90 131
-189 65 90
-106 255 156
-0 0 0
diff --git a/graphics/trainers/battle_girl/front.png b/graphics/trainers/battle_girl.png
index fbce1299e..fbce1299e 100644
--- a/graphics/trainers/battle_girl/front.png
+++ b/graphics/trainers/battle_girl.png
diff --git a/graphics/trainers/battle_girl/palette.pal b/graphics/trainers/battle_girl/palette.pal
deleted file mode 100644
index 7f172b169..000000000
--- a/graphics/trainers/battle_girl/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-255 164 82
-230 106 0
-197 65 65
-156 106 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/beauty/front.png b/graphics/trainers/beauty.png
index aea688176..aea688176 100644
--- a/graphics/trainers/beauty/front.png
+++ b/graphics/trainers/beauty.png
diff --git a/graphics/trainers/beauty/palette.pal b/graphics/trainers/beauty/palette.pal
deleted file mode 100644
index ab549df20..000000000
--- a/graphics/trainers/beauty/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-230 172 131
-205 131 115
-123 82 74
-148 131 139
-255 205 106
-213 172 74
-164 123 82
-115 90 115
-74 49 74
-255 82 57
-180 82 74
-131 74 65
-255 255 255
-0 0 24
diff --git a/graphics/trainers/bird_keeper/front.png b/graphics/trainers/bird_keeper.png
index 7ad67c5d7..7ad67c5d7 100644
--- a/graphics/trainers/bird_keeper/front.png
+++ b/graphics/trainers/bird_keeper.png
diff --git a/graphics/trainers/bird_keeper/palette.pal b/graphics/trainers/bird_keeper/palette.pal
deleted file mode 100644
index 87194c84a..000000000
--- a/graphics/trainers/bird_keeper/palette.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 180 197
-131 139 156
-90 98 115
-57 65 82
-213 213 222
-131 16 41
-24 32 49
-213 82 90
-180 41 57
-255 255 255
-0 0 0
diff --git a/graphics/trainers/black_belt/front.png b/graphics/trainers/black_belt.png
index fd3b51c66..fd3b51c66 100644
--- a/graphics/trainers/black_belt/front.png
+++ b/graphics/trainers/black_belt.png
diff --git a/graphics/trainers/black_belt/palette.pal b/graphics/trainers/black_belt/palette.pal
deleted file mode 100644
index 869e5d8df..000000000
--- a/graphics/trainers/black_belt/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-246 205 189
-222 172 148
-172 131 106
-90 65 49
-148 131 123
-106 90 82
-82 90 115
-49 57 82
-205 189 189
-189 164 164
-156 139 139
-255 98 90
-197 65 65
-246 230 230
-0 0 0
diff --git a/graphics/trainers/brawly/front.png b/graphics/trainers/brawly.png
index a8d05b25d..a8d05b25d 100644
--- a/graphics/trainers/brawly/front.png
+++ b/graphics/trainers/brawly.png
diff --git a/graphics/trainers/brawly/palette.pal b/graphics/trainers/brawly/palette.pal
deleted file mode 100644
index 5a5a482f2..000000000
--- a/graphics/trainers/brawly/palette.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
-65 90 139
-49 49 74
-213 213 222
-255 164 197
-115 115 115
-255 139 65
-213 98 24
-255 255 255
-0 0 0
diff --git a/graphics/trainers/brendan/front.png b/graphics/trainers/brendan.png
index c1110bf28..c1110bf28 100644
--- a/graphics/trainers/brendan/front.png
+++ b/graphics/trainers/brendan.png
diff --git a/graphics/trainers/brendan/palette.pal b/graphics/trainers/brendan/palette.pal
deleted file mode 100644
index b5d3791c3..000000000
--- a/graphics/trainers/brendan/palette.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
-255 197 90
-189 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/brendan/back.png b/graphics/trainers/brendan_back.png
index 51b360637..51b360637 100644
--- a/graphics/trainers/brendan/back.png
+++ b/graphics/trainers/brendan_back.png
diff --git a/graphics/trainers/bug_catcher/front.png b/graphics/trainers/bug_catcher.png
index 8fe86d40e..8fe86d40e 100644
--- a/graphics/trainers/bug_catcher/front.png
+++ b/graphics/trainers/bug_catcher.png
diff --git a/graphics/trainers/bug_catcher/palette.pal b/graphics/trainers/bug_catcher/palette.pal
deleted file mode 100644
index c68f56690..000000000
--- a/graphics/trainers/bug_catcher/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-230 180 148
-213 148 115
-123 90 82
-222 222 164
-197 197 139
-156 139 74
-41 57 98
-197 197 238
-246 238 213
-189 49 57
-98 164 222
-49 123 156
-255 255 255
-0 0 0
diff --git a/graphics/trainers/bug_maniac/front.png b/graphics/trainers/bug_maniac.png
index 239bba039..239bba039 100644
--- a/graphics/trainers/bug_maniac/front.png
+++ b/graphics/trainers/bug_maniac.png
diff --git a/graphics/trainers/bug_maniac/palette.pal b/graphics/trainers/bug_maniac/palette.pal
deleted file mode 100644
index 2aa329179..000000000
--- a/graphics/trainers/bug_maniac/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-49 123 156
-49 65 131
-65 74 74
-222 222 164
-197 197 139
-205 213 213
-156 139 74
-98 164 222
-106 115 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/camper/front.png b/graphics/trainers/camper.png
index 24d173dee..24d173dee 100644
--- a/graphics/trainers/camper/front.png
+++ b/graphics/trainers/camper.png
diff --git a/graphics/trainers/camper/palette.pal b/graphics/trainers/camper/palette.pal
deleted file mode 100644
index e5c224fd2..000000000
--- a/graphics/trainers/camper/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-230 189 156
-205 156 115
-115 82 65
-131 213 205
-82 164 148
-180 189 222
-57 90 74
-24 49 90
-98 115 230
-57 82 131
-255 98 41
-189 74 41
-255 255 255
-0 0 0
diff --git a/graphics/trainers/collector/front.png b/graphics/trainers/collector.png
index 15187ce1c..15187ce1c 100644
--- a/graphics/trainers/collector/front.png
+++ b/graphics/trainers/collector.png
diff --git a/graphics/trainers/collector/palette.pal b/graphics/trainers/collector/palette.pal
deleted file mode 100644
index d4d9221e2..000000000
--- a/graphics/trainers/collector/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-230 180 148
-197 139 115
-123 90 82
-106 139 189
-65 98 148
-32 74 123
-255 98 90
-197 65 65
-213 222 230
-131 74 65
-115 123 131
-164 172 180
-255 255 255
-0 0 0
diff --git a/graphics/trainers/cool_trainer_f/front.png b/graphics/trainers/cool_trainer_f.png
index 572aa811a..572aa811a 100644
--- a/graphics/trainers/cool_trainer_f/front.png
+++ b/graphics/trainers/cool_trainer_f.png
diff --git a/graphics/trainers/cool_trainer_f/palette.pal b/graphics/trainers/cool_trainer_f/palette.pal
deleted file mode 100644
index 292d0fc78..000000000
--- a/graphics/trainers/cool_trainer_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-238 197 156
-205 156 115
-115 82 65
-238 156 115
-205 90 74
-0 189 222
-123 41 24
-180 230 139
-139 180 57
-74 90 32
-255 246 189
-213 205 131
-255 255 255
-0 0 0
diff --git a/graphics/trainers/cool_trainer_m/front.png b/graphics/trainers/cool_trainer_m.png
index 6b998992e..6b998992e 100644
--- a/graphics/trainers/cool_trainer_m/front.png
+++ b/graphics/trainers/cool_trainer_m.png
diff --git a/graphics/trainers/cool_trainer_m/palette.pal b/graphics/trainers/cool_trainer_m/palette.pal
deleted file mode 100644
index 52a32e925..000000000
--- a/graphics/trainers/cool_trainer_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-246 205 156
-205 156 115
-115 82 65
-238 156 115
-230 98 82
-180 90 74
-131 49 32
-57 90 41
-164 180 106
-98 123 57
-255 246 189
-213 205 131
-255 255 255
-0 0 0
diff --git a/graphics/trainers/cycling_triathlete_f/front.png b/graphics/trainers/cycling_triathlete_f.png
index b5c2662b3..b5c2662b3 100644
--- a/graphics/trainers/cycling_triathlete_f/front.png
+++ b/graphics/trainers/cycling_triathlete_f.png
diff --git a/graphics/trainers/cycling_triathlete_f/palette.pal b/graphics/trainers/cycling_triathlete_f/palette.pal
deleted file mode 100644
index b72bb3011..000000000
--- a/graphics/trainers/cycling_triathlete_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-57 41 57
-57 74 106
-131 131 156
-139 156 238
-115 131 205
-98 106 172
-205 197 255
-230 90 65
-189 74 41
-139 74 82
-255 255 255
-0 0 24
diff --git a/graphics/trainers/cycling_triathlete_m/front.png b/graphics/trainers/cycling_triathlete_m.png
index b2f55f0fc..b2f55f0fc 100644
--- a/graphics/trainers/cycling_triathlete_m/front.png
+++ b/graphics/trainers/cycling_triathlete_m.png
diff --git a/graphics/trainers/cycling_triathlete_m/palette.pal b/graphics/trainers/cycling_triathlete_m/palette.pal
deleted file mode 100644
index 9255a4a94..000000000
--- a/graphics/trainers/cycling_triathlete_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-238 189 139
-189 148 115
-139 106 82
-57 41 57
-115 90 106
-156 131 156
-156 213 255
-106 164 222
-82 131 197
-205 197 255
-230 90 65
-189 74 41
-139 74 82
-255 255 255
-0 0 24
diff --git a/graphics/trainers/dragon_tamer/front.png b/graphics/trainers/dragon_tamer.png
index 285f2207c..285f2207c 100644
--- a/graphics/trainers/dragon_tamer/front.png
+++ b/graphics/trainers/dragon_tamer.png
diff --git a/graphics/trainers/dragon_tamer/palette.pal b/graphics/trainers/dragon_tamer/palette.pal
deleted file mode 100644
index 545c55b74..000000000
--- a/graphics/trainers/dragon_tamer/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-74 57 49
-164 57 246
-123 49 172
-131 139 148
-255 98 90
-197 65 65
-213 222 230
-74 74 65
-255 205 106
-213 172 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/drake/front.png b/graphics/trainers/drake.png
index b27716719..b27716719 100644
--- a/graphics/trainers/drake/front.png
+++ b/graphics/trainers/drake.png
diff --git a/graphics/trainers/drake/palette.pal b/graphics/trainers/drake/palette.pal
deleted file mode 100644
index 6ab0bae73..000000000
--- a/graphics/trainers/drake/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 172 148
-164 131 106
-98 57 65
-139 131 164
-106 98 123
-41 49 57
-57 65 82
-197 197 213
-255 222 106
-189 156 90
-106 131 238
-65 106 172
-255 255 255
-0 0 0
diff --git a/graphics/trainers/expert_f/front.png b/graphics/trainers/expert_f.png
index 5f69c2de6..5f69c2de6 100644
--- a/graphics/trainers/expert_f/front.png
+++ b/graphics/trainers/expert_f.png
diff --git a/graphics/trainers/expert_f/palette.pal b/graphics/trainers/expert_f/palette.pal
deleted file mode 100644
index 2fa5f5202..000000000
--- a/graphics/trainers/expert_f/palette.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
-180 180 172
-90 131 189
-65 90 139
-57 57 57
-213 222 230
-139 139 131
-189 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/expert_m/front.png b/graphics/trainers/expert_m.png
index 1c53bf71f..1c53bf71f 100644
--- a/graphics/trainers/expert_m/front.png
+++ b/graphics/trainers/expert_m.png
diff --git a/graphics/trainers/expert_m/palette.pal b/graphics/trainers/expert_m/palette.pal
deleted file mode 100644
index 2fa5f5202..000000000
--- a/graphics/trainers/expert_m/palette.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
-180 180 172
-90 131 189
-65 90 139
-57 57 57
-213 222 230
-139 139 131
-189 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/fisherman/front.png b/graphics/trainers/fisherman.png
index 8e90ccb17..8e90ccb17 100644
--- a/graphics/trainers/fisherman/front.png
+++ b/graphics/trainers/fisherman.png
diff --git a/graphics/trainers/fisherman/palette.pal b/graphics/trainers/fisherman/palette.pal
deleted file mode 100644
index 3c18e8f1f..000000000
--- a/graphics/trainers/fisherman/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 213 189
-222 172 148
-180 131 115
-82 57 57
-123 98 106
-82 82 123
-213 172 82
-180 139 82
-205 205 222
-123 82 49
-49 49 74
-246 123 49
-189 106 49
-238 238 255
-0 0 24
diff --git a/graphics/trainers/flannery/front.png b/graphics/trainers/flannery.png
index 942dc5b6b..942dc5b6b 100644
--- a/graphics/trainers/flannery/front.png
+++ b/graphics/trainers/flannery.png
diff --git a/graphics/trainers/flannery/palette.pal b/graphics/trainers/flannery/palette.pal
deleted file mode 100644
index 20f2f8579..000000000
--- a/graphics/trainers/flannery/palette.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
-180 197 230
-90 156 213
-65 115 164
-49 49 74
-213 213 222
-131 74 16
-115 115 115
-255 139 65
-197 98 32
-255 255 255
-0 0 0
diff --git a/graphics/trainers/gentleman/front.png b/graphics/trainers/gentleman.png
index 85e4b024b..85e4b024b 100644
--- a/graphics/trainers/gentleman/front.png
+++ b/graphics/trainers/gentleman.png
diff --git a/graphics/trainers/gentleman/palette.pal b/graphics/trainers/gentleman/palette.pal
deleted file mode 100644
index ef021d026..000000000
--- a/graphics/trainers/gentleman/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-180 148 115
-148 115 82
-123 90 57
-65 49 41
-255 238 156
-213 213 205
-180 180 172
-90 106 172
-57 74 123
-255 255 255
-0 0 0
diff --git a/graphics/trainers/glacia/front.png b/graphics/trainers/glacia.png
index 7f135ff4b..7f135ff4b 100644
--- a/graphics/trainers/glacia/front.png
+++ b/graphics/trainers/glacia.png
diff --git a/graphics/trainers/glacia/palette.pal b/graphics/trainers/glacia/palette.pal
deleted file mode 100644
index 75b5eb108..000000000
--- a/graphics/trainers/glacia/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-115 82 65
-148 148 164
-148 90 164
-115 65 123
-82 41 82
-255 255 164
-213 197 90
-156 148 90
-222 230 238
-189 197 205
-255 255 255
-0 0 0
diff --git a/graphics/trainers/guitarist/front.png b/graphics/trainers/guitarist.png
index 477f76bdc..477f76bdc 100644
--- a/graphics/trainers/guitarist/front.png
+++ b/graphics/trainers/guitarist.png
diff --git a/graphics/trainers/guitarist/palette.pal b/graphics/trainers/guitarist/palette.pal
deleted file mode 100644
index 74e59e819..000000000
--- a/graphics/trainers/guitarist/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-172 172 164
-139 131 131
-106 98 98
-65 57 57
-255 238 156
-255 197 90
-205 180 148
-255 98 90
-189 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/hex_maniac/front.png b/graphics/trainers/hex_maniac.png
index 8d66b4794..8d66b4794 100644
--- a/graphics/trainers/hex_maniac/front.png
+++ b/graphics/trainers/hex_maniac.png
diff --git a/graphics/trainers/hex_maniac/palette.pal b/graphics/trainers/hex_maniac/palette.pal
deleted file mode 100644
index 549d7fac9..000000000
--- a/graphics/trainers/hex_maniac/palette.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 123 156
-139 90 131
-106 65 106
-74 41 74
-213 222 230
-189 205 213
-205 57 82
-115 41 65
-180 49 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/hiker/front.png b/graphics/trainers/hiker.png
index 6112a5f1e..6112a5f1e 100644
--- a/graphics/trainers/hiker/front.png
+++ b/graphics/trainers/hiker.png
diff --git a/graphics/trainers/hiker/palette.pal b/graphics/trainers/hiker/palette.pal
deleted file mode 100644
index cb8fce7f6..000000000
--- a/graphics/trainers/hiker/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 164 148
-205 131 115
-74 65 57
-123 189 90
-115 148 90
-213 180 98
-172 148 98
-205 205 222
-148 148 148
-123 115 74
-230 98 90
-164 74 74
-255 255 255
-0 0 24
diff --git a/graphics/trainers/interviewer/front.png b/graphics/trainers/interviewer.png
index ff2f9ca54..ff2f9ca54 100644
--- a/graphics/trainers/interviewer/front.png
+++ b/graphics/trainers/interviewer.png
diff --git a/graphics/trainers/interviewer/palette.pal b/graphics/trainers/interviewer/palette.pal
deleted file mode 100644
index 61ace1935..000000000
--- a/graphics/trainers/interviewer/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-148 148 172
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-98 197 255
-90 156 189
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/kindler/front.png b/graphics/trainers/kindler.png
index 01deeb1d9..01deeb1d9 100644
--- a/graphics/trainers/kindler/front.png
+++ b/graphics/trainers/kindler.png
diff --git a/graphics/trainers/kindler/palette.pal b/graphics/trainers/kindler/palette.pal
deleted file mode 100644
index af6adf7e8..000000000
--- a/graphics/trainers/kindler/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-115 82 65
-246 246 230
-222 222 189
-180 180 139
-123 115 74
-172 213 246
-115 180 205
-57 123 139
-255 82 57
-255 156 90
-255 255 255
-0 0 0
diff --git a/graphics/trainers/lady/front.png b/graphics/trainers/lady.png
index 4914eb433..4914eb433 100644
--- a/graphics/trainers/lady/front.png
+++ b/graphics/trainers/lady.png
diff --git a/graphics/trainers/lady/palette.pal b/graphics/trainers/lady/palette.pal
deleted file mode 100644
index b70873111..000000000
--- a/graphics/trainers/lady/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 222
-238 180 180
-156 123 106
-172 106 74
-82 82 32
-213 222 230
-255 230 106
-213 172 90
-222 98 123
-148 164 180
-180 238 106
-148 213 82
-123 189 65
-255 255 255
-0 0 24
diff --git a/graphics/trainers/lass/front.png b/graphics/trainers/lass.png
index 5ccf1afcd..5ccf1afcd 100644
--- a/graphics/trainers/lass/front.png
+++ b/graphics/trainers/lass.png
diff --git a/graphics/trainers/lass/palette.pal b/graphics/trainers/lass/palette.pal
deleted file mode 100644
index 89e78d683..000000000
--- a/graphics/trainers/lass/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-222 148 115
-123 90 82
-164 172 197
-90 98 148
-49 57 82
-41 57 98
-222 230 238
-255 197 90
-189 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/magma_admin_f/front.png b/graphics/trainers/magma_admin_f.png
index c5890b11f..c5890b11f 100644
--- a/graphics/trainers/magma_admin_f/front.png
+++ b/graphics/trainers/magma_admin_f.png
diff --git a/graphics/trainers/magma_admin_f/palette.pal b/graphics/trainers/magma_admin_f/palette.pal
deleted file mode 100644
index a987cdbc1..000000000
--- a/graphics/trainers/magma_admin_f/palette.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
-123 123 123
-90 90 90
-82 98 148
-57 57 65
-65 74 115
-139 49 65
-189 189 180
-222 82 98
-189 57 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/magma_admin_m/front.png b/graphics/trainers/magma_admin_m.png
index d7b5e4fb1..d7b5e4fb1 100644
--- a/graphics/trainers/magma_admin_m/front.png
+++ b/graphics/trainers/magma_admin_m.png
diff --git a/graphics/trainers/magma_admin_m/palette.pal b/graphics/trainers/magma_admin_m/palette.pal
deleted file mode 100644
index a987cdbc1..000000000
--- a/graphics/trainers/magma_admin_m/palette.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
-123 123 123
-90 90 90
-82 98 148
-57 57 65
-65 74 115
-139 49 65
-189 189 180
-222 82 98
-189 57 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/magma_grunt_f/front.png b/graphics/trainers/magma_grunt_f.png
index 6fa81a6a7..6fa81a6a7 100644
--- a/graphics/trainers/magma_grunt_f/front.png
+++ b/graphics/trainers/magma_grunt_f.png
diff --git a/graphics/trainers/magma_grunt_f/palette.pal b/graphics/trainers/magma_grunt_f/palette.pal
deleted file mode 100644
index a987cdbc1..000000000
--- a/graphics/trainers/magma_grunt_f/palette.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
-123 123 123
-90 90 90
-82 98 148
-57 57 65
-65 74 115
-139 49 65
-189 189 180
-222 82 98
-189 57 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/magma_grunt_m/front.png b/graphics/trainers/magma_grunt_m.png
index 4c7fa355a..4c7fa355a 100644
--- a/graphics/trainers/magma_grunt_m/front.png
+++ b/graphics/trainers/magma_grunt_m.png
diff --git a/graphics/trainers/magma_grunt_m/palette.pal b/graphics/trainers/magma_grunt_m/palette.pal
deleted file mode 100644
index a987cdbc1..000000000
--- a/graphics/trainers/magma_grunt_m/palette.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
-123 123 123
-90 90 90
-82 98 148
-57 57 65
-65 74 115
-139 49 65
-189 189 180
-222 82 98
-189 57 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/maxie/front.png b/graphics/trainers/maxie.png
index 679f62367..679f62367 100644
--- a/graphics/trainers/maxie/front.png
+++ b/graphics/trainers/maxie.png
diff --git a/graphics/trainers/maxie/palette.pal b/graphics/trainers/maxie/palette.pal
deleted file mode 100644
index 151bf6d5b..000000000
--- a/graphics/trainers/maxie/palette.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 180 197
-115 123 139
-74 82 98
-49 57 82
-213 213 222
-131 16 41
-24 32 49
-213 82 90
-180 41 57
-255 255 255
-0 0 0
diff --git a/graphics/trainers/may/front.png b/graphics/trainers/may.png
index b795b4586..b795b4586 100644
--- a/graphics/trainers/may/front.png
+++ b/graphics/trainers/may.png
diff --git a/graphics/trainers/may/palette.pal b/graphics/trainers/may/palette.pal
deleted file mode 100644
index e106ce693..000000000
--- a/graphics/trainers/may/palette.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
-255 197 90
-189 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/may/back.png b/graphics/trainers/may_back.png
index a6930037f..a6930037f 100644
--- a/graphics/trainers/may/back.png
+++ b/graphics/trainers/may_back.png
diff --git a/graphics/trainers/ninja_boy/front.png b/graphics/trainers/ninja_boy.png
index f36849ca3..f36849ca3 100644
--- a/graphics/trainers/ninja_boy/front.png
+++ b/graphics/trainers/ninja_boy.png
diff --git a/graphics/trainers/ninja_boy/palette.pal b/graphics/trainers/ninja_boy/palette.pal
deleted file mode 100644
index 524d3f4ba..000000000
--- a/graphics/trainers/ninja_boy/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-230 180 148
-213 148 115
-123 90 82
-164 180 197
-131 139 156
-82 98 115
-49 57 82
-213 213 222
-131 16 41
-255 172 32
-213 82 90
-180 41 57
-255 255 255
-0 0 0
diff --git a/graphics/trainers/norman/front.png b/graphics/trainers/norman.png
index ce9998b09..ce9998b09 100644
--- a/graphics/trainers/norman/front.png
+++ b/graphics/trainers/norman.png
diff --git a/graphics/trainers/norman/palette.pal b/graphics/trainers/norman/palette.pal
deleted file mode 100644
index e53c16837..000000000
--- a/graphics/trainers/norman/palette.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
-180 197 230
-139 156 172
-74 98 123
-49 65 82
-213 213 222
-131 16 41
-115 115 115
-213 82 90
-180 41 57
-255 255 255
-0 0 0
diff --git a/graphics/trainers/old_couple/front.png b/graphics/trainers/old_couple.png
index 71c527b72..71c527b72 100644
--- a/graphics/trainers/old_couple/front.png
+++ b/graphics/trainers/old_couple.png
diff --git a/graphics/trainers/old_couple/palette.pal b/graphics/trainers/old_couple/palette.pal
deleted file mode 100644
index 2fa5f5202..000000000
--- a/graphics/trainers/old_couple/palette.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
-180 180 172
-90 131 189
-65 90 139
-57 57 57
-213 222 230
-139 139 131
-189 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/parasol_lady/front.png b/graphics/trainers/parasol_lady.png
index 088d4d76e..088d4d76e 100644
--- a/graphics/trainers/parasol_lady/front.png
+++ b/graphics/trainers/parasol_lady.png
diff --git a/graphics/trainers/parasol_lady/palette.pal b/graphics/trainers/parasol_lady/palette.pal
deleted file mode 100644
index dc5c6f67f..000000000
--- a/graphics/trainers/parasol_lady/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-123 82 65
-90 131 189
-65 90 139
-41 65 98
-255 98 90
-197 65 65
-255 156 106
-131 74 65
-255 205 106
-213 172 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/phoebe/front.png b/graphics/trainers/phoebe.png
index 788908c6c..788908c6c 100644
--- a/graphics/trainers/phoebe/front.png
+++ b/graphics/trainers/phoebe.png
diff --git a/graphics/trainers/phoebe/palette.pal b/graphics/trainers/phoebe/palette.pal
deleted file mode 100644
index 8c07c0d5b..000000000
--- a/graphics/trainers/phoebe/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-115 82 65
-57 131 255
-32 106 230
-16 82 205
-41 49 123
-164 205 255
-115 98 106
-74 57 65
-255 82 156
-197 65 90
-255 255 255
-0 0 0
diff --git a/graphics/trainers/picnicker/front.png b/graphics/trainers/picnicker.png
index 06d4d3dea..06d4d3dea 100644
--- a/graphics/trainers/picnicker/front.png
+++ b/graphics/trainers/picnicker.png
diff --git a/graphics/trainers/picnicker/palette.pal b/graphics/trainers/picnicker/palette.pal
deleted file mode 100644
index acd90e943..000000000
--- a/graphics/trainers/picnicker/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-246 205 156
-205 156 115
-115 82 65
-131 213 205
-82 164 148
-180 189 222
-57 90 74
-24 49 90
-98 115 230
-57 82 131
-255 98 41
-189 74 41
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokefan_f/front.png b/graphics/trainers/pokefan_f.png
index 4d4f9cffe..4d4f9cffe 100644
--- a/graphics/trainers/pokefan_f/front.png
+++ b/graphics/trainers/pokefan_f.png
diff --git a/graphics/trainers/pokefan_f/palette.pal b/graphics/trainers/pokefan_f/palette.pal
deleted file mode 100644
index 09728f005..000000000
--- a/graphics/trainers/pokefan_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-90 172 189
-65 123 180
-255 0 255
-32 57 82
-197 205 213
-180 139 90
-131 90 41
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokefan_m/front.png b/graphics/trainers/pokefan_m.png
index a6dc4a18e..a6dc4a18e 100644
--- a/graphics/trainers/pokefan_m/front.png
+++ b/graphics/trainers/pokefan_m.png
diff --git a/graphics/trainers/pokefan_m/palette.pal b/graphics/trainers/pokefan_m/palette.pal
deleted file mode 100644
index 1d1f48875..000000000
--- a/graphics/trainers/pokefan_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-222 189 148
-197 156 115
-156 123 82
-49 57 49
-230 90 41
-131 172 222
-172 49 32
-82 123 172
-255 238 74
-213 189 41
-205 205 213
-98 98 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokemaniac/front.png b/graphics/trainers/pokemaniac.png
index f35de383d..f35de383d 100644
--- a/graphics/trainers/pokemaniac/front.png
+++ b/graphics/trainers/pokemaniac.png
diff --git a/graphics/trainers/pokemaniac/palette.pal b/graphics/trainers/pokemaniac/palette.pal
deleted file mode 100644
index 3ede03b14..000000000
--- a/graphics/trainers/pokemaniac/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-246 205 156
-205 156 115
-115 82 65
-246 189 115
-213 123 74
-180 82 74
-139 57 41
-74 74 49
-255 230 57
-98 123 106
-230 82 24
-213 205 230
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokemon_breeder_f/front.png b/graphics/trainers/pokemon_breeder_f.png
index d20122a7b..d20122a7b 100644
--- a/graphics/trainers/pokemon_breeder_f/front.png
+++ b/graphics/trainers/pokemon_breeder_f.png
diff --git a/graphics/trainers/pokemon_breeder_f/palette.pal b/graphics/trainers/pokemon_breeder_f/palette.pal
deleted file mode 100644
index b15f5db8a..000000000
--- a/graphics/trainers/pokemon_breeder_f/palette.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
-255 98 90
-164 49 65
-255 148 131
-49 49 74
-213 222 230
-205 74 74
-115 148 197
-49 74 123
-57 115 164
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokemon_breeder_m/front.png b/graphics/trainers/pokemon_breeder_m.png
index da37f87dd..da37f87dd 100644
--- a/graphics/trainers/pokemon_breeder_m/front.png
+++ b/graphics/trainers/pokemon_breeder_m.png
diff --git a/graphics/trainers/pokemon_breeder_m/palette.pal b/graphics/trainers/pokemon_breeder_m/palette.pal
deleted file mode 100644
index 6551f8482..000000000
--- a/graphics/trainers/pokemon_breeder_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-131 90 74
-255 98 90
-156 65 74
-255 148 131
-49 49 74
-213 222 230
-205 74 74
-115 148 197
-49 74 123
-57 115 164
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokemon_ranger_f/front.png b/graphics/trainers/pokemon_ranger_f.png
index a5e00d751..a5e00d751 100644
--- a/graphics/trainers/pokemon_ranger_f/front.png
+++ b/graphics/trainers/pokemon_ranger_f.png
diff --git a/graphics/trainers/pokemon_ranger_f/palette.pal b/graphics/trainers/pokemon_ranger_f/palette.pal
deleted file mode 100644
index 93220f5cb..000000000
--- a/graphics/trainers/pokemon_ranger_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-131 90 65
-82 49 49
-131 139 156
-82 90 115
-49 57 82
-213 213 222
-255 205 65
-255 131 74
-205 98 74
-156 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/pokemon_ranger_m/front.png b/graphics/trainers/pokemon_ranger_m.png
index 84f17dab1..84f17dab1 100644
--- a/graphics/trainers/pokemon_ranger_m/front.png
+++ b/graphics/trainers/pokemon_ranger_m.png
diff --git a/graphics/trainers/pokemon_ranger_m/palette.pal b/graphics/trainers/pokemon_ranger_m/palette.pal
deleted file mode 100644
index 2f16ca0cb..000000000
--- a/graphics/trainers/pokemon_ranger_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-139 106 82
-82 49 49
-131 139 156
-90 98 115
-49 57 82
-213 213 222
-255 205 65
-238 139 82
-197 82 74
-115 57 49
-255 255 255
-0 0 0
diff --git a/graphics/trainers/psychic_f/front.png b/graphics/trainers/psychic_f.png
index b7e3ac406..b7e3ac406 100644
--- a/graphics/trainers/psychic_f/front.png
+++ b/graphics/trainers/psychic_f.png
diff --git a/graphics/trainers/psychic_f/palette.pal b/graphics/trainers/psychic_f/palette.pal
deleted file mode 100644
index 232cfd755..000000000
--- a/graphics/trainers/psychic_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-246 205 156
-205 156 115
-115 82 65
-98 123 180
-32 98 131
-255 0 246
-41 57 90
-213 131 255
-156 115 180
-115 82 148
-246 139 90
-197 90 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/psychic_m/front.png b/graphics/trainers/psychic_m.png
index a0272a3a2..a0272a3a2 100644
--- a/graphics/trainers/psychic_m/front.png
+++ b/graphics/trainers/psychic_m.png
diff --git a/graphics/trainers/psychic_m/palette.pal b/graphics/trainers/psychic_m/palette.pal
deleted file mode 100644
index 0ddd2894b..000000000
--- a/graphics/trainers/psychic_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-230 189 148
-205 156 115
-115 82 65
-98 123 180
-32 98 131
-0 255 0
-41 57 90
-213 131 255
-131 106 172
-90 74 131
-246 139 90
-197 90 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/rich_boy/front.png b/graphics/trainers/rich_boy.png
index c0404a44e..c0404a44e 100644
--- a/graphics/trainers/rich_boy/front.png
+++ b/graphics/trainers/rich_boy.png
diff --git a/graphics/trainers/rich_boy/palette.pal b/graphics/trainers/rich_boy/palette.pal
deleted file mode 100644
index 1ebb77204..000000000
--- a/graphics/trainers/rich_boy/palette.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
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-213 222 230
-255 230 98
-222 180 90
-156 123 115
-115 82 90
-255 255 255
-0 0 0
diff --git a/graphics/trainers/roxanne/front.png b/graphics/trainers/roxanne.png
index b996ee790..b996ee790 100644
--- a/graphics/trainers/roxanne/front.png
+++ b/graphics/trainers/roxanne.png
diff --git a/graphics/trainers/roxanne/palette.pal b/graphics/trainers/roxanne/palette.pal
deleted file mode 100644
index c2b28ead9..000000000
--- a/graphics/trainers/roxanne/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 164 197
-189 156 90
-255 115 148
-213 82 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/ruin_maniac/front.png b/graphics/trainers/ruin_maniac.png
index b234aabd5..b234aabd5 100644
--- a/graphics/trainers/ruin_maniac/front.png
+++ b/graphics/trainers/ruin_maniac.png
diff --git a/graphics/trainers/ruin_maniac/palette.pal b/graphics/trainers/ruin_maniac/palette.pal
deleted file mode 100644
index bbc342a06..000000000
--- a/graphics/trainers/ruin_maniac/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-255 238 106
-246 246 230
-222 222 189
-180 180 139
-115 106 65
-222 213 246
-115 131 205
-222 189 8
-213 115 139
-172 74 90
-255 255 255
-0 0 0
diff --git a/graphics/trainers/running_triathlete_f/front.png b/graphics/trainers/running_triathlete_f.png
index 29297cc82..29297cc82 100644
--- a/graphics/trainers/running_triathlete_f/front.png
+++ b/graphics/trainers/running_triathlete_f.png
diff --git a/graphics/trainers/running_triathlete_f/palette.pal b/graphics/trainers/running_triathlete_f/palette.pal
deleted file mode 100644
index 671c1593f..000000000
--- a/graphics/trainers/running_triathlete_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-180 139 90
-139 65 65
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/running_triathlete_m/front.png b/graphics/trainers/running_triathlete_m.png
index 7fe34330f..7fe34330f 100644
--- a/graphics/trainers/running_triathlete_m/front.png
+++ b/graphics/trainers/running_triathlete_m.png
diff --git a/graphics/trainers/running_triathlete_m/palette.pal b/graphics/trainers/running_triathlete_m/palette.pal
deleted file mode 100644
index 13a56a556..000000000
--- a/graphics/trainers/running_triathlete_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-246 205 180
-230 180 148
-180 139 106
-115 82 65
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-180 139 90
-139 65 65
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/sailor/front.png b/graphics/trainers/sailor.png
index 298c2c6e1..298c2c6e1 100644
--- a/graphics/trainers/sailor/front.png
+++ b/graphics/trainers/sailor.png
diff --git a/graphics/trainers/sailor/palette.pal b/graphics/trainers/sailor/palette.pal
deleted file mode 100644
index 3b6248576..000000000
--- a/graphics/trainers/sailor/palette.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
-180 180 172
-90 131 189
-65 90 139
-57 57 57
-213 222 230
-139 139 131
-131 180 230
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/school_kid_f/front.png b/graphics/trainers/school_kid_f.png
index 9107a4373..9107a4373 100644
--- a/graphics/trainers/school_kid_f/front.png
+++ b/graphics/trainers/school_kid_f.png
diff --git a/graphics/trainers/school_kid_f/palette.pal b/graphics/trainers/school_kid_f/palette.pal
deleted file mode 100644
index ce758377a..000000000
--- a/graphics/trainers/school_kid_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-238 189 156
-205 148 115
-106 74 57
-255 139 164
-213 82 131
-131 139 255
-98 115 180
-57 74 131
-246 189 123
-197 131 65
-230 82 41
-139 90 32
-255 255 255
-0 0 0
diff --git a/graphics/trainers/school_kid_m/front.png b/graphics/trainers/school_kid_m.png
index 614f99ae1..614f99ae1 100644
--- a/graphics/trainers/school_kid_m/front.png
+++ b/graphics/trainers/school_kid_m.png
diff --git a/graphics/trainers/school_kid_m/palette.pal b/graphics/trainers/school_kid_m/palette.pal
deleted file mode 100644
index dc4298ea0..000000000
--- a/graphics/trainers/school_kid_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-230 180 148
-213 148 115
-123 90 82
-172 164 115
-65 90 148
-49 57 82
-131 123 82
-197 197 238
-255 222 65
-205 189 123
-98 164 222
-49 123 156
-255 255 255
-0 0 0
diff --git a/graphics/trainers/sidney/front.png b/graphics/trainers/sidney.png
index d43ab5cc3..d43ab5cc3 100644
--- a/graphics/trainers/sidney/front.png
+++ b/graphics/trainers/sidney.png
diff --git a/graphics/trainers/sidney/palette.pal b/graphics/trainers/sidney/palette.pal
deleted file mode 100644
index d778e0ed6..000000000
--- a/graphics/trainers/sidney/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 180 148
-189 139 106
-98 57 65
-131 106 74
-106 98 123
-41 49 57
-57 65 82
-197 197 213
-238 213 139
-197 164 106
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/sis_and_bro/front.png b/graphics/trainers/sis_and_bro.png
index ba32a26c3..ba32a26c3 100644
--- a/graphics/trainers/sis_and_bro/front.png
+++ b/graphics/trainers/sis_and_bro.png
diff --git a/graphics/trainers/sis_and_bro/palette.pal b/graphics/trainers/sis_and_bro/palette.pal
deleted file mode 100644
index 823ef66ef..000000000
--- a/graphics/trainers/sis_and_bro/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-246 205 189
-222 164 148
-164 123 98
-74 57 49
-255 139 90
-230 82 74
-180 65 65
-90 65 82
-197 65 65
-213 222 230
-255 230 205
-139 172 213
-90 131 189
-255 255 255
-0 0 0
diff --git a/graphics/trainers/sr_and_jr/front.png b/graphics/trainers/sr_and_jr.png
index 124637452..124637452 100644
--- a/graphics/trainers/sr_and_jr/front.png
+++ b/graphics/trainers/sr_and_jr.png
diff --git a/graphics/trainers/sr_and_jr/palette.pal b/graphics/trainers/sr_and_jr/palette.pal
deleted file mode 100644
index 72238881f..000000000
--- a/graphics/trainers/sr_and_jr/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-180 139 90
-131 90 41
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/steven/front.png b/graphics/trainers/steven.png
index a322cbe5a..a322cbe5a 100644
--- a/graphics/trainers/steven/front.png
+++ b/graphics/trainers/steven.png
diff --git a/graphics/trainers/steven/palette.pal b/graphics/trainers/steven/palette.pal
deleted file mode 100644
index bb2fedd5f..000000000
--- a/graphics/trainers/steven/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 180 148
-189 148 115
-123 90 82
-189 115 205
-164 82 172
-82 82 90
-49 49 57
-213 222 238
-172 189 213
-123 148 164
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/swimmer_f/front.png b/graphics/trainers/swimmer_f.png
index 7018c85b8..7018c85b8 100644
--- a/graphics/trainers/swimmer_f/front.png
+++ b/graphics/trainers/swimmer_f.png
diff --git a/graphics/trainers/swimmer_f/palette.pal b/graphics/trainers/swimmer_f/palette.pal
deleted file mode 100644
index 823ef66ef..000000000
--- a/graphics/trainers/swimmer_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-246 205 189
-222 164 148
-164 123 98
-74 57 49
-255 139 90
-230 82 74
-180 65 65
-90 65 82
-197 65 65
-213 222 230
-255 230 205
-139 172 213
-90 131 189
-255 255 255
-0 0 0
diff --git a/graphics/trainers/swimmer_m/front.png b/graphics/trainers/swimmer_m.png
index da4909deb..da4909deb 100644
--- a/graphics/trainers/swimmer_m/front.png
+++ b/graphics/trainers/swimmer_m.png
diff --git a/graphics/trainers/swimmer_m/palette.pal b/graphics/trainers/swimmer_m/palette.pal
deleted file mode 100644
index 259a53b9a..000000000
--- a/graphics/trainers/swimmer_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-230 197 172
-213 172 148
-172 123 106
-115 82 65
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-172 172 180
-139 65 65
-222 238 238
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/swimming_triathlete_f/front.png b/graphics/trainers/swimming_triathlete_f.png
index 808c1c1c7..808c1c1c7 100644
--- a/graphics/trainers/swimming_triathlete_f/front.png
+++ b/graphics/trainers/swimming_triathlete_f.png
diff --git a/graphics/trainers/swimming_triathlete_f/palette.pal b/graphics/trainers/swimming_triathlete_f/palette.pal
deleted file mode 100644
index 671c1593f..000000000
--- a/graphics/trainers/swimming_triathlete_f/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-180 139 90
-139 65 65
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/swimming_triathlete_m/front.png b/graphics/trainers/swimming_triathlete_m.png
index f649d0045..f649d0045 100644
--- a/graphics/trainers/swimming_triathlete_m/front.png
+++ b/graphics/trainers/swimming_triathlete_m.png
diff --git a/graphics/trainers/swimming_triathlete_m/palette.pal b/graphics/trainers/swimming_triathlete_m/palette.pal
deleted file mode 100644
index 671c1593f..000000000
--- a/graphics/trainers/swimming_triathlete_m/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-90 131 189
-65 90 139
-41 65 98
-49 41 65
-205 213 222
-180 139 90
-139 65 65
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/tate_and_liza/front.png b/graphics/trainers/tate_and_liza.png
index a4930e3f1..a4930e3f1 100644
--- a/graphics/trainers/tate_and_liza/front.png
+++ b/graphics/trainers/tate_and_liza.png
diff --git a/graphics/trainers/tate_and_liza/palette.pal b/graphics/trainers/tate_and_liza/palette.pal
deleted file mode 100644
index ab64e9bea..000000000
--- a/graphics/trainers/tate_and_liza/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 172 65
-255 222 205
-238 180 148
-180 131 106
-106 74 74
-189 189 197
-123 123 131
-74 82 98
-41 49 65
-255 98 90
-164 49 57
-255 197 90
-106 189 255
-90 139 197
-255 255 255
-0 0 0
diff --git a/graphics/trainers/tuber_f/front.png b/graphics/trainers/tuber_f.png
index 93dc6eea2..93dc6eea2 100644
--- a/graphics/trainers/tuber_f/front.png
+++ b/graphics/trainers/tuber_f.png
diff --git a/graphics/trainers/tuber_f/palette.pal b/graphics/trainers/tuber_f/palette.pal
deleted file mode 100644
index b5cb0047a..000000000
--- a/graphics/trainers/tuber_f/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 230 74
-205 57 82
-238 180 57
-189 131 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/tuber_m/front.png b/graphics/trainers/tuber_m.png
index 19182aa59..19182aa59 100644
--- a/graphics/trainers/tuber_m/front.png
+++ b/graphics/trainers/tuber_m.png
diff --git a/graphics/trainers/tuber_m/palette.pal b/graphics/trainers/tuber_m/palette.pal
deleted file mode 100644
index b5cb0047a..000000000
--- a/graphics/trainers/tuber_m/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 230 74
-205 57 82
-238 180 57
-189 131 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/twins/front.png b/graphics/trainers/twins.png
index f0c0e034e..f0c0e034e 100644
--- a/graphics/trainers/twins/front.png
+++ b/graphics/trainers/twins.png
diff --git a/graphics/trainers/twins/palette.pal b/graphics/trainers/twins/palette.pal
deleted file mode 100644
index 3b162de25..000000000
--- a/graphics/trainers/twins/palette.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
-65 90 139
-57 57 57
-213 222 230
-255 230 74
-180 82 98
-238 180 57
-189 131 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/unused_aqua/front.png b/graphics/trainers/unused_aqua.png
index 5a1163176..5a1163176 100644
--- a/graphics/trainers/unused_aqua/front.png
+++ b/graphics/trainers/unused_aqua.png
diff --git a/graphics/trainers/unused_aqua/palette.pal b/graphics/trainers/unused_aqua/palette.pal
deleted file mode 100644
index e0323fba1..000000000
--- a/graphics/trainers/unused_aqua/palette.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 197 213
-106 98 139
-65 90 90
-57 57 57
-205 222 189
-156 57 57
-189 156 90
-255 106 98
-205 82 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/wallace/front.png b/graphics/trainers/wallace.png
index 3f0159cdb..3f0159cdb 100644
--- a/graphics/trainers/wallace/front.png
+++ b/graphics/trainers/wallace.png
diff --git a/graphics/trainers/wallace/palette.pal b/graphics/trainers/wallace/palette.pal
deleted file mode 100644
index eaaed070f..000000000
--- a/graphics/trainers/wallace/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 180 148
-189 139 106
-98 57 65
-189 131 255
-148 106 172
-115 131 255
-82 106 180
-197 197 213
-57 74 115
-139 139 164
-57 41 57
-98 57 98
-255 255 255
-0 0 0
diff --git a/graphics/trainers/wally/front.png b/graphics/trainers/wally.png
index 76338eb4d..76338eb4d 100644
--- a/graphics/trainers/wally/front.png
+++ b/graphics/trainers/wally.png
diff --git a/graphics/trainers/wally/palette.pal b/graphics/trainers/wally/palette.pal
deleted file mode 100644
index 30e2e2a6c..000000000
--- a/graphics/trainers/wally/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 238 213
-222 180 164
-189 148 115
-123 90 82
-156 148 172
-115 106 131
-189 205 98
-148 172 74
-222 222 230
-98 148 49
-65 106 24
-98 156 222
-180 180 205
-255 255 255
-0 0 0
diff --git a/graphics/trainers/wally/back.png b/graphics/trainers/wally_back.png
index b4c2f1fa3..b4c2f1fa3 100644
--- a/graphics/trainers/wally/back.png
+++ b/graphics/trainers/wally_back.png
diff --git a/graphics/trainers/wattson/front.png b/graphics/trainers/wattson.png
index 7b9438a25..7b9438a25 100644
--- a/graphics/trainers/wattson/front.png
+++ b/graphics/trainers/wattson.png
diff --git a/graphics/trainers/wattson/palette.pal b/graphics/trainers/wattson/palette.pal
deleted file mode 100644
index c8a4e1420..000000000
--- a/graphics/trainers/wattson/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-123 90 82
-164 139 90
-131 106 74
-139 131 106
-82 65 74
-213 213 222
-255 197 90
-189 156 90
-57 41 49
-222 115 131
-255 255 255
-0 0 0
diff --git a/graphics/trainers/winona/front.png b/graphics/trainers/winona.png
index fc0e4a6dd..fc0e4a6dd 100644
--- a/graphics/trainers/winona/front.png
+++ b/graphics/trainers/winona.png
diff --git a/graphics/trainers/winona/palette.pal b/graphics/trainers/winona/palette.pal
deleted file mode 100644
index 62783523b..000000000
--- a/graphics/trainers/winona/palette.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 189 213
-139 156 205
-74 98 148
-49 65 82
-205 213 222
-115 57 123
-255 197 90
-189 123 222
-148 90 172
-255 255 255
-0 0 0
diff --git a/graphics/trainers/young_couple/front.png b/graphics/trainers/young_couple.png
index 6be8b73d8..6be8b73d8 100644
--- a/graphics/trainers/young_couple/front.png
+++ b/graphics/trainers/young_couple.png
diff --git a/graphics/trainers/young_couple/palette.pal b/graphics/trainers/young_couple/palette.pal
deleted file mode 100644
index bba95c19a..000000000
--- a/graphics/trainers/young_couple/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-98 65 57
-148 164 172
-82 123 164
-57 82 106
-32 49 74
-205 213 222
-123 197 156
-90 164 131
-255 98 90
-197 65 65
-106 106 139
-0 0 0
diff --git a/graphics/trainers/youngster/front.png b/graphics/trainers/youngster.png
index 311c49572..311c49572 100644
--- a/graphics/trainers/youngster/front.png
+++ b/graphics/trainers/youngster.png
diff --git a/graphics/trainers/youngster/palette.pal b/graphics/trainers/youngster/palette.pal
deleted file mode 100644
index f91520d9b..000000000
--- a/graphics/trainers/youngster/palette.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-230 180 148
-213 148 115
-123 90 82
-139 197 222
-65 90 148
-49 57 82
-41 57 98
-197 197 238
-255 222 65
-222 172 90
-98 164 222
-49 123 156
-255 255 255
-0 0 0