ref: c6fefd0fe878a350a5e8cb1140d0356c78648ba5
parent: 08b14e593e07555c8d3a445d78d9bcb82a10ddf3
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Sun Dec 10 19:17:39 EST 2017
Rename overworld sprite files, consistent with their constants
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,5 +1,5 @@
; sprite ids
-; SpriteHeaders indexes (see gfx/overworld/sprite_headers.asm)
+; SpriteHeaders indexes (see gfx/sprite_headers.asm)
const_def
const SPRITE_NONE ; 00
const SPRITE_CHRIS ; 01
@@ -166,7 +166,7 @@
const SPRITE_COPYCAT ; fb
const SPRITE_JANINE_IMPERSONATOR ; fc
-; sprite_header struct members (see gfx/overworld/sprite_headers.asm)
+; sprite_header struct members (see gfx/sprite_headers.asm)
const_def
const SPRITEHEADER_ADDR_LO
const SPRITEHEADER_ADDR_HI
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -141,7 +141,7 @@
; 8c2f4
TrainerBattlePokeballTiles: ; 8c2f4
-INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp"
+INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
FlashyTransitionToBattle: ; 8c314
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1877,7 +1877,7 @@
INCLUDE "gfx/pics/palette_pointers.asm"
-INCLUDE "gfx/trainers/palette_pointers.asm"
+INCLUDE "gfx/trainer_palettes.asm"
LoadMapPals:
callba LoadSpecialMapPalette
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -850,9 +850,9 @@
; b84f2
FishingGFX: ; b84f2
-INCBIN "gfx/ow_fx/chris_fish.2bpp"
+INCBIN "gfx/overworld/chris_fish.2bpp"
; b8582
KrisFishingGFX: ; b8582
-INCBIN "gfx/ow_fx/kris_fish.2bpp"
+INCBIN "gfx/overworld/kris_fish.2bpp"
; b8612
--- a/engine/healmachineanim.asm
+++ b/engine/healmachineanim.asm
@@ -137,7 +137,7 @@
; 123fc
.HealMachineGFX: ; 123fc
-INCBIN "gfx/ow_fx/heal_machine.2bpp"
+INCBIN "gfx/overworld/heal_machine.2bpp"
; 1241c
.HOF_OAM: ; 1241c
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -1477,5 +1477,5 @@
SpriteHeaders: ; 14736
-INCLUDE "gfx/overworld/sprite_headers.asm"
+INCLUDE "gfx/sprite_headers.asm"
; 1499a
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@
; 8c893
HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/ow_fx/headbutt_tree.2bpp"
+INCBIN "gfx/overworld/headbutt_tree.2bpp"
; 8c913
HideHeadbuttTree: ; 8c913
@@ -152,11 +152,11 @@
; 8c98c
CutTreeGFX: ; c898c
-INCBIN "gfx/ow_fx/cut_tree.2bpp"
+INCBIN "gfx/overworld/cut_tree.2bpp"
; c89cc
CutGrassGFX: ; 8c9cc
-INCBIN "gfx/ow_fx/cut_grass.2bpp"
+INCBIN "gfx/overworld/cut_grass.2bpp"
; 8ca0c
OWCutJumptable: ; 8ca0c
binary files a/gfx/overworld/000.png /dev/null differ
binary files a/gfx/overworld/001.png /dev/null differ
binary files a/gfx/overworld/002.png /dev/null differ
binary files a/gfx/overworld/003.png /dev/null differ
binary files a/gfx/overworld/004.png /dev/null differ
binary files a/gfx/overworld/005.png /dev/null differ
binary files a/gfx/overworld/006.png /dev/null differ
binary files a/gfx/overworld/007.png /dev/null differ
binary files a/gfx/overworld/008.png /dev/null differ
binary files a/gfx/overworld/009.png /dev/null differ
binary files a/gfx/overworld/010.png /dev/null differ
binary files a/gfx/overworld/011.png /dev/null differ
binary files a/gfx/overworld/012.png /dev/null differ
binary files a/gfx/overworld/013.png /dev/null differ
binary files a/gfx/overworld/014.png /dev/null differ
binary files a/gfx/overworld/015.png /dev/null differ
binary files a/gfx/overworld/016.png /dev/null differ
binary files a/gfx/overworld/017.png /dev/null differ
binary files a/gfx/overworld/018.png /dev/null differ
binary files a/gfx/overworld/019.png /dev/null differ
binary files a/gfx/overworld/020.png /dev/null differ
binary files a/gfx/overworld/021.png /dev/null differ
binary files a/gfx/overworld/022.png /dev/null differ
binary files a/gfx/overworld/023.png /dev/null differ
binary files a/gfx/overworld/024.png /dev/null differ
binary files a/gfx/overworld/025.png /dev/null differ
binary files a/gfx/overworld/026.png /dev/null differ
binary files a/gfx/overworld/027.png /dev/null differ
binary files a/gfx/overworld/028.png /dev/null differ
binary files a/gfx/overworld/029.png /dev/null differ
binary files a/gfx/overworld/030.png /dev/null differ
binary files a/gfx/overworld/031.png /dev/null differ
binary files a/gfx/overworld/032.png /dev/null differ
binary files a/gfx/overworld/033.png /dev/null differ
binary files a/gfx/overworld/034.png /dev/null differ
binary files a/gfx/overworld/035.png /dev/null differ
binary files a/gfx/overworld/036.png /dev/null differ
binary files a/gfx/overworld/037.png /dev/null differ
binary files a/gfx/overworld/038.png /dev/null differ
binary files a/gfx/overworld/039.png /dev/null differ
binary files a/gfx/overworld/040.png /dev/null differ
binary files a/gfx/overworld/041.png /dev/null differ
binary files a/gfx/overworld/042.png /dev/null differ
binary files a/gfx/overworld/043.png /dev/null differ
binary files a/gfx/overworld/044.png /dev/null differ
binary files a/gfx/overworld/045.png /dev/null differ
binary files a/gfx/overworld/046.png /dev/null differ
binary files a/gfx/overworld/047.png /dev/null differ
binary files a/gfx/overworld/048.png /dev/null differ
binary files a/gfx/overworld/049.png /dev/null differ
binary files a/gfx/overworld/050.png /dev/null differ
binary files a/gfx/overworld/051.png /dev/null differ
binary files a/gfx/overworld/052.png /dev/null differ
binary files a/gfx/overworld/053.png /dev/null differ
binary files a/gfx/overworld/054.png /dev/null differ
binary files a/gfx/overworld/055.png /dev/null differ
binary files a/gfx/overworld/056.png /dev/null differ
binary files a/gfx/overworld/057.png /dev/null differ
binary files a/gfx/overworld/058.png /dev/null differ
binary files a/gfx/overworld/059.png /dev/null differ
binary files a/gfx/overworld/060.png /dev/null differ
binary files a/gfx/overworld/061.png /dev/null differ
binary files a/gfx/overworld/062.png /dev/null differ
binary files a/gfx/overworld/063.png /dev/null differ
binary files a/gfx/overworld/064.png /dev/null differ
binary files a/gfx/overworld/065.png /dev/null differ
binary files a/gfx/overworld/066.png /dev/null differ
binary files a/gfx/overworld/067.png /dev/null differ
binary files a/gfx/overworld/068.png /dev/null differ
binary files a/gfx/overworld/069.png /dev/null differ
binary files a/gfx/overworld/070.png /dev/null differ
binary files a/gfx/overworld/071.png /dev/null differ
binary files a/gfx/overworld/072.png /dev/null differ
binary files a/gfx/overworld/073.png /dev/null differ
binary files a/gfx/overworld/074.png /dev/null differ
binary files a/gfx/overworld/075.png /dev/null differ
binary files a/gfx/overworld/076.png /dev/null differ
binary files a/gfx/overworld/077.png /dev/null differ
binary files a/gfx/overworld/078.png /dev/null differ
binary files a/gfx/overworld/079.png /dev/null differ
binary files a/gfx/overworld/080.png /dev/null differ
binary files a/gfx/overworld/081.png /dev/null differ
binary files a/gfx/overworld/082.png /dev/null differ
binary files a/gfx/overworld/083.png /dev/null differ
binary files a/gfx/overworld/084.png /dev/null differ
binary files a/gfx/overworld/085.png /dev/null differ
binary files a/gfx/overworld/086.png /dev/null differ
binary files a/gfx/overworld/087.png /dev/null differ
binary files a/gfx/overworld/088.png /dev/null differ
binary files a/gfx/overworld/089.png /dev/null differ
binary files a/gfx/overworld/090.png /dev/null differ
binary files a/gfx/overworld/091.png /dev/null differ
binary files a/gfx/overworld/092.png /dev/null differ
binary files a/gfx/overworld/093.png /dev/null differ
binary files a/gfx/overworld/094.png /dev/null differ
binary files a/gfx/overworld/095.png /dev/null differ
binary files a/gfx/overworld/096.png /dev/null differ
binary files a/gfx/overworld/097.png /dev/null differ
binary files a/gfx/overworld/098.png /dev/null differ
binary files a/gfx/overworld/099.png /dev/null differ
binary files a/gfx/overworld/100.png /dev/null differ
binary files a/gfx/overworld/101.png /dev/null differ
binary files /dev/null b/gfx/overworld/boulder_dust.png differ
binary files /dev/null b/gfx/overworld/chris_fish.png differ
binary files /dev/null b/gfx/overworld/cut_grass.png differ
binary files /dev/null b/gfx/overworld/cut_tree.png differ
binary files /dev/null b/gfx/overworld/fishing_rod.png differ
binary files /dev/null b/gfx/overworld/grass_rustle.png differ
binary files /dev/null b/gfx/overworld/headbutt_tree.png differ
binary files /dev/null b/gfx/overworld/heal_machine.png differ
binary files /dev/null b/gfx/overworld/kris_fish.png differ
binary files /dev/null b/gfx/overworld/shadow.png differ
--- a/gfx/overworld/sprite_headers.asm
+++ /dev/null
@@ -1,419 +1,0 @@
-; Format:
-; Address
-; Length, Bank
-; Type, Palette
-
-sprite_header: MACRO
-; pointer, length, type, palette
- dw \1
- db \2 * 4 tiles, BANK(\1)
- db \3, \4
-ENDM
-
-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
--- a/gfx/overworld/sprites_1.asm
+++ /dev/null
@@ -1,44 +1,0 @@
-ChrisSpriteGFX: INCBIN "gfx/overworld/000.2bpp" ; c0000
-ChrisBikeSpriteGFX: INCBIN "gfx/overworld/001.2bpp" ; c0180
-GameboyKidSpriteGFX: INCBIN "gfx/overworld/002.2bpp" ; c0300
-SilverSpriteGFX: INCBIN "gfx/overworld/003.2bpp" ; c03c0
-OakSpriteGFX: INCBIN "gfx/overworld/004.2bpp" ; c0540
-RedSpriteGFX: INCBIN "gfx/overworld/005.2bpp" ; c06c0
-BlueSpriteGFX: INCBIN "gfx/overworld/006.2bpp" ; c0840
-BillSpriteGFX: INCBIN "gfx/overworld/007.2bpp" ; c09c0
-ElderSpriteGFX: INCBIN "gfx/overworld/008.2bpp" ; c0b40
-JanineSpriteGFX: INCBIN "gfx/overworld/009.2bpp" ; c0cc0
-KurtSpriteGFX: INCBIN "gfx/overworld/010.2bpp" ; c0e40
-MomSpriteGFX: INCBIN "gfx/overworld/011.2bpp" ; c0fc0
-BlaineSpriteGFX: INCBIN "gfx/overworld/012.2bpp" ; c1140
-RedsMomSpriteGFX: INCBIN "gfx/overworld/013.2bpp" ; c12c0
-DaisySpriteGFX: INCBIN "gfx/overworld/014.2bpp" ; c1440
-ElmSpriteGFX: INCBIN "gfx/overworld/015.2bpp" ; c15c0
-WillSpriteGFX: INCBIN "gfx/overworld/016.2bpp" ; c1740
-FalknerSpriteGFX: INCBIN "gfx/overworld/017.2bpp" ; c1800
-WhitneySpriteGFX: INCBIN "gfx/overworld/018.2bpp" ; c1980
-BugsySpriteGFX: INCBIN "gfx/overworld/019.2bpp" ; c1b00
-MortySpriteGFX: INCBIN "gfx/overworld/020.2bpp" ; c1c80
-ChuckSpriteGFX: INCBIN "gfx/overworld/021.2bpp" ; c1e00
-JasmineSpriteGFX: INCBIN "gfx/overworld/022.2bpp" ; c1f80
-PryceSpriteGFX: INCBIN "gfx/overworld/023.2bpp" ; c2100
-ClairSpriteGFX: INCBIN "gfx/overworld/024.2bpp" ; c2280
-BrockSpriteGFX: INCBIN "gfx/overworld/025.2bpp" ; c2400
-KarenSpriteGFX: INCBIN "gfx/overworld/026.2bpp" ; c2580
-BrunoSpriteGFX: INCBIN "gfx/overworld/027.2bpp" ; c2640
-MistySpriteGFX: INCBIN "gfx/overworld/028.2bpp" ; c27c0
-LanceSpriteGFX: INCBIN "gfx/overworld/029.2bpp" ; c2940
-SurgeSpriteGFX: INCBIN "gfx/overworld/030.2bpp" ; c2ac0
-ErikaSpriteGFX: INCBIN "gfx/overworld/031.2bpp" ; c2c40
-KogaSpriteGFX: INCBIN "gfx/overworld/032.2bpp" ; c2dc0
-SabrinaSpriteGFX: INCBIN "gfx/overworld/033.2bpp" ; c2f40
-CooltrainerMSpriteGFX: INCBIN "gfx/overworld/034.2bpp" ; c30c0
-CooltrainerFSpriteGFX: INCBIN "gfx/overworld/035.2bpp" ; c3240
-BugCatcherSpriteGFX: INCBIN "gfx/overworld/036.2bpp" ; c33c0
-TwinSpriteGFX: INCBIN "gfx/overworld/037.2bpp" ; c3540
-YoungsterSpriteGFX: INCBIN "gfx/overworld/038.2bpp" ; c36c0
-LassSpriteGFX: INCBIN "gfx/overworld/039.2bpp" ; c3840
-TeacherSpriteGFX: INCBIN "gfx/overworld/040.2bpp" ; c39c0
-BuenaSpriteGFX: INCBIN "gfx/overworld/041.2bpp" ; c3b40
-SuperNerdSpriteGFX: INCBIN "gfx/overworld/042.2bpp" ; c3cc0
-RockerSpriteGFX: INCBIN "gfx/overworld/043.2bpp" ; c3e40
--- a/gfx/overworld/sprites_2.asm
+++ /dev/null
@@ -1,58 +1,0 @@
-PokefanMSpriteGFX: INCBIN "gfx/overworld/044.2bpp" ; c4000
-PokefanFSpriteGFX: INCBIN "gfx/overworld/045.2bpp" ; c4180
-GrampsSpriteGFX: INCBIN "gfx/overworld/046.2bpp" ; c4300
-GrannySpriteGFX: INCBIN "gfx/overworld/047.2bpp" ; c4480
-SwimmerGuySpriteGFX: INCBIN "gfx/overworld/048.2bpp" ; c4600
-SwimmerGirlSpriteGFX: INCBIN "gfx/overworld/049.2bpp" ; c4780
-BigSnorlaxSpriteGFX: INCBIN "gfx/overworld/050.2bpp" ; c4900
-SurfingPikachuSpriteGFX: INCBIN "gfx/overworld/051.2bpp" ; c4980
-RocketSpriteGFX: INCBIN "gfx/overworld/052.2bpp" ; c4b00
-RocketGirlSpriteGFX: INCBIN "gfx/overworld/053.2bpp" ; c4c80
-NurseSpriteGFX: INCBIN "gfx/overworld/054.2bpp" ; c4e00
-LinkReceptionistSpriteGFX: INCBIN "gfx/overworld/055.2bpp" ; c4ec0
-ClerkSpriteGFX: INCBIN "gfx/overworld/056.2bpp" ; c5040
-FisherSpriteGFX: INCBIN "gfx/overworld/057.2bpp" ; c51c0
-FishingGuruSpriteGFX: INCBIN "gfx/overworld/058.2bpp" ; c5340
-ScientistSpriteGFX: INCBIN "gfx/overworld/059.2bpp" ; c54c0
-KimonoGirlSpriteGFX: INCBIN "gfx/overworld/060.2bpp" ; c5640
-SageSpriteGFX: INCBIN "gfx/overworld/061.2bpp" ; c57c0
-UnusedGuySpriteGFX: INCBIN "gfx/overworld/062.2bpp" ; c5940
-GentlemanSpriteGFX: INCBIN "gfx/overworld/063.2bpp" ; c5ac0
-BlackBeltSpriteGFX: INCBIN "gfx/overworld/064.2bpp" ; c5c40
-ReceptionistSpriteGFX: INCBIN "gfx/overworld/065.2bpp" ; c5dc0
-OfficerSpriteGFX: INCBIN "gfx/overworld/066.2bpp" ; c5f40
-CalSpriteGFX: INCBIN "gfx/overworld/067.2bpp" ; c60c0
-SlowpokeSpriteGFX: INCBIN "gfx/overworld/068.2bpp" ; c6240
-CaptainSpriteGFX: INCBIN "gfx/overworld/069.2bpp" ; c6280
-BigLaprasSpriteGFX: INCBIN "gfx/overworld/070.2bpp" ; c6400
-GymGuySpriteGFX: INCBIN "gfx/overworld/071.2bpp" ; c6480
-SailorSpriteGFX: INCBIN "gfx/overworld/072.2bpp" ; c6600
-BikerSpriteGFX: INCBIN "gfx/overworld/073.2bpp" ; c6780
-PharmacistSpriteGFX: INCBIN "gfx/overworld/074.2bpp" ; c6900
-MonsterSpriteGFX: INCBIN "gfx/overworld/075.2bpp" ; c6a80
-FairySpriteGFX: INCBIN "gfx/overworld/076.2bpp" ; c6c00
-BirdSpriteGFX: INCBIN "gfx/overworld/077.2bpp" ; c6d80
-DragonSpriteGFX: INCBIN "gfx/overworld/078.2bpp" ; c6f00
-BigOnixSpriteGFX: INCBIN "gfx/overworld/079.2bpp" ; c7080
-N64SpriteGFX: INCBIN "gfx/overworld/080.2bpp" ; c7140
-SudowoodoSpriteGFX: INCBIN "gfx/overworld/081.2bpp" ; c7180
-SurfSpriteGFX: INCBIN "gfx/overworld/082.2bpp" ; c7200
-PokeBallSpriteGFX: INCBIN "gfx/overworld/083.2bpp" ; c7380
-PokedexSpriteGFX: INCBIN "gfx/overworld/084.2bpp" ; c7500
-PaperSpriteGFX: INCBIN "gfx/overworld/085.2bpp" ; c7680
-VirtualBoySpriteGFX: INCBIN "gfx/overworld/086.2bpp" ; c7800
-OldLinkReceptionistSpriteGFX: INCBIN "gfx/overworld/087.2bpp" ; c7840
-RockSpriteGFX: INCBIN "gfx/overworld/088.2bpp" ; c7880
-BoulderSpriteGFX: INCBIN "gfx/overworld/089.2bpp" ; c78c0
-SnesSpriteGFX: INCBIN "gfx/overworld/090.2bpp" ; c7900
-FamicomSpriteGFX: INCBIN "gfx/overworld/091.2bpp" ; c7940
-FruitTreeSpriteGFX: INCBIN "gfx/overworld/092.2bpp" ; c7980
-GoldTrophySpriteGFX: INCBIN "gfx/overworld/093.2bpp" ; c79c0
-SilverTrophySpriteGFX: INCBIN "gfx/overworld/094.2bpp" ; c7a00
-KrisSpriteGFX: INCBIN "gfx/overworld/095.2bpp" ; c7a40
-KrisBikeSpriteGFX: INCBIN "gfx/overworld/096.2bpp" ; c7bc0
-KurtOutsideSpriteGFX: INCBIN "gfx/overworld/097.2bpp" ; c7d40
-SuicuneSpriteGFX: INCBIN "gfx/overworld/098.2bpp" ; c7e00
-EnteiSpriteGFX: INCBIN "gfx/overworld/099.2bpp" ; c7e40
-RaikouSpriteGFX: INCBIN "gfx/overworld/100.2bpp" ; c7e80
-StandingYoungsterSpriteGFX: INCBIN "gfx/overworld/101.2bpp" ; c7ec0
binary files /dev/null b/gfx/overworld/trainer_battle_pokeball_tiles.png differ
binary files a/gfx/ow_fx/boulder_dust.png /dev/null differ
binary files a/gfx/ow_fx/chris_fish.png /dev/null differ
binary files a/gfx/ow_fx/cut_grass.png /dev/null differ
binary files a/gfx/ow_fx/cut_tree.png /dev/null differ
binary files a/gfx/ow_fx/fishing_rod.png /dev/null differ
binary files a/gfx/ow_fx/grass_rustle.png /dev/null differ
binary files a/gfx/ow_fx/headbutt_tree.png /dev/null differ
binary files a/gfx/ow_fx/heal_machine.png /dev/null differ
binary files a/gfx/ow_fx/kris_fish.png /dev/null differ
binary files a/gfx/ow_fx/shadow.png /dev/null differ
binary files a/gfx/ow_fx/trainer_battle_pokeball_tiles.png /dev/null differ
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,18 +1,21 @@
INCLUDE "includes.asm"
-; Unown pic pointers are assumed to start at the same address in a different bank.
-
SECTION "Pic Pointers", ROMX
+
PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm"
+
SECTION "Unown Pic Pointers", ROMX
+
+; Unown pic pointers are assumed to start at the same address as PicPointers,
+; but in a different bank.
UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"
SECTION "Trainer Pic Pointers", ROMX
-TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
+TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm"
SECTION "Pics 1", ROMX
--- a/gfx/pics/trainer_pic_pointers.asm
+++ /dev/null
@@ -1,68 +1,0 @@
-
- add_pic FalknerPic
- add_pic WhitneyPic
- add_pic BugsyPic
- add_pic MortyPic
- add_pic PrycePic
- add_pic JasminePic
- add_pic ChuckPic
- add_pic ClairPic
- add_pic Rival1Pic
- add_pic PokemonProfPic
- add_pic WillPic
- add_pic CalPic
- add_pic BrunoPic
- add_pic KarenPic
- add_pic KogaPic
- add_pic ChampionPic
- add_pic BrockPic
- add_pic MistyPic
- add_pic LtSurgePic
- add_pic ScientistPic
- add_pic ErikaPic
- add_pic YoungsterPic
- add_pic SchoolboyPic
- add_pic BirdKeeperPic
- add_pic LassPic
- add_pic JaninePic
- add_pic CooltrainermPic
- add_pic CooltrainerfPic
- add_pic BeautyPic
- add_pic PokemaniacPic
- add_pic GruntmPic
- add_pic GentlemanPic
- add_pic SkierPic
- add_pic TeacherPic
- add_pic SabrinaPic
- add_pic BugCatcherPic
- add_pic FisherPic
- add_pic SwimmermPic
- add_pic SwimmerfPic
- add_pic SailorPic
- add_pic SuperNerdPic
- add_pic Rival2Pic
- add_pic GuitaristPic
- add_pic HikerPic
- add_pic BikerPic
- add_pic BlainePic
- add_pic BurglarPic
- add_pic FirebreatherPic
- add_pic JugglerPic
- add_pic BlackbeltTPic
- add_pic ExecutivemPic
- add_pic PsychicTPic
- add_pic PicnickerPic
- add_pic CamperPic
- add_pic ExecutivefPic
- add_pic SagePic
- add_pic MediumPic
- add_pic BoarderPic
- add_pic PokefanmPic
- add_pic KimonoGirlPic
- add_pic TwinsPic
- add_pic PokefanfPic
- add_pic RedPic
- add_pic BluePic
- add_pic OfficerPic
- add_pic GruntfPic
- add_pic MysticalmanPic
--- /dev/null
+++ b/gfx/sprite_headers.asm
@@ -1,0 +1,419 @@
+; Format:
+; Address
+; Length, Bank
+; Type, Palette
+
+sprite_header: MACRO
+; pointer, length, type, palette
+ dw \1
+ db \2 * 4 tiles, BANK(\1)
+ db \3, \4
+ENDM
+
+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
--- /dev/null
+++ b/gfx/sprites.asm
@@ -1,0 +1,108 @@
+SECTION "Sprites 1", ROMX
+
+ChrisSpriteGFX: INCBIN "gfx/sprites/chris.2bpp" ; c0000
+ChrisBikeSpriteGFX: INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180
+GameboyKidSpriteGFX: INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300
+SilverSpriteGFX: INCBIN "gfx/sprites/silver.2bpp" ; c03c0
+OakSpriteGFX: INCBIN "gfx/sprites/oak.2bpp" ; c0540
+RedSpriteGFX: INCBIN "gfx/sprites/red.2bpp" ; c06c0
+BlueSpriteGFX: INCBIN "gfx/sprites/blue.2bpp" ; c0840
+BillSpriteGFX: INCBIN "gfx/sprites/bill.2bpp" ; c09c0
+ElderSpriteGFX: INCBIN "gfx/sprites/elder.2bpp" ; c0b40
+JanineSpriteGFX: INCBIN "gfx/sprites/janine.2bpp" ; c0cc0
+KurtSpriteGFX: INCBIN "gfx/sprites/kurt.2bpp" ; c0e40
+MomSpriteGFX: INCBIN "gfx/sprites/mom.2bpp" ; c0fc0
+BlaineSpriteGFX: INCBIN "gfx/sprites/blaine.2bpp" ; c1140
+RedsMomSpriteGFX: INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0
+DaisySpriteGFX: INCBIN "gfx/sprites/daisy.2bpp" ; c1440
+ElmSpriteGFX: INCBIN "gfx/sprites/elm.2bpp" ; c15c0
+WillSpriteGFX: INCBIN "gfx/sprites/will.2bpp" ; c1740
+FalknerSpriteGFX: INCBIN "gfx/sprites/falkner.2bpp" ; c1800
+WhitneySpriteGFX: INCBIN "gfx/sprites/whitney.2bpp" ; c1980
+BugsySpriteGFX: INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00
+MortySpriteGFX: INCBIN "gfx/sprites/morty.2bpp" ; c1c80
+ChuckSpriteGFX: INCBIN "gfx/sprites/chuck.2bpp" ; c1e00
+JasmineSpriteGFX: INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80
+PryceSpriteGFX: INCBIN "gfx/sprites/pryce.2bpp" ; c2100
+ClairSpriteGFX: INCBIN "gfx/sprites/clair.2bpp" ; c2280
+BrockSpriteGFX: INCBIN "gfx/sprites/brock.2bpp" ; c2400
+KarenSpriteGFX: INCBIN "gfx/sprites/karen.2bpp" ; c2580
+BrunoSpriteGFX: INCBIN "gfx/sprites/bruno.2bpp" ; c2640
+MistySpriteGFX: INCBIN "gfx/sprites/misty.2bpp" ; c27c0
+LanceSpriteGFX: INCBIN "gfx/sprites/lance.2bpp" ; c2940
+SurgeSpriteGFX: INCBIN "gfx/sprites/surge.2bpp" ; c2ac0
+ErikaSpriteGFX: INCBIN "gfx/sprites/erika.2bpp" ; c2c40
+KogaSpriteGFX: INCBIN "gfx/sprites/koga.2bpp" ; c2dc0
+SabrinaSpriteGFX: INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40
+CooltrainerMSpriteGFX: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0
+CooltrainerFSpriteGFX: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240
+BugCatcherSpriteGFX: INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0
+TwinSpriteGFX: INCBIN "gfx/sprites/twin.2bpp" ; c3540
+YoungsterSpriteGFX: INCBIN "gfx/sprites/youngster.2bpp" ; c36c0
+LassSpriteGFX: INCBIN "gfx/sprites/lass.2bpp" ; c3840
+TeacherSpriteGFX: INCBIN "gfx/sprites/teacher.2bpp" ; c39c0
+BuenaSpriteGFX: INCBIN "gfx/sprites/buena.2bpp" ; c3b40
+SuperNerdSpriteGFX: INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0
+RockerSpriteGFX: INCBIN "gfx/sprites/rocker.2bpp" ; c3e40
+
+
+SECTION "Sprites 2", ROMX
+
+PokefanMSpriteGFX: INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000
+PokefanFSpriteGFX: INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180
+GrampsSpriteGFX: INCBIN "gfx/sprites/gramps.2bpp" ; c4300
+GrannySpriteGFX: INCBIN "gfx/sprites/granny.2bpp" ; c4480
+SwimmerGuySpriteGFX: INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600
+SwimmerGirlSpriteGFX: INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780
+BigSnorlaxSpriteGFX: INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900
+SurfingPikachuSpriteGFX: INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980
+RocketSpriteGFX: INCBIN "gfx/sprites/rocket.2bpp" ; c4b00
+RocketGirlSpriteGFX: INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80
+NurseSpriteGFX: INCBIN "gfx/sprites/nurse.2bpp" ; c4e00
+LinkReceptionistSpriteGFX: INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0
+ClerkSpriteGFX: INCBIN "gfx/sprites/clerk.2bpp" ; c5040
+FisherSpriteGFX: INCBIN "gfx/sprites/fisher.2bpp" ; c51c0
+FishingGuruSpriteGFX: INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340
+ScientistSpriteGFX: INCBIN "gfx/sprites/scientist.2bpp" ; c54c0
+KimonoGirlSpriteGFX: INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640
+SageSpriteGFX: INCBIN "gfx/sprites/sage.2bpp" ; c57c0
+UnusedGuySpriteGFX: INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940
+GentlemanSpriteGFX: INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0
+BlackBeltSpriteGFX: INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40
+ReceptionistSpriteGFX: INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0
+OfficerSpriteGFX: INCBIN "gfx/sprites/officer.2bpp" ; c5f40
+CalSpriteGFX: INCBIN "gfx/sprites/cal.2bpp" ; c60c0
+SlowpokeSpriteGFX: INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240
+CaptainSpriteGFX: INCBIN "gfx/sprites/captain.2bpp" ; c6280
+BigLaprasSpriteGFX: INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400
+GymGuySpriteGFX: INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480
+SailorSpriteGFX: INCBIN "gfx/sprites/sailor.2bpp" ; c6600
+BikerSpriteGFX: INCBIN "gfx/sprites/biker.2bpp" ; c6780
+PharmacistSpriteGFX: INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900
+MonsterSpriteGFX: INCBIN "gfx/sprites/monster.2bpp" ; c6a80
+FairySpriteGFX: INCBIN "gfx/sprites/fairy.2bpp" ; c6c00
+BirdSpriteGFX: INCBIN "gfx/sprites/bird.2bpp" ; c6d80
+DragonSpriteGFX: INCBIN "gfx/sprites/dragon.2bpp" ; c6f00
+BigOnixSpriteGFX: INCBIN "gfx/sprites/big_onix.2bpp" ; c7080
+N64SpriteGFX: INCBIN "gfx/sprites/n64.2bpp" ; c7140
+SudowoodoSpriteGFX: INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180
+SurfSpriteGFX: INCBIN "gfx/sprites/surf.2bpp" ; c7200
+PokeBallSpriteGFX: INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380
+PokedexSpriteGFX: INCBIN "gfx/sprites/pokedex.2bpp" ; c7500
+PaperSpriteGFX: INCBIN "gfx/sprites/paper.2bpp" ; c7680
+VirtualBoySpriteGFX: INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800
+OldLinkReceptionistSpriteGFX: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840
+RockSpriteGFX: INCBIN "gfx/sprites/rock.2bpp" ; c7880
+BoulderSpriteGFX: INCBIN "gfx/sprites/boulder.2bpp" ; c78c0
+SnesSpriteGFX: INCBIN "gfx/sprites/snes.2bpp" ; c7900
+FamicomSpriteGFX: INCBIN "gfx/sprites/famicom.2bpp" ; c7940
+FruitTreeSpriteGFX: INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980
+GoldTrophySpriteGFX: INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0
+SilverTrophySpriteGFX: INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00
+KrisSpriteGFX: INCBIN "gfx/sprites/kris.2bpp" ; c7a40
+KrisBikeSpriteGFX: INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0
+KurtOutsideSpriteGFX: INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40
+SuicuneSpriteGFX: INCBIN "gfx/sprites/suicune.2bpp" ; c7e00
+EnteiSpriteGFX: INCBIN "gfx/sprites/entei.2bpp" ; c7e40
+RaikouSpriteGFX: INCBIN "gfx/sprites/raikou.2bpp" ; c7e80
+StandingYoungsterSpriteGFX: INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0
binary files /dev/null b/gfx/sprites/big_lapras.png differ
binary files /dev/null b/gfx/sprites/big_onix.png differ
binary files /dev/null b/gfx/sprites/big_snorlax.png differ
binary files /dev/null b/gfx/sprites/biker.png differ
binary files /dev/null b/gfx/sprites/bill.png differ
binary files /dev/null b/gfx/sprites/bird.png differ
binary files /dev/null b/gfx/sprites/black_belt.png differ
binary files /dev/null b/gfx/sprites/blaine.png differ
binary files /dev/null b/gfx/sprites/blue.png differ
binary files /dev/null b/gfx/sprites/boulder.png differ
binary files /dev/null b/gfx/sprites/brock.png differ
binary files /dev/null b/gfx/sprites/bruno.png differ
binary files /dev/null b/gfx/sprites/buena.png differ
binary files /dev/null b/gfx/sprites/bug_catcher.png differ
binary files /dev/null b/gfx/sprites/bugsy.png differ
binary files /dev/null b/gfx/sprites/cal.png differ
binary files /dev/null b/gfx/sprites/captain.png differ
binary files /dev/null b/gfx/sprites/chris.png differ
binary files /dev/null b/gfx/sprites/chris_bike.png differ
binary files /dev/null b/gfx/sprites/chuck.png differ
binary files /dev/null b/gfx/sprites/clair.png differ
binary files /dev/null b/gfx/sprites/clerk.png differ
binary files /dev/null b/gfx/sprites/cooltrainer_f.png differ
binary files /dev/null b/gfx/sprites/cooltrainer_m.png differ
binary files /dev/null b/gfx/sprites/daisy.png differ
binary files /dev/null b/gfx/sprites/dragon.png differ
binary files /dev/null b/gfx/sprites/elder.png differ
binary files /dev/null b/gfx/sprites/elm.png differ
binary files /dev/null b/gfx/sprites/entei.png differ
binary files /dev/null b/gfx/sprites/erika.png differ
binary files /dev/null b/gfx/sprites/fairy.png differ
binary files /dev/null b/gfx/sprites/falkner.png differ
binary files /dev/null b/gfx/sprites/famicom.png differ
binary files /dev/null b/gfx/sprites/fisher.png differ
binary files /dev/null b/gfx/sprites/fishing_guru.png differ
binary files /dev/null b/gfx/sprites/fruit_tree.png differ
binary files /dev/null b/gfx/sprites/gameboy_kid.png differ
binary files /dev/null b/gfx/sprites/gentleman.png differ
binary files /dev/null b/gfx/sprites/gold_trophy.png differ
binary files /dev/null b/gfx/sprites/gramps.png differ
binary files /dev/null b/gfx/sprites/granny.png differ
binary files /dev/null b/gfx/sprites/gym_guy.png differ
binary files /dev/null b/gfx/sprites/janine.png differ
binary files /dev/null b/gfx/sprites/jasmine.png differ
binary files /dev/null b/gfx/sprites/karen.png differ
binary files /dev/null b/gfx/sprites/kimono_girl.png differ
binary files /dev/null b/gfx/sprites/koga.png differ
binary files /dev/null b/gfx/sprites/kris.png differ
binary files /dev/null b/gfx/sprites/kris_bike.png differ
binary files /dev/null b/gfx/sprites/kurt.png differ
binary files /dev/null b/gfx/sprites/kurt_outside.png differ
binary files /dev/null b/gfx/sprites/lance.png differ
binary files /dev/null b/gfx/sprites/lass.png differ
binary files /dev/null b/gfx/sprites/link_receptionist.png differ
binary files /dev/null b/gfx/sprites/misty.png differ
binary files /dev/null b/gfx/sprites/mom.png differ
binary files /dev/null b/gfx/sprites/monster.png differ
binary files /dev/null b/gfx/sprites/morty.png differ
binary files /dev/null b/gfx/sprites/n64.png differ
binary files /dev/null b/gfx/sprites/nurse.png differ
binary files /dev/null b/gfx/sprites/oak.png differ
binary files /dev/null b/gfx/sprites/officer.png differ
binary files /dev/null b/gfx/sprites/old_link_receptionist.png differ
binary files /dev/null b/gfx/sprites/paper.png differ
binary files /dev/null b/gfx/sprites/pharmacist.png differ
binary files /dev/null b/gfx/sprites/poke_ball.png differ
binary files /dev/null b/gfx/sprites/pokedex.png differ
binary files /dev/null b/gfx/sprites/pokefan_f.png differ
binary files /dev/null b/gfx/sprites/pokefan_m.png differ
binary files /dev/null b/gfx/sprites/pryce.png differ
binary files /dev/null b/gfx/sprites/raikou.png differ
binary files /dev/null b/gfx/sprites/receptionist.png differ
binary files /dev/null b/gfx/sprites/red.png differ
binary files /dev/null b/gfx/sprites/reds_mom.png differ
binary files /dev/null b/gfx/sprites/rock.png differ
binary files /dev/null b/gfx/sprites/rocker.png differ
binary files /dev/null b/gfx/sprites/rocket.png differ
binary files /dev/null b/gfx/sprites/rocket_girl.png differ
binary files /dev/null b/gfx/sprites/sabrina.png differ
binary files /dev/null b/gfx/sprites/sage.png differ
binary files /dev/null b/gfx/sprites/sailor.png differ
binary files /dev/null b/gfx/sprites/scientist.png differ
binary files /dev/null b/gfx/sprites/silver.png differ
binary files /dev/null b/gfx/sprites/silver_trophy.png differ
binary files /dev/null b/gfx/sprites/slowpoke.png differ
binary files /dev/null b/gfx/sprites/snes.png differ
binary files /dev/null b/gfx/sprites/standing_youngster.png differ
binary files /dev/null b/gfx/sprites/sudowoodo.png differ
binary files /dev/null b/gfx/sprites/suicune.png differ
binary files /dev/null b/gfx/sprites/super_nerd.png differ
binary files /dev/null b/gfx/sprites/surf.png differ
binary files /dev/null b/gfx/sprites/surfing_pikachu.png differ
binary files /dev/null b/gfx/sprites/surge.png differ
binary files /dev/null b/gfx/sprites/swimmer_girl.png differ
binary files /dev/null b/gfx/sprites/swimmer_guy.png differ
binary files /dev/null b/gfx/sprites/teacher.png differ
binary files /dev/null b/gfx/sprites/twin.png differ
binary files /dev/null b/gfx/sprites/unused_guy.png differ
binary files /dev/null b/gfx/sprites/virtual_boy.png differ
binary files /dev/null b/gfx/sprites/whitney.png differ
binary files /dev/null b/gfx/sprites/will.png differ
binary files /dev/null b/gfx/sprites/youngster.png differ
--- /dev/null
+++ b/gfx/trainer_palettes.asm
@@ -1,0 +1,82 @@
+
+TrainerPalettes: ; b0ce
+
+PlayerPalette: ; b0ce
+; The player's palette
+; RGB 25, 18, 12
+; RGB 22, 09, 05
+ 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"
+; b1de
--- /dev/null
+++ b/gfx/trainer_pic_pointers.asm
@@ -1,0 +1,68 @@
+
+ add_pic FalknerPic
+ add_pic WhitneyPic
+ add_pic BugsyPic
+ add_pic MortyPic
+ add_pic PrycePic
+ add_pic JasminePic
+ add_pic ChuckPic
+ add_pic ClairPic
+ add_pic Rival1Pic
+ add_pic PokemonProfPic
+ add_pic WillPic
+ add_pic CalPic
+ add_pic BrunoPic
+ add_pic KarenPic
+ add_pic KogaPic
+ add_pic ChampionPic
+ add_pic BrockPic
+ add_pic MistyPic
+ add_pic LtSurgePic
+ add_pic ScientistPic
+ add_pic ErikaPic
+ add_pic YoungsterPic
+ add_pic SchoolboyPic
+ add_pic BirdKeeperPic
+ add_pic LassPic
+ add_pic JaninePic
+ add_pic CooltrainermPic
+ add_pic CooltrainerfPic
+ add_pic BeautyPic
+ add_pic PokemaniacPic
+ add_pic GruntmPic
+ add_pic GentlemanPic
+ add_pic SkierPic
+ add_pic TeacherPic
+ add_pic SabrinaPic
+ add_pic BugCatcherPic
+ add_pic FisherPic
+ add_pic SwimmermPic
+ add_pic SwimmerfPic
+ add_pic SailorPic
+ add_pic SuperNerdPic
+ add_pic Rival2Pic
+ add_pic GuitaristPic
+ add_pic HikerPic
+ add_pic BikerPic
+ add_pic BlainePic
+ add_pic BurglarPic
+ add_pic FirebreatherPic
+ add_pic JugglerPic
+ add_pic BlackbeltTPic
+ add_pic ExecutivemPic
+ add_pic PsychicTPic
+ add_pic PicnickerPic
+ add_pic CamperPic
+ add_pic ExecutivefPic
+ add_pic SagePic
+ add_pic MediumPic
+ add_pic BoarderPic
+ add_pic PokefanmPic
+ add_pic KimonoGirlPic
+ add_pic TwinsPic
+ add_pic PokefanfPic
+ add_pic RedPic
+ add_pic BluePic
+ add_pic OfficerPic
+ add_pic GruntfPic
+ add_pic MysticalmanPic
--- a/gfx/trainers/palette_pointers.asm
+++ /dev/null
@@ -1,82 +1,0 @@
-
-TrainerPalettes: ; b0ce
-
-PlayerPalette: ; b0ce
-; The player's palette
-; RGB 25, 18, 12
-; RGB 22, 09, 05
- 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"
-; b1de
--- a/main.asm
+++ b/main.asm
@@ -5062,13 +5062,9 @@
AlreadyBeatenTrainerScript:
scripttalkafter
-SECTION "bank30", ROMX
-INCLUDE "gfx/overworld/sprites_1.asm"
+INCLUDE "gfx/sprites.asm"
-SECTION "bank31", ROMX
-
-INCLUDE "gfx/overworld/sprites_2.asm"
SECTION "bank32", ROMX
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -632,7 +632,7 @@
BoltEmote: INCBIN "gfx/emotes/bolt.2bpp"
SleepEmote: INCBIN "gfx/emotes/sleep.2bpp"
FishEmote: INCBIN "gfx/emotes/fish.2bpp"
-JumpShadowGFX: INCBIN "gfx/ow_fx/shadow.2bpp"
-FishingRodGFX: INCBIN "gfx/ow_fx/fishing_rod.2bpp"
-BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp"
-GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp"
+JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp"
+FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp"
+BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp"
+GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp"
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -129,9 +129,9 @@
ROMX $2f
"bank2F"
ROMX $30
- "bank30"
+ "Sprites 1"
ROMX $31
- "bank31"
+ "Sprites 2"
ROMX $32
"bank32"
ROMX $33