Clean up some palette stuff, update main.asm and layout.link.

1 files changed, 66 insertions, 66 deletions

diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm
index 2f13e5d6..b21729f8 100644
--- a/data/trainers/palettes.asm
+++ b/data/trainers/palettes.asm
@@ -6,69 +6,69 @@ TrainerPalettes:
 
 PlayerPalette: ; Chris uses the same colors as Cal
 INCLUDE "gfx/trainers/cal.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"
+INCLUDE "gfx/trainers/falkner.pal"
+INCLUDE "gfx/trainers/whitney.pal"
+INCLUDE "gfx/trainers/bugsy.pal"
+INCLUDE "gfx/trainers/morty.pal"
+INCLUDE "gfx/trainers/pryce.pal"
+INCLUDE "gfx/trainers/jasmine.pal"
+INCLUDE "gfx/trainers/chuck.pal"
+INCLUDE "gfx/trainers/clair.pal"
+INCLUDE "gfx/trainers/rival1.pal"
+INCLUDE "gfx/trainers/oak.pal"
+INCLUDE "gfx/trainers/will.pal"
+INCLUDE "gfx/trainers/cal.pal"
+INCLUDE "gfx/trainers/bruno.pal"
+INCLUDE "gfx/trainers/karen.pal"
+INCLUDE "gfx/trainers/koga.pal"
+INCLUDE "gfx/trainers/champion.pal"
+INCLUDE "gfx/trainers/brock.pal"
+INCLUDE "gfx/trainers/misty.pal"
+INCLUDE "gfx/trainers/lt_surge.pal"
+INCLUDE "gfx/trainers/scientist.pal"
+INCLUDE "gfx/trainers/erika.pal"
+INCLUDE "gfx/trainers/youngster.pal"
+INCLUDE "gfx/trainers/schoolboy.pal"
+INCLUDE "gfx/trainers/bird_keeper.pal"
+INCLUDE "gfx/trainers/lass.pal"
+INCLUDE "gfx/trainers/janine.pal"
+INCLUDE "gfx/trainers/cooltrainer_m.pal"
+INCLUDE "gfx/trainers/cooltrainer_f.pal"
+INCLUDE "gfx/trainers/beauty.pal"
+INCLUDE "gfx/trainers/pokemaniac.pal"
+INCLUDE "gfx/trainers/grunt_m.pal"
+INCLUDE "gfx/trainers/gentleman.pal"
+INCLUDE "gfx/trainers/skier.pal"
+INCLUDE "gfx/trainers/teacher.pal"
+INCLUDE "gfx/trainers/sabrina.pal"
+INCLUDE "gfx/trainers/bug_catcher.pal"
+INCLUDE "gfx/trainers/fisher.pal"
+INCLUDE "gfx/trainers/swimmer_m.pal"
+INCLUDE "gfx/trainers/swimmer_f.pal"
+INCLUDE "gfx/trainers/sailor.pal"
+INCLUDE "gfx/trainers/super_nerd.pal"
+INCLUDE "gfx/trainers/rival2.pal"
+INCLUDE "gfx/trainers/guitarist.pal"
+INCLUDE "gfx/trainers/hiker.pal"
+INCLUDE "gfx/trainers/biker.pal"
+INCLUDE "gfx/trainers/blaine.pal"
+INCLUDE "gfx/trainers/burglar.pal"
+INCLUDE "gfx/trainers/firebreather.pal"
+INCLUDE "gfx/trainers/juggler.pal"
+INCLUDE "gfx/trainers/blackbelt_t.pal"
+INCLUDE "gfx/trainers/executive_m.pal"
+INCLUDE "gfx/trainers/psychic_t.pal"
+INCLUDE "gfx/trainers/picnicker.pal"
+INCLUDE "gfx/trainers/camper.pal"
+INCLUDE "gfx/trainers/executive_f.pal"
+INCLUDE "gfx/trainers/sage.pal"
+INCLUDE "gfx/trainers/medium.pal"
+INCLUDE "gfx/trainers/boarder.pal"
+INCLUDE "gfx/trainers/pokefan_m.pal"
+INCLUDE "gfx/trainers/kimono_girl.pal"
+INCLUDE "gfx/trainers/twins.pal"
+INCLUDE "gfx/trainers/pokefan_f.pal"
+INCLUDE "gfx/trainers/red.pal"
+INCLUDE "gfx/trainers/blue.pal"
+INCLUDE "gfx/trainers/officer.pal"
+INCLUDE "gfx/trainers/grunt_f.pal"