From 2804ddca7e50b66ed209815476f74ff98f52f54b Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi@gmail.com>
Date: Thu, 31 May 2018 19:38:55 -0400
Subject: Disassemble overworld sprites

---
 data/sprites/sprites.asm              | 102 ++++++++++++++++++++
 gfx.asm                               | 172 +++++++++++++++++++++-------------
 gfx/icons/egg.png                     | Bin 0 -> 234 bytes
 gfx/icons/tamago.png                  | Bin 234 -> 0 bytes
 gfx/sprites/blackbelt.png             | Bin 0 -> 279 bytes
 gfx/sprites/blue.png                  | Bin 0 -> 321 bytes
 gfx/sprites/boulder.png               | Bin 0 -> 293 bytes
 gfx/sprites/bug_catcher_boy.png       | Bin 0 -> 237 bytes
 gfx/sprites/burglar.png               | Bin 0 -> 292 bytes
 gfx/sprites/captain.png               | Bin 0 -> 227 bytes
 gfx/sprites/clerk.png                 | Bin 0 -> 292 bytes
 gfx/sprites/cooltrainer_f.png         | Bin 0 -> 349 bytes
 gfx/sprites/cooltrainer_m.png         | Bin 0 -> 286 bytes
 gfx/sprites/egg.png                   | Bin 0 -> 264 bytes
 gfx/sprites/elder.png                 | Bin 0 -> 319 bytes
 gfx/sprites/enoki.png                 | Bin 0 -> 555 bytes
 gfx/sprites/evil_okido.png            | Bin 0 -> 288 bytes
 gfx/sprites/fisher.png                | Bin 0 -> 308 bytes
 gfx/sprites/fishing_guru.png          | Bin 0 -> 269 bytes
 gfx/sprites/frowning_man.png          | Bin 0 -> 262 bytes
 gfx/sprites/gantetsu.png              | Bin 0 -> 309 bytes
 gfx/sprites/gentleman.png             | Bin 0 -> 264 bytes
 gfx/sprites/girl.png                  | Bin 0 -> 325 bytes
 gfx/sprites/gold.png                  | Bin 0 -> 305 bytes
 gfx/sprites/gold_bike.png             | Bin 0 -> 373 bytes
 gfx/sprites/gold_skateboard.png       | Bin 0 -> 351 bytes
 gfx/sprites/gramps.png                | Bin 0 -> 338 bytes
 gfx/sprites/granny.png                | Bin 0 -> 360 bytes
 gfx/sprites/gym_guy.png               | Bin 0 -> 295 bytes
 gfx/sprites/hayato.png                | Bin 0 -> 524 bytes
 gfx/sprites/helmet.png                | Bin 0 -> 272 bytes
 gfx/sprites/kabigon.png               | Bin 0 -> 346 bytes
 gfx/sprites/kikuko.png                | Bin 0 -> 289 bytes
 gfx/sprites/laplace.png               | Bin 0 -> 355 bytes
 gfx/sprites/lass.png                  | Bin 0 -> 305 bytes
 gfx/sprites/link_receptionist.png     | Bin 0 -> 460 bytes
 gfx/sprites/lizardon.png              | Bin 0 -> 327 bytes
 gfx/sprites/masaki.png                | Bin 0 -> 307 bytes
 gfx/sprites/medium.png                | Bin 0 -> 261 bytes
 gfx/sprites/mikan.png                 | Bin 0 -> 249 bytes
 gfx/sprites/mohawk.png                | Bin 0 -> 309 bytes
 gfx/sprites/mom.png                   | Bin 0 -> 269 bytes
 gfx/sprites/nanami.png                | Bin 0 -> 277 bytes
 gfx/sprites/nurse.png                 | Bin 0 -> 497 bytes
 gfx/sprites/nyorobon.png              | Bin 0 -> 268 bytes
 gfx/sprites/officer.png               | Bin 0 -> 285 bytes
 gfx/sprites/okido.png                 | Bin 0 -> 305 bytes
 gfx/sprites/old_link_receptionist.png | Bin 0 -> 290 bytes
 gfx/sprites/paper.png                 | Bin 0 -> 269 bytes
 gfx/sprites/pawou.png                 | Bin 0 -> 347 bytes
 gfx/sprites/pippi.png                 | Bin 0 -> 317 bytes
 gfx/sprites/poke_ball.png             | Bin 0 -> 274 bytes
 gfx/sprites/pokedex.png               | Bin 0 -> 274 bytes
 gfx/sprites/pokefan_f.png             | Bin 0 -> 264 bytes
 gfx/sprites/pokefan_m.png             | Bin 0 -> 289 bytes
 gfx/sprites/poppo.png                 | Bin 0 -> 354 bytes
 gfx/sprites/receptionist.png          | Bin 0 -> 237 bytes
 gfx/sprites/red.png                   | Bin 0 -> 294 bytes
 gfx/sprites/reds_mom.png              | Bin 0 -> 281 bytes
 gfx/sprites/rocker.png                | Bin 0 -> 296 bytes
 gfx/sprites/rocket_f.png              | Bin 0 -> 253 bytes
 gfx/sprites/rocket_m.png              | Bin 0 -> 247 bytes
 gfx/sprites/sage.png                  | Bin 0 -> 305 bytes
 gfx/sprites/sailor.png                | Bin 0 -> 307 bytes
 gfx/sprites/sakaki.png                | Bin 0 -> 265 bytes
 gfx/sprites/scientist.png             | Bin 0 -> 283 bytes
 gfx/sprites/sidon.png                 | Bin 0 -> 350 bytes
 gfx/sprites/silver.png                | Bin 0 -> 300 bytes
 gfx/sprites/silvers_mom.png           | Bin 0 -> 262 bytes
 gfx/sprites/super_nerd.png            | Bin 0 -> 293 bytes
 gfx/sprites/swimmer_f.png             | Bin 0 -> 328 bytes
 gfx/sprites/swimmer_m.png             | Bin 0 -> 303 bytes
 gfx/sprites/teacher.png               | Bin 0 -> 283 bytes
 gfx/sprites/tsukushi.png              | Bin 0 -> 540 bytes
 gfx/sprites/twin.png                  | Bin 0 -> 254 bytes
 gfx/sprites/youngster.png             | Bin 0 -> 281 bytes
 shim.sym                              |   2 -
 77 files changed, 210 insertions(+), 66 deletions(-)
 create mode 100644 data/sprites/sprites.asm
 create mode 100644 gfx/icons/egg.png
 delete mode 100644 gfx/icons/tamago.png
 create mode 100644 gfx/sprites/blackbelt.png
 create mode 100644 gfx/sprites/blue.png
 create mode 100644 gfx/sprites/boulder.png
 create mode 100644 gfx/sprites/bug_catcher_boy.png
 create mode 100644 gfx/sprites/burglar.png
 create mode 100644 gfx/sprites/captain.png
 create mode 100644 gfx/sprites/clerk.png
 create mode 100644 gfx/sprites/cooltrainer_f.png
 create mode 100644 gfx/sprites/cooltrainer_m.png
 create mode 100644 gfx/sprites/egg.png
 create mode 100644 gfx/sprites/elder.png
 create mode 100644 gfx/sprites/enoki.png
 create mode 100644 gfx/sprites/evil_okido.png
 create mode 100644 gfx/sprites/fisher.png
 create mode 100644 gfx/sprites/fishing_guru.png
 create mode 100644 gfx/sprites/frowning_man.png
 create mode 100644 gfx/sprites/gantetsu.png
 create mode 100644 gfx/sprites/gentleman.png
 create mode 100644 gfx/sprites/girl.png
 create mode 100644 gfx/sprites/gold.png
 create mode 100644 gfx/sprites/gold_bike.png
 create mode 100644 gfx/sprites/gold_skateboard.png
 create mode 100644 gfx/sprites/gramps.png
 create mode 100644 gfx/sprites/granny.png
 create mode 100644 gfx/sprites/gym_guy.png
 create mode 100644 gfx/sprites/hayato.png
 create mode 100644 gfx/sprites/helmet.png
 create mode 100644 gfx/sprites/kabigon.png
 create mode 100644 gfx/sprites/kikuko.png
 create mode 100644 gfx/sprites/laplace.png
 create mode 100644 gfx/sprites/lass.png
 create mode 100644 gfx/sprites/link_receptionist.png
 create mode 100644 gfx/sprites/lizardon.png
 create mode 100644 gfx/sprites/masaki.png
 create mode 100644 gfx/sprites/medium.png
 create mode 100644 gfx/sprites/mikan.png
 create mode 100644 gfx/sprites/mohawk.png
 create mode 100644 gfx/sprites/mom.png
 create mode 100644 gfx/sprites/nanami.png
 create mode 100644 gfx/sprites/nurse.png
 create mode 100644 gfx/sprites/nyorobon.png
 create mode 100644 gfx/sprites/officer.png
 create mode 100644 gfx/sprites/okido.png
 create mode 100644 gfx/sprites/old_link_receptionist.png
 create mode 100644 gfx/sprites/paper.png
 create mode 100644 gfx/sprites/pawou.png
 create mode 100644 gfx/sprites/pippi.png
 create mode 100644 gfx/sprites/poke_ball.png
 create mode 100644 gfx/sprites/pokedex.png
 create mode 100644 gfx/sprites/pokefan_f.png
 create mode 100644 gfx/sprites/pokefan_m.png
 create mode 100644 gfx/sprites/poppo.png
 create mode 100644 gfx/sprites/receptionist.png
 create mode 100644 gfx/sprites/red.png
 create mode 100644 gfx/sprites/reds_mom.png
 create mode 100644 gfx/sprites/rocker.png
 create mode 100644 gfx/sprites/rocket_f.png
 create mode 100644 gfx/sprites/rocket_m.png
 create mode 100644 gfx/sprites/sage.png
 create mode 100644 gfx/sprites/sailor.png
 create mode 100644 gfx/sprites/sakaki.png
 create mode 100644 gfx/sprites/scientist.png
 create mode 100644 gfx/sprites/sidon.png
 create mode 100644 gfx/sprites/silver.png
 create mode 100644 gfx/sprites/silvers_mom.png
 create mode 100644 gfx/sprites/super_nerd.png
 create mode 100644 gfx/sprites/swimmer_f.png
 create mode 100644 gfx/sprites/swimmer_m.png
 create mode 100644 gfx/sprites/teacher.png
 create mode 100644 gfx/sprites/tsukushi.png
 create mode 100644 gfx/sprites/twin.png
 create mode 100644 gfx/sprites/youngster.png

diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
new file mode 100644
index 0000000..b901b7a
--- /dev/null
+++ b/data/sprites/sprites.asm
@@ -0,0 +1,102 @@
+INCLUDE "constants.asm"
+
+SECTION "OverworldSprites", ROMX[$423B], BANK[$05]
+
+overworld_sprite: MACRO
+; pointer, length, bank
+	dw \1
+	db \2 tiles, BANK(\1)
+ENDM
+
+OverworldSprites::
+	overworld_sprite GoldSpriteGFX, 12
+	overworld_sprite GoldBikeSpriteGFX, 12
+	overworld_sprite GoldSkateboardSpriteGFX, 12
+	overworld_sprite SilverSpriteGFX, 12
+	overworld_sprite OkidoSpriteGFX, 12
+	overworld_sprite RedSpriteGFX, 12
+	overworld_sprite BlueSpriteGFX, 12
+	overworld_sprite MasakiSpriteGFX, 12
+	overworld_sprite ElderSpriteGFX, 12
+	overworld_sprite SakakiSpriteGFX, 12
+	overworld_sprite GantetsuSpriteGFX, 12
+	overworld_sprite MomSpriteGFX, 12
+	overworld_sprite SilversMomSpriteGFX, 12
+	overworld_sprite RedsMomSpriteGFX, 12
+	overworld_sprite RedsMomSpriteGFX, 12
+	overworld_sprite NanamiSpriteGFX, 12
+	overworld_sprite EvilOkidoSpriteGFX, 12
+	overworld_sprite KikukoSpriteGFX, 12
+	overworld_sprite HayatoSpriteGFX, 12
+	overworld_sprite TsukushiSpriteGFX, 12
+	overworld_sprite TsukushiSpriteGFX, 12
+	overworld_sprite EnokiSpriteGFX, 12
+	overworld_sprite MikanSpriteGFX, 12
+	overworld_sprite MikanSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerMSpriteGFX, 12
+	overworld_sprite CooltrainerFSpriteGFX, 12
+	overworld_sprite BugCatcherBoySpriteGFX, 12
+	overworld_sprite TwinSpriteGFX, 12
+	overworld_sprite YoungsterSpriteGFX, 12
+	overworld_sprite LassSpriteGFX, 12
+	overworld_sprite TeacherSpriteGFX, 12
+	overworld_sprite GirlSpriteGFX, 12
+	overworld_sprite SuperNerdSpriteGFX, 12
+	overworld_sprite RockerSpriteGFX, 12
+	overworld_sprite PokefanMSpriteGFX, 12
+	overworld_sprite PokefanFSpriteGFX, 12
+	overworld_sprite GrampsSpriteGFX, 12
+	overworld_sprite GrannySpriteGFX, 12
+	overworld_sprite SwimmerMSpriteGFX, 12
+	overworld_sprite SwimmerFSpriteGFX, 12
+	overworld_sprite RocketMSpriteGFX, 12
+	overworld_sprite RocketMSpriteGFX, 12
+	overworld_sprite RocketMSpriteGFX, 12
+	overworld_sprite RocketFSpriteGFX, 12
+	overworld_sprite NurseSpriteGFX, 12
+	overworld_sprite LinkReceptionistSpriteGFX, 12
+	overworld_sprite ClerkSpriteGFX, 12
+	overworld_sprite FisherSpriteGFX, 12
+	overworld_sprite FishingGuruSpriteGFX, 12
+	overworld_sprite ScientistSpriteGFX, 12
+	overworld_sprite MediumSpriteGFX, 12
+	overworld_sprite SageSpriteGFX, 12
+	overworld_sprite FrowningManSpriteGFX, 12
+	overworld_sprite GentlemanSpriteGFX, 12
+	overworld_sprite BlackbeltSpriteGFX, 12
+	overworld_sprite ReceptionistSpriteGFX, 12
+	overworld_sprite OfficerSpriteGFX, 12
+	overworld_sprite CaptainSpriteGFX, 12
+	overworld_sprite CaptainSpriteGFX, 12
+	overworld_sprite CaptainSpriteGFX, 12
+	overworld_sprite MohawkSpriteGFX, 12
+	overworld_sprite GymGuySpriteGFX, 12
+	overworld_sprite SailorSpriteGFX, 12
+	overworld_sprite HelmetSpriteGFX, 12
+	overworld_sprite BurglarSpriteGFX, 12
+	overworld_sprite SidonSpriteGFX, 12
+	overworld_sprite PippiSpriteGFX, 12
+	overworld_sprite PoppoSpriteGFX, 12
+	overworld_sprite LizardonSpriteGFX, 12
+	overworld_sprite KabigonSpriteGFX, 4
+	overworld_sprite PawouSpriteGFX, 12
+	overworld_sprite NyorobonSpriteGFX, 12
+	overworld_sprite LaplaceSpriteGFX, 12
+	overworld_sprite PokeBallSpriteGFX, 4
+	overworld_sprite PokedexSpriteGFX, 4
+	overworld_sprite PaperSpriteGFX, 4
+	overworld_sprite OldLinkReceptionistSpriteGFX, 4
+	overworld_sprite OldLinkReceptionistSpriteGFX, 4
+	overworld_sprite EggSpriteGFX, 4
+	overworld_sprite BoulderSpriteGFX, 4
diff --git a/gfx.asm b/gfx.asm
index 5353dd3..320af56 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -176,70 +176,38 @@ SECTION "Attack Animation GFX", ROMX[$4000], BANK[$21]
 INCBIN "gfx/battle_anims/attack_animations.2bpp"
 
 SECTION "Pokemon Party Sprites", ROMX[$60CC], BANK[$23]
-NyoromoIcon::
-INCBIN "gfx/icons/nyoromo.2bpp"
-PurinIcon::
-INCBIN "gfx/icons/purin.2bpp"
-DigdaIcon::
-INCBIN "gfx/icons/digda.2bpp"
-PikachuIcon::
-INCBIN "gfx/icons/pikachu.2bpp"
-HitodemanIcon::
-INCBIN "gfx/icons/hitodeman.2bpp"
-KoikingIcon::
-INCBIN "gfx/icons/koiking.2bpp"
-PoppoIcon::
-INCBIN "gfx/icons/poppo.2bpp"
-SidonIcon::
-INCBIN "gfx/icons/sidon.2bpp"
-PippiIcon::
-INCBIN "gfx/icons/pippi.2bpp"
-NazonokusaIcon::
-INCBIN "gfx/icons/nazonokusa.2bpp"
-MushiIcon::
-INCBIN "gfx/icons/mushi.2bpp"
-GangarIcon::
-INCBIN "gfx/icons/gangar.2bpp"
-LaplaceIcon::
-INCBIN "gfx/icons/laplace.2bpp"
-BarrierdIcon::
-INCBIN "gfx/icons/barrierd.2bpp"
-LokonIcon::
-INCBIN "gfx/icons/lokon.2bpp"
-KentaurosIcon::
-INCBIN "gfx/icons/kentauros.2bpp"
-ShellderIcon::
-INCBIN "gfx/icons/shellder.2bpp"
-MetamonIcon::
-INCBIN "gfx/icons/metamon.2bpp"
-IwarkIcon::
-INCBIN "gfx/icons/iwark.2bpp"
-BiriridamaIcon::
-INCBIN "gfx/icons/biriridama.2bpp"
-ZenigameIcon::
-INCBIN "gfx/icons/zenigame.2bpp"
-FushigidaneIcon::
-INCBIN "gfx/icons/fushigidane.2bpp"
-HitokageIcon::
-INCBIN "gfx/icons/hitokage.2bpp"
-BeedleIcon::
-INCBIN "gfx/icons/beedle.2bpp"
-AnnonIcon::
-INCBIN "gfx/icons/annon.2bpp"
-IsitsubuteIcon::
-INCBIN "gfx/icons/isitsubute.2bpp"
-WanrikyIcon::
-INCBIN "gfx/icons/wanriky.2bpp"
-TamagoIcon::
-INCBIN "gfx/icons/tamago.2bpp"
-MenokurageIcon::
-INCBIN "gfx/icons/menokurage.2bpp"
-ButterfreeIcon::
-INCBIN "gfx/icons/butterfree.2bpp"
-ZubatIcon::
-INCBIN "gfx/icons/zubat.2bpp"
-KabigonIcon::
-INCBIN "gfx/icons/kabigon.2bpp"
+NyoromoIcon:: INCBIN "gfx/icons/nyoromo.2bpp"
+PurinIcon:: INCBIN "gfx/icons/purin.2bpp"
+DigdaIcon:: INCBIN "gfx/icons/digda.2bpp"
+PikachuIcon:: INCBIN "gfx/icons/pikachu.2bpp"
+HitodemanIcon:: INCBIN "gfx/icons/hitodeman.2bpp"
+KoikingIcon:: INCBIN "gfx/icons/koiking.2bpp"
+PoppoIcon:: INCBIN "gfx/icons/poppo.2bpp"
+SidonIcon:: INCBIN "gfx/icons/sidon.2bpp"
+PippiIcon:: INCBIN "gfx/icons/pippi.2bpp"
+NazonokusaIcon:: INCBIN "gfx/icons/nazonokusa.2bpp"
+MushiIcon:: INCBIN "gfx/icons/mushi.2bpp"
+GangarIcon:: INCBIN "gfx/icons/gangar.2bpp"
+LaplaceIcon:: INCBIN "gfx/icons/laplace.2bpp"
+BarrierdIcon:: INCBIN "gfx/icons/barrierd.2bpp"
+LokonIcon:: INCBIN "gfx/icons/lokon.2bpp"
+KentaurosIcon:: INCBIN "gfx/icons/kentauros.2bpp"
+ShellderIcon:: INCBIN "gfx/icons/shellder.2bpp"
+MetamonIcon:: INCBIN "gfx/icons/metamon.2bpp"
+IwarkIcon:: INCBIN "gfx/icons/iwark.2bpp"
+BiriridamaIcon:: INCBIN "gfx/icons/biriridama.2bpp"
+ZenigameIcon:: INCBIN "gfx/icons/zenigame.2bpp"
+FushigidaneIcon:: INCBIN "gfx/icons/fushigidane.2bpp"
+HitokageIcon:: INCBIN "gfx/icons/hitokage.2bpp"
+BeedleIcon:: INCBIN "gfx/icons/beedle.2bpp"
+AnnonIcon:: INCBIN "gfx/icons/annon.2bpp"
+IsitsubuteIcon:: INCBIN "gfx/icons/isitsubute.2bpp"
+WanrikyIcon:: INCBIN "gfx/icons/wanriky.2bpp"
+EggIcon:: INCBIN "gfx/icons/egg.2bpp"
+MenokurageIcon:: INCBIN "gfx/icons/menokurage.2bpp"
+ButterfreeIcon:: INCBIN "gfx/icons/butterfree.2bpp"
+ZubatIcon:: INCBIN "gfx/icons/zubat.2bpp"
+KabigonIcon:: INCBIN "gfx/icons/kabigon.2bpp"
 
 SECTION "Slot Machine GFX", ROMX[$4FDB], BANK[$24]
 SlotMachineGFX::
@@ -247,6 +215,82 @@ INCBIN "gfx/minigames/slots.2bpp"
 SlotMachine2GFX::
 INCBIN "gfx/minigames/slots_2.2bpp"
 
+SECTION "Bank 30 Sprites 1", ROMX[$4000], BANK[$30]
+GoldSpriteGFX:: INCBIN "gfx/sprites/gold.2bpp" ; 30:4000
+GoldBikeSpriteGFX:: INCBIN "gfx/sprites/gold_bike.2bpp" ; 30:4180
+GoldSkateboardSpriteGFX:: INCBIN "gfx/sprites/gold_skateboard.2bpp" ; 30:4300
+SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp" ; 30:4480
+OkidoSpriteGFX:: INCBIN "gfx/sprites/okido.2bpp" ; 30:4600
+RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp" ; 30:4780
+BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp" ; 30:4900
+MasakiSpriteGFX:: INCBIN "gfx/sprites/masaki.2bpp" ; 30:4a80
+ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp" ; 30:4c00
+SakakiSpriteGFX:: INCBIN "gfx/sprites/sakaki.2bpp" ; 30:4d80
+GantetsuSpriteGFX:: INCBIN "gfx/sprites/gantetsu.2bpp" ; 30:4f00
+MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp" ; 30:5080
+SilversMomSpriteGFX:: INCBIN "gfx/sprites/silvers_mom.2bpp" ; 30:5200
+RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp" ; 30:5380
+NanamiSpriteGFX:: INCBIN "gfx/sprites/nanami.2bpp" ; 30:5500
+EvilOkidoSpriteGFX:: INCBIN "gfx/sprites/evil_okido.2bpp" ; 30:5680
+KikukoSpriteGFX:: INCBIN "gfx/sprites/kikuko.2bpp" ; 30:5800
+HayatoSpriteGFX:: INCBIN "gfx/sprites/hayato.2bpp" ; 30:5980
+TsukushiSpriteGFX:: INCBIN "gfx/sprites/tsukushi.2bpp" ; 30:5a40
+EnokiSpriteGFX:: INCBIN "gfx/sprites/enoki.2bpp" ; 30:5b00
+MikanSpriteGFX:: INCBIN "gfx/sprites/mikan.2bpp" ; 30:5bc0
+CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; 30:5d40
+CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; 30:5ec0
+BugCatcherBoySpriteGFX:: INCBIN "gfx/sprites/bug_catcher_boy.2bpp" ; 30:6040
+TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" ; 30:61c0
+YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" ; 30:6340
+LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" ; 30:64c0
+TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" ; 30:6640
+GirlSpriteGFX:: INCBIN "gfx/sprites/girl.2bpp" ; 30:67c0
+SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" ; 30:6940
+RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" ; 30:6ac0
+PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp" ; 30:6c40
+PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp" ; 30:6dc0
+GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp" ; 30:6f40
+GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp" ; 30:70c0
+SwimmerMSpriteGFX:: INCBIN "gfx/sprites/swimmer_m.2bpp" ; 30:7240
+SwimmerFSpriteGFX:: INCBIN "gfx/sprites/swimmer_f.2bpp" ; 30:73c0
+RocketMSpriteGFX:: INCBIN "gfx/sprites/rocket_m.2bpp" ; 30:7540
+RocketFSpriteGFX:: INCBIN "gfx/sprites/rocket_f.2bpp" ; 30:76c0
+NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp" ; 30:7840
+LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp" ; 30:7900
+ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" ; 30:79c0
+FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" ; 30:7b40
+FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" ; 30:7cc0
+
+SECTION "Bank 31 Sprites 2", ROMX[$4000], BANK[$31]
+ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" ; 31:4000
+MediumSpriteGFX:: INCBIN "gfx/sprites/medium.2bpp" ; 31:4180
+SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" ; 31:4300
+FrowningManSpriteGFX:: INCBIN "gfx/sprites/frowning_man.2bpp" ; 31:4480
+GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp" ; 31:4600
+BlackbeltSpriteGFX:: INCBIN "gfx/sprites/blackbelt.2bpp" ; 31:4780
+ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp" ; 31:4900
+OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp" ; 31:4a80
+CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp" ; 31:4c00
+MohawkSpriteGFX:: INCBIN "gfx/sprites/mohawk.2bpp" ; 31:4d80
+GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp" ; 31:4f00
+SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp" ; 31:5080
+HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp" ; 31:5200
+BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp" ; 31:5380
+SidonSpriteGFX:: INCBIN "gfx/sprites/sidon.2bpp" ; 31:5500
+PippiSpriteGFX:: INCBIN "gfx/sprites/pippi.2bpp" ; 31:5680
+PoppoSpriteGFX:: INCBIN "gfx/sprites/poppo.2bpp" ; 31:5800
+LizardonSpriteGFX:: INCBIN "gfx/sprites/lizardon.2bpp" ; 31:5980
+KabigonSpriteGFX:: INCBIN "gfx/sprites/kabigon.2bpp" ; 31:5b00
+PawouSpriteGFX:: INCBIN "gfx/sprites/pawou.2bpp" ; 31:5c80
+NyorobonSpriteGFX:: INCBIN "gfx/sprites/nyorobon.2bpp" ; 31:5e00
+LaplaceSpriteGFX:: INCBIN "gfx/sprites/laplace.2bpp" ; 31:5f80
+PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp" ; 31:6100
+PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp" ; 31:6280
+PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp" ; 31:6400
+OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; 31:6580
+EggSpriteGFX:: INCBIN "gfx/sprites/egg.2bpp" ; 31:65c0
+BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" ; 31:6600
+
 SECTION "Bank 37 Tilesets 10", ROMX[$4000], BANK[$37]
 Tileset_10_GFX:
 INCBIN "gfx/tilesets/tileset_10.2bpp"
diff --git a/gfx/icons/egg.png b/gfx/icons/egg.png
new file mode 100644
index 0000000..364fadf
Binary files /dev/null and b/gfx/icons/egg.png differ
diff --git a/gfx/icons/tamago.png b/gfx/icons/tamago.png
deleted file mode 100644
index 364fadf..0000000
Binary files a/gfx/icons/tamago.png and /dev/null differ
diff --git a/gfx/sprites/blackbelt.png b/gfx/sprites/blackbelt.png
new file mode 100644
index 0000000..9aec228
Binary files /dev/null and b/gfx/sprites/blackbelt.png differ
diff --git a/gfx/sprites/blue.png b/gfx/sprites/blue.png
new file mode 100644
index 0000000..17fc2fd
Binary files /dev/null and b/gfx/sprites/blue.png differ
diff --git a/gfx/sprites/boulder.png b/gfx/sprites/boulder.png
new file mode 100644
index 0000000..4c4fd7a
Binary files /dev/null and b/gfx/sprites/boulder.png differ
diff --git a/gfx/sprites/bug_catcher_boy.png b/gfx/sprites/bug_catcher_boy.png
new file mode 100644
index 0000000..e1306b6
Binary files /dev/null and b/gfx/sprites/bug_catcher_boy.png differ
diff --git a/gfx/sprites/burglar.png b/gfx/sprites/burglar.png
new file mode 100644
index 0000000..ed0fa1d
Binary files /dev/null and b/gfx/sprites/burglar.png differ
diff --git a/gfx/sprites/captain.png b/gfx/sprites/captain.png
new file mode 100644
index 0000000..7408cbb
Binary files /dev/null and b/gfx/sprites/captain.png differ
diff --git a/gfx/sprites/clerk.png b/gfx/sprites/clerk.png
new file mode 100644
index 0000000..77a5fb9
Binary files /dev/null and b/gfx/sprites/clerk.png differ
diff --git a/gfx/sprites/cooltrainer_f.png b/gfx/sprites/cooltrainer_f.png
new file mode 100644
index 0000000..53bf81b
Binary files /dev/null and b/gfx/sprites/cooltrainer_f.png differ
diff --git a/gfx/sprites/cooltrainer_m.png b/gfx/sprites/cooltrainer_m.png
new file mode 100644
index 0000000..ffd94f4
Binary files /dev/null and b/gfx/sprites/cooltrainer_m.png differ
diff --git a/gfx/sprites/egg.png b/gfx/sprites/egg.png
new file mode 100644
index 0000000..0b5c54c
Binary files /dev/null and b/gfx/sprites/egg.png differ
diff --git a/gfx/sprites/elder.png b/gfx/sprites/elder.png
new file mode 100644
index 0000000..90b499f
Binary files /dev/null and b/gfx/sprites/elder.png differ
diff --git a/gfx/sprites/enoki.png b/gfx/sprites/enoki.png
new file mode 100644
index 0000000..a926851
Binary files /dev/null and b/gfx/sprites/enoki.png differ
diff --git a/gfx/sprites/evil_okido.png b/gfx/sprites/evil_okido.png
new file mode 100644
index 0000000..b2af757
Binary files /dev/null and b/gfx/sprites/evil_okido.png differ
diff --git a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png
new file mode 100644
index 0000000..a84a2e3
Binary files /dev/null and b/gfx/sprites/fisher.png differ
diff --git a/gfx/sprites/fishing_guru.png b/gfx/sprites/fishing_guru.png
new file mode 100644
index 0000000..748444f
Binary files /dev/null and b/gfx/sprites/fishing_guru.png differ
diff --git a/gfx/sprites/frowning_man.png b/gfx/sprites/frowning_man.png
new file mode 100644
index 0000000..a6300e1
Binary files /dev/null and b/gfx/sprites/frowning_man.png differ
diff --git a/gfx/sprites/gantetsu.png b/gfx/sprites/gantetsu.png
new file mode 100644
index 0000000..bd7fc20
Binary files /dev/null and b/gfx/sprites/gantetsu.png differ
diff --git a/gfx/sprites/gentleman.png b/gfx/sprites/gentleman.png
new file mode 100644
index 0000000..38a6125
Binary files /dev/null and b/gfx/sprites/gentleman.png differ
diff --git a/gfx/sprites/girl.png b/gfx/sprites/girl.png
new file mode 100644
index 0000000..66c1455
Binary files /dev/null and b/gfx/sprites/girl.png differ
diff --git a/gfx/sprites/gold.png b/gfx/sprites/gold.png
new file mode 100644
index 0000000..9dfe77f
Binary files /dev/null and b/gfx/sprites/gold.png differ
diff --git a/gfx/sprites/gold_bike.png b/gfx/sprites/gold_bike.png
new file mode 100644
index 0000000..552d58f
Binary files /dev/null and b/gfx/sprites/gold_bike.png differ
diff --git a/gfx/sprites/gold_skateboard.png b/gfx/sprites/gold_skateboard.png
new file mode 100644
index 0000000..35b4da1
Binary files /dev/null and b/gfx/sprites/gold_skateboard.png differ
diff --git a/gfx/sprites/gramps.png b/gfx/sprites/gramps.png
new file mode 100644
index 0000000..abe61a3
Binary files /dev/null and b/gfx/sprites/gramps.png differ
diff --git a/gfx/sprites/granny.png b/gfx/sprites/granny.png
new file mode 100644
index 0000000..763b2a2
Binary files /dev/null and b/gfx/sprites/granny.png differ
diff --git a/gfx/sprites/gym_guy.png b/gfx/sprites/gym_guy.png
new file mode 100644
index 0000000..a1f74da
Binary files /dev/null and b/gfx/sprites/gym_guy.png differ
diff --git a/gfx/sprites/hayato.png b/gfx/sprites/hayato.png
new file mode 100644
index 0000000..00ee47b
Binary files /dev/null and b/gfx/sprites/hayato.png differ
diff --git a/gfx/sprites/helmet.png b/gfx/sprites/helmet.png
new file mode 100644
index 0000000..f905a7a
Binary files /dev/null and b/gfx/sprites/helmet.png differ
diff --git a/gfx/sprites/kabigon.png b/gfx/sprites/kabigon.png
new file mode 100644
index 0000000..7a2f70c
Binary files /dev/null and b/gfx/sprites/kabigon.png differ
diff --git a/gfx/sprites/kikuko.png b/gfx/sprites/kikuko.png
new file mode 100644
index 0000000..e454197
Binary files /dev/null and b/gfx/sprites/kikuko.png differ
diff --git a/gfx/sprites/laplace.png b/gfx/sprites/laplace.png
new file mode 100644
index 0000000..d124616
Binary files /dev/null and b/gfx/sprites/laplace.png differ
diff --git a/gfx/sprites/lass.png b/gfx/sprites/lass.png
new file mode 100644
index 0000000..762108a
Binary files /dev/null and b/gfx/sprites/lass.png differ
diff --git a/gfx/sprites/link_receptionist.png b/gfx/sprites/link_receptionist.png
new file mode 100644
index 0000000..42050ff
Binary files /dev/null and b/gfx/sprites/link_receptionist.png differ
diff --git a/gfx/sprites/lizardon.png b/gfx/sprites/lizardon.png
new file mode 100644
index 0000000..3b6c621
Binary files /dev/null and b/gfx/sprites/lizardon.png differ
diff --git a/gfx/sprites/masaki.png b/gfx/sprites/masaki.png
new file mode 100644
index 0000000..d72bb7b
Binary files /dev/null and b/gfx/sprites/masaki.png differ
diff --git a/gfx/sprites/medium.png b/gfx/sprites/medium.png
new file mode 100644
index 0000000..62be06b
Binary files /dev/null and b/gfx/sprites/medium.png differ
diff --git a/gfx/sprites/mikan.png b/gfx/sprites/mikan.png
new file mode 100644
index 0000000..cb58ae9
Binary files /dev/null and b/gfx/sprites/mikan.png differ
diff --git a/gfx/sprites/mohawk.png b/gfx/sprites/mohawk.png
new file mode 100644
index 0000000..9634d31
Binary files /dev/null and b/gfx/sprites/mohawk.png differ
diff --git a/gfx/sprites/mom.png b/gfx/sprites/mom.png
new file mode 100644
index 0000000..5ea9e6e
Binary files /dev/null and b/gfx/sprites/mom.png differ
diff --git a/gfx/sprites/nanami.png b/gfx/sprites/nanami.png
new file mode 100644
index 0000000..84f330f
Binary files /dev/null and b/gfx/sprites/nanami.png differ
diff --git a/gfx/sprites/nurse.png b/gfx/sprites/nurse.png
new file mode 100644
index 0000000..5984b44
Binary files /dev/null and b/gfx/sprites/nurse.png differ
diff --git a/gfx/sprites/nyorobon.png b/gfx/sprites/nyorobon.png
new file mode 100644
index 0000000..058461c
Binary files /dev/null and b/gfx/sprites/nyorobon.png differ
diff --git a/gfx/sprites/officer.png b/gfx/sprites/officer.png
new file mode 100644
index 0000000..f622520
Binary files /dev/null and b/gfx/sprites/officer.png differ
diff --git a/gfx/sprites/okido.png b/gfx/sprites/okido.png
new file mode 100644
index 0000000..7a76574
Binary files /dev/null and b/gfx/sprites/okido.png differ
diff --git a/gfx/sprites/old_link_receptionist.png b/gfx/sprites/old_link_receptionist.png
new file mode 100644
index 0000000..a03cae7
Binary files /dev/null and b/gfx/sprites/old_link_receptionist.png differ
diff --git a/gfx/sprites/paper.png b/gfx/sprites/paper.png
new file mode 100644
index 0000000..ede44e8
Binary files /dev/null and b/gfx/sprites/paper.png differ
diff --git a/gfx/sprites/pawou.png b/gfx/sprites/pawou.png
new file mode 100644
index 0000000..dbd4c07
Binary files /dev/null and b/gfx/sprites/pawou.png differ
diff --git a/gfx/sprites/pippi.png b/gfx/sprites/pippi.png
new file mode 100644
index 0000000..06fe007
Binary files /dev/null and b/gfx/sprites/pippi.png differ
diff --git a/gfx/sprites/poke_ball.png b/gfx/sprites/poke_ball.png
new file mode 100644
index 0000000..dec0cd8
Binary files /dev/null and b/gfx/sprites/poke_ball.png differ
diff --git a/gfx/sprites/pokedex.png b/gfx/sprites/pokedex.png
new file mode 100644
index 0000000..4af7be4
Binary files /dev/null and b/gfx/sprites/pokedex.png differ
diff --git a/gfx/sprites/pokefan_f.png b/gfx/sprites/pokefan_f.png
new file mode 100644
index 0000000..aa1fbc0
Binary files /dev/null and b/gfx/sprites/pokefan_f.png differ
diff --git a/gfx/sprites/pokefan_m.png b/gfx/sprites/pokefan_m.png
new file mode 100644
index 0000000..fea7979
Binary files /dev/null and b/gfx/sprites/pokefan_m.png differ
diff --git a/gfx/sprites/poppo.png b/gfx/sprites/poppo.png
new file mode 100644
index 0000000..9e20099
Binary files /dev/null and b/gfx/sprites/poppo.png differ
diff --git a/gfx/sprites/receptionist.png b/gfx/sprites/receptionist.png
new file mode 100644
index 0000000..0d102b0
Binary files /dev/null and b/gfx/sprites/receptionist.png differ
diff --git a/gfx/sprites/red.png b/gfx/sprites/red.png
new file mode 100644
index 0000000..018b676
Binary files /dev/null and b/gfx/sprites/red.png differ
diff --git a/gfx/sprites/reds_mom.png b/gfx/sprites/reds_mom.png
new file mode 100644
index 0000000..5644764
Binary files /dev/null and b/gfx/sprites/reds_mom.png differ
diff --git a/gfx/sprites/rocker.png b/gfx/sprites/rocker.png
new file mode 100644
index 0000000..50ac208
Binary files /dev/null and b/gfx/sprites/rocker.png differ
diff --git a/gfx/sprites/rocket_f.png b/gfx/sprites/rocket_f.png
new file mode 100644
index 0000000..b8714ba
Binary files /dev/null and b/gfx/sprites/rocket_f.png differ
diff --git a/gfx/sprites/rocket_m.png b/gfx/sprites/rocket_m.png
new file mode 100644
index 0000000..43a71bd
Binary files /dev/null and b/gfx/sprites/rocket_m.png differ
diff --git a/gfx/sprites/sage.png b/gfx/sprites/sage.png
new file mode 100644
index 0000000..8022304
Binary files /dev/null and b/gfx/sprites/sage.png differ
diff --git a/gfx/sprites/sailor.png b/gfx/sprites/sailor.png
new file mode 100644
index 0000000..b4d3b5f
Binary files /dev/null and b/gfx/sprites/sailor.png differ
diff --git a/gfx/sprites/sakaki.png b/gfx/sprites/sakaki.png
new file mode 100644
index 0000000..2e625e1
Binary files /dev/null and b/gfx/sprites/sakaki.png differ
diff --git a/gfx/sprites/scientist.png b/gfx/sprites/scientist.png
new file mode 100644
index 0000000..39c4429
Binary files /dev/null and b/gfx/sprites/scientist.png differ
diff --git a/gfx/sprites/sidon.png b/gfx/sprites/sidon.png
new file mode 100644
index 0000000..80d615b
Binary files /dev/null and b/gfx/sprites/sidon.png differ
diff --git a/gfx/sprites/silver.png b/gfx/sprites/silver.png
new file mode 100644
index 0000000..7d82d40
Binary files /dev/null and b/gfx/sprites/silver.png differ
diff --git a/gfx/sprites/silvers_mom.png b/gfx/sprites/silvers_mom.png
new file mode 100644
index 0000000..b8e9464
Binary files /dev/null and b/gfx/sprites/silvers_mom.png differ
diff --git a/gfx/sprites/super_nerd.png b/gfx/sprites/super_nerd.png
new file mode 100644
index 0000000..6866c7b
Binary files /dev/null and b/gfx/sprites/super_nerd.png differ
diff --git a/gfx/sprites/swimmer_f.png b/gfx/sprites/swimmer_f.png
new file mode 100644
index 0000000..eed753a
Binary files /dev/null and b/gfx/sprites/swimmer_f.png differ
diff --git a/gfx/sprites/swimmer_m.png b/gfx/sprites/swimmer_m.png
new file mode 100644
index 0000000..4c1818b
Binary files /dev/null and b/gfx/sprites/swimmer_m.png differ
diff --git a/gfx/sprites/teacher.png b/gfx/sprites/teacher.png
new file mode 100644
index 0000000..2107159
Binary files /dev/null and b/gfx/sprites/teacher.png differ
diff --git a/gfx/sprites/tsukushi.png b/gfx/sprites/tsukushi.png
new file mode 100644
index 0000000..99a36a2
Binary files /dev/null and b/gfx/sprites/tsukushi.png differ
diff --git a/gfx/sprites/twin.png b/gfx/sprites/twin.png
new file mode 100644
index 0000000..caa9f43
Binary files /dev/null and b/gfx/sprites/twin.png differ
diff --git a/gfx/sprites/youngster.png b/gfx/sprites/youngster.png
new file mode 100644
index 0000000..5c0d339
Binary files /dev/null and b/gfx/sprites/youngster.png differ
diff --git a/shim.sym b/shim.sym
index 8fb54b0..f417a87 100644
--- a/shim.sym
+++ b/shim.sym
@@ -75,8 +75,6 @@
 23:4349 OverworldFadeOut
 23:60cc MenuMonIconGfx
 
-30:4000 OverworldSpriteGfx
-
 3A:4D9D _PlayCryHeader
 3A:4E22 _PlaySFX
 3A:4F11 LoadChannel
-- 
cgit v1.2.3