Merge branch 'master' of github.com:pret/pokecrystal

author: surskitty <surskitty@gmail.com> 2017-12-12 00:50:55 -0500
committer: surskitty <surskitty@gmail.com> 2017-12-12 00:50:55 -0500
commit: 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree: 0c0bedcd311ab83262e31cf6d9d4c37257143acc /gfx
parent: 98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parent: f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
224 files changed, 392 insertions, 613 deletions
diff --git a/gfx/font.asm b/gfx/font.asm
index 8d7186e4c..f2efefd37 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -59,7 +59,7 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp"
 ; f8f34
 
 GFX_f8f34: ; unused bold letters + unown chars
-INCBIN "gfx/unknown/0f8f34.1bpp"
+INCBIN "gfx/unknown/bold_font.1bpp"
 ; f9204
 
 TextBoxSpaceGFX: ; f9204
@@ -165,13 +165,13 @@ _LoadFontsBattleExtra:: ; fb4be
 LoadFrame: ; fb4cc
 	ld a, [TextBoxFrame]
 	and 7
-	ld bc, TILES_PER_FRAME * LEN_1BPP_TILE
+	ld bc, LEN_1BPP_TILE * 6
 	ld hl, Frames
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld hl, VTiles2 tile "┌" ; $79
-	lb bc, BANK(Frames), TILES_PER_FRAME
+	lb bc, BANK(Frames), 6
 	call Get1bpp_2
 	ld hl, VTiles2 tile " " ; $7f
 	ld de, TextBoxSpaceGFX
diff --git a/gfx/icon_pointers.asm b/gfx/icon_pointers.asm
new file mode 100644
index 000000000..bfe07abb6
--- /dev/null
+++ b/gfx/icon_pointers.asm
@@ -0,0 +1,41 @@
+IconPointers:
+; entries correspond to ICON_* constants
+	dw NullIcon
+	dw PoliwagIcon
+	dw JigglypuffIcon
+	dw DiglettIcon
+	dw PikachuIcon
+	dw StaryuIcon
+	dw FishIcon
+	dw BirdIcon
+	dw MonsterIcon
+	dw ClefairyIcon
+	dw OddishIcon
+	dw BugIcon
+	dw GhostIcon
+	dw LaprasIcon
+	dw HumanshapeIcon
+	dw FoxIcon
+	dw EquineIcon
+	dw ShellIcon
+	dw BlobIcon
+	dw SerpentIcon
+	dw VoltorbIcon
+	dw SquirtleIcon
+	dw BulbasaurIcon
+	dw CharmanderIcon
+	dw CaterpillarIcon
+	dw UnownIcon
+	dw GeodudeIcon
+	dw FighterIcon
+	dw EggIcon
+	dw JellyfishIcon
+	dw MothIcon
+	dw BatIcon
+	dw SnorlaxIcon
+	dw HoOhIcon
+	dw LugiaIcon
+	dw GyaradosIcon
+	dw SlowpokeIcon
+	dw SudowoodoIcon
+	dw BigmonIcon
diff --git a/gfx/icons.asm b/gfx/icons.asm
new file mode 100644
index 000000000..8d44c1fef
--- /dev/null
+++ b/gfx/icons.asm
@@ -0,0 +1,39 @@
+NullIcon:
+PoliwagIcon:      INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d
+JigglypuffIcon:   INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d
+DiglettIcon:      INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d
+PikachuIcon:      INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d
+StaryuIcon:       INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d
+FishIcon:         INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d
+BirdIcon:         INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d
+MonsterIcon:      INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d
+ClefairyIcon:     INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d
+OddishIcon:       INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d
+BugIcon:          INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d
+GhostIcon:        INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d
+LaprasIcon:       INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d
+HumanshapeIcon:   INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d
+FoxIcon:          INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d
+EquineIcon:       INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d
+ShellIcon:        INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d
+BlobIcon:         INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d
+SerpentIcon:      INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d
+VoltorbIcon:      INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d
+SquirtleIcon:     INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d
+BulbasaurIcon:    INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d
+CharmanderIcon:   INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d
+CaterpillarIcon:  INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d
+UnownIcon:        INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d
+GeodudeIcon:      INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d
+FighterIcon:      INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d
+EggIcon:          INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d
+JellyfishIcon:    INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d
+MothIcon:         INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d
+BatIcon:          INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d
+SnorlaxIcon:      INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d
+HoOhIcon:         INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d
+LugiaIcon:        INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d
+GyaradosIcon:     INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d
+SlowpokeIcon:     INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d
+SudowoodoIcon:    INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d
+BigmonIcon:       INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d
diff --git a/gfx/misc/mobile_adapter.png b/gfx/mobile/mobile_adapter.png
index fa5965e92..fa5965e92 100644
--- a/gfx/misc/mobile_adapter.png
+++ b/gfx/mobile/mobile_adapter.png
diff --git a/gfx/misc/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png
index 0fd458dec..0fd458dec 100644
--- a/gfx/misc/mystery_gift.png
+++ b/gfx/mystery_gift/mystery_gift.png
diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/mystery_gift/mystery_gift_jp.png
index 692cf8732..692cf8732 100644
--- a/gfx/misc/mystery_gift_jp.png
+++ b/gfx/mystery_gift/mystery_gift_jp.png
diff --git a/gfx/ow_fx/boulder_dust.png b/gfx/overworld/boulder_dust.png
index 9acb11c1b..9acb11c1b 100644
--- a/gfx/ow_fx/boulder_dust.png
+++ b/gfx/overworld/boulder_dust.png
diff --git a/gfx/ow_fx/chris_fish.png b/gfx/overworld/chris_fish.png
index ea0730151..ea0730151 100644
--- a/gfx/ow_fx/chris_fish.png
+++ b/gfx/overworld/chris_fish.png
diff --git a/gfx/ow_fx/cut_grass.png b/gfx/overworld/cut_grass.png
index b10e0cf8c..b10e0cf8c 100644
--- a/gfx/ow_fx/cut_grass.png
+++ b/gfx/overworld/cut_grass.png
diff --git a/gfx/ow_fx/cut_tree.png b/gfx/overworld/cut_tree.png
index c1f1bc97d..c1f1bc97d 100644
--- a/gfx/ow_fx/cut_tree.png
+++ b/gfx/overworld/cut_tree.png
diff --git a/gfx/ow_fx/fishing_rod.png b/gfx/overworld/fishing_rod.png
index 32d277269..32d277269 100644
--- a/gfx/ow_fx/fishing_rod.png
+++ b/gfx/overworld/fishing_rod.png
diff --git a/gfx/ow_fx/grass_rustle.png b/gfx/overworld/grass_rustle.png
index 0b2d73e2c..0b2d73e2c 100644
--- a/gfx/ow_fx/grass_rustle.png
+++ b/gfx/overworld/grass_rustle.png
diff --git a/gfx/ow_fx/headbutt_tree.png b/gfx/overworld/headbutt_tree.png
index 4cbb595f7..4cbb595f7 100644
--- a/gfx/ow_fx/headbutt_tree.png
+++ b/gfx/overworld/headbutt_tree.png
diff --git a/gfx/ow_fx/heal_machine.png b/gfx/overworld/heal_machine.png
index dbf513487..dbf513487 100644
--- a/gfx/ow_fx/heal_machine.png
+++ b/gfx/overworld/heal_machine.png
diff --git a/gfx/ow_fx/kris_fish.png b/gfx/overworld/kris_fish.png
index a47b89042..a47b89042 100644
--- a/gfx/ow_fx/kris_fish.png
+++ b/gfx/overworld/kris_fish.png
diff --git a/gfx/ow_fx/shadow.png b/gfx/overworld/shadow.png
index ba3dab5be..ba3dab5be 100644
--- a/gfx/ow_fx/shadow.png
+++ b/gfx/overworld/shadow.png
diff --git a/gfx/overworld/sprite_headers.asm b/gfx/overworld/sprite_headers.asm
deleted file mode 100644
index 095d7594b..000000000
--- a/gfx/overworld/sprite_headers.asm
+++ /dev/null
@@ -1,419 +0,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
diff --git a/gfx/overworld/sprites_1.asm b/gfx/overworld/sprites_1.asm
deleted file mode 100644
index 640ac6ccc..000000000
--- a/gfx/overworld/sprites_1.asm
+++ /dev/null
@@ -1,44 +0,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
diff --git a/gfx/overworld/sprites_2.asm b/gfx/overworld/sprites_2.asm
deleted file mode 100644
index 20060d0c1..000000000
--- a/gfx/overworld/sprites_2.asm
+++ /dev/null
@@ -1,58 +0,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
diff --git a/gfx/ow_fx/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png
index a4655d26e..a4655d26e 100644
--- a/gfx/ow_fx/trainer_battle_pokeball_tiles.png
+++ b/gfx/overworld/trainer_battle_pokeball_tiles.png
diff --git a/gfx/pics.asm b/gfx/pics.asm
index c48106e3c..026be8142 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,18 +1,22 @@
 INCLUDE "includes.asm"
 
 
-; Unown pic pointers are assumed to start at the same address in a different bank.
+; PicPointers and UnownPicPointers are assumed to start at the same address,
+; but in different banks. This is enforced in pokecrystal.link.
 
 SECTION "Pic Pointers", ROMX
-PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm"
+
+INCLUDE "gfx/pics/pic_pointers.asm"
+
 
 SECTION "Unown Pic Pointers", ROMX
-UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"
+
+INCLUDE "gfx/pics/unown_pic_pointers.asm"
 
 
 SECTION "Trainer Pic Pointers", ROMX
-TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
+INCLUDE "gfx/trainer_pic_pointers.asm"
 
 
 SECTION "Pics 1", ROMX
diff --git a/gfx/pics/pic_pointers.asm b/gfx/pics/pic_pointers.asm
index d8f6a157f..2a6a2699a 100644
--- a/gfx/pics/pic_pointers.asm
+++ b/gfx/pics/pic_pointers.asm
@@ -1,4 +1,5 @@
-
+PicPointers::
+; entries correspond to constants/pokemon_constants.asm, two apiece
 	add_pic BulbasaurFrontpic
 	add_pic BulbasaurBackpic
 	add_pic IvysaurFrontpic
diff --git a/gfx/pics/unown_pic_pointers.asm b/gfx/pics/unown_pic_pointers.asm
index a74b818ef..c5072c903 100644
--- a/gfx/pics/unown_pic_pointers.asm
+++ b/gfx/pics/unown_pic_pointers.asm
@@ -1,4 +1,5 @@
-
+UnownPicPointers::
+; entries correspond to Unown letters, two apiece
 	add_pic UnownAFrontpic
 	add_pic UnownABackpic
 	add_pic UnownBFrontpic
diff --git a/gfx/misc/gbc_only.2bpp.lz.4a5bba0e b/gfx/sgb/gbc_only.2bpp.lz.4a5bba0e
index 9533fbe6d..9533fbe6d 100644
--- a/gfx/misc/gbc_only.2bpp.lz.4a5bba0e
+++ b/gfx/sgb/gbc_only.2bpp.lz.4a5bba0e
diff --git a/gfx/misc/gbc_only.png b/gfx/sgb/gbc_only.png
index 72bcf0131..72bcf0131 100644
--- a/gfx/misc/gbc_only.png
+++ b/gfx/sgb/gbc_only.png
diff --git a/gfx/misc/sgb_border.png b/gfx/sgb/sgb_border.png
index 867c36b10..867c36b10 100644
--- a/gfx/misc/sgb_border.png
+++ b/gfx/sgb/sgb_border.png
diff --git a/gfx/sprite_headers.asm b/gfx/sprite_headers.asm
new file mode 100644
index 000000000..d41d62075
--- /dev/null
+++ b/gfx/sprite_headers.asm
@@ -0,0 +1,111 @@
+sprite_header: MACRO
+; pointer, length, type, palette
+	dw \1
+	db \2 * 4 tiles, BANK(\1)
+	db \3, \4
+ENDM
+
+SpriteHeaders: ; 14736
+; entries correspond to SPRITE_* constants
+	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
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
new file mode 100644
index 000000000..f7740d6a6
--- /dev/null
+++ b/gfx/sprites.asm
@@ -0,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
diff --git a/gfx/overworld/070.png b/gfx/sprites/big_lapras.png
index 45f27649e..45f27649e 100644
--- a/gfx/overworld/070.png
+++ b/gfx/sprites/big_lapras.png
diff --git a/gfx/overworld/079.png b/gfx/sprites/big_onix.png
index 7996be17e..7996be17e 100644
--- a/gfx/overworld/079.png
+++ b/gfx/sprites/big_onix.png
diff --git a/gfx/overworld/050.png b/gfx/sprites/big_snorlax.png
index f53f71105..f53f71105 100644
--- a/gfx/overworld/050.png
+++ b/gfx/sprites/big_snorlax.png
diff --git a/gfx/overworld/073.png b/gfx/sprites/biker.png
index 5d056cf42..5d056cf42 100644
--- a/gfx/overworld/073.png
+++ b/gfx/sprites/biker.png
diff --git a/gfx/overworld/007.png b/gfx/sprites/bill.png
index d72bb7ba1..d72bb7ba1 100644
--- a/gfx/overworld/007.png
+++ b/gfx/sprites/bill.png
diff --git a/gfx/overworld/077.png b/gfx/sprites/bird.png
index 9e2009940..9e2009940 100644
--- a/gfx/overworld/077.png
+++ b/gfx/sprites/bird.png
diff --git a/gfx/overworld/064.png b/gfx/sprites/black_belt.png
index 9aec228c5..9aec228c5 100644
--- a/gfx/overworld/064.png
+++ b/gfx/sprites/black_belt.png
diff --git a/gfx/overworld/012.png b/gfx/sprites/blaine.png
index 6ce1f3092..6ce1f3092 100644
--- a/gfx/overworld/012.png
+++ b/gfx/sprites/blaine.png
diff --git a/gfx/overworld/006.png b/gfx/sprites/blue.png
index 17fc2fdc6..17fc2fdc6 100644
--- a/gfx/overworld/006.png
+++ b/gfx/sprites/blue.png
diff --git a/gfx/overworld/089.png b/gfx/sprites/boulder.png
index 9b408e021..9b408e021 100644
--- a/gfx/overworld/089.png
+++ b/gfx/sprites/boulder.png
diff --git a/gfx/overworld/025.png b/gfx/sprites/brock.png
index f9f8ec431..f9f8ec431 100644
--- a/gfx/overworld/025.png
+++ b/gfx/sprites/brock.png
diff --git a/gfx/overworld/027.png b/gfx/sprites/bruno.png
index 5f77217ef..5f77217ef 100644
--- a/gfx/overworld/027.png
+++ b/gfx/sprites/bruno.png
diff --git a/gfx/overworld/041.png b/gfx/sprites/buena.png
index af5a7e7e7..af5a7e7e7 100644
--- a/gfx/overworld/041.png
+++ b/gfx/sprites/buena.png
diff --git a/gfx/overworld/036.png b/gfx/sprites/bug_catcher.png
index e1306b6a0..e1306b6a0 100644
--- a/gfx/overworld/036.png
+++ b/gfx/sprites/bug_catcher.png
diff --git a/gfx/overworld/019.png b/gfx/sprites/bugsy.png
index b528045b5..b528045b5 100644
--- a/gfx/overworld/019.png
+++ b/gfx/sprites/bugsy.png
diff --git a/gfx/overworld/067.png b/gfx/sprites/cal.png
index 9dfe77ff4..9dfe77ff4 100644
--- a/gfx/overworld/067.png
+++ b/gfx/sprites/cal.png
diff --git a/gfx/overworld/069.png b/gfx/sprites/captain.png
index 7408cbbbc..7408cbbbc 100644
--- a/gfx/overworld/069.png
+++ b/gfx/sprites/captain.png
diff --git a/gfx/overworld/000.png b/gfx/sprites/chris.png
index 1050bb02c..1050bb02c 100644
--- a/gfx/overworld/000.png
+++ b/gfx/sprites/chris.png
diff --git a/gfx/overworld/001.png b/gfx/sprites/chris_bike.png
index 0d18d11a6..0d18d11a6 100644
--- a/gfx/overworld/001.png
+++ b/gfx/sprites/chris_bike.png
diff --git a/gfx/overworld/021.png b/gfx/sprites/chuck.png
index 54300be2d..54300be2d 100644
--- a/gfx/overworld/021.png
+++ b/gfx/sprites/chuck.png
diff --git a/gfx/overworld/024.png b/gfx/sprites/clair.png
index c4e721b75..c4e721b75 100644
--- a/gfx/overworld/024.png
+++ b/gfx/sprites/clair.png
diff --git a/gfx/overworld/056.png b/gfx/sprites/clerk.png
index 77a5fb914..77a5fb914 100644
--- a/gfx/overworld/056.png
+++ b/gfx/sprites/clerk.png
diff --git a/gfx/overworld/035.png b/gfx/sprites/cooltrainer_f.png
index 53bf81b13..53bf81b13 100644
--- a/gfx/overworld/035.png
+++ b/gfx/sprites/cooltrainer_f.png
diff --git a/gfx/overworld/034.png b/gfx/sprites/cooltrainer_m.png
index ffd94f410..ffd94f410 100644
--- a/gfx/overworld/034.png
+++ b/gfx/sprites/cooltrainer_m.png
diff --git a/gfx/overworld/014.png b/gfx/sprites/daisy.png
index 84f330f1d..84f330f1d 100644
--- a/gfx/overworld/014.png
+++ b/gfx/sprites/daisy.png
diff --git a/gfx/overworld/078.png b/gfx/sprites/dragon.png
index 3b6c621b8..3b6c621b8 100644
--- a/gfx/overworld/078.png
+++ b/gfx/sprites/dragon.png
diff --git a/gfx/overworld/008.png b/gfx/sprites/elder.png
index 90b499f16..90b499f16 100644
--- a/gfx/overworld/008.png
+++ b/gfx/sprites/elder.png
diff --git a/gfx/overworld/015.png b/gfx/sprites/elm.png
index ed1439b69..ed1439b69 100644
--- a/gfx/overworld/015.png
+++ b/gfx/sprites/elm.png
diff --git a/gfx/overworld/099.png b/gfx/sprites/entei.png
index 1ff4fd63c..1ff4fd63c 100644
--- a/gfx/overworld/099.png
+++ b/gfx/sprites/entei.png
diff --git a/gfx/overworld/031.png b/gfx/sprites/erika.png
index 22c157d82..22c157d82 100644
--- a/gfx/overworld/031.png
+++ b/gfx/sprites/erika.png
diff --git a/gfx/overworld/076.png b/gfx/sprites/fairy.png
index 06fe00768..06fe00768 100644
--- a/gfx/overworld/076.png
+++ b/gfx/sprites/fairy.png
diff --git a/gfx/overworld/017.png b/gfx/sprites/falkner.png
index a9bc75dbd..a9bc75dbd 100644
--- a/gfx/overworld/017.png
+++ b/gfx/sprites/falkner.png
diff --git a/gfx/overworld/091.png b/gfx/sprites/famicom.png
index 15ff22d0a..15ff22d0a 100644
--- a/gfx/overworld/091.png
+++ b/gfx/sprites/famicom.png
diff --git a/gfx/overworld/057.png b/gfx/sprites/fisher.png
index a84a2e371..a84a2e371 100644
--- a/gfx/overworld/057.png
+++ b/gfx/sprites/fisher.png
diff --git a/gfx/overworld/058.png b/gfx/sprites/fishing_guru.png
index 748444f8e..748444f8e 100644
--- a/gfx/overworld/058.png
+++ b/gfx/sprites/fishing_guru.png
diff --git a/gfx/overworld/092.png b/gfx/sprites/fruit_tree.png
index b27633907..b27633907 100644
--- a/gfx/overworld/092.png
+++ b/gfx/sprites/fruit_tree.png
diff --git a/gfx/overworld/002.png b/gfx/sprites/gameboy_kid.png
index 0ca4acef9..0ca4acef9 100644
--- a/gfx/overworld/002.png
+++ b/gfx/sprites/gameboy_kid.png
diff --git a/gfx/overworld/063.png b/gfx/sprites/gentleman.png
index 38a6125d2..38a6125d2 100644
--- a/gfx/overworld/063.png
+++ b/gfx/sprites/gentleman.png
diff --git a/gfx/overworld/093.png b/gfx/sprites/gold_trophy.png
index cc12f9f34..cc12f9f34 100644
--- a/gfx/overworld/093.png
+++ b/gfx/sprites/gold_trophy.png
diff --git a/gfx/overworld/046.png b/gfx/sprites/gramps.png
index abe61a31d..abe61a31d 100644
--- a/gfx/overworld/046.png
+++ b/gfx/sprites/gramps.png
diff --git a/gfx/overworld/047.png b/gfx/sprites/granny.png
index 763b2a2b1..763b2a2b1 100644
--- a/gfx/overworld/047.png
+++ b/gfx/sprites/granny.png
diff --git a/gfx/overworld/071.png b/gfx/sprites/gym_guy.png
index a1f74da03..a1f74da03 100644
--- a/gfx/overworld/071.png
+++ b/gfx/sprites/gym_guy.png
diff --git a/gfx/overworld/009.png b/gfx/sprites/janine.png
index b49f8e573..b49f8e573 100644
--- a/gfx/overworld/009.png
+++ b/gfx/sprites/janine.png
diff --git a/gfx/overworld/022.png b/gfx/sprites/jasmine.png
index 0d8be19ec..0d8be19ec 100644
--- a/gfx/overworld/022.png
+++ b/gfx/sprites/jasmine.png
diff --git a/gfx/overworld/026.png b/gfx/sprites/karen.png
index 8b95fb3fc..8b95fb3fc 100644
--- a/gfx/overworld/026.png
+++ b/gfx/sprites/karen.png
diff --git a/gfx/overworld/060.png b/gfx/sprites/kimono_girl.png
index 0ea041f5b..0ea041f5b 100644
--- a/gfx/overworld/060.png
+++ b/gfx/sprites/kimono_girl.png
diff --git a/gfx/overworld/032.png b/gfx/sprites/koga.png
index 8afd066bd..8afd066bd 100644
--- a/gfx/overworld/032.png
+++ b/gfx/sprites/koga.png
diff --git a/gfx/overworld/095.png b/gfx/sprites/kris.png
index d4339470e..d4339470e 100644
--- a/gfx/overworld/095.png
+++ b/gfx/sprites/kris.png
diff --git a/gfx/overworld/096.png b/gfx/sprites/kris_bike.png
index 161ce5722..161ce5722 100644
--- a/gfx/overworld/096.png
+++ b/gfx/sprites/kris_bike.png
diff --git a/gfx/overworld/010.png b/gfx/sprites/kurt.png
index bd7fc20ea..bd7fc20ea 100644
--- a/gfx/overworld/010.png
+++ b/gfx/sprites/kurt.png
diff --git a/gfx/overworld/097.png b/gfx/sprites/kurt_outside.png
index 69e46b84c..69e46b84c 100644
--- a/gfx/overworld/097.png
+++ b/gfx/sprites/kurt_outside.png
diff --git a/gfx/overworld/029.png b/gfx/sprites/lance.png
index 5a2372dfa..5a2372dfa 100644
--- a/gfx/overworld/029.png
+++ b/gfx/sprites/lance.png
diff --git a/gfx/overworld/039.png b/gfx/sprites/lass.png
index 762108ad5..762108ad5 100644
--- a/gfx/overworld/039.png
+++ b/gfx/sprites/lass.png
diff --git a/gfx/overworld/055.png b/gfx/sprites/link_receptionist.png
index b6c98bbef..b6c98bbef 100644
--- a/gfx/overworld/055.png
+++ b/gfx/sprites/link_receptionist.png
diff --git a/gfx/overworld/028.png b/gfx/sprites/misty.png
index 8b9857a85..8b9857a85 100644
--- a/gfx/overworld/028.png
+++ b/gfx/sprites/misty.png
diff --git a/gfx/overworld/011.png b/gfx/sprites/mom.png
index 36010c92d..36010c92d 100644
--- a/gfx/overworld/011.png
+++ b/gfx/sprites/mom.png
diff --git a/gfx/overworld/075.png b/gfx/sprites/monster.png
index 80d615b2e..80d615b2e 100644
--- a/gfx/overworld/075.png
+++ b/gfx/sprites/monster.png
diff --git a/gfx/overworld/020.png b/gfx/sprites/morty.png
index dcee550e0..dcee550e0 100644
--- a/gfx/overworld/020.png
+++ b/gfx/sprites/morty.png
diff --git a/gfx/overworld/080.png b/gfx/sprites/n64.png
index 6d2bdc8d7..6d2bdc8d7 100644
--- a/gfx/overworld/080.png
+++ b/gfx/sprites/n64.png
diff --git a/gfx/overworld/054.png b/gfx/sprites/nurse.png
index 4cd71fcfc..4cd71fcfc 100644
--- a/gfx/overworld/054.png
+++ b/gfx/sprites/nurse.png
diff --git a/gfx/overworld/004.png b/gfx/sprites/oak.png
index 7a76574d0..7a76574d0 100644
--- a/gfx/overworld/004.png
+++ b/gfx/sprites/oak.png
diff --git a/gfx/overworld/066.png b/gfx/sprites/officer.png
index f62252038..f62252038 100644
--- a/gfx/overworld/066.png
+++ b/gfx/sprites/officer.png
diff --git a/gfx/overworld/087.png b/gfx/sprites/old_link_receptionist.png
index fad0eedd8..fad0eedd8 100644
--- a/gfx/overworld/087.png
+++ b/gfx/sprites/old_link_receptionist.png
diff --git a/gfx/overworld/085.png b/gfx/sprites/paper.png
index da171b3b2..da171b3b2 100644
--- a/gfx/overworld/085.png
+++ b/gfx/sprites/paper.png
diff --git a/gfx/overworld/074.png b/gfx/sprites/pharmacist.png
index ed0fa1d28..ed0fa1d28 100644
--- a/gfx/overworld/074.png
+++ b/gfx/sprites/pharmacist.png
diff --git a/gfx/overworld/083.png b/gfx/sprites/poke_ball.png
index b12bf897c..b12bf897c 100644
--- a/gfx/overworld/083.png
+++ b/gfx/sprites/poke_ball.png
diff --git a/gfx/overworld/084.png b/gfx/sprites/pokedex.png
index 63846bfad..63846bfad 100644
--- a/gfx/overworld/084.png
+++ b/gfx/sprites/pokedex.png
diff --git a/gfx/overworld/045.png b/gfx/sprites/pokefan_f.png
index aa1fbc06f..aa1fbc06f 100644
--- a/gfx/overworld/045.png
+++ b/gfx/sprites/pokefan_f.png
diff --git a/gfx/overworld/044.png b/gfx/sprites/pokefan_m.png
index fea7979d3..fea7979d3 100644
--- a/gfx/overworld/044.png
+++ b/gfx/sprites/pokefan_m.png
diff --git a/gfx/overworld/023.png b/gfx/sprites/pryce.png
index 69f152a3c..69f152a3c 100644
--- a/gfx/overworld/023.png
+++ b/gfx/sprites/pryce.png
diff --git a/gfx/overworld/100.png b/gfx/sprites/raikou.png
index 4a5f1f186..4a5f1f186 100644
--- a/gfx/overworld/100.png
+++ b/gfx/sprites/raikou.png
diff --git a/gfx/overworld/065.png b/gfx/sprites/receptionist.png
index 0d102b04a..0d102b04a 100644
--- a/gfx/overworld/065.png
+++ b/gfx/sprites/receptionist.png
diff --git a/gfx/overworld/005.png b/gfx/sprites/red.png
index 018b676f5..018b676f5 100644
--- a/gfx/overworld/005.png
+++ b/gfx/sprites/red.png
diff --git a/gfx/overworld/013.png b/gfx/sprites/reds_mom.png
index 5644764c0..5644764c0 100644
--- a/gfx/overworld/013.png
+++ b/gfx/sprites/reds_mom.png
diff --git a/gfx/overworld/088.png b/gfx/sprites/rock.png
index 5a614d7bb..5a614d7bb 100644
--- a/gfx/overworld/088.png
+++ b/gfx/sprites/rock.png
diff --git a/gfx/overworld/043.png b/gfx/sprites/rocker.png
index 50ac2089e..50ac2089e 100644
--- a/gfx/overworld/043.png
+++ b/gfx/sprites/rocker.png
diff --git a/gfx/overworld/052.png b/gfx/sprites/rocket.png
index 43a71bd6e..43a71bd6e 100644
--- a/gfx/overworld/052.png
+++ b/gfx/sprites/rocket.png
diff --git a/gfx/overworld/053.png b/gfx/sprites/rocket_girl.png
index b8714ba6f..b8714ba6f 100644
--- a/gfx/overworld/053.png
+++ b/gfx/sprites/rocket_girl.png
diff --git a/gfx/overworld/033.png b/gfx/sprites/sabrina.png
index ef29e27d5..ef29e27d5 100644
--- a/gfx/overworld/033.png
+++ b/gfx/sprites/sabrina.png
diff --git a/gfx/overworld/061.png b/gfx/sprites/sage.png
index 802230467..802230467 100644
--- a/gfx/overworld/061.png
+++ b/gfx/sprites/sage.png
diff --git a/gfx/overworld/072.png b/gfx/sprites/sailor.png
index b4d3b5f2a..b4d3b5f2a 100644
--- a/gfx/overworld/072.png
+++ b/gfx/sprites/sailor.png
diff --git a/gfx/overworld/059.png b/gfx/sprites/scientist.png
index 39c44291e..39c44291e 100644
--- a/gfx/overworld/059.png
+++ b/gfx/sprites/scientist.png
diff --git a/gfx/overworld/003.png b/gfx/sprites/silver.png
index 7d82d400c..7d82d400c 100644
--- a/gfx/overworld/003.png
+++ b/gfx/sprites/silver.png
diff --git a/gfx/overworld/094.png b/gfx/sprites/silver_trophy.png
index 458cda431..458cda431 100644
--- a/gfx/overworld/094.png
+++ b/gfx/sprites/silver_trophy.png
diff --git a/gfx/overworld/068.png b/gfx/sprites/slowpoke.png
index d651ad3e6..d651ad3e6 100644
--- a/gfx/overworld/068.png
+++ b/gfx/sprites/slowpoke.png
diff --git a/gfx/overworld/090.png b/gfx/sprites/snes.png
index 4eaae4591..4eaae4591 100644
--- a/gfx/overworld/090.png
+++ b/gfx/sprites/snes.png
diff --git a/gfx/overworld/101.png b/gfx/sprites/standing_youngster.png
index 61a8b79c6..61a8b79c6 100644
--- a/gfx/overworld/101.png
+++ b/gfx/sprites/standing_youngster.png
diff --git a/gfx/overworld/081.png b/gfx/sprites/sudowoodo.png
index 9354f928b..9354f928b 100644
--- a/gfx/overworld/081.png
+++ b/gfx/sprites/sudowoodo.png
diff --git a/gfx/overworld/098.png b/gfx/sprites/suicune.png
index c3aef5c6c..c3aef5c6c 100644
--- a/gfx/overworld/098.png
+++ b/gfx/sprites/suicune.png
diff --git a/gfx/overworld/042.png b/gfx/sprites/super_nerd.png
index 6866c7b30..6866c7b30 100644
--- a/gfx/overworld/042.png
+++ b/gfx/sprites/super_nerd.png
diff --git a/gfx/overworld/082.png b/gfx/sprites/surf.png
index d124616b0..d124616b0 100644
--- a/gfx/overworld/082.png
+++ b/gfx/sprites/surf.png
diff --git a/gfx/overworld/051.png b/gfx/sprites/surfing_pikachu.png
index e6a3d7d03..e6a3d7d03 100644
--- a/gfx/overworld/051.png
+++ b/gfx/sprites/surfing_pikachu.png
diff --git a/gfx/overworld/030.png b/gfx/sprites/surge.png
index ae165c7ab..ae165c7ab 100644
--- a/gfx/overworld/030.png
+++ b/gfx/sprites/surge.png
diff --git a/gfx/overworld/049.png b/gfx/sprites/swimmer_girl.png
index eed753ab2..eed753ab2 100644
--- a/gfx/overworld/049.png
+++ b/gfx/sprites/swimmer_girl.png
diff --git a/gfx/overworld/048.png b/gfx/sprites/swimmer_guy.png
index 4c1818b2b..4c1818b2b 100644
--- a/gfx/overworld/048.png
+++ b/gfx/sprites/swimmer_guy.png
diff --git a/gfx/overworld/040.png b/gfx/sprites/teacher.png
index 2107159e9..2107159e9 100644
--- a/gfx/overworld/040.png
+++ b/gfx/sprites/teacher.png
diff --git a/gfx/overworld/037.png b/gfx/sprites/twin.png
index caa9f43af..caa9f43af 100644
--- a/gfx/overworld/037.png
+++ b/gfx/sprites/twin.png
diff --git a/gfx/overworld/062.png b/gfx/sprites/unused_guy.png
index d979b9a6e..d979b9a6e 100644
--- a/gfx/overworld/062.png
+++ b/gfx/sprites/unused_guy.png
diff --git a/gfx/overworld/086.png b/gfx/sprites/virtual_boy.png
index dba7dc130..dba7dc130 100644
--- a/gfx/overworld/086.png
+++ b/gfx/sprites/virtual_boy.png
diff --git a/gfx/overworld/018.png b/gfx/sprites/whitney.png
index ff8b28b98..ff8b28b98 100644
--- a/gfx/overworld/018.png
+++ b/gfx/sprites/whitney.png
diff --git a/gfx/overworld/016.png b/gfx/sprites/will.png
index 5229bb404..5229bb404 100644
--- a/gfx/overworld/016.png
+++ b/gfx/sprites/will.png
diff --git a/gfx/overworld/038.png b/gfx/sprites/youngster.png
index 5c0d33939..5c0d33939 100644
--- a/gfx/overworld/038.png
+++ b/gfx/sprites/youngster.png
diff --git a/gfx/tilesets/01.2bpp.lz.0c7e555a b/gfx/tilesets/01.2bpp.lz.0c7e555a
deleted file mode 100644
index 9821e1433..000000000
--- a/gfx/tilesets/01.2bpp.lz.0c7e555a
+++ /dev/null
diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
deleted file mode 100644
index 0fc2db12f..000000000
--- a/gfx/tilesets/01.png
+++ /dev/null
diff --git a/gfx/tilesets/26.2bpp.lz.8b42470b b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/26.2bpp.lz.8b42470b
+++ b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/26.png b/gfx/tilesets/aerodactyl_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/26.png
+++ b/gfx/tilesets/aerodactyl_word_room.png
diff --git a/gfx/tilesets/22.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
index fa5d0a9f0..fa5d0a9f0 100644
--- a/gfx/tilesets/22.2bpp.lz.467b6a2d
+++ b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
diff --git a/gfx/tilesets/22.png b/gfx/tilesets/battle_tower.png
index 1cd57402d..1cd57402d 100644
--- a/gfx/tilesets/22.png
+++ b/gfx/tilesets/battle_tower.png
diff --git a/gfx/tilesets/02.2bpp.lz.391603fb b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/02.2bpp.lz.391603fb
+++ b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/battle_tower_outside.png
index 126573b7b..126573b7b 100644
--- a/gfx/tilesets/02.png
+++ b/gfx/tilesets/battle_tower_outside.png
diff --git a/gfx/tilesets/32.2bpp.lz.8b42470b b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/32.2bpp.lz.8b42470b
+++ b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/32.png b/gfx/tilesets/beta_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/32.png
+++ b/gfx/tilesets/beta_word_room.png
diff --git a/gfx/tilesets/24.2bpp.lz.3437812a b/gfx/tilesets/cave.2bpp.lz.3437812a
index 69069fb75..69069fb75 100644
--- a/gfx/tilesets/24.2bpp.lz.3437812a
+++ b/gfx/tilesets/cave.2bpp.lz.3437812a
diff --git a/gfx/tilesets/24.png b/gfx/tilesets/cave.png
index 0e5bdee7e..0e5bdee7e 100644
--- a/gfx/tilesets/24.png
+++ b/gfx/tilesets/cave.png
diff --git a/gfx/tilesets/13.2bpp.lz.63b414d4 b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
index b68f147d0..b68f147d0 100644
--- a/gfx/tilesets/13.2bpp.lz.63b414d4
+++ b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/celadon_mansion.png
index 7dde8574e..7dde8574e 100644
--- a/gfx/tilesets/13.png
+++ b/gfx/tilesets/celadon_mansion.png
diff --git a/gfx/tilesets/14.2bpp.lz.71d29a2f b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f
index f7e185b4e..f7e185b4e 100644
--- a/gfx/tilesets/14.2bpp.lz.71d29a2f
+++ b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/game_corner.png
index 776900638..776900638 100644
--- a/gfx/tilesets/14.png
+++ b/gfx/tilesets/game_corner.png
diff --git a/gfx/tilesets/08.2bpp.lz.f5a55006 b/gfx/tilesets/gate.2bpp.lz.f5a55006
index 724b6b8b7..724b6b8b7 100644
--- a/gfx/tilesets/08.2bpp.lz.f5a55006
+++ b/gfx/tilesets/gate.2bpp.lz.f5a55006
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/gate.png
index b8f2db2d2..b8f2db2d2 100644
--- a/gfx/tilesets/08.png
+++ b/gfx/tilesets/gate.png
diff --git a/gfx/tilesets/15.2bpp.lz.c1f2ed8f b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
index 6b45c769d..6b45c769d 100644
--- a/gfx/tilesets/15.2bpp.lz.c1f2ed8f
+++ b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/gym_1.png
index 582b9365d..582b9365d 100644
--- a/gfx/tilesets/15.png
+++ b/gfx/tilesets/gym_1.png
diff --git a/gfx/tilesets/33.2bpp.lz.8b42470b b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/33.2bpp.lz.8b42470b
+++ b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/33.png b/gfx/tilesets/ho_oh_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/33.png
+++ b/gfx/tilesets/ho_oh_word_room.png
diff --git a/gfx/tilesets/05.2bpp.lz.c848ef13 b/gfx/tilesets/house_1.2bpp.lz.c848ef13
index f9afaf70d..f9afaf70d 100644
--- a/gfx/tilesets/05.2bpp.lz.c848ef13
+++ b/gfx/tilesets/house_1.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/house_1.png
index 3ab7b5ce8..3ab7b5ce8 100644
--- a/gfx/tilesets/05.png
+++ b/gfx/tilesets/house_1.png
diff --git a/gfx/tilesets/29.2bpp.lz.e23bc89f b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f
index 25cc45c85..25cc45c85 100644
--- a/gfx/tilesets/29.2bpp.lz.e23bc89f
+++ b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f
diff --git a/gfx/tilesets/29.png b/gfx/tilesets/ice_path.png
index d70eb53be..d70eb53be 100644
--- a/gfx/tilesets/29.png
+++ b/gfx/tilesets/ice_path.png
diff --git a/gfx/tilesets/31.2bpp.lz.6b0ac896 b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
index 7b5355705..7b5355705 100644
--- a/gfx/tilesets/31.2bpp.lz.6b0ac896
+++ b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/31.png b/gfx/tilesets/ilex_forest.png
index a85cc0394..a85cc0394 100644
--- a/gfx/tilesets/31.png
+++ b/gfx/tilesets/ilex_forest.png
diff --git a/gfx/tilesets/00.2bpp.lz.0c7e555a b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/00.2bpp.lz.0c7e555a
+++ b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/johto_1.png
index 0fc2db12f..0fc2db12f 100644
--- a/gfx/tilesets/00.png
+++ b/gfx/tilesets/johto_1.png
diff --git a/gfx/tilesets/04.2bpp.lz.391603fb b/gfx/tilesets/johto_2.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/04.2bpp.lz.391603fb
+++ b/gfx/tilesets/johto_2.2bpp.lz.391603fb
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/johto_2.png
index 126573b7b..126573b7b 100644
--- a/gfx/tilesets/04.png
+++ b/gfx/tilesets/johto_2.png
diff --git a/gfx/tilesets/34.2bpp.lz.8b42470b b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/34.2bpp.lz.8b42470b
+++ b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/34.png b/gfx/tilesets/kabuto_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/34.png
+++ b/gfx/tilesets/kabuto_word_room.png
diff --git a/gfx/tilesets/03.2bpp.lz.a29f5d51 b/gfx/tilesets/kanto.2bpp.lz.a29f5d51
index d925ee111..d925ee111 100644
--- a/gfx/tilesets/03.2bpp.lz.a29f5d51
+++ b/gfx/tilesets/kanto.2bpp.lz.a29f5d51
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/kanto.png
index 08b2cbeea..08b2cbeea 100644
--- a/gfx/tilesets/03.png
+++ b/gfx/tilesets/kanto.png
diff --git a/gfx/tilesets/16.2bpp.lz.dd51d079 b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079
index 28f025413..28f025413 100644
--- a/gfx/tilesets/16.2bpp.lz.dd51d079
+++ b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/kurts_house.png
index 3d6f1b511..3d6f1b511 100644
--- a/gfx/tilesets/16.png
+++ b/gfx/tilesets/kurts_house.png
diff --git a/gfx/tilesets/10.2bpp.lz.b8d0f547 b/gfx/tilesets/lab.2bpp.lz.b8d0f547
index cd0f43861..cd0f43861 100644
--- a/gfx/tilesets/10.2bpp.lz.b8d0f547
+++ b/gfx/tilesets/lab.2bpp.lz.b8d0f547
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/lab.png
index 418a068fa..418a068fa 100644
--- a/gfx/tilesets/10.png
+++ b/gfx/tilesets/lab.png
diff --git a/gfx/tilesets/19.2bpp.lz.0c1544c1 b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
index d208e65c3..d208e65c3 100644
--- a/gfx/tilesets/19.2bpp.lz.0c1544c1
+++ b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
diff --git a/gfx/tilesets/19.png b/gfx/tilesets/lighthouse.png
index 920ee30ec..920ee30ec 100644
--- a/gfx/tilesets/19.png
+++ b/gfx/tilesets/lighthouse.png
diff --git a/gfx/tilesets/12.2bpp.lz.e2e94f92 b/gfx/tilesets/mart.2bpp.lz.e2e94f92
index e8091a899..e8091a899 100644
--- a/gfx/tilesets/12.2bpp.lz.e2e94f92
+++ b/gfx/tilesets/mart.2bpp.lz.e2e94f92
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/mart.png
index 4053283bc..4053283bc 100644
--- a/gfx/tilesets/12.png
+++ b/gfx/tilesets/mart.png
diff --git a/gfx/tilesets/18.2bpp.lz.93800351 b/gfx/tilesets/olivine_gym.2bpp.lz.93800351
index e19994f37..e19994f37 100644
--- a/gfx/tilesets/18.2bpp.lz.93800351
+++ b/gfx/tilesets/olivine_gym.2bpp.lz.93800351
diff --git a/gfx/tilesets/18.png b/gfx/tilesets/olivine_gym.png
index 350c04932..350c04932 100644
--- a/gfx/tilesets/18.png
+++ b/gfx/tilesets/olivine_gym.png
diff --git a/gfx/tilesets/35.2bpp.lz.8b42470b b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/35.2bpp.lz.8b42470b
+++ b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/35.png b/gfx/tilesets/omanyte_word_room.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/35.png
+++ b/gfx/tilesets/omanyte_word_room.png
diff --git a/gfx/tilesets/25.2bpp.lz.7fcb81d6 b/gfx/tilesets/park.2bpp.lz.7fcb81d6
index 01a0e56bd..01a0e56bd 100644
--- a/gfx/tilesets/25.2bpp.lz.7fcb81d6
+++ b/gfx/tilesets/park.2bpp.lz.7fcb81d6
diff --git a/gfx/tilesets/25.png b/gfx/tilesets/park.png
index 7a4a5f8eb..7a4a5f8eb 100644
--- a/gfx/tilesets/25.png
+++ b/gfx/tilesets/park.png
diff --git a/gfx/tilesets/06.2bpp.lz.252cbd8f b/gfx/tilesets/players_house.2bpp.lz.252cbd8f
index 17c64de65..17c64de65 100644
--- a/gfx/tilesets/06.2bpp.lz.252cbd8f
+++ b/gfx/tilesets/players_house.2bpp.lz.252cbd8f
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/players_house.png
index b49f799d8..b49f799d8 100644
--- a/gfx/tilesets/06.png
+++ b/gfx/tilesets/players_house.png
diff --git a/gfx/tilesets/20.2bpp.lz.35e51007 b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007
index b458a501d..b458a501d 100644
--- a/gfx/tilesets/20.2bpp.lz.35e51007
+++ b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007
diff --git a/gfx/tilesets/20.png b/gfx/tilesets/players_house_2f.png
index e46a847b9..e46a847b9 100644
--- a/gfx/tilesets/20.png
+++ b/gfx/tilesets/players_house_2f.png
diff --git a/gfx/tilesets/07.2bpp.lz.e1c4014c b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
index 71783d9f2..71783d9f2 100644
--- a/gfx/tilesets/07.2bpp.lz.e1c4014c
+++ b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/pokecenter.png
index d4084ebd4..d4084ebd4 100644
--- a/gfx/tilesets/07.png
+++ b/gfx/tilesets/pokecenter.png
diff --git a/gfx/tilesets/21.2bpp.lz.febbc4ec b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
index 5b787c854..5b787c854 100644
--- a/gfx/tilesets/21.2bpp.lz.febbc4ec
+++ b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
diff --git a/gfx/tilesets/21.png b/gfx/tilesets/pokecom_center.png
index 889b02727..889b02727 100644
--- a/gfx/tilesets/21.png
+++ b/gfx/tilesets/pokecom_center.png
diff --git a/gfx/tilesets/09.2bpp.lz.56b1a405 b/gfx/tilesets/port.2bpp.lz.56b1a405
index 96dd2e594..96dd2e594 100644
--- a/gfx/tilesets/09.2bpp.lz.56b1a405
+++ b/gfx/tilesets/port.2bpp.lz.56b1a405
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/port.png
index 6990a7d7b..6990a7d7b 100644
--- a/gfx/tilesets/09.png
+++ b/gfx/tilesets/port.png
diff --git a/gfx/tilesets/11.2bpp.lz.454cfd8b b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b
index 584e54dd2..584e54dd2 100644
--- a/gfx/tilesets/11.2bpp.lz.454cfd8b
+++ b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/power_plant.png
index b72e3f401..b72e3f401 100644
--- a/gfx/tilesets/11.png
+++ b/gfx/tilesets/power_plant.png
diff --git a/gfx/tilesets/27.2bpp.lz.27cdd9ad b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
index 34be33856..34be33856 100644
--- a/gfx/tilesets/27.2bpp.lz.27cdd9ad
+++ b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
diff --git a/gfx/tilesets/27.png b/gfx/tilesets/radio_tower.png
index 8d2d32e1f..8d2d32e1f 100644
--- a/gfx/tilesets/27.png
+++ b/gfx/tilesets/radio_tower.png
diff --git a/gfx/tilesets/36.2bpp.lz.8b42470b b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/36.2bpp.lz.8b42470b
+++ b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/36.png b/gfx/tilesets/ruins_of_alph.png
index f41866c58..f41866c58 100644
--- a/gfx/tilesets/36.png
+++ b/gfx/tilesets/ruins_of_alph.png
diff --git a/gfx/tilesets/23.2bpp.lz.bc56789c b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
index 2033306e3..2033306e3 100644
--- a/gfx/tilesets/23.2bpp.lz.bc56789c
+++ b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/23.png b/gfx/tilesets/sprout_tower.png
index 268fc998f..268fc998f 100644
--- a/gfx/tilesets/23.png
+++ b/gfx/tilesets/sprout_tower.png
diff --git a/gfx/tilesets/17.2bpp.lz.1600ca86 b/gfx/tilesets/train_station.2bpp.lz.1600ca86
index 56e509f5e..56e509f5e 100644
--- a/gfx/tilesets/17.2bpp.lz.1600ca86
+++ b/gfx/tilesets/train_station.2bpp.lz.1600ca86
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/train_station.png
index 0c148f95d..0c148f95d 100644
--- a/gfx/tilesets/17.png
+++ b/gfx/tilesets/train_station.png
diff --git a/gfx/tilesets/28.2bpp.lz.cace291c b/gfx/tilesets/underground.2bpp.lz.cace291c
index c204dca26..c204dca26 100644
--- a/gfx/tilesets/28.2bpp.lz.cace291c
+++ b/gfx/tilesets/underground.2bpp.lz.cace291c
diff --git a/gfx/tilesets/28.png b/gfx/tilesets/underground.png
index 0a83d2043..0a83d2043 100644
--- a/gfx/tilesets/28.png
+++ b/gfx/tilesets/underground.png
diff --git a/gfx/tilesets/30.2bpp.lz.25b9c4b6 b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
index 50a5ab9ac..50a5ab9ac 100644
--- a/gfx/tilesets/30.2bpp.lz.25b9c4b6
+++ b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/30.png b/gfx/tilesets/whirl_islands.png
index 9dc74c45b..9dc74c45b 100644
--- a/gfx/tilesets/30.png
+++ b/gfx/tilesets/whirl_islands.png
diff --git a/gfx/trainer_palettes.asm b/gfx/trainer_palettes.asm
new file mode 100644
index 000000000..c943e49d7
--- /dev/null
+++ b/gfx/trainer_palettes.asm
@@ -0,0 +1,76 @@
+TrainerPalettes: ; b0ce
+; entries correspond to trainer classes
+
+PlayerPalette: ; b0ce
+; Chris uses the same colors as Cal
+INCLUDE "gfx/trainers/cal.pal"
+KrisPalette: ; b0d0
+; 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
diff --git a/gfx/pics/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm
index 4c1db41d5..fb1fe0755 100644
--- a/gfx/pics/trainer_pic_pointers.asm
+++ b/gfx/trainer_pic_pointers.asm
@@ -1,4 +1,5 @@
-
+TrainerPicPointers::
+; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	add_pic FalknerPic
 	add_pic WhitneyPic
 	add_pic BugsyPic
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
deleted file mode 100644
index 6dbf13983..000000000
--- a/gfx/trainers/palette_pointers.asm
+++ /dev/null
@@ -1,82 +0,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
diff --git a/gfx/unknown/171db1.png b/gfx/unknown/ascii_font.png
index 1c32d2bda..1c32d2bda 100644
--- a/gfx/unknown/171db1.png
+++ b/gfx/unknown/ascii_font.png
diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/bold_a.png
index 56252c423..56252c423 100644
--- a/gfx/unknown/016d9c.png
+++ b/gfx/unknown/bold_a.png
diff --git a/gfx/unknown/016da4.png b/gfx/unknown/bold_b.png
index 8ce07a03c..8ce07a03c 100644
--- a/gfx/unknown/016da4.png
+++ b/gfx/unknown/bold_b.png
diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/bold_font.png
index e02b91ce2..e02b91ce2 100644
--- a/gfx/unknown/0f8f34.png
+++ b/gfx/unknown/bold_font.png
diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/down_arrow.png
index 9eaaadd2d..9eaaadd2d 100644
--- a/gfx/unknown/0488cb.png
+++ b/gfx/unknown/down_arrow.png
diff --git a/gfx/unknown/1715a4.2bpp.lz.3eaf004f b/gfx/unknown/egg_animated.2bpp.lz.3eaf004f
index b4fabff15..b4fabff15 100644
--- a/gfx/unknown/1715a4.2bpp.lz.3eaf004f
+++ b/gfx/unknown/egg_animated.2bpp.lz.3eaf004f
diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/egg_animated.png
index 3e1c0bb46..3e1c0bb46 100644
--- a/gfx/unknown/1715a4.png
+++ b/gfx/unknown/egg_animated.png
diff --git a/gfx/unknown/1715a4_nonmatching.png b/gfx/unknown/egg_animated_nonmatching.png
index 44ea166ef..44ea166ef 100755
--- a/gfx/unknown/1715a4_nonmatching.png
+++ b/gfx/unknown/egg_animated_nonmatching.png
diff --git a/gfx/unknown/16c79b.tilemap b/gfx/unknown/mobile_splash.attrmap
index 86666b3fd..86666b3fd 100644
--- a/gfx/unknown/16c79b.tilemap
+++ b/gfx/unknown/mobile_splash.attrmap
diff --git a/gfx/unknown/16c173.png b/gfx/unknown/mobile_splash.png
index d54b68cdf..d54b68cdf 100755
--- a/gfx/unknown/16c173.png
+++ b/gfx/unknown/mobile_splash.png
diff --git a/gfx/unknown/16c633.tilemap b/gfx/unknown/mobile_splash.tilemap
index 81818e531..81818e531 100644
--- a/gfx/unknown/16c633.tilemap
+++ b/gfx/unknown/mobile_splash.tilemap
diff --git a/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 b/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4
index 4d50c6bcf..4d50c6bcf 100644
--- a/gfx/unknown/170d16.2bpp.lz.5d6d2ad4
+++ b/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4
diff --git a/gfx/unknown/170d16.png b/gfx/unknown/pichu_animated.png
index 2832fdb6a..2832fdb6a 100644
--- a/gfx/unknown/170d16.png
+++ b/gfx/unknown/pichu_animated.png
diff --git a/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa
index d8de54c79..d8de54c79 100644
--- a/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa
+++ b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa
diff --git a/gfx/misc/unknown_egg.png b/gfx/unknown/unknown_egg.png
index 0642c28cf..0642c28cf 100644
--- a/gfx/misc/unknown_egg.png
+++ b/gfx/unknown/unknown_egg.png
diff --git a/gfx/unknown/029f54.png b/gfx/unknown/unused_border.png
index d3ac169fc..d3ac169fc 100644
--- a/gfx/unknown/029f54.png
+++ b/gfx/unknown/unused_border.png
diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/up_arrow.png
index e8b43de99..e8b43de99 100644
--- a/gfx/unknown/0488c3.png
+++ b/gfx/unknown/up_arrow.png
author	surskitty <surskitty@gmail.com>	2017-12-12 00:50:55 -0500
committer	surskitty <surskitty@gmail.com>	2017-12-12 00:50:55 -0500
commit	096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree	0c0bedcd311ab83262e31cf6d9d4c37257143acc /gfx
parent	98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parent	f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)