Merge pull request #60 from Rangi42/master

Organize home and macro code

1 files changed, 161 insertions, 161 deletions

diff --git a/gfx/pics.asm b/gfx/pics.asm
index 2e410ea3..6cd8af95 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,326 +1,326 @@
 SECTION "Pics 1", ROMX
 
-RhydonPicFront::      INCBIN "gfx/pokemon/front_yellow/rhydon.pic"
+RhydonPicFront::      INCBIN "gfx/pokemon/front/rhydon.pic"
 RhydonPicBack::       INCBIN "gfx/pokemon/back/rhydonb.pic"
-KangaskhanPicFront::  INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic"
+KangaskhanPicFront::  INCBIN "gfx/pokemon/front/kangaskhan.pic"
 KangaskhanPicBack::   INCBIN "gfx/pokemon/back/kangaskhanb.pic"
-NidoranMPicFront::    INCBIN "gfx/pokemon/front_yellow/nidoranm.pic"
+NidoranMPicFront::    INCBIN "gfx/pokemon/front/nidoranm.pic"
 NidoranMPicBack::     INCBIN "gfx/pokemon/back/nidoranmb.pic"
-ClefairyPicFront::    INCBIN "gfx/pokemon/front_yellow/clefairy.pic"
+ClefairyPicFront::    INCBIN "gfx/pokemon/front/clefairy.pic"
 ClefairyPicBack::     INCBIN "gfx/pokemon/back/clefairyb.pic"
-SpearowPicFront::     INCBIN "gfx/pokemon/front_yellow/spearow.pic"
+SpearowPicFront::     INCBIN "gfx/pokemon/front/spearow.pic"
 SpearowPicBack::      INCBIN "gfx/pokemon/back/spearowb.pic"
-VoltorbPicFront::     INCBIN "gfx/pokemon/front_yellow/voltorb.pic"
+VoltorbPicFront::     INCBIN "gfx/pokemon/front/voltorb.pic"
 VoltorbPicBack::      INCBIN "gfx/pokemon/back/voltorbb.pic"
-NidokingPicFront::    INCBIN "gfx/pokemon/front_yellow/nidoking.pic"
+NidokingPicFront::    INCBIN "gfx/pokemon/front/nidoking.pic"
 NidokingPicBack::     INCBIN "gfx/pokemon/back/nidokingb.pic"
-SlowbroPicFront::     INCBIN "gfx/pokemon/front_yellow/slowbro.pic"
+SlowbroPicFront::     INCBIN "gfx/pokemon/front/slowbro.pic"
 SlowbroPicBack::      INCBIN "gfx/pokemon/back/slowbrob.pic"
-IvysaurPicFront::     INCBIN "gfx/pokemon/front_yellow/ivysaur.pic"
+IvysaurPicFront::     INCBIN "gfx/pokemon/front/ivysaur.pic"
 IvysaurPicBack::      INCBIN "gfx/pokemon/back/ivysaurb.pic"
-ExeggutorPicFront::   INCBIN "gfx/pokemon/front_yellow/exeggutor.pic"
+ExeggutorPicFront::   INCBIN "gfx/pokemon/front/exeggutor.pic"
 ExeggutorPicBack::    INCBIN "gfx/pokemon/back/exeggutorb.pic"
-LickitungPicFront::   INCBIN "gfx/pokemon/front_yellow/lickitung.pic"
+LickitungPicFront::   INCBIN "gfx/pokemon/front/lickitung.pic"
 LickitungPicBack::    INCBIN "gfx/pokemon/back/lickitungb.pic"
-ExeggcutePicFront::   INCBIN "gfx/pokemon/front_yellow/exeggcute.pic"
+ExeggcutePicFront::   INCBIN "gfx/pokemon/front/exeggcute.pic"
 ExeggcutePicBack::    INCBIN "gfx/pokemon/back/exeggcuteb.pic"
-GrimerPicFront::      INCBIN "gfx/pokemon/front_yellow/grimer.pic"
+GrimerPicFront::      INCBIN "gfx/pokemon/front/grimer.pic"
 GrimerPicBack::       INCBIN "gfx/pokemon/back/grimerb.pic"
-GengarPicFront::      INCBIN "gfx/pokemon/front_yellow/gengar.pic"
+GengarPicFront::      INCBIN "gfx/pokemon/front/gengar.pic"
 GengarPicBack::       INCBIN "gfx/pokemon/back/gengarb.pic"
-NidoranFPicFront::    INCBIN "gfx/pokemon/front_yellow/nidoranf.pic"
+NidoranFPicFront::    INCBIN "gfx/pokemon/front/nidoranf.pic"
 NidoranFPicBack::     INCBIN "gfx/pokemon/back/nidoranfb.pic"
-NidoqueenPicFront::   INCBIN "gfx/pokemon/front_yellow/nidoqueen.pic"
+NidoqueenPicFront::   INCBIN "gfx/pokemon/front/nidoqueen.pic"
 NidoqueenPicBack::    INCBIN "gfx/pokemon/back/nidoqueenb.pic"
-CubonePicFront::      INCBIN "gfx/pokemon/front_yellow/cubone.pic"
+CubonePicFront::      INCBIN "gfx/pokemon/front/cubone.pic"
 CubonePicBack::       INCBIN "gfx/pokemon/back/cuboneb.pic"
-RhyhornPicFront::     INCBIN "gfx/pokemon/front_yellow/rhyhorn.pic"
+RhyhornPicFront::     INCBIN "gfx/pokemon/front/rhyhorn.pic"
 RhyhornPicBack::      INCBIN "gfx/pokemon/back/rhyhornb.pic"
-LaprasPicFront::      INCBIN "gfx/pokemon/front_yellow/lapras.pic"
+LaprasPicFront::      INCBIN "gfx/pokemon/front/lapras.pic"
 LaprasPicBack::       INCBIN "gfx/pokemon/back/laprasb.pic"
-ArcaninePicFront::    INCBIN "gfx/pokemon/front_yellow/arcanine.pic"
+ArcaninePicFront::    INCBIN "gfx/pokemon/front/arcanine.pic"
 ArcaninePicBack::     INCBIN "gfx/pokemon/back/arcanineb.pic"
-MewPicFront::         INCBIN "gfx/pokemon/front_yellow/mew.pic"
+MewPicFront::         INCBIN "gfx/pokemon/front/mew.pic"
 MewPicBack::          INCBIN "gfx/pokemon/back/mewb.pic"
-GyaradosPicFront::    INCBIN "gfx/pokemon/front_yellow/gyarados.pic"
+GyaradosPicFront::    INCBIN "gfx/pokemon/front/gyarados.pic"
 GyaradosPicBack::     INCBIN "gfx/pokemon/back/gyaradosb.pic"
-ShellderPicFront::    INCBIN "gfx/pokemon/front_yellow/shellder.pic"
+ShellderPicFront::    INCBIN "gfx/pokemon/front/shellder.pic"
 ShellderPicBack::     INCBIN "gfx/pokemon/back/shellderb.pic"
-TentacoolPicFront::   INCBIN "gfx/pokemon/front_yellow/tentacool.pic"
+TentacoolPicFront::   INCBIN "gfx/pokemon/front/tentacool.pic"
 TentacoolPicBack::    INCBIN "gfx/pokemon/back/tentacoolb.pic"
-GastlyPicFront::      INCBIN "gfx/pokemon/front_yellow/gastly.pic"
+GastlyPicFront::      INCBIN "gfx/pokemon/front/gastly.pic"
 GastlyPicBack::       INCBIN "gfx/pokemon/back/gastlyb.pic"
-ScytherPicFront::     INCBIN "gfx/pokemon/front_yellow/scyther.pic"
+ScytherPicFront::     INCBIN "gfx/pokemon/front/scyther.pic"
 ScytherPicBack::      INCBIN "gfx/pokemon/back/scytherb.pic"
-StaryuPicFront::      INCBIN "gfx/pokemon/front_yellow/staryu.pic"
+StaryuPicFront::      INCBIN "gfx/pokemon/front/staryu.pic"
 StaryuPicBack::       INCBIN "gfx/pokemon/back/staryub.pic"
-BlastoisePicFront::   INCBIN "gfx/pokemon/front_yellow/blastoise.pic"
+BlastoisePicFront::   INCBIN "gfx/pokemon/front/blastoise.pic"
 BlastoisePicBack::    INCBIN "gfx/pokemon/back/blastoiseb.pic"
-PinsirPicFront::      INCBIN "gfx/pokemon/front_yellow/pinsir.pic"
+PinsirPicFront::      INCBIN "gfx/pokemon/front/pinsir.pic"
 PinsirPicBack::       INCBIN "gfx/pokemon/back/pinsirb.pic"
-TangelaPicFront::     INCBIN "gfx/pokemon/front_yellow/tangela.pic"
+TangelaPicFront::     INCBIN "gfx/pokemon/front/tangela.pic"
 TangelaPicBack::      INCBIN "gfx/pokemon/back/tangelab.pic"
 
 
 SECTION "Pics 2", ROMX
 
-GrowlithePicFront::   INCBIN "gfx/pokemon/front_yellow/growlithe.pic"
+GrowlithePicFront::   INCBIN "gfx/pokemon/front/growlithe.pic"
 GrowlithePicBack::    INCBIN "gfx/pokemon/back/growlitheb.pic"
-OnixPicFront::        INCBIN "gfx/pokemon/front_yellow/onix.pic"
+OnixPicFront::        INCBIN "gfx/pokemon/front/onix.pic"
 OnixPicBack::         INCBIN "gfx/pokemon/back/onixb.pic"
-FearowPicFront::      INCBIN "gfx/pokemon/front_yellow/fearow.pic"
+FearowPicFront::      INCBIN "gfx/pokemon/front/fearow.pic"
 FearowPicBack::       INCBIN "gfx/pokemon/back/fearowb.pic"
-PidgeyPicFront::      INCBIN "gfx/pokemon/front_yellow/pidgey.pic"
+PidgeyPicFront::      INCBIN "gfx/pokemon/front/pidgey.pic"
 PidgeyPicBack::       INCBIN "gfx/pokemon/back/pidgeyb.pic"
-SlowpokePicFront::    INCBIN "gfx/pokemon/front_yellow/slowpoke.pic"
+SlowpokePicFront::    INCBIN "gfx/pokemon/front/slowpoke.pic"
 SlowpokePicBack::     INCBIN "gfx/pokemon/back/slowpokeb.pic"
-KadabraPicFront::     INCBIN "gfx/pokemon/front_yellow/kadabra.pic"
+KadabraPicFront::     INCBIN "gfx/pokemon/front/kadabra.pic"
 KadabraPicBack::      INCBIN "gfx/pokemon/back/kadabrab.pic"
-GravelerPicFront::    INCBIN "gfx/pokemon/front_yellow/graveler.pic"
+GravelerPicFront::    INCBIN "gfx/pokemon/front/graveler.pic"
 GravelerPicBack::     INCBIN "gfx/pokemon/back/gravelerb.pic"
-ChanseyPicFront::     INCBIN "gfx/pokemon/front_yellow/chansey.pic"
+ChanseyPicFront::     INCBIN "gfx/pokemon/front/chansey.pic"
 ChanseyPicBack::      INCBIN "gfx/pokemon/back/chanseyb.pic"
-MachokePicFront::     INCBIN "gfx/pokemon/front_yellow/machoke.pic"
+MachokePicFront::     INCBIN "gfx/pokemon/front/machoke.pic"
 MachokePicBack::      INCBIN "gfx/pokemon/back/machokeb.pic"
-MrMimePicFront::      INCBIN "gfx/pokemon/front_yellow/mr.mime.pic"
+MrMimePicFront::      INCBIN "gfx/pokemon/front/mr.mime.pic"
 MrMimePicBack::       INCBIN "gfx/pokemon/back/mr.mimeb.pic"
-HitmonleePicFront::   INCBIN "gfx/pokemon/front_yellow/hitmonlee.pic"
+HitmonleePicFront::   INCBIN "gfx/pokemon/front/hitmonlee.pic"
 HitmonleePicBack::    INCBIN "gfx/pokemon/back/hitmonleeb.pic"
-HitmonchanPicFront::  INCBIN "gfx/pokemon/front_yellow/hitmonchan.pic"
+HitmonchanPicFront::  INCBIN "gfx/pokemon/front/hitmonchan.pic"
 HitmonchanPicBack::   INCBIN "gfx/pokemon/back/hitmonchanb.pic"
-ArbokPicFront::       INCBIN "gfx/pokemon/front_yellow/arbok.pic"
+ArbokPicFront::       INCBIN "gfx/pokemon/front/arbok.pic"
 ArbokPicBack::        INCBIN "gfx/pokemon/back/arbokb.pic"
-ParasectPicFront::    INCBIN "gfx/pokemon/front_yellow/parasect.pic"
+ParasectPicFront::    INCBIN "gfx/pokemon/front/parasect.pic"
 ParasectPicBack::     INCBIN "gfx/pokemon/back/parasectb.pic"
-PsyduckPicFront::     INCBIN "gfx/pokemon/front_yellow/psyduck.pic"
+PsyduckPicFront::     INCBIN "gfx/pokemon/front/psyduck.pic"
 PsyduckPicBack::      INCBIN "gfx/pokemon/back/psyduckb.pic"
-DrowzeePicFront::     INCBIN "gfx/pokemon/front_yellow/drowzee.pic"
+DrowzeePicFront::     INCBIN "gfx/pokemon/front/drowzee.pic"
 DrowzeePicBack::      INCBIN "gfx/pokemon/back/drowzeeb.pic"
-GolemPicFront::       INCBIN "gfx/pokemon/front_yellow/golem.pic"
+GolemPicFront::       INCBIN "gfx/pokemon/front/golem.pic"
 GolemPicBack::        INCBIN "gfx/pokemon/back/golemb.pic"
-MagmarPicFront::      INCBIN "gfx/pokemon/front_yellow/magmar.pic"
+MagmarPicFront::      INCBIN "gfx/pokemon/front/magmar.pic"
 MagmarPicBack::       INCBIN "gfx/pokemon/back/magmarb.pic"
-ElectabuzzPicFront::  INCBIN "gfx/pokemon/front_yellow/electabuzz.pic"
+ElectabuzzPicFront::  INCBIN "gfx/pokemon/front/electabuzz.pic"
 ElectabuzzPicBack::   INCBIN "gfx/pokemon/back/electabuzzb.pic"
-MagnetonPicFront::    INCBIN "gfx/pokemon/front_yellow/magneton.pic"
+MagnetonPicFront::    INCBIN "gfx/pokemon/front/magneton.pic"
 MagnetonPicBack::     INCBIN "gfx/pokemon/back/magnetonb.pic"
-KoffingPicFront::     INCBIN "gfx/pokemon/front_yellow/koffing.pic"
+KoffingPicFront::     INCBIN "gfx/pokemon/front/koffing.pic"
 KoffingPicBack::      INCBIN "gfx/pokemon/back/koffingb.pic"
-MankeyPicFront::      INCBIN "gfx/pokemon/front_yellow/mankey.pic"
+MankeyPicFront::      INCBIN "gfx/pokemon/front/mankey.pic"
 MankeyPicBack::       INCBIN "gfx/pokemon/back/mankeyb.pic"
-SeelPicFront::        INCBIN "gfx/pokemon/front_yellow/seel.pic"
+SeelPicFront::        INCBIN "gfx/pokemon/front/seel.pic"
 SeelPicBack::         INCBIN "gfx/pokemon/back/seelb.pic"
-DiglettPicFront::     INCBIN "gfx/pokemon/front_yellow/diglett.pic"
+DiglettPicFront::     INCBIN "gfx/pokemon/front/diglett.pic"
 DiglettPicBack::      INCBIN "gfx/pokemon/back/diglettb.pic"
-TaurosPicFront::      INCBIN "gfx/pokemon/front_yellow/tauros.pic"
+TaurosPicFront::      INCBIN "gfx/pokemon/front/tauros.pic"
 TaurosPicBack::       INCBIN "gfx/pokemon/back/taurosb.pic"
-FarfetchdPicFront::   INCBIN "gfx/pokemon/front_yellow/farfetchd.pic"
+FarfetchdPicFront::   INCBIN "gfx/pokemon/front/farfetchd.pic"
 FarfetchdPicBack::    INCBIN "gfx/pokemon/back/farfetchdb.pic"
-VenonatPicFront::     INCBIN "gfx/pokemon/front_yellow/venonat.pic"
+VenonatPicFront::     INCBIN "gfx/pokemon/front/venonat.pic"
 VenonatPicBack::      INCBIN "gfx/pokemon/back/venonatb.pic"
-DragonitePicFront::   INCBIN "gfx/pokemon/front_yellow/dragonite.pic"
+DragonitePicFront::   INCBIN "gfx/pokemon/front/dragonite.pic"
 DragonitePicBack::    INCBIN "gfx/pokemon/back/dragoniteb.pic"
-DoduoPicFront::       INCBIN "gfx/pokemon/front_yellow/doduo.pic"
+DoduoPicFront::       INCBIN "gfx/pokemon/front/doduo.pic"
 DoduoPicBack::        INCBIN "gfx/pokemon/back/doduob.pic"
-PoliwagPicFront::     INCBIN "gfx/pokemon/front_yellow/poliwag.pic"
+PoliwagPicFront::     INCBIN "gfx/pokemon/front/poliwag.pic"
 PoliwagPicBack::      INCBIN "gfx/pokemon/back/poliwagb.pic"
-JynxPicFront::        INCBIN "gfx/pokemon/front_yellow/jynx.pic"
+JynxPicFront::        INCBIN "gfx/pokemon/front/jynx.pic"
 JynxPicBack::         INCBIN "gfx/pokemon/back/jynxb.pic"
-MoltresPicFront::     INCBIN "gfx/pokemon/front_yellow/moltres.pic"
+MoltresPicFront::     INCBIN "gfx/pokemon/front/moltres.pic"
 MoltresPicBack::      INCBIN "gfx/pokemon/back/moltresb.pic"
 
 
 SECTION "Pics 3", ROMX
 
-ArticunoPicFront::    INCBIN "gfx/pokemon/front_yellow/articuno.pic"
+ArticunoPicFront::    INCBIN "gfx/pokemon/front/articuno.pic"
 ArticunoPicBack::     INCBIN "gfx/pokemon/back/articunob.pic"
-ZapdosPicFront::      INCBIN "gfx/pokemon/front_yellow/zapdos.pic"
+ZapdosPicFront::      INCBIN "gfx/pokemon/front/zapdos.pic"
 ZapdosPicBack::       INCBIN "gfx/pokemon/back/zapdosb.pic"
-DittoPicFront::       INCBIN "gfx/pokemon/front_yellow/ditto.pic"
+DittoPicFront::       INCBIN "gfx/pokemon/front/ditto.pic"
 DittoPicBack::        INCBIN "gfx/pokemon/back/dittob.pic"
-MeowthPicFront::      INCBIN "gfx/pokemon/front_yellow/meowth.pic"
+MeowthPicFront::      INCBIN "gfx/pokemon/front/meowth.pic"
 MeowthPicBack::       INCBIN "gfx/pokemon/back/meowthb.pic"
-KrabbyPicFront::      INCBIN "gfx/pokemon/front_yellow/krabby.pic"
+KrabbyPicFront::      INCBIN "gfx/pokemon/front/krabby.pic"
 KrabbyPicBack::       INCBIN "gfx/pokemon/back/krabbyb.pic"
-VulpixPicFront::      INCBIN "gfx/pokemon/front_yellow/vulpix.pic"
+VulpixPicFront::      INCBIN "gfx/pokemon/front/vulpix.pic"
 VulpixPicBack::       INCBIN "gfx/pokemon/back/vulpixb.pic"
-NinetalesPicFront::   INCBIN "gfx/pokemon/front_yellow/ninetales.pic"
+NinetalesPicFront::   INCBIN "gfx/pokemon/front/ninetales.pic"
 NinetalesPicBack::    INCBIN "gfx/pokemon/back/ninetalesb.pic"
-PikachuPicFront::     INCBIN "gfx/pokemon/front_yellow/pikachu.pic"
+PikachuPicFront::     INCBIN "gfx/pokemon/front/pikachu.pic"
 PikachuPicBack::      INCBIN "gfx/pokemon/back/pikachub.pic"
-RaichuPicFront::      INCBIN "gfx/pokemon/front_yellow/raichu.pic"
+RaichuPicFront::      INCBIN "gfx/pokemon/front/raichu.pic"
 RaichuPicBack::       INCBIN "gfx/pokemon/back/raichub.pic"
-DratiniPicFront::     INCBIN "gfx/pokemon/front_yellow/dratini.pic"
+DratiniPicFront::     INCBIN "gfx/pokemon/front/dratini.pic"
 DratiniPicBack::      INCBIN "gfx/pokemon/back/dratinib.pic"
-DragonairPicFront::   INCBIN "gfx/pokemon/front_yellow/dragonair.pic"
+DragonairPicFront::   INCBIN "gfx/pokemon/front/dragonair.pic"
 DragonairPicBack::    INCBIN "gfx/pokemon/back/dragonairb.pic"
-KabutoPicFront::      INCBIN "gfx/pokemon/front_yellow/kabuto.pic"
+KabutoPicFront::      INCBIN "gfx/pokemon/front/kabuto.pic"
 KabutoPicBack::       INCBIN "gfx/pokemon/back/kabutob.pic"
-KabutopsPicFront::    INCBIN "gfx/pokemon/front_yellow/kabutops.pic"
+KabutopsPicFront::    INCBIN "gfx/pokemon/front/kabutops.pic"
 KabutopsPicBack::     INCBIN "gfx/pokemon/back/kabutopsb.pic"
-HorseaPicFront::      INCBIN "gfx/pokemon/front_yellow/horsea.pic"
+HorseaPicFront::      INCBIN "gfx/pokemon/front/horsea.pic"
 HorseaPicBack::       INCBIN "gfx/pokemon/back/horseab.pic"
-SeadraPicFront::      INCBIN "gfx/pokemon/front_yellow/seadra.pic"
+SeadraPicFront::      INCBIN "gfx/pokemon/front/seadra.pic"
 SeadraPicBack::       INCBIN "gfx/pokemon/back/seadrab.pic"
-SandshrewPicFront::   INCBIN "gfx/pokemon/front_yellow/sandshrew.pic"
+SandshrewPicFront::   INCBIN "gfx/pokemon/front/sandshrew.pic"
 SandshrewPicBack::    INCBIN "gfx/pokemon/back/sandshrewb.pic"
-SandslashPicFront::   INCBIN "gfx/pokemon/front_yellow/sandslash.pic"
+SandslashPicFront::   INCBIN "gfx/pokemon/front/sandslash.pic"
 SandslashPicBack::    INCBIN "gfx/pokemon/back/sandslashb.pic"
-OmanytePicFront::     INCBIN "gfx/pokemon/front_yellow/omanyte.pic"
+OmanytePicFront::     INCBIN "gfx/pokemon/front/omanyte.pic"
 OmanytePicBack::      INCBIN "gfx/pokemon/back/omanyteb.pic"
-OmastarPicFront::     INCBIN "gfx/pokemon/front_yellow/omastar.pic"
+OmastarPicFront::     INCBIN "gfx/pokemon/front/omastar.pic"
 OmastarPicBack::      INCBIN "gfx/pokemon/back/omastarb.pic"
-JigglypuffPicFront::  INCBIN "gfx/pokemon/front_yellow/jigglypuff.pic"
+JigglypuffPicFront::  INCBIN "gfx/pokemon/front/jigglypuff.pic"
 JigglypuffPicBack::   INCBIN "gfx/pokemon/back/jigglypuffb.pic"
-WigglytuffPicFront::  INCBIN "gfx/pokemon/front_yellow/wigglytuff.pic"
+WigglytuffPicFront::  INCBIN "gfx/pokemon/front/wigglytuff.pic"
 WigglytuffPicBack::   INCBIN "gfx/pokemon/back/wigglytuffb.pic"
-EeveePicFront::       INCBIN "gfx/pokemon/front_yellow/eevee.pic"
+EeveePicFront::       INCBIN "gfx/pokemon/front/eevee.pic"
 EeveePicBack::        INCBIN "gfx/pokemon/back/eeveeb.pic"
-FlareonPicFront::     INCBIN "gfx/pokemon/front_yellow/flareon.pic"
+FlareonPicFront::     INCBIN "gfx/pokemon/front/flareon.pic"
 FlareonPicBack::      INCBIN "gfx/pokemon/back/flareonb.pic"
-JolteonPicFront::     INCBIN "gfx/pokemon/front_yellow/jolteon.pic"
+JolteonPicFront::     INCBIN "gfx/pokemon/front/jolteon.pic"
 JolteonPicBack::      INCBIN "gfx/pokemon/back/jolteonb.pic"
-VaporeonPicFront::    INCBIN "gfx/pokemon/front_yellow/vaporeon.pic"
+VaporeonPicFront::    INCBIN "gfx/pokemon/front/vaporeon.pic"
 VaporeonPicBack::     INCBIN "gfx/pokemon/back/vaporeonb.pic"
-MachopPicFront::      INCBIN "gfx/pokemon/front_yellow/machop.pic"
+MachopPicFront::      INCBIN "gfx/pokemon/front/machop.pic"
 MachopPicBack::       INCBIN "gfx/pokemon/back/machopb.pic"
-ZubatPicFront::       INCBIN "gfx/pokemon/front_yellow/zubat.pic"
+ZubatPicFront::       INCBIN "gfx/pokemon/front/zubat.pic"
 ZubatPicBack::        INCBIN "gfx/pokemon/back/zubatb.pic"
-EkansPicFront::       INCBIN "gfx/pokemon/front_yellow/ekans.pic"
+EkansPicFront::       INCBIN "gfx/pokemon/front/ekans.pic"
 EkansPicBack::        INCBIN "gfx/pokemon/back/ekansb.pic"
-ParasPicFront::       INCBIN "gfx/pokemon/front_yellow/paras.pic"
+ParasPicFront::       INCBIN "gfx/pokemon/front/paras.pic"
 ParasPicBack::        INCBIN "gfx/pokemon/back/parasb.pic"
-PoliwhirlPicFront::   INCBIN "gfx/pokemon/front_yellow/poliwhirl.pic"
+PoliwhirlPicFront::   INCBIN "gfx/pokemon/front/poliwhirl.pic"
 PoliwhirlPicBack::    INCBIN "gfx/pokemon/back/poliwhirlb.pic"
-PoliwrathPicFront::   INCBIN "gfx/pokemon/front_yellow/poliwrath.pic"
+PoliwrathPicFront::   INCBIN "gfx/pokemon/front/poliwrath.pic"
 PoliwrathPicBack::    INCBIN "gfx/pokemon/back/poliwrathb.pic"
-WeedlePicFront::      INCBIN "gfx/pokemon/front_yellow/weedle.pic"
+WeedlePicFront::      INCBIN "gfx/pokemon/front/weedle.pic"
 WeedlePicBack::       INCBIN "gfx/pokemon/back/weedleb.pic"
-KakunaPicFront::      INCBIN "gfx/pokemon/front_yellow/kakuna.pic"
+KakunaPicFront::      INCBIN "gfx/pokemon/front/kakuna.pic"
 KakunaPicBack::       INCBIN "gfx/pokemon/back/kakunab.pic"
-BeedrillPicFront::    INCBIN "gfx/pokemon/front_yellow/beedrill.pic"
+BeedrillPicFront::    INCBIN "gfx/pokemon/front/beedrill.pic"
 BeedrillPicBack::     INCBIN "gfx/pokemon/back/beedrillb.pic"
 
-FossilKabutopsPic::   INCBIN "gfx/pokemon/front_yellow/fossilkabutops.pic"
+FossilKabutopsPic::   INCBIN "gfx/pokemon/front/fossilkabutops.pic"
 
 
 SECTION "Pics 4", ROMX
 
-DodrioPicFront::       INCBIN "gfx/pokemon/front_yellow/dodrio.pic"
+DodrioPicFront::       INCBIN "gfx/pokemon/front/dodrio.pic"
 DodrioPicBack::        INCBIN "gfx/pokemon/back/dodriob.pic"
-PrimeapePicFront::     INCBIN "gfx/pokemon/front_yellow/primeape.pic"
+PrimeapePicFront::     INCBIN "gfx/pokemon/front/primeape.pic"
 PrimeapePicBack::      INCBIN "gfx/pokemon/back/primeapeb.pic"
-DugtrioPicFront::      INCBIN "gfx/pokemon/front_yellow/dugtrio.pic"
+DugtrioPicFront::      INCBIN "gfx/pokemon/front/dugtrio.pic"
 DugtrioPicBack::       INCBIN "gfx/pokemon/back/dugtriob.pic"
-VenomothPicFront::     INCBIN "gfx/pokemon/front_yellow/venomoth.pic"
+VenomothPicFront::     INCBIN "gfx/pokemon/front/venomoth.pic"
 VenomothPicBack::      INCBIN "gfx/pokemon/back/venomothb.pic"
-DewgongPicFront::      INCBIN "gfx/pokemon/front_yellow/dewgong.pic"
+DewgongPicFront::      INCBIN "gfx/pokemon/front/dewgong.pic"
 DewgongPicBack::       INCBIN "gfx/pokemon/back/dewgongb.pic"
-CaterpiePicFront::     INCBIN "gfx/pokemon/front_yellow/caterpie.pic"
+CaterpiePicFront::     INCBIN "gfx/pokemon/front/caterpie.pic"
 CaterpiePicBack::      INCBIN "gfx/pokemon/back/caterpieb.pic"
-MetapodPicFront::      INCBIN "gfx/pokemon/front_yellow/metapod.pic"
+MetapodPicFront::      INCBIN "gfx/pokemon/front/metapod.pic"
 MetapodPicBack::       INCBIN "gfx/pokemon/back/metapodb.pic"
-ButterfreePicFront::   INCBIN "gfx/pokemon/front_yellow/butterfree.pic"
+ButterfreePicFront::   INCBIN "gfx/pokemon/front/butterfree.pic"
 ButterfreePicBack::    INCBIN "gfx/pokemon/back/butterfreeb.pic"
-MachampPicFront::      INCBIN "gfx/pokemon/front_yellow/machamp.pic"
+MachampPicFront::      INCBIN "gfx/pokemon/front/machamp.pic"
 MachampPicBack::       INCBIN "gfx/pokemon/back/machampb.pic"
-GolduckPicFront::      INCBIN "gfx/pokemon/front_yellow/golduck.pic"
+GolduckPicFront::      INCBIN "gfx/pokemon/front/golduck.pic"
 GolduckPicBack::       INCBIN "gfx/pokemon/back/golduckb.pic"
-HypnoPicFront::        INCBIN "gfx/pokemon/front_yellow/hypno.pic"
+HypnoPicFront::        INCBIN "gfx/pokemon/front/hypno.pic"
 HypnoPicBack::         INCBIN "gfx/pokemon/back/hypnob.pic"
-GolbatPicFront::       INCBIN "gfx/pokemon/front_yellow/golbat.pic"
+GolbatPicFront::       INCBIN "gfx/pokemon/front/golbat.pic"
 GolbatPicBack::        INCBIN "gfx/pokemon/back/golbatb.pic"
-MewtwoPicFront::       INCBIN "gfx/pokemon/front_yellow/mewtwo.pic"
+MewtwoPicFront::       INCBIN "gfx/pokemon/front/mewtwo.pic"
 MewtwoPicBack::        INCBIN "gfx/pokemon/back/mewtwob.pic"
-SnorlaxPicFront::      INCBIN "gfx/pokemon/front_yellow/snorlax.pic"
+SnorlaxPicFront::      INCBIN "gfx/pokemon/front/snorlax.pic"
 SnorlaxPicBack::       INCBIN "gfx/pokemon/back/snorlaxb.pic"
-MagikarpPicFront::     INCBIN "gfx/pokemon/front_yellow/magikarp.pic"
+MagikarpPicFront::     INCBIN "gfx/pokemon/front/magikarp.pic"
 MagikarpPicBack::      INCBIN "gfx/pokemon/back/magikarpb.pic"
-MukPicFront::          INCBIN "gfx/pokemon/front_yellow/muk.pic"
+MukPicFront::          INCBIN "gfx/pokemon/front/muk.pic"
 MukPicBack::           INCBIN "gfx/pokemon/back/mukb.pic"
-KinglerPicFront::      INCBIN "gfx/pokemon/front_yellow/kingler.pic"
+KinglerPicFront::      INCBIN "gfx/pokemon/front/kingler.pic"
 KinglerPicBack::       INCBIN "gfx/pokemon/back/kinglerb.pic"
-CloysterPicFront::     INCBIN "gfx/pokemon/front_yellow/cloyster.pic"
+CloysterPicFront::     INCBIN "gfx/pokemon/front/cloyster.pic"
 CloysterPicBack::      INCBIN "gfx/pokemon/back/cloysterb.pic"
-ElectrodePicFront::    INCBIN "gfx/pokemon/front_yellow/electrode.pic"
+ElectrodePicFront::    INCBIN "gfx/pokemon/front/electrode.pic"
 ElectrodePicBack::     INCBIN "gfx/pokemon/back/electrodeb.pic"
-ClefablePicFront::     INCBIN "gfx/pokemon/front_yellow/clefable.pic"
+ClefablePicFront::     INCBIN "gfx/pokemon/front/clefable.pic"
 ClefablePicBack::      INCBIN "gfx/pokemon/back/clefableb.pic"
-WeezingPicFront::      INCBIN "gfx/pokemon/front_yellow/weezing.pic"
+WeezingPicFront::      INCBIN "gfx/pokemon/front/weezing.pic"
 WeezingPicBack::       INCBIN "gfx/pokemon/back/weezingb.pic"
-PersianPicFront::      INCBIN "gfx/pokemon/front_yellow/persian.pic"
+PersianPicFront::      INCBIN "gfx/pokemon/front/persian.pic"
 PersianPicBack::       INCBIN "gfx/pokemon/back/persianb.pic"
-MarowakPicFront::      INCBIN "gfx/pokemon/front_yellow/marowak.pic"
+MarowakPicFront::      INCBIN "gfx/pokemon/front/marowak.pic"
 MarowakPicBack::       INCBIN "gfx/pokemon/back/marowakb.pic"
-HaunterPicFront::      INCBIN "gfx/pokemon/front_yellow/haunter.pic"
+HaunterPicFront::      INCBIN "gfx/pokemon/front/haunter.pic"
 HaunterPicBack::       INCBIN "gfx/pokemon/back/haunterb.pic"
-AbraPicFront::         INCBIN "gfx/pokemon/front_yellow/abra.pic"
+AbraPicFront::         INCBIN "gfx/pokemon/front/abra.pic"
 AbraPicBack::          INCBIN "gfx/pokemon/back/abrab.pic"
-AlakazamPicFront::     INCBIN "gfx/pokemon/front_yellow/alakazam.pic"
+AlakazamPicFront::     INCBIN "gfx/pokemon/front/alakazam.pic"
 AlakazamPicBack::      INCBIN "gfx/pokemon/back/alakazamb.pic"
-PidgeottoPicFront::    INCBIN "gfx/pokemon/front_yellow/pidgeotto.pic"
+PidgeottoPicFront::    INCBIN "gfx/pokemon/front/pidgeotto.pic"
 PidgeottoPicBack::     INCBIN "gfx/pokemon/back/pidgeottob.pic"
-PidgeotPicFront::      INCBIN "gfx/pokemon/front_yellow/pidgeot.pic"
+PidgeotPicFront::      INCBIN "gfx/pokemon/front/pidgeot.pic"
 PidgeotPicBack::       INCBIN "gfx/pokemon/back/pidgeotb.pic"
-StarmiePicFront::      INCBIN "gfx/pokemon/front_yellow/starmie.pic"
+StarmiePicFront::      INCBIN "gfx/pokemon/front/starmie.pic"
 StarmiePicBack::       INCBIN "gfx/pokemon/back/starmieb.pic"
 
 
 SECTION "Pics 5", ROMX
 
-BulbasaurPicFront::    INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic"
+BulbasaurPicFront::    INCBIN "gfx/pokemon/front/bulbasaur.pic"
 BulbasaurPicBack::     INCBIN "gfx/pokemon/back/bulbasaurb.pic"
-VenusaurPicFront::     INCBIN "gfx/pokemon/front_yellow/venusaur.pic"
+VenusaurPicFront::     INCBIN "gfx/pokemon/front/venusaur.pic"
 VenusaurPicBack::      INCBIN "gfx/pokemon/back/venusaurb.pic"
-TentacruelPicFront::   INCBIN "gfx/pokemon/front_yellow/tentacruel.pic"
+TentacruelPicFront::   INCBIN "gfx/pokemon/front/tentacruel.pic"
 TentacruelPicBack::    INCBIN "gfx/pokemon/back/tentacruelb.pic"
-GoldeenPicFront::      INCBIN "gfx/pokemon/front_yellow/goldeen.pic"
+GoldeenPicFront::      INCBIN "gfx/pokemon/front/goldeen.pic"
 GoldeenPicBack::       INCBIN "gfx/pokemon/back/goldeenb.pic"
-SeakingPicFront::      INCBIN "gfx/pokemon/front_yellow/seaking.pic"
+SeakingPicFront::      INCBIN "gfx/pokemon/front/seaking.pic"
 SeakingPicBack::       INCBIN "gfx/pokemon/back/seakingb.pic"
-PonytaPicFront::       INCBIN "gfx/pokemon/front_yellow/ponyta.pic"
-RapidashPicFront::     INCBIN "gfx/pokemon/front_yellow/rapidash.pic"
+PonytaPicFront::       INCBIN "gfx/pokemon/front/ponyta.pic"
+RapidashPicFront::     INCBIN "gfx/pokemon/front/rapidash.pic"
 PonytaPicBack::        INCBIN "gfx/pokemon/back/ponytab.pic"
 RapidashPicBack::      INCBIN "gfx/pokemon/back/rapidashb.pic"
-RattataPicFront::      INCBIN "gfx/pokemon/front_yellow/rattata.pic"
+RattataPicFront::      INCBIN "gfx/pokemon/front/rattata.pic"
 RattataPicBack::       INCBIN "gfx/pokemon/back/rattatab.pic"
-RaticatePicFront::     INCBIN "gfx/pokemon/front_yellow/raticate.pic"
+RaticatePicFront::     INCBIN "gfx/pokemon/front/raticate.pic"
 RaticatePicBack::      INCBIN "gfx/pokemon/back/raticateb.pic"
-NidorinoPicFront::     INCBIN "gfx/pokemon/front_yellow/nidorino.pic"
+NidorinoPicFront::     INCBIN "gfx/pokemon/front/nidorino.pic"
 NidorinoPicBack::      INCBIN "gfx/pokemon/back/nidorinob.pic"
-NidorinaPicFront::     INCBIN "gfx/pokemon/front_yellow/nidorina.pic"
+NidorinaPicFront::     INCBIN "gfx/pokemon/front/nidorina.pic"
 NidorinaPicBack::      INCBIN "gfx/pokemon/back/nidorinab.pic"
-GeodudePicFront::      INCBIN "gfx/pokemon/front_yellow/geodude.pic"
+GeodudePicFront::      INCBIN "gfx/pokemon/front/geodude.pic"
 GeodudePicBack::       INCBIN "gfx/pokemon/back/geodudeb.pic"
-PorygonPicFront::      INCBIN "gfx/pokemon/front_yellow/porygon.pic"
+PorygonPicFront::      INCBIN "gfx/pokemon/front/porygon.pic"
 PorygonPicBack::       INCBIN "gfx/pokemon/back/porygonb.pic"
-AerodactylPicFront::   INCBIN "gfx/pokemon/front_yellow/aerodactyl.pic"
+AerodactylPicFront::   INCBIN "gfx/pokemon/front/aerodactyl.pic"
 AerodactylPicBack::    INCBIN "gfx/pokemon/back/aerodactylb.pic"
-MagnemitePicFront::    INCBIN "gfx/pokemon/front_yellow/magnemite.pic"
+MagnemitePicFront::    INCBIN "gfx/pokemon/front/magnemite.pic"
 MagnemitePicBack::     INCBIN "gfx/pokemon/back/magnemiteb.pic"
-CharmanderPicFront::   INCBIN "gfx/pokemon/front_yellow/charmander.pic"
+CharmanderPicFront::   INCBIN "gfx/pokemon/front/charmander.pic"
 CharmanderPicBack::    INCBIN "gfx/pokemon/back/charmanderb.pic"
-SquirtlePicFront::     INCBIN "gfx/pokemon/front_yellow/squirtle.pic"
+SquirtlePicFront::     INCBIN "gfx/pokemon/front/squirtle.pic"
 SquirtlePicBack::      INCBIN "gfx/pokemon/back/squirtleb.pic"
-CharmeleonPicFront::   INCBIN "gfx/pokemon/front_yellow/charmeleon.pic"
+CharmeleonPicFront::   INCBIN "gfx/pokemon/front/charmeleon.pic"
 CharmeleonPicBack::    INCBIN "gfx/pokemon/back/charmeleonb.pic"
-WartortlePicFront::    INCBIN "gfx/pokemon/front_yellow/wartortle.pic"
+WartortlePicFront::    INCBIN "gfx/pokemon/front/wartortle.pic"
 WartortlePicBack::     INCBIN "gfx/pokemon/back/wartortleb.pic"
-CharizardPicFront::    INCBIN "gfx/pokemon/front_yellow/charizard.pic"
+CharizardPicFront::    INCBIN "gfx/pokemon/front/charizard.pic"
 CharizardPicBack::     INCBIN "gfx/pokemon/back/charizardb.pic"
-FossilAerodactylPic::  INCBIN "gfx/pokemon/front_yellow/fossilaerodactyl.pic"
+FossilAerodactylPic::  INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"
 GhostPic::             INCBIN "gfx/battle/ghost.pic"
-OddishPicFront::       INCBIN "gfx/pokemon/front_yellow/oddish.pic"
+OddishPicFront::       INCBIN "gfx/pokemon/front/oddish.pic"
 OddishPicBack::        INCBIN "gfx/pokemon/back/oddishb.pic"
-GloomPicFront::        INCBIN "gfx/pokemon/front_yellow/gloom.pic"
+GloomPicFront::        INCBIN "gfx/pokemon/front/gloom.pic"
 GloomPicBack::         INCBIN "gfx/pokemon/back/gloomb.pic"
-VileplumePicFront::    INCBIN "gfx/pokemon/front_yellow/vileplume.pic"
+VileplumePicFront::    INCBIN "gfx/pokemon/front/vileplume.pic"
 VileplumePicBack::     INCBIN "gfx/pokemon/back/vileplumeb.pic"
-BellsproutPicFront::   INCBIN "gfx/pokemon/front_yellow/bellsprout.pic"
+BellsproutPicFront::   INCBIN "gfx/pokemon/front/bellsprout.pic"
 BellsproutPicBack::    INCBIN "gfx/pokemon/back/bellsproutb.pic"
-WeepinbellPicFront::   INCBIN "gfx/pokemon/front_yellow/weepinbell.pic"
+WeepinbellPicFront::   INCBIN "gfx/pokemon/front/weepinbell.pic"
 WeepinbellPicBack::    INCBIN "gfx/pokemon/back/weepinbellb.pic"
-VictreebelPicFront::   INCBIN "gfx/pokemon/front_yellow/victreebel.pic"
+VictreebelPicFront::   INCBIN "gfx/pokemon/front/victreebel.pic"
 VictreebelPicBack::    INCBIN "gfx/pokemon/back/victreebelb.pic"
 
 
@@ -350,7 +350,7 @@ JugglerPic::       INCBIN "gfx/trainers/juggler.pic"
 TamerPic::         INCBIN "gfx/trainers/tamer.pic"
 BirdKeeperPic::    INCBIN "gfx/trainers/birdkeeper.pic"
 BlackbeltPic::     INCBIN "gfx/trainers/blackbelt.pic"
-Rival1Pic::        INCBIN "gfx/trainers/yellow/rival1.pic"
+Rival1Pic::        INCBIN "gfx/trainers/rival1.pic"
 ProfOakPic::       INCBIN "gfx/trainers/prof.oak.pic"
 ChiefPic::
 ScientistPic::     INCBIN "gfx/trainers/scientist.pic"
@@ -359,25 +359,25 @@ RocketPic::        INCBIN "gfx/trainers/rocket.pic"
 CooltrainerMPic::  INCBIN "gfx/trainers/cooltrainerm.pic"
 CooltrainerFPic::  INCBIN "gfx/trainers/cooltrainerf.pic"
 BrunoPic::         INCBIN "gfx/trainers/bruno.pic"
-BrockPic::         INCBIN "gfx/trainers/yellow/brock.pic"
-MistyPic::         INCBIN "gfx/trainers/yellow/misty.pic"
+BrockPic::         INCBIN "gfx/trainers/brock.pic"
+MistyPic::         INCBIN "gfx/trainers/misty.pic"
 LtSurgePic::       INCBIN "gfx/trainers/lt.surge.pic"
-ErikaPic::         INCBIN "gfx/trainers/yellow/erika.pic"
+ErikaPic::         INCBIN "gfx/trainers/erika.pic"
 KogaPic::          INCBIN "gfx/trainers/koga.pic"
 BlainePic::        INCBIN "gfx/trainers/blaine.pic"
 SabrinaPic::       INCBIN "gfx/trainers/sabrina.pic"
 GentlemanPic::     INCBIN "gfx/trainers/gentleman.pic"
-Rival2Pic::        INCBIN "gfx/trainers/yellow/rival2.pic"
-Rival3Pic::        INCBIN "gfx/trainers/yellow/rival3.pic"
+Rival2Pic::        INCBIN "gfx/trainers/rival2.pic"
+Rival3Pic::        INCBIN "gfx/trainers/rival3.pic"
 LoreleiPic::       INCBIN "gfx/trainers/lorelei.pic"
 ChannelerPic::     INCBIN "gfx/trainers/channeler.pic"
 AgathaPic::        INCBIN "gfx/trainers/agatha.pic"
 LancePic::         INCBIN "gfx/trainers/lance.pic"
-JessieJamesPic::   INCBIN "gfx/trainers/yellow/jessiejames.pic"
+JessieJamesPic::   INCBIN "gfx/trainers/jessiejames.pic"
 
 
 SECTION "Pics 7", ROMX
 
 RedPicBack::       INCBIN "gfx/player/redb.pic"
-OldManPic::        INCBIN "gfx/battle/oldman.pic"
+OldManPicBack::    INCBIN "gfx/battle/oldmanb.pic"
 ProfOakPicBack::   INCBIN "gfx/battle/prof.oakb.pic"