summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-03-03 18:03:10 -0500
committeryenatch <yenatch@gmail.com>2015-03-03 21:49:59 -0500
commitd1346bfc615769aa59559e67ba2385936906d0d6 (patch)
tree60314c9c63eab6f1bb939d61a91538775e313d22
parent275780271e040761b7d15dba2258f2b5a42d5c4c (diff)
Rename trainer palettes to match the trainer pics.
-rw-r--r--gfx/trainers/beauty.pal (renamed from gfx/trainers/028.pal)0
-rw-r--r--gfx/trainers/biker.pal (renamed from gfx/trainers/044.pal)0
-rw-r--r--gfx/trainers/bird_keeper.pal (renamed from gfx/trainers/023.pal)0
-rw-r--r--gfx/trainers/blackbelt_t.pal (renamed from gfx/trainers/049.pal)0
-rw-r--r--gfx/trainers/blaine.pal (renamed from gfx/trainers/045.pal)0
-rw-r--r--gfx/trainers/blue.pal (renamed from gfx/trainers/063.pal)0
-rw-r--r--gfx/trainers/boarder.pal (renamed from gfx/trainers/057.pal)0
-rw-r--r--gfx/trainers/brock.pal (renamed from gfx/trainers/016.pal)0
-rw-r--r--gfx/trainers/bruno.pal (renamed from gfx/trainers/012.pal)0
-rw-r--r--gfx/trainers/bug_catcher.pal (renamed from gfx/trainers/035.pal)0
-rw-r--r--gfx/trainers/bugsy.pal (renamed from gfx/trainers/002.pal)0
-rw-r--r--gfx/trainers/burglar.pal (renamed from gfx/trainers/046.pal)0
-rw-r--r--gfx/trainers/cal.pal (renamed from gfx/trainers/011.pal)0
-rw-r--r--gfx/trainers/camper.pal (renamed from gfx/trainers/053.pal)0
-rw-r--r--gfx/trainers/champion.pal (renamed from gfx/trainers/015.pal)0
-rw-r--r--gfx/trainers/chuck.pal (renamed from gfx/trainers/006.pal)0
-rw-r--r--gfx/trainers/clair.pal (renamed from gfx/trainers/007.pal)0
-rw-r--r--gfx/trainers/cooltrainer_f.pal (renamed from gfx/trainers/026.pal)0
-rw-r--r--gfx/trainers/cooltrainer_m.pal (renamed from gfx/trainers/027.pal)0
-rw-r--r--gfx/trainers/erika.pal (renamed from gfx/trainers/020.pal)0
-rw-r--r--gfx/trainers/executive_f.pal (renamed from gfx/trainers/054.pal)0
-rw-r--r--gfx/trainers/executive_m.pal (renamed from gfx/trainers/050.pal)0
-rw-r--r--gfx/trainers/falkner.pal (renamed from gfx/trainers/000.pal)0
-rw-r--r--gfx/trainers/firebreather.pal (renamed from gfx/trainers/047.pal)0
-rw-r--r--gfx/trainers/fisher.pal (renamed from gfx/trainers/036.pal)0
-rw-r--r--gfx/trainers/gentleman.pal (renamed from gfx/trainers/031.pal)0
-rw-r--r--gfx/trainers/grunt_f.pal (renamed from gfx/trainers/065.pal)0
-rw-r--r--gfx/trainers/grunt_m.pal (renamed from gfx/trainers/030.pal)0
-rw-r--r--gfx/trainers/guitarist.pal (renamed from gfx/trainers/042.pal)0
-rw-r--r--gfx/trainers/hiker.pal (renamed from gfx/trainers/043.pal)0
-rw-r--r--gfx/trainers/janine.pal (renamed from gfx/trainers/025.pal)0
-rw-r--r--gfx/trainers/jasmine.pal (renamed from gfx/trainers/005.pal)0
-rw-r--r--gfx/trainers/juggler.pal (renamed from gfx/trainers/048.pal)0
-rw-r--r--gfx/trainers/karen.pal (renamed from gfx/trainers/013.pal)0
-rw-r--r--gfx/trainers/kimono_girl.pal (renamed from gfx/trainers/059.pal)0
-rw-r--r--gfx/trainers/koga.pal (renamed from gfx/trainers/014.pal)0
-rw-r--r--gfx/trainers/lass.pal (renamed from gfx/trainers/024.pal)0
-rw-r--r--gfx/trainers/lt_surge.pal (renamed from gfx/trainers/018.pal)0
-rw-r--r--gfx/trainers/medium.pal (renamed from gfx/trainers/056.pal)0
-rw-r--r--gfx/trainers/misty.pal (renamed from gfx/trainers/017.pal)0
-rw-r--r--gfx/trainers/morty.pal (renamed from gfx/trainers/003.pal)0
-rw-r--r--gfx/trainers/mysticalman.pal (renamed from gfx/trainers/066.pal)0
-rw-r--r--gfx/trainers/oak.pal (renamed from gfx/trainers/009.pal)0
-rw-r--r--gfx/trainers/officer.pal (renamed from gfx/trainers/064.pal)0
-rw-r--r--gfx/trainers/palette_pointers.asm134
-rw-r--r--gfx/trainers/picnicker.pal (renamed from gfx/trainers/052.pal)0
-rw-r--r--gfx/trainers/pokefan_f.pal (renamed from gfx/trainers/061.pal)0
-rw-r--r--gfx/trainers/pokefan_m.pal (renamed from gfx/trainers/058.pal)0
-rw-r--r--gfx/trainers/pokemaniac.pal (renamed from gfx/trainers/029.pal)0
-rw-r--r--gfx/trainers/pryce.pal (renamed from gfx/trainers/004.pal)0
-rw-r--r--gfx/trainers/psychic_t.pal (renamed from gfx/trainers/051.pal)0
-rw-r--r--gfx/trainers/red.pal (renamed from gfx/trainers/062.pal)0
-rw-r--r--gfx/trainers/rival1.pal (renamed from gfx/trainers/008.pal)0
-rw-r--r--gfx/trainers/rival2.pal (renamed from gfx/trainers/041.pal)0
-rw-r--r--gfx/trainers/sabrina.pal (renamed from gfx/trainers/034.pal)0
-rw-r--r--gfx/trainers/sage.pal (renamed from gfx/trainers/055.pal)0
-rw-r--r--gfx/trainers/sailor.pal (renamed from gfx/trainers/039.pal)0
-rw-r--r--gfx/trainers/schoolboy.pal (renamed from gfx/trainers/022.pal)0
-rw-r--r--gfx/trainers/scientist.pal (renamed from gfx/trainers/019.pal)0
-rw-r--r--gfx/trainers/skier.pal (renamed from gfx/trainers/032.pal)0
-rw-r--r--gfx/trainers/super_nerd.pal (renamed from gfx/trainers/040.pal)0
-rw-r--r--gfx/trainers/swimmer_f.pal (renamed from gfx/trainers/038.pal)0
-rw-r--r--gfx/trainers/swimmer_m.pal (renamed from gfx/trainers/037.pal)0
-rw-r--r--gfx/trainers/teacher.pal (renamed from gfx/trainers/033.pal)0
-rw-r--r--gfx/trainers/twins.pal (renamed from gfx/trainers/060.pal)0
-rw-r--r--gfx/trainers/whitney.pal (renamed from gfx/trainers/001.pal)0
-rw-r--r--gfx/trainers/will.pal (renamed from gfx/trainers/010.pal)0
-rw-r--r--gfx/trainers/youngster.pal (renamed from gfx/trainers/021.pal)0
68 files changed, 67 insertions, 67 deletions
diff --git a/gfx/trainers/028.pal b/gfx/trainers/beauty.pal
index 7183a0502..7183a0502 100644
--- a/gfx/trainers/028.pal
+++ b/gfx/trainers/beauty.pal
diff --git a/gfx/trainers/044.pal b/gfx/trainers/biker.pal
index bfffe557d..bfffe557d 100644
--- a/gfx/trainers/044.pal
+++ b/gfx/trainers/biker.pal
diff --git a/gfx/trainers/023.pal b/gfx/trainers/bird_keeper.pal
index ca0407a3b..ca0407a3b 100644
--- a/gfx/trainers/023.pal
+++ b/gfx/trainers/bird_keeper.pal
diff --git a/gfx/trainers/049.pal b/gfx/trainers/blackbelt_t.pal
index 59ea02844..59ea02844 100644
--- a/gfx/trainers/049.pal
+++ b/gfx/trainers/blackbelt_t.pal
diff --git a/gfx/trainers/045.pal b/gfx/trainers/blaine.pal
index 90f3a381f..90f3a381f 100644
--- a/gfx/trainers/045.pal
+++ b/gfx/trainers/blaine.pal
diff --git a/gfx/trainers/063.pal b/gfx/trainers/blue.pal
index ce6b3f1d7..ce6b3f1d7 100644
--- a/gfx/trainers/063.pal
+++ b/gfx/trainers/blue.pal
diff --git a/gfx/trainers/057.pal b/gfx/trainers/boarder.pal
index 4fb9af5e1..4fb9af5e1 100644
--- a/gfx/trainers/057.pal
+++ b/gfx/trainers/boarder.pal
diff --git a/gfx/trainers/016.pal b/gfx/trainers/brock.pal
index f5a1b0c06..f5a1b0c06 100644
--- a/gfx/trainers/016.pal
+++ b/gfx/trainers/brock.pal
diff --git a/gfx/trainers/012.pal b/gfx/trainers/bruno.pal
index 41408a91d..41408a91d 100644
--- a/gfx/trainers/012.pal
+++ b/gfx/trainers/bruno.pal
diff --git a/gfx/trainers/035.pal b/gfx/trainers/bug_catcher.pal
index 8e4df4219..8e4df4219 100644
--- a/gfx/trainers/035.pal
+++ b/gfx/trainers/bug_catcher.pal
diff --git a/gfx/trainers/002.pal b/gfx/trainers/bugsy.pal
index 1743f663b..1743f663b 100644
--- a/gfx/trainers/002.pal
+++ b/gfx/trainers/bugsy.pal
diff --git a/gfx/trainers/046.pal b/gfx/trainers/burglar.pal
index cfcdd144f..cfcdd144f 100644
--- a/gfx/trainers/046.pal
+++ b/gfx/trainers/burglar.pal
diff --git a/gfx/trainers/011.pal b/gfx/trainers/cal.pal
index 92101c5e3..92101c5e3 100644
--- a/gfx/trainers/011.pal
+++ b/gfx/trainers/cal.pal
diff --git a/gfx/trainers/053.pal b/gfx/trainers/camper.pal
index 13a083c68..13a083c68 100644
--- a/gfx/trainers/053.pal
+++ b/gfx/trainers/camper.pal
diff --git a/gfx/trainers/015.pal b/gfx/trainers/champion.pal
index 3dee1efef..3dee1efef 100644
--- a/gfx/trainers/015.pal
+++ b/gfx/trainers/champion.pal
diff --git a/gfx/trainers/006.pal b/gfx/trainers/chuck.pal
index 9616829dc..9616829dc 100644
--- a/gfx/trainers/006.pal
+++ b/gfx/trainers/chuck.pal
diff --git a/gfx/trainers/007.pal b/gfx/trainers/clair.pal
index 616598fee..616598fee 100644
--- a/gfx/trainers/007.pal
+++ b/gfx/trainers/clair.pal
diff --git a/gfx/trainers/026.pal b/gfx/trainers/cooltrainer_f.pal
index bdeefabf8..bdeefabf8 100644
--- a/gfx/trainers/026.pal
+++ b/gfx/trainers/cooltrainer_f.pal
diff --git a/gfx/trainers/027.pal b/gfx/trainers/cooltrainer_m.pal
index bdeefabf8..bdeefabf8 100644
--- a/gfx/trainers/027.pal
+++ b/gfx/trainers/cooltrainer_m.pal
diff --git a/gfx/trainers/020.pal b/gfx/trainers/erika.pal
index e8de9b43d..e8de9b43d 100644
--- a/gfx/trainers/020.pal
+++ b/gfx/trainers/erika.pal
diff --git a/gfx/trainers/054.pal b/gfx/trainers/executive_f.pal
index 36ec86f8e..36ec86f8e 100644
--- a/gfx/trainers/054.pal
+++ b/gfx/trainers/executive_f.pal
diff --git a/gfx/trainers/050.pal b/gfx/trainers/executive_m.pal
index 66e0a46c9..66e0a46c9 100644
--- a/gfx/trainers/050.pal
+++ b/gfx/trainers/executive_m.pal
diff --git a/gfx/trainers/000.pal b/gfx/trainers/falkner.pal
index ddc5262ba..ddc5262ba 100644
--- a/gfx/trainers/000.pal
+++ b/gfx/trainers/falkner.pal
diff --git a/gfx/trainers/047.pal b/gfx/trainers/firebreather.pal
index b051224dd..b051224dd 100644
--- a/gfx/trainers/047.pal
+++ b/gfx/trainers/firebreather.pal
diff --git a/gfx/trainers/036.pal b/gfx/trainers/fisher.pal
index 9d0657111..9d0657111 100644
--- a/gfx/trainers/036.pal
+++ b/gfx/trainers/fisher.pal
diff --git a/gfx/trainers/031.pal b/gfx/trainers/gentleman.pal
index c6faa0d33..c6faa0d33 100644
--- a/gfx/trainers/031.pal
+++ b/gfx/trainers/gentleman.pal
diff --git a/gfx/trainers/065.pal b/gfx/trainers/grunt_f.pal
index 746132411..746132411 100644
--- a/gfx/trainers/065.pal
+++ b/gfx/trainers/grunt_f.pal
diff --git a/gfx/trainers/030.pal b/gfx/trainers/grunt_m.pal
index f7dc95d8f..f7dc95d8f 100644
--- a/gfx/trainers/030.pal
+++ b/gfx/trainers/grunt_m.pal
diff --git a/gfx/trainers/042.pal b/gfx/trainers/guitarist.pal
index d5c88a3bd..d5c88a3bd 100644
--- a/gfx/trainers/042.pal
+++ b/gfx/trainers/guitarist.pal
diff --git a/gfx/trainers/043.pal b/gfx/trainers/hiker.pal
index 8d0cb5c4c..8d0cb5c4c 100644
--- a/gfx/trainers/043.pal
+++ b/gfx/trainers/hiker.pal
diff --git a/gfx/trainers/025.pal b/gfx/trainers/janine.pal
index e958004cb..e958004cb 100644
--- a/gfx/trainers/025.pal
+++ b/gfx/trainers/janine.pal
diff --git a/gfx/trainers/005.pal b/gfx/trainers/jasmine.pal
index 352d95673..352d95673 100644
--- a/gfx/trainers/005.pal
+++ b/gfx/trainers/jasmine.pal
diff --git a/gfx/trainers/048.pal b/gfx/trainers/juggler.pal
index ffee98b09..ffee98b09 100644
--- a/gfx/trainers/048.pal
+++ b/gfx/trainers/juggler.pal
diff --git a/gfx/trainers/013.pal b/gfx/trainers/karen.pal
index 0eeb5fa2d..0eeb5fa2d 100644
--- a/gfx/trainers/013.pal
+++ b/gfx/trainers/karen.pal
diff --git a/gfx/trainers/059.pal b/gfx/trainers/kimono_girl.pal
index 334b11d21..334b11d21 100644
--- a/gfx/trainers/059.pal
+++ b/gfx/trainers/kimono_girl.pal
diff --git a/gfx/trainers/014.pal b/gfx/trainers/koga.pal
index 096b1e131..096b1e131 100644
--- a/gfx/trainers/014.pal
+++ b/gfx/trainers/koga.pal
diff --git a/gfx/trainers/024.pal b/gfx/trainers/lass.pal
index 1ca3149dc..1ca3149dc 100644
--- a/gfx/trainers/024.pal
+++ b/gfx/trainers/lass.pal
diff --git a/gfx/trainers/018.pal b/gfx/trainers/lt_surge.pal
index 6243fae58..6243fae58 100644
--- a/gfx/trainers/018.pal
+++ b/gfx/trainers/lt_surge.pal
diff --git a/gfx/trainers/056.pal b/gfx/trainers/medium.pal
index e06b66f39..e06b66f39 100644
--- a/gfx/trainers/056.pal
+++ b/gfx/trainers/medium.pal
diff --git a/gfx/trainers/017.pal b/gfx/trainers/misty.pal
index aab4b0849..aab4b0849 100644
--- a/gfx/trainers/017.pal
+++ b/gfx/trainers/misty.pal
diff --git a/gfx/trainers/003.pal b/gfx/trainers/morty.pal
index 736d93ba7..736d93ba7 100644
--- a/gfx/trainers/003.pal
+++ b/gfx/trainers/morty.pal
diff --git a/gfx/trainers/066.pal b/gfx/trainers/mysticalman.pal
index 7e95414ae..7e95414ae 100644
--- a/gfx/trainers/066.pal
+++ b/gfx/trainers/mysticalman.pal
diff --git a/gfx/trainers/009.pal b/gfx/trainers/oak.pal
index a4be7ff97..a4be7ff97 100644
--- a/gfx/trainers/009.pal
+++ b/gfx/trainers/oak.pal
diff --git a/gfx/trainers/064.pal b/gfx/trainers/officer.pal
index a14a47917..a14a47917 100644
--- a/gfx/trainers/064.pal
+++ b/gfx/trainers/officer.pal
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
index 0c8627204..d401028d7 100644
--- a/gfx/trainers/palette_pointers.asm
+++ b/gfx/trainers/palette_pointers.asm
@@ -11,72 +11,72 @@ KrisPalette: ; b0d0
; RGB 27, 17, 14
; RGB 07, 05, 31
-FalknerPalette: INCLUDE "gfx/trainers/000.pal"
-WhitneyPalette: INCLUDE "gfx/trainers/001.pal"
-BugsyPalette: INCLUDE "gfx/trainers/002.pal"
-MortyPalette: INCLUDE "gfx/trainers/003.pal"
-PrycePalette: INCLUDE "gfx/trainers/004.pal"
-JasminePalette: INCLUDE "gfx/trainers/005.pal"
-ChuckPalette: INCLUDE "gfx/trainers/006.pal"
-ClairPalette: INCLUDE "gfx/trainers/007.pal"
-Rival1Palette: INCLUDE "gfx/trainers/008.pal"
-PokemonProfPalette: INCLUDE "gfx/trainers/009.pal"
-WillPalette: INCLUDE "gfx/trainers/010.pal"
-CalPalette: INCLUDE "gfx/trainers/011.pal"
-BrunoPalette: INCLUDE "gfx/trainers/012.pal"
-KarenPalette: INCLUDE "gfx/trainers/013.pal"
-KogaPalette: INCLUDE "gfx/trainers/014.pal"
-ChampionPalette: INCLUDE "gfx/trainers/015.pal"
-BrockPalette: INCLUDE "gfx/trainers/016.pal"
-MistyPalette: INCLUDE "gfx/trainers/017.pal"
-LtSurgePalette: INCLUDE "gfx/trainers/018.pal"
-ScientistPalette: INCLUDE "gfx/trainers/019.pal"
-ErikaPalette: INCLUDE "gfx/trainers/020.pal"
-YoungsterPalette: INCLUDE "gfx/trainers/021.pal"
-SchoolboyPalette: INCLUDE "gfx/trainers/022.pal"
-BirdKeeperPalette: INCLUDE "gfx/trainers/023.pal"
-LassPalette: INCLUDE "gfx/trainers/024.pal"
-JaninePalette: INCLUDE "gfx/trainers/025.pal"
-CooltrainermPalette: INCLUDE "gfx/trainers/026.pal"
-CooltrainerfPalette: INCLUDE "gfx/trainers/027.pal"
-BeautyPalette: INCLUDE "gfx/trainers/028.pal"
-PokemaniacPalette: INCLUDE "gfx/trainers/029.pal"
-GruntmPalette: INCLUDE "gfx/trainers/030.pal"
-GentlemanPalette: INCLUDE "gfx/trainers/031.pal"
-SkierPalette: INCLUDE "gfx/trainers/032.pal"
-TeacherPalette: INCLUDE "gfx/trainers/033.pal"
-SabrinaPalette: INCLUDE "gfx/trainers/034.pal"
-BugCatcherPalette: INCLUDE "gfx/trainers/035.pal"
-FisherPalette: INCLUDE "gfx/trainers/036.pal"
-SwimmermPalette: INCLUDE "gfx/trainers/037.pal"
-SwimmerfPalette: INCLUDE "gfx/trainers/038.pal"
-SailorPalette: INCLUDE "gfx/trainers/039.pal"
-SuperNerdPalette: INCLUDE "gfx/trainers/040.pal"
-Rival2Palette: INCLUDE "gfx/trainers/041.pal"
-GuitaristPalette: INCLUDE "gfx/trainers/042.pal"
-HikerPalette: INCLUDE "gfx/trainers/043.pal"
-BikerPalette: INCLUDE "gfx/trainers/044.pal"
-BlainePalette: INCLUDE "gfx/trainers/045.pal"
-BurglarPalette: INCLUDE "gfx/trainers/046.pal"
-FirebreatherPalette: INCLUDE "gfx/trainers/047.pal"
-JugglerPalette: INCLUDE "gfx/trainers/048.pal"
-BlackbeltTPalette: INCLUDE "gfx/trainers/049.pal"
-ExecutivemPalette: INCLUDE "gfx/trainers/050.pal"
-PsychicTPalette: INCLUDE "gfx/trainers/051.pal"
-PicnickerPalette: INCLUDE "gfx/trainers/052.pal"
-CamperPalette: INCLUDE "gfx/trainers/053.pal"
-ExecutivefPalette: INCLUDE "gfx/trainers/054.pal"
-SagePalette: INCLUDE "gfx/trainers/055.pal"
-MediumPalette: INCLUDE "gfx/trainers/056.pal"
-BoarderPalette: INCLUDE "gfx/trainers/057.pal"
-PokefanmPalette: INCLUDE "gfx/trainers/058.pal"
-KimonoGirlPalette: INCLUDE "gfx/trainers/059.pal"
-TwinsPalette: INCLUDE "gfx/trainers/060.pal"
-PokefanfPalette: INCLUDE "gfx/trainers/061.pal"
-RedPalette: INCLUDE "gfx/trainers/062.pal"
-BluePalette: INCLUDE "gfx/trainers/063.pal"
-OfficerPalette: INCLUDE "gfx/trainers/064.pal"
-GruntfPalette: INCLUDE "gfx/trainers/065.pal"
-MysticalmanPalette: INCLUDE "gfx/trainers/066.pal"
+FalknerPalette: INCLUDE "gfx/trainers/falkner.pal"
+WhitneyPalette: INCLUDE "gfx/trainers/whitney.pal"
+BugsyPalette: INCLUDE "gfx/trainers/bugsy.pal"
+MortyPalette: INCLUDE "gfx/trainers/morty.pal"
+PrycePalette: INCLUDE "gfx/trainers/pryce.pal"
+JasminePalette: INCLUDE "gfx/trainers/jasmine.pal"
+ChuckPalette: INCLUDE "gfx/trainers/chuck.pal"
+ClairPalette: INCLUDE "gfx/trainers/clair.pal"
+Rival1Palette: INCLUDE "gfx/trainers/rival1.pal"
+PokemonProfPalette: INCLUDE "gfx/trainers/oak.pal"
+WillPalette: INCLUDE "gfx/trainers/will.pal"
+CalPalette: INCLUDE "gfx/trainers/cal.pal"
+BrunoPalette: INCLUDE "gfx/trainers/bruno.pal"
+KarenPalette: INCLUDE "gfx/trainers/karen.pal"
+KogaPalette: INCLUDE "gfx/trainers/koga.pal"
+ChampionPalette: INCLUDE "gfx/trainers/champion.pal"
+BrockPalette: INCLUDE "gfx/trainers/brock.pal"
+MistyPalette: INCLUDE "gfx/trainers/misty.pal"
+LtSurgePalette: INCLUDE "gfx/trainers/lt_surge.pal"
+ScientistPalette: INCLUDE "gfx/trainers/scientist.pal"
+ErikaPalette: INCLUDE "gfx/trainers/erika.pal"
+YoungsterPalette: INCLUDE "gfx/trainers/youngster.pal"
+SchoolboyPalette: INCLUDE "gfx/trainers/schoolboy.pal"
+BirdKeeperPalette: INCLUDE "gfx/trainers/bird_keeper.pal"
+LassPalette: INCLUDE "gfx/trainers/lass.pal"
+JaninePalette: INCLUDE "gfx/trainers/janine.pal"
+CooltrainermPalette: INCLUDE "gfx/trainers/cooltrainer_m.pal"
+CooltrainerfPalette: INCLUDE "gfx/trainers/cooltrainer_f.pal"
+BeautyPalette: INCLUDE "gfx/trainers/beauty.pal"
+PokemaniacPalette: INCLUDE "gfx/trainers/pokemaniac.pal"
+GruntmPalette: INCLUDE "gfx/trainers/grunt_m.pal"
+GentlemanPalette: INCLUDE "gfx/trainers/gentleman.pal"
+SkierPalette: INCLUDE "gfx/trainers/skier.pal"
+TeacherPalette: INCLUDE "gfx/trainers/teacher.pal"
+SabrinaPalette: INCLUDE "gfx/trainers/sabrina.pal"
+BugCatcherPalette: INCLUDE "gfx/trainers/bug_catcher.pal"
+FisherPalette: INCLUDE "gfx/trainers/fisher.pal"
+SwimmermPalette: INCLUDE "gfx/trainers/swimmer_m.pal"
+SwimmerfPalette: INCLUDE "gfx/trainers/swimmer_f.pal"
+SailorPalette: INCLUDE "gfx/trainers/sailor.pal"
+SuperNerdPalette: INCLUDE "gfx/trainers/super_nerd.pal"
+Rival2Palette: INCLUDE "gfx/trainers/rival2.pal"
+GuitaristPalette: INCLUDE "gfx/trainers/guitarist.pal"
+HikerPalette: INCLUDE "gfx/trainers/hiker.pal"
+BikerPalette: INCLUDE "gfx/trainers/biker.pal"
+BlainePalette: INCLUDE "gfx/trainers/blaine.pal"
+BurglarPalette: INCLUDE "gfx/trainers/burglar.pal"
+FirebreatherPalette: INCLUDE "gfx/trainers/firebreather.pal"
+JugglerPalette: INCLUDE "gfx/trainers/juggler.pal"
+BlackbeltTPalette: INCLUDE "gfx/trainers/blackbelt_t.pal"
+ExecutivemPalette: INCLUDE "gfx/trainers/executive_m.pal"
+PsychicTPalette: INCLUDE "gfx/trainers/psychic_t.pal"
+PicnickerPalette: INCLUDE "gfx/trainers/picnicker.pal"
+CamperPalette: INCLUDE "gfx/trainers/camper.pal"
+ExecutivefPalette: INCLUDE "gfx/trainers/executive_f.pal"
+SagePalette: INCLUDE "gfx/trainers/sage.pal"
+MediumPalette: INCLUDE "gfx/trainers/medium.pal"
+BoarderPalette: INCLUDE "gfx/trainers/boarder.pal"
+PokefanmPalette: INCLUDE "gfx/trainers/pokefan_m.pal"
+KimonoGirlPalette: INCLUDE "gfx/trainers/kimono_girl.pal"
+TwinsPalette: INCLUDE "gfx/trainers/twins.pal"
+PokefanfPalette: INCLUDE "gfx/trainers/pokefan_f.pal"
+RedPalette: INCLUDE "gfx/trainers/red.pal"
+BluePalette: INCLUDE "gfx/trainers/blue.pal"
+OfficerPalette: INCLUDE "gfx/trainers/officer.pal"
+GruntfPalette: INCLUDE "gfx/trainers/grunt_f.pal"
+MysticalmanPalette: INCLUDE "gfx/trainers/mysticalman.pal"
; b1de
diff --git a/gfx/trainers/052.pal b/gfx/trainers/picnicker.pal
index d0eec39f9..d0eec39f9 100644
--- a/gfx/trainers/052.pal
+++ b/gfx/trainers/picnicker.pal
diff --git a/gfx/trainers/061.pal b/gfx/trainers/pokefan_f.pal
index 57d1b94cf..57d1b94cf 100644
--- a/gfx/trainers/061.pal
+++ b/gfx/trainers/pokefan_f.pal
diff --git a/gfx/trainers/058.pal b/gfx/trainers/pokefan_m.pal
index 601ed4ae9..601ed4ae9 100644
--- a/gfx/trainers/058.pal
+++ b/gfx/trainers/pokefan_m.pal
diff --git a/gfx/trainers/029.pal b/gfx/trainers/pokemaniac.pal
index f8e224ab8..f8e224ab8 100644
--- a/gfx/trainers/029.pal
+++ b/gfx/trainers/pokemaniac.pal
diff --git a/gfx/trainers/004.pal b/gfx/trainers/pryce.pal
index ca319f05a..ca319f05a 100644
--- a/gfx/trainers/004.pal
+++ b/gfx/trainers/pryce.pal
diff --git a/gfx/trainers/051.pal b/gfx/trainers/psychic_t.pal
index e19c4d817..e19c4d817 100644
--- a/gfx/trainers/051.pal
+++ b/gfx/trainers/psychic_t.pal
diff --git a/gfx/trainers/062.pal b/gfx/trainers/red.pal
index 3ebf35fb7..3ebf35fb7 100644
--- a/gfx/trainers/062.pal
+++ b/gfx/trainers/red.pal
diff --git a/gfx/trainers/008.pal b/gfx/trainers/rival1.pal
index 190dc92e0..190dc92e0 100644
--- a/gfx/trainers/008.pal
+++ b/gfx/trainers/rival1.pal
diff --git a/gfx/trainers/041.pal b/gfx/trainers/rival2.pal
index 190dc92e0..190dc92e0 100644
--- a/gfx/trainers/041.pal
+++ b/gfx/trainers/rival2.pal
diff --git a/gfx/trainers/034.pal b/gfx/trainers/sabrina.pal
index 950be6902..950be6902 100644
--- a/gfx/trainers/034.pal
+++ b/gfx/trainers/sabrina.pal
diff --git a/gfx/trainers/055.pal b/gfx/trainers/sage.pal
index d61b39ec3..d61b39ec3 100644
--- a/gfx/trainers/055.pal
+++ b/gfx/trainers/sage.pal
diff --git a/gfx/trainers/039.pal b/gfx/trainers/sailor.pal
index 33b3c02b1..33b3c02b1 100644
--- a/gfx/trainers/039.pal
+++ b/gfx/trainers/sailor.pal
diff --git a/gfx/trainers/022.pal b/gfx/trainers/schoolboy.pal
index 5ba665e79..5ba665e79 100644
--- a/gfx/trainers/022.pal
+++ b/gfx/trainers/schoolboy.pal
diff --git a/gfx/trainers/019.pal b/gfx/trainers/scientist.pal
index 0661e50e8..0661e50e8 100644
--- a/gfx/trainers/019.pal
+++ b/gfx/trainers/scientist.pal
diff --git a/gfx/trainers/032.pal b/gfx/trainers/skier.pal
index 9201ca909..9201ca909 100644
--- a/gfx/trainers/032.pal
+++ b/gfx/trainers/skier.pal
diff --git a/gfx/trainers/040.pal b/gfx/trainers/super_nerd.pal
index 862d4e21e..862d4e21e 100644
--- a/gfx/trainers/040.pal
+++ b/gfx/trainers/super_nerd.pal
diff --git a/gfx/trainers/038.pal b/gfx/trainers/swimmer_f.pal
index 6bddcbcc3..6bddcbcc3 100644
--- a/gfx/trainers/038.pal
+++ b/gfx/trainers/swimmer_f.pal
diff --git a/gfx/trainers/037.pal b/gfx/trainers/swimmer_m.pal
index 164d2166b..164d2166b 100644
--- a/gfx/trainers/037.pal
+++ b/gfx/trainers/swimmer_m.pal
diff --git a/gfx/trainers/033.pal b/gfx/trainers/teacher.pal
index a614be34c..a614be34c 100644
--- a/gfx/trainers/033.pal
+++ b/gfx/trainers/teacher.pal
diff --git a/gfx/trainers/060.pal b/gfx/trainers/twins.pal
index 47792418b..47792418b 100644
--- a/gfx/trainers/060.pal
+++ b/gfx/trainers/twins.pal
diff --git a/gfx/trainers/001.pal b/gfx/trainers/whitney.pal
index a51af5fda..a51af5fda 100644
--- a/gfx/trainers/001.pal
+++ b/gfx/trainers/whitney.pal
diff --git a/gfx/trainers/010.pal b/gfx/trainers/will.pal
index d27fd8069..d27fd8069 100644
--- a/gfx/trainers/010.pal
+++ b/gfx/trainers/will.pal
diff --git a/gfx/trainers/021.pal b/gfx/trainers/youngster.pal
index a330d692f..a330d692f 100644
--- a/gfx/trainers/021.pal
+++ b/gfx/trainers/youngster.pal