Kanto Mon Names (#79)

Rename Kanto mons to English

285 files changed, 292 insertions, 292 deletions

diff --git a/gfx/gfx.asm b/gfx/gfx.asm
index e0ed3ee..44e1c07 100644
--- a/gfx/gfx.asm
+++ b/gfx/gfx.asm
@@ -372,38 +372,38 @@ INCBIN "gfx/battle_anims/pointer.2bpp"
 INCBIN "gfx/battle_anims/attack_animations_2.2bpp"
 
 SECTION "gfx.asm@Pokemon Party Sprites", ROMX
-NyoromoIcon:: INCBIN "gfx/icons/nyoromo.2bpp"
-PurinIcon:: INCBIN "gfx/icons/purin.2bpp"
-DigdaIcon:: INCBIN "gfx/icons/digda.2bpp"
+PoliwagIcon:: INCBIN "gfx/icons/poliwag.2bpp"
+JigglypuffIcon:: INCBIN "gfx/icons/jigglypuff.2bpp"
+DiglettIcon:: INCBIN "gfx/icons/diglett.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"
+StaryuIcon:: INCBIN "gfx/icons/staryu.2bpp"
+MagikarpIcon:: INCBIN "gfx/icons/magikarp.2bpp"
+PidgeyIcon:: INCBIN "gfx/icons/pidgey.2bpp"
+RhydonIcon:: INCBIN "gfx/icons/rhydon.2bpp"
+ClefairyIcon:: INCBIN "gfx/icons/clefairy.2bpp"
+OddishIcon:: INCBIN "gfx/icons/oddish.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"
+GengarIcon:: INCBIN "gfx/icons/gengar.2bpp"
+LaprasIcon:: INCBIN "gfx/icons/lapras.2bpp"
+MrMimeIcon:: INCBIN "gfx/icons/mrmime.2bpp"
 LokonIcon:: INCBIN "gfx/icons/lokon.2bpp"
-KentaurosIcon:: INCBIN "gfx/icons/kentauros.2bpp"
+TaurosIcon:: INCBIN "gfx/icons/tauros.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"
+DittoIcon:: INCBIN "gfx/icons/ditto.2bpp"
+OnixIcon:: INCBIN "gfx/icons/onix.2bpp"
+VoltorbIcon:: INCBIN "gfx/icons/voltorb.2bpp"
+SquirtleIcon:: INCBIN "gfx/icons/squirtle.2bpp"
+BulbasaurIcon:: INCBIN "gfx/icons/bulbasaur.2bpp"
+CharmanderIcon:: INCBIN "gfx/icons/charmander.2bpp"
+WeedleIcon:: INCBIN "gfx/icons/weedle.2bpp"
 AnnonIcon:: INCBIN "gfx/icons/annon.2bpp"
-IsitsubuteIcon:: INCBIN "gfx/icons/isitsubute.2bpp"
-WanrikyIcon:: INCBIN "gfx/icons/wanriky.2bpp"
+GeodudeIcon:: INCBIN "gfx/icons/geodude.2bpp"
+MachopIcon:: INCBIN "gfx/icons/machop.2bpp"
 EggIcon:: INCBIN "gfx/icons/egg.2bpp"
-MenokurageIcon:: INCBIN "gfx/icons/menokurage.2bpp"
+TentacoolIcon:: INCBIN "gfx/icons/tentacool.2bpp"
 ButterfreeIcon:: INCBIN "gfx/icons/butterfree.2bpp"
 ZubatIcon:: INCBIN "gfx/icons/zubat.2bpp"
-KabigonIcon:: INCBIN "gfx/icons/kabigon.2bpp"
+SnorlaxIcon:: INCBIN "gfx/icons/snorlax.2bpp"
 
 SECTION "gfx.asm@Slot Machine GFX", ROMX
 SlotMachineGFX::
@@ -472,14 +472,14 @@ GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp"
 SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp"
 HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp"
 BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp"
-SidonSpriteGFX:: INCBIN "gfx/sprites/sidon.2bpp"
-PippiSpriteGFX:: INCBIN "gfx/sprites/pippi.2bpp"
-PoppoSpriteGFX:: INCBIN "gfx/sprites/poppo.2bpp"
-LizardonSpriteGFX:: INCBIN "gfx/sprites/lizardon.2bpp"
-KabigonSpriteGFX:: INCBIN "gfx/sprites/kabigon.2bpp"
-PawouSpriteGFX:: INCBIN "gfx/sprites/pawou.2bpp"
-NyorobonSpriteGFX:: INCBIN "gfx/sprites/nyorobon.2bpp"
-LaplaceSpriteGFX:: INCBIN "gfx/sprites/laplace.2bpp"
+RhydonSpriteGFX:: INCBIN "gfx/sprites/rhydon.2bpp"
+ClefairySpriteGFX:: INCBIN "gfx/sprites/clefairy.2bpp"
+PidgeySpriteGFX:: INCBIN "gfx/sprites/pidgey.2bpp"
+CharizardSpriteGFX:: INCBIN "gfx/sprites/charizard.2bpp"
+SnorlaxSpriteGFX:: INCBIN "gfx/sprites/snorlax.2bpp"
+SeelSpriteGFX:: INCBIN "gfx/sprites/seel.2bpp"
+PoliwrathSpriteGFX:: INCBIN "gfx/sprites/poliwrath.2bpp"
+LaprasSpriteGFX:: INCBIN "gfx/sprites/lapras.2bpp"
 PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp"
 PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp"
 PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp"
@@ -554,20 +554,20 @@ IntroForestGFX::
 INCBIN "gfx/intro/forest.2bpp"
 
 SECTION "gfx.asm@Intro Mon", ROMX
-IntroPurinPikachuGFX::
-INCBIN "gfx/intro/purin_pikachu.2bpp"
-IntroLizardon1GFX::
-INCBIN "gfx/intro/lizardon_1.2bpp"
-IntroLizardon2GFX::
-INCBIN "gfx/intro/lizardon_2.2bpp"
-IntroLizardon3GFX::
-INCBIN "gfx/intro/lizardon_3.2bpp"
-IntroLizardonFlamesGFX::
-INCBIN "gfx/intro/lizardon_flames.2bpp"
-IntroKamexGFX::
-INCBIN "gfx/intro/kamex.2bpp"
-IntroFushigibanaGFX::
-INCBIN "gfx/intro/fushigibana.2bpp"
+IntroJigglypuffPikachuGFX::
+INCBIN "gfx/intro/jigglypuff_pikachu.2bpp"
+IntroCharizard1GFX::
+INCBIN "gfx/intro/charizard_1.2bpp"
+IntroCharizard2GFX::
+INCBIN "gfx/intro/charizard_2.2bpp"
+IntroCharizard3GFX::
+INCBIN "gfx/intro/charizard_3.2bpp"
+IntroCharizardFlamesGFX::
+INCBIN "gfx/intro/charizard_flames.2bpp"
+IntroBlastoiseGFX::
+INCBIN "gfx/intro/blastoise.2bpp"
+IntroVenusaurGFX::
+INCBIN "gfx/intro/venusaur.2bpp"
 
 SECTION "gfx.asm@Misc GFX", ROMX
 FontExtraGFX::
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index 05b940c..fe01521 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -15,7 +15,7 @@ $(BUILD)/gfx/trainer_gear/town_map.2bpp: tools/gfx += --trim-trailing
 $(BUILD)/gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace
 
-$(BUILD)/gfx/intro/purin_pikachu.2bpp: tools/gfx += --trim-whitespace
+$(BUILD)/gfx/intro/jigglypuff_pikachu.2bpp: tools/gfx += --trim-whitespace
 
 $(BUILD)/gfx/battle_anims/attack_animations_1.2bpp: tools/gfx += --trim-whitespace
 $(BUILD)/gfx/battle_anims/attack_animations_2.2bpp: tools/gfx += --trim-whitespace
diff --git a/gfx/icons/fushigidane.png b/gfx/icons/bulbasaur.png
index 74cee15..74cee15 100644
--- a/gfx/icons/fushigidane.png
+++ b/gfx/icons/bulbasaur.png
diff --git a/gfx/icons/hitokage.png b/gfx/icons/charmander.png
index 3f83cba..3f83cba 100644
--- a/gfx/icons/hitokage.png
+++ b/gfx/icons/charmander.png
diff --git a/gfx/icons/pippi.png b/gfx/icons/clefairy.png
index bb8454b..bb8454b 100644
--- a/gfx/icons/pippi.png
+++ b/gfx/icons/clefairy.png
diff --git a/gfx/icons/digda.png b/gfx/icons/diglett.png
index 336c4b8..336c4b8 100644
--- a/gfx/icons/digda.png
+++ b/gfx/icons/diglett.png
diff --git a/gfx/icons/metamon.png b/gfx/icons/ditto.png
index a72faee..a72faee 100644
--- a/gfx/icons/metamon.png
+++ b/gfx/icons/ditto.png
diff --git a/gfx/icons/gangar.png b/gfx/icons/gengar.png
index 59c3e7f..59c3e7f 100644
--- a/gfx/icons/gangar.png
+++ b/gfx/icons/gengar.png
diff --git a/gfx/icons/isitsubute.png b/gfx/icons/geodude.png
index e8def42..e8def42 100644
--- a/gfx/icons/isitsubute.png
+++ b/gfx/icons/geodude.png
diff --git a/gfx/icons/purin.png b/gfx/icons/jigglypuff.png
index 63e226b..63e226b 100644
--- a/gfx/icons/purin.png
+++ b/gfx/icons/jigglypuff.png
diff --git a/gfx/icons/laplace.png b/gfx/icons/lapras.png
index 489fd85..489fd85 100644
--- a/gfx/icons/laplace.png
+++ b/gfx/icons/lapras.png
diff --git a/gfx/icons/wanriky.png b/gfx/icons/machop.png
index 21a8bde..21a8bde 100644
--- a/gfx/icons/wanriky.png
+++ b/gfx/icons/machop.png
diff --git a/gfx/icons/koiking.png b/gfx/icons/magikarp.png
index 3624402..3624402 100644
--- a/gfx/icons/koiking.png
+++ b/gfx/icons/magikarp.png
diff --git a/gfx/icons/barrierd.png b/gfx/icons/mrmime.png
index 54784f4..54784f4 100644
--- a/gfx/icons/barrierd.png
+++ b/gfx/icons/mrmime.png
diff --git a/gfx/icons/nazonokusa.png b/gfx/icons/oddish.png
index 7c36012..7c36012 100644
--- a/gfx/icons/nazonokusa.png
+++ b/gfx/icons/oddish.png
diff --git a/gfx/icons/iwark.png b/gfx/icons/onix.png
index 14e8c3a..14e8c3a 100644
--- a/gfx/icons/iwark.png
+++ b/gfx/icons/onix.png
diff --git a/gfx/icons/poppo.png b/gfx/icons/pidgey.png
index 7b025e6..7b025e6 100644
--- a/gfx/icons/poppo.png
+++ b/gfx/icons/pidgey.png
diff --git a/gfx/icons/nyoromo.png b/gfx/icons/poliwag.png
index 1de70d9..1de70d9 100644
--- a/gfx/icons/nyoromo.png
+++ b/gfx/icons/poliwag.png
diff --git a/gfx/icons/sidon.png b/gfx/icons/rhydon.png
index ac54c6f..ac54c6f 100644
--- a/gfx/icons/sidon.png
+++ b/gfx/icons/rhydon.png
diff --git a/gfx/icons/kabigon.png b/gfx/icons/snorlax.png
index f6d7e43..f6d7e43 100644
--- a/gfx/icons/kabigon.png
+++ b/gfx/icons/snorlax.png
diff --git a/gfx/icons/zenigame.png b/gfx/icons/squirtle.png
index 09a8e41..09a8e41 100644
--- a/gfx/icons/zenigame.png
+++ b/gfx/icons/squirtle.png
diff --git a/gfx/icons/hitodeman.png b/gfx/icons/staryu.png
index 97eef67..97eef67 100644
--- a/gfx/icons/hitodeman.png
+++ b/gfx/icons/staryu.png
diff --git a/gfx/icons/kentauros.png b/gfx/icons/tauros.png
index d76634c..d76634c 100644
--- a/gfx/icons/kentauros.png
+++ b/gfx/icons/tauros.png
diff --git a/gfx/icons/menokurage.png b/gfx/icons/tentacool.png
index 761bc3f..761bc3f 100644
--- a/gfx/icons/menokurage.png
+++ b/gfx/icons/tentacool.png
diff --git a/gfx/icons/biriridama.png b/gfx/icons/voltorb.png
index 8b30886..8b30886 100644
--- a/gfx/icons/biriridama.png
+++ b/gfx/icons/voltorb.png
diff --git a/gfx/icons/beedle.png b/gfx/icons/weedle.png
index bbaa3d6..bbaa3d6 100644
--- a/gfx/icons/beedle.png
+++ b/gfx/icons/weedle.png
diff --git a/gfx/intro/kamex.png b/gfx/intro/blastoise.png
index 255ca08..255ca08 100644
--- a/gfx/intro/kamex.png
+++ b/gfx/intro/blastoise.png
diff --git a/gfx/intro/lizardon_1.png b/gfx/intro/charizard_1.png
index 0aa062c..0aa062c 100644
--- a/gfx/intro/lizardon_1.png
+++ b/gfx/intro/charizard_1.png
diff --git a/gfx/intro/lizardon_2.png b/gfx/intro/charizard_2.png
index a3e7ff3..a3e7ff3 100644
--- a/gfx/intro/lizardon_2.png
+++ b/gfx/intro/charizard_2.png
diff --git a/gfx/intro/lizardon_3.png b/gfx/intro/charizard_3.png
index be9e22a..be9e22a 100644
--- a/gfx/intro/lizardon_3.png
+++ b/gfx/intro/charizard_3.png
diff --git a/gfx/intro/lizardon_flames.png b/gfx/intro/charizard_flames.png
index 2b99a62..2b99a62 100644
--- a/gfx/intro/lizardon_flames.png
+++ b/gfx/intro/charizard_flames.png
diff --git a/gfx/intro/purin_pikachu.png b/gfx/intro/jigglypuff_pikachu.png
index eab3c2d..eab3c2d 100644
--- a/gfx/intro/purin_pikachu.png
+++ b/gfx/intro/jigglypuff_pikachu.png
diff --git a/gfx/intro/fushigibana.png b/gfx/intro/venusaur.png
index 784a1c0..784a1c0 100644
--- a/gfx/intro/fushigibana.png
+++ b/gfx/intro/venusaur.png
diff --git a/gfx/pokemon/casey/back.png b/gfx/pokemon/abra/back.png
index 8e872cf..8e872cf 100644
--- a/gfx/pokemon/casey/back.png
+++ b/gfx/pokemon/abra/back.png
diff --git a/gfx/pokemon/casey/front.png b/gfx/pokemon/abra/front.png
index 12045ee..12045ee 100644
--- a/gfx/pokemon/casey/front.png
+++ b/gfx/pokemon/abra/front.png
diff --git a/gfx/pokemon/ptera/back.png b/gfx/pokemon/aerodactyl/back.png
index 8c51349..8c51349 100644
--- a/gfx/pokemon/ptera/back.png
+++ b/gfx/pokemon/aerodactyl/back.png
diff --git a/gfx/pokemon/ptera/front.png b/gfx/pokemon/aerodactyl/front.png
index 4cbfdee..4cbfdee 100644
--- a/gfx/pokemon/ptera/front.png
+++ b/gfx/pokemon/aerodactyl/front.png
diff --git a/gfx/pokemon/foodin/back.png b/gfx/pokemon/alakazam/back.png
index 1e31a7d..1e31a7d 100644
--- a/gfx/pokemon/foodin/back.png
+++ b/gfx/pokemon/alakazam/back.png
diff --git a/gfx/pokemon/foodin/front.png b/gfx/pokemon/alakazam/front.png
index 9c379b6..9c379b6 100644
--- a/gfx/pokemon/foodin/front.png
+++ b/gfx/pokemon/alakazam/front.png
diff --git a/gfx/pokemon/windie/back.png b/gfx/pokemon/arcanine/back.png
index b4aa719..b4aa719 100644
--- a/gfx/pokemon/windie/back.png
+++ b/gfx/pokemon/arcanine/back.png
diff --git a/gfx/pokemon/windie/front.png b/gfx/pokemon/arcanine/front.png
index a60bf37..a60bf37 100644
--- a/gfx/pokemon/windie/front.png
+++ b/gfx/pokemon/arcanine/front.png
diff --git a/gfx/pokemon/freezer/back.png b/gfx/pokemon/articuno/back.png
index a17f977..a17f977 100644
--- a/gfx/pokemon/freezer/back.png
+++ b/gfx/pokemon/articuno/back.png
diff --git a/gfx/pokemon/freezer/front.png b/gfx/pokemon/articuno/front.png
index 66986ad..66986ad 100644
--- a/gfx/pokemon/freezer/front.png
+++ b/gfx/pokemon/articuno/front.png
diff --git a/gfx/pokemon/spear/back.png b/gfx/pokemon/beedrill/back.png
index 60ac706..60ac706 100644
--- a/gfx/pokemon/spear/back.png
+++ b/gfx/pokemon/beedrill/back.png
diff --git a/gfx/pokemon/spear/front.png b/gfx/pokemon/beedrill/front.png
index 9a640d1..9a640d1 100644
--- a/gfx/pokemon/spear/front.png
+++ b/gfx/pokemon/beedrill/front.png
diff --git a/gfx/pokemon/madatsubomi/back.png b/gfx/pokemon/bellsprout/back.png
index d668f24..d668f24 100644
--- a/gfx/pokemon/madatsubomi/back.png
+++ b/gfx/pokemon/bellsprout/back.png
diff --git a/gfx/pokemon/madatsubomi/front.png b/gfx/pokemon/bellsprout/front.png
index 4099321..4099321 100644
--- a/gfx/pokemon/madatsubomi/front.png
+++ b/gfx/pokemon/bellsprout/front.png
diff --git a/gfx/pokemon/kamex/back.png b/gfx/pokemon/blastoise/back.png
index 087a374..087a374 100644
--- a/gfx/pokemon/kamex/back.png
+++ b/gfx/pokemon/blastoise/back.png
diff --git a/gfx/pokemon/kamex/front.png b/gfx/pokemon/blastoise/front.png
index 00480e7..00480e7 100644
--- a/gfx/pokemon/kamex/front.png
+++ b/gfx/pokemon/blastoise/front.png
diff --git a/gfx/pokemon/fushigidane/back.png b/gfx/pokemon/bulbasaur/back.png
index 4f1c96f..4f1c96f 100644
--- a/gfx/pokemon/fushigidane/back.png
+++ b/gfx/pokemon/bulbasaur/back.png
diff --git a/gfx/pokemon/fushigidane/front.png b/gfx/pokemon/bulbasaur/front.png
index 8eb7345..8eb7345 100644
--- a/gfx/pokemon/fushigidane/front.png
+++ b/gfx/pokemon/bulbasaur/front.png
diff --git a/gfx/pokemon/lucky/back.png b/gfx/pokemon/chansey/back.png
index 70702fa..70702fa 100644
--- a/gfx/pokemon/lucky/back.png
+++ b/gfx/pokemon/chansey/back.png
diff --git a/gfx/pokemon/lucky/front.png b/gfx/pokemon/chansey/front.png
index f676e4c..f676e4c 100644
--- a/gfx/pokemon/lucky/front.png
+++ b/gfx/pokemon/chansey/front.png
diff --git a/gfx/pokemon/lizardon/back.png b/gfx/pokemon/charizard/back.png
index 8201f50..8201f50 100644
--- a/gfx/pokemon/lizardon/back.png
+++ b/gfx/pokemon/charizard/back.png
diff --git a/gfx/pokemon/lizardon/front.png b/gfx/pokemon/charizard/front.png
index cc60d90..cc60d90 100644
--- a/gfx/pokemon/lizardon/front.png
+++ b/gfx/pokemon/charizard/front.png
diff --git a/gfx/pokemon/hitokage/back.png b/gfx/pokemon/charmander/back.png
index 218ad76..218ad76 100644
--- a/gfx/pokemon/hitokage/back.png
+++ b/gfx/pokemon/charmander/back.png
diff --git a/gfx/pokemon/hitokage/front.png b/gfx/pokemon/charmander/front.png
index 712ef16..712ef16 100644
--- a/gfx/pokemon/hitokage/front.png
+++ b/gfx/pokemon/charmander/front.png
diff --git a/gfx/pokemon/lizardo/back.png b/gfx/pokemon/charmeleon/back.png
index 7351704..7351704 100644
--- a/gfx/pokemon/lizardo/back.png
+++ b/gfx/pokemon/charmeleon/back.png
diff --git a/gfx/pokemon/lizardo/front.png b/gfx/pokemon/charmeleon/front.png
index 10a4a0d..10a4a0d 100644
--- a/gfx/pokemon/lizardo/front.png
+++ b/gfx/pokemon/charmeleon/front.png
diff --git a/gfx/pokemon/pixy/back.png b/gfx/pokemon/clefable/back.png
index 72f8840..72f8840 100644
--- a/gfx/pokemon/pixy/back.png
+++ b/gfx/pokemon/clefable/back.png
diff --git a/gfx/pokemon/pixy/front.png b/gfx/pokemon/clefable/front.png
index f9c6396..f9c6396 100644
--- a/gfx/pokemon/pixy/front.png
+++ b/gfx/pokemon/clefable/front.png
diff --git a/gfx/pokemon/pippi/back.png b/gfx/pokemon/clefairy/back.png
index b83889d..b83889d 100644
--- a/gfx/pokemon/pippi/back.png
+++ b/gfx/pokemon/clefairy/back.png
diff --git a/gfx/pokemon/pippi/front.png b/gfx/pokemon/clefairy/front.png
index cabeea7..cabeea7 100644
--- a/gfx/pokemon/pippi/front.png
+++ b/gfx/pokemon/clefairy/front.png
diff --git a/gfx/pokemon/parshen/back.png b/gfx/pokemon/cloyster/back.png
index 328be06..328be06 100644
--- a/gfx/pokemon/parshen/back.png
+++ b/gfx/pokemon/cloyster/back.png
diff --git a/gfx/pokemon/parshen/front.png b/gfx/pokemon/cloyster/front.png
index 2ae6546..2ae6546 100644
--- a/gfx/pokemon/parshen/front.png
+++ b/gfx/pokemon/cloyster/front.png
diff --git a/gfx/pokemon/karakara/back.png b/gfx/pokemon/cubone/back.png
index 7b8ce3d..7b8ce3d 100644
--- a/gfx/pokemon/karakara/back.png
+++ b/gfx/pokemon/cubone/back.png
diff --git a/gfx/pokemon/karakara/front.png b/gfx/pokemon/cubone/front.png
index 23e3a23..23e3a23 100644
--- a/gfx/pokemon/karakara/front.png
+++ b/gfx/pokemon/cubone/front.png
diff --git a/gfx/pokemon/jugon/back.png b/gfx/pokemon/dewgong/back.png
index a8ebfa1..a8ebfa1 100644
--- a/gfx/pokemon/jugon/back.png
+++ b/gfx/pokemon/dewgong/back.png
diff --git a/gfx/pokemon/jugon/front.png b/gfx/pokemon/dewgong/front.png
index 1acc0b9..1acc0b9 100644
--- a/gfx/pokemon/jugon/front.png
+++ b/gfx/pokemon/dewgong/front.png
diff --git a/gfx/pokemon/digda/back.png b/gfx/pokemon/diglett/back.png
index 2e32dde..2e32dde 100644
--- a/gfx/pokemon/digda/back.png
+++ b/gfx/pokemon/diglett/back.png
diff --git a/gfx/pokemon/digda/front.png b/gfx/pokemon/diglett/front.png
index 1339078..1339078 100644
--- a/gfx/pokemon/digda/front.png
+++ b/gfx/pokemon/diglett/front.png
diff --git a/gfx/pokemon/metamon/back.png b/gfx/pokemon/ditto/back.png
index 11d8a81..11d8a81 100644
--- a/gfx/pokemon/metamon/back.png
+++ b/gfx/pokemon/ditto/back.png
diff --git a/gfx/pokemon/metamon/front.png b/gfx/pokemon/ditto/front.png
index e2e944f..e2e944f 100644
--- a/gfx/pokemon/metamon/front.png
+++ b/gfx/pokemon/ditto/front.png
diff --git a/gfx/pokemon/dodorio/back.png b/gfx/pokemon/dodrio/back.png
index 0c91362..0c91362 100644
--- a/gfx/pokemon/dodorio/back.png
+++ b/gfx/pokemon/dodrio/back.png
diff --git a/gfx/pokemon/dodorio/front.png b/gfx/pokemon/dodrio/front.png
index 6404d4a..6404d4a 100644
--- a/gfx/pokemon/dodorio/front.png
+++ b/gfx/pokemon/dodrio/front.png
diff --git a/gfx/pokemon/dodo/back.png b/gfx/pokemon/doduo/back.png
index 926e521..926e521 100644
--- a/gfx/pokemon/dodo/back.png
+++ b/gfx/pokemon/doduo/back.png
diff --git a/gfx/pokemon/dodo/front.png b/gfx/pokemon/doduo/front.png
index 73a0b26..73a0b26 100644
--- a/gfx/pokemon/dodo/front.png
+++ b/gfx/pokemon/doduo/front.png
diff --git a/gfx/pokemon/hakuryu/back.png b/gfx/pokemon/dragonair/back.png
index 03a9d57..03a9d57 100644
--- a/gfx/pokemon/hakuryu/back.png
+++ b/gfx/pokemon/dragonair/back.png
diff --git a/gfx/pokemon/hakuryu/front.png b/gfx/pokemon/dragonair/front.png
index b8eaef6..b8eaef6 100644
--- a/gfx/pokemon/hakuryu/front.png
+++ b/gfx/pokemon/dragonair/front.png
diff --git a/gfx/pokemon/kairyu/back.png b/gfx/pokemon/dragonite/back.png
index fb93e2f..fb93e2f 100644
--- a/gfx/pokemon/kairyu/back.png
+++ b/gfx/pokemon/dragonite/back.png
diff --git a/gfx/pokemon/kairyu/front.png b/gfx/pokemon/dragonite/front.png
index a3edb82..a3edb82 100644
--- a/gfx/pokemon/kairyu/front.png
+++ b/gfx/pokemon/dragonite/front.png
diff --git a/gfx/pokemon/miniryu/back.png b/gfx/pokemon/dratini/back.png
index bdffa59..bdffa59 100644
--- a/gfx/pokemon/miniryu/back.png
+++ b/gfx/pokemon/dratini/back.png
diff --git a/gfx/pokemon/miniryu/front.png b/gfx/pokemon/dratini/front.png
index 1fcef94..1fcef94 100644
--- a/gfx/pokemon/miniryu/front.png
+++ b/gfx/pokemon/dratini/front.png
diff --git a/gfx/pokemon/sleepe/back.png b/gfx/pokemon/drowzee/back.png
index 0a0fafa..0a0fafa 100644
--- a/gfx/pokemon/sleepe/back.png
+++ b/gfx/pokemon/drowzee/back.png
diff --git a/gfx/pokemon/sleepe/front.png b/gfx/pokemon/drowzee/front.png
index cc85510..cc85510 100644
--- a/gfx/pokemon/sleepe/front.png
+++ b/gfx/pokemon/drowzee/front.png
diff --git a/gfx/pokemon/eievui/back.png b/gfx/pokemon/eevee/back.png
index 5fc5228..5fc5228 100644
--- a/gfx/pokemon/eievui/back.png
+++ b/gfx/pokemon/eevee/back.png
diff --git a/gfx/pokemon/eievui/front.png b/gfx/pokemon/eevee/front.png
index 38df0b0..38df0b0 100644
--- a/gfx/pokemon/eievui/front.png
+++ b/gfx/pokemon/eevee/front.png
diff --git a/gfx/pokemon/arbo/back.png b/gfx/pokemon/ekans/back.png
index 9175e22..9175e22 100644
--- a/gfx/pokemon/arbo/back.png
+++ b/gfx/pokemon/ekans/back.png
diff --git a/gfx/pokemon/arbo/front.png b/gfx/pokemon/ekans/front.png
index 48ceba3..48ceba3 100644
--- a/gfx/pokemon/arbo/front.png
+++ b/gfx/pokemon/ekans/front.png
diff --git a/gfx/pokemon/eleboo/back.png b/gfx/pokemon/electabuzz/back.png
index d6685e5..d6685e5 100644
--- a/gfx/pokemon/eleboo/back.png
+++ b/gfx/pokemon/electabuzz/back.png
diff --git a/gfx/pokemon/eleboo/front.png b/gfx/pokemon/electabuzz/front.png
index 0ddccbe..0ddccbe 100644
--- a/gfx/pokemon/eleboo/front.png
+++ b/gfx/pokemon/electabuzz/front.png
diff --git a/gfx/pokemon/marumine/back.png b/gfx/pokemon/electrode/back.png
index 90880ac..90880ac 100644
--- a/gfx/pokemon/marumine/back.png
+++ b/gfx/pokemon/electrode/back.png
diff --git a/gfx/pokemon/marumine/front.png b/gfx/pokemon/electrode/front.png
index 8df79e6..8df79e6 100644
--- a/gfx/pokemon/marumine/front.png
+++ b/gfx/pokemon/electrode/front.png
diff --git a/gfx/pokemon/tamatama/back.png b/gfx/pokemon/exeggcute/back.png
index 905fe76..905fe76 100644
--- a/gfx/pokemon/tamatama/back.png
+++ b/gfx/pokemon/exeggcute/back.png
diff --git a/gfx/pokemon/tamatama/front.png b/gfx/pokemon/exeggcute/front.png
index 0ddf8e3..0ddf8e3 100644
--- a/gfx/pokemon/tamatama/front.png
+++ b/gfx/pokemon/exeggcute/front.png
diff --git a/gfx/pokemon/nassy/back.png b/gfx/pokemon/exeggutor/back.png
index 01bb87d..01bb87d 100644
--- a/gfx/pokemon/nassy/back.png
+++ b/gfx/pokemon/exeggutor/back.png
diff --git a/gfx/pokemon/nassy/front.png b/gfx/pokemon/exeggutor/front.png
index 3e8d37c..3e8d37c 100644
--- a/gfx/pokemon/nassy/front.png
+++ b/gfx/pokemon/exeggutor/front.png
diff --git a/gfx/pokemon/kamonegi/back.png b/gfx/pokemon/farfetchd/back.png
index cca3371..cca3371 100644
--- a/gfx/pokemon/kamonegi/back.png
+++ b/gfx/pokemon/farfetchd/back.png
diff --git a/gfx/pokemon/kamonegi/front.png b/gfx/pokemon/farfetchd/front.png
index 9238f94..9238f94 100644
--- a/gfx/pokemon/kamonegi/front.png
+++ b/gfx/pokemon/farfetchd/front.png
diff --git a/gfx/pokemon/onidrill/back.png b/gfx/pokemon/fearow/back.png
index 3e0108b..3e0108b 100644
--- a/gfx/pokemon/onidrill/back.png
+++ b/gfx/pokemon/fearow/back.png
diff --git a/gfx/pokemon/onidrill/front.png b/gfx/pokemon/fearow/front.png
index c2c6525..c2c6525 100644
--- a/gfx/pokemon/onidrill/front.png
+++ b/gfx/pokemon/fearow/front.png
diff --git a/gfx/pokemon/booster/back.png b/gfx/pokemon/flareon/back.png
index 61c420a..61c420a 100644
--- a/gfx/pokemon/booster/back.png
+++ b/gfx/pokemon/flareon/back.png
diff --git a/gfx/pokemon/booster/front.png b/gfx/pokemon/flareon/front.png
index 2fb6526..2fb6526 100644
--- a/gfx/pokemon/booster/front.png
+++ b/gfx/pokemon/flareon/front.png
diff --git a/gfx/pokemon/ghos/back.png b/gfx/pokemon/gastly/back.png
index 6f36886..6f36886 100644
--- a/gfx/pokemon/ghos/back.png
+++ b/gfx/pokemon/gastly/back.png
diff --git a/gfx/pokemon/ghos/front.png b/gfx/pokemon/gastly/front.png
index 5afb2f0..5afb2f0 100644
--- a/gfx/pokemon/ghos/front.png
+++ b/gfx/pokemon/gastly/front.png
diff --git a/gfx/pokemon/gangar/back.png b/gfx/pokemon/gengar/back.png
index 0c467d0..0c467d0 100644
--- a/gfx/pokemon/gangar/back.png
+++ b/gfx/pokemon/gengar/back.png
diff --git a/gfx/pokemon/gangar/front.png b/gfx/pokemon/gengar/front.png
index 02a6b3f..02a6b3f 100644
--- a/gfx/pokemon/gangar/front.png
+++ b/gfx/pokemon/gengar/front.png
diff --git a/gfx/pokemon/isitsubute/back.png b/gfx/pokemon/geodude/back.png
index 1f6c711..1f6c711 100644
--- a/gfx/pokemon/isitsubute/back.png
+++ b/gfx/pokemon/geodude/back.png
diff --git a/gfx/pokemon/isitsubute/front.png b/gfx/pokemon/geodude/front.png
index 4202192..4202192 100644
--- a/gfx/pokemon/isitsubute/front.png
+++ b/gfx/pokemon/geodude/front.png
diff --git a/gfx/pokemon/kusaihana/back.png b/gfx/pokemon/gloom/back.png
index 046acb1..046acb1 100644
--- a/gfx/pokemon/kusaihana/back.png
+++ b/gfx/pokemon/gloom/back.png
diff --git a/gfx/pokemon/kusaihana/front.png b/gfx/pokemon/gloom/front.png
index 3d144b0..3d144b0 100644
--- a/gfx/pokemon/kusaihana/front.png
+++ b/gfx/pokemon/gloom/front.png
diff --git a/gfx/pokemon/tosakinto/back.png b/gfx/pokemon/goldeen/back.png
index 9b364b4..9b364b4 100644
--- a/gfx/pokemon/tosakinto/back.png
+++ b/gfx/pokemon/goldeen/back.png
diff --git a/gfx/pokemon/tosakinto/front.png b/gfx/pokemon/goldeen/front.png
index 155d1d9..155d1d9 100644
--- a/gfx/pokemon/tosakinto/front.png
+++ b/gfx/pokemon/goldeen/front.png
diff --git a/gfx/pokemon/golonya/back.png b/gfx/pokemon/golem/back.png
index 186af7e..186af7e 100644
--- a/gfx/pokemon/golonya/back.png
+++ b/gfx/pokemon/golem/back.png
diff --git a/gfx/pokemon/golonya/front.png b/gfx/pokemon/golem/front.png
index 9309da7..9309da7 100644
--- a/gfx/pokemon/golonya/front.png
+++ b/gfx/pokemon/golem/front.png
diff --git a/gfx/pokemon/golone/back.png b/gfx/pokemon/graveler/back.png
index 0af022c..0af022c 100644
--- a/gfx/pokemon/golone/back.png
+++ b/gfx/pokemon/graveler/back.png
diff --git a/gfx/pokemon/golone/front.png b/gfx/pokemon/graveler/front.png
index cdc8bc2..cdc8bc2 100644
--- a/gfx/pokemon/golone/front.png
+++ b/gfx/pokemon/graveler/front.png
diff --git a/gfx/pokemon/betbeter/back.png b/gfx/pokemon/grimer/back.png
index b0b35f8..b0b35f8 100644
--- a/gfx/pokemon/betbeter/back.png
+++ b/gfx/pokemon/grimer/back.png
diff --git a/gfx/pokemon/betbeter/front.png b/gfx/pokemon/grimer/front.png
index 57d4644..57d4644 100644
--- a/gfx/pokemon/betbeter/front.png
+++ b/gfx/pokemon/grimer/front.png
diff --git a/gfx/pokemon/gardie/back.png b/gfx/pokemon/growlithe/back.png
index 2b55504..2b55504 100644
--- a/gfx/pokemon/gardie/back.png
+++ b/gfx/pokemon/growlithe/back.png
diff --git a/gfx/pokemon/gardie/front.png b/gfx/pokemon/growlithe/front.png
index 4c94abd..4c94abd 100644
--- a/gfx/pokemon/gardie/front.png
+++ b/gfx/pokemon/growlithe/front.png
diff --git a/gfx/pokemon/ghost/back.png b/gfx/pokemon/haunter/back.png
index df7a51e..df7a51e 100644
--- a/gfx/pokemon/ghost/back.png
+++ b/gfx/pokemon/haunter/back.png
diff --git a/gfx/pokemon/ghost/front.png b/gfx/pokemon/haunter/front.png
index 3f824cb..3f824cb 100644
--- a/gfx/pokemon/ghost/front.png
+++ b/gfx/pokemon/haunter/front.png
diff --git a/gfx/pokemon/ebiwalar/back.png b/gfx/pokemon/hitmonchan/back.png
index 6910754..6910754 100644
--- a/gfx/pokemon/ebiwalar/back.png
+++ b/gfx/pokemon/hitmonchan/back.png
diff --git a/gfx/pokemon/ebiwalar/front.png b/gfx/pokemon/hitmonchan/front.png
index d8a6ffd..d8a6ffd 100644
--- a/gfx/pokemon/ebiwalar/front.png
+++ b/gfx/pokemon/hitmonchan/front.png
diff --git a/gfx/pokemon/sawamular/back.png b/gfx/pokemon/hitmonlee/back.png
index e66fac4..e66fac4 100644
--- a/gfx/pokemon/sawamular/back.png
+++ b/gfx/pokemon/hitmonlee/back.png
diff --git a/gfx/pokemon/sawamular/front.png b/gfx/pokemon/hitmonlee/front.png
index 36042c6..36042c6 100644
--- a/gfx/pokemon/sawamular/front.png
+++ b/gfx/pokemon/hitmonlee/front.png
diff --git a/gfx/pokemon/tattu/back.png b/gfx/pokemon/horsea/back.png
index 2b870fa..2b870fa 100644
--- a/gfx/pokemon/tattu/back.png
+++ b/gfx/pokemon/horsea/back.png
diff --git a/gfx/pokemon/tattu/front.png b/gfx/pokemon/horsea/front.png
index 3afa531..3afa531 100644
--- a/gfx/pokemon/tattu/front.png
+++ b/gfx/pokemon/horsea/front.png
diff --git a/gfx/pokemon/sleeper/back.png b/gfx/pokemon/hypno/back.png
index 8a6242f..8a6242f 100644
--- a/gfx/pokemon/sleeper/back.png
+++ b/gfx/pokemon/hypno/back.png
diff --git a/gfx/pokemon/sleeper/front.png b/gfx/pokemon/hypno/front.png
index 0344c19..0344c19 100644
--- a/gfx/pokemon/sleeper/front.png
+++ b/gfx/pokemon/hypno/front.png
diff --git a/gfx/pokemon/fushigisou/back.png b/gfx/pokemon/ivysaur/back.png
index b9492e1..b9492e1 100644
--- a/gfx/pokemon/fushigisou/back.png
+++ b/gfx/pokemon/ivysaur/back.png
diff --git a/gfx/pokemon/fushigisou/front.png b/gfx/pokemon/ivysaur/front.png
index ebf3a16..ebf3a16 100644
--- a/gfx/pokemon/fushigisou/front.png
+++ b/gfx/pokemon/ivysaur/front.png
diff --git a/gfx/pokemon/purin/back.png b/gfx/pokemon/jigglypuff/back.png
index 6314ace..6314ace 100644
--- a/gfx/pokemon/purin/back.png
+++ b/gfx/pokemon/jigglypuff/back.png
diff --git a/gfx/pokemon/purin/front.png b/gfx/pokemon/jigglypuff/front.png
index 27fa318..27fa318 100644
--- a/gfx/pokemon/purin/front.png
+++ b/gfx/pokemon/jigglypuff/front.png
diff --git a/gfx/pokemon/thunders/back.png b/gfx/pokemon/jolteon/back.png
index 591975f..591975f 100644
--- a/gfx/pokemon/thunders/back.png
+++ b/gfx/pokemon/jolteon/back.png
diff --git a/gfx/pokemon/thunders/front.png b/gfx/pokemon/jolteon/front.png
index e4e81ad..e4e81ad 100644
--- a/gfx/pokemon/thunders/front.png
+++ b/gfx/pokemon/jolteon/front.png
diff --git a/gfx/pokemon/rougela/back.png b/gfx/pokemon/jynx/back.png
index 32d1a56..32d1a56 100644
--- a/gfx/pokemon/rougela/back.png
+++ b/gfx/pokemon/jynx/back.png
diff --git a/gfx/pokemon/rougela/front.png b/gfx/pokemon/jynx/front.png
index 9a8c061..9a8c061 100644
--- a/gfx/pokemon/rougela/front.png
+++ b/gfx/pokemon/jynx/front.png
diff --git a/gfx/pokemon/yungerer/back.png b/gfx/pokemon/kadabra/back.png
index da6f89c..da6f89c 100644
--- a/gfx/pokemon/yungerer/back.png
+++ b/gfx/pokemon/kadabra/back.png
diff --git a/gfx/pokemon/yungerer/front.png b/gfx/pokemon/kadabra/front.png
index 3658944..3658944 100644
--- a/gfx/pokemon/yungerer/front.png
+++ b/gfx/pokemon/kadabra/front.png
diff --git a/gfx/pokemon/cocoon/back.png b/gfx/pokemon/kakuna/back.png
index 77738d4..77738d4 100644
--- a/gfx/pokemon/cocoon/back.png
+++ b/gfx/pokemon/kakuna/back.png
diff --git a/gfx/pokemon/cocoon/front.png b/gfx/pokemon/kakuna/front.png
index 4ba336d..4ba336d 100644
--- a/gfx/pokemon/cocoon/front.png
+++ b/gfx/pokemon/kakuna/front.png
diff --git a/gfx/pokemon/garura/back.png b/gfx/pokemon/kangaskhan/back.png
index 3a3a757..3a3a757 100644
--- a/gfx/pokemon/garura/back.png
+++ b/gfx/pokemon/kangaskhan/back.png
diff --git a/gfx/pokemon/garura/front.png b/gfx/pokemon/kangaskhan/front.png
index 1c0ba99..1c0ba99 100644
--- a/gfx/pokemon/garura/front.png
+++ b/gfx/pokemon/kangaskhan/front.png
diff --git a/gfx/pokemon/dogars/back.png b/gfx/pokemon/koffing/back.png
index 7d08ad2..7d08ad2 100644
--- a/gfx/pokemon/dogars/back.png
+++ b/gfx/pokemon/koffing/back.png
diff --git a/gfx/pokemon/dogars/front.png b/gfx/pokemon/koffing/front.png
index 2021abb..2021abb 100644
--- a/gfx/pokemon/dogars/front.png
+++ b/gfx/pokemon/koffing/front.png
diff --git a/gfx/pokemon/crab/back.png b/gfx/pokemon/krabby/back.png
index 3690410..3690410 100644
--- a/gfx/pokemon/crab/back.png
+++ b/gfx/pokemon/krabby/back.png
diff --git a/gfx/pokemon/crab/front.png b/gfx/pokemon/krabby/front.png
index b280e8d..b280e8d 100644
--- a/gfx/pokemon/crab/front.png
+++ b/gfx/pokemon/krabby/front.png
diff --git a/gfx/pokemon/laplace/back.png b/gfx/pokemon/lapras/back.png
index 5501efc..5501efc 100644
--- a/gfx/pokemon/laplace/back.png
+++ b/gfx/pokemon/lapras/back.png
diff --git a/gfx/pokemon/laplace/front.png b/gfx/pokemon/lapras/front.png
index 822c00e..822c00e 100644
--- a/gfx/pokemon/laplace/front.png
+++ b/gfx/pokemon/lapras/front.png
diff --git a/gfx/pokemon/beroringa/back.png b/gfx/pokemon/lickitung/back.png
index cb916df..cb916df 100644
--- a/gfx/pokemon/beroringa/back.png
+++ b/gfx/pokemon/lickitung/back.png
diff --git a/gfx/pokemon/beroringa/front.png b/gfx/pokemon/lickitung/front.png
index 4176577..4176577 100644
--- a/gfx/pokemon/beroringa/front.png
+++ b/gfx/pokemon/lickitung/front.png
diff --git a/gfx/pokemon/kairiky/back.png b/gfx/pokemon/machamp/back.png
index 6f64b7a..6f64b7a 100644
--- a/gfx/pokemon/kairiky/back.png
+++ b/gfx/pokemon/machamp/back.png
diff --git a/gfx/pokemon/kairiky/front.png b/gfx/pokemon/machamp/front.png
index c854a2c..c854a2c 100644
--- a/gfx/pokemon/kairiky/front.png
+++ b/gfx/pokemon/machamp/front.png
diff --git a/gfx/pokemon/goriky/back.png b/gfx/pokemon/machoke/back.png
index 62d77de..62d77de 100644
--- a/gfx/pokemon/goriky/back.png
+++ b/gfx/pokemon/machoke/back.png
diff --git a/gfx/pokemon/goriky/front.png b/gfx/pokemon/machoke/front.png
index 3f3db5e..3f3db5e 100644
--- a/gfx/pokemon/goriky/front.png
+++ b/gfx/pokemon/machoke/front.png
diff --git a/gfx/pokemon/wanriky/back.png b/gfx/pokemon/machop/back.png
index e8157dd..e8157dd 100644
--- a/gfx/pokemon/wanriky/back.png
+++ b/gfx/pokemon/machop/back.png
diff --git a/gfx/pokemon/wanriky/front.png b/gfx/pokemon/machop/front.png
index 18eac7a..18eac7a 100644
--- a/gfx/pokemon/wanriky/front.png
+++ b/gfx/pokemon/machop/front.png
diff --git a/gfx/pokemon/koiking/back.png b/gfx/pokemon/magikarp/back.png
index ae1ba54..ae1ba54 100644
--- a/gfx/pokemon/koiking/back.png
+++ b/gfx/pokemon/magikarp/back.png
diff --git a/gfx/pokemon/koiking/front.png b/gfx/pokemon/magikarp/front.png
index e71402f..e71402f 100644
--- a/gfx/pokemon/koiking/front.png
+++ b/gfx/pokemon/magikarp/front.png
diff --git a/gfx/pokemon/boober/back.png b/gfx/pokemon/magmar/back.png
index 7909354..7909354 100644
--- a/gfx/pokemon/boober/back.png
+++ b/gfx/pokemon/magmar/back.png
diff --git a/gfx/pokemon/boober/front.png b/gfx/pokemon/magmar/front.png
index 9bc1d92..9bc1d92 100644
--- a/gfx/pokemon/boober/front.png
+++ b/gfx/pokemon/magmar/front.png
diff --git a/gfx/pokemon/coil/back.png b/gfx/pokemon/magnemite/back.png
index 5da6f47..5da6f47 100644
--- a/gfx/pokemon/coil/back.png
+++ b/gfx/pokemon/magnemite/back.png
diff --git a/gfx/pokemon/coil/front.png b/gfx/pokemon/magnemite/front.png
index f2254be..f2254be 100644
--- a/gfx/pokemon/coil/front.png
+++ b/gfx/pokemon/magnemite/front.png
diff --git a/gfx/pokemon/rarecoil/back.png b/gfx/pokemon/magneton/back.png
index 28e5da9..28e5da9 100644
--- a/gfx/pokemon/rarecoil/back.png
+++ b/gfx/pokemon/magneton/back.png
diff --git a/gfx/pokemon/rarecoil/front.png b/gfx/pokemon/magneton/front.png
index 3d9c190..3d9c190 100644
--- a/gfx/pokemon/rarecoil/front.png
+++ b/gfx/pokemon/magneton/front.png
diff --git a/gfx/pokemon/garagara/back.png b/gfx/pokemon/marowak/back.png
index 4c7e62d..4c7e62d 100644
--- a/gfx/pokemon/garagara/back.png
+++ b/gfx/pokemon/marowak/back.png
diff --git a/gfx/pokemon/garagara/front.png b/gfx/pokemon/marowak/front.png
index b2d1843..b2d1843 100644
--- a/gfx/pokemon/garagara/front.png
+++ b/gfx/pokemon/marowak/front.png
diff --git a/gfx/pokemon/nyarth/back.png b/gfx/pokemon/meowth/back.png
index 1ccfe01..1ccfe01 100644
--- a/gfx/pokemon/nyarth/back.png
+++ b/gfx/pokemon/meowth/back.png
diff --git a/gfx/pokemon/nyarth/front.png b/gfx/pokemon/meowth/front.png
index e21b749..e21b749 100644
--- a/gfx/pokemon/nyarth/front.png
+++ b/gfx/pokemon/meowth/front.png
diff --git a/gfx/pokemon/transel/back.png b/gfx/pokemon/metapod/back.png
index aba701f..aba701f 100644
--- a/gfx/pokemon/transel/back.png
+++ b/gfx/pokemon/metapod/back.png
diff --git a/gfx/pokemon/transel/front.png b/gfx/pokemon/metapod/front.png
index 129dca0..129dca0 100644
--- a/gfx/pokemon/transel/front.png
+++ b/gfx/pokemon/metapod/front.png
diff --git a/gfx/pokemon/fire/back.png b/gfx/pokemon/moltres/back.png
index f3198a6..f3198a6 100644
--- a/gfx/pokemon/fire/back.png
+++ b/gfx/pokemon/moltres/back.png
diff --git a/gfx/pokemon/fire/front.png b/gfx/pokemon/moltres/front.png
index 7c15399..7c15399 100644
--- a/gfx/pokemon/fire/front.png
+++ b/gfx/pokemon/moltres/front.png
diff --git a/gfx/pokemon/barrierd/back.png b/gfx/pokemon/mrmime/back.png
index 1d55b96..1d55b96 100644
--- a/gfx/pokemon/barrierd/back.png
+++ b/gfx/pokemon/mrmime/back.png
diff --git a/gfx/pokemon/barrierd/front.png b/gfx/pokemon/mrmime/front.png
index d9085ec..d9085ec 100644
--- a/gfx/pokemon/barrierd/front.png
+++ b/gfx/pokemon/mrmime/front.png
diff --git a/gfx/pokemon/betbeton/back.png b/gfx/pokemon/muk/back.png
index f30d189..f30d189 100644
--- a/gfx/pokemon/betbeton/back.png
+++ b/gfx/pokemon/muk/back.png
diff --git a/gfx/pokemon/betbeton/front.png b/gfx/pokemon/muk/front.png
index 0f9b1d5..0f9b1d5 100644
--- a/gfx/pokemon/betbeton/front.png
+++ b/gfx/pokemon/muk/front.png
diff --git a/gfx/pokemon/kyukon/back.png b/gfx/pokemon/ninetales/back.png
index 9cc66f5..9cc66f5 100644
--- a/gfx/pokemon/kyukon/back.png
+++ b/gfx/pokemon/ninetales/back.png
diff --git a/gfx/pokemon/kyukon/front.png b/gfx/pokemon/ninetales/front.png
index 2c421cd..2c421cd 100644
--- a/gfx/pokemon/kyukon/front.png
+++ b/gfx/pokemon/ninetales/front.png
diff --git a/gfx/pokemon/nazonokusa/back.png b/gfx/pokemon/oddish/back.png
index 764874f..764874f 100644
--- a/gfx/pokemon/nazonokusa/back.png
+++ b/gfx/pokemon/oddish/back.png
diff --git a/gfx/pokemon/nazonokusa/front.png b/gfx/pokemon/oddish/front.png
index f4f2535..f4f2535 100644
--- a/gfx/pokemon/nazonokusa/front.png
+++ b/gfx/pokemon/oddish/front.png
diff --git a/gfx/pokemon/omnite/back.png b/gfx/pokemon/omanyte/back.png
index 39b2e33..39b2e33 100644
--- a/gfx/pokemon/omnite/back.png
+++ b/gfx/pokemon/omanyte/back.png
diff --git a/gfx/pokemon/omnite/front.png b/gfx/pokemon/omanyte/front.png
index bdfa544..bdfa544 100644
--- a/gfx/pokemon/omnite/front.png
+++ b/gfx/pokemon/omanyte/front.png
diff --git a/gfx/pokemon/omstar/back.png b/gfx/pokemon/omastar/back.png
index d70f0d0..d70f0d0 100644
--- a/gfx/pokemon/omstar/back.png
+++ b/gfx/pokemon/omastar/back.png
diff --git a/gfx/pokemon/omstar/front.png b/gfx/pokemon/omastar/front.png
index 3221d3d..3221d3d 100644
--- a/gfx/pokemon/omstar/front.png
+++ b/gfx/pokemon/omastar/front.png
diff --git a/gfx/pokemon/iwark/back.png b/gfx/pokemon/onix/back.png
index 9de5172..9de5172 100644
--- a/gfx/pokemon/iwark/back.png
+++ b/gfx/pokemon/onix/back.png
diff --git a/gfx/pokemon/iwark/front.png b/gfx/pokemon/onix/front.png
index 44a21a6..44a21a6 100644
--- a/gfx/pokemon/iwark/front.png
+++ b/gfx/pokemon/onix/front.png
diff --git a/gfx/pokemon/pigeot/back.png b/gfx/pokemon/pidgeot/back.png
index c11ce4f..c11ce4f 100644
--- a/gfx/pokemon/pigeot/back.png
+++ b/gfx/pokemon/pidgeot/back.png
diff --git a/gfx/pokemon/pigeot/front.png b/gfx/pokemon/pidgeot/front.png
index 7daf609..7daf609 100644
--- a/gfx/pokemon/pigeot/front.png
+++ b/gfx/pokemon/pidgeot/front.png
diff --git a/gfx/pokemon/pigeon/back.png b/gfx/pokemon/pidgeotto/back.png
index 5a614b1..5a614b1 100644
--- a/gfx/pokemon/pigeon/back.png
+++ b/gfx/pokemon/pidgeotto/back.png
diff --git a/gfx/pokemon/pigeon/front.png b/gfx/pokemon/pidgeotto/front.png
index c86b86f..c86b86f 100644
--- a/gfx/pokemon/pigeon/front.png
+++ b/gfx/pokemon/pidgeotto/front.png
diff --git a/gfx/pokemon/poppo/back.png b/gfx/pokemon/pidgey/back.png
index b833c79..b833c79 100644
--- a/gfx/pokemon/poppo/back.png
+++ b/gfx/pokemon/pidgey/back.png
diff --git a/gfx/pokemon/poppo/front.png b/gfx/pokemon/pidgey/front.png
index a4a917b..a4a917b 100644
--- a/gfx/pokemon/poppo/front.png
+++ b/gfx/pokemon/pidgey/front.png
diff --git a/gfx/pokemon/kailios/back.png b/gfx/pokemon/pinsir/back.png
index 226c68e..226c68e 100644
--- a/gfx/pokemon/kailios/back.png
+++ b/gfx/pokemon/pinsir/back.png
diff --git a/gfx/pokemon/kailios/front.png b/gfx/pokemon/pinsir/front.png
index 320c79c..320c79c 100644
--- a/gfx/pokemon/kailios/front.png
+++ b/gfx/pokemon/pinsir/front.png
diff --git a/gfx/pokemon/pkmn_pic_banks.inc b/gfx/pokemon/pkmn_pic_banks.inc
index dd0fc42..2969484 100644
--- a/gfx/pokemon/pkmn_pic_banks.inc
+++ b/gfx/pokemon/pkmn_pic_banks.inc
@@ -2,10 +2,10 @@ MonSpriteBankList::
 	; last mon in bank, bank #
 	db DEX_RAICHU,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 0
 	db DEX_DUGTRIO,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 1
-	db DEX_GOLONE,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 2
-	db DEX_CRAB,       BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 3
+	db DEX_GRAVELER,   BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 2
+	db DEX_KRABBY,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 3
 	db DEX_STARMIE,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 4
-	db DEX_FREEZER,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 5
+	db DEX_ARTICUNO,   BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 5
 	db DEX_JARANRA,    BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 6
 	db DEX_KOUNYA,     BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 7
 	db DEX_BOMBSEEKER, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 8
diff --git a/gfx/pokemon/pkmn_pics.inc b/gfx/pokemon/pkmn_pics.inc
index 178b738..1dba21e 100644
--- a/gfx/pokemon/pkmn_pics.inc
+++ b/gfx/pokemon/pkmn_pics.inc
@@ -1,51 +1,51 @@
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 1", ROMX
 
-FushigidanePicFront:: INCBIN "gfx/pokemon/fushigidane/front.pic"
-FushigidanePicBack::  INCBIN "gfx/pokemon/fushigidane/back.pic"
-FushigisouPicFront::  INCBIN "gfx/pokemon/fushigisou/front.pic"
-FushigisouPicBack::   INCBIN "gfx/pokemon/fushigisou/back.pic"
-FushigibanaPicFront:: INCBIN "gfx/pokemon/fushigibana/front.pic"
-FushigibanaPicBack::  INCBIN "gfx/pokemon/fushigibana/back.pic"
-HitokagePicFront::    INCBIN "gfx/pokemon/hitokage/front.pic"
-HitokagePicBack::     INCBIN "gfx/pokemon/hitokage/back.pic"
-LizardoPicFront::     INCBIN "gfx/pokemon/lizardo/front.pic"
-LizardoPicBack::      INCBIN "gfx/pokemon/lizardo/back.pic"
-LizardonPicFront::    INCBIN "gfx/pokemon/lizardon/front.pic"
-LizardonPicBack::     INCBIN "gfx/pokemon/lizardon/back.pic"
-ZenigamePicFront::    INCBIN "gfx/pokemon/zenigame/front.pic"
-ZenigamePicBack::     INCBIN "gfx/pokemon/zenigame/back.pic"
-KameilPicFront::      INCBIN "gfx/pokemon/kameil/front.pic"
-KameilPicBack::       INCBIN "gfx/pokemon/kameil/back.pic"
-KamexPicFront::       INCBIN "gfx/pokemon/kamex/front.pic"
-KamexPicBack::        INCBIN "gfx/pokemon/kamex/back.pic"
+BulbasaurPicFront::   INCBIN "gfx/pokemon/bulbasaur/front.pic"
+BulbasaurPicBack::    INCBIN "gfx/pokemon/bulbasaur/back.pic"
+IvysaurPicFront::     INCBIN "gfx/pokemon/ivysaur/front.pic"
+IvysaurPicBack::      INCBIN "gfx/pokemon/ivysaur/back.pic"
+VenusaurPicFront::    INCBIN "gfx/pokemon/venusaur/front.pic"
+VenusaurPicBack::     INCBIN "gfx/pokemon/venusaur/back.pic"
+CharmanderPicFront::  INCBIN "gfx/pokemon/charmander/front.pic"
+CharmanderPicBack::   INCBIN "gfx/pokemon/charmander/back.pic"
+CharmeleonPicFront::  INCBIN "gfx/pokemon/charmeleon/front.pic"
+CharmeleonPicBack::   INCBIN "gfx/pokemon/charmeleon/back.pic"
+CharizardPicFront::   INCBIN "gfx/pokemon/charizard/front.pic"
+CharizardPicBack::    INCBIN "gfx/pokemon/charizard/back.pic"
+SquirtlePicFront::    INCBIN "gfx/pokemon/squirtle/front.pic"
+SquirtlePicBack::     INCBIN "gfx/pokemon/squirtle/back.pic"
+WartortlePicFront::   INCBIN "gfx/pokemon/wartortle/front.pic"
+WartortlePicBack::    INCBIN "gfx/pokemon/wartortle/back.pic"
+BlastoisePicFront::   INCBIN "gfx/pokemon/blastoise/front.pic"
+BlastoisePicBack::    INCBIN "gfx/pokemon/blastoise/back.pic"
 CaterpiePicFront::    INCBIN "gfx/pokemon/caterpie/front.pic"
 CaterpiePicBack::     INCBIN "gfx/pokemon/caterpie/back.pic"
-TranselPicFront::     INCBIN "gfx/pokemon/transel/front.pic"
-TranselPicBack::      INCBIN "gfx/pokemon/transel/back.pic"
+MetapodPicFront::     INCBIN "gfx/pokemon/metapod/front.pic"
+MetapodPicBack::      INCBIN "gfx/pokemon/metapod/back.pic"
 ButterfreePicFront::  INCBIN "gfx/pokemon/butterfree/front.pic"
 ButterfreePicBack::   INCBIN "gfx/pokemon/butterfree/back.pic"
-BeedlePicFront::      INCBIN "gfx/pokemon/beedle/front.pic"
-BeedlePicBack::       INCBIN "gfx/pokemon/beedle/back.pic"
-CocoonPicFront::      INCBIN "gfx/pokemon/cocoon/front.pic"
-CocoonPicBack::       INCBIN "gfx/pokemon/cocoon/back.pic"
-SpearPicFront::       INCBIN "gfx/pokemon/spear/front.pic"
-SpearPicBack::        INCBIN "gfx/pokemon/spear/back.pic"
-PoppoPicFront::       INCBIN "gfx/pokemon/poppo/front.pic"
-PoppoPicBack::        INCBIN "gfx/pokemon/poppo/back.pic"
-PigeonPicFront::      INCBIN "gfx/pokemon/pigeon/front.pic"
-PigeonPicBack::       INCBIN "gfx/pokemon/pigeon/back.pic"
-PigeotPicFront::      INCBIN "gfx/pokemon/pigeot/front.pic"
-PigeotPicBack::       INCBIN "gfx/pokemon/pigeot/back.pic"
-KorattaPicFront::     INCBIN "gfx/pokemon/koratta/front.pic"
-KorattaPicBack::      INCBIN "gfx/pokemon/koratta/back.pic"
-RattaPicFront::       INCBIN "gfx/pokemon/ratta/front.pic"
-RattaPicBack::        INCBIN "gfx/pokemon/ratta/back.pic"
-OnisuzumePicFront::   INCBIN "gfx/pokemon/onisuzume/front.pic"
-OnisuzumePicBack::    INCBIN "gfx/pokemon/onisuzume/back.pic"
-OnidrillPicFront::    INCBIN "gfx/pokemon/onidrill/front.pic"
-OnidrillPicBack::     INCBIN "gfx/pokemon/onidrill/back.pic"
-ArboPicFront::        INCBIN "gfx/pokemon/arbo/front.pic"
-ArboPicBack::         INCBIN "gfx/pokemon/arbo/back.pic"
+WeedlePicFront::      INCBIN "gfx/pokemon/weedle/front.pic"
+WeedlePicBack::       INCBIN "gfx/pokemon/weedle/back.pic"
+KakunaPicFront::      INCBIN "gfx/pokemon/kakuna/front.pic"
+KakunaPicBack::       INCBIN "gfx/pokemon/kakuna/back.pic"
+BeedrillPicFront::    INCBIN "gfx/pokemon/beedrill/front.pic"
+BeedrillPicBack::     INCBIN "gfx/pokemon/beedrill/back.pic"
+PidgeyPicFront::      INCBIN "gfx/pokemon/pidgey/front.pic"
+PidgeyPicBack::       INCBIN "gfx/pokemon/pidgey/back.pic"
+PidgeottoPicFront::   INCBIN "gfx/pokemon/pidgeotto/front.pic"
+PidgeottoPicBack::    INCBIN "gfx/pokemon/pidgeotto/back.pic"
+PidgeotPicFront::     INCBIN "gfx/pokemon/pidgeot/front.pic"
+PidgeotPicBack::      INCBIN "gfx/pokemon/pidgeot/back.pic"
+RattataPicFront::     INCBIN "gfx/pokemon/rattata/front.pic"
+RattataPicBack::      INCBIN "gfx/pokemon/rattata/back.pic"
+RaticatePicFront::    INCBIN "gfx/pokemon/raticate/front.pic"
+RaticatePicBack::     INCBIN "gfx/pokemon/raticate/back.pic"
+SpearowPicFront::     INCBIN "gfx/pokemon/spearow/front.pic"
+SpearowPicBack::      INCBIN "gfx/pokemon/spearow/back.pic"
+FearowPicFront::      INCBIN "gfx/pokemon/fearow/front.pic"
+FearowPicBack::       INCBIN "gfx/pokemon/fearow/back.pic"
+EkansPicFront::       INCBIN "gfx/pokemon/ekans/front.pic"
+EkansPicBack::        INCBIN "gfx/pokemon/ekans/back.pic"
 ArbokPicFront::       INCBIN "gfx/pokemon/arbok/front.pic"
 ArbokPicBack::        INCBIN "gfx/pokemon/arbok/back.pic"
 PikachuPicFront::     INCBIN "gfx/pokemon/pikachu/front.pic"
@@ -56,10 +56,10 @@ RaichuPicBack::       INCBIN "gfx/pokemon/raichu/back.pic"
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 2", ROMX
 
-SandPicFront::        INCBIN "gfx/pokemon/sand/front.pic"
-SandPicBack::         INCBIN "gfx/pokemon/sand/back.pic"
-SandpanPicFront::     INCBIN "gfx/pokemon/sandpan/front.pic"
-SandpanPicBack::      INCBIN "gfx/pokemon/sandpan/back.pic"
+SandshrewPicFront::   INCBIN "gfx/pokemon/sandshrew/front.pic"
+SandshrewPicBack::    INCBIN "gfx/pokemon/sandshrew/back.pic"
+SandslashPicFront::   INCBIN "gfx/pokemon/sandslash/front.pic"
+SandslashPicBack::    INCBIN "gfx/pokemon/sandslash/back.pic"
 Nidoran_FPicFront::   INCBIN "gfx/pokemon/nidoran_f/front.pic"
 Nidoran_FPicBack::    INCBIN "gfx/pokemon/nidoran_f/back.pic"
 NidorinaPicFront::    INCBIN "gfx/pokemon/nidorina/front.pic"
@@ -72,256 +72,256 @@ NidorinoPicFront::    INCBIN "gfx/pokemon/nidorino/front.pic"
 NidorinoPicBack::     INCBIN "gfx/pokemon/nidorino/back.pic"
 NidokingPicFront::    INCBIN "gfx/pokemon/nidoking/front.pic"
 NidokingPicBack::     INCBIN "gfx/pokemon/nidoking/back.pic"
-PippiPicFront::       INCBIN "gfx/pokemon/pippi/front.pic"
-PippiPicBack::        INCBIN "gfx/pokemon/pippi/back.pic"
-PixyPicFront::        INCBIN "gfx/pokemon/pixy/front.pic"
-PixyPicBack::         INCBIN "gfx/pokemon/pixy/back.pic"
-RokonPicFront::       INCBIN "gfx/pokemon/rokon/front.pic"
-RokonPicBack::        INCBIN "gfx/pokemon/rokon/back.pic"
-KyukonPicFront::      INCBIN "gfx/pokemon/kyukon/front.pic"
-KyukonPicBack::       INCBIN "gfx/pokemon/kyukon/back.pic"
-PurinPicFront::       INCBIN "gfx/pokemon/purin/front.pic"
-PurinPicBack::        INCBIN "gfx/pokemon/purin/back.pic"
-PukurinPicFront::     INCBIN "gfx/pokemon/pukurin/front.pic"
-PukurinPicBack::      INCBIN "gfx/pokemon/pukurin/back.pic"
+ClefairyPicFront::    INCBIN "gfx/pokemon/clefairy/front.pic"
+ClefairyPicBack::     INCBIN "gfx/pokemon/clefairy/back.pic"
+ClefablePicFront::    INCBIN "gfx/pokemon/clefable/front.pic"
+ClefablePicBack::     INCBIN "gfx/pokemon/clefable/back.pic"
+VulpixPicFront::      INCBIN "gfx/pokemon/vulpix/front.pic"
+VulpixPicBack::       INCBIN "gfx/pokemon/vulpix/back.pic"
+NinetalesPicFront::   INCBIN "gfx/pokemon/ninetales/front.pic"
+NinetalesPicBack::    INCBIN "gfx/pokemon/ninetales/back.pic"
+JigglypuffPicFront::  INCBIN "gfx/pokemon/jigglypuff/front.pic"
+JigglypuffPicBack::   INCBIN "gfx/pokemon/jigglypuff/back.pic"
+WigglytuffPicFront::  INCBIN "gfx/pokemon/wigglytuff/front.pic"
+WigglytuffPicBack::   INCBIN "gfx/pokemon/wigglytuff/back.pic"
 ZubatPicFront::       INCBIN "gfx/pokemon/zubat/front.pic"
 ZubatPicBack::        INCBIN "gfx/pokemon/zubat/back.pic"
 GolbatPicFront::      INCBIN "gfx/pokemon/golbat/front.pic"
 GolbatPicBack::       INCBIN "gfx/pokemon/golbat/back.pic"
-NazonokusaPicFront::  INCBIN "gfx/pokemon/nazonokusa/front.pic"
-NazonokusaPicBack::   INCBIN "gfx/pokemon/nazonokusa/back.pic"
-KusaihanaPicFront::   INCBIN "gfx/pokemon/kusaihana/front.pic"
-KusaihanaPicBack::    INCBIN "gfx/pokemon/kusaihana/back.pic"
-RuffresiaPicFront::   INCBIN "gfx/pokemon/ruffresia/front.pic"
-RuffresiaPicBack::    INCBIN "gfx/pokemon/ruffresia/back.pic"
+OddishPicFront::      INCBIN "gfx/pokemon/oddish/front.pic"
+OddishPicBack::       INCBIN "gfx/pokemon/oddish/back.pic"
+GloomPicFront::       INCBIN "gfx/pokemon/gloom/front.pic"
+GloomPicBack::        INCBIN "gfx/pokemon/gloom/back.pic"
+VileplumePicFront::   INCBIN "gfx/pokemon/vileplume/front.pic"
+VileplumePicBack::    INCBIN "gfx/pokemon/vileplume/back.pic"
 ParasPicFront::       INCBIN "gfx/pokemon/paras/front.pic"
 ParasPicBack::        INCBIN "gfx/pokemon/paras/back.pic"
 ParasectPicFront::    INCBIN "gfx/pokemon/parasect/front.pic"
 ParasectPicBack::     INCBIN "gfx/pokemon/parasect/back.pic"
-KongpangPicFront::    INCBIN "gfx/pokemon/kongpang/front.pic"
-KongpangPicBack::     INCBIN "gfx/pokemon/kongpang/back.pic"
-MorphonPicFront::     INCBIN "gfx/pokemon/morphon/front.pic"
-MorphonPicBack::      INCBIN "gfx/pokemon/morphon/back.pic"
-DigdaPicFront::       INCBIN "gfx/pokemon/digda/front.pic"
-DigdaPicBack::        INCBIN "gfx/pokemon/digda/back.pic"
+VenonatPicFront::     INCBIN "gfx/pokemon/venonat/front.pic"
+VenonatPicBack::      INCBIN "gfx/pokemon/venonat/back.pic"
+VenomothPicFront::    INCBIN "gfx/pokemon/venomoth/front.pic"
+VenomothPicBack::     INCBIN "gfx/pokemon/venomoth/back.pic"
+DiglettPicFront::     INCBIN "gfx/pokemon/diglett/front.pic"
+DiglettPicBack::      INCBIN "gfx/pokemon/diglett/back.pic"
 DugtrioPicFront::     INCBIN "gfx/pokemon/dugtrio/front.pic"
 DugtrioPicBack::      INCBIN "gfx/pokemon/dugtrio/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 3", ROMX
 
-NyarthPicFront::      INCBIN "gfx/pokemon/nyarth/front.pic"
-NyarthPicBack::       INCBIN "gfx/pokemon/nyarth/back.pic"
+MeowthPicFront::      INCBIN "gfx/pokemon/meowth/front.pic"
+MeowthPicBack::       INCBIN "gfx/pokemon/meowth/back.pic"
 PersianPicFront::     INCBIN "gfx/pokemon/persian/front.pic"
 PersianPicBack::      INCBIN "gfx/pokemon/persian/back.pic"
-KoduckPicFront::      INCBIN "gfx/pokemon/koduck/front.pic"
-KoduckPicBack::       INCBIN "gfx/pokemon/koduck/back.pic"
+PsyduckPicFront::     INCBIN "gfx/pokemon/psyduck/front.pic"
+PsyduckPicBack::      INCBIN "gfx/pokemon/psyduck/back.pic"
 GolduckPicFront::     INCBIN "gfx/pokemon/golduck/front.pic"
 GolduckPicBack::      INCBIN "gfx/pokemon/golduck/back.pic"
 MankeyPicFront::      INCBIN "gfx/pokemon/mankey/front.pic"
 MankeyPicBack::       INCBIN "gfx/pokemon/mankey/back.pic"
-OkorizaruPicFront::   INCBIN "gfx/pokemon/okorizaru/front.pic"
-OkorizaruPicBack::    INCBIN "gfx/pokemon/okorizaru/back.pic"
-GardiePicFront::      INCBIN "gfx/pokemon/gardie/front.pic"
-GardiePicBack::       INCBIN "gfx/pokemon/gardie/back.pic"
-WindiePicFront::      INCBIN "gfx/pokemon/windie/front.pic"
-WindiePicBack::       INCBIN "gfx/pokemon/windie/back.pic"
-NyoromoPicFront::     INCBIN "gfx/pokemon/nyoromo/front.pic"
-NyoromoPicBack::      INCBIN "gfx/pokemon/nyoromo/back.pic"
-NyorozoPicFront::     INCBIN "gfx/pokemon/nyorozo/front.pic"
-NyorozoPicBack::      INCBIN "gfx/pokemon/nyorozo/back.pic"
-NyorobonPicFront::    INCBIN "gfx/pokemon/nyorobon/front.pic"
-NyorobonPicBack::     INCBIN "gfx/pokemon/nyorobon/back.pic"
-CaseyPicFront::       INCBIN "gfx/pokemon/casey/front.pic"
-CaseyPicBack::        INCBIN "gfx/pokemon/casey/back.pic"
-YungererPicFront::    INCBIN "gfx/pokemon/yungerer/front.pic"
-YungererPicBack::     INCBIN "gfx/pokemon/yungerer/back.pic"
-FoodinPicFront::      INCBIN "gfx/pokemon/foodin/front.pic"
-FoodinPicBack::       INCBIN "gfx/pokemon/foodin/back.pic"
-WanrikyPicFront::     INCBIN "gfx/pokemon/wanriky/front.pic"
-WanrikyPicBack::      INCBIN "gfx/pokemon/wanriky/back.pic"
-GorikyPicFront::      INCBIN "gfx/pokemon/goriky/front.pic"
-GorikyPicBack::       INCBIN "gfx/pokemon/goriky/back.pic"
-KairikyPicFront::     INCBIN "gfx/pokemon/kairiky/front.pic"
-KairikyPicBack::      INCBIN "gfx/pokemon/kairiky/back.pic"
-MadatsubomiPicFront:: INCBIN "gfx/pokemon/madatsubomi/front.pic"
-MadatsubomiPicBack::  INCBIN "gfx/pokemon/madatsubomi/back.pic"
-UtsudonPicFront::     INCBIN "gfx/pokemon/utsudon/front.pic"
-UtsudonPicBack::      INCBIN "gfx/pokemon/utsudon/back.pic"
-UtsubotPicFront::     INCBIN "gfx/pokemon/utsubot/front.pic"
-UtsubotPicBack::      INCBIN "gfx/pokemon/utsubot/back.pic"
-MenokuragePicFront::  INCBIN "gfx/pokemon/menokurage/front.pic"
-MenokuragePicBack::   INCBIN "gfx/pokemon/menokurage/back.pic"
-DokukuragePicFront::  INCBIN "gfx/pokemon/dokukurage/front.pic"
-DokukuragePicBack::   INCBIN "gfx/pokemon/dokukurage/back.pic"
-IsitsubutePicFront::  INCBIN "gfx/pokemon/isitsubute/front.pic"
-IsitsubutePicBack::   INCBIN "gfx/pokemon/isitsubute/back.pic"
-GolonePicFront::      INCBIN "gfx/pokemon/golone/front.pic"
-GolonePicBack::       INCBIN "gfx/pokemon/golone/back.pic"
+PrimeapePicFront::    INCBIN "gfx/pokemon/primeape/front.pic"
+PrimeapePicBack::     INCBIN "gfx/pokemon/primeape/back.pic"
+GrowlithePicFront::   INCBIN "gfx/pokemon/growlithe/front.pic"
+GrowlithePicBack::    INCBIN "gfx/pokemon/growlithe/back.pic"
+ArcaninePicFront::    INCBIN "gfx/pokemon/arcanine/front.pic"
+ArcaninePicBack::     INCBIN "gfx/pokemon/arcanine/back.pic"
+PoliwagPicFront::     INCBIN "gfx/pokemon/poliwag/front.pic"
+PoliwagPicBack::      INCBIN "gfx/pokemon/poliwag/back.pic"
+PoliwhirlPicFront::   INCBIN "gfx/pokemon/poliwhirl/front.pic"
+PoliwhirlPicBack::    INCBIN "gfx/pokemon/poliwhirl/back.pic"
+PoliwrathPicFront::   INCBIN "gfx/pokemon/poliwrath/front.pic"
+PoliwrathPicBack::    INCBIN "gfx/pokemon/poliwrath/back.pic"
+AbraPicFront::        INCBIN "gfx/pokemon/abra/front.pic"
+AbraPicBack::         INCBIN "gfx/pokemon/abra/back.pic"
+KadabraPicFront::     INCBIN "gfx/pokemon/kadabra/front.pic"
+KadabraPicBack::      INCBIN "gfx/pokemon/kadabra/back.pic"
+AlakazamPicFront::    INCBIN "gfx/pokemon/alakazam/front.pic"
+AlakazamPicBack::     INCBIN "gfx/pokemon/alakazam/back.pic"
+MachopPicFront::      INCBIN "gfx/pokemon/machop/front.pic"
+MachopPicBack::       INCBIN "gfx/pokemon/machop/back.pic"
+MachokePicFront::     INCBIN "gfx/pokemon/machoke/front.pic"
+MachokePicBack::      INCBIN "gfx/pokemon/machoke/back.pic"
+MachampPicFront::     INCBIN "gfx/pokemon/machamp/front.pic"
+MachampPicBack::      INCBIN "gfx/pokemon/machamp/back.pic"
+BellsproutPicFront::  INCBIN "gfx/pokemon/bellsprout/front.pic"
+BellsproutPicBack::   INCBIN "gfx/pokemon/bellsprout/back.pic"
+WeepinbellPicFront::  INCBIN "gfx/pokemon/weepinbell/front.pic"
+WeepinbellPicBack::   INCBIN "gfx/pokemon/weepinbell/back.pic"
+VictreebelPicFront::  INCBIN "gfx/pokemon/victreebel/front.pic"
+VictreebelPicBack::   INCBIN "gfx/pokemon/victreebel/back.pic"
+TentacoolPicFront::   INCBIN "gfx/pokemon/tentacool/front.pic"
+TentacoolPicBack::    INCBIN "gfx/pokemon/tentacool/back.pic"
+TentacruelPicFront::  INCBIN "gfx/pokemon/tentacruel/front.pic"
+TentacruelPicBack::   INCBIN "gfx/pokemon/tentacruel/back.pic"
+GeodudePicFront::     INCBIN "gfx/pokemon/geodude/front.pic"
+GeodudePicBack::      INCBIN "gfx/pokemon/geodude/back.pic"
+GravelerPicFront::    INCBIN "gfx/pokemon/graveler/front.pic"
+GravelerPicBack::     INCBIN "gfx/pokemon/graveler/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 4", ROMX
 
-GolonyaPicFront::     INCBIN "gfx/pokemon/golonya/front.pic"
-GolonyaPicBack::      INCBIN "gfx/pokemon/golonya/back.pic"
+GolemPicFront::       INCBIN "gfx/pokemon/golem/front.pic"
+GolemPicBack::        INCBIN "gfx/pokemon/golem/back.pic"
 PonytaPicFront::      INCBIN "gfx/pokemon/ponyta/front.pic"
 PonytaPicBack::       INCBIN "gfx/pokemon/ponyta/back.pic"
-GallopPicFront::      INCBIN "gfx/pokemon/gallop/front.pic"
-GallopPicBack::       INCBIN "gfx/pokemon/gallop/back.pic"
-YadonPicFront::       INCBIN "gfx/pokemon/yadon/front.pic"
-YadonPicBack::        INCBIN "gfx/pokemon/yadon/back.pic"
-YadoranPicFront::     INCBIN "gfx/pokemon/yadoran/front.pic"
-YadoranPicBack::      INCBIN "gfx/pokemon/yadoran/back.pic"
-CoilPicFront::        INCBIN "gfx/pokemon/coil/front.pic"
-CoilPicBack::         INCBIN "gfx/pokemon/coil/back.pic"
-RarecoilPicFront::    INCBIN "gfx/pokemon/rarecoil/front.pic"
-RarecoilPicBack::     INCBIN "gfx/pokemon/rarecoil/back.pic"
-KamonegiPicFront::    INCBIN "gfx/pokemon/kamonegi/front.pic"
-KamonegiPicBack::     INCBIN "gfx/pokemon/kamonegi/back.pic"
-DodoPicFront::        INCBIN "gfx/pokemon/dodo/front.pic"
-DodoPicBack::         INCBIN "gfx/pokemon/dodo/back.pic"
-DodorioPicFront::     INCBIN "gfx/pokemon/dodorio/front.pic"
-DodorioPicBack::      INCBIN "gfx/pokemon/dodorio/back.pic"
-PawouPicFront::       INCBIN "gfx/pokemon/pawou/front.pic"
-PawouPicBack::        INCBIN "gfx/pokemon/pawou/back.pic"
-JugonPicFront::       INCBIN "gfx/pokemon/jugon/front.pic"
-JugonPicBack::        INCBIN "gfx/pokemon/jugon/back.pic"
-BetbeterPicFront::    INCBIN "gfx/pokemon/betbeter/front.pic"
-BetbeterPicBack::     INCBIN "gfx/pokemon/betbeter/back.pic"
-BetbetonPicFront::    INCBIN "gfx/pokemon/betbeton/front.pic"
-BetbetonPicBack::     INCBIN "gfx/pokemon/betbeton/back.pic"
+RapidashPicFront::    INCBIN "gfx/pokemon/rapidash/front.pic"
+RapidashPicBack::     INCBIN "gfx/pokemon/rapidash/back.pic"
+SlowpokePicFront::    INCBIN "gfx/pokemon/slowpoke/front.pic"
+SlowpokePicBack::     INCBIN "gfx/pokemon/slowpoke/back.pic"
+SlowbroPicFront::     INCBIN "gfx/pokemon/slowbro/front.pic"
+SlowbroPicBack::      INCBIN "gfx/pokemon/slowbro/back.pic"
+MagnemitePicFront::   INCBIN "gfx/pokemon/magnemite/front.pic"
+MagnemitePicBack::    INCBIN "gfx/pokemon/magnemite/back.pic"
+MagnetonPicFront::    INCBIN "gfx/pokemon/magneton/front.pic"
+MagnetonPicBack::     INCBIN "gfx/pokemon/magneton/back.pic"
+FarfetchdPicFront::   INCBIN "gfx/pokemon/farfetchd/front.pic"
+FarfetchdPicBack::    INCBIN "gfx/pokemon/farfetchd/back.pic"
+DoduoPicFront::       INCBIN "gfx/pokemon/doduo/front.pic"
+DoduoPicBack::        INCBIN "gfx/pokemon/doduo/back.pic"
+DodrioPicFront::      INCBIN "gfx/pokemon/dodrio/front.pic"
+DodrioPicBack::       INCBIN "gfx/pokemon/dodrio/back.pic"
+SeelPicFront::        INCBIN "gfx/pokemon/seel/front.pic"
+SeelPicBack::         INCBIN "gfx/pokemon/seel/back.pic"
+DewgongPicFront::     INCBIN "gfx/pokemon/dewgong/front.pic"
+DewgongPicBack::      INCBIN "gfx/pokemon/dewgong/back.pic"
+GrimerPicFront::      INCBIN "gfx/pokemon/grimer/front.pic"
+GrimerPicBack::       INCBIN "gfx/pokemon/grimer/back.pic"
+MukPicFront::         INCBIN "gfx/pokemon/muk/front.pic"
+MukPicBack::          INCBIN "gfx/pokemon/muk/back.pic"
 ShellderPicFront::    INCBIN "gfx/pokemon/shellder/front.pic"
 ShellderPicBack::     INCBIN "gfx/pokemon/shellder/back.pic"
-ParshenPicFront::     INCBIN "gfx/pokemon/parshen/front.pic"
-ParshenPicBack::      INCBIN "gfx/pokemon/parshen/back.pic"
-GhosPicFront::        INCBIN "gfx/pokemon/ghos/front.pic"
-GhosPicBack::         INCBIN "gfx/pokemon/ghos/back.pic"
-GhostPicFront::       INCBIN "gfx/pokemon/ghost/front.pic"
-GhostPicBack::        INCBIN "gfx/pokemon/ghost/back.pic"
-GangarPicFront::      INCBIN "gfx/pokemon/gangar/front.pic"
-GangarPicBack::       INCBIN "gfx/pokemon/gangar/back.pic"
-IwarkPicFront::       INCBIN "gfx/pokemon/iwark/front.pic"
-IwarkPicBack::        INCBIN "gfx/pokemon/iwark/back.pic"
-SleepePicFront::      INCBIN "gfx/pokemon/sleepe/front.pic"
-SleepePicBack::       INCBIN "gfx/pokemon/sleepe/back.pic"
-SleeperPicFront::     INCBIN "gfx/pokemon/sleeper/front.pic"
-SleeperPicBack::      INCBIN "gfx/pokemon/sleeper/back.pic"
-CrabPicFront::        INCBIN "gfx/pokemon/crab/front.pic"
-CrabPicBack::         INCBIN "gfx/pokemon/crab/back.pic"
+CloysterPicFront::    INCBIN "gfx/pokemon/cloyster/front.pic"
+CloysterPicBack::     INCBIN "gfx/pokemon/cloyster/back.pic"
+GastlyPicFront::      INCBIN "gfx/pokemon/gastly/front.pic"
+GastlyPicBack::       INCBIN "gfx/pokemon/gastly/back.pic"
+HaunterPicFront::     INCBIN "gfx/pokemon/haunter/front.pic"
+HaunterPicBack::      INCBIN "gfx/pokemon/haunter/back.pic"
+GengarPicFront::      INCBIN "gfx/pokemon/gengar/front.pic"
+GengarPicBack::       INCBIN "gfx/pokemon/gengar/back.pic"
+OnixPicFront::        INCBIN "gfx/pokemon/onix/front.pic"
+OnixPicBack::         INCBIN "gfx/pokemon/onix/back.pic"
+DrowzeePicFront::     INCBIN "gfx/pokemon/drowzee/front.pic"
+DrowzeePicBack::      INCBIN "gfx/pokemon/drowzee/back.pic"
+HypnoPicFront::       INCBIN "gfx/pokemon/hypno/front.pic"
+HypnoPicBack::        INCBIN "gfx/pokemon/hypno/back.pic"
+KrabbyPicFront::      INCBIN "gfx/pokemon/krabby/front.pic"
+KrabbyPicBack::       INCBIN "gfx/pokemon/krabby/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 5", ROMX
 
 KinglerPicFront::     INCBIN "gfx/pokemon/kingler/front.pic"
 KinglerPicBack::      INCBIN "gfx/pokemon/kingler/back.pic"
-BiriridamaPicFront::  INCBIN "gfx/pokemon/biriridama/front.pic"
-BiriridamaPicBack::   INCBIN "gfx/pokemon/biriridama/back.pic"
-MaruminePicFront::    INCBIN "gfx/pokemon/marumine/front.pic"
-MaruminePicBack::     INCBIN "gfx/pokemon/marumine/back.pic"
-TamatamaPicFront::    INCBIN "gfx/pokemon/tamatama/front.pic"
-TamatamaPicBack::     INCBIN "gfx/pokemon/tamatama/back.pic"
-NassyPicFront::       INCBIN "gfx/pokemon/nassy/front.pic"
-NassyPicBack::        INCBIN "gfx/pokemon/nassy/back.pic"
-KarakaraPicFront::    INCBIN "gfx/pokemon/karakara/front.pic"
-KarakaraPicBack::     INCBIN "gfx/pokemon/karakara/back.pic"
-GaragaraPicFront::    INCBIN "gfx/pokemon/garagara/front.pic"
-GaragaraPicBack::     INCBIN "gfx/pokemon/garagara/back.pic"
-SawamularPicFront::   INCBIN "gfx/pokemon/sawamular/front.pic"
-SawamularPicBack::    INCBIN "gfx/pokemon/sawamular/back.pic"
-EbiwalarPicFront::    INCBIN "gfx/pokemon/ebiwalar/front.pic"
-EbiwalarPicBack::     INCBIN "gfx/pokemon/ebiwalar/back.pic"
-BeroringaPicFront::   INCBIN "gfx/pokemon/beroringa/front.pic"
-BeroringaPicBack::    INCBIN "gfx/pokemon/beroringa/back.pic"
-DogarsPicFront::      INCBIN "gfx/pokemon/dogars/front.pic"
-DogarsPicBack::       INCBIN "gfx/pokemon/dogars/back.pic"
-MatadogasPicFront::   INCBIN "gfx/pokemon/matadogas/front.pic"
-MatadogasPicBack::    INCBIN "gfx/pokemon/matadogas/back.pic"
-SihornPicFront::      INCBIN "gfx/pokemon/sihorn/front.pic"
-SihornPicBack::       INCBIN "gfx/pokemon/sihorn/back.pic"
-SidonPicFront::       INCBIN "gfx/pokemon/sidon/front.pic"
-SidonPicBack::        INCBIN "gfx/pokemon/sidon/back.pic"
-LuckyPicFront::       INCBIN "gfx/pokemon/lucky/front.pic"
-LuckyPicBack::        INCBIN "gfx/pokemon/lucky/back.pic"
-MonjaraPicFront::     INCBIN "gfx/pokemon/monjara/front.pic"
-MonjaraPicBack::      INCBIN "gfx/pokemon/monjara/back.pic"
-GaruraPicFront::      INCBIN "gfx/pokemon/garura/front.pic"
-GaruraPicBack::       INCBIN "gfx/pokemon/garura/back.pic"
-TattuPicFront::       INCBIN "gfx/pokemon/tattu/front.pic"
-TattuPicBack::        INCBIN "gfx/pokemon/tattu/back.pic"
+VoltorbPicFront::     INCBIN "gfx/pokemon/voltorb/front.pic"
+VoltorbPicBack::      INCBIN "gfx/pokemon/voltorb/back.pic"
+ElectrodePicFront::   INCBIN "gfx/pokemon/electrode/front.pic"
+ElectrodePicBack::    INCBIN "gfx/pokemon/electrode/back.pic"
+ExeggcutePicFront::   INCBIN "gfx/pokemon/exeggcute/front.pic"
+ExeggcutePicBack::    INCBIN "gfx/pokemon/exeggcute/back.pic"
+ExeggutorPicFront::   INCBIN "gfx/pokemon/exeggutor/front.pic"
+ExeggutorPicBack::    INCBIN "gfx/pokemon/exeggutor/back.pic"
+CubonePicFront::      INCBIN "gfx/pokemon/cubone/front.pic"
+CubonePicBack::       INCBIN "gfx/pokemon/cubone/back.pic"
+MarowakPicFront::     INCBIN "gfx/pokemon/marowak/front.pic"
+MarowakPicBack::      INCBIN "gfx/pokemon/marowak/back.pic"
+HitmonleePicFront::   INCBIN "gfx/pokemon/hitmonlee/front.pic"
+HitmonleePicBack::    INCBIN "gfx/pokemon/hitmonlee/back.pic"
+HitmonchanPicFront::  INCBIN "gfx/pokemon/hitmonchan/front.pic"
+HitmonchanPicBack::   INCBIN "gfx/pokemon/hitmonchan/back.pic"
+LickitungPicFront::   INCBIN "gfx/pokemon/lickitung/front.pic"
+LickitungPicBack::    INCBIN "gfx/pokemon/lickitung/back.pic"
+KoffingPicFront::     INCBIN "gfx/pokemon/koffing/front.pic"
+KoffingPicBack::      INCBIN "gfx/pokemon/koffing/back.pic"
+WeezingPicFront::     INCBIN "gfx/pokemon/weezing/front.pic"
+WeezingPicBack::      INCBIN "gfx/pokemon/weezing/back.pic"
+RhyhornPicFront::     INCBIN "gfx/pokemon/rhyhorn/front.pic"
+RhyhornPicBack::      INCBIN "gfx/pokemon/rhyhorn/back.pic"
+RhydonPicFront::      INCBIN "gfx/pokemon/rhydon/front.pic"
+RhydonPicBack::       INCBIN "gfx/pokemon/rhydon/back.pic"
+ChanseyPicFront::     INCBIN "gfx/pokemon/chansey/front.pic"
+ChanseyPicBack::      INCBIN "gfx/pokemon/chansey/back.pic"
+TangelaPicFront::     INCBIN "gfx/pokemon/tangela/front.pic"
+TangelaPicBack::      INCBIN "gfx/pokemon/tangela/back.pic"
+KangaskhanPicFront::  INCBIN "gfx/pokemon/kangaskhan/front.pic"
+KangaskhanPicBack::   INCBIN "gfx/pokemon/kangaskhan/back.pic"
+HorseaPicFront::      INCBIN "gfx/pokemon/horsea/front.pic"
+HorseaPicBack::       INCBIN "gfx/pokemon/horsea/back.pic"
 SeadraPicFront::      INCBIN "gfx/pokemon/seadra/front.pic"
 SeadraPicBack::       INCBIN "gfx/pokemon/seadra/back.pic"
-TosakintoPicFront::   INCBIN "gfx/pokemon/tosakinto/front.pic"
-TosakintoPicBack::    INCBIN "gfx/pokemon/tosakinto/back.pic"
-AzumaoPicFront::      INCBIN "gfx/pokemon/azumao/front.pic"
-AzumaoPicBack::       INCBIN "gfx/pokemon/azumao/back.pic"
-HitodemanPicFront::   INCBIN "gfx/pokemon/hitodeman/front.pic"
-HitodemanPicBack::    INCBIN "gfx/pokemon/hitodeman/back.pic"
+GoldeenPicFront::     INCBIN "gfx/pokemon/goldeen/front.pic"
+GoldeenPicBack::      INCBIN "gfx/pokemon/goldeen/back.pic"
+SeakingPicFront::     INCBIN "gfx/pokemon/seaking/front.pic"
+SeakingPicBack::      INCBIN "gfx/pokemon/seaking/back.pic"
+StaryuPicFront::      INCBIN "gfx/pokemon/staryu/front.pic"
+StaryuPicBack::       INCBIN "gfx/pokemon/staryu/back.pic"
 StarmiePicFront::     INCBIN "gfx/pokemon/starmie/front.pic"
 StarmiePicBack::      INCBIN "gfx/pokemon/starmie/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 6", ROMX
 
-BarrierdPicFront::    INCBIN "gfx/pokemon/barrierd/front.pic"
-BarrierdPicBack::     INCBIN "gfx/pokemon/barrierd/back.pic"
-StrikePicFront::      INCBIN "gfx/pokemon/strike/front.pic"
-StrikePicBack::       INCBIN "gfx/pokemon/strike/back.pic"
-RougelaPicFront::     INCBIN "gfx/pokemon/rougela/front.pic"
-RougelaPicBack::      INCBIN "gfx/pokemon/rougela/back.pic"
-ElebooPicFront::      INCBIN "gfx/pokemon/eleboo/front.pic"
-ElebooPicBack::       INCBIN "gfx/pokemon/eleboo/back.pic"
-BooberPicFront::      INCBIN "gfx/pokemon/boober/front.pic"
-BooberPicBack::       INCBIN "gfx/pokemon/boober/back.pic"
-KailiosPicFront::     INCBIN "gfx/pokemon/kailios/front.pic"
-KailiosPicBack::      INCBIN "gfx/pokemon/kailios/back.pic"
-KentaurosPicFront::   INCBIN "gfx/pokemon/kentauros/front.pic"
-KentaurosPicBack::    INCBIN "gfx/pokemon/kentauros/back.pic"
-KoikingPicFront::     INCBIN "gfx/pokemon/koiking/front.pic"
-KoikingPicBack::      INCBIN "gfx/pokemon/koiking/back.pic"
+MrMimePicFront::      INCBIN "gfx/pokemon/mrmime/front.pic"
+MrMimePicBack::       INCBIN "gfx/pokemon/mrmime/back.pic"
+ScytherPicFront::     INCBIN "gfx/pokemon/scyther/front.pic"
+ScytherPicBack::      INCBIN "gfx/pokemon/scyther/back.pic"
+JynxPicFront::        INCBIN "gfx/pokemon/jynx/front.pic"
+JynxPicBack::         INCBIN "gfx/pokemon/jynx/back.pic"
+ElectabuzzPicFront::  INCBIN "gfx/pokemon/electabuzz/front.pic"
+ElectabuzzPicBack::   INCBIN "gfx/pokemon/electabuzz/back.pic"
+MagmarPicFront::      INCBIN "gfx/pokemon/magmar/front.pic"
+MagmarPicBack::       INCBIN "gfx/pokemon/magmar/back.pic"
+PinsirPicFront::      INCBIN "gfx/pokemon/pinsir/front.pic"
+PinsirPicBack::       INCBIN "gfx/pokemon/pinsir/back.pic"
+TaurosPicFront::      INCBIN "gfx/pokemon/tauros/front.pic"
+TaurosPicBack::       INCBIN "gfx/pokemon/tauros/back.pic"
+MagikarpPicFront::    INCBIN "gfx/pokemon/magikarp/front.pic"
+MagikarpPicBack::     INCBIN "gfx/pokemon/magikarp/back.pic"
 GyaradosPicFront::    INCBIN "gfx/pokemon/gyarados/front.pic"
 GyaradosPicBack::     INCBIN "gfx/pokemon/gyarados/back.pic"
-LaplacePicFront::     INCBIN "gfx/pokemon/laplace/front.pic"
-LaplacePicBack::      INCBIN "gfx/pokemon/laplace/back.pic"
-MetamonPicFront::     INCBIN "gfx/pokemon/metamon/front.pic"
-MetamonPicBack::      INCBIN "gfx/pokemon/metamon/back.pic"
-EievuiPicFront::      INCBIN "gfx/pokemon/eievui/front.pic"
-EievuiPicBack::       INCBIN "gfx/pokemon/eievui/back.pic"
-ShowersPicFront::     INCBIN "gfx/pokemon/showers/front.pic"
-ShowersPicBack::      INCBIN "gfx/pokemon/showers/back.pic"
-ThundersPicFront::    INCBIN "gfx/pokemon/thunders/front.pic"
-ThundersPicBack::     INCBIN "gfx/pokemon/thunders/back.pic"
-BoosterPicFront::     INCBIN "gfx/pokemon/booster/front.pic"
-BoosterPicBack::      INCBIN "gfx/pokemon/booster/back.pic"
+LaprasPicFront::      INCBIN "gfx/pokemon/lapras/front.pic"
+LaprasPicBack::       INCBIN "gfx/pokemon/lapras/back.pic"
+DittoPicFront::       INCBIN "gfx/pokemon/ditto/front.pic"
+DittoPicBack::        INCBIN "gfx/pokemon/ditto/back.pic"
+EeveePicFront::       INCBIN "gfx/pokemon/eevee/front.pic"
+EeveePicBack::        INCBIN "gfx/pokemon/eevee/back.pic"
+VaporeonPicFront::    INCBIN "gfx/pokemon/vaporeon/front.pic"
+VaporeonPicBack::     INCBIN "gfx/pokemon/vaporeon/back.pic"
+JolteonPicFront::     INCBIN "gfx/pokemon/jolteon/front.pic"
+JolteonPicBack::      INCBIN "gfx/pokemon/jolteon/back.pic"
+FlareonPicFront::     INCBIN "gfx/pokemon/flareon/front.pic"
+FlareonPicBack::      INCBIN "gfx/pokemon/flareon/back.pic"
 PorygonPicFront::     INCBIN "gfx/pokemon/porygon/front.pic"
 PorygonPicBack::      INCBIN "gfx/pokemon/porygon/back.pic"
-OmnitePicFront::      INCBIN "gfx/pokemon/omnite/front.pic"
-OmnitePicBack::       INCBIN "gfx/pokemon/omnite/back.pic"
-OmstarPicFront::      INCBIN "gfx/pokemon/omstar/front.pic"
-OmstarPicBack::       INCBIN "gfx/pokemon/omstar/back.pic"
+OmanytePicFront::     INCBIN "gfx/pokemon/omanyte/front.pic"
+OmanytePicBack::      INCBIN "gfx/pokemon/omanyte/back.pic"
+OmastarPicFront::     INCBIN "gfx/pokemon/omastar/front.pic"
+OmastarPicBack::      INCBIN "gfx/pokemon/omastar/back.pic"
 KabutoPicFront::      INCBIN "gfx/pokemon/kabuto/front.pic"
 KabutoPicBack::       INCBIN "gfx/pokemon/kabuto/back.pic"
 KabutopsPicFront::    INCBIN "gfx/pokemon/kabutops/front.pic"
 KabutopsPicBack::     INCBIN "gfx/pokemon/kabutops/back.pic"
-PteraPicFront::       INCBIN "gfx/pokemon/ptera/front.pic"
-PteraPicBack::        INCBIN "gfx/pokemon/ptera/back.pic"
-KabigonPicFront::     INCBIN "gfx/pokemon/kabigon/front.pic"
-KabigonPicBack::      INCBIN "gfx/pokemon/kabigon/back.pic"
-FreezerPicFront::     INCBIN "gfx/pokemon/freezer/front.pic"
-FreezerPicBack::      INCBIN "gfx/pokemon/freezer/back.pic"
+AerodactylPicFront::  INCBIN "gfx/pokemon/aerodactyl/front.pic"
+AerodactylPicBack::   INCBIN "gfx/pokemon/aerodactyl/back.pic"
+SnorlaxPicFront::     INCBIN "gfx/pokemon/snorlax/front.pic"
+SnorlaxPicBack::      INCBIN "gfx/pokemon/snorlax/back.pic"
+ArticunoPicFront::    INCBIN "gfx/pokemon/articuno/front.pic"
+ArticunoPicBack::     INCBIN "gfx/pokemon/articuno/back.pic"
 
 
 SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 7", ROMX
 
-ThunderPicFront::     INCBIN "gfx/pokemon/thunder/front.pic"
-ThunderPicBack::      INCBIN "gfx/pokemon/thunder/back.pic"
-FirePicFront::        INCBIN "gfx/pokemon/fire/front.pic"
-FirePicBack::         INCBIN "gfx/pokemon/fire/back.pic"
-MiniryuPicFront::     INCBIN "gfx/pokemon/miniryu/front.pic"
-MiniryuPicBack::      INCBIN "gfx/pokemon/miniryu/back.pic"
-HakuryuPicFront::     INCBIN "gfx/pokemon/hakuryu/front.pic"
-HakuryuPicBack::      INCBIN "gfx/pokemon/hakuryu/back.pic"
-KairyuPicFront::      INCBIN "gfx/pokemon/kairyu/front.pic"
-KairyuPicBack::       INCBIN "gfx/pokemon/kairyu/back.pic"
+ZapdosPicFront::      INCBIN "gfx/pokemon/zapdos/front.pic"
+ZapdosPicBack::       INCBIN "gfx/pokemon/zapdos/back.pic"
+MoltresPicFront::     INCBIN "gfx/pokemon/moltres/front.pic"
+MoltresPicBack::      INCBIN "gfx/pokemon/moltres/back.pic"
+DratiniPicFront::     INCBIN "gfx/pokemon/dratini/front.pic"
+DratiniPicBack::      INCBIN "gfx/pokemon/dratini/back.pic"
+DragonairPicFront::   INCBIN "gfx/pokemon/dragonair/front.pic"
+DragonairPicBack::    INCBIN "gfx/pokemon/dragonair/back.pic"
+DragonitePicFront::   INCBIN "gfx/pokemon/dragonite/front.pic"
+DragonitePicBack::    INCBIN "gfx/pokemon/dragonite/back.pic"
 MewtwoPicFront::      INCBIN "gfx/pokemon/mewtwo/front.pic"
 MewtwoPicBack::       INCBIN "gfx/pokemon/mewtwo/back.pic"
 MewPicFront::         INCBIN "gfx/pokemon/mew/front.pic"
diff --git a/gfx/pokemon/nyoromo/back.png b/gfx/pokemon/poliwag/back.png
index 1a4d7da..1a4d7da 100644
--- a/gfx/pokemon/nyoromo/back.png
+++ b/gfx/pokemon/poliwag/back.png
diff --git a/gfx/pokemon/nyoromo/front.png b/gfx/pokemon/poliwag/front.png
index 04deb5e..04deb5e 100644
--- a/gfx/pokemon/nyoromo/front.png
+++ b/gfx/pokemon/poliwag/front.png
diff --git a/gfx/pokemon/nyorozo/back.png b/gfx/pokemon/poliwhirl/back.png
index c5028e3..c5028e3 100644
--- a/gfx/pokemon/nyorozo/back.png
+++ b/gfx/pokemon/poliwhirl/back.png
diff --git a/gfx/pokemon/nyorozo/front.png b/gfx/pokemon/poliwhirl/front.png
index ea16237..ea16237 100644
--- a/gfx/pokemon/nyorozo/front.png
+++ b/gfx/pokemon/poliwhirl/front.png
diff --git a/gfx/pokemon/nyorobon/back.png b/gfx/pokemon/poliwrath/back.png
index 8b33b83..8b33b83 100644
--- a/gfx/pokemon/nyorobon/back.png
+++ b/gfx/pokemon/poliwrath/back.png
diff --git a/gfx/pokemon/nyorobon/front.png b/gfx/pokemon/poliwrath/front.png
index 6531a0c..6531a0c 100644
--- a/gfx/pokemon/nyorobon/front.png
+++ b/gfx/pokemon/poliwrath/front.png
diff --git a/gfx/pokemon/okorizaru/back.png b/gfx/pokemon/primeape/back.png
index e4eb256..e4eb256 100644
--- a/gfx/pokemon/okorizaru/back.png
+++ b/gfx/pokemon/primeape/back.png
diff --git a/gfx/pokemon/okorizaru/front.png b/gfx/pokemon/primeape/front.png
index dbca012..dbca012 100644
--- a/gfx/pokemon/okorizaru/front.png
+++ b/gfx/pokemon/primeape/front.png
diff --git a/gfx/pokemon/koduck/back.png b/gfx/pokemon/psyduck/back.png
index 8ca4202..8ca4202 100644
--- a/gfx/pokemon/koduck/back.png
+++ b/gfx/pokemon/psyduck/back.png
diff --git a/gfx/pokemon/koduck/front.png b/gfx/pokemon/psyduck/front.png
index 697e77b..697e77b 100644
--- a/gfx/pokemon/koduck/front.png
+++ b/gfx/pokemon/psyduck/front.png
diff --git a/gfx/pokemon/gallop/back.png b/gfx/pokemon/rapidash/back.png
index 113b263..113b263 100644
--- a/gfx/pokemon/gallop/back.png
+++ b/gfx/pokemon/rapidash/back.png
diff --git a/gfx/pokemon/gallop/front.png b/gfx/pokemon/rapidash/front.png
index afc18e4..afc18e4 100644
--- a/gfx/pokemon/gallop/front.png
+++ b/gfx/pokemon/rapidash/front.png
diff --git a/gfx/pokemon/ratta/back.png b/gfx/pokemon/raticate/back.png
index 24e4d6a..24e4d6a 100644
--- a/gfx/pokemon/ratta/back.png
+++ b/gfx/pokemon/raticate/back.png
diff --git a/gfx/pokemon/ratta/front.png b/gfx/pokemon/raticate/front.png
index 6434084..6434084 100644
--- a/gfx/pokemon/ratta/front.png
+++ b/gfx/pokemon/raticate/front.png
diff --git a/gfx/pokemon/koratta/back.png b/gfx/pokemon/rattata/back.png
index 3e015c3..3e015c3 100644
--- a/gfx/pokemon/koratta/back.png
+++ b/gfx/pokemon/rattata/back.png
diff --git a/gfx/pokemon/koratta/front.png b/gfx/pokemon/rattata/front.png
index 896b372..896b372 100644
--- a/gfx/pokemon/koratta/front.png
+++ b/gfx/pokemon/rattata/front.png
diff --git a/gfx/pokemon/sidon/back.png b/gfx/pokemon/rhydon/back.png
index 155fe2b..155fe2b 100644
--- a/gfx/pokemon/sidon/back.png
+++ b/gfx/pokemon/rhydon/back.png
diff --git a/gfx/pokemon/sidon/front.png b/gfx/pokemon/rhydon/front.png
index 9240647..9240647 100644
--- a/gfx/pokemon/sidon/front.png
+++ b/gfx/pokemon/rhydon/front.png
diff --git a/gfx/pokemon/sihorn/back.png b/gfx/pokemon/rhyhorn/back.png
index 3a64cac..3a64cac 100644
--- a/gfx/pokemon/sihorn/back.png
+++ b/gfx/pokemon/rhyhorn/back.png
diff --git a/gfx/pokemon/sihorn/front.png b/gfx/pokemon/rhyhorn/front.png
index 9452b70..9452b70 100644
--- a/gfx/pokemon/sihorn/front.png
+++ b/gfx/pokemon/rhyhorn/front.png
diff --git a/gfx/pokemon/sand/back.png b/gfx/pokemon/sandshrew/back.png
index 062b92d..062b92d 100644
--- a/gfx/pokemon/sand/back.png
+++ b/gfx/pokemon/sandshrew/back.png
diff --git a/gfx/pokemon/sand/front.png b/gfx/pokemon/sandshrew/front.png
index 80a1ab1..80a1ab1 100644
--- a/gfx/pokemon/sand/front.png
+++ b/gfx/pokemon/sandshrew/front.png
diff --git a/gfx/pokemon/sandpan/back.png b/gfx/pokemon/sandslash/back.png
index 50afa13..50afa13 100644
--- a/gfx/pokemon/sandpan/back.png
+++ b/gfx/pokemon/sandslash/back.png
diff --git a/gfx/pokemon/sandpan/front.png b/gfx/pokemon/sandslash/front.png
index e4327ff..e4327ff 100644
--- a/gfx/pokemon/sandpan/front.png
+++ b/gfx/pokemon/sandslash/front.png
diff --git a/gfx/pokemon/strike/back.png b/gfx/pokemon/scyther/back.png
index 0b137fd..0b137fd 100644
--- a/gfx/pokemon/strike/back.png
+++ b/gfx/pokemon/scyther/back.png
diff --git a/gfx/pokemon/strike/front.png b/gfx/pokemon/scyther/front.png
index 3fe6eea..3fe6eea 100644
--- a/gfx/pokemon/strike/front.png
+++ b/gfx/pokemon/scyther/front.png
diff --git a/gfx/pokemon/azumao/back.png b/gfx/pokemon/seaking/back.png
index 8f0d786..8f0d786 100644
--- a/gfx/pokemon/azumao/back.png
+++ b/gfx/pokemon/seaking/back.png
diff --git a/gfx/pokemon/azumao/front.png b/gfx/pokemon/seaking/front.png
index d9e1433..d9e1433 100644
--- a/gfx/pokemon/azumao/front.png
+++ b/gfx/pokemon/seaking/front.png
diff --git a/gfx/pokemon/pawou/back.png b/gfx/pokemon/seel/back.png
index 1784dbb..1784dbb 100644
--- a/gfx/pokemon/pawou/back.png
+++ b/gfx/pokemon/seel/back.png
diff --git a/gfx/pokemon/pawou/front.png b/gfx/pokemon/seel/front.png
index 08b77f9..08b77f9 100644
--- a/gfx/pokemon/pawou/front.png
+++ b/gfx/pokemon/seel/front.png
diff --git a/gfx/pokemon/yadoran/back.png b/gfx/pokemon/slowbro/back.png
index 3b4c51a..3b4c51a 100644
--- a/gfx/pokemon/yadoran/back.png
+++ b/gfx/pokemon/slowbro/back.png
diff --git a/gfx/pokemon/yadoran/front.png b/gfx/pokemon/slowbro/front.png
index 5ec0d50..5ec0d50 100644
--- a/gfx/pokemon/yadoran/front.png
+++ b/gfx/pokemon/slowbro/front.png
diff --git a/gfx/pokemon/yadon/back.png b/gfx/pokemon/slowpoke/back.png
index 4402fea..4402fea 100644
--- a/gfx/pokemon/yadon/back.png
+++ b/gfx/pokemon/slowpoke/back.png
diff --git a/gfx/pokemon/yadon/front.png b/gfx/pokemon/slowpoke/front.png
index 0730a34..0730a34 100644
--- a/gfx/pokemon/yadon/front.png
+++ b/gfx/pokemon/slowpoke/front.png
diff --git a/gfx/pokemon/kabigon/back.png b/gfx/pokemon/snorlax/back.png
index 44f1e97..44f1e97 100644
--- a/gfx/pokemon/kabigon/back.png
+++ b/gfx/pokemon/snorlax/back.png
diff --git a/gfx/pokemon/kabigon/front.png b/gfx/pokemon/snorlax/front.png
index 132561f..132561f 100644
--- a/gfx/pokemon/kabigon/front.png
+++ b/gfx/pokemon/snorlax/front.png
diff --git a/gfx/pokemon/onisuzume/back.png b/gfx/pokemon/spearow/back.png
index e77a3c5..e77a3c5 100644
--- a/gfx/pokemon/onisuzume/back.png
+++ b/gfx/pokemon/spearow/back.png
diff --git a/gfx/pokemon/onisuzume/front.png b/gfx/pokemon/spearow/front.png
index 320e385..320e385 100644
--- a/gfx/pokemon/onisuzume/front.png
+++ b/gfx/pokemon/spearow/front.png
diff --git a/gfx/pokemon/zenigame/back.png b/gfx/pokemon/squirtle/back.png
index c965b9c..c965b9c 100644
--- a/gfx/pokemon/zenigame/back.png
+++ b/gfx/pokemon/squirtle/back.png
diff --git a/gfx/pokemon/zenigame/front.png b/gfx/pokemon/squirtle/front.png
index bb9f7c9..bb9f7c9 100644
--- a/gfx/pokemon/zenigame/front.png
+++ b/gfx/pokemon/squirtle/front.png
diff --git a/gfx/pokemon/hitodeman/back.png b/gfx/pokemon/staryu/back.png
index 95776f7..95776f7 100644
--- a/gfx/pokemon/hitodeman/back.png
+++ b/gfx/pokemon/staryu/back.png
diff --git a/gfx/pokemon/hitodeman/front.png b/gfx/pokemon/staryu/front.png
index 394732e..394732e 100644
--- a/gfx/pokemon/hitodeman/front.png
+++ b/gfx/pokemon/staryu/front.png
diff --git a/gfx/pokemon/monjara/back.png b/gfx/pokemon/tangela/back.png
index 12c9d18..12c9d18 100644
--- a/gfx/pokemon/monjara/back.png
+++ b/gfx/pokemon/tangela/back.png
diff --git a/gfx/pokemon/monjara/front.png b/gfx/pokemon/tangela/front.png
index eff9c5a..eff9c5a 100644
--- a/gfx/pokemon/monjara/front.png
+++ b/gfx/pokemon/tangela/front.png
diff --git a/gfx/pokemon/kentauros/back.png b/gfx/pokemon/tauros/back.png
index d530081..d530081 100644
--- a/gfx/pokemon/kentauros/back.png
+++ b/gfx/pokemon/tauros/back.png
diff --git a/gfx/pokemon/kentauros/front.png b/gfx/pokemon/tauros/front.png
index 3a4edfe..3a4edfe 100644
--- a/gfx/pokemon/kentauros/front.png
+++ b/gfx/pokemon/tauros/front.png
diff --git a/gfx/pokemon/menokurage/back.png b/gfx/pokemon/tentacool/back.png
index 3d45c1e..3d45c1e 100644
--- a/gfx/pokemon/menokurage/back.png
+++ b/gfx/pokemon/tentacool/back.png
diff --git a/gfx/pokemon/menokurage/front.png b/gfx/pokemon/tentacool/front.png
index 14424d1..14424d1 100644
--- a/gfx/pokemon/menokurage/front.png
+++ b/gfx/pokemon/tentacool/front.png
diff --git a/gfx/pokemon/dokukurage/back.png b/gfx/pokemon/tentacruel/back.png
index 8558bac..8558bac 100644
--- a/gfx/pokemon/dokukurage/back.png
+++ b/gfx/pokemon/tentacruel/back.png
diff --git a/gfx/pokemon/dokukurage/front.png b/gfx/pokemon/tentacruel/front.png
index 7a26a30..7a26a30 100644
--- a/gfx/pokemon/dokukurage/front.png
+++ b/gfx/pokemon/tentacruel/front.png
diff --git a/gfx/pokemon/showers/back.png b/gfx/pokemon/vaporeon/back.png
index 288e12d..288e12d 100644
--- a/gfx/pokemon/showers/back.png
+++ b/gfx/pokemon/vaporeon/back.png
diff --git a/gfx/pokemon/showers/front.png b/gfx/pokemon/vaporeon/front.png
index fcedc75..fcedc75 100644
--- a/gfx/pokemon/showers/front.png
+++ b/gfx/pokemon/vaporeon/front.png
diff --git a/gfx/pokemon/morphon/back.png b/gfx/pokemon/venomoth/back.png
index 4fc5a2e..4fc5a2e 100644
--- a/gfx/pokemon/morphon/back.png
+++ b/gfx/pokemon/venomoth/back.png
diff --git a/gfx/pokemon/morphon/front.png b/gfx/pokemon/venomoth/front.png
index 1c659d9..1c659d9 100644
--- a/gfx/pokemon/morphon/front.png
+++ b/gfx/pokemon/venomoth/front.png
diff --git a/gfx/pokemon/kongpang/back.png b/gfx/pokemon/venonat/back.png
index 73b97cf..73b97cf 100644
--- a/gfx/pokemon/kongpang/back.png
+++ b/gfx/pokemon/venonat/back.png
diff --git a/gfx/pokemon/kongpang/front.png b/gfx/pokemon/venonat/front.png
index 3a59b02..3a59b02 100644
--- a/gfx/pokemon/kongpang/front.png
+++ b/gfx/pokemon/venonat/front.png
diff --git a/gfx/pokemon/fushigibana/back.png b/gfx/pokemon/venusaur/back.png
index ae3d563..ae3d563 100644
--- a/gfx/pokemon/fushigibana/back.png
+++ b/gfx/pokemon/venusaur/back.png
diff --git a/gfx/pokemon/fushigibana/front.png b/gfx/pokemon/venusaur/front.png
index dd39184..dd39184 100644
--- a/gfx/pokemon/fushigibana/front.png
+++ b/gfx/pokemon/venusaur/front.png
diff --git a/gfx/pokemon/utsubot/back.png b/gfx/pokemon/victreebel/back.png
index 903aeb8..903aeb8 100644
--- a/gfx/pokemon/utsubot/back.png
+++ b/gfx/pokemon/victreebel/back.png
diff --git a/gfx/pokemon/utsubot/front.png b/gfx/pokemon/victreebel/front.png
index 5cbf5b5..5cbf5b5 100644
--- a/gfx/pokemon/utsubot/front.png
+++ b/gfx/pokemon/victreebel/front.png
diff --git a/gfx/pokemon/ruffresia/back.png b/gfx/pokemon/vileplume/back.png
index a0d36e8..a0d36e8 100644
--- a/gfx/pokemon/ruffresia/back.png
+++ b/gfx/pokemon/vileplume/back.png
diff --git a/gfx/pokemon/ruffresia/front.png b/gfx/pokemon/vileplume/front.png
index b40d48e..b40d48e 100644
--- a/gfx/pokemon/ruffresia/front.png
+++ b/gfx/pokemon/vileplume/front.png
diff --git a/gfx/pokemon/biriridama/back.png b/gfx/pokemon/voltorb/back.png
index 2d1db46..2d1db46 100644
--- a/gfx/pokemon/biriridama/back.png
+++ b/gfx/pokemon/voltorb/back.png
diff --git a/gfx/pokemon/biriridama/front.png b/gfx/pokemon/voltorb/front.png
index 22d0c67..22d0c67 100644
--- a/gfx/pokemon/biriridama/front.png
+++ b/gfx/pokemon/voltorb/front.png
diff --git a/gfx/pokemon/rokon/back.png b/gfx/pokemon/vulpix/back.png
index b7f5eef..b7f5eef 100644
--- a/gfx/pokemon/rokon/back.png
+++ b/gfx/pokemon/vulpix/back.png
diff --git a/gfx/pokemon/rokon/front.png b/gfx/pokemon/vulpix/front.png
index b49d5a3..b49d5a3 100644
--- a/gfx/pokemon/rokon/front.png
+++ b/gfx/pokemon/vulpix/front.png
diff --git a/gfx/pokemon/kameil/back.png b/gfx/pokemon/wartortle/back.png
index d0a146d..d0a146d 100644
--- a/gfx/pokemon/kameil/back.png
+++ b/gfx/pokemon/wartortle/back.png
diff --git a/gfx/pokemon/kameil/front.png b/gfx/pokemon/wartortle/front.png
index 5599383..5599383 100644
--- a/gfx/pokemon/kameil/front.png
+++ b/gfx/pokemon/wartortle/front.png
diff --git a/gfx/pokemon/beedle/back.png b/gfx/pokemon/weedle/back.png
index 2f7f3a9..2f7f3a9 100644
--- a/gfx/pokemon/beedle/back.png
+++ b/gfx/pokemon/weedle/back.png
diff --git a/gfx/pokemon/beedle/front.png b/gfx/pokemon/weedle/front.png
index 809fde2..809fde2 100644
--- a/gfx/pokemon/beedle/front.png
+++ b/gfx/pokemon/weedle/front.png
diff --git a/gfx/pokemon/utsudon/back.png b/gfx/pokemon/weepinbell/back.png
index cfbca83..cfbca83 100644
--- a/gfx/pokemon/utsudon/back.png
+++ b/gfx/pokemon/weepinbell/back.png
diff --git a/gfx/pokemon/utsudon/front.png b/gfx/pokemon/weepinbell/front.png
index 36b6aed..36b6aed 100644
--- a/gfx/pokemon/utsudon/front.png
+++ b/gfx/pokemon/weepinbell/front.png
diff --git a/gfx/pokemon/matadogas/back.png b/gfx/pokemon/weezing/back.png
index 1ab177d..1ab177d 100644
--- a/gfx/pokemon/matadogas/back.png
+++ b/gfx/pokemon/weezing/back.png
diff --git a/gfx/pokemon/matadogas/front.png b/gfx/pokemon/weezing/front.png
index 8a08573..8a08573 100644
--- a/gfx/pokemon/matadogas/front.png
+++ b/gfx/pokemon/weezing/front.png
diff --git a/gfx/pokemon/pukurin/back.png b/gfx/pokemon/wigglytuff/back.png
index db677c3..db677c3 100644
--- a/gfx/pokemon/pukurin/back.png
+++ b/gfx/pokemon/wigglytuff/back.png
diff --git a/gfx/pokemon/pukurin/front.png b/gfx/pokemon/wigglytuff/front.png
index 85803ee..85803ee 100644
--- a/gfx/pokemon/pukurin/front.png
+++ b/gfx/pokemon/wigglytuff/front.png
diff --git a/gfx/pokemon/thunder/back.png b/gfx/pokemon/zapdos/back.png
index 95c339e..95c339e 100644
--- a/gfx/pokemon/thunder/back.png
+++ b/gfx/pokemon/zapdos/back.png
diff --git a/gfx/pokemon/thunder/front.png b/gfx/pokemon/zapdos/front.png
index 0bd71f4..0bd71f4 100644
--- a/gfx/pokemon/thunder/front.png
+++ b/gfx/pokemon/zapdos/front.png
diff --git a/gfx/sprites/lizardon.png b/gfx/sprites/charizard.png
index 3b6c621..3b6c621 100644
--- a/gfx/sprites/lizardon.png
+++ b/gfx/sprites/charizard.png
diff --git a/gfx/sprites/pippi.png b/gfx/sprites/clefairy.png
index 06fe007..06fe007 100644
--- a/gfx/sprites/pippi.png
+++ b/gfx/sprites/clefairy.png
diff --git a/gfx/sprites/laplace.png b/gfx/sprites/lapras.png
index d124616..d124616 100644
--- a/gfx/sprites/laplace.png
+++ b/gfx/sprites/lapras.png
diff --git a/gfx/sprites/poppo.png b/gfx/sprites/pidgey.png
index 9e20099..9e20099 100644
--- a/gfx/sprites/poppo.png
+++ b/gfx/sprites/pidgey.png
diff --git a/gfx/sprites/nyorobon.png b/gfx/sprites/poliwrath.png
index 058461c..058461c 100644
--- a/gfx/sprites/nyorobon.png
+++ b/gfx/sprites/poliwrath.png
diff --git a/gfx/sprites/sidon.png b/gfx/sprites/rhydon.png
index 80d615b..80d615b 100644
--- a/gfx/sprites/sidon.png
+++ b/gfx/sprites/rhydon.png
diff --git a/gfx/sprites/pawou.png b/gfx/sprites/seel.png
index dbd4c07..dbd4c07 100644
--- a/gfx/sprites/pawou.png
+++ b/gfx/sprites/seel.png
diff --git a/gfx/sprites/kabigon.png b/gfx/sprites/snorlax.png
index 7a2f70c..7a2f70c 100644
--- a/gfx/sprites/kabigon.png
+++ b/gfx/sprites/snorlax.png