ref: c3f423e30faea0b81eea3f2b35c9fba68f643971
parent: 213dcc70d77ade7cf587d57016cc5bb405494fe8
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Mon Dec 11 18:05:26 EST 2017
Sprite headers and trainer palettes don't have pointer tables, so they don't need individual labels
--- a/gfx/sprite_headers.asm
+++ b/gfx/sprite_headers.asm
@@ -7,411 +7,105 @@
SpriteHeaders: ; 14736
; entries correspond to SPRITE_* constants
-
-ChrisSprite: ; 14736
- sprite_header ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1473c
-
-ChrisBikeSprite: ; 1473c
- sprite_header ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14742
-
-GameboyKidSprite: ; 14742
- sprite_header GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
-; 14748
-
-SilverSprite: ; 14748
- sprite_header SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1474e
-
-OakSprite: ; 1474e
- sprite_header OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14754
-
-RedSprite: ; 14754
- sprite_header RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1475a
-
-BlueSprite: ; 1475a
- sprite_header BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14760
-
-BillSprite: ; 14760
- sprite_header BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14766
-
-ElderSprite: ; 14766
- sprite_header ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 1476c
-
-JanineSprite: ; 1476c
- sprite_header JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14772
-
-KurtSprite: ; 14772
- sprite_header KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14778
-
-MomSprite: ; 14778
- sprite_header MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1477e
-
-BlaineSprite: ; 1477e
- sprite_header BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14784
-
-RedsMomSprite: ; 14784
- sprite_header RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1478a
-
-DaisySprite: ; 1478a
- sprite_header DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14790
-
-ElmSprite: ; 14790
- sprite_header ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14796
-
-WillSprite: ; 14796
- sprite_header WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-; 1479c
-
-FalknerSprite: ; 1479c
- sprite_header FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 147a2
-
-WhitneySprite: ; 147a2
- sprite_header WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 147a8
-
-BugsySprite: ; 147a8
- sprite_header BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-; 147ae
-
-MortySprite: ; 147ae
- sprite_header MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 147b4
-
-ChuckSprite: ; 147b4
- sprite_header ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 147ba
-
-JasmineSprite: ; 147ba
- sprite_header JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-; 147c0
-
-PryceSprite: ; 147c0
- sprite_header PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 147c6
-
-ClairSprite: ; 147c6
- sprite_header ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 147cc
-
-BrockSprite: ; 147cc
- sprite_header BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 147d2
-
-KarenSprite: ; 147d2
- sprite_header KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-; 147d8
-
-BrunoSprite: ; 147d8
- sprite_header BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 147de
-
-MistySprite: ; 147de
- sprite_header MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 147e4
-
-LanceSprite: ; 147e4
- sprite_header LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 147ea
-
-SurgeSprite: ; 147ea
- sprite_header SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-; 147f0
-
-ErikaSprite: ; 147f0
- sprite_header ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-; 147f6
-
-KogaSprite: ; 147f6
- sprite_header KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 147fc
-
-SabrinaSprite: ; 147fc
- sprite_header SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14802
-
-CooltrainerMSprite: ; 14802
- sprite_header CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14808
-
-CooltrainerFSprite: ; 14808
- sprite_header CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 1480e
-
-BugCatcherSprite: ; 1480e
- sprite_header BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14814
-
-TwinSprite: ; 14814
- sprite_header TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1481a
-
-YoungsterSprite: ; 1481a
- sprite_header YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14820
-
-LassSprite: ; 14820
- sprite_header LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14826
-
-TeacherSprite: ; 14826
- sprite_header TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1482c
-
-BuenaSprite: ; 1482c
- sprite_header BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14832
-
-SuperNerdSprite: ; 14832
- sprite_header SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14838
-
-RockerSprite: ; 14838
- sprite_header RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-; 1483e
-
-PokefanMSprite: ; 1483e
- sprite_header PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14844
-
-PokefanFSprite: ; 14844
- sprite_header PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 1484a
-
-GrampsSprite: ; 1484a
- sprite_header GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14850
-
-GrannySprite: ; 14850
- sprite_header GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14856
-
-SwimmerGuySprite: ; 14856
- sprite_header SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 1485c
-
-SwimmerGirlSprite: ; 1485c
- sprite_header SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14862
-
-BigSnorlaxSprite: ; 14862
- sprite_header BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-; 14868
-
-SurfingPikachuSprite: ; 14868
- sprite_header SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1486e
-
-RocketSprite: ; 1486e
- sprite_header RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 14874
-
-RocketGirlSprite: ; 14874
- sprite_header RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 1487a
-
-NurseSprite: ; 1487a
- sprite_header NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-; 14880
-
-LinkReceptionistSprite: ; 14880
- sprite_header LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14886
-
-ClerkSprite: ; 14886
- sprite_header ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-; 1488c
-
-FisherSprite: ; 1488c
- sprite_header FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14892
-
-FishingGuruSprite: ; 14892
- sprite_header FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14898
-
-ScientistSprite: ; 14898
- sprite_header ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 1489e
-
-KimonoGirlSprite: ; 1489e
- sprite_header KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 148a4
-
-SageSprite: ; 148a4
- sprite_header SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 148aa
-
-UnusedGuySprite: ; 148aa
- sprite_header UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-; 148b0
-
-GentlemanSprite: ; 148b0
- sprite_header GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 148b6
-
-BlackBeltSprite: ; 148b6
- sprite_header BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 148bc
-
-ReceptionistSprite: ; 148bc
- sprite_header ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 148c2
-
-OfficerSprite: ; 148c2
- sprite_header OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 148c8
-
-CalSprite: ; 148c8
- sprite_header CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 148ce
-
-SlowpokeSprite: ; 148ce
- sprite_header SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-; 148d4
-
-CaptainSprite: ; 148d4
- sprite_header CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 148da
-
-BigLaprasSprite: ; 148da
- sprite_header BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-; 148e0
-
-GymGuySprite: ; 148e0
- sprite_header GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 148e6
-
-SailorSprite: ; 148e6
- sprite_header SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 148ec
-
-BikerSprite: ; 148ec
- sprite_header BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-; 148f2
-
-PharmacistSprite: ; 148f2
- sprite_header PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 148f8
-
-MonsterSprite: ; 148f8
- sprite_header MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 148fe
-
-FairySprite: ; 148fe
- sprite_header FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14904
-
-BirdSprite: ; 14904
- sprite_header BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 1490a
-
-DragonSprite: ; 1490a
- sprite_header DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-; 14910
-
-BigOnixSprite: ; 14910
- sprite_header BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
-; 14916
-
-N64Sprite: ; 14916
- sprite_header N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-; 1491c
-
-SudowoodoSprite: ; 1491c
- sprite_header SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
-; 14922
-
-SurfSprite: ; 14922
- sprite_header SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14928
-
-PokeBallSprite: ; 14928
- sprite_header PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-; 1492e
-
-PokedexSprite: ; 1492e
- sprite_header PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-; 14934
-
-PaperSprite: ; 14934
- sprite_header PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-; 1493a
-
-VirtualBoySprite: ; 1493a
- sprite_header VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-; 14940
-
-OldLinkReceptionistSprite: ; 14940
- sprite_header OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-; 14946
-
-RockSprite: ; 14946
- sprite_header RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
-; 1494c
-
-BoulderSprite: ; 1494c
- sprite_header BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
-; 14952
-
-SnesSprite: ; 14952
- sprite_header SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-; 14958
-
-FamicomSprite: ; 14958
- sprite_header FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-; 1495e
-
-FruitTreeSprite: ; 1495e
- sprite_header FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE
-; 14964
-
-GoldTrophySprite: ; 14964
- sprite_header GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-; 1496a
-
-SilverTrophySprite: ; 1496a
- sprite_header SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER
-; 14970
-
-KrisSprite: ; 14970
- sprite_header KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 14976
-
-KrisBikeSprite: ; 14976
- sprite_header KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-; 1497c
-
-KurtOutsideSprite: ; 1497c
- sprite_header KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
-; 14982
-
-SuicuneSprite: ; 14982
- sprite_header SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-; 14988
-
-EnteiSprite: ; 14988
- sprite_header EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-; 1498e
-
-RaikouSprite: ; 1498e
- sprite_header RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-; 14994
-
-StandingYoungsterSprite: ; 14994
- sprite_header StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-; 1499a
+ sprite_header ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1473c
+ sprite_header ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14742
+ sprite_header GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN ; 14748
+ sprite_header SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1474e
+ sprite_header OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14754
+ sprite_header RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1475a
+ sprite_header BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14760
+ sprite_header BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14766
+ sprite_header ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1476c
+ sprite_header JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14772
+ sprite_header KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14778
+ sprite_header MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1477e
+ sprite_header BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14784
+ sprite_header RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1478a
+ sprite_header DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14790
+ sprite_header ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14796
+ sprite_header WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 1479c
+ sprite_header FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 147a2
+ sprite_header WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147a8
+ sprite_header BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147ae
+ sprite_header MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147b4
+ sprite_header ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147ba
+ sprite_header JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147c0
+ sprite_header PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147c6
+ sprite_header ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147cc
+ sprite_header BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147d2
+ sprite_header KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 147d8
+ sprite_header BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147de
+ sprite_header MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 147e4
+ sprite_header LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147ea
+ sprite_header SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147f0
+ sprite_header ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147f6
+ sprite_header KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147fc
+ sprite_header SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14802
+ sprite_header CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14808
+ sprite_header CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1480e
+ sprite_header BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14814
+ sprite_header TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1481a
+ sprite_header YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14820
+ sprite_header LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14826
+ sprite_header TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1482c
+ sprite_header BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14832
+ sprite_header SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14838
+ sprite_header RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 1483e
+ sprite_header PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14844
+ sprite_header PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1484a
+ sprite_header GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14850
+ sprite_header GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14856
+ sprite_header SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1485c
+ sprite_header SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14862
+ sprite_header BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 14868
+ sprite_header SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1486e
+ sprite_header RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14874
+ sprite_header RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1487a
+ sprite_header NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 14880
+ sprite_header LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14886
+ sprite_header ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 1488c
+ sprite_header FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14892
+ sprite_header FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14898
+ sprite_header ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1489e
+ sprite_header KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 148a4
+ sprite_header SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148aa
+ sprite_header UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 148b0
+ sprite_header GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148b6
+ sprite_header BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148bc
+ sprite_header ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148c2
+ sprite_header OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148c8
+ sprite_header CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148ce
+ sprite_header SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 148d4
+ sprite_header CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148da
+ sprite_header BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 148e0
+ sprite_header GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148e6
+ sprite_header SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148ec
+ sprite_header BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148f2
+ sprite_header PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148f8
+ sprite_header MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 148fe
+ sprite_header FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14904
+ sprite_header BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1490a
+ sprite_header DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14910
+ sprite_header BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN ; 14916
+ sprite_header N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 1491c
+ sprite_header SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN ; 14922
+ sprite_header SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14928
+ sprite_header PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1492e
+ sprite_header PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 14934
+ sprite_header PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 1493a
+ sprite_header VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 14940
+ sprite_header OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 14946
+ sprite_header RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK ; 1494c
+ sprite_header BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK ; 14952
+ sprite_header SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 14958
+ sprite_header FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1495e
+ sprite_header FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE ; 14964
+ sprite_header GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 1496a
+ sprite_header SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER ; 14970
+ sprite_header KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14976
+ sprite_header KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1497c
+ sprite_header KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN ; 14982
+ sprite_header SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 14988
+ sprite_header EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1498e
+ sprite_header RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 14994
+ sprite_header StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 1499a
--- a/gfx/trainer_palettes.asm
+++ b/gfx/trainer_palettes.asm
@@ -1,81 +1,76 @@
TrainerPalettes: ; b0ce
+; entries correspond to trainer classes
PlayerPalette: ; b0ce
-; The player's palette
-; RGB 25, 18, 12
-; RGB 22, 09, 05
- INCLUDE "gfx/trainers/cal.pal"
-
+; Chris uses the same colors as Cal
+INCLUDE "gfx/trainers/cal.pal"
KrisPalette: ; b0d0
-; Kris uses Falkner's palette
-; RGB 27, 17, 14
-; RGB 07, 05, 31
-
-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"
+; Kris shares Falkner's palette
+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"
+INCLUDE "gfx/trainers/mysticalman.pal"
; b1de