Merge pic/ into gfx/

822 files changed, 507 insertions, 507 deletions

diff --git a/Makefile b/Makefile
index 5daa6a74..20462319 100644
--- a/Makefile
+++ b/Makefile
@@ -117,5 +117,5 @@ gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
 	$(if $(tools/gfx),\
 		tools/gfx $(tools/gfx) -d1 -o $@ $@)
 
-%.pic:  %.2bpp
+%.pic: %.2bpp
 	tools/pkmncompress $< $@
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm
index 1a41bb5c..dfb446ca 100644
--- a/data/baseStats/abra.asm
+++ b/data/baseStats/abra.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 200 ; catch rate
 db 73 ; base exp yield
-INCBIN "pic/bmon/abra.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/abra.pic",0,1 ; 55, sprite dimensions
 dw AbraPicFront
 dw AbraPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm
index 874dd57d..564fc831 100644
--- a/data/baseStats/aerodactyl.asm
+++ b/data/baseStats/aerodactyl.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 202 ; base exp yield
-INCBIN "pic/bmon/aerodactyl.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/aerodactyl.pic",0,1 ; 77, sprite dimensions
 dw AerodactylPicFront
 dw AerodactylPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm
index c20b6c41..57f7f516 100644
--- a/data/baseStats/alakazam.asm
+++ b/data/baseStats/alakazam.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 50 ; catch rate
 db 186 ; base exp yield
-INCBIN "pic/bmon/alakazam.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/alakazam.pic",0,1 ; 77, sprite dimensions
 dw AlakazamPicFront
 dw AlakazamPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm
index 6beee569..1e88289f 100644
--- a/data/baseStats/arbok.asm
+++ b/data/baseStats/arbok.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 90 ; catch rate
 db 147 ; base exp yield
-INCBIN "pic/bmon/arbok.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/arbok.pic",0,1 ; 77, sprite dimensions
 dw ArbokPicFront
 dw ArbokPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm
index 2a2dda3b..c661cc88 100644
--- a/data/baseStats/arcanine.asm
+++ b/data/baseStats/arcanine.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 75 ; catch rate
 db 213 ; base exp yield
-INCBIN "pic/bmon/arcanine.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/arcanine.pic",0,1 ; 77, sprite dimensions
 dw ArcaninePicFront
 dw ArcaninePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm
index ef791055..6265c654 100644
--- a/data/baseStats/articuno.asm
+++ b/data/baseStats/articuno.asm
@@ -8,7 +8,7 @@ db ICE ; species type 1
 db FLYING ; species type 2
 db 3 ; catch rate
 db 215 ; base exp yield
-INCBIN "pic/bmon/articuno.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/articuno.pic",0,1 ; 77, sprite dimensions
 dw ArticunoPicFront
 dw ArticunoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm
index 6bf091b8..516f5747 100644
--- a/data/baseStats/beedrill.asm
+++ b/data/baseStats/beedrill.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 159 ; base exp yield
-INCBIN "pic/bmon/beedrill.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/beedrill.pic",0,1 ; 77, sprite dimensions
 dw BeedrillPicFront
 dw BeedrillPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm
index 1c908bbb..42c1a22c 100644
--- a/data/baseStats/bellsprout.asm
+++ b/data/baseStats/bellsprout.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 255 ; catch rate
 db 84 ; base exp yield
-INCBIN "pic/bmon/bellsprout.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/bellsprout.pic",0,1 ; 55, sprite dimensions
 dw BellsproutPicFront
 dw BellsproutPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm
index eaf18b41..1e073c26 100644
--- a/data/baseStats/blastoise.asm
+++ b/data/baseStats/blastoise.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 210 ; base exp yield
-INCBIN "pic/bmon/blastoise.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/blastoise.pic",0,1 ; 77, sprite dimensions
 dw BlastoisePicFront
 dw BlastoisePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm
index 32650d06..08e171ef 100644
--- a/data/baseStats/bulbasaur.asm
+++ b/data/baseStats/bulbasaur.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 64 ; base exp yield
-INCBIN "pic/bmon/bulbasaur.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/bulbasaur.pic",0,1 ; 55, sprite dimensions
 dw BulbasaurPicFront
 dw BulbasaurPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
index c0fb5f6c..2f0dae18 100644
--- a/data/baseStats/butterfree.asm
+++ b/data/baseStats/butterfree.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 160 ; base exp yield
-INCBIN "pic/bmon/butterfree.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/butterfree.pic",0,1 ; 77, sprite dimensions
 dw ButterfreePicFront
 dw ButterfreePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm
index d26bc5d9..75270144 100644
--- a/data/baseStats/caterpie.asm
+++ b/data/baseStats/caterpie.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db BUG ; species type 2
 db 255 ; catch rate
 db 53 ; base exp yield
-INCBIN "pic/bmon/caterpie.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/caterpie.pic",0,1 ; 55, sprite dimensions
 dw CaterpiePicFront
 dw CaterpiePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm
index 434b1c26..7f0cf16e 100644
--- a/data/baseStats/chansey.asm
+++ b/data/baseStats/chansey.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 30 ; catch rate
 db 255 ; base exp yield
-INCBIN "pic/bmon/chansey.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/chansey.pic",0,1 ; 66, sprite dimensions
 dw ChanseyPicFront
 dw ChanseyPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm
index 2479a60c..c0df120e 100644
--- a/data/baseStats/charizard.asm
+++ b/data/baseStats/charizard.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 209 ; base exp yield
-INCBIN "pic/bmon/charizard.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/charizard.pic",0,1 ; 77, sprite dimensions
 dw CharizardPicFront
 dw CharizardPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm
index ccd53458..a296b609 100644
--- a/data/baseStats/charmander.asm
+++ b/data/baseStats/charmander.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 45 ; catch rate
 db 65 ; base exp yield
-INCBIN "pic/bmon/charmander.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/charmander.pic",0,1 ; 55, sprite dimensions
 dw CharmanderPicFront
 dw CharmanderPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm
index 80aa2bca..62e8eb89 100644
--- a/data/baseStats/charmeleon.asm
+++ b/data/baseStats/charmeleon.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 45 ; catch rate
 db 142 ; base exp yield
-INCBIN "pic/bmon/charmeleon.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/charmeleon.pic",0,1 ; 66, sprite dimensions
 dw CharmeleonPicFront
 dw CharmeleonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm
index 17837da4..407a5170 100644
--- a/data/baseStats/clefable.asm
+++ b/data/baseStats/clefable.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 25 ; catch rate
 db 129 ; base exp yield
-INCBIN "pic/bmon/clefable.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/clefable.pic",0,1 ; 66, sprite dimensions
 dw ClefablePicFront
 dw ClefablePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm
index 952391c7..2e3bbf92 100644
--- a/data/baseStats/clefairy.asm
+++ b/data/baseStats/clefairy.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 150 ; catch rate
 db 68 ; base exp yield
-INCBIN "pic/bmon/clefairy.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/clefairy.pic",0,1 ; 55, sprite dimensions
 dw ClefairyPicFront
 dw ClefairyPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm
index 10f38bdb..9b79bd78 100644
--- a/data/baseStats/cloyster.asm
+++ b/data/baseStats/cloyster.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db ICE ; species type 2
 db 60 ; catch rate
 db 203 ; base exp yield
-INCBIN "pic/bmon/cloyster.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/cloyster.pic",0,1 ; 77, sprite dimensions
 dw CloysterPicFront
 dw CloysterPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm
index b1222d98..776a771c 100644
--- a/data/baseStats/cubone.asm
+++ b/data/baseStats/cubone.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db GROUND ; species type 2
 db 190 ; catch rate
 db 87 ; base exp yield
-INCBIN "pic/bmon/cubone.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/cubone.pic",0,1 ; 55, sprite dimensions
 dw CubonePicFront
 dw CubonePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm
index fb0cf2c2..59ab04b0 100644
--- a/data/baseStats/dewgong.asm
+++ b/data/baseStats/dewgong.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db ICE ; species type 2
 db 75 ; catch rate
 db 176 ; base exp yield
-INCBIN "pic/bmon/dewgong.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/dewgong.pic",0,1 ; 66, sprite dimensions
 dw DewgongPicFront
 dw DewgongPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm
index 8ef6e381..da8648d8 100644
--- a/data/baseStats/diglett.asm
+++ b/data/baseStats/diglett.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db GROUND ; species type 2
 db 255 ; catch rate
 db 81 ; base exp yield
-INCBIN "pic/bmon/diglett.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/diglett.pic",0,1 ; 55, sprite dimensions
 dw DiglettPicFront
 dw DiglettPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm
index 90ea4c5e..aff87275 100644
--- a/data/baseStats/ditto.asm
+++ b/data/baseStats/ditto.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 35 ; catch rate
 db 61 ; base exp yield
-INCBIN "pic/bmon/ditto.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/ditto.pic",0,1 ; 55, sprite dimensions
 dw DittoPicFront
 dw DittoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm
index 99608f48..baf1fd8a 100644
--- a/data/baseStats/dodrio.asm
+++ b/data/baseStats/dodrio.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 158 ; base exp yield
-INCBIN "pic/bmon/dodrio.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/dodrio.pic",0,1 ; 77, sprite dimensions
 dw DodrioPicFront
 dw DodrioPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm
index 760c258b..33d1506a 100644
--- a/data/baseStats/doduo.asm
+++ b/data/baseStats/doduo.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 190 ; catch rate
 db 96 ; base exp yield
-INCBIN "pic/bmon/doduo.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/doduo.pic",0,1 ; 55, sprite dimensions
 dw DoduoPicFront
 dw DoduoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm
index 041300e0..9d8ab0c2 100644
--- a/data/baseStats/dragonair.asm
+++ b/data/baseStats/dragonair.asm
@@ -8,7 +8,7 @@ db DRAGON ; species type 1
 db DRAGON ; species type 2
 db 45 ; catch rate
 db 144 ; base exp yield
-INCBIN "pic/bmon/dragonair.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/dragonair.pic",0,1 ; 66, sprite dimensions
 dw DragonairPicFront
 dw DragonairPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm
index 442275b2..22653bcc 100644
--- a/data/baseStats/dragonite.asm
+++ b/data/baseStats/dragonite.asm
@@ -8,7 +8,7 @@ db DRAGON ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 218 ; base exp yield
-INCBIN "pic/bmon/dragonite.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/dragonite.pic",0,1 ; 77, sprite dimensions
 dw DragonitePicFront
 dw DragonitePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm
index 5fb5c75d..c377c217 100644
--- a/data/baseStats/dratini.asm
+++ b/data/baseStats/dratini.asm
@@ -8,7 +8,7 @@ db DRAGON ; species type 1
 db DRAGON ; species type 2
 db 45 ; catch rate
 db 67 ; base exp yield
-INCBIN "pic/bmon/dratini.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/dratini.pic",0,1 ; 55, sprite dimensions
 dw DratiniPicFront
 dw DratiniPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm
index 452db1bc..075158c4 100644
--- a/data/baseStats/drowzee.asm
+++ b/data/baseStats/drowzee.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 190 ; catch rate
 db 102 ; base exp yield
-INCBIN "pic/bmon/drowzee.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/drowzee.pic",0,1 ; 66, sprite dimensions
 dw DrowzeePicFront
 dw DrowzeePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm
index c763680f..86a55e22 100644
--- a/data/baseStats/dugtrio.asm
+++ b/data/baseStats/dugtrio.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db GROUND ; species type 2
 db 50 ; catch rate
 db 153 ; base exp yield
-INCBIN "pic/bmon/dugtrio.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/dugtrio.pic",0,1 ; 66, sprite dimensions
 dw DugtrioPicFront
 dw DugtrioPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm
index 51e36621..d5cbaa9b 100644
--- a/data/baseStats/eevee.asm
+++ b/data/baseStats/eevee.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 45 ; catch rate
 db 92 ; base exp yield
-INCBIN "pic/bmon/eevee.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/eevee.pic",0,1 ; 55, sprite dimensions
 dw EeveePicFront
 dw EeveePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm
index b029a67c..94295b51 100644
--- a/data/baseStats/ekans.asm
+++ b/data/baseStats/ekans.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 255 ; catch rate
 db 62 ; base exp yield
-INCBIN "pic/bmon/ekans.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/ekans.pic",0,1 ; 55, sprite dimensions
 dw EkansPicFront
 dw EkansPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm
index 4b44604e..5a1bc59f 100644
--- a/data/baseStats/electabuzz.asm
+++ b/data/baseStats/electabuzz.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 45 ; catch rate
 db 156 ; base exp yield
-INCBIN "pic/bmon/electabuzz.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/electabuzz.pic",0,1 ; 66, sprite dimensions
 dw ElectabuzzPicFront
 dw ElectabuzzPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm
index 1b292f2f..86b023c3 100644
--- a/data/baseStats/electrode.asm
+++ b/data/baseStats/electrode.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 60 ; catch rate
 db 150 ; base exp yield
-INCBIN "pic/bmon/electrode.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/electrode.pic",0,1 ; 55, sprite dimensions
 dw ElectrodePicFront
 dw ElectrodePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm
index 8503889b..6499362a 100644
--- a/data/baseStats/exeggcute.asm
+++ b/data/baseStats/exeggcute.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db PSYCHIC ; species type 2
 db 90 ; catch rate
 db 98 ; base exp yield
-INCBIN "pic/bmon/exeggcute.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/exeggcute.pic",0,1 ; 77, sprite dimensions
 dw ExeggcutePicFront
 dw ExeggcutePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm
index 4d739430..17b1f6a6 100644
--- a/data/baseStats/exeggutor.asm
+++ b/data/baseStats/exeggutor.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db PSYCHIC ; species type 2
 db 45 ; catch rate
 db 212 ; base exp yield
-INCBIN "pic/bmon/exeggutor.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/exeggutor.pic",0,1 ; 77, sprite dimensions
 dw ExeggutorPicFront
 dw ExeggutorPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm
index 2aa7eca0..ffbb70f1 100644
--- a/data/baseStats/farfetchd.asm
+++ b/data/baseStats/farfetchd.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 94 ; base exp yield
-INCBIN "pic/bmon/farfetchd.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/farfetchd.pic",0,1 ; 66, sprite dimensions
 dw FarfetchdPicFront
 dw FarfetchdPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm
index 4ad88723..d03722ba 100644
--- a/data/baseStats/fearow.asm
+++ b/data/baseStats/fearow.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 90 ; catch rate
 db 162 ; base exp yield
-INCBIN "pic/bmon/fearow.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/fearow.pic",0,1 ; 77, sprite dimensions
 dw FearowPicFront
 dw FearowPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm
index 70621a6a..8ebe4ede 100644
--- a/data/baseStats/flareon.asm
+++ b/data/baseStats/flareon.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 45 ; catch rate
 db 198 ; base exp yield
-INCBIN "pic/bmon/flareon.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/flareon.pic",0,1 ; 66, sprite dimensions
 dw FlareonPicFront
 dw FlareonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm
index fdcaaa71..b68d431b 100644
--- a/data/baseStats/gastly.asm
+++ b/data/baseStats/gastly.asm
@@ -8,7 +8,7 @@ db GHOST ; species type 1
 db POISON ; species type 2
 db 190 ; catch rate
 db 95 ; base exp yield
-INCBIN "pic/bmon/gastly.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/gastly.pic",0,1 ; 77, sprite dimensions
 dw GastlyPicFront
 dw GastlyPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm
index 0e3e877c..bdbe5de6 100644
--- a/data/baseStats/gengar.asm
+++ b/data/baseStats/gengar.asm
@@ -8,7 +8,7 @@ db GHOST ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 190 ; base exp yield
-INCBIN "pic/bmon/gengar.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/gengar.pic",0,1 ; 66, sprite dimensions
 dw GengarPicFront
 dw GengarPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm
index a47a993a..9ffd1c86 100644
--- a/data/baseStats/geodude.asm
+++ b/data/baseStats/geodude.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db GROUND ; species type 2
 db 255 ; catch rate
 db 86 ; base exp yield
-INCBIN "pic/bmon/geodude.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/geodude.pic",0,1 ; 55, sprite dimensions
 dw GeodudePicFront
 dw GeodudePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm
index f2153e5c..6c08287e 100644
--- a/data/baseStats/gloom.asm
+++ b/data/baseStats/gloom.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 120 ; catch rate
 db 132 ; base exp yield
-INCBIN "pic/bmon/gloom.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/gloom.pic",0,1 ; 66, sprite dimensions
 dw GloomPicFront
 dw GloomPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm
index 845adf4b..de93ee3f 100644
--- a/data/baseStats/golbat.asm
+++ b/data/baseStats/golbat.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db FLYING ; species type 2
 db 90 ; catch rate
 db 171 ; base exp yield
-INCBIN "pic/bmon/golbat.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/golbat.pic",0,1 ; 77, sprite dimensions
 dw GolbatPicFront
 dw GolbatPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm
index ed3a4fdb..32c89599 100644
--- a/data/baseStats/goldeen.asm
+++ b/data/baseStats/goldeen.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 225 ; catch rate
 db 111 ; base exp yield
-INCBIN "pic/bmon/goldeen.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/goldeen.pic",0,1 ; 66, sprite dimensions
 dw GoldeenPicFront
 dw GoldeenPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm
index cce89da7..6f2cc6a9 100644
--- a/data/baseStats/golduck.asm
+++ b/data/baseStats/golduck.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 75 ; catch rate
 db 174 ; base exp yield
-INCBIN "pic/bmon/golduck.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/golduck.pic",0,1 ; 77, sprite dimensions
 dw GolduckPicFront
 dw GolduckPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm
index 28f2a326..b5506372 100644
--- a/data/baseStats/golem.asm
+++ b/data/baseStats/golem.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db GROUND ; species type 2
 db 45 ; catch rate
 db 177 ; base exp yield
-INCBIN "pic/bmon/golem.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/golem.pic",0,1 ; 66, sprite dimensions
 dw GolemPicFront
 dw GolemPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm
index 08776ab1..0525c587 100644
--- a/data/baseStats/graveler.asm
+++ b/data/baseStats/graveler.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db GROUND ; species type 2
 db 120 ; catch rate
 db 134 ; base exp yield
-INCBIN "pic/bmon/graveler.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/graveler.pic",0,1 ; 66, sprite dimensions
 dw GravelerPicFront
 dw GravelerPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm
index 5f7a64a7..63533c00 100644
--- a/data/baseStats/grimer.asm
+++ b/data/baseStats/grimer.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 190 ; catch rate
 db 90 ; base exp yield
-INCBIN "pic/bmon/grimer.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/grimer.pic",0,1 ; 55, sprite dimensions
 dw GrimerPicFront
 dw GrimerPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm
index df305636..9bf5e036 100644
--- a/data/baseStats/growlithe.asm
+++ b/data/baseStats/growlithe.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 190 ; catch rate
 db 91 ; base exp yield
-INCBIN "pic/bmon/growlithe.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/growlithe.pic",0,1 ; 55, sprite dimensions
 dw GrowlithePicFront
 dw GrowlithePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm
index 6bfc34a0..3cd2e213 100644
--- a/data/baseStats/gyarados.asm
+++ b/data/baseStats/gyarados.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 214 ; base exp yield
-INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/gyarados.pic",0,1 ; 77, sprite dimensions
 dw GyaradosPicFront
 dw GyaradosPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm
index bd39eaf4..879b75d4 100644
--- a/data/baseStats/haunter.asm
+++ b/data/baseStats/haunter.asm
@@ -8,7 +8,7 @@ db GHOST ; species type 1
 db POISON ; species type 2
 db 90 ; catch rate
 db 126 ; base exp yield
-INCBIN "pic/bmon/haunter.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/haunter.pic",0,1 ; 66, sprite dimensions
 dw HaunterPicFront
 dw HaunterPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm
index 37021f65..f34bf086 100644
--- a/data/baseStats/hitmonchan.asm
+++ b/data/baseStats/hitmonchan.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 45 ; catch rate
 db 140 ; base exp yield
-INCBIN "pic/bmon/hitmonchan.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/hitmonchan.pic",0,1 ; 66, sprite dimensions
 dw HitmonchanPicFront
 dw HitmonchanPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm
index d16db130..2590bfb0 100644
--- a/data/baseStats/hitmonlee.asm
+++ b/data/baseStats/hitmonlee.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 45 ; catch rate
 db 139 ; base exp yield
-INCBIN "pic/bmon/hitmonlee.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/hitmonlee.pic",0,1 ; 77, sprite dimensions
 dw HitmonleePicFront
 dw HitmonleePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm
index 01de3ff6..ecf98197 100644
--- a/data/baseStats/horsea.asm
+++ b/data/baseStats/horsea.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 225 ; catch rate
 db 83 ; base exp yield
-INCBIN "pic/bmon/horsea.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/horsea.pic",0,1 ; 55, sprite dimensions
 dw HorseaPicFront
 dw HorseaPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm
index 4e4959b4..9d251cd6 100644
--- a/data/baseStats/hypno.asm
+++ b/data/baseStats/hypno.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 75 ; catch rate
 db 165 ; base exp yield
-INCBIN "pic/bmon/hypno.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/hypno.pic",0,1 ; 77, sprite dimensions
 dw HypnoPicFront
 dw HypnoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm
index 3e19f2a1..f90549b9 100644
--- a/data/baseStats/ivysaur.asm
+++ b/data/baseStats/ivysaur.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 141 ; base exp yield
-INCBIN "pic/bmon/ivysaur.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/ivysaur.pic",0,1 ; 66, sprite dimensions
 dw IvysaurPicFront
 dw IvysaurPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm
index fac03fc9..0a6bdf49 100644
--- a/data/baseStats/jigglypuff.asm
+++ b/data/baseStats/jigglypuff.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 170 ; catch rate
 db 76 ; base exp yield
-INCBIN "pic/bmon/jigglypuff.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/jigglypuff.pic",0,1 ; 55, sprite dimensions
 dw JigglypuffPicFront
 dw JigglypuffPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm
index b33d6327..1752354b 100644
--- a/data/baseStats/jolteon.asm
+++ b/data/baseStats/jolteon.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 45 ; catch rate
 db 197 ; base exp yield
-INCBIN "pic/bmon/jolteon.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/jolteon.pic",0,1 ; 66, sprite dimensions
 dw JolteonPicFront
 dw JolteonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm
index e69b87b9..f82796e5 100644
--- a/data/baseStats/jynx.asm
+++ b/data/baseStats/jynx.asm
@@ -8,7 +8,7 @@ db ICE ; species type 1
 db PSYCHIC ; species type 2
 db 45 ; catch rate
 db 137 ; base exp yield
-INCBIN "pic/bmon/jynx.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/jynx.pic",0,1 ; 66, sprite dimensions
 dw JynxPicFront
 dw JynxPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm
index 60f3e959..fc2df213 100644
--- a/data/baseStats/kabuto.asm
+++ b/data/baseStats/kabuto.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 119 ; base exp yield
-INCBIN "pic/bmon/kabuto.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/kabuto.pic",0,1 ; 55, sprite dimensions
 dw KabutoPicFront
 dw KabutoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm
index dbddab2e..ca35e56a 100644
--- a/data/baseStats/kabutops.asm
+++ b/data/baseStats/kabutops.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 201 ; base exp yield
-INCBIN "pic/bmon/kabutops.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/kabutops.pic",0,1 ; 66, sprite dimensions
 dw KabutopsPicFront
 dw KabutopsPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
index 472cc4c5..652f762a 100644
--- a/data/baseStats/kadabra.asm
+++ b/data/baseStats/kadabra.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 100 ; catch rate
 db 145 ; base exp yield
-INCBIN "pic/bmon/kadabra.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/kadabra.pic",0,1 ; 66, sprite dimensions
 dw KadabraPicFront
 dw KadabraPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm
index ec593f91..4a7ec5b4 100644
--- a/data/baseStats/kakuna.asm
+++ b/data/baseStats/kakuna.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db POISON ; species type 2
 db 120 ; catch rate
 db 71 ; base exp yield
-INCBIN "pic/bmon/kakuna.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/kakuna.pic",0,1 ; 55, sprite dimensions
 dw KakunaPicFront
 dw KakunaPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm
index 6dcd1e3c..381c8879 100644
--- a/data/baseStats/kangaskhan.asm
+++ b/data/baseStats/kangaskhan.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 45 ; catch rate
 db 175 ; base exp yield
-INCBIN "pic/bmon/kangaskhan.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/kangaskhan.pic",0,1 ; 77, sprite dimensions
 dw KangaskhanPicFront
 dw KangaskhanPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm
index 8708d5cf..d4b426fb 100644
--- a/data/baseStats/kingler.asm
+++ b/data/baseStats/kingler.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 60 ; catch rate
 db 206 ; base exp yield
-INCBIN "pic/bmon/kingler.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/kingler.pic",0,1 ; 77, sprite dimensions
 dw KinglerPicFront
 dw KinglerPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm
index fced6246..ca3e1029 100644
--- a/data/baseStats/koffing.asm
+++ b/data/baseStats/koffing.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 190 ; catch rate
 db 114 ; base exp yield
-INCBIN "pic/bmon/koffing.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/koffing.pic",0,1 ; 66, sprite dimensions
 dw KoffingPicFront
 dw KoffingPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm
index 88d690b6..d1839d26 100644
--- a/data/baseStats/krabby.asm
+++ b/data/baseStats/krabby.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 225 ; catch rate
 db 115 ; base exp yield
-INCBIN "pic/bmon/krabby.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/krabby.pic",0,1 ; 55, sprite dimensions
 dw KrabbyPicFront
 dw KrabbyPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm
index 3a897525..17b80461 100644
--- a/data/baseStats/lapras.asm
+++ b/data/baseStats/lapras.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db ICE ; species type 2
 db 45 ; catch rate
 db 219 ; base exp yield
-INCBIN "pic/bmon/lapras.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/lapras.pic",0,1 ; 77, sprite dimensions
 dw LaprasPicFront
 dw LaprasPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm
index 05020627..5c772dd3 100644
--- a/data/baseStats/lickitung.asm
+++ b/data/baseStats/lickitung.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 45 ; catch rate
 db 127 ; base exp yield
-INCBIN "pic/bmon/lickitung.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/lickitung.pic",0,1 ; 77, sprite dimensions
 dw LickitungPicFront
 dw LickitungPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm
index b461d45a..825766a6 100644
--- a/data/baseStats/machamp.asm
+++ b/data/baseStats/machamp.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 45 ; catch rate
 db 193 ; base exp yield
-INCBIN "pic/bmon/machamp.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/machamp.pic",0,1 ; 77, sprite dimensions
 dw MachampPicFront
 dw MachampPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm
index b8a41efd..9bc5df42 100644
--- a/data/baseStats/machoke.asm
+++ b/data/baseStats/machoke.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 90 ; catch rate
 db 146 ; base exp yield
-INCBIN "pic/bmon/machoke.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/machoke.pic",0,1 ; 77, sprite dimensions
 dw MachokePicFront
 dw MachokePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm
index 9ed22dc2..a691183a 100644
--- a/data/baseStats/machop.asm
+++ b/data/baseStats/machop.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 180 ; catch rate
 db 88 ; base exp yield
-INCBIN "pic/bmon/machop.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/machop.pic",0,1 ; 55, sprite dimensions
 dw MachopPicFront
 dw MachopPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm
index 50cc651c..5185e3f0 100644
--- a/data/baseStats/magikarp.asm
+++ b/data/baseStats/magikarp.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 255 ; catch rate
 db 20 ; base exp yield
-INCBIN "pic/bmon/magikarp.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/magikarp.pic",0,1 ; 66, sprite dimensions
 dw MagikarpPicFront
 dw MagikarpPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm
index 379e91df..b24f519c 100644
--- a/data/baseStats/magmar.asm
+++ b/data/baseStats/magmar.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 45 ; catch rate
 db 167 ; base exp yield
-INCBIN "pic/bmon/magmar.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/magmar.pic",0,1 ; 66, sprite dimensions
 dw MagmarPicFront
 dw MagmarPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm
index ce042457..f7fe0b00 100644
--- a/data/baseStats/magnemite.asm
+++ b/data/baseStats/magnemite.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 190 ; catch rate
 db 89 ; base exp yield
-INCBIN "pic/bmon/magnemite.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/magnemite.pic",0,1 ; 55, sprite dimensions
 dw MagnemitePicFront
 dw MagnemitePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm
index a2890bbd..7c32d059 100644
--- a/data/baseStats/magneton.asm
+++ b/data/baseStats/magneton.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 60 ; catch rate
 db 161 ; base exp yield
-INCBIN "pic/bmon/magneton.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/magneton.pic",0,1 ; 66, sprite dimensions
 dw MagnetonPicFront
 dw MagnetonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm
index 406a1364..07b961c5 100644
--- a/data/baseStats/mankey.asm
+++ b/data/baseStats/mankey.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 190 ; catch rate
 db 74 ; base exp yield
-INCBIN "pic/bmon/mankey.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/mankey.pic",0,1 ; 55, sprite dimensions
 dw MankeyPicFront
 dw MankeyPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm
index 3b90dbb1..a2c5a4c6 100644
--- a/data/baseStats/marowak.asm
+++ b/data/baseStats/marowak.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db GROUND ; species type 2
 db 75 ; catch rate
 db 124 ; base exp yield
-INCBIN "pic/bmon/marowak.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/marowak.pic",0,1 ; 66, sprite dimensions
 dw MarowakPicFront
 dw MarowakPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm
index dc146cf3..aa1904ba 100644
--- a/data/baseStats/meowth.asm
+++ b/data/baseStats/meowth.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 255 ; catch rate
 db 69 ; base exp yield
-INCBIN "pic/bmon/meowth.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/meowth.pic",0,1 ; 55, sprite dimensions
 dw MeowthPicFront
 dw MeowthPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm
index 9da351ad..cf4f52b7 100644
--- a/data/baseStats/metapod.asm
+++ b/data/baseStats/metapod.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db BUG ; species type 2
 db 120 ; catch rate
 db 72 ; base exp yield
-INCBIN "pic/bmon/metapod.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/metapod.pic",0,1 ; 55, sprite dimensions
 dw MetapodPicFront
 dw MetapodPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm
index 046b4d86..f89a2864 100644
--- a/data/baseStats/mew.asm
+++ b/data/baseStats/mew.asm
@@ -9,7 +9,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 45 ; catch rate
 db 64 ; base exp yield
-INCBIN "pic/bmon/mew.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/mew.pic",0,1 ; 55, sprite dimensions
 dw MewPicFront
 dw MewPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm
index dc597345..6e85291d 100644
--- a/data/baseStats/mewtwo.asm
+++ b/data/baseStats/mewtwo.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 3 ; catch rate
 db 220 ; base exp yield
-INCBIN "pic/bmon/mewtwo.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/mewtwo.pic",0,1 ; 77, sprite dimensions
 dw MewtwoPicFront
 dw MewtwoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm
index e9437405..4c54cf44 100644
--- a/data/baseStats/moltres.asm
+++ b/data/baseStats/moltres.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FLYING ; species type 2
 db 3 ; catch rate
 db 217 ; base exp yield
-INCBIN "pic/bmon/moltres.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/moltres.pic",0,1 ; 77, sprite dimensions
 dw MoltresPicFront
 dw MoltresPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm
index 8640e340..95f2655a 100644
--- a/data/baseStats/mrmime.asm
+++ b/data/baseStats/mrmime.asm
@@ -8,7 +8,7 @@ db PSYCHIC ; species type 1
 db PSYCHIC ; species type 2
 db 45 ; catch rate
 db 136 ; base exp yield
-INCBIN "pic/bmon/mr.mime.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/mr.mime.pic",0,1 ; 66, sprite dimensions
 dw MrMimePicFront
 dw MrMimePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm
index cb15563e..45f7921f 100644
--- a/data/baseStats/muk.asm
+++ b/data/baseStats/muk.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 75 ; catch rate
 db 157 ; base exp yield
-INCBIN "pic/bmon/muk.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/muk.pic",0,1 ; 77, sprite dimensions
 dw MukPicFront
 dw MukPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm
index ebef0965..7d5ff438 100644
--- a/data/baseStats/nidoking.asm
+++ b/data/baseStats/nidoking.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db GROUND ; species type 2
 db 45 ; catch rate
 db 195 ; base exp yield
-INCBIN "pic/bmon/nidoking.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/nidoking.pic",0,1 ; 77, sprite dimensions
 dw NidokingPicFront
 dw NidokingPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm
index 9ea29a31..9b635e3e 100644
--- a/data/baseStats/nidoqueen.asm
+++ b/data/baseStats/nidoqueen.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db GROUND ; species type 2
 db 45 ; catch rate
 db 194 ; base exp yield
-INCBIN "pic/bmon/nidoqueen.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/nidoqueen.pic",0,1 ; 77, sprite dimensions
 dw NidoqueenPicFront
 dw NidoqueenPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm
index 67832f18..f58e971d 100644
--- a/data/baseStats/nidoranf.asm
+++ b/data/baseStats/nidoranf.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 235 ; catch rate
 db 59 ; base exp yield
-INCBIN "pic/bmon/nidoranf.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/nidoranf.pic",0,1 ; 55, sprite dimensions
 dw NidoranFPicFront
 dw NidoranFPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm
index a7882766..2c5374ba 100644
--- a/data/baseStats/nidoranm.asm
+++ b/data/baseStats/nidoranm.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 235 ; catch rate
 db 60 ; base exp yield
-INCBIN "pic/bmon/nidoranm.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/nidoranm.pic",0,1 ; 55, sprite dimensions
 dw NidoranMPicFront
 dw NidoranMPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm
index 0ddecf70..ae7681c4 100644
--- a/data/baseStats/nidorina.asm
+++ b/data/baseStats/nidorina.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 120 ; catch rate
 db 117 ; base exp yield
-INCBIN "pic/bmon/nidorina.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/nidorina.pic",0,1 ; 66, sprite dimensions
 dw NidorinaPicFront
 dw NidorinaPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm
index fc435fc4..c9c87c25 100644
--- a/data/baseStats/nidorino.asm
+++ b/data/baseStats/nidorino.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 120 ; catch rate
 db 118 ; base exp yield
-INCBIN "pic/bmon/nidorino.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/nidorino.pic",0,1 ; 66, sprite dimensions
 dw NidorinoPicFront
 dw NidorinoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/ninetales.asm b/data/baseStats/ninetales.asm
index e98028dc..88d95329 100644
--- a/data/baseStats/ninetales.asm
+++ b/data/baseStats/ninetales.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 75 ; catch rate
 db 178 ; base exp yield
-INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/ninetales.pic",0,1 ; 77, sprite dimensions
 dw NinetalesPicFront
 dw NinetalesPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm
index c91c5138..d0309427 100644
--- a/data/baseStats/oddish.asm
+++ b/data/baseStats/oddish.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 255 ; catch rate
 db 78 ; base exp yield
-INCBIN "pic/bmon/oddish.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/oddish.pic",0,1 ; 55, sprite dimensions
 dw OddishPicFront
 dw OddishPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm
index 3c461876..33541539 100644
--- a/data/baseStats/omanyte.asm
+++ b/data/baseStats/omanyte.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 120 ; base exp yield
-INCBIN "pic/bmon/omanyte.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/omanyte.pic",0,1 ; 55, sprite dimensions
 dw OmanytePicFront
 dw OmanytePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm
index 09a2ae77..dfd5c7a2 100644
--- a/data/baseStats/omastar.asm
+++ b/data/baseStats/omastar.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 199 ; base exp yield
-INCBIN "pic/bmon/omastar.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/omastar.pic",0,1 ; 66, sprite dimensions
 dw OmastarPicFront
 dw OmastarPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm
index 6f3be4df..a0ad840e 100644
--- a/data/baseStats/onix.asm
+++ b/data/baseStats/onix.asm
@@ -8,7 +8,7 @@ db ROCK ; species type 1
 db GROUND ; species type 2
 db 45 ; catch rate
 db 108 ; base exp yield
-INCBIN "pic/bmon/onix.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/onix.pic",0,1 ; 77, sprite dimensions
 dw OnixPicFront
 dw OnixPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm
index 2c918e68..47d2d490 100644
--- a/data/baseStats/paras.asm
+++ b/data/baseStats/paras.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db GRASS ; species type 2
 db 190 ; catch rate
 db 70 ; base exp yield
-INCBIN "pic/bmon/paras.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/paras.pic",0,1 ; 55, sprite dimensions
 dw ParasPicFront
 dw ParasPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm
index dfa0c73e..8e39c90e 100644
--- a/data/baseStats/parasect.asm
+++ b/data/baseStats/parasect.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db GRASS ; species type 2
 db 75 ; catch rate
 db 128 ; base exp yield
-INCBIN "pic/bmon/parasect.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/parasect.pic",0,1 ; 77, sprite dimensions
 dw ParasectPicFront
 dw ParasectPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm
index 2f5ef125..40a9d70c 100644
--- a/data/baseStats/persian.asm
+++ b/data/baseStats/persian.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 90 ; catch rate
 db 148 ; base exp yield
-INCBIN "pic/bmon/persian.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/persian.pic",0,1 ; 77, sprite dimensions
 dw PersianPicFront
 dw PersianPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm
index 05350d07..9c770dd6 100644
--- a/data/baseStats/pidgeot.asm
+++ b/data/baseStats/pidgeot.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 172 ; base exp yield
-INCBIN "pic/bmon/pidgeot.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/pidgeot.pic",0,1 ; 77, sprite dimensions
 dw PidgeotPicFront
 dw PidgeotPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm
index 74440fcc..1a2962e7 100644
--- a/data/baseStats/pidgeotto.asm
+++ b/data/baseStats/pidgeotto.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 120 ; catch rate
 db 113 ; base exp yield
-INCBIN "pic/bmon/pidgeotto.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/pidgeotto.pic",0,1 ; 66, sprite dimensions
 dw PidgeottoPicFront
 dw PidgeottoPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm
index ec032d6b..ca167e3b 100644
--- a/data/baseStats/pidgey.asm
+++ b/data/baseStats/pidgey.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 255 ; catch rate
 db 55 ; base exp yield
-INCBIN "pic/bmon/pidgey.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/pidgey.pic",0,1 ; 55, sprite dimensions
 dw PidgeyPicFront
 dw PidgeyPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm
index 09971b79..36391ed8 100644
--- a/data/baseStats/pikachu.asm
+++ b/data/baseStats/pikachu.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 190 ; catch rate
 db 82 ; base exp yield
-INCBIN "pic/bmon/pikachu.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/pikachu.pic",0,1 ; 55, sprite dimensions
 dw PikachuPicFront
 dw PikachuPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm
index 08c0e95a..db749370 100644
--- a/data/baseStats/pinsir.asm
+++ b/data/baseStats/pinsir.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db BUG ; species type 2
 db 45 ; catch rate
 db 200 ; base exp yield
-INCBIN "pic/bmon/pinsir.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/pinsir.pic",0,1 ; 77, sprite dimensions
 dw PinsirPicFront
 dw PinsirPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm
index 8014811e..a4e260ba 100644
--- a/data/baseStats/poliwag.asm
+++ b/data/baseStats/poliwag.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 255 ; catch rate
 db 77 ; base exp yield
-INCBIN "pic/bmon/poliwag.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/poliwag.pic",0,1 ; 55, sprite dimensions
 dw PoliwagPicFront
 dw PoliwagPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm
index 6209da68..706bd498 100644
--- a/data/baseStats/poliwhirl.asm
+++ b/data/baseStats/poliwhirl.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 120 ; catch rate
 db 131 ; base exp yield
-INCBIN "pic/bmon/poliwhirl.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/poliwhirl.pic",0,1 ; 66, sprite dimensions
 dw PoliwhirlPicFront
 dw PoliwhirlPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm
index 9489a6a3..6f7d4b78 100644
--- a/data/baseStats/poliwrath.asm
+++ b/data/baseStats/poliwrath.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db FIGHTING ; species type 2
 db 45 ; catch rate
 db 185 ; base exp yield
-INCBIN "pic/bmon/poliwrath.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/poliwrath.pic",0,1 ; 77, sprite dimensions
 dw PoliwrathPicFront
 dw PoliwrathPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm
index a6ff9e4b..667d3cc9 100644
--- a/data/baseStats/ponyta.asm
+++ b/data/baseStats/ponyta.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 190 ; catch rate
 db 152 ; base exp yield
-INCBIN "pic/bmon/ponyta.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/ponyta.pic",0,1 ; 66, sprite dimensions
 dw PonytaPicFront
 dw PonytaPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm
index a049fa7f..71a37154 100644
--- a/data/baseStats/porygon.asm
+++ b/data/baseStats/porygon.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 45 ; catch rate
 db 130 ; base exp yield
-INCBIN "pic/bmon/porygon.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/porygon.pic",0,1 ; 66, sprite dimensions
 dw PorygonPicFront
 dw PorygonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm
index 659edefd..2d00ee76 100644
--- a/data/baseStats/primeape.asm
+++ b/data/baseStats/primeape.asm
@@ -8,7 +8,7 @@ db FIGHTING ; species type 1
 db FIGHTING ; species type 2
 db 75 ; catch rate
 db 149 ; base exp yield
-INCBIN "pic/bmon/primeape.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/primeape.pic",0,1 ; 77, sprite dimensions
 dw PrimeapePicFront
 dw PrimeapePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm
index db3ac79f..163f851e 100644
--- a/data/baseStats/psyduck.asm
+++ b/data/baseStats/psyduck.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 190 ; catch rate
 db 80 ; base exp yield
-INCBIN "pic/bmon/psyduck.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/psyduck.pic",0,1 ; 55, sprite dimensions
 dw PsyduckPicFront
 dw PsyduckPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm
index c830483c..c2c0c6a9 100644
--- a/data/baseStats/raichu.asm
+++ b/data/baseStats/raichu.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 75 ; catch rate
 db 122 ; base exp yield
-INCBIN "pic/bmon/raichu.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/raichu.pic",0,1 ; 77, sprite dimensions
 dw RaichuPicFront
 dw RaichuPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm
index c452159e..53dcbe4a 100644
--- a/data/baseStats/rapidash.asm
+++ b/data/baseStats/rapidash.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 60 ; catch rate
 db 192 ; base exp yield
-INCBIN "pic/bmon/rapidash.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/rapidash.pic",0,1 ; 77, sprite dimensions
 dw RapidashPicFront
 dw RapidashPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm
index ff8373d5..157b22bb 100644
--- a/data/baseStats/raticate.asm
+++ b/data/baseStats/raticate.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 90 ; catch rate
 db 116 ; base exp yield
-INCBIN "pic/bmon/raticate.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/raticate.pic",0,1 ; 66, sprite dimensions
 dw RaticatePicFront
 dw RaticatePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm
index 7edfb626..5dfafddb 100644
--- a/data/baseStats/rattata.asm
+++ b/data/baseStats/rattata.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 255 ; catch rate
 db 57 ; base exp yield
-INCBIN "pic/bmon/rattata.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/rattata.pic",0,1 ; 55, sprite dimensions
 dw RattataPicFront
 dw RattataPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm
index d7066906..9f611a83 100644
--- a/data/baseStats/rhydon.asm
+++ b/data/baseStats/rhydon.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db ROCK ; species type 2
 db 60 ; catch rate
 db 204 ; base exp yield
-INCBIN "pic/bmon/rhydon.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/rhydon.pic",0,1 ; 77, sprite dimensions
 dw RhydonPicFront
 dw RhydonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm
index a6491bd5..b7fc9137 100644
--- a/data/baseStats/rhyhorn.asm
+++ b/data/baseStats/rhyhorn.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db ROCK ; species type 2
 db 120 ; catch rate
 db 135 ; base exp yield
-INCBIN "pic/bmon/rhyhorn.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/rhyhorn.pic",0,1 ; 77, sprite dimensions
 dw RhyhornPicFront
 dw RhyhornPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm
index a9875a8e..a098678e 100644
--- a/data/baseStats/sandshrew.asm
+++ b/data/baseStats/sandshrew.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db GROUND ; species type 2
 db 255 ; catch rate
 db 93 ; base exp yield
-INCBIN "pic/bmon/sandshrew.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/sandshrew.pic",0,1 ; 55, sprite dimensions
 dw SandshrewPicFront
 dw SandshrewPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm
index 30477eb4..c596265c 100644
--- a/data/baseStats/sandslash.asm
+++ b/data/baseStats/sandslash.asm
@@ -8,7 +8,7 @@ db GROUND ; species type 1
 db GROUND ; species type 2
 db 90 ; catch rate
 db 163 ; base exp yield
-INCBIN "pic/bmon/sandslash.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/sandslash.pic",0,1 ; 66, sprite dimensions
 dw SandslashPicFront
 dw SandslashPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm
index 13de0d2b..303a33c1 100644
--- a/data/baseStats/scyther.asm
+++ b/data/baseStats/scyther.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db FLYING ; species type 2
 db 45 ; catch rate
 db 187 ; base exp yield
-INCBIN "pic/bmon/scyther.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/scyther.pic",0,1 ; 77, sprite dimensions
 dw ScytherPicFront
 dw ScytherPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm
index 9f28001b..cd9bbc3f 100644
--- a/data/baseStats/seadra.asm
+++ b/data/baseStats/seadra.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 75 ; catch rate
 db 155 ; base exp yield
-INCBIN "pic/bmon/seadra.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/seadra.pic",0,1 ; 66, sprite dimensions
 dw SeadraPicFront
 dw SeadraPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm
index d4fbe8ea..c14b095b 100644
--- a/data/baseStats/seaking.asm
+++ b/data/baseStats/seaking.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 60 ; catch rate
 db 170 ; base exp yield
-INCBIN "pic/bmon/seaking.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/seaking.pic",0,1 ; 77, sprite dimensions
 dw SeakingPicFront
 dw SeakingPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm
index ef9c2898..64c0cd7f 100644
--- a/data/baseStats/seel.asm
+++ b/data/baseStats/seel.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 190 ; catch rate
 db 100 ; base exp yield
-INCBIN "pic/bmon/seel.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/seel.pic",0,1 ; 66, sprite dimensions
 dw SeelPicFront
 dw SeelPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm
index 7c2cdf9d..c051f2f5 100644
--- a/data/baseStats/shellder.asm
+++ b/data/baseStats/shellder.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 190 ; catch rate
 db 97 ; base exp yield
-INCBIN "pic/bmon/shellder.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/shellder.pic",0,1 ; 55, sprite dimensions
 dw ShellderPicFront
 dw ShellderPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm
index ffeda79e..51d3f564 100644
--- a/data/baseStats/slowbro.asm
+++ b/data/baseStats/slowbro.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db PSYCHIC ; species type 2
 db 75 ; catch rate
 db 164 ; base exp yield
-INCBIN "pic/bmon/slowbro.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/slowbro.pic",0,1 ; 77, sprite dimensions
 dw SlowbroPicFront
 dw SlowbroPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm
index ea238a6e..60e47ea8 100644
--- a/data/baseStats/slowpoke.asm
+++ b/data/baseStats/slowpoke.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db PSYCHIC ; species type 2
 db 190 ; catch rate
 db 99 ; base exp yield
-INCBIN "pic/bmon/slowpoke.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/slowpoke.pic",0,1 ; 55, sprite dimensions
 dw SlowpokePicFront
 dw SlowpokePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm
index 2d1fd6e3..c1d47cd6 100644
--- a/data/baseStats/snorlax.asm
+++ b/data/baseStats/snorlax.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 25 ; catch rate
 db 154 ; base exp yield
-INCBIN "pic/bmon/snorlax.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/snorlax.pic",0,1 ; 77, sprite dimensions
 dw SnorlaxPicFront
 dw SnorlaxPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm
index eb8ab1ec..9b8db91d 100644
--- a/data/baseStats/spearow.asm
+++ b/data/baseStats/spearow.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db FLYING ; species type 2
 db 255 ; catch rate
 db 58 ; base exp yield
-INCBIN "pic/bmon/spearow.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/spearow.pic",0,1 ; 55, sprite dimensions
 dw SpearowPicFront
 dw SpearowPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm
index f8dcd0a1..639809f9 100644
--- a/data/baseStats/squirtle.asm
+++ b/data/baseStats/squirtle.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 66 ; base exp yield
-INCBIN "pic/bmon/squirtle.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/squirtle.pic",0,1 ; 55, sprite dimensions
 dw SquirtlePicFront
 dw SquirtlePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm
index 686dfa57..23858638 100644
--- a/data/baseStats/starmie.asm
+++ b/data/baseStats/starmie.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db PSYCHIC ; species type 2
 db 60 ; catch rate
 db 207 ; base exp yield
-INCBIN "pic/bmon/starmie.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/starmie.pic",0,1 ; 66, sprite dimensions
 dw StarmiePicFront
 dw StarmiePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm
index 35f51a6a..ffbb1f21 100644
--- a/data/baseStats/staryu.asm
+++ b/data/baseStats/staryu.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 225 ; catch rate
 db 106 ; base exp yield
-INCBIN "pic/bmon/staryu.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/staryu.pic",0,1 ; 66, sprite dimensions
 dw StaryuPicFront
 dw StaryuPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm
index b50a57bc..65570b3c 100644
--- a/data/baseStats/tangela.asm
+++ b/data/baseStats/tangela.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db GRASS ; species type 2
 db 45 ; catch rate
 db 166 ; base exp yield
-INCBIN "pic/bmon/tangela.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/tangela.pic",0,1 ; 66, sprite dimensions
 dw TangelaPicFront
 dw TangelaPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm
index 87f28ec6..e66980d7 100644
--- a/data/baseStats/tauros.asm
+++ b/data/baseStats/tauros.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 45 ; catch rate
 db 211 ; base exp yield
-INCBIN "pic/bmon/tauros.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/tauros.pic",0,1 ; 77, sprite dimensions
 dw TaurosPicFront
 dw TaurosPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm
index 7237f083..0b1b840d 100644
--- a/data/baseStats/tentacool.asm
+++ b/data/baseStats/tentacool.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db POISON ; species type 2
 db 190 ; catch rate
 db 105 ; base exp yield
-INCBIN "pic/bmon/tentacool.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/tentacool.pic",0,1 ; 55, sprite dimensions
 dw TentacoolPicFront
 dw TentacoolPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm
index d3d93919..ef82c764 100644
--- a/data/baseStats/tentacruel.asm
+++ b/data/baseStats/tentacruel.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db POISON ; species type 2
 db 60 ; catch rate
 db 205 ; base exp yield
-INCBIN "pic/bmon/tentacruel.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/tentacruel.pic",0,1 ; 66, sprite dimensions
 dw TentacruelPicFront
 dw TentacruelPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm
index e22b3185..a01c9ade 100644
--- a/data/baseStats/vaporeon.asm
+++ b/data/baseStats/vaporeon.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 196 ; base exp yield
-INCBIN "pic/bmon/vaporeon.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/vaporeon.pic",0,1 ; 66, sprite dimensions
 dw VaporeonPicFront
 dw VaporeonPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm
index 7a5bd981..7518f31e 100644
--- a/data/baseStats/venomoth.asm
+++ b/data/baseStats/venomoth.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db POISON ; species type 2
 db 75 ; catch rate
 db 138 ; base exp yield
-INCBIN "pic/bmon/venomoth.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/venomoth.pic",0,1 ; 77, sprite dimensions
 dw VenomothPicFront
 dw VenomothPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm
index aeadc6cd..1e88d9ae 100644
--- a/data/baseStats/venonat.asm
+++ b/data/baseStats/venonat.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db POISON ; species type 2
 db 190 ; catch rate
 db 75 ; base exp yield
-INCBIN "pic/bmon/venonat.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/venonat.pic",0,1 ; 55, sprite dimensions
 dw VenonatPicFront
 dw VenonatPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm
index 0a457321..bda8a528 100644
--- a/data/baseStats/venusaur.asm
+++ b/data/baseStats/venusaur.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 208 ; base exp yield
-INCBIN "pic/bmon/venusaur.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/venusaur.pic",0,1 ; 77, sprite dimensions
 dw VenusaurPicFront
 dw VenusaurPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm
index 7a82c86e..ce528805 100644
--- a/data/baseStats/victreebel.asm
+++ b/data/baseStats/victreebel.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 191 ; base exp yield
-INCBIN "pic/bmon/victreebel.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/victreebel.pic",0,1 ; 77, sprite dimensions
 dw VictreebelPicFront
 dw VictreebelPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm
index 17bb9739..2ec67131 100644
--- a/data/baseStats/vileplume.asm
+++ b/data/baseStats/vileplume.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 45 ; catch rate
 db 184 ; base exp yield
-INCBIN "pic/bmon/vileplume.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/vileplume.pic",0,1 ; 77, sprite dimensions
 dw VileplumePicFront
 dw VileplumePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm
index 92d2ccb3..6cb55714 100644
--- a/data/baseStats/voltorb.asm
+++ b/data/baseStats/voltorb.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db ELECTRIC ; species type 2
 db 190 ; catch rate
 db 103 ; base exp yield
-INCBIN "pic/bmon/voltorb.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/voltorb.pic",0,1 ; 55, sprite dimensions
 dw VoltorbPicFront
 dw VoltorbPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm
index 9577ae30..9285df13 100644
--- a/data/baseStats/vulpix.asm
+++ b/data/baseStats/vulpix.asm
@@ -8,7 +8,7 @@ db FIRE ; species type 1
 db FIRE ; species type 2
 db 190 ; catch rate
 db 63 ; base exp yield
-INCBIN "pic/bmon/vulpix.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/vulpix.pic",0,1 ; 66, sprite dimensions
 dw VulpixPicFront
 dw VulpixPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm
index bc86bd6f..ce37e7b3 100644
--- a/data/baseStats/wartortle.asm
+++ b/data/baseStats/wartortle.asm
@@ -8,7 +8,7 @@ db WATER ; species type 1
 db WATER ; species type 2
 db 45 ; catch rate
 db 143 ; base exp yield
-INCBIN "pic/bmon/wartortle.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/wartortle.pic",0,1 ; 66, sprite dimensions
 dw WartortlePicFront
 dw WartortlePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm
index 8370dc41..7434d93a 100644
--- a/data/baseStats/weedle.asm
+++ b/data/baseStats/weedle.asm
@@ -8,7 +8,7 @@ db BUG ; species type 1
 db POISON ; species type 2
 db 255 ; catch rate
 db 52 ; base exp yield
-INCBIN "pic/bmon/weedle.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/weedle.pic",0,1 ; 55, sprite dimensions
 dw WeedlePicFront
 dw WeedlePicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm
index 735a453f..48e18a31 100644
--- a/data/baseStats/weepinbell.asm
+++ b/data/baseStats/weepinbell.asm
@@ -8,7 +8,7 @@ db GRASS ; species type 1
 db POISON ; species type 2
 db 120 ; catch rate
 db 151 ; base exp yield
-INCBIN "pic/bmon/weepinbell.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/weepinbell.pic",0,1 ; 66, sprite dimensions
 dw WeepinbellPicFront
 dw WeepinbellPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm
index 0dd09dfe..21779741 100644
--- a/data/baseStats/weezing.asm
+++ b/data/baseStats/weezing.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db POISON ; species type 2
 db 60 ; catch rate
 db 173 ; base exp yield
-INCBIN "pic/bmon/weezing.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/weezing.pic",0,1 ; 77, sprite dimensions
 dw WeezingPicFront
 dw WeezingPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm
index d5fd08e2..4f7fec95 100644
--- a/data/baseStats/wigglytuff.asm
+++ b/data/baseStats/wigglytuff.asm
@@ -8,7 +8,7 @@ db NORMAL ; species type 1
 db NORMAL ; species type 2
 db 50 ; catch rate
 db 109 ; base exp yield
-INCBIN "pic/bmon/wigglytuff.pic",0,1 ; 66, sprite dimensions
+INCBIN "gfx/pokemon/front/wigglytuff.pic",0,1 ; 66, sprite dimensions
 dw WigglytuffPicFront
 dw WigglytuffPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm
index 487052ba..560f78c4 100644
--- a/data/baseStats/zapdos.asm
+++ b/data/baseStats/zapdos.asm
@@ -8,7 +8,7 @@ db ELECTRIC ; species type 1
 db FLYING ; species type 2
 db 3 ; catch rate
 db 216 ; base exp yield
-INCBIN "pic/bmon/zapdos.pic",0,1 ; 77, sprite dimensions
+INCBIN "gfx/pokemon/front/zapdos.pic",0,1 ; 77, sprite dimensions
 dw ZapdosPicFront
 dw ZapdosPicBack
 ; attacks known at lvl 0
diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm
index 1caa4259..55b7ac4c 100644
--- a/data/baseStats/zubat.asm
+++ b/data/baseStats/zubat.asm
@@ -8,7 +8,7 @@ db POISON ; species type 1
 db FLYING ; species type 2
 db 255 ; catch rate
 db 54 ; base exp yield
-INCBIN "pic/bmon/zubat.pic",0,1 ; 55, sprite dimensions
+INCBIN "gfx/pokemon/front/zubat.pic",0,1 ; 55, sprite dimensions
 dw ZubatPicFront
 dw ZubatPicBack
 ; attacks known at lvl 0
diff --git a/pic/other/ghost.png b/gfx/battle/ghost.png
index bfe7ef12..bfe7ef12 100644
--- a/pic/other/ghost.png
+++ b/gfx/battle/ghost.png
diff --git a/pic/trainer/oldman.png b/gfx/battle/oldman.png
index 6d48000f..6d48000f 100644
--- a/pic/trainer/oldman.png
+++ b/gfx/battle/oldman.png
diff --git a/pic/trainer/red.png b/gfx/player/red.png
index 9098fc76..9098fc76 100644
--- a/pic/trainer/red.png
+++ b/gfx/player/red.png
diff --git a/pic/trainer/redb.png b/gfx/player/redb.png
index 6e8d9eec..6e8d9eec 100644
--- a/pic/trainer/redb.png
+++ b/gfx/player/redb.png
diff --git a/pic/trainer/shrink1.png b/gfx/player/shrink1.png
index ef7a61ae..ef7a61ae 100644
--- a/pic/trainer/shrink1.png
+++ b/gfx/player/shrink1.png
diff --git a/pic/trainer/shrink2.png b/gfx/player/shrink2.png
index 01706b22..01706b22 100644
--- a/pic/trainer/shrink2.png
+++ b/gfx/player/shrink2.png
diff --git a/pic/monback/abrab.png b/gfx/pokemon/back/abrab.png
index 828c063c..828c063c 100644
--- a/pic/monback/abrab.png
+++ b/gfx/pokemon/back/abrab.png
diff --git a/pic/monback/aerodactylb.png b/gfx/pokemon/back/aerodactylb.png
index 88643489..88643489 100644
--- a/pic/monback/aerodactylb.png
+++ b/gfx/pokemon/back/aerodactylb.png
diff --git a/pic/monback/alakazamb.png b/gfx/pokemon/back/alakazamb.png
index acee9083..acee9083 100644
--- a/pic/monback/alakazamb.png
+++ b/gfx/pokemon/back/alakazamb.png
diff --git a/pic/monback/arbokb.png b/gfx/pokemon/back/arbokb.png
index 8aed21b5..8aed21b5 100644
--- a/pic/monback/arbokb.png
+++ b/gfx/pokemon/back/arbokb.png
diff --git a/pic/monback/arcanineb.png b/gfx/pokemon/back/arcanineb.png
index bc46be7f..bc46be7f 100644
--- a/pic/monback/arcanineb.png
+++ b/gfx/pokemon/back/arcanineb.png
diff --git a/pic/monback/articunob.png b/gfx/pokemon/back/articunob.png
index b4529453..b4529453 100644
--- a/pic/monback/articunob.png
+++ b/gfx/pokemon/back/articunob.png
diff --git a/pic/monback/beedrillb.png b/gfx/pokemon/back/beedrillb.png
index 66787e7c..66787e7c 100644
--- a/pic/monback/beedrillb.png
+++ b/gfx/pokemon/back/beedrillb.png
diff --git a/pic/monback/bellsproutb.png b/gfx/pokemon/back/bellsproutb.png
index e8682420..e8682420 100644
--- a/pic/monback/bellsproutb.png
+++ b/gfx/pokemon/back/bellsproutb.png
diff --git a/pic/monback/blastoiseb.png b/gfx/pokemon/back/blastoiseb.png
index 0df4ec2c..0df4ec2c 100644
--- a/pic/monback/blastoiseb.png
+++ b/gfx/pokemon/back/blastoiseb.png
diff --git a/pic/monback/bulbasaurb.png b/gfx/pokemon/back/bulbasaurb.png
index dbe2e487..dbe2e487 100644
--- a/pic/monback/bulbasaurb.png
+++ b/gfx/pokemon/back/bulbasaurb.png
diff --git a/pic/monback/butterfreeb.png b/gfx/pokemon/back/butterfreeb.png
index 5f3d5ac8..5f3d5ac8 100644
--- a/pic/monback/butterfreeb.png
+++ b/gfx/pokemon/back/butterfreeb.png
diff --git a/pic/monback/caterpieb.png b/gfx/pokemon/back/caterpieb.png
index f9568087..f9568087 100644
--- a/pic/monback/caterpieb.png
+++ b/gfx/pokemon/back/caterpieb.png
diff --git a/pic/monback/chanseyb.png b/gfx/pokemon/back/chanseyb.png
index c2f5ac3b..c2f5ac3b 100644
--- a/pic/monback/chanseyb.png
+++ b/gfx/pokemon/back/chanseyb.png
diff --git a/pic/monback/charizardb.png b/gfx/pokemon/back/charizardb.png
index f5540842..f5540842 100644
--- a/pic/monback/charizardb.png
+++ b/gfx/pokemon/back/charizardb.png
diff --git a/pic/monback/charmanderb.png b/gfx/pokemon/back/charmanderb.png
index ed75d27d..ed75d27d 100644
--- a/pic/monback/charmanderb.png
+++ b/gfx/pokemon/back/charmanderb.png
diff --git a/pic/monback/charmeleonb.png b/gfx/pokemon/back/charmeleonb.png
index fedd2f10..fedd2f10 100644
--- a/pic/monback/charmeleonb.png
+++ b/gfx/pokemon/back/charmeleonb.png
diff --git a/pic/monback/clefableb.png b/gfx/pokemon/back/clefableb.png
index 341b48b9..341b48b9 100644
--- a/pic/monback/clefableb.png
+++ b/gfx/pokemon/back/clefableb.png
diff --git a/pic/monback/clefairyb.png b/gfx/pokemon/back/clefairyb.png
index ea0590fc..ea0590fc 100644
--- a/pic/monback/clefairyb.png
+++ b/gfx/pokemon/back/clefairyb.png
diff --git a/pic/monback/cloysterb.png b/gfx/pokemon/back/cloysterb.png
index 0cfb046e..0cfb046e 100644
--- a/pic/monback/cloysterb.png
+++ b/gfx/pokemon/back/cloysterb.png
diff --git a/pic/monback/cuboneb.png b/gfx/pokemon/back/cuboneb.png
index dc82e13f..dc82e13f 100644
--- a/pic/monback/cuboneb.png
+++ b/gfx/pokemon/back/cuboneb.png
diff --git a/pic/monback/dewgongb.png b/gfx/pokemon/back/dewgongb.png
index cbbd148d..cbbd148d 100644
--- a/pic/monback/dewgongb.png
+++ b/gfx/pokemon/back/dewgongb.png
diff --git a/pic/monback/diglettb.png b/gfx/pokemon/back/diglettb.png
index 15f4dc47..15f4dc47 100644
--- a/pic/monback/diglettb.png
+++ b/gfx/pokemon/back/diglettb.png
diff --git a/pic/monback/dittob.png b/gfx/pokemon/back/dittob.png
index 9b95a5db..9b95a5db 100644
--- a/pic/monback/dittob.png
+++ b/gfx/pokemon/back/dittob.png
diff --git a/pic/monback/dodriob.png b/gfx/pokemon/back/dodriob.png
index 7b5796aa..7b5796aa 100644
--- a/pic/monback/dodriob.png
+++ b/gfx/pokemon/back/dodriob.png
diff --git a/pic/monback/doduob.png b/gfx/pokemon/back/doduob.png
index 007b9994..007b9994 100644
--- a/pic/monback/doduob.png
+++ b/gfx/pokemon/back/doduob.png
diff --git a/pic/monback/dragonairb.png b/gfx/pokemon/back/dragonairb.png
index 581d5d6a..581d5d6a 100644
--- a/pic/monback/dragonairb.png
+++ b/gfx/pokemon/back/dragonairb.png
diff --git a/pic/monback/dragoniteb.png b/gfx/pokemon/back/dragoniteb.png
index 53f14038..53f14038 100644
--- a/pic/monback/dragoniteb.png
+++ b/gfx/pokemon/back/dragoniteb.png
diff --git a/pic/monback/dratinib.png b/gfx/pokemon/back/dratinib.png
index 3d40256d..3d40256d 100644
--- a/pic/monback/dratinib.png
+++ b/gfx/pokemon/back/dratinib.png
diff --git a/pic/monback/drowzeeb.png b/gfx/pokemon/back/drowzeeb.png
index 682c1797..682c1797 100644
--- a/pic/monback/drowzeeb.png
+++ b/gfx/pokemon/back/drowzeeb.png
diff --git a/pic/monback/dugtriob.png b/gfx/pokemon/back/dugtriob.png
index 4e72aa93..4e72aa93 100644
--- a/pic/monback/dugtriob.png
+++ b/gfx/pokemon/back/dugtriob.png
diff --git a/pic/monback/eeveeb.png b/gfx/pokemon/back/eeveeb.png
index 56cfcd2c..56cfcd2c 100644
--- a/pic/monback/eeveeb.png
+++ b/gfx/pokemon/back/eeveeb.png
diff --git a/pic/monback/ekansb.png b/gfx/pokemon/back/ekansb.png
index 82dd96dd..82dd96dd 100644
--- a/pic/monback/ekansb.png
+++ b/gfx/pokemon/back/ekansb.png
diff --git a/pic/monback/electabuzzb.png b/gfx/pokemon/back/electabuzzb.png
index 12442d39..12442d39 100644
--- a/pic/monback/electabuzzb.png
+++ b/gfx/pokemon/back/electabuzzb.png
diff --git a/pic/monback/electrodeb.png b/gfx/pokemon/back/electrodeb.png
index ab1a5550..ab1a5550 100644
--- a/pic/monback/electrodeb.png
+++ b/gfx/pokemon/back/electrodeb.png
diff --git a/pic/monback/exeggcuteb.png b/gfx/pokemon/back/exeggcuteb.png
index 6af005b6..6af005b6 100644
--- a/pic/monback/exeggcuteb.png
+++ b/gfx/pokemon/back/exeggcuteb.png
diff --git a/pic/monback/exeggutorb.png b/gfx/pokemon/back/exeggutorb.png
index 95777871..95777871 100644
--- a/pic/monback/exeggutorb.png
+++ b/gfx/pokemon/back/exeggutorb.png
diff --git a/pic/monback/farfetchdb.png b/gfx/pokemon/back/farfetchdb.png
index 389dd556..389dd556 100644
--- a/pic/monback/farfetchdb.png
+++ b/gfx/pokemon/back/farfetchdb.png
diff --git a/pic/monback/fearowb.png b/gfx/pokemon/back/fearowb.png
index 542cd06a..542cd06a 100644
--- a/pic/monback/fearowb.png
+++ b/gfx/pokemon/back/fearowb.png
diff --git a/pic/monback/flareonb.png b/gfx/pokemon/back/flareonb.png
index d73544b2..d73544b2 100644
--- a/pic/monback/flareonb.png
+++ b/gfx/pokemon/back/flareonb.png
diff --git a/pic/monback/gastlyb.png b/gfx/pokemon/back/gastlyb.png
index b9c9584b..b9c9584b 100644
--- a/pic/monback/gastlyb.png
+++ b/gfx/pokemon/back/gastlyb.png
diff --git a/pic/monback/gengarb.png b/gfx/pokemon/back/gengarb.png
index 64ecc4c6..64ecc4c6 100644
--- a/pic/monback/gengarb.png
+++ b/gfx/pokemon/back/gengarb.png
diff --git a/pic/monback/geodudeb.png b/gfx/pokemon/back/geodudeb.png
index e6d6f2a7..e6d6f2a7 100644
--- a/pic/monback/geodudeb.png
+++ b/gfx/pokemon/back/geodudeb.png
diff --git a/pic/monback/gloomb.png b/gfx/pokemon/back/gloomb.png
index e05973b6..e05973b6 100644
--- a/pic/monback/gloomb.png
+++ b/gfx/pokemon/back/gloomb.png
diff --git a/pic/monback/golbatb.png b/gfx/pokemon/back/golbatb.png
index bbce03c5..bbce03c5 100644
--- a/pic/monback/golbatb.png
+++ b/gfx/pokemon/back/golbatb.png
diff --git a/pic/monback/goldeenb.png b/gfx/pokemon/back/goldeenb.png
index e7d242df..e7d242df 100644
--- a/pic/monback/goldeenb.png
+++ b/gfx/pokemon/back/goldeenb.png
diff --git a/pic/monback/golduckb.png b/gfx/pokemon/back/golduckb.png
index 634605e2..634605e2 100644
--- a/pic/monback/golduckb.png
+++ b/gfx/pokemon/back/golduckb.png
diff --git a/pic/monback/golemb.png b/gfx/pokemon/back/golemb.png
index 1242d7b5..1242d7b5 100644
--- a/pic/monback/golemb.png
+++ b/gfx/pokemon/back/golemb.png
diff --git a/pic/monback/gravelerb.png b/gfx/pokemon/back/gravelerb.png
index 18a9c317..18a9c317 100644
--- a/pic/monback/gravelerb.png
+++ b/gfx/pokemon/back/gravelerb.png
diff --git a/pic/monback/grimerb.png b/gfx/pokemon/back/grimerb.png
index d4b6baf3..d4b6baf3 100644
--- a/pic/monback/grimerb.png
+++ b/gfx/pokemon/back/grimerb.png
diff --git a/pic/monback/growlitheb.png b/gfx/pokemon/back/growlitheb.png
index b5dd0f7f..b5dd0f7f 100644
--- a/pic/monback/growlitheb.png
+++ b/gfx/pokemon/back/growlitheb.png
diff --git a/pic/monback/gyaradosb.png b/gfx/pokemon/back/gyaradosb.png
index 3c6e05a4..3c6e05a4 100644
--- a/pic/monback/gyaradosb.png
+++ b/gfx/pokemon/back/gyaradosb.png
diff --git a/pic/monback/haunterb.png b/gfx/pokemon/back/haunterb.png
index 3767db06..3767db06 100644
--- a/pic/monback/haunterb.png
+++ b/gfx/pokemon/back/haunterb.png
diff --git a/pic/monback/hitmonchanb.png b/gfx/pokemon/back/hitmonchanb.png
index 7b7f0ee6..7b7f0ee6 100644
--- a/pic/monback/hitmonchanb.png
+++ b/gfx/pokemon/back/hitmonchanb.png
diff --git a/pic/monback/hitmonleeb.png b/gfx/pokemon/back/hitmonleeb.png
index 17251aff..17251aff 100644
--- a/pic/monback/hitmonleeb.png
+++ b/gfx/pokemon/back/hitmonleeb.png
diff --git a/pic/monback/horseab.png b/gfx/pokemon/back/horseab.png
index 39e9163e..39e9163e 100644
--- a/pic/monback/horseab.png
+++ b/gfx/pokemon/back/horseab.png
diff --git a/pic/monback/hypnob.png b/gfx/pokemon/back/hypnob.png
index 90bcd0e7..90bcd0e7 100644
--- a/pic/monback/hypnob.png
+++ b/gfx/pokemon/back/hypnob.png
diff --git a/pic/monback/ivysaurb.png b/gfx/pokemon/back/ivysaurb.png
index c6070b7a..c6070b7a 100644
--- a/pic/monback/ivysaurb.png
+++ b/gfx/pokemon/back/ivysaurb.png
diff --git a/pic/monback/jigglypuffb.png b/gfx/pokemon/back/jigglypuffb.png
index cb224907..cb224907 100644
--- a/pic/monback/jigglypuffb.png
+++ b/gfx/pokemon/back/jigglypuffb.png
diff --git a/pic/monback/jolteonb.png b/gfx/pokemon/back/jolteonb.png
index 30e92499..30e92499 100644
--- a/pic/monback/jolteonb.png
+++ b/gfx/pokemon/back/jolteonb.png
diff --git a/pic/monback/jynxb.png b/gfx/pokemon/back/jynxb.png
index 00c2ad04..00c2ad04 100644
--- a/pic/monback/jynxb.png
+++ b/gfx/pokemon/back/jynxb.png
diff --git a/pic/monback/kabutob.png b/gfx/pokemon/back/kabutob.png
index 8c744494..8c744494 100644
--- a/pic/monback/kabutob.png
+++ b/gfx/pokemon/back/kabutob.png
diff --git a/pic/monback/kabutopsb.png b/gfx/pokemon/back/kabutopsb.png
index cdd1be4f..cdd1be4f 100644
--- a/pic/monback/kabutopsb.png
+++ b/gfx/pokemon/back/kabutopsb.png
diff --git a/pic/monback/kadabrab.png b/gfx/pokemon/back/kadabrab.png
index a82d2f11..a82d2f11 100644
--- a/pic/monback/kadabrab.png
+++ b/gfx/pokemon/back/kadabrab.png
diff --git a/pic/monback/kakunab.png b/gfx/pokemon/back/kakunab.png
index b9fba0ae..b9fba0ae 100644
--- a/pic/monback/kakunab.png
+++ b/gfx/pokemon/back/kakunab.png
diff --git a/pic/monback/kangaskhanb.png b/gfx/pokemon/back/kangaskhanb.png
index 9d39e9bc..9d39e9bc 100644
--- a/pic/monback/kangaskhanb.png
+++ b/gfx/pokemon/back/kangaskhanb.png
diff --git a/pic/monback/kinglerb.png b/gfx/pokemon/back/kinglerb.png
index b7db5dc0..b7db5dc0 100644
--- a/pic/monback/kinglerb.png
+++ b/gfx/pokemon/back/kinglerb.png
diff --git a/pic/monback/koffingb.png b/gfx/pokemon/back/koffingb.png
index f3942061..f3942061 100644
--- a/pic/monback/koffingb.png
+++ b/gfx/pokemon/back/koffingb.png
diff --git a/pic/monback/krabbyb.png b/gfx/pokemon/back/krabbyb.png
index d2e72cf8..d2e72cf8 100644
--- a/pic/monback/krabbyb.png
+++ b/gfx/pokemon/back/krabbyb.png
diff --git a/pic/monback/laprasb.png b/gfx/pokemon/back/laprasb.png
index 83e852f3..83e852f3 100644
--- a/pic/monback/laprasb.png
+++ b/gfx/pokemon/back/laprasb.png
diff --git a/pic/monback/lickitungb.png b/gfx/pokemon/back/lickitungb.png
index 34a8dc7f..34a8dc7f 100644
--- a/pic/monback/lickitungb.png
+++ b/gfx/pokemon/back/lickitungb.png
diff --git a/pic/monback/machampb.png b/gfx/pokemon/back/machampb.png
index 816584bc..816584bc 100644
--- a/pic/monback/machampb.png
+++ b/gfx/pokemon/back/machampb.png
diff --git a/pic/monback/machokeb.png b/gfx/pokemon/back/machokeb.png
index f621546f..f621546f 100644
--- a/pic/monback/machokeb.png
+++ b/gfx/pokemon/back/machokeb.png
diff --git a/pic/monback/machopb.png b/gfx/pokemon/back/machopb.png
index 154f9623..154f9623 100644
--- a/pic/monback/machopb.png
+++ b/gfx/pokemon/back/machopb.png
diff --git a/pic/monback/magikarpb.png b/gfx/pokemon/back/magikarpb.png
index e4e93564..e4e93564 100644
--- a/pic/monback/magikarpb.png
+++ b/gfx/pokemon/back/magikarpb.png
diff --git a/pic/monback/magmarb.png b/gfx/pokemon/back/magmarb.png
index 3278b43c..3278b43c 100644
--- a/pic/monback/magmarb.png
+++ b/gfx/pokemon/back/magmarb.png
diff --git a/pic/monback/magnemiteb.png b/gfx/pokemon/back/magnemiteb.png
index be2aeadb..be2aeadb 100644
--- a/pic/monback/magnemiteb.png
+++ b/gfx/pokemon/back/magnemiteb.png
diff --git a/pic/monback/magnetonb.png b/gfx/pokemon/back/magnetonb.png
index 19874b61..19874b61 100644
--- a/pic/monback/magnetonb.png
+++ b/gfx/pokemon/back/magnetonb.png
diff --git a/pic/monback/mankeyb.png b/gfx/pokemon/back/mankeyb.png
index bba4907b..bba4907b 100644
--- a/pic/monback/mankeyb.png
+++ b/gfx/pokemon/back/mankeyb.png
diff --git a/pic/monback/marowakb.png b/gfx/pokemon/back/marowakb.png
index 62907099..62907099 100644
--- a/pic/monback/marowakb.png
+++ b/gfx/pokemon/back/marowakb.png
diff --git a/pic/monback/meowthb.png b/gfx/pokemon/back/meowthb.png
index c9d7057b..c9d7057b 100644
--- a/pic/monback/meowthb.png
+++ b/gfx/pokemon/back/meowthb.png
diff --git a/pic/monback/metapodb.png b/gfx/pokemon/back/metapodb.png
index db7d4e06..db7d4e06 100644
--- a/pic/monback/metapodb.png
+++ b/gfx/pokemon/back/metapodb.png
diff --git a/pic/monback/mewb.png b/gfx/pokemon/back/mewb.png
index 89816a6f..89816a6f 100644
--- a/pic/monback/mewb.png
+++ b/gfx/pokemon/back/mewb.png
diff --git a/pic/monback/mewtwob.png b/gfx/pokemon/back/mewtwob.png
index c57ffe5d..c57ffe5d 100644
--- a/pic/monback/mewtwob.png
+++ b/gfx/pokemon/back/mewtwob.png
diff --git a/pic/monback/moltresb.png b/gfx/pokemon/back/moltresb.png
index 992708c9..992708c9 100644
--- a/pic/monback/moltresb.png
+++ b/gfx/pokemon/back/moltresb.png
diff --git a/pic/monback/mr.mimeb.png b/gfx/pokemon/back/mr.mimeb.png
index 3902dace..3902dace 100644
--- a/pic/monback/mr.mimeb.png
+++ b/gfx/pokemon/back/mr.mimeb.png
diff --git a/pic/monback/mukb.png b/gfx/pokemon/back/mukb.png
index 9fcaab51..9fcaab51 100644
--- a/pic/monback/mukb.png
+++ b/gfx/pokemon/back/mukb.png
diff --git a/pic/monback/nidokingb.png b/gfx/pokemon/back/nidokingb.png
index cfd9c689..cfd9c689 100644
--- a/pic/monback/nidokingb.png
+++ b/gfx/pokemon/back/nidokingb.png
diff --git a/pic/monback/nidoqueenb.png b/gfx/pokemon/back/nidoqueenb.png
index c6114752..c6114752 100644
--- a/pic/monback/nidoqueenb.png
+++ b/gfx/pokemon/back/nidoqueenb.png
diff --git a/pic/monback/nidoranfb.png b/gfx/pokemon/back/nidoranfb.png
index 803ac656..803ac656 100644
--- a/pic/monback/nidoranfb.png
+++ b/gfx/pokemon/back/nidoranfb.png
diff --git a/pic/monback/nidoranmb.png b/gfx/pokemon/back/nidoranmb.png
index 756fe9bf..756fe9bf 100644
--- a/pic/monback/nidoranmb.png
+++ b/gfx/pokemon/back/nidoranmb.png
diff --git a/pic/monback/nidorinab.png b/gfx/pokemon/back/nidorinab.png
index 7b369bcc..7b369bcc 100644
--- a/pic/monback/nidorinab.png
+++ b/gfx/pokemon/back/nidorinab.png
diff --git a/pic/monback/nidorinob.png b/gfx/pokemon/back/nidorinob.png
index a5df5095..a5df5095 100644
--- a/pic/monback/nidorinob.png
+++ b/gfx/pokemon/back/nidorinob.png
diff --git a/pic/monback/ninetalesb.png b/gfx/pokemon/back/ninetalesb.png
index 8c5e5953..8c5e5953 100644
--- a/pic/monback/ninetalesb.png
+++ b/gfx/pokemon/back/ninetalesb.png
diff --git a/pic/monback/oddishb.png b/gfx/pokemon/back/oddishb.png
index 022491c4..022491c4 100644
--- a/pic/monback/oddishb.png
+++ b/gfx/pokemon/back/oddishb.png
diff --git a/pic/monback/omanyteb.png b/gfx/pokemon/back/omanyteb.png
index fd3152e8..fd3152e8 100644
--- a/pic/monback/omanyteb.png
+++ b/gfx/pokemon/back/omanyteb.png
diff --git a/pic/monback/omastarb.png b/gfx/pokemon/back/omastarb.png
index 38defee4..38defee4 100644
--- a/pic/monback/omastarb.png
+++ b/gfx/pokemon/back/omastarb.png
diff --git a/pic/monback/onixb.png b/gfx/pokemon/back/onixb.png
index c2f35005..c2f35005 100644
--- a/pic/monback/onixb.png
+++ b/gfx/pokemon/back/onixb.png
diff --git a/pic/monback/parasb.png b/gfx/pokemon/back/parasb.png
index 810cac1a..810cac1a 100644
--- a/pic/monback/parasb.png
+++ b/gfx/pokemon/back/parasb.png
diff --git a/pic/monback/parasectb.png b/gfx/pokemon/back/parasectb.png
index 1cbaade2..1cbaade2 100644
--- a/pic/monback/parasectb.png
+++ b/gfx/pokemon/back/parasectb.png
diff --git a/pic/monback/persianb.png b/gfx/pokemon/back/persianb.png
index 6fe4545d..6fe4545d 100644
--- a/pic/monback/persianb.png
+++ b/gfx/pokemon/back/persianb.png
diff --git a/pic/monback/pidgeotb.png b/gfx/pokemon/back/pidgeotb.png
index 06131268..06131268 100644
--- a/pic/monback/pidgeotb.png
+++ b/gfx/pokemon/back/pidgeotb.png
diff --git a/pic/monback/pidgeottob.png b/gfx/pokemon/back/pidgeottob.png
index b7b5f707..b7b5f707 100644
--- a/pic/monback/pidgeottob.png
+++ b/gfx/pokemon/back/pidgeottob.png
diff --git a/pic/monback/pidgeyb.png b/gfx/pokemon/back/pidgeyb.png
index c7eec098..c7eec098 100644
--- a/pic/monback/pidgeyb.png
+++ b/gfx/pokemon/back/pidgeyb.png
diff --git a/pic/monback/pikachub.png b/gfx/pokemon/back/pikachub.png
index a0cb1faf..a0cb1faf 100644
--- a/pic/monback/pikachub.png
+++ b/gfx/pokemon/back/pikachub.png
diff --git a/pic/monback/pinsirb.png b/gfx/pokemon/back/pinsirb.png
index 14b65dc5..14b65dc5 100644
--- a/pic/monback/pinsirb.png
+++ b/gfx/pokemon/back/pinsirb.png
diff --git a/pic/monback/poliwagb.png b/gfx/pokemon/back/poliwagb.png
index d46d804f..d46d804f 100644
--- a/pic/monback/poliwagb.png
+++ b/gfx/pokemon/back/poliwagb.png
diff --git a/pic/monback/poliwhirlb.png b/gfx/pokemon/back/poliwhirlb.png
index 0b078460..0b078460 100644
--- a/pic/monback/poliwhirlb.png
+++ b/gfx/pokemon/back/poliwhirlb.png
diff --git a/pic/monback/poliwrathb.png b/gfx/pokemon/back/poliwrathb.png
index 9d80eafc..9d80eafc 100644
--- a/pic/monback/poliwrathb.png
+++ b/gfx/pokemon/back/poliwrathb.png
diff --git a/pic/monback/ponytab.png b/gfx/pokemon/back/ponytab.png
index 1efc01af..1efc01af 100644
--- a/pic/monback/ponytab.png
+++ b/gfx/pokemon/back/ponytab.png
diff --git a/pic/monback/porygonb.png b/gfx/pokemon/back/porygonb.png
index c9f94319..c9f94319 100644
--- a/pic/monback/porygonb.png
+++ b/gfx/pokemon/back/porygonb.png
diff --git a/pic/monback/primeapeb.png b/gfx/pokemon/back/primeapeb.png
index 0a4da28f..0a4da28f 100644
--- a/pic/monback/primeapeb.png
+++ b/gfx/pokemon/back/primeapeb.png
diff --git a/pic/monback/psyduckb.png b/gfx/pokemon/back/psyduckb.png
index 7d77dc75..7d77dc75 100644
--- a/pic/monback/psyduckb.png
+++ b/gfx/pokemon/back/psyduckb.png
diff --git a/pic/monback/raichub.png b/gfx/pokemon/back/raichub.png
index 3d8d93c7..3d8d93c7 100644
--- a/pic/monback/raichub.png
+++ b/gfx/pokemon/back/raichub.png
diff --git a/pic/monback/rapidashb.png b/gfx/pokemon/back/rapidashb.png
index 36258b71..36258b71 100644
--- a/pic/monback/rapidashb.png
+++ b/gfx/pokemon/back/rapidashb.png
diff --git a/pic/monback/raticateb.png b/gfx/pokemon/back/raticateb.png
index bbc1ac5a..bbc1ac5a 100644
--- a/pic/monback/raticateb.png
+++ b/gfx/pokemon/back/raticateb.png
diff --git a/pic/monback/rattatab.png b/gfx/pokemon/back/rattatab.png
index e1aa812d..e1aa812d 100644
--- a/pic/monback/rattatab.png
+++ b/gfx/pokemon/back/rattatab.png
diff --git a/pic/monback/rhydonb.png b/gfx/pokemon/back/rhydonb.png
index 12a20582..12a20582 100644
--- a/pic/monback/rhydonb.png
+++ b/gfx/pokemon/back/rhydonb.png
diff --git a/pic/monback/rhyhornb.png b/gfx/pokemon/back/rhyhornb.png
index 88dc72c1..88dc72c1 100644
--- a/pic/monback/rhyhornb.png
+++ b/gfx/pokemon/back/rhyhornb.png
diff --git a/pic/monback/sandshrewb.png b/gfx/pokemon/back/sandshrewb.png
index 439c59f0..439c59f0 100644
--- a/pic/monback/sandshrewb.png
+++ b/gfx/pokemon/back/sandshrewb.png
diff --git a/pic/monback/sandslashb.png b/gfx/pokemon/back/sandslashb.png
index 18a5490f..18a5490f 100644
--- a/pic/monback/sandslashb.png
+++ b/gfx/pokemon/back/sandslashb.png
diff --git a/pic/monback/scytherb.png b/gfx/pokemon/back/scytherb.png
index d68204b0..d68204b0 100644
--- a/pic/monback/scytherb.png
+++ b/gfx/pokemon/back/scytherb.png
diff --git a/pic/monback/seadrab.png b/gfx/pokemon/back/seadrab.png
index a7ab0daf..a7ab0daf 100644
--- a/pic/monback/seadrab.png
+++ b/gfx/pokemon/back/seadrab.png
diff --git a/pic/monback/seakingb.png b/gfx/pokemon/back/seakingb.png
index a46b61b8..a46b61b8 100644
--- a/pic/monback/seakingb.png
+++ b/gfx/pokemon/back/seakingb.png
diff --git a/pic/monback/seelb.png b/gfx/pokemon/back/seelb.png
index f8b1a190..f8b1a190 100644
--- a/pic/monback/seelb.png
+++ b/gfx/pokemon/back/seelb.png
diff --git a/pic/monback/shellderb.png b/gfx/pokemon/back/shellderb.png
index e7288bf6..e7288bf6 100644
--- a/pic/monback/shellderb.png
+++ b/gfx/pokemon/back/shellderb.png
diff --git a/pic/monback/slowbrob.png b/gfx/pokemon/back/slowbrob.png
index d1a58548..d1a58548 100644
--- a/pic/monback/slowbrob.png
+++ b/gfx/pokemon/back/slowbrob.png
diff --git a/pic/monback/slowpokeb.png b/gfx/pokemon/back/slowpokeb.png
index ddb3a878..ddb3a878 100644
--- a/pic/monback/slowpokeb.png
+++ b/gfx/pokemon/back/slowpokeb.png
diff --git a/pic/monback/snorlaxb.png b/gfx/pokemon/back/snorlaxb.png
index ea704f80..ea704f80 100644
--- a/pic/monback/snorlaxb.png
+++ b/gfx/pokemon/back/snorlaxb.png
diff --git a/pic/monback/spearowb.png b/gfx/pokemon/back/spearowb.png
index 7bd385a9..7bd385a9 100644
--- a/pic/monback/spearowb.png
+++ b/gfx/pokemon/back/spearowb.png
diff --git a/pic/monback/squirtleb.png b/gfx/pokemon/back/squirtleb.png
index a5679293..a5679293 100644
--- a/pic/monback/squirtleb.png
+++ b/gfx/pokemon/back/squirtleb.png
diff --git a/pic/monback/starmieb.png b/gfx/pokemon/back/starmieb.png
index f01303b8..f01303b8 100644
--- a/pic/monback/starmieb.png
+++ b/gfx/pokemon/back/starmieb.png
diff --git a/pic/monback/staryub.png b/gfx/pokemon/back/staryub.png
index 2e35efa8..2e35efa8 100644
--- a/pic/monback/staryub.png
+++ b/gfx/pokemon/back/staryub.png
diff --git a/pic/monback/tangelab.png b/gfx/pokemon/back/tangelab.png
index cbb035d9..cbb035d9 100644
--- a/pic/monback/tangelab.png
+++ b/gfx/pokemon/back/tangelab.png
diff --git a/pic/monback/taurosb.png b/gfx/pokemon/back/taurosb.png
index 9e835e80..9e835e80 100644
--- a/pic/monback/taurosb.png
+++ b/gfx/pokemon/back/taurosb.png
diff --git a/pic/monback/tentacoolb.png b/gfx/pokemon/back/tentacoolb.png
index 5aa3b9cd..5aa3b9cd 100644
--- a/pic/monback/tentacoolb.png
+++ b/gfx/pokemon/back/tentacoolb.png
diff --git a/pic/monback/tentacruelb.png b/gfx/pokemon/back/tentacruelb.png
index 8510367f..8510367f 100644
--- a/pic/monback/tentacruelb.png
+++ b/gfx/pokemon/back/tentacruelb.png
diff --git a/pic/monback/vaporeonb.png b/gfx/pokemon/back/vaporeonb.png
index dd7f7818..dd7f7818 100644
--- a/pic/monback/vaporeonb.png
+++ b/gfx/pokemon/back/vaporeonb.png
diff --git a/pic/monback/venomothb.png b/gfx/pokemon/back/venomothb.png
index 8282fa45..8282fa45 100644
--- a/pic/monback/venomothb.png
+++ b/gfx/pokemon/back/venomothb.png
diff --git a/pic/monback/venonatb.png b/gfx/pokemon/back/venonatb.png
index 1eafa547..1eafa547 100644
--- a/pic/monback/venonatb.png
+++ b/gfx/pokemon/back/venonatb.png
diff --git a/pic/monback/venusaurb.png b/gfx/pokemon/back/venusaurb.png
index f0f85d44..f0f85d44 100644
--- a/pic/monback/venusaurb.png
+++ b/gfx/pokemon/back/venusaurb.png
diff --git a/pic/monback/victreebelb.png b/gfx/pokemon/back/victreebelb.png
index 7f1c8057..7f1c8057 100644
--- a/pic/monback/victreebelb.png
+++ b/gfx/pokemon/back/victreebelb.png
diff --git a/pic/monback/vileplumeb.png b/gfx/pokemon/back/vileplumeb.png
index 34ac2d95..34ac2d95 100644
--- a/pic/monback/vileplumeb.png
+++ b/gfx/pokemon/back/vileplumeb.png
diff --git a/pic/monback/voltorbb.png b/gfx/pokemon/back/voltorbb.png
index 119bce73..119bce73 100644
--- a/pic/monback/voltorbb.png
+++ b/gfx/pokemon/back/voltorbb.png
diff --git a/pic/monback/vulpixb.png b/gfx/pokemon/back/vulpixb.png
index 29bb2ff9..29bb2ff9 100644
--- a/pic/monback/vulpixb.png
+++ b/gfx/pokemon/back/vulpixb.png
diff --git a/pic/monback/wartortleb.png b/gfx/pokemon/back/wartortleb.png
index d0e6ad69..d0e6ad69 100644
--- a/pic/monback/wartortleb.png
+++ b/gfx/pokemon/back/wartortleb.png
diff --git a/pic/monback/weedleb.png b/gfx/pokemon/back/weedleb.png
index 2acaf4ee..2acaf4ee 100644
--- a/pic/monback/weedleb.png
+++ b/gfx/pokemon/back/weedleb.png
diff --git a/pic/monback/weepinbellb.png b/gfx/pokemon/back/weepinbellb.png
index 6362db7e..6362db7e 100644
--- a/pic/monback/weepinbellb.png
+++ b/gfx/pokemon/back/weepinbellb.png
diff --git a/pic/monback/weezingb.png b/gfx/pokemon/back/weezingb.png
index 20d59b12..20d59b12 100644
--- a/pic/monback/weezingb.png
+++ b/gfx/pokemon/back/weezingb.png
diff --git a/pic/monback/wigglytuffb.png b/gfx/pokemon/back/wigglytuffb.png
index 235bc319..235bc319 100644
--- a/pic/monback/wigglytuffb.png
+++ b/gfx/pokemon/back/wigglytuffb.png
diff --git a/pic/monback/zapdosb.png b/gfx/pokemon/back/zapdosb.png
index 72831372..72831372 100644
--- a/pic/monback/zapdosb.png
+++ b/gfx/pokemon/back/zapdosb.png
diff --git a/pic/monback/zubatb.png b/gfx/pokemon/back/zubatb.png
index 2738acd8..2738acd8 100644
--- a/pic/monback/zubatb.png
+++ b/gfx/pokemon/back/zubatb.png
diff --git a/pic/bmon/abra.png b/gfx/pokemon/front/abra.png
index 12045ee3..12045ee3 100644
--- a/pic/bmon/abra.png
+++ b/gfx/pokemon/front/abra.png
diff --git a/pic/bmon/aerodactyl.png b/gfx/pokemon/front/aerodactyl.png
index 4cbfdeeb..4cbfdeeb 100644
--- a/pic/bmon/aerodactyl.png
+++ b/gfx/pokemon/front/aerodactyl.png
diff --git a/pic/bmon/alakazam.png b/gfx/pokemon/front/alakazam.png
index 9c379b6a..9c379b6a 100644
--- a/pic/bmon/alakazam.png
+++ b/gfx/pokemon/front/alakazam.png
diff --git a/pic/bmon/arbok.png b/gfx/pokemon/front/arbok.png
index bd8da001..bd8da001 100644
--- a/pic/bmon/arbok.png
+++ b/gfx/pokemon/front/arbok.png
diff --git a/pic/bmon/arcanine.png b/gfx/pokemon/front/arcanine.png
index 5d25961d..5d25961d 100644
--- a/pic/bmon/arcanine.png
+++ b/gfx/pokemon/front/arcanine.png
diff --git a/pic/bmon/articuno.png b/gfx/pokemon/front/articuno.png
index 66986add..66986add 100644
--- a/pic/bmon/articuno.png
+++ b/gfx/pokemon/front/articuno.png
diff --git a/pic/bmon/beedrill.png b/gfx/pokemon/front/beedrill.png
index 36b4a06f..36b4a06f 100644
--- a/pic/bmon/beedrill.png
+++ b/gfx/pokemon/front/beedrill.png
diff --git a/pic/bmon/bellsprout.png b/gfx/pokemon/front/bellsprout.png
index e4fc5e18..e4fc5e18 100644
--- a/pic/bmon/bellsprout.png
+++ b/gfx/pokemon/front/bellsprout.png
diff --git a/pic/bmon/blastoise.png b/gfx/pokemon/front/blastoise.png
index 2192b43a..2192b43a 100644
--- a/pic/bmon/blastoise.png
+++ b/gfx/pokemon/front/blastoise.png
diff --git a/pic/bmon/bulbasaur.png b/gfx/pokemon/front/bulbasaur.png
index a2a924c7..a2a924c7 100644
--- a/pic/bmon/bulbasaur.png
+++ b/gfx/pokemon/front/bulbasaur.png
diff --git a/pic/bmon/butterfree.png b/gfx/pokemon/front/butterfree.png
index 8f1a69aa..8f1a69aa 100644
--- a/pic/bmon/butterfree.png
+++ b/gfx/pokemon/front/butterfree.png
diff --git a/pic/bmon/caterpie.png b/gfx/pokemon/front/caterpie.png
index 8e1a49dd..8e1a49dd 100644
--- a/pic/bmon/caterpie.png
+++ b/gfx/pokemon/front/caterpie.png
diff --git a/pic/bmon/chansey.png b/gfx/pokemon/front/chansey.png
index 832ba27c..832ba27c 100644
--- a/pic/bmon/chansey.png
+++ b/gfx/pokemon/front/chansey.png
diff --git a/pic/bmon/charizard.png b/gfx/pokemon/front/charizard.png
index ad29e489..ad29e489 100644
--- a/pic/bmon/charizard.png
+++ b/gfx/pokemon/front/charizard.png
diff --git a/pic/bmon/charmander.png b/gfx/pokemon/front/charmander.png
index 12d16f01..12d16f01 100644
--- a/pic/bmon/charmander.png
+++ b/gfx/pokemon/front/charmander.png
diff --git a/pic/bmon/charmeleon.png b/gfx/pokemon/front/charmeleon.png
index a5cff72f..a5cff72f 100644
--- a/pic/bmon/charmeleon.png
+++ b/gfx/pokemon/front/charmeleon.png
diff --git a/pic/bmon/clefable.png b/gfx/pokemon/front/clefable.png
index 2fcfac0a..2fcfac0a 100644
--- a/pic/bmon/clefable.png
+++ b/gfx/pokemon/front/clefable.png
diff --git a/pic/bmon/clefairy.png b/gfx/pokemon/front/clefairy.png
index 5a7f3721..5a7f3721 100644
--- a/pic/bmon/clefairy.png
+++ b/gfx/pokemon/front/clefairy.png
diff --git a/pic/bmon/cloyster.png b/gfx/pokemon/front/cloyster.png
index 71f63a7f..71f63a7f 100644
--- a/pic/bmon/cloyster.png
+++ b/gfx/pokemon/front/cloyster.png
diff --git a/pic/bmon/cubone.png b/gfx/pokemon/front/cubone.png
index 23e3a23a..23e3a23a 100644
--- a/pic/bmon/cubone.png
+++ b/gfx/pokemon/front/cubone.png
diff --git a/pic/bmon/dewgong.png b/gfx/pokemon/front/dewgong.png
index aac4e65c..aac4e65c 100644
--- a/pic/bmon/dewgong.png
+++ b/gfx/pokemon/front/dewgong.png
diff --git a/pic/bmon/diglett.png b/gfx/pokemon/front/diglett.png
index f92ae5bc..f92ae5bc 100644
--- a/pic/bmon/diglett.png
+++ b/gfx/pokemon/front/diglett.png
diff --git a/pic/bmon/ditto.png b/gfx/pokemon/front/ditto.png
index 4485e6ec..4485e6ec 100644
--- a/pic/bmon/ditto.png
+++ b/gfx/pokemon/front/ditto.png
diff --git a/pic/bmon/dodrio.png b/gfx/pokemon/front/dodrio.png
index 92e6839d..92e6839d 100644
--- a/pic/bmon/dodrio.png
+++ b/gfx/pokemon/front/dodrio.png
diff --git a/pic/bmon/doduo.png b/gfx/pokemon/front/doduo.png
index 20cba7ba..20cba7ba 100644
--- a/pic/bmon/doduo.png
+++ b/gfx/pokemon/front/doduo.png
diff --git a/pic/bmon/dragonair.png b/gfx/pokemon/front/dragonair.png
index 55d1ef5b..55d1ef5b 100644
--- a/pic/bmon/dragonair.png
+++ b/gfx/pokemon/front/dragonair.png
diff --git a/pic/bmon/dragonite.png b/gfx/pokemon/front/dragonite.png
index 4c387c3e..4c387c3e 100644
--- a/pic/bmon/dragonite.png
+++ b/gfx/pokemon/front/dragonite.png
diff --git a/pic/bmon/dratini.png b/gfx/pokemon/front/dratini.png
index 9df332e4..9df332e4 100644
--- a/pic/bmon/dratini.png
+++ b/gfx/pokemon/front/dratini.png
diff --git a/pic/bmon/drowzee.png b/gfx/pokemon/front/drowzee.png
index cc85510b..cc85510b 100644
--- a/pic/bmon/drowzee.png
+++ b/gfx/pokemon/front/drowzee.png
diff --git a/pic/bmon/dugtrio.png b/gfx/pokemon/front/dugtrio.png
index 433f95ef..433f95ef 100644
--- a/pic/bmon/dugtrio.png
+++ b/gfx/pokemon/front/dugtrio.png
diff --git a/pic/bmon/eevee.png b/gfx/pokemon/front/eevee.png
index 956f8ce0..956f8ce0 100644
--- a/pic/bmon/eevee.png
+++ b/gfx/pokemon/front/eevee.png
diff --git a/pic/bmon/ekans.png b/gfx/pokemon/front/ekans.png
index 6dffaf84..6dffaf84 100644
--- a/pic/bmon/ekans.png
+++ b/gfx/pokemon/front/ekans.png
diff --git a/pic/bmon/electabuzz.png b/gfx/pokemon/front/electabuzz.png
index 0ddccbe1..0ddccbe1 100644
--- a/pic/bmon/electabuzz.png
+++ b/gfx/pokemon/front/electabuzz.png
diff --git a/pic/bmon/electrode.png b/gfx/pokemon/front/electrode.png
index 8df79e6a..8df79e6a 100644
--- a/pic/bmon/electrode.png
+++ b/gfx/pokemon/front/electrode.png
diff --git a/pic/bmon/exeggcute.png b/gfx/pokemon/front/exeggcute.png
index 0ddf8e32..0ddf8e32 100644
--- a/pic/bmon/exeggcute.png
+++ b/gfx/pokemon/front/exeggcute.png
diff --git a/pic/bmon/exeggutor.png b/gfx/pokemon/front/exeggutor.png
index 89ccbdc4..89ccbdc4 100644
--- a/pic/bmon/exeggutor.png
+++ b/gfx/pokemon/front/exeggutor.png
diff --git a/pic/bmon/farfetchd.png b/gfx/pokemon/front/farfetchd.png
index 490e2b7c..490e2b7c 100644
--- a/pic/bmon/farfetchd.png
+++ b/gfx/pokemon/front/farfetchd.png
diff --git a/pic/bmon/fearow.png b/gfx/pokemon/front/fearow.png
index c2c65257..c2c65257 100644
--- a/pic/bmon/fearow.png
+++ b/gfx/pokemon/front/fearow.png
diff --git a/pic/bmon/flareon.png b/gfx/pokemon/front/flareon.png
index eadebd27..eadebd27 100644
--- a/pic/bmon/flareon.png
+++ b/gfx/pokemon/front/flareon.png
diff --git a/pic/bmon/fossilaerodactyl.png b/gfx/pokemon/front/fossilaerodactyl.png
index eb7fc3a3..eb7fc3a3 100644
--- a/pic/bmon/fossilaerodactyl.png
+++ b/gfx/pokemon/front/fossilaerodactyl.png
diff --git a/pic/bmon/fossilkabutops.png b/gfx/pokemon/front/fossilkabutops.png
index dd8d41ea..dd8d41ea 100644
--- a/pic/bmon/fossilkabutops.png
+++ b/gfx/pokemon/front/fossilkabutops.png
diff --git a/pic/bmon/gastly.png b/gfx/pokemon/front/gastly.png
index 081b121d..081b121d 100644
--- a/pic/bmon/gastly.png
+++ b/gfx/pokemon/front/gastly.png
diff --git a/pic/bmon/gengar.png b/gfx/pokemon/front/gengar.png
index 450662d7..450662d7 100644
--- a/pic/bmon/gengar.png
+++ b/gfx/pokemon/front/gengar.png
diff --git a/pic/bmon/geodude.png b/gfx/pokemon/front/geodude.png
index 4202192a..4202192a 100644
--- a/pic/bmon/geodude.png
+++ b/gfx/pokemon/front/geodude.png
diff --git a/pic/bmon/gloom.png b/gfx/pokemon/front/gloom.png
index c2ea9ba4..c2ea9ba4 100644
--- a/pic/bmon/gloom.png
+++ b/gfx/pokemon/front/gloom.png
diff --git a/pic/bmon/golbat.png b/gfx/pokemon/front/golbat.png
index 6abc6f0a..6abc6f0a 100644
--- a/pic/bmon/golbat.png
+++ b/gfx/pokemon/front/golbat.png
diff --git a/pic/bmon/goldeen.png b/gfx/pokemon/front/goldeen.png
index e8cbfddc..e8cbfddc 100644
--- a/pic/bmon/goldeen.png
+++ b/gfx/pokemon/front/goldeen.png
diff --git a/pic/bmon/golduck.png b/gfx/pokemon/front/golduck.png
index 5448f7c8..5448f7c8 100644
--- a/pic/bmon/golduck.png
+++ b/gfx/pokemon/front/golduck.png
diff --git a/pic/bmon/golem.png b/gfx/pokemon/front/golem.png
index 1dba6a67..1dba6a67 100644
--- a/pic/bmon/golem.png
+++ b/gfx/pokemon/front/golem.png
diff --git a/pic/bmon/graveler.png b/gfx/pokemon/front/graveler.png
index 0d9da672..0d9da672 100644
--- a/pic/bmon/graveler.png
+++ b/gfx/pokemon/front/graveler.png
diff --git a/pic/bmon/grimer.png b/gfx/pokemon/front/grimer.png
index 255b10b9..255b10b9 100644
--- a/pic/bmon/grimer.png
+++ b/gfx/pokemon/front/grimer.png
diff --git a/pic/bmon/growlithe.png b/gfx/pokemon/front/growlithe.png
index b753bce7..b753bce7 100644
--- a/pic/bmon/growlithe.png
+++ b/gfx/pokemon/front/growlithe.png
diff --git a/pic/bmon/gyarados.png b/gfx/pokemon/front/gyarados.png
index a7ed0c17..a7ed0c17 100644
--- a/pic/bmon/gyarados.png
+++ b/gfx/pokemon/front/gyarados.png
diff --git a/pic/bmon/haunter.png b/gfx/pokemon/front/haunter.png
index 4d6c758d..4d6c758d 100644
--- a/pic/bmon/haunter.png
+++ b/gfx/pokemon/front/haunter.png
diff --git a/pic/bmon/hitmonchan.png b/gfx/pokemon/front/hitmonchan.png
index d8a6ffd3..d8a6ffd3 100644
--- a/pic/bmon/hitmonchan.png
+++ b/gfx/pokemon/front/hitmonchan.png
diff --git a/pic/bmon/hitmonlee.png b/gfx/pokemon/front/hitmonlee.png
index 36042c68..36042c68 100644
--- a/pic/bmon/hitmonlee.png
+++ b/gfx/pokemon/front/hitmonlee.png
diff --git a/pic/bmon/horsea.png b/gfx/pokemon/front/horsea.png
index cd28df8c..cd28df8c 100644
--- a/pic/bmon/horsea.png
+++ b/gfx/pokemon/front/horsea.png
diff --git a/pic/bmon/hypno.png b/gfx/pokemon/front/hypno.png
index e7434ea4..e7434ea4 100644
--- a/pic/bmon/hypno.png
+++ b/gfx/pokemon/front/hypno.png
diff --git a/pic/bmon/ivysaur.png b/gfx/pokemon/front/ivysaur.png
index dad10ae0..dad10ae0 100644
--- a/pic/bmon/ivysaur.png
+++ b/gfx/pokemon/front/ivysaur.png
diff --git a/pic/bmon/jigglypuff.png b/gfx/pokemon/front/jigglypuff.png
index a5475777..a5475777 100644
--- a/pic/bmon/jigglypuff.png
+++ b/gfx/pokemon/front/jigglypuff.png
diff --git a/pic/bmon/jolteon.png b/gfx/pokemon/front/jolteon.png
index 7ecd6fbb..7ecd6fbb 100644
--- a/pic/bmon/jolteon.png
+++ b/gfx/pokemon/front/jolteon.png
diff --git a/pic/bmon/jynx.png b/gfx/pokemon/front/jynx.png
index 583bd5da..583bd5da 100644
--- a/pic/bmon/jynx.png
+++ b/gfx/pokemon/front/jynx.png
diff --git a/pic/bmon/kabuto.png b/gfx/pokemon/front/kabuto.png
index e8e44e15..e8e44e15 100644
--- a/pic/bmon/kabuto.png
+++ b/gfx/pokemon/front/kabuto.png
diff --git a/pic/bmon/kabutops.png b/gfx/pokemon/front/kabutops.png
index 39fcb900..39fcb900 100644
--- a/pic/bmon/kabutops.png
+++ b/gfx/pokemon/front/kabutops.png
diff --git a/pic/bmon/kadabra.png b/gfx/pokemon/front/kadabra.png
index 36589440..36589440 100644
--- a/pic/bmon/kadabra.png
+++ b/gfx/pokemon/front/kadabra.png
diff --git a/pic/bmon/kakuna.png b/gfx/pokemon/front/kakuna.png
index ee350ffd..ee350ffd 100644
--- a/pic/bmon/kakuna.png
+++ b/gfx/pokemon/front/kakuna.png
diff --git a/pic/bmon/kangaskhan.png b/gfx/pokemon/front/kangaskhan.png
index 1c0ba99c..1c0ba99c 100644
--- a/pic/bmon/kangaskhan.png
+++ b/gfx/pokemon/front/kangaskhan.png
diff --git a/pic/bmon/kingler.png b/gfx/pokemon/front/kingler.png
index b2bd7418..b2bd7418 100644
--- a/pic/bmon/kingler.png
+++ b/gfx/pokemon/front/kingler.png
diff --git a/pic/bmon/koffing.png b/gfx/pokemon/front/koffing.png
index 36961502..36961502 100644
--- a/pic/bmon/koffing.png
+++ b/gfx/pokemon/front/koffing.png
diff --git a/pic/bmon/krabby.png b/gfx/pokemon/front/krabby.png
index b280e8db..b280e8db 100644
--- a/pic/bmon/krabby.png
+++ b/gfx/pokemon/front/krabby.png
diff --git a/pic/bmon/lapras.png b/gfx/pokemon/front/lapras.png
index 822c00e9..822c00e9 100644
--- a/pic/bmon/lapras.png
+++ b/gfx/pokemon/front/lapras.png
diff --git a/pic/bmon/lickitung.png b/gfx/pokemon/front/lickitung.png
index 050f7d23..050f7d23 100644
--- a/pic/bmon/lickitung.png
+++ b/gfx/pokemon/front/lickitung.png
diff --git a/pic/bmon/machamp.png b/gfx/pokemon/front/machamp.png
index c854a2cf..c854a2cf 100644
--- a/pic/bmon/machamp.png
+++ b/gfx/pokemon/front/machamp.png
diff --git a/pic/bmon/machoke.png b/gfx/pokemon/front/machoke.png
index 317dad96..317dad96 100644
--- a/pic/bmon/machoke.png
+++ b/gfx/pokemon/front/machoke.png
diff --git a/pic/bmon/machop.png b/gfx/pokemon/front/machop.png
index 63909c11..63909c11 100644
--- a/pic/bmon/machop.png
+++ b/gfx/pokemon/front/machop.png
diff --git a/pic/bmon/magikarp.png b/gfx/pokemon/front/magikarp.png
index e71402f8..e71402f8 100644
--- a/pic/bmon/magikarp.png
+++ b/gfx/pokemon/front/magikarp.png
diff --git a/pic/bmon/magmar.png b/gfx/pokemon/front/magmar.png
index 9bc1d929..9bc1d929 100644
--- a/pic/bmon/magmar.png
+++ b/gfx/pokemon/front/magmar.png
diff --git a/pic/bmon/magnemite.png b/gfx/pokemon/front/magnemite.png
index f2254bed..f2254bed 100644
--- a/pic/bmon/magnemite.png
+++ b/gfx/pokemon/front/magnemite.png
diff --git a/pic/bmon/magneton.png b/gfx/pokemon/front/magneton.png
index 4d0f2cc7..4d0f2cc7 100644
--- a/pic/bmon/magneton.png
+++ b/gfx/pokemon/front/magneton.png
diff --git a/pic/bmon/mankey.png b/gfx/pokemon/front/mankey.png
index 303ce1f2..303ce1f2 100644
--- a/pic/bmon/mankey.png
+++ b/gfx/pokemon/front/mankey.png
diff --git a/pic/bmon/marowak.png b/gfx/pokemon/front/marowak.png
index b2d18437..b2d18437 100644
--- a/pic/bmon/marowak.png
+++ b/gfx/pokemon/front/marowak.png
diff --git a/pic/bmon/meowth.png b/gfx/pokemon/front/meowth.png
index 0e706c35..0e706c35 100644
--- a/pic/bmon/meowth.png
+++ b/gfx/pokemon/front/meowth.png
diff --git a/pic/bmon/metapod.png b/gfx/pokemon/front/metapod.png
index cbfa6e1e..cbfa6e1e 100644
--- a/pic/bmon/metapod.png
+++ b/gfx/pokemon/front/metapod.png
diff --git a/pic/bmon/mew.png b/gfx/pokemon/front/mew.png
index 7e25a96d..7e25a96d 100644
--- a/pic/bmon/mew.png
+++ b/gfx/pokemon/front/mew.png
diff --git a/pic/bmon/mewtwo.png b/gfx/pokemon/front/mewtwo.png
index b7a31296..b7a31296 100644
--- a/pic/bmon/mewtwo.png
+++ b/gfx/pokemon/front/mewtwo.png
diff --git a/pic/bmon/moltres.png b/gfx/pokemon/front/moltres.png
index 7c153998..7c153998 100644
--- a/pic/bmon/moltres.png
+++ b/gfx/pokemon/front/moltres.png
diff --git a/pic/bmon/mr.mime.png b/gfx/pokemon/front/mr.mime.png
index d9085ec6..d9085ec6 100644
--- a/pic/bmon/mr.mime.png
+++ b/gfx/pokemon/front/mr.mime.png
diff --git a/pic/bmon/muk.png b/gfx/pokemon/front/muk.png
index f69b83b7..f69b83b7 100644
--- a/pic/bmon/muk.png
+++ b/gfx/pokemon/front/muk.png
diff --git a/pic/bmon/nidoking.png b/gfx/pokemon/front/nidoking.png
index 24330538..24330538 100644
--- a/pic/bmon/nidoking.png
+++ b/gfx/pokemon/front/nidoking.png
diff --git a/pic/bmon/nidoqueen.png b/gfx/pokemon/front/nidoqueen.png
index c0043e1b..c0043e1b 100644
--- a/pic/bmon/nidoqueen.png
+++ b/gfx/pokemon/front/nidoqueen.png
diff --git a/pic/bmon/nidoranf.png b/gfx/pokemon/front/nidoranf.png
index 6b58b274..6b58b274 100644
--- a/pic/bmon/nidoranf.png
+++ b/gfx/pokemon/front/nidoranf.png
diff --git a/pic/bmon/nidoranm.png b/gfx/pokemon/front/nidoranm.png
index 92d0cb49..92d0cb49 100644
--- a/pic/bmon/nidoranm.png
+++ b/gfx/pokemon/front/nidoranm.png
diff --git a/pic/bmon/nidorina.png b/gfx/pokemon/front/nidorina.png
index 68aca7c4..68aca7c4 100644
--- a/pic/bmon/nidorina.png
+++ b/gfx/pokemon/front/nidorina.png
diff --git a/pic/bmon/nidorino.png b/gfx/pokemon/front/nidorino.png
index 795bf0c5..795bf0c5 100644
--- a/pic/bmon/nidorino.png
+++ b/gfx/pokemon/front/nidorino.png
diff --git a/pic/bmon/ninetales.png b/gfx/pokemon/front/ninetales.png
index ed6bb398..ed6bb398 100644
--- a/pic/bmon/ninetales.png
+++ b/gfx/pokemon/front/ninetales.png
diff --git a/pic/bmon/oddish.png b/gfx/pokemon/front/oddish.png
index e47dabe1..e47dabe1 100644
--- a/pic/bmon/oddish.png
+++ b/gfx/pokemon/front/oddish.png
diff --git a/pic/bmon/omanyte.png b/gfx/pokemon/front/omanyte.png
index bdfa5440..bdfa5440 100644
--- a/pic/bmon/omanyte.png
+++ b/gfx/pokemon/front/omanyte.png
diff --git a/pic/bmon/omastar.png b/gfx/pokemon/front/omastar.png
index 3221d3d8..3221d3d8 100644
--- a/pic/bmon/omastar.png
+++ b/gfx/pokemon/front/omastar.png
diff --git a/pic/bmon/onix.png b/gfx/pokemon/front/onix.png
index 44a21a61..44a21a61 100644
--- a/pic/bmon/onix.png
+++ b/gfx/pokemon/front/onix.png
diff --git a/pic/bmon/paras.png b/gfx/pokemon/front/paras.png
index f4909bbd..f4909bbd 100644
--- a/pic/bmon/paras.png
+++ b/gfx/pokemon/front/paras.png
diff --git a/pic/bmon/parasect.png b/gfx/pokemon/front/parasect.png
index 938bf53b..938bf53b 100644
--- a/pic/bmon/parasect.png
+++ b/gfx/pokemon/front/parasect.png
diff --git a/pic/bmon/persian.png b/gfx/pokemon/front/persian.png
index cc15677a..cc15677a 100644
--- a/pic/bmon/persian.png
+++ b/gfx/pokemon/front/persian.png
diff --git a/pic/bmon/pidgeot.png b/gfx/pokemon/front/pidgeot.png
index 7daf609f..7daf609f 100644
--- a/pic/bmon/pidgeot.png
+++ b/gfx/pokemon/front/pidgeot.png
diff --git a/pic/bmon/pidgeotto.png b/gfx/pokemon/front/pidgeotto.png
index c86b86f1..c86b86f1 100644
--- a/pic/bmon/pidgeotto.png
+++ b/gfx/pokemon/front/pidgeotto.png
diff --git a/pic/bmon/pidgey.png b/gfx/pokemon/front/pidgey.png
index 70d9dd4a..70d9dd4a 100644
--- a/pic/bmon/pidgey.png
+++ b/gfx/pokemon/front/pidgey.png
diff --git a/pic/bmon/pikachu.png b/gfx/pokemon/front/pikachu.png
index 159e47e9..159e47e9 100644
--- a/pic/bmon/pikachu.png
+++ b/gfx/pokemon/front/pikachu.png
diff --git a/pic/bmon/pinsir.png b/gfx/pokemon/front/pinsir.png
index 320c79cb..320c79cb 100644
--- a/pic/bmon/pinsir.png
+++ b/gfx/pokemon/front/pinsir.png
diff --git a/pic/bmon/poliwag.png b/gfx/pokemon/front/poliwag.png
index 397d2e66..397d2e66 100644
--- a/pic/bmon/poliwag.png
+++ b/gfx/pokemon/front/poliwag.png
diff --git a/pic/bmon/poliwhirl.png b/gfx/pokemon/front/poliwhirl.png
index a7039145..a7039145 100644
--- a/pic/bmon/poliwhirl.png
+++ b/gfx/pokemon/front/poliwhirl.png
diff --git a/pic/bmon/poliwrath.png b/gfx/pokemon/front/poliwrath.png
index f31d0680..f31d0680 100644
--- a/pic/bmon/poliwrath.png
+++ b/gfx/pokemon/front/poliwrath.png
diff --git a/pic/bmon/ponyta.png b/gfx/pokemon/front/ponyta.png
index 4d8c1bee..4d8c1bee 100644
--- a/pic/bmon/ponyta.png
+++ b/gfx/pokemon/front/ponyta.png
diff --git a/pic/bmon/porygon.png b/gfx/pokemon/front/porygon.png
index ba3500c6..ba3500c6 100644
--- a/pic/bmon/porygon.png
+++ b/gfx/pokemon/front/porygon.png
diff --git a/pic/bmon/primeape.png b/gfx/pokemon/front/primeape.png
index 7c5a1a09..7c5a1a09 100644
--- a/pic/bmon/primeape.png
+++ b/gfx/pokemon/front/primeape.png
diff --git a/pic/bmon/psyduck.png b/gfx/pokemon/front/psyduck.png
index 86772256..86772256 100644
--- a/pic/bmon/psyduck.png
+++ b/gfx/pokemon/front/psyduck.png
diff --git a/pic/bmon/raichu.png b/gfx/pokemon/front/raichu.png
index a29731e5..a29731e5 100644
--- a/pic/bmon/raichu.png
+++ b/gfx/pokemon/front/raichu.png
diff --git a/pic/bmon/rapidash.png b/gfx/pokemon/front/rapidash.png
index 62d47506..62d47506 100644
--- a/pic/bmon/rapidash.png
+++ b/gfx/pokemon/front/rapidash.png
diff --git a/pic/bmon/raticate.png b/gfx/pokemon/front/raticate.png
index 64340846..64340846 100644
--- a/pic/bmon/raticate.png
+++ b/gfx/pokemon/front/raticate.png
diff --git a/pic/bmon/rattata.png b/gfx/pokemon/front/rattata.png
index 9b391cca..9b391cca 100644
--- a/pic/bmon/rattata.png
+++ b/gfx/pokemon/front/rattata.png
diff --git a/pic/bmon/rhydon.png b/gfx/pokemon/front/rhydon.png
index 92406476..92406476 100644
--- a/pic/bmon/rhydon.png
+++ b/gfx/pokemon/front/rhydon.png
diff --git a/pic/bmon/rhyhorn.png b/gfx/pokemon/front/rhyhorn.png
index 9452b701..9452b701 100644
--- a/pic/bmon/rhyhorn.png
+++ b/gfx/pokemon/front/rhyhorn.png
diff --git a/pic/bmon/sandshrew.png b/gfx/pokemon/front/sandshrew.png
index bcf52215..bcf52215 100644
--- a/pic/bmon/sandshrew.png
+++ b/gfx/pokemon/front/sandshrew.png
diff --git a/pic/bmon/sandslash.png b/gfx/pokemon/front/sandslash.png
index 3b212a60..3b212a60 100644
--- a/pic/bmon/sandslash.png
+++ b/gfx/pokemon/front/sandslash.png
diff --git a/pic/bmon/scyther.png b/gfx/pokemon/front/scyther.png
index 3fe6eeae..3fe6eeae 100644
--- a/pic/bmon/scyther.png
+++ b/gfx/pokemon/front/scyther.png
diff --git a/pic/bmon/seadra.png b/gfx/pokemon/front/seadra.png
index e8af292f..e8af292f 100644
--- a/pic/bmon/seadra.png
+++ b/gfx/pokemon/front/seadra.png
diff --git a/pic/bmon/seaking.png b/gfx/pokemon/front/seaking.png
index ebe70c7e..ebe70c7e 100644
--- a/pic/bmon/seaking.png
+++ b/gfx/pokemon/front/seaking.png
diff --git a/pic/bmon/seel.png b/gfx/pokemon/front/seel.png
index c4b2315a..c4b2315a 100644
--- a/pic/bmon/seel.png
+++ b/gfx/pokemon/front/seel.png
diff --git a/pic/bmon/shellder.png b/gfx/pokemon/front/shellder.png
index cf44a7fe..cf44a7fe 100644
--- a/pic/bmon/shellder.png
+++ b/gfx/pokemon/front/shellder.png
diff --git a/pic/bmon/slowbro.png b/gfx/pokemon/front/slowbro.png
index e61ad34b..e61ad34b 100644
--- a/pic/bmon/slowbro.png
+++ b/gfx/pokemon/front/slowbro.png
diff --git a/pic/bmon/slowpoke.png b/gfx/pokemon/front/slowpoke.png
index fdf701d7..fdf701d7 100644
--- a/pic/bmon/slowpoke.png
+++ b/gfx/pokemon/front/slowpoke.png
diff --git a/pic/bmon/snorlax.png b/gfx/pokemon/front/snorlax.png
index 5b571a18..5b571a18 100644
--- a/pic/bmon/snorlax.png
+++ b/gfx/pokemon/front/snorlax.png
diff --git a/pic/bmon/spearow.png b/gfx/pokemon/front/spearow.png
index 835800a5..835800a5 100644
--- a/pic/bmon/spearow.png
+++ b/gfx/pokemon/front/spearow.png
diff --git a/pic/bmon/squirtle.png b/gfx/pokemon/front/squirtle.png
index bc0c9979..bc0c9979 100644
--- a/pic/bmon/squirtle.png
+++ b/gfx/pokemon/front/squirtle.png
diff --git a/pic/bmon/starmie.png b/gfx/pokemon/front/starmie.png
index 24025ddf..24025ddf 100644
--- a/pic/bmon/starmie.png
+++ b/gfx/pokemon/front/starmie.png
diff --git a/pic/bmon/staryu.png b/gfx/pokemon/front/staryu.png
index 394732e9..394732e9 100644
--- a/pic/bmon/staryu.png
+++ b/gfx/pokemon/front/staryu.png
diff --git a/pic/bmon/tangela.png b/gfx/pokemon/front/tangela.png
index eff9c5a5..eff9c5a5 100644
--- a/pic/bmon/tangela.png
+++ b/gfx/pokemon/front/tangela.png
diff --git a/pic/bmon/tauros.png b/gfx/pokemon/front/tauros.png
index 3a4edfee..3a4edfee 100644
--- a/pic/bmon/tauros.png
+++ b/gfx/pokemon/front/tauros.png
diff --git a/pic/bmon/tentacool.png b/gfx/pokemon/front/tentacool.png
index 534e5496..534e5496 100644
--- a/pic/bmon/tentacool.png
+++ b/gfx/pokemon/front/tentacool.png
diff --git a/pic/bmon/tentacruel.png b/gfx/pokemon/front/tentacruel.png
index 7a26a305..7a26a305 100644
--- a/pic/bmon/tentacruel.png
+++ b/gfx/pokemon/front/tentacruel.png
diff --git a/pic/bmon/vaporeon.png b/gfx/pokemon/front/vaporeon.png
index 48dafce6..48dafce6 100644
--- a/pic/bmon/vaporeon.png
+++ b/gfx/pokemon/front/vaporeon.png
diff --git a/pic/bmon/venomoth.png b/gfx/pokemon/front/venomoth.png
index e28b1017..e28b1017 100644
--- a/pic/bmon/venomoth.png
+++ b/gfx/pokemon/front/venomoth.png
diff --git a/pic/bmon/venonat.png b/gfx/pokemon/front/venonat.png
index edf15889..edf15889 100644
--- a/pic/bmon/venonat.png
+++ b/gfx/pokemon/front/venonat.png
diff --git a/pic/bmon/venusaur.png b/gfx/pokemon/front/venusaur.png
index dd39184a..dd39184a 100644
--- a/pic/bmon/venusaur.png
+++ b/gfx/pokemon/front/venusaur.png
diff --git a/pic/bmon/victreebel.png b/gfx/pokemon/front/victreebel.png
index 29a471c8..29a471c8 100644
--- a/pic/bmon/victreebel.png
+++ b/gfx/pokemon/front/victreebel.png
diff --git a/pic/bmon/vileplume.png b/gfx/pokemon/front/vileplume.png
index e788425e..e788425e 100644
--- a/pic/bmon/vileplume.png
+++ b/gfx/pokemon/front/vileplume.png
diff --git a/pic/bmon/voltorb.png b/gfx/pokemon/front/voltorb.png
index 22d0c675..22d0c675 100644
--- a/pic/bmon/voltorb.png
+++ b/gfx/pokemon/front/voltorb.png
diff --git a/pic/bmon/vulpix.png b/gfx/pokemon/front/vulpix.png
index f4780ef2..f4780ef2 100644
--- a/pic/bmon/vulpix.png
+++ b/gfx/pokemon/front/vulpix.png
diff --git a/pic/bmon/wartortle.png b/gfx/pokemon/front/wartortle.png
index bd844562..bd844562 100644
--- a/pic/bmon/wartortle.png
+++ b/gfx/pokemon/front/wartortle.png
diff --git a/pic/bmon/weedle.png b/gfx/pokemon/front/weedle.png
index 445fe8f3..445fe8f3 100644
--- a/pic/bmon/weedle.png
+++ b/gfx/pokemon/front/weedle.png
diff --git a/pic/bmon/weepinbell.png b/gfx/pokemon/front/weepinbell.png
index 6ee57334..6ee57334 100644
--- a/pic/bmon/weepinbell.png
+++ b/gfx/pokemon/front/weepinbell.png
diff --git a/pic/bmon/weezing.png b/gfx/pokemon/front/weezing.png
index deb2a623..deb2a623 100644
--- a/pic/bmon/weezing.png
+++ b/gfx/pokemon/front/weezing.png
diff --git a/pic/bmon/wigglytuff.png b/gfx/pokemon/front/wigglytuff.png
index c7cd495b..c7cd495b 100644
--- a/pic/bmon/wigglytuff.png
+++ b/gfx/pokemon/front/wigglytuff.png
diff --git a/pic/bmon/zapdos.png b/gfx/pokemon/front/zapdos.png
index 0bd71f4e..0bd71f4e 100644
--- a/pic/bmon/zapdos.png
+++ b/gfx/pokemon/front/zapdos.png
diff --git a/pic/bmon/zubat.png b/gfx/pokemon/front/zubat.png
index 73078725..73078725 100644
--- a/pic/bmon/zubat.png
+++ b/gfx/pokemon/front/zubat.png
diff --git a/pic/rgmon/abra.png b/gfx/pokemon/front_rg/abra.png
index bc0cb24b..bc0cb24b 100644
--- a/pic/rgmon/abra.png
+++ b/gfx/pokemon/front_rg/abra.png
diff --git a/pic/rgmon/aerodactyl.png b/gfx/pokemon/front_rg/aerodactyl.png
index 89812b32..89812b32 100644
--- a/pic/rgmon/aerodactyl.png
+++ b/gfx/pokemon/front_rg/aerodactyl.png
diff --git a/pic/rgmon/alakazam.png b/gfx/pokemon/front_rg/alakazam.png
index 3a8b32d1..3a8b32d1 100644
--- a/pic/rgmon/alakazam.png
+++ b/gfx/pokemon/front_rg/alakazam.png
diff --git a/pic/rgmon/arbok.png b/gfx/pokemon/front_rg/arbok.png
index dab294f5..dab294f5 100644
--- a/pic/rgmon/arbok.png
+++ b/gfx/pokemon/front_rg/arbok.png
diff --git a/pic/rgmon/arcanine.png b/gfx/pokemon/front_rg/arcanine.png
index 0149138b..0149138b 100644
--- a/pic/rgmon/arcanine.png
+++ b/gfx/pokemon/front_rg/arcanine.png
diff --git a/pic/rgmon/articuno.png b/gfx/pokemon/front_rg/articuno.png
index 99b6385d..99b6385d 100644
--- a/pic/rgmon/articuno.png
+++ b/gfx/pokemon/front_rg/articuno.png
diff --git a/pic/rgmon/beedrill.png b/gfx/pokemon/front_rg/beedrill.png
index b6f31036..b6f31036 100644
--- a/pic/rgmon/beedrill.png
+++ b/gfx/pokemon/front_rg/beedrill.png
diff --git a/pic/rgmon/bellsprout.png b/gfx/pokemon/front_rg/bellsprout.png
index 380913d5..380913d5 100644
--- a/pic/rgmon/bellsprout.png
+++ b/gfx/pokemon/front_rg/bellsprout.png
diff --git a/pic/rgmon/blastoise.png b/gfx/pokemon/front_rg/blastoise.png
index 97bf497b..97bf497b 100644
--- a/pic/rgmon/blastoise.png
+++ b/gfx/pokemon/front_rg/blastoise.png
diff --git a/pic/rgmon/bulbasaur.png b/gfx/pokemon/front_rg/bulbasaur.png
index 1a4676a1..1a4676a1 100644
--- a/pic/rgmon/bulbasaur.png
+++ b/gfx/pokemon/front_rg/bulbasaur.png
diff --git a/pic/rgmon/butterfree.png b/gfx/pokemon/front_rg/butterfree.png
index 0b3044d4..0b3044d4 100644
--- a/pic/rgmon/butterfree.png
+++ b/gfx/pokemon/front_rg/butterfree.png
diff --git a/pic/rgmon/caterpie.png b/gfx/pokemon/front_rg/caterpie.png
index dca52b88..dca52b88 100644
--- a/pic/rgmon/caterpie.png
+++ b/gfx/pokemon/front_rg/caterpie.png
diff --git a/pic/rgmon/chansey.png b/gfx/pokemon/front_rg/chansey.png
index fa47540e..fa47540e 100644
--- a/pic/rgmon/chansey.png
+++ b/gfx/pokemon/front_rg/chansey.png
diff --git a/pic/rgmon/charizard.png b/gfx/pokemon/front_rg/charizard.png
index a8b87e05..a8b87e05 100644
--- a/pic/rgmon/charizard.png
+++ b/gfx/pokemon/front_rg/charizard.png
diff --git a/pic/rgmon/charmander.png b/gfx/pokemon/front_rg/charmander.png
index 153f9381..153f9381 100644
--- a/pic/rgmon/charmander.png
+++ b/gfx/pokemon/front_rg/charmander.png
diff --git a/pic/rgmon/charmeleon.png b/gfx/pokemon/front_rg/charmeleon.png
index f60d1294..f60d1294 100644
--- a/pic/rgmon/charmeleon.png
+++ b/gfx/pokemon/front_rg/charmeleon.png
diff --git a/pic/rgmon/clefable.png b/gfx/pokemon/front_rg/clefable.png
index 8ef6be5f..8ef6be5f 100644
--- a/pic/rgmon/clefable.png
+++ b/gfx/pokemon/front_rg/clefable.png
diff --git a/pic/rgmon/clefairy.png b/gfx/pokemon/front_rg/clefairy.png
index 632844d5..632844d5 100644
--- a/pic/rgmon/clefairy.png
+++ b/gfx/pokemon/front_rg/clefairy.png
diff --git a/pic/rgmon/cloyster.png b/gfx/pokemon/front_rg/cloyster.png
index b6e16485..b6e16485 100644
--- a/pic/rgmon/cloyster.png
+++ b/gfx/pokemon/front_rg/cloyster.png
diff --git a/pic/rgmon/cubone.png b/gfx/pokemon/front_rg/cubone.png
index 1312b7c7..1312b7c7 100644
--- a/pic/rgmon/cubone.png
+++ b/gfx/pokemon/front_rg/cubone.png
diff --git a/pic/rgmon/dewgong.png b/gfx/pokemon/front_rg/dewgong.png
index 823b7125..823b7125 100644
--- a/pic/rgmon/dewgong.png
+++ b/gfx/pokemon/front_rg/dewgong.png
diff --git a/pic/rgmon/diglett.png b/gfx/pokemon/front_rg/diglett.png
index 69b93a90..69b93a90 100644
--- a/pic/rgmon/diglett.png
+++ b/gfx/pokemon/front_rg/diglett.png
diff --git a/pic/rgmon/ditto.png b/gfx/pokemon/front_rg/ditto.png
index 1a38c474..1a38c474 100644
--- a/pic/rgmon/ditto.png
+++ b/gfx/pokemon/front_rg/ditto.png
diff --git a/pic/rgmon/dodrio.png b/gfx/pokemon/front_rg/dodrio.png
index c88fa388..c88fa388 100644
--- a/pic/rgmon/dodrio.png
+++ b/gfx/pokemon/front_rg/dodrio.png
diff --git a/pic/rgmon/doduo.png b/gfx/pokemon/front_rg/doduo.png
index c95aae73..c95aae73 100644
--- a/pic/rgmon/doduo.png
+++ b/gfx/pokemon/front_rg/doduo.png
diff --git a/pic/rgmon/dragonair.png b/gfx/pokemon/front_rg/dragonair.png
index fe097cfa..fe097cfa 100644
--- a/pic/rgmon/dragonair.png
+++ b/gfx/pokemon/front_rg/dragonair.png
diff --git a/pic/rgmon/dragonite.png b/gfx/pokemon/front_rg/dragonite.png
index 49474a4d..49474a4d 100644
--- a/pic/rgmon/dragonite.png
+++ b/gfx/pokemon/front_rg/dragonite.png
diff --git a/pic/rgmon/dratini.png b/gfx/pokemon/front_rg/dratini.png
index 9c7e454d..9c7e454d 100644
--- a/pic/rgmon/dratini.png
+++ b/gfx/pokemon/front_rg/dratini.png
diff --git a/pic/rgmon/drowzee.png b/gfx/pokemon/front_rg/drowzee.png
index b8cdf0db..b8cdf0db 100644
--- a/pic/rgmon/drowzee.png
+++ b/gfx/pokemon/front_rg/drowzee.png
diff --git a/pic/rgmon/dugtrio.png b/gfx/pokemon/front_rg/dugtrio.png
index 1619ab92..1619ab92 100644
--- a/pic/rgmon/dugtrio.png
+++ b/gfx/pokemon/front_rg/dugtrio.png
diff --git a/pic/rgmon/eevee.png b/gfx/pokemon/front_rg/eevee.png
index b8fcab5a..b8fcab5a 100644
--- a/pic/rgmon/eevee.png
+++ b/gfx/pokemon/front_rg/eevee.png
diff --git a/pic/rgmon/ekans.png b/gfx/pokemon/front_rg/ekans.png
index cd43c69c..cd43c69c 100644
--- a/pic/rgmon/ekans.png
+++ b/gfx/pokemon/front_rg/ekans.png
diff --git a/pic/rgmon/electabuzz.png b/gfx/pokemon/front_rg/electabuzz.png
index 24791e64..24791e64 100644
--- a/pic/rgmon/electabuzz.png
+++ b/gfx/pokemon/front_rg/electabuzz.png
diff --git a/pic/rgmon/electrode.png b/gfx/pokemon/front_rg/electrode.png
index ff812003..ff812003 100644
--- a/pic/rgmon/electrode.png
+++ b/gfx/pokemon/front_rg/electrode.png
diff --git a/pic/rgmon/exeggcute.png b/gfx/pokemon/front_rg/exeggcute.png
index 63b55927..63b55927 100644
--- a/pic/rgmon/exeggcute.png
+++ b/gfx/pokemon/front_rg/exeggcute.png
diff --git a/pic/rgmon/exeggutor.png b/gfx/pokemon/front_rg/exeggutor.png
index dc1f7287..dc1f7287 100644
--- a/pic/rgmon/exeggutor.png
+++ b/gfx/pokemon/front_rg/exeggutor.png
diff --git a/pic/rgmon/farfetchd.png b/gfx/pokemon/front_rg/farfetchd.png
index bd97b9e8..bd97b9e8 100644
--- a/pic/rgmon/farfetchd.png
+++ b/gfx/pokemon/front_rg/farfetchd.png
diff --git a/pic/rgmon/fearow.png b/gfx/pokemon/front_rg/fearow.png
index 93d7a847..93d7a847 100644
--- a/pic/rgmon/fearow.png
+++ b/gfx/pokemon/front_rg/fearow.png
diff --git a/pic/rgmon/flareon.png b/gfx/pokemon/front_rg/flareon.png
index 7a39866a..7a39866a 100644
--- a/pic/rgmon/flareon.png
+++ b/gfx/pokemon/front_rg/flareon.png
diff --git a/pic/rgmon/fossilaerodactyl.png b/gfx/pokemon/front_rg/fossilaerodactyl.png
index 27d5c3ac..27d5c3ac 100644
--- a/pic/rgmon/fossilaerodactyl.png
+++ b/gfx/pokemon/front_rg/fossilaerodactyl.png
diff --git a/pic/rgmon/fossilkabutops.png b/gfx/pokemon/front_rg/fossilkabutops.png
index d37edb02..d37edb02 100644
--- a/pic/rgmon/fossilkabutops.png
+++ b/gfx/pokemon/front_rg/fossilkabutops.png
diff --git a/pic/rgmon/gastly.png b/gfx/pokemon/front_rg/gastly.png
index a5c0f406..a5c0f406 100644
--- a/pic/rgmon/gastly.png
+++ b/gfx/pokemon/front_rg/gastly.png
diff --git a/pic/rgmon/gengar.png b/gfx/pokemon/front_rg/gengar.png
index cb31fecf..cb31fecf 100644
--- a/pic/rgmon/gengar.png
+++ b/gfx/pokemon/front_rg/gengar.png
diff --git a/pic/rgmon/geodude.png b/gfx/pokemon/front_rg/geodude.png
index 02b690e9..02b690e9 100644
--- a/pic/rgmon/geodude.png
+++ b/gfx/pokemon/front_rg/geodude.png
diff --git a/pic/rgmon/gloom.png b/gfx/pokemon/front_rg/gloom.png
index c2fd2aa7..c2fd2aa7 100644
--- a/pic/rgmon/gloom.png
+++ b/gfx/pokemon/front_rg/gloom.png
diff --git a/pic/rgmon/golbat.png b/gfx/pokemon/front_rg/golbat.png
index 1fb2a341..1fb2a341 100644
--- a/pic/rgmon/golbat.png
+++ b/gfx/pokemon/front_rg/golbat.png
diff --git a/pic/rgmon/goldeen.png b/gfx/pokemon/front_rg/goldeen.png
index bee7de2a..bee7de2a 100644
--- a/pic/rgmon/goldeen.png
+++ b/gfx/pokemon/front_rg/goldeen.png
diff --git a/pic/rgmon/golduck.png b/gfx/pokemon/front_rg/golduck.png
index a0827b54..a0827b54 100644
--- a/pic/rgmon/golduck.png
+++ b/gfx/pokemon/front_rg/golduck.png
diff --git a/pic/rgmon/golem.png b/gfx/pokemon/front_rg/golem.png
index 86ea3c68..86ea3c68 100644
--- a/pic/rgmon/golem.png
+++ b/gfx/pokemon/front_rg/golem.png
diff --git a/pic/rgmon/graveler.png b/gfx/pokemon/front_rg/graveler.png
index 5e876f0b..5e876f0b 100644
--- a/pic/rgmon/graveler.png
+++ b/gfx/pokemon/front_rg/graveler.png
diff --git a/pic/rgmon/grimer.png b/gfx/pokemon/front_rg/grimer.png
index cc6931fb..cc6931fb 100644
--- a/pic/rgmon/grimer.png
+++ b/gfx/pokemon/front_rg/grimer.png
diff --git a/pic/rgmon/growlithe.png b/gfx/pokemon/front_rg/growlithe.png
index 1aafd535..1aafd535 100644
--- a/pic/rgmon/growlithe.png
+++ b/gfx/pokemon/front_rg/growlithe.png
diff --git a/pic/rgmon/gyarados.png b/gfx/pokemon/front_rg/gyarados.png
index 4d25aabb..4d25aabb 100644
--- a/pic/rgmon/gyarados.png
+++ b/gfx/pokemon/front_rg/gyarados.png
diff --git a/pic/rgmon/haunter.png b/gfx/pokemon/front_rg/haunter.png
index 531c8a62..531c8a62 100644
--- a/pic/rgmon/haunter.png
+++ b/gfx/pokemon/front_rg/haunter.png
diff --git a/pic/rgmon/hitmonchan.png b/gfx/pokemon/front_rg/hitmonchan.png
index 1774dd18..1774dd18 100644
--- a/pic/rgmon/hitmonchan.png
+++ b/gfx/pokemon/front_rg/hitmonchan.png
diff --git a/pic/rgmon/hitmonlee.png b/gfx/pokemon/front_rg/hitmonlee.png
index 04ca9be3..04ca9be3 100644
--- a/pic/rgmon/hitmonlee.png
+++ b/gfx/pokemon/front_rg/hitmonlee.png
diff --git a/pic/rgmon/horsea.png b/gfx/pokemon/front_rg/horsea.png
index 0d11d78c..0d11d78c 100644
--- a/pic/rgmon/horsea.png
+++ b/gfx/pokemon/front_rg/horsea.png
diff --git a/pic/rgmon/hypno.png b/gfx/pokemon/front_rg/hypno.png
index f29559c2..f29559c2 100644
--- a/pic/rgmon/hypno.png
+++ b/gfx/pokemon/front_rg/hypno.png
diff --git a/pic/rgmon/ivysaur.png b/gfx/pokemon/front_rg/ivysaur.png
index 337bc27d..337bc27d 100644
--- a/pic/rgmon/ivysaur.png
+++ b/gfx/pokemon/front_rg/ivysaur.png
diff --git a/pic/rgmon/jigglypuff.png b/gfx/pokemon/front_rg/jigglypuff.png
index 607c429e..607c429e 100644
--- a/pic/rgmon/jigglypuff.png
+++ b/gfx/pokemon/front_rg/jigglypuff.png
diff --git a/pic/rgmon/jolteon.png b/gfx/pokemon/front_rg/jolteon.png
index fab34a30..fab34a30 100644
--- a/pic/rgmon/jolteon.png
+++ b/gfx/pokemon/front_rg/jolteon.png
diff --git a/pic/rgmon/jynx.png b/gfx/pokemon/front_rg/jynx.png
index 6966ce34..6966ce34 100644
--- a/pic/rgmon/jynx.png
+++ b/gfx/pokemon/front_rg/jynx.png
diff --git a/pic/rgmon/kabuto.png b/gfx/pokemon/front_rg/kabuto.png
index b8923ad7..b8923ad7 100644
--- a/pic/rgmon/kabuto.png
+++ b/gfx/pokemon/front_rg/kabuto.png
diff --git a/pic/rgmon/kabutops.png b/gfx/pokemon/front_rg/kabutops.png
index 0f33c4d0..0f33c4d0 100644
--- a/pic/rgmon/kabutops.png
+++ b/gfx/pokemon/front_rg/kabutops.png
diff --git a/pic/rgmon/kadabra.png b/gfx/pokemon/front_rg/kadabra.png
index 8b8abc1a..8b8abc1a 100644
--- a/pic/rgmon/kadabra.png
+++ b/gfx/pokemon/front_rg/kadabra.png
diff --git a/pic/rgmon/kakuna.png b/gfx/pokemon/front_rg/kakuna.png
index 0cc6eabf..0cc6eabf 100644
--- a/pic/rgmon/kakuna.png
+++ b/gfx/pokemon/front_rg/kakuna.png
diff --git a/pic/rgmon/kangaskhan.png b/gfx/pokemon/front_rg/kangaskhan.png
index c9d3361d..c9d3361d 100644
--- a/pic/rgmon/kangaskhan.png
+++ b/gfx/pokemon/front_rg/kangaskhan.png
diff --git a/pic/rgmon/kingler.png b/gfx/pokemon/front_rg/kingler.png
index c1302fbf..c1302fbf 100644
--- a/pic/rgmon/kingler.png
+++ b/gfx/pokemon/front_rg/kingler.png
diff --git a/pic/rgmon/koffing.png b/gfx/pokemon/front_rg/koffing.png
index e6dfee04..e6dfee04 100644
--- a/pic/rgmon/koffing.png
+++ b/gfx/pokemon/front_rg/koffing.png
diff --git a/pic/rgmon/krabby.png b/gfx/pokemon/front_rg/krabby.png
index 2740128f..2740128f 100644
--- a/pic/rgmon/krabby.png
+++ b/gfx/pokemon/front_rg/krabby.png
diff --git a/pic/rgmon/lapras.png b/gfx/pokemon/front_rg/lapras.png
index b696b8d9..b696b8d9 100644
--- a/pic/rgmon/lapras.png
+++ b/gfx/pokemon/front_rg/lapras.png
diff --git a/pic/rgmon/lickitung.png b/gfx/pokemon/front_rg/lickitung.png
index 3deb9b12..3deb9b12 100644
--- a/pic/rgmon/lickitung.png
+++ b/gfx/pokemon/front_rg/lickitung.png
diff --git a/pic/rgmon/machamp.png b/gfx/pokemon/front_rg/machamp.png
index a6f773a0..a6f773a0 100644
--- a/pic/rgmon/machamp.png
+++ b/gfx/pokemon/front_rg/machamp.png
diff --git a/pic/rgmon/machoke.png b/gfx/pokemon/front_rg/machoke.png
index ed637897..ed637897 100644
--- a/pic/rgmon/machoke.png
+++ b/gfx/pokemon/front_rg/machoke.png
diff --git a/pic/rgmon/machop.png b/gfx/pokemon/front_rg/machop.png
index a5e20532..a5e20532 100644
--- a/pic/rgmon/machop.png
+++ b/gfx/pokemon/front_rg/machop.png
diff --git a/pic/rgmon/magikarp.png b/gfx/pokemon/front_rg/magikarp.png
index 68bc4f8c..68bc4f8c 100644
--- a/pic/rgmon/magikarp.png
+++ b/gfx/pokemon/front_rg/magikarp.png
diff --git a/pic/rgmon/magmar.png b/gfx/pokemon/front_rg/magmar.png
index f12bd2f2..f12bd2f2 100644
--- a/pic/rgmon/magmar.png
+++ b/gfx/pokemon/front_rg/magmar.png
diff --git a/pic/rgmon/magnemite.png b/gfx/pokemon/front_rg/magnemite.png
index fc807398..fc807398 100644
--- a/pic/rgmon/magnemite.png
+++ b/gfx/pokemon/front_rg/magnemite.png
diff --git a/pic/rgmon/magneton.png b/gfx/pokemon/front_rg/magneton.png
index 51a3f12c..51a3f12c 100644
--- a/pic/rgmon/magneton.png
+++ b/gfx/pokemon/front_rg/magneton.png
diff --git a/pic/rgmon/mankey.png b/gfx/pokemon/front_rg/mankey.png
index 9ae43757..9ae43757 100644
--- a/pic/rgmon/mankey.png
+++ b/gfx/pokemon/front_rg/mankey.png
diff --git a/pic/rgmon/marowak.png b/gfx/pokemon/front_rg/marowak.png
index 8ac6c6ee..8ac6c6ee 100644
--- a/pic/rgmon/marowak.png
+++ b/gfx/pokemon/front_rg/marowak.png
diff --git a/pic/rgmon/meowth.png b/gfx/pokemon/front_rg/meowth.png
index d00a08db..d00a08db 100644
--- a/pic/rgmon/meowth.png
+++ b/gfx/pokemon/front_rg/meowth.png
diff --git a/pic/rgmon/metapod.png b/gfx/pokemon/front_rg/metapod.png
index 5d7514f4..5d7514f4 100644
--- a/pic/rgmon/metapod.png
+++ b/gfx/pokemon/front_rg/metapod.png
diff --git a/pic/rgmon/mew.png b/gfx/pokemon/front_rg/mew.png
index 0d9bef36..0d9bef36 100644
--- a/pic/rgmon/mew.png
+++ b/gfx/pokemon/front_rg/mew.png
diff --git a/pic/rgmon/mewtwo.png b/gfx/pokemon/front_rg/mewtwo.png
index b41409ca..b41409ca 100644
--- a/pic/rgmon/mewtwo.png
+++ b/gfx/pokemon/front_rg/mewtwo.png
diff --git a/pic/rgmon/moltres.png b/gfx/pokemon/front_rg/moltres.png
index 52259f4a..52259f4a 100644
--- a/pic/rgmon/moltres.png
+++ b/gfx/pokemon/front_rg/moltres.png
diff --git a/pic/rgmon/mr.mime.png b/gfx/pokemon/front_rg/mr.mime.png
index 6dca1791..6dca1791 100644
--- a/pic/rgmon/mr.mime.png
+++ b/gfx/pokemon/front_rg/mr.mime.png
diff --git a/pic/rgmon/muk.png b/gfx/pokemon/front_rg/muk.png
index 8816e939..8816e939 100644
--- a/pic/rgmon/muk.png
+++ b/gfx/pokemon/front_rg/muk.png
diff --git a/pic/rgmon/nidoking.png b/gfx/pokemon/front_rg/nidoking.png
index c181e60c..c181e60c 100644
--- a/pic/rgmon/nidoking.png
+++ b/gfx/pokemon/front_rg/nidoking.png
diff --git a/pic/rgmon/nidoqueen.png b/gfx/pokemon/front_rg/nidoqueen.png
index 86cba6d6..86cba6d6 100644
--- a/pic/rgmon/nidoqueen.png
+++ b/gfx/pokemon/front_rg/nidoqueen.png
diff --git a/pic/rgmon/nidoranf.png b/gfx/pokemon/front_rg/nidoranf.png
index 8d99c920..8d99c920 100644
--- a/pic/rgmon/nidoranf.png
+++ b/gfx/pokemon/front_rg/nidoranf.png
diff --git a/pic/rgmon/nidoranm.png b/gfx/pokemon/front_rg/nidoranm.png
index 9a93e864..9a93e864 100644
--- a/pic/rgmon/nidoranm.png
+++ b/gfx/pokemon/front_rg/nidoranm.png
diff --git a/pic/rgmon/nidorina.png b/gfx/pokemon/front_rg/nidorina.png
index a8d277b8..a8d277b8 100644
--- a/pic/rgmon/nidorina.png
+++ b/gfx/pokemon/front_rg/nidorina.png
diff --git a/pic/rgmon/nidorino.png b/gfx/pokemon/front_rg/nidorino.png
index 4d6c9e55..4d6c9e55 100644
--- a/pic/rgmon/nidorino.png
+++ b/gfx/pokemon/front_rg/nidorino.png
diff --git a/pic/rgmon/ninetales.png b/gfx/pokemon/front_rg/ninetales.png
index 128e8e53..128e8e53 100644
--- a/pic/rgmon/ninetales.png
+++ b/gfx/pokemon/front_rg/ninetales.png
diff --git a/pic/rgmon/oddish.png b/gfx/pokemon/front_rg/oddish.png
index 55aa2d09..55aa2d09 100644
--- a/pic/rgmon/oddish.png
+++ b/gfx/pokemon/front_rg/oddish.png
diff --git a/pic/rgmon/omanyte.png b/gfx/pokemon/front_rg/omanyte.png
index d042710e..d042710e 100644
--- a/pic/rgmon/omanyte.png
+++ b/gfx/pokemon/front_rg/omanyte.png
diff --git a/pic/rgmon/omastar.png b/gfx/pokemon/front_rg/omastar.png
index af84f55f..af84f55f 100644
--- a/pic/rgmon/omastar.png
+++ b/gfx/pokemon/front_rg/omastar.png
diff --git a/pic/rgmon/onix.png b/gfx/pokemon/front_rg/onix.png
index 3b731ece..3b731ece 100644
--- a/pic/rgmon/onix.png
+++ b/gfx/pokemon/front_rg/onix.png
diff --git a/pic/rgmon/paras.png b/gfx/pokemon/front_rg/paras.png
index b8ee6517..b8ee6517 100644
--- a/pic/rgmon/paras.png
+++ b/gfx/pokemon/front_rg/paras.png
diff --git a/pic/rgmon/parasect.png b/gfx/pokemon/front_rg/parasect.png
index 3d58b8e5..3d58b8e5 100644
--- a/pic/rgmon/parasect.png
+++ b/gfx/pokemon/front_rg/parasect.png
diff --git a/pic/rgmon/persian.png b/gfx/pokemon/front_rg/persian.png
index aed4d6dc..aed4d6dc 100644
--- a/pic/rgmon/persian.png
+++ b/gfx/pokemon/front_rg/persian.png
diff --git a/pic/rgmon/pidgeot.png b/gfx/pokemon/front_rg/pidgeot.png
index 4b4aa72f..4b4aa72f 100644
--- a/pic/rgmon/pidgeot.png
+++ b/gfx/pokemon/front_rg/pidgeot.png
diff --git a/pic/rgmon/pidgeotto.png b/gfx/pokemon/front_rg/pidgeotto.png
index 58a51f5d..58a51f5d 100644
--- a/pic/rgmon/pidgeotto.png
+++ b/gfx/pokemon/front_rg/pidgeotto.png
diff --git a/pic/rgmon/pidgey.png b/gfx/pokemon/front_rg/pidgey.png
index 7636fb67..7636fb67 100644
--- a/pic/rgmon/pidgey.png
+++ b/gfx/pokemon/front_rg/pidgey.png
diff --git a/pic/rgmon/pikachu.png b/gfx/pokemon/front_rg/pikachu.png
index 5a3eb782..5a3eb782 100644
--- a/pic/rgmon/pikachu.png
+++ b/gfx/pokemon/front_rg/pikachu.png
diff --git a/pic/rgmon/pinsir.png b/gfx/pokemon/front_rg/pinsir.png
index 2944c453..2944c453 100644
--- a/pic/rgmon/pinsir.png
+++ b/gfx/pokemon/front_rg/pinsir.png
diff --git a/pic/rgmon/poliwag.png b/gfx/pokemon/front_rg/poliwag.png
index a1ad26c8..a1ad26c8 100644
--- a/pic/rgmon/poliwag.png
+++ b/gfx/pokemon/front_rg/poliwag.png
diff --git a/pic/rgmon/poliwhirl.png b/gfx/pokemon/front_rg/poliwhirl.png
index d18311d6..d18311d6 100644
--- a/pic/rgmon/poliwhirl.png
+++ b/gfx/pokemon/front_rg/poliwhirl.png
diff --git a/pic/rgmon/poliwrath.png b/gfx/pokemon/front_rg/poliwrath.png
index 49f07b96..49f07b96 100644
--- a/pic/rgmon/poliwrath.png
+++ b/gfx/pokemon/front_rg/poliwrath.png
diff --git a/pic/rgmon/ponyta.png b/gfx/pokemon/front_rg/ponyta.png
index c3a67849..c3a67849 100644
--- a/pic/rgmon/ponyta.png
+++ b/gfx/pokemon/front_rg/ponyta.png
diff --git a/pic/rgmon/porygon.png b/gfx/pokemon/front_rg/porygon.png
index 1ed804ff..1ed804ff 100644
--- a/pic/rgmon/porygon.png
+++ b/gfx/pokemon/front_rg/porygon.png
diff --git a/pic/rgmon/primeape.png b/gfx/pokemon/front_rg/primeape.png
index 42c03f6d..42c03f6d 100644
--- a/pic/rgmon/primeape.png
+++ b/gfx/pokemon/front_rg/primeape.png
diff --git a/pic/rgmon/psyduck.png b/gfx/pokemon/front_rg/psyduck.png
index cd0a5e9e..cd0a5e9e 100644
--- a/pic/rgmon/psyduck.png
+++ b/gfx/pokemon/front_rg/psyduck.png
diff --git a/pic/rgmon/raichu.png b/gfx/pokemon/front_rg/raichu.png
index 961d2aeb..961d2aeb 100644
--- a/pic/rgmon/raichu.png
+++ b/gfx/pokemon/front_rg/raichu.png
diff --git a/pic/rgmon/rapidash.png b/gfx/pokemon/front_rg/rapidash.png
index d118b947..d118b947 100644
--- a/pic/rgmon/rapidash.png
+++ b/gfx/pokemon/front_rg/rapidash.png
diff --git a/pic/rgmon/raticate.png b/gfx/pokemon/front_rg/raticate.png
index 895c1006..895c1006 100644
--- a/pic/rgmon/raticate.png
+++ b/gfx/pokemon/front_rg/raticate.png
diff --git a/pic/rgmon/rattata.png b/gfx/pokemon/front_rg/rattata.png
index 8d114876..8d114876 100644
--- a/pic/rgmon/rattata.png
+++ b/gfx/pokemon/front_rg/rattata.png
diff --git a/pic/rgmon/rhydon.png b/gfx/pokemon/front_rg/rhydon.png
index 772e64d8..772e64d8 100644
--- a/pic/rgmon/rhydon.png
+++ b/gfx/pokemon/front_rg/rhydon.png
diff --git a/pic/rgmon/rhyhorn.png b/gfx/pokemon/front_rg/rhyhorn.png
index 1b968785..1b968785 100644
--- a/pic/rgmon/rhyhorn.png
+++ b/gfx/pokemon/front_rg/rhyhorn.png
diff --git a/pic/rgmon/sandshrew.png b/gfx/pokemon/front_rg/sandshrew.png
index e078d6d3..e078d6d3 100644
--- a/pic/rgmon/sandshrew.png
+++ b/gfx/pokemon/front_rg/sandshrew.png
diff --git a/pic/rgmon/sandslash.png b/gfx/pokemon/front_rg/sandslash.png
index 55320b96..55320b96 100644
--- a/pic/rgmon/sandslash.png
+++ b/gfx/pokemon/front_rg/sandslash.png
diff --git a/pic/rgmon/scyther.png b/gfx/pokemon/front_rg/scyther.png
index de4d89ed..de4d89ed 100644
--- a/pic/rgmon/scyther.png
+++ b/gfx/pokemon/front_rg/scyther.png
diff --git a/pic/rgmon/seadra.png b/gfx/pokemon/front_rg/seadra.png
index 17cdf4ea..17cdf4ea 100644
--- a/pic/rgmon/seadra.png
+++ b/gfx/pokemon/front_rg/seadra.png
diff --git a/pic/rgmon/seaking.png b/gfx/pokemon/front_rg/seaking.png
index 184f0556..184f0556 100644
--- a/pic/rgmon/seaking.png
+++ b/gfx/pokemon/front_rg/seaking.png
diff --git a/pic/rgmon/seel.png b/gfx/pokemon/front_rg/seel.png
index cb2f7f2e..cb2f7f2e 100644
--- a/pic/rgmon/seel.png
+++ b/gfx/pokemon/front_rg/seel.png
diff --git a/pic/rgmon/shellder.png b/gfx/pokemon/front_rg/shellder.png
index b7c41dd2..b7c41dd2 100644
--- a/pic/rgmon/shellder.png
+++ b/gfx/pokemon/front_rg/shellder.png
diff --git a/pic/rgmon/slowbro.png b/gfx/pokemon/front_rg/slowbro.png
index b67bbc08..b67bbc08 100644
--- a/pic/rgmon/slowbro.png
+++ b/gfx/pokemon/front_rg/slowbro.png
diff --git a/pic/rgmon/slowpoke.png b/gfx/pokemon/front_rg/slowpoke.png
index d59e9008..d59e9008 100644
--- a/pic/rgmon/slowpoke.png
+++ b/gfx/pokemon/front_rg/slowpoke.png
diff --git a/pic/rgmon/snorlax.png b/gfx/pokemon/front_rg/snorlax.png
index c249327d..c249327d 100644
--- a/pic/rgmon/snorlax.png
+++ b/gfx/pokemon/front_rg/snorlax.png
diff --git a/pic/rgmon/spearow.png b/gfx/pokemon/front_rg/spearow.png
index c1fce869..c1fce869 100644
--- a/pic/rgmon/spearow.png
+++ b/gfx/pokemon/front_rg/spearow.png
diff --git a/pic/rgmon/squirtle.png b/gfx/pokemon/front_rg/squirtle.png
index 3139cddc..3139cddc 100644
--- a/pic/rgmon/squirtle.png
+++ b/gfx/pokemon/front_rg/squirtle.png
diff --git a/pic/rgmon/starmie.png b/gfx/pokemon/front_rg/starmie.png
index 395fd857..395fd857 100644
--- a/pic/rgmon/starmie.png
+++ b/gfx/pokemon/front_rg/starmie.png
diff --git a/pic/rgmon/staryu.png b/gfx/pokemon/front_rg/staryu.png
index 740089e8..740089e8 100644
--- a/pic/rgmon/staryu.png
+++ b/gfx/pokemon/front_rg/staryu.png
diff --git a/pic/rgmon/tangela.png b/gfx/pokemon/front_rg/tangela.png
index a6f6327c..a6f6327c 100644
--- a/pic/rgmon/tangela.png
+++ b/gfx/pokemon/front_rg/tangela.png
diff --git a/pic/rgmon/tauros.png b/gfx/pokemon/front_rg/tauros.png
index ae57f111..ae57f111 100644
--- a/pic/rgmon/tauros.png
+++ b/gfx/pokemon/front_rg/tauros.png
diff --git a/pic/rgmon/tentacool.png b/gfx/pokemon/front_rg/tentacool.png
index 59a979c2..59a979c2 100644
--- a/pic/rgmon/tentacool.png
+++ b/gfx/pokemon/front_rg/tentacool.png
diff --git a/pic/rgmon/tentacruel.png b/gfx/pokemon/front_rg/tentacruel.png
index aaf4d426..aaf4d426 100644
--- a/pic/rgmon/tentacruel.png
+++ b/gfx/pokemon/front_rg/tentacruel.png
diff --git a/pic/rgmon/vaporeon.png b/gfx/pokemon/front_rg/vaporeon.png
index 72db05da..72db05da 100644
--- a/pic/rgmon/vaporeon.png
+++ b/gfx/pokemon/front_rg/vaporeon.png
diff --git a/pic/rgmon/venomoth.png b/gfx/pokemon/front_rg/venomoth.png
index e677255e..e677255e 100644
--- a/pic/rgmon/venomoth.png
+++ b/gfx/pokemon/front_rg/venomoth.png
diff --git a/pic/rgmon/venonat.png b/gfx/pokemon/front_rg/venonat.png
index cf2f4df1..cf2f4df1 100644
--- a/pic/rgmon/venonat.png
+++ b/gfx/pokemon/front_rg/venonat.png
diff --git a/pic/rgmon/venusaur.png b/gfx/pokemon/front_rg/venusaur.png
index f444a234..f444a234 100644
--- a/pic/rgmon/venusaur.png
+++ b/gfx/pokemon/front_rg/venusaur.png
diff --git a/pic/rgmon/victreebel.png b/gfx/pokemon/front_rg/victreebel.png
index 62193011..62193011 100644
--- a/pic/rgmon/victreebel.png
+++ b/gfx/pokemon/front_rg/victreebel.png
diff --git a/pic/rgmon/vileplume.png b/gfx/pokemon/front_rg/vileplume.png
index e39d50e0..e39d50e0 100644
--- a/pic/rgmon/vileplume.png
+++ b/gfx/pokemon/front_rg/vileplume.png
diff --git a/pic/rgmon/voltorb.png b/gfx/pokemon/front_rg/voltorb.png
index c2159e6c..c2159e6c 100644
--- a/pic/rgmon/voltorb.png
+++ b/gfx/pokemon/front_rg/voltorb.png
diff --git a/pic/rgmon/vulpix.png b/gfx/pokemon/front_rg/vulpix.png
index 8b8810ad..8b8810ad 100644
--- a/pic/rgmon/vulpix.png
+++ b/gfx/pokemon/front_rg/vulpix.png
diff --git a/pic/rgmon/wartortle.png b/gfx/pokemon/front_rg/wartortle.png
index 6e65bb7c..6e65bb7c 100644
--- a/pic/rgmon/wartortle.png
+++ b/gfx/pokemon/front_rg/wartortle.png
diff --git a/pic/rgmon/weedle.png b/gfx/pokemon/front_rg/weedle.png
index 3efbd49d..3efbd49d 100644
--- a/pic/rgmon/weedle.png
+++ b/gfx/pokemon/front_rg/weedle.png
diff --git a/pic/rgmon/weepinbell.png b/gfx/pokemon/front_rg/weepinbell.png
index 18b44783..18b44783 100644
--- a/pic/rgmon/weepinbell.png
+++ b/gfx/pokemon/front_rg/weepinbell.png
diff --git a/pic/rgmon/weezing.png b/gfx/pokemon/front_rg/weezing.png
index 5b30b4e0..5b30b4e0 100644
--- a/pic/rgmon/weezing.png
+++ b/gfx/pokemon/front_rg/weezing.png
diff --git a/pic/rgmon/wigglytuff.png b/gfx/pokemon/front_rg/wigglytuff.png
index e986affd..e986affd 100644
--- a/pic/rgmon/wigglytuff.png
+++ b/gfx/pokemon/front_rg/wigglytuff.png
diff --git a/pic/rgmon/zapdos.png b/gfx/pokemon/front_rg/zapdos.png
index 534ac4a9..534ac4a9 100644
--- a/pic/rgmon/zapdos.png
+++ b/gfx/pokemon/front_rg/zapdos.png
diff --git a/pic/rgmon/zubat.png b/gfx/pokemon/front_rg/zubat.png
index 14dc9118..14dc9118 100644
--- a/pic/rgmon/zubat.png
+++ b/gfx/pokemon/front_rg/zubat.png
diff --git a/pic/trainer/agatha.png b/gfx/trainers/agatha.png
index d95b77be..d95b77be 100644
--- a/pic/trainer/agatha.png
+++ b/gfx/trainers/agatha.png
diff --git a/pic/trainer/beauty.png b/gfx/trainers/beauty.png
index a7e53c13..a7e53c13 100644
--- a/pic/trainer/beauty.png
+++ b/gfx/trainers/beauty.png
diff --git a/pic/trainer/biker.png b/gfx/trainers/biker.png
index b64809f9..b64809f9 100644
--- a/pic/trainer/biker.png
+++ b/gfx/trainers/biker.png
diff --git a/pic/trainer/birdkeeper.png b/gfx/trainers/birdkeeper.png
index 6e06d839..6e06d839 100644
--- a/pic/trainer/birdkeeper.png
+++ b/gfx/trainers/birdkeeper.png
diff --git a/pic/trainer/blackbelt.png b/gfx/trainers/blackbelt.png
index 8ba5480f..8ba5480f 100644
--- a/pic/trainer/blackbelt.png
+++ b/gfx/trainers/blackbelt.png
diff --git a/pic/trainer/blaine.png b/gfx/trainers/blaine.png
index 0698b3b9..0698b3b9 100644
--- a/pic/trainer/blaine.png
+++ b/gfx/trainers/blaine.png
diff --git a/pic/trainer/brock.png b/gfx/trainers/brock.png
index fc8f2378..fc8f2378 100644
--- a/pic/trainer/brock.png
+++ b/gfx/trainers/brock.png
diff --git a/pic/trainer/bruno.png b/gfx/trainers/bruno.png
index 651b7c9c..651b7c9c 100644
--- a/pic/trainer/bruno.png
+++ b/gfx/trainers/bruno.png
diff --git a/pic/trainer/bugcatcher.png b/gfx/trainers/bugcatcher.png
index 0d108f40..0d108f40 100644
--- a/pic/trainer/bugcatcher.png
+++ b/gfx/trainers/bugcatcher.png
diff --git a/pic/trainer/burglar.png b/gfx/trainers/burglar.png
index d4af219b..d4af219b 100644
--- a/pic/trainer/burglar.png
+++ b/gfx/trainers/burglar.png
diff --git a/pic/trainer/channeler.png b/gfx/trainers/channeler.png
index 3fd174a5..3fd174a5 100644
--- a/pic/trainer/channeler.png
+++ b/gfx/trainers/channeler.png
diff --git a/pic/trainer/cooltrainerf.png b/gfx/trainers/cooltrainerf.png
index 0a90c5e5..0a90c5e5 100644
--- a/pic/trainer/cooltrainerf.png
+++ b/gfx/trainers/cooltrainerf.png
diff --git a/pic/trainer/cooltrainerm.png b/gfx/trainers/cooltrainerm.png
index 2482bc2b..2482bc2b 100644
--- a/pic/trainer/cooltrainerm.png
+++ b/gfx/trainers/cooltrainerm.png
diff --git a/pic/trainer/cueball.png b/gfx/trainers/cueball.png
index 6d3ae768..6d3ae768 100644
--- a/pic/trainer/cueball.png
+++ b/gfx/trainers/cueball.png
diff --git a/pic/trainer/engineer.png b/gfx/trainers/engineer.png
index dd0ab2c0..dd0ab2c0 100644
--- a/pic/trainer/engineer.png
+++ b/gfx/trainers/engineer.png
diff --git a/pic/trainer/erika.png b/gfx/trainers/erika.png
index 961d094b..961d094b 100644
--- a/pic/trainer/erika.png
+++ b/gfx/trainers/erika.png
diff --git a/pic/trainer/fisher.png b/gfx/trainers/fisher.png
index ccc9d705..ccc9d705 100644
--- a/pic/trainer/fisher.png
+++ b/gfx/trainers/fisher.png
diff --git a/pic/trainer/gambler.png b/gfx/trainers/gambler.png
index d3ec85b7..d3ec85b7 100644
--- a/pic/trainer/gambler.png
+++ b/gfx/trainers/gambler.png
diff --git a/pic/trainer/gentleman.png b/gfx/trainers/gentleman.png
index 62a2ffb7..62a2ffb7 100644
--- a/pic/trainer/gentleman.png
+++ b/gfx/trainers/gentleman.png
diff --git a/pic/trainer/giovanni.png b/gfx/trainers/giovanni.png
index 505adebd..505adebd 100644
--- a/pic/trainer/giovanni.png
+++ b/gfx/trainers/giovanni.png
diff --git a/pic/trainer/hiker.png b/gfx/trainers/hiker.png
index 5223a7d0..5223a7d0 100644
--- a/pic/trainer/hiker.png
+++ b/gfx/trainers/hiker.png
diff --git a/pic/trainer/jr.trainerf.png b/gfx/trainers/jr.trainerf.png
index 55ceef30..55ceef30 100644
--- a/pic/trainer/jr.trainerf.png
+++ b/gfx/trainers/jr.trainerf.png
diff --git a/pic/trainer/jr.trainerm.png b/gfx/trainers/jr.trainerm.png
index 48392bf5..48392bf5 100644
--- a/pic/trainer/jr.trainerm.png
+++ b/gfx/trainers/jr.trainerm.png
diff --git a/pic/trainer/juggler.png b/gfx/trainers/juggler.png
index 58dd61ee..58dd61ee 100644
--- a/pic/trainer/juggler.png
+++ b/gfx/trainers/juggler.png
diff --git a/pic/trainer/koga.png b/gfx/trainers/koga.png
index 6caa7da5..6caa7da5 100644
--- a/pic/trainer/koga.png
+++ b/gfx/trainers/koga.png
diff --git a/pic/trainer/lance.png b/gfx/trainers/lance.png
index d836b284..d836b284 100644
--- a/pic/trainer/lance.png
+++ b/gfx/trainers/lance.png
diff --git a/pic/trainer/lass.png b/gfx/trainers/lass.png
index 432f4090..432f4090 100644
--- a/pic/trainer/lass.png
+++ b/gfx/trainers/lass.png
diff --git a/pic/trainer/lorelei.png b/gfx/trainers/lorelei.png
index 608107bf..608107bf 100644
--- a/pic/trainer/lorelei.png
+++ b/gfx/trainers/lorelei.png
diff --git a/pic/trainer/lt.surge.png b/gfx/trainers/lt.surge.png
index 5a06a320..5a06a320 100644
--- a/pic/trainer/lt.surge.png
+++ b/gfx/trainers/lt.surge.png
diff --git a/pic/trainer/misty.png b/gfx/trainers/misty.png
index ea2e655a..ea2e655a 100644
--- a/pic/trainer/misty.png
+++ b/gfx/trainers/misty.png
diff --git a/pic/trainer/pokemaniac.png b/gfx/trainers/pokemaniac.png
index 954bbc43..954bbc43 100644
--- a/pic/trainer/pokemaniac.png
+++ b/gfx/trainers/pokemaniac.png
diff --git a/pic/trainer/prof.oak.png b/gfx/trainers/prof.oak.png
index 4334e1d0..4334e1d0 100644
--- a/pic/trainer/prof.oak.png
+++ b/gfx/trainers/prof.oak.png
diff --git a/pic/trainer/psychic.png b/gfx/trainers/psychic.png
index 58244d80..58244d80 100644
--- a/pic/trainer/psychic.png
+++ b/gfx/trainers/psychic.png
diff --git a/pic/trainer/rival1.png b/gfx/trainers/rival1.png
index 6b94fd27..6b94fd27 100644
--- a/pic/trainer/rival1.png
+++ b/gfx/trainers/rival1.png
diff --git a/pic/trainer/rival2.png b/gfx/trainers/rival2.png
index df9b2524..df9b2524 100644
--- a/pic/trainer/rival2.png
+++ b/gfx/trainers/rival2.png
diff --git a/pic/trainer/rival3.png b/gfx/trainers/rival3.png
index 5e6fc5ff..5e6fc5ff 100644
--- a/pic/trainer/rival3.png
+++ b/gfx/trainers/rival3.png
diff --git a/pic/trainer/rocker.png b/gfx/trainers/rocker.png
index 70ecf4e8..70ecf4e8 100644
--- a/pic/trainer/rocker.png
+++ b/gfx/trainers/rocker.png
diff --git a/pic/trainer/rocket.png b/gfx/trainers/rocket.png
index a5e73de3..a5e73de3 100644
--- a/pic/trainer/rocket.png
+++ b/gfx/trainers/rocket.png
diff --git a/pic/trainer/sabrina.png b/gfx/trainers/sabrina.png
index 391144fc..391144fc 100644
--- a/pic/trainer/sabrina.png
+++ b/gfx/trainers/sabrina.png
diff --git a/pic/trainer/sailor.png b/gfx/trainers/sailor.png
index b3b06e4c..b3b06e4c 100644
--- a/pic/trainer/sailor.png
+++ b/gfx/trainers/sailor.png
diff --git a/pic/trainer/scientist.png b/gfx/trainers/scientist.png
index eef66fe7..eef66fe7 100644
--- a/pic/trainer/scientist.png
+++ b/gfx/trainers/scientist.png
diff --git a/pic/trainer/supernerd.png b/gfx/trainers/supernerd.png
index 37ef663e..37ef663e 100644
--- a/pic/trainer/supernerd.png
+++ b/gfx/trainers/supernerd.png
diff --git a/pic/trainer/swimmer.png b/gfx/trainers/swimmer.png
index 06bae30c..06bae30c 100644
--- a/pic/trainer/swimmer.png
+++ b/gfx/trainers/swimmer.png
diff --git a/pic/trainer/tamer.png b/gfx/trainers/tamer.png
index 14fe7a53..14fe7a53 100644
--- a/pic/trainer/tamer.png
+++ b/gfx/trainers/tamer.png
diff --git a/pic/trainer/youngster.png b/gfx/trainers/youngster.png
index 51fa5e0f..51fa5e0f 100644
--- a/pic/trainer/youngster.png
+++ b/gfx/trainers/youngster.png
diff --git a/main.asm b/main.asm
index abe13d5b..126bf943 100755
--- a/main.asm
+++ b/main.asm
@@ -6,8 +6,8 @@ SECTION "bank1", ROMX
 INCLUDE "data/facing.asm"
 INCLUDE "engine/black_out.asm"
 
-MewPicFront:: INCBIN "pic/bmon/mew.pic"
-MewPicBack::  INCBIN "pic/monback/mewb.pic"
+MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"
+MewPicBack::  INCBIN "gfx/pokemon/back/mewb.pic"
 INCLUDE "data/baseStats/mew.asm"
 
 INCLUDE "engine/battle/safari_zone.asm"
@@ -109,9 +109,9 @@ INCLUDE "engine/overworld/is_player_just_outside_map.asm"
 INCLUDE "engine/menu/status_screen.asm"
 INCLUDE "engine/menu/party_menu.asm"
 
-RedPicFront:: INCBIN "pic/trainer/red.pic"
-ShrinkPic1::  INCBIN "pic/trainer/shrink1.pic"
-ShrinkPic2::  INCBIN "pic/trainer/shrink2.pic"
+RedPicFront:: INCBIN "gfx/player/red.pic"
+ShrinkPic1::  INCBIN "gfx/player/shrink1.pic"
+ShrinkPic2::  INCBIN "gfx/player/shrink2.pic"
 
 INCLUDE "engine/turn_sprite.asm"
 INCLUDE "engine/menu/start_sub_menus.asm"
diff --git a/pic/ymon/abra.png b/pic/ymon/abra.png
deleted file mode 100644
index 3573a040..00000000
--- a/pic/ymon/abra.png
+++ /dev/null
diff --git a/pic/ymon/aerodactyl.png b/pic/ymon/aerodactyl.png
deleted file mode 100644
index cf0212a0..00000000
--- a/pic/ymon/aerodactyl.png
+++ /dev/null
diff --git a/pic/ymon/alakazam.png b/pic/ymon/alakazam.png
deleted file mode 100644
index 613ae5ad..00000000
--- a/pic/ymon/alakazam.png
+++ /dev/null
diff --git a/pic/ymon/arbok.png b/pic/ymon/arbok.png
deleted file mode 100644
index 45df87b1..00000000
--- a/pic/ymon/arbok.png
+++ /dev/null
diff --git a/pic/ymon/arcanine.png b/pic/ymon/arcanine.png
deleted file mode 100644
index 77bb89b0..00000000
--- a/pic/ymon/arcanine.png
+++ /dev/null
diff --git a/pic/ymon/articuno.png b/pic/ymon/articuno.png
deleted file mode 100644
index e8ae875e..00000000
--- a/pic/ymon/articuno.png
+++ /dev/null
diff --git a/pic/ymon/beedrill.png b/pic/ymon/beedrill.png
deleted file mode 100644
index bc9ca73d..00000000
--- a/pic/ymon/beedrill.png
+++ /dev/null
diff --git a/pic/ymon/bellsprout.png b/pic/ymon/bellsprout.png
deleted file mode 100644
index f3d2ff1c..00000000
--- a/pic/ymon/bellsprout.png
+++ /dev/null
diff --git a/pic/ymon/blastoise.png b/pic/ymon/blastoise.png
deleted file mode 100644
index 6cdd8e30..00000000
--- a/pic/ymon/blastoise.png
+++ /dev/null
diff --git a/pic/ymon/bulbasaur.png b/pic/ymon/bulbasaur.png
deleted file mode 100644
index 27abe273..00000000
--- a/pic/ymon/bulbasaur.png
+++ /dev/null
diff --git a/pic/ymon/butterfree.png b/pic/ymon/butterfree.png
deleted file mode 100644
index 951ae4c4..00000000
--- a/pic/ymon/butterfree.png
+++ /dev/null
diff --git a/pic/ymon/caterpie.png b/pic/ymon/caterpie.png
deleted file mode 100644
index 8e3205c9..00000000
--- a/pic/ymon/caterpie.png
+++ /dev/null
diff --git a/pic/ymon/chansey.png b/pic/ymon/chansey.png
deleted file mode 100644
index d517535a..00000000
--- a/pic/ymon/chansey.png
+++ /dev/null
diff --git a/pic/ymon/charizard.png b/pic/ymon/charizard.png
deleted file mode 100644
index 100416d4..00000000
--- a/pic/ymon/charizard.png
+++ /dev/null
diff --git a/pic/ymon/charmander.png b/pic/ymon/charmander.png
deleted file mode 100644
index 155a68a4..00000000
--- a/pic/ymon/charmander.png
+++ /dev/null
diff --git a/pic/ymon/charmeleon.png b/pic/ymon/charmeleon.png
deleted file mode 100644
index 63808b25..00000000
--- a/pic/ymon/charmeleon.png
+++ /dev/null
diff --git a/pic/ymon/clefable.png b/pic/ymon/clefable.png
deleted file mode 100644
index 8e5111f9..00000000
--- a/pic/ymon/clefable.png
+++ /dev/null
diff --git a/pic/ymon/clefairy.png b/pic/ymon/clefairy.png
deleted file mode 100644
index 4a26be0b..00000000
--- a/pic/ymon/clefairy.png
+++ /dev/null
diff --git a/pic/ymon/cloyster.png b/pic/ymon/cloyster.png
deleted file mode 100644
index 67542d93..00000000
--- a/pic/ymon/cloyster.png
+++ /dev/null
diff --git a/pic/ymon/cubone.png b/pic/ymon/cubone.png
deleted file mode 100644
index c5dec329..00000000
--- a/pic/ymon/cubone.png
+++ /dev/null
diff --git a/pic/ymon/dewgong.png b/pic/ymon/dewgong.png
deleted file mode 100644
index c7bb5424..00000000
--- a/pic/ymon/dewgong.png
+++ /dev/null
diff --git a/pic/ymon/diglett.png b/pic/ymon/diglett.png
deleted file mode 100644
index a9becda8..00000000
--- a/pic/ymon/diglett.png
+++ /dev/null
diff --git a/pic/ymon/ditto.png b/pic/ymon/ditto.png
deleted file mode 100644
index 3c662491..00000000
--- a/pic/ymon/ditto.png
+++ /dev/null
diff --git a/pic/ymon/dodrio.png b/pic/ymon/dodrio.png
deleted file mode 100644
index 45606e63..00000000
--- a/pic/ymon/dodrio.png
+++ /dev/null
diff --git a/pic/ymon/doduo.png b/pic/ymon/doduo.png
deleted file mode 100644
index 0aa722c0..00000000
--- a/pic/ymon/doduo.png
+++ /dev/null
diff --git a/pic/ymon/dragonair.png b/pic/ymon/dragonair.png
deleted file mode 100644
index e7fc1448..00000000
--- a/pic/ymon/dragonair.png
+++ /dev/null
diff --git a/pic/ymon/dragonite.png b/pic/ymon/dragonite.png
deleted file mode 100644
index 7ac78924..00000000
--- a/pic/ymon/dragonite.png
+++ /dev/null
diff --git a/pic/ymon/dratini.png b/pic/ymon/dratini.png
deleted file mode 100644
index 5a1a880f..00000000
--- a/pic/ymon/dratini.png
+++ /dev/null
diff --git a/pic/ymon/drowzee.png b/pic/ymon/drowzee.png
deleted file mode 100644
index 16d3edfc..00000000
--- a/pic/ymon/drowzee.png
+++ /dev/null
diff --git a/pic/ymon/dugtrio.png b/pic/ymon/dugtrio.png
deleted file mode 100644
index c20d01b6..00000000
--- a/pic/ymon/dugtrio.png
+++ /dev/null
diff --git a/pic/ymon/eevee.png b/pic/ymon/eevee.png
deleted file mode 100644
index 7bc62ae9..00000000
--- a/pic/ymon/eevee.png
+++ /dev/null
diff --git a/pic/ymon/ekans.png b/pic/ymon/ekans.png
deleted file mode 100644
index 1d454a13..00000000
--- a/pic/ymon/ekans.png
+++ /dev/null
diff --git a/pic/ymon/electabuzz.png b/pic/ymon/electabuzz.png
deleted file mode 100644
index 77647d26..00000000
--- a/pic/ymon/electabuzz.png
+++ /dev/null
diff --git a/pic/ymon/electrode.png b/pic/ymon/electrode.png
deleted file mode 100755
index f5e05464..00000000
--- a/pic/ymon/electrode.png
+++ /dev/null
diff --git a/pic/ymon/exeggcute.png b/pic/ymon/exeggcute.png
deleted file mode 100644
index 901e2244..00000000
--- a/pic/ymon/exeggcute.png
+++ /dev/null
diff --git a/pic/ymon/exeggutor.png b/pic/ymon/exeggutor.png
deleted file mode 100644
index 3e8d37cb..00000000
--- a/pic/ymon/exeggutor.png
+++ /dev/null
diff --git a/pic/ymon/farfetchd.png b/pic/ymon/farfetchd.png
deleted file mode 100644
index 8412e767..00000000
--- a/pic/ymon/farfetchd.png
+++ /dev/null
diff --git a/pic/ymon/fearow.png b/pic/ymon/fearow.png
deleted file mode 100644
index 7b54a854..00000000
--- a/pic/ymon/fearow.png
+++ /dev/null
diff --git a/pic/ymon/flareon.png b/pic/ymon/flareon.png
deleted file mode 100644
index 5b0e5376..00000000
--- a/pic/ymon/flareon.png
+++ /dev/null
diff --git a/pic/ymon/gastly.png b/pic/ymon/gastly.png
deleted file mode 100644
index 9d236e5a..00000000
--- a/pic/ymon/gastly.png
+++ /dev/null
diff --git a/pic/ymon/gengar.png b/pic/ymon/gengar.png
deleted file mode 100644
index 1993bcfc..00000000
--- a/pic/ymon/gengar.png
+++ /dev/null
diff --git a/pic/ymon/geodude.png b/pic/ymon/geodude.png
deleted file mode 100644
index c28db680..00000000
--- a/pic/ymon/geodude.png
+++ /dev/null
diff --git a/pic/ymon/gloom.png b/pic/ymon/gloom.png
deleted file mode 100644
index 6071ea5d..00000000
--- a/pic/ymon/gloom.png
+++ /dev/null
diff --git a/pic/ymon/golbat.png b/pic/ymon/golbat.png
deleted file mode 100644
index 7d2b17da..00000000
--- a/pic/ymon/golbat.png
+++ /dev/null
diff --git a/pic/ymon/goldeen.png b/pic/ymon/goldeen.png
deleted file mode 100644
index c6bbeae5..00000000
--- a/pic/ymon/goldeen.png
+++ /dev/null
diff --git a/pic/ymon/golduck.png b/pic/ymon/golduck.png
deleted file mode 100644
index 299b6300..00000000
--- a/pic/ymon/golduck.png
+++ /dev/null
diff --git a/pic/ymon/golem.png b/pic/ymon/golem.png
deleted file mode 100644
index 7d317b7d..00000000
--- a/pic/ymon/golem.png
+++ /dev/null
diff --git a/pic/ymon/graveler.png b/pic/ymon/graveler.png
deleted file mode 100644
index 26d4b0a1..00000000
--- a/pic/ymon/graveler.png
+++ /dev/null
diff --git a/pic/ymon/grimer.png b/pic/ymon/grimer.png
deleted file mode 100644
index a72c9e45..00000000
--- a/pic/ymon/grimer.png
+++ /dev/null
diff --git a/pic/ymon/growlithe.png b/pic/ymon/growlithe.png
deleted file mode 100644
index e75173cf..00000000
--- a/pic/ymon/growlithe.png
+++ /dev/null
diff --git a/pic/ymon/gyarados.png b/pic/ymon/gyarados.png
deleted file mode 100644
index 387c2725..00000000
--- a/pic/ymon/gyarados.png
+++ /dev/null
diff --git a/pic/ymon/haunter.png b/pic/ymon/haunter.png
deleted file mode 100644
index d7f96e3d..00000000
--- a/pic/ymon/haunter.png
+++ /dev/null
diff --git a/pic/ymon/hitmonchan.png b/pic/ymon/hitmonchan.png
deleted file mode 100644
index 2fb7122b..00000000
--- a/pic/ymon/hitmonchan.png
+++ /dev/null
diff --git a/pic/ymon/hitmonlee.png b/pic/ymon/hitmonlee.png
deleted file mode 100644
index acbe68ff..00000000
--- a/pic/ymon/hitmonlee.png
+++ /dev/null
diff --git a/pic/ymon/horsea.png b/pic/ymon/horsea.png
deleted file mode 100644
index 390c419d..00000000
--- a/pic/ymon/horsea.png
+++ /dev/null
diff --git a/pic/ymon/hypno.png b/pic/ymon/hypno.png
deleted file mode 100644
index ed100f66..00000000
--- a/pic/ymon/hypno.png
+++ /dev/null
diff --git a/pic/ymon/ivysaur.png b/pic/ymon/ivysaur.png
deleted file mode 100644
index 4da5664b..00000000
--- a/pic/ymon/ivysaur.png
+++ /dev/null
diff --git a/pic/ymon/jigglypuff.png b/pic/ymon/jigglypuff.png
deleted file mode 100644
index d11ec165..00000000
--- a/pic/ymon/jigglypuff.png
+++ /dev/null
diff --git a/pic/ymon/jolteon.png b/pic/ymon/jolteon.png
deleted file mode 100644
index a1942ec6..00000000
--- a/pic/ymon/jolteon.png
+++ /dev/null
diff --git a/pic/ymon/jynx.png b/pic/ymon/jynx.png
deleted file mode 100644
index 699ab3f5..00000000
--- a/pic/ymon/jynx.png
+++ /dev/null
diff --git a/pic/ymon/kabuto.png b/pic/ymon/kabuto.png
deleted file mode 100644
index 58f27e0f..00000000
--- a/pic/ymon/kabuto.png
+++ /dev/null
diff --git a/pic/ymon/kabutops.png b/pic/ymon/kabutops.png
deleted file mode 100644
index e898ca12..00000000
--- a/pic/ymon/kabutops.png
+++ /dev/null
diff --git a/pic/ymon/kadabra.png b/pic/ymon/kadabra.png
deleted file mode 100644
index 58aff19a..00000000
--- a/pic/ymon/kadabra.png
+++ /dev/null
diff --git a/pic/ymon/kakuna.png b/pic/ymon/kakuna.png
deleted file mode 100644
index fb4ec863..00000000
--- a/pic/ymon/kakuna.png
+++ /dev/null
diff --git a/pic/ymon/kangaskhan.png b/pic/ymon/kangaskhan.png
deleted file mode 100644
index 56ab2619..00000000
--- a/pic/ymon/kangaskhan.png
+++ /dev/null
diff --git a/pic/ymon/kingler.png b/pic/ymon/kingler.png
deleted file mode 100644
index c7610d11..00000000
--- a/pic/ymon/kingler.png
+++ /dev/null
diff --git a/pic/ymon/koffing.png b/pic/ymon/koffing.png
deleted file mode 100644
index 9d394cdc..00000000
--- a/pic/ymon/koffing.png
+++ /dev/null
diff --git a/pic/ymon/krabby.png b/pic/ymon/krabby.png
deleted file mode 100644
index fe463732..00000000
--- a/pic/ymon/krabby.png
+++ /dev/null
diff --git a/pic/ymon/lapras.png b/pic/ymon/lapras.png
deleted file mode 100644
index ee954079..00000000
--- a/pic/ymon/lapras.png
+++ /dev/null
diff --git a/pic/ymon/lickitung.png b/pic/ymon/lickitung.png
deleted file mode 100644
index 3b480655..00000000
--- a/pic/ymon/lickitung.png
+++ /dev/null
diff --git a/pic/ymon/machamp.png b/pic/ymon/machamp.png
deleted file mode 100644
index f2bf5a0b..00000000
--- a/pic/ymon/machamp.png
+++ /dev/null
diff --git a/pic/ymon/machoke.png b/pic/ymon/machoke.png
deleted file mode 100644
index 7079a52b..00000000
--- a/pic/ymon/machoke.png
+++ /dev/null
diff --git a/pic/ymon/machop.png b/pic/ymon/machop.png
deleted file mode 100644
index cd6d6891..00000000
--- a/pic/ymon/machop.png
+++ /dev/null
diff --git a/pic/ymon/magikarp.png b/pic/ymon/magikarp.png
deleted file mode 100644
index 881aa50a..00000000
--- a/pic/ymon/magikarp.png
+++ /dev/null
diff --git a/pic/ymon/magmar.png b/pic/ymon/magmar.png
deleted file mode 100644
index 839fa204..00000000
--- a/pic/ymon/magmar.png
+++ /dev/null
diff --git a/pic/ymon/magnemite.png b/pic/ymon/magnemite.png
deleted file mode 100644
index 4cb5e3da..00000000
--- a/pic/ymon/magnemite.png
+++ /dev/null
diff --git a/pic/ymon/magneton.png b/pic/ymon/magneton.png
deleted file mode 100644
index 5d2a3eaa..00000000
--- a/pic/ymon/magneton.png
+++ /dev/null
diff --git a/pic/ymon/mankey.png b/pic/ymon/mankey.png
deleted file mode 100644
index f3266f29..00000000
--- a/pic/ymon/mankey.png
+++ /dev/null
diff --git a/pic/ymon/marowak.png b/pic/ymon/marowak.png
deleted file mode 100644
index d90e4627..00000000
--- a/pic/ymon/marowak.png
+++ /dev/null
diff --git a/pic/ymon/meowth.png b/pic/ymon/meowth.png
deleted file mode 100644
index de82b0c2..00000000
--- a/pic/ymon/meowth.png
+++ /dev/null
diff --git a/pic/ymon/metapod.png b/pic/ymon/metapod.png
deleted file mode 100644
index 6268ed9a..00000000
--- a/pic/ymon/metapod.png
+++ /dev/null
diff --git a/pic/ymon/mew.png b/pic/ymon/mew.png
deleted file mode 100644
index a00783a9..00000000
--- a/pic/ymon/mew.png
+++ /dev/null
diff --git a/pic/ymon/mewtwo.png b/pic/ymon/mewtwo.png
deleted file mode 100644
index 40c6f217..00000000
--- a/pic/ymon/mewtwo.png
+++ /dev/null
diff --git a/pic/ymon/moltres.png b/pic/ymon/moltres.png
deleted file mode 100644
index e5e3d02e..00000000
--- a/pic/ymon/moltres.png
+++ /dev/null
diff --git a/pic/ymon/mr.mime.png b/pic/ymon/mr.mime.png
deleted file mode 100644
index 5a3642d3..00000000
--- a/pic/ymon/mr.mime.png
+++ /dev/null
diff --git a/pic/ymon/muk.png b/pic/ymon/muk.png
deleted file mode 100644
index d7d98e37..00000000
--- a/pic/ymon/muk.png
+++ /dev/null
diff --git a/pic/ymon/nidoking.png b/pic/ymon/nidoking.png
deleted file mode 100644
index 785adc67..00000000
--- a/pic/ymon/nidoking.png
+++ /dev/null
diff --git a/pic/ymon/nidoqueen.png b/pic/ymon/nidoqueen.png
deleted file mode 100644
index 24f786c7..00000000
--- a/pic/ymon/nidoqueen.png
+++ /dev/null
diff --git a/pic/ymon/nidoranf.png b/pic/ymon/nidoranf.png
deleted file mode 100644
index 1f6532d2..00000000
--- a/pic/ymon/nidoranf.png
+++ /dev/null
diff --git a/pic/ymon/nidoranm.png b/pic/ymon/nidoranm.png
deleted file mode 100644
index bb960e01..00000000
--- a/pic/ymon/nidoranm.png
+++ /dev/null
diff --git a/pic/ymon/nidorina.png b/pic/ymon/nidorina.png
deleted file mode 100644
index 76edf719..00000000
--- a/pic/ymon/nidorina.png
+++ /dev/null
diff --git a/pic/ymon/nidorino.png b/pic/ymon/nidorino.png
deleted file mode 100644
index c68dbdd1..00000000
--- a/pic/ymon/nidorino.png
+++ /dev/null
diff --git a/pic/ymon/ninetales.png b/pic/ymon/ninetales.png
deleted file mode 100644
index f7ff9ff6..00000000
--- a/pic/ymon/ninetales.png
+++ /dev/null
diff --git a/pic/ymon/oddish.png b/pic/ymon/oddish.png
deleted file mode 100644
index 17281e3b..00000000
--- a/pic/ymon/oddish.png
+++ /dev/null
diff --git a/pic/ymon/omanyte.png b/pic/ymon/omanyte.png
deleted file mode 100644
index eafbd593..00000000
--- a/pic/ymon/omanyte.png
+++ /dev/null
diff --git a/pic/ymon/omastar.png b/pic/ymon/omastar.png
deleted file mode 100644
index 2eb40d37..00000000
--- a/pic/ymon/omastar.png
+++ /dev/null
diff --git a/pic/ymon/onix.png b/pic/ymon/onix.png
deleted file mode 100644
index 1e49634f..00000000
--- a/pic/ymon/onix.png
+++ /dev/null
diff --git a/pic/ymon/paras.png b/pic/ymon/paras.png
deleted file mode 100644
index 73c805c8..00000000
--- a/pic/ymon/paras.png
+++ /dev/null
diff --git a/pic/ymon/parasect.png b/pic/ymon/parasect.png
deleted file mode 100644
index def9e493..00000000
--- a/pic/ymon/parasect.png
+++ /dev/null
diff --git a/pic/ymon/persian.png b/pic/ymon/persian.png
deleted file mode 100644
index 831a9da8..00000000
--- a/pic/ymon/persian.png
+++ /dev/null
diff --git a/pic/ymon/pidgeot.png b/pic/ymon/pidgeot.png
deleted file mode 100644
index 4bb98422..00000000
--- a/pic/ymon/pidgeot.png
+++ /dev/null
diff --git a/pic/ymon/pidgeotto.png b/pic/ymon/pidgeotto.png
deleted file mode 100644
index 0490003c..00000000
--- a/pic/ymon/pidgeotto.png
+++ /dev/null
diff --git a/pic/ymon/pidgey.png b/pic/ymon/pidgey.png
deleted file mode 100644
index fe507e6d..00000000
--- a/pic/ymon/pidgey.png
+++ /dev/null
diff --git a/pic/ymon/pikachu.png b/pic/ymon/pikachu.png
deleted file mode 100644
index 4fc61c87..00000000
--- a/pic/ymon/pikachu.png
+++ /dev/null
diff --git a/pic/ymon/pinsir.png b/pic/ymon/pinsir.png
deleted file mode 100644
index 0f8d8639..00000000
--- a/pic/ymon/pinsir.png
+++ /dev/null
diff --git a/pic/ymon/poliwag.png b/pic/ymon/poliwag.png
deleted file mode 100644
index 1c19fd1c..00000000
--- a/pic/ymon/poliwag.png
+++ /dev/null
diff --git a/pic/ymon/poliwhirl.png b/pic/ymon/poliwhirl.png
deleted file mode 100644
index f56f75df..00000000
--- a/pic/ymon/poliwhirl.png
+++ /dev/null
diff --git a/pic/ymon/poliwrath.png b/pic/ymon/poliwrath.png
deleted file mode 100644
index 20fe9e6c..00000000
--- a/pic/ymon/poliwrath.png
+++ /dev/null
diff --git a/pic/ymon/ponyta.png b/pic/ymon/ponyta.png
deleted file mode 100644
index b4ec63b2..00000000
--- a/pic/ymon/ponyta.png
+++ /dev/null
diff --git a/pic/ymon/porygon.png b/pic/ymon/porygon.png
deleted file mode 100644
index f991dd6e..00000000
--- a/pic/ymon/porygon.png
+++ /dev/null
diff --git a/pic/ymon/primeape.png b/pic/ymon/primeape.png
deleted file mode 100644
index a14234f5..00000000
--- a/pic/ymon/primeape.png
+++ /dev/null
diff --git a/pic/ymon/psyduck.png b/pic/ymon/psyduck.png
deleted file mode 100644
index 75cd2f17..00000000
--- a/pic/ymon/psyduck.png
+++ /dev/null
diff --git a/pic/ymon/raichu.png b/pic/ymon/raichu.png
deleted file mode 100644
index 1ef39dc9..00000000
--- a/pic/ymon/raichu.png
+++ /dev/null
diff --git a/pic/ymon/rapidash.png b/pic/ymon/rapidash.png
deleted file mode 100644
index 804e7829..00000000
--- a/pic/ymon/rapidash.png
+++ /dev/null
diff --git a/pic/ymon/raticate.png b/pic/ymon/raticate.png
deleted file mode 100644
index 95018e0b..00000000
--- a/pic/ymon/raticate.png
+++ /dev/null
diff --git a/pic/ymon/rattata.png b/pic/ymon/rattata.png
deleted file mode 100644
index 423299bb..00000000
--- a/pic/ymon/rattata.png
+++ /dev/null
diff --git a/pic/ymon/rhydon.png b/pic/ymon/rhydon.png
deleted file mode 100644
index 6d75e4be..00000000
--- a/pic/ymon/rhydon.png
+++ /dev/null
diff --git a/pic/ymon/rhyhorn.png b/pic/ymon/rhyhorn.png
deleted file mode 100644
index dcf9dd6a..00000000
--- a/pic/ymon/rhyhorn.png
+++ /dev/null
diff --git a/pic/ymon/sandshrew.png b/pic/ymon/sandshrew.png
deleted file mode 100644
index 010908fd..00000000
--- a/pic/ymon/sandshrew.png
+++ /dev/null
diff --git a/pic/ymon/sandslash.png b/pic/ymon/sandslash.png
deleted file mode 100644
index d37a8de1..00000000
--- a/pic/ymon/sandslash.png
+++ /dev/null
diff --git a/pic/ymon/scyther.png b/pic/ymon/scyther.png
deleted file mode 100644
index 51663342..00000000
--- a/pic/ymon/scyther.png
+++ /dev/null
diff --git a/pic/ymon/seadra.png b/pic/ymon/seadra.png
deleted file mode 100644
index 150416dc..00000000
--- a/pic/ymon/seadra.png
+++ /dev/null
diff --git a/pic/ymon/seaking.png b/pic/ymon/seaking.png
deleted file mode 100644
index 75060461..00000000
--- a/pic/ymon/seaking.png
+++ /dev/null
diff --git a/pic/ymon/seel.png b/pic/ymon/seel.png
deleted file mode 100644
index ef3574b0..00000000
--- a/pic/ymon/seel.png
+++ /dev/null
diff --git a/pic/ymon/shellder.png b/pic/ymon/shellder.png
deleted file mode 100644
index d7ddfa48..00000000
--- a/pic/ymon/shellder.png
+++ /dev/null
diff --git a/pic/ymon/slowbro.png b/pic/ymon/slowbro.png
deleted file mode 100644
index e506c9ec..00000000
--- a/pic/ymon/slowbro.png
+++ /dev/null
diff --git a/pic/ymon/slowpoke.png b/pic/ymon/slowpoke.png
deleted file mode 100644
index 1328f4a0..00000000
--- a/pic/ymon/slowpoke.png
+++ /dev/null
diff --git a/pic/ymon/snorlax.png b/pic/ymon/snorlax.png
deleted file mode 100644
index 00c78d27..00000000
--- a/pic/ymon/snorlax.png
+++ /dev/null
diff --git a/pic/ymon/spearow.png b/pic/ymon/spearow.png
deleted file mode 100644
index d9349987..00000000
--- a/pic/ymon/spearow.png
+++ /dev/null
diff --git a/pic/ymon/squirtle.png b/pic/ymon/squirtle.png
deleted file mode 100644
index db7aa6c7..00000000
--- a/pic/ymon/squirtle.png
+++ /dev/null
diff --git a/pic/ymon/starmie.png b/pic/ymon/starmie.png
deleted file mode 100644
index 2ed93b4d..00000000
--- a/pic/ymon/starmie.png
+++ /dev/null
diff --git a/pic/ymon/staryu.png b/pic/ymon/staryu.png
deleted file mode 100644
index 320fb6a6..00000000
--- a/pic/ymon/staryu.png
+++ /dev/null
diff --git a/pic/ymon/tangela.png b/pic/ymon/tangela.png
deleted file mode 100644
index 43d04726..00000000
--- a/pic/ymon/tangela.png
+++ /dev/null
diff --git a/pic/ymon/tauros.png b/pic/ymon/tauros.png
deleted file mode 100644
index 8086fd13..00000000
--- a/pic/ymon/tauros.png
+++ /dev/null
diff --git a/pic/ymon/tentacool.png b/pic/ymon/tentacool.png
deleted file mode 100644
index 88d7fde3..00000000
--- a/pic/ymon/tentacool.png
+++ /dev/null
diff --git a/pic/ymon/tentacruel.png b/pic/ymon/tentacruel.png
deleted file mode 100644
index 47383372..00000000
--- a/pic/ymon/tentacruel.png
+++ /dev/null
diff --git a/pic/ymon/vaporeon.png b/pic/ymon/vaporeon.png
deleted file mode 100644
index 2c35af22..00000000
--- a/pic/ymon/vaporeon.png
+++ /dev/null
diff --git a/pic/ymon/venomoth.png b/pic/ymon/venomoth.png
deleted file mode 100644
index 9d801497..00000000
--- a/pic/ymon/venomoth.png
+++ /dev/null
diff --git a/pic/ymon/venonat.png b/pic/ymon/venonat.png
deleted file mode 100644
index 574ed26b..00000000
--- a/pic/ymon/venonat.png
+++ /dev/null
diff --git a/pic/ymon/venusaur.png b/pic/ymon/venusaur.png
deleted file mode 100644
index f6a964e3..00000000
--- a/pic/ymon/venusaur.png
+++ /dev/null
diff --git a/pic/ymon/victreebel.png b/pic/ymon/victreebel.png
deleted file mode 100644
index 115c45a3..00000000
--- a/pic/ymon/victreebel.png
+++ /dev/null
diff --git a/pic/ymon/vileplume.png b/pic/ymon/vileplume.png
deleted file mode 100644
index af4f0862..00000000
--- a/pic/ymon/vileplume.png
+++ /dev/null
diff --git a/pic/ymon/voltorb.png b/pic/ymon/voltorb.png
deleted file mode 100644
index 8b4bc64d..00000000
--- a/pic/ymon/voltorb.png
+++ /dev/null
diff --git a/pic/ymon/vulpix.png b/pic/ymon/vulpix.png
deleted file mode 100644
index cef8fbd8..00000000
--- a/pic/ymon/vulpix.png
+++ /dev/null
diff --git a/pic/ymon/wartortle.png b/pic/ymon/wartortle.png
deleted file mode 100644
index 961aaf4f..00000000
--- a/pic/ymon/wartortle.png
+++ /dev/null
diff --git a/pic/ymon/weedle.png b/pic/ymon/weedle.png
deleted file mode 100644
index 989b57b5..00000000
--- a/pic/ymon/weedle.png
+++ /dev/null
diff --git a/pic/ymon/weepinbell.png b/pic/ymon/weepinbell.png
deleted file mode 100644
index 8dd8fc34..00000000
--- a/pic/ymon/weepinbell.png
+++ /dev/null
diff --git a/pic/ymon/weezing.png b/pic/ymon/weezing.png
deleted file mode 100644
index 445556b3..00000000
--- a/pic/ymon/weezing.png
+++ /dev/null
diff --git a/pic/ymon/wigglytuff.png b/pic/ymon/wigglytuff.png
deleted file mode 100644
index c9ae89ad..00000000
--- a/pic/ymon/wigglytuff.png
+++ /dev/null
diff --git a/pic/ymon/zapdos.png b/pic/ymon/zapdos.png
deleted file mode 100644
index 47b63d6a..00000000
--- a/pic/ymon/zapdos.png
+++ /dev/null
diff --git a/pic/ymon/zubat.png b/pic/ymon/zubat.png
deleted file mode 100644
index 86ac4710..00000000
--- a/pic/ymon/zubat.png
+++ /dev/null
diff --git a/pic/ytrainer/brock.png b/pic/ytrainer/brock.png
deleted file mode 100644
index 8b33e8b9..00000000
--- a/pic/ytrainer/brock.png
+++ /dev/null
diff --git a/pic/ytrainer/erika.png b/pic/ytrainer/erika.png
deleted file mode 100644
index 446ed6aa..00000000
--- a/pic/ytrainer/erika.png
+++ /dev/null
diff --git a/pic/ytrainer/jessiejames.png b/pic/ytrainer/jessiejames.png
deleted file mode 100644
index 764e5af4..00000000
--- a/pic/ytrainer/jessiejames.png
+++ /dev/null
diff --git a/pic/ytrainer/misty.png b/pic/ytrainer/misty.png
deleted file mode 100644
index a7fdd6bc..00000000
--- a/pic/ytrainer/misty.png
+++ /dev/null
diff --git a/pic/ytrainer/prof.oakb.png b/pic/ytrainer/prof.oakb.png
deleted file mode 100644
index fb96bbf9..00000000
--- a/pic/ytrainer/prof.oakb.png
+++ /dev/null
diff --git a/pic/ytrainer/red.png b/pic/ytrainer/red.png
deleted file mode 100644
index dff68167..00000000
--- a/pic/ytrainer/red.png
+++ /dev/null
diff --git a/pic/ytrainer/rival1.png b/pic/ytrainer/rival1.png
deleted file mode 100644
index 4a0ba97c..00000000
--- a/pic/ytrainer/rival1.png
+++ /dev/null
diff --git a/pic/ytrainer/rival2.png b/pic/ytrainer/rival2.png
deleted file mode 100644
index e8718589..00000000
--- a/pic/ytrainer/rival2.png
+++ /dev/null
diff --git a/pic/ytrainer/rival3.png b/pic/ytrainer/rival3.png
deleted file mode 100644
index 08e22813..00000000
--- a/pic/ytrainer/rival3.png
+++ /dev/null
diff --git a/pics.asm b/pics.asm
index 93f68b35..0e2adc24 100644
--- a/pics.asm
+++ b/pics.asm
@@ -1,376 +1,376 @@
 SECTION "Pics 1", ROMX
 
-RhydonPicFront::      INCBIN "pic/bmon/rhydon.pic"
-RhydonPicBack::       INCBIN "pic/monback/rhydonb.pic"
-KangaskhanPicFront::  INCBIN "pic/bmon/kangaskhan.pic"
-KangaskhanPicBack::   INCBIN "pic/monback/kangaskhanb.pic"
-NidoranMPicFront::    INCBIN "pic/bmon/nidoranm.pic"
-NidoranMPicBack::     INCBIN "pic/monback/nidoranmb.pic"
-ClefairyPicFront::    INCBIN "pic/bmon/clefairy.pic"
-ClefairyPicBack::     INCBIN "pic/monback/clefairyb.pic"
-SpearowPicFront::     INCBIN "pic/bmon/spearow.pic"
-SpearowPicBack::      INCBIN "pic/monback/spearowb.pic"
-VoltorbPicFront::     INCBIN "pic/bmon/voltorb.pic"
-VoltorbPicBack::      INCBIN "pic/monback/voltorbb.pic"
-NidokingPicFront::    INCBIN "pic/bmon/nidoking.pic"
-NidokingPicBack::     INCBIN "pic/monback/nidokingb.pic"
-SlowbroPicFront::     INCBIN "pic/bmon/slowbro.pic"
-SlowbroPicBack::      INCBIN "pic/monback/slowbrob.pic"
-IvysaurPicFront::     INCBIN "pic/bmon/ivysaur.pic"
-IvysaurPicBack::      INCBIN "pic/monback/ivysaurb.pic"
-ExeggutorPicFront::   INCBIN "pic/bmon/exeggutor.pic"
-ExeggutorPicBack::    INCBIN "pic/monback/exeggutorb.pic"
-LickitungPicFront::   INCBIN "pic/bmon/lickitung.pic"
-LickitungPicBack::    INCBIN "pic/monback/lickitungb.pic"
-ExeggcutePicFront::   INCBIN "pic/bmon/exeggcute.pic"
-ExeggcutePicBack::    INCBIN "pic/monback/exeggcuteb.pic"
-GrimerPicFront::      INCBIN "pic/bmon/grimer.pic"
-GrimerPicBack::       INCBIN "pic/monback/grimerb.pic"
-GengarPicFront::      INCBIN "pic/bmon/gengar.pic"
-GengarPicBack::       INCBIN "pic/monback/gengarb.pic"
-NidoranFPicFront::    INCBIN "pic/bmon/nidoranf.pic"
-NidoranFPicBack::     INCBIN "pic/monback/nidoranfb.pic"
-NidoqueenPicFront::   INCBIN "pic/bmon/nidoqueen.pic"
-NidoqueenPicBack::    INCBIN "pic/monback/nidoqueenb.pic"
-CubonePicFront::      INCBIN "pic/bmon/cubone.pic"
-CubonePicBack::       INCBIN "pic/monback/cuboneb.pic"
-RhyhornPicFront::     INCBIN "pic/bmon/rhyhorn.pic"
-RhyhornPicBack::      INCBIN "pic/monback/rhyhornb.pic"
-LaprasPicFront::      INCBIN "pic/bmon/lapras.pic"
-LaprasPicBack::       INCBIN "pic/monback/laprasb.pic"
-ArcaninePicFront::    INCBIN "pic/bmon/arcanine.pic"
-ArcaninePicBack::     INCBIN "pic/monback/arcanineb.pic"
-GyaradosPicFront::    INCBIN "pic/bmon/gyarados.pic"
-GyaradosPicBack::     INCBIN "pic/monback/gyaradosb.pic"
-ShellderPicFront::    INCBIN "pic/bmon/shellder.pic"
-ShellderPicBack::     INCBIN "pic/monback/shellderb.pic"
-TentacoolPicFront::   INCBIN "pic/bmon/tentacool.pic"
-TentacoolPicBack::    INCBIN "pic/monback/tentacoolb.pic"
-GastlyPicFront::      INCBIN "pic/bmon/gastly.pic"
-GastlyPicBack::       INCBIN "pic/monback/gastlyb.pic"
-ScytherPicFront::     INCBIN "pic/bmon/scyther.pic"
-ScytherPicBack::      INCBIN "pic/monback/scytherb.pic"
-StaryuPicFront::      INCBIN "pic/bmon/staryu.pic"
-StaryuPicBack::       INCBIN "pic/monback/staryub.pic"
-BlastoisePicFront::   INCBIN "pic/bmon/blastoise.pic"
-BlastoisePicBack::    INCBIN "pic/monback/blastoiseb.pic"
-PinsirPicFront::      INCBIN "pic/bmon/pinsir.pic"
-PinsirPicBack::       INCBIN "pic/monback/pinsirb.pic"
-TangelaPicFront::     INCBIN "pic/bmon/tangela.pic"
-TangelaPicBack::      INCBIN "pic/monback/tangelab.pic"
+RhydonPicFront::      INCBIN "gfx/pokemon/front/rhydon.pic"
+RhydonPicBack::       INCBIN "gfx/pokemon/back/rhydonb.pic"
+KangaskhanPicFront::  INCBIN "gfx/pokemon/front/kangaskhan.pic"
+KangaskhanPicBack::   INCBIN "gfx/pokemon/back/kangaskhanb.pic"
+NidoranMPicFront::    INCBIN "gfx/pokemon/front/nidoranm.pic"
+NidoranMPicBack::     INCBIN "gfx/pokemon/back/nidoranmb.pic"
+ClefairyPicFront::    INCBIN "gfx/pokemon/front/clefairy.pic"
+ClefairyPicBack::     INCBIN "gfx/pokemon/back/clefairyb.pic"
+SpearowPicFront::     INCBIN "gfx/pokemon/front/spearow.pic"
+SpearowPicBack::      INCBIN "gfx/pokemon/back/spearowb.pic"
+VoltorbPicFront::     INCBIN "gfx/pokemon/front/voltorb.pic"
+VoltorbPicBack::      INCBIN "gfx/pokemon/back/voltorbb.pic"
+NidokingPicFront::    INCBIN "gfx/pokemon/front/nidoking.pic"
+NidokingPicBack::     INCBIN "gfx/pokemon/back/nidokingb.pic"
+SlowbroPicFront::     INCBIN "gfx/pokemon/front/slowbro.pic"
+SlowbroPicBack::      INCBIN "gfx/pokemon/back/slowbrob.pic"
+IvysaurPicFront::     INCBIN "gfx/pokemon/front/ivysaur.pic"
+IvysaurPicBack::      INCBIN "gfx/pokemon/back/ivysaurb.pic"
+ExeggutorPicFront::   INCBIN "gfx/pokemon/front/exeggutor.pic"
+ExeggutorPicBack::    INCBIN "gfx/pokemon/back/exeggutorb.pic"
+LickitungPicFront::   INCBIN "gfx/pokemon/front/lickitung.pic"
+LickitungPicBack::    INCBIN "gfx/pokemon/back/lickitungb.pic"
+ExeggcutePicFront::   INCBIN "gfx/pokemon/front/exeggcute.pic"
+ExeggcutePicBack::    INCBIN "gfx/pokemon/back/exeggcuteb.pic"
+GrimerPicFront::      INCBIN "gfx/pokemon/front/grimer.pic"
+GrimerPicBack::       INCBIN "gfx/pokemon/back/grimerb.pic"
+GengarPicFront::      INCBIN "gfx/pokemon/front/gengar.pic"
+GengarPicBack::       INCBIN "gfx/pokemon/back/gengarb.pic"
+NidoranFPicFront::    INCBIN "gfx/pokemon/front/nidoranf.pic"
+NidoranFPicBack::     INCBIN "gfx/pokemon/back/nidoranfb.pic"
+NidoqueenPicFront::   INCBIN "gfx/pokemon/front/nidoqueen.pic"
+NidoqueenPicBack::    INCBIN "gfx/pokemon/back/nidoqueenb.pic"
+CubonePicFront::      INCBIN "gfx/pokemon/front/cubone.pic"
+CubonePicBack::       INCBIN "gfx/pokemon/back/cuboneb.pic"
+RhyhornPicFront::     INCBIN "gfx/pokemon/front/rhyhorn.pic"
+RhyhornPicBack::      INCBIN "gfx/pokemon/back/rhyhornb.pic"
+LaprasPicFront::      INCBIN "gfx/pokemon/front/lapras.pic"
+LaprasPicBack::       INCBIN "gfx/pokemon/back/laprasb.pic"
+ArcaninePicFront::    INCBIN "gfx/pokemon/front/arcanine.pic"
+ArcaninePicBack::     INCBIN "gfx/pokemon/back/arcanineb.pic"
+GyaradosPicFront::    INCBIN "gfx/pokemon/front/gyarados.pic"
+GyaradosPicBack::     INCBIN "gfx/pokemon/back/gyaradosb.pic"
+ShellderPicFront::    INCBIN "gfx/pokemon/front/shellder.pic"
+ShellderPicBack::     INCBIN "gfx/pokemon/back/shellderb.pic"
+TentacoolPicFront::   INCBIN "gfx/pokemon/front/tentacool.pic"
+TentacoolPicBack::    INCBIN "gfx/pokemon/back/tentacoolb.pic"
+GastlyPicFront::      INCBIN "gfx/pokemon/front/gastly.pic"
+GastlyPicBack::       INCBIN "gfx/pokemon/back/gastlyb.pic"
+ScytherPicFront::     INCBIN "gfx/pokemon/front/scyther.pic"
+ScytherPicBack::      INCBIN "gfx/pokemon/back/scytherb.pic"
+StaryuPicFront::      INCBIN "gfx/pokemon/front/staryu.pic"
+StaryuPicBack::       INCBIN "gfx/pokemon/back/staryub.pic"
+BlastoisePicFront::   INCBIN "gfx/pokemon/front/blastoise.pic"
+BlastoisePicBack::    INCBIN "gfx/pokemon/back/blastoiseb.pic"
+PinsirPicFront::      INCBIN "gfx/pokemon/front/pinsir.pic"
+PinsirPicBack::       INCBIN "gfx/pokemon/back/pinsirb.pic"
+TangelaPicFront::     INCBIN "gfx/pokemon/front/tangela.pic"
+TangelaPicBack::      INCBIN "gfx/pokemon/back/tangelab.pic"
 
 
 SECTION "Pics 2", ROMX
 
-GrowlithePicFront::   INCBIN "pic/bmon/growlithe.pic"
-GrowlithePicBack::    INCBIN "pic/monback/growlitheb.pic"
-OnixPicFront::        INCBIN "pic/bmon/onix.pic"
-OnixPicBack::         INCBIN "pic/monback/onixb.pic"
-FearowPicFront::      INCBIN "pic/bmon/fearow.pic"
-FearowPicBack::       INCBIN "pic/monback/fearowb.pic"
-PidgeyPicFront::      INCBIN "pic/bmon/pidgey.pic"
-PidgeyPicBack::       INCBIN "pic/monback/pidgeyb.pic"
-SlowpokePicFront::    INCBIN "pic/bmon/slowpoke.pic"
-SlowpokePicBack::     INCBIN "pic/monback/slowpokeb.pic"
-KadabraPicFront::     INCBIN "pic/bmon/kadabra.pic"
-KadabraPicBack::      INCBIN "pic/monback/kadabrab.pic"
-GravelerPicFront::    INCBIN "pic/bmon/graveler.pic"
-GravelerPicBack::     INCBIN "pic/monback/gravelerb.pic"
-ChanseyPicFront::     INCBIN "pic/bmon/chansey.pic"
-ChanseyPicBack::      INCBIN "pic/monback/chanseyb.pic"
-MachokePicFront::     INCBIN "pic/bmon/machoke.pic"
-MachokePicBack::      INCBIN "pic/monback/machokeb.pic"
-MrMimePicFront::      INCBIN "pic/bmon/mr.mime.pic"
-MrMimePicBack::       INCBIN "pic/monback/mr.mimeb.pic"
-HitmonleePicFront::   INCBIN "pic/bmon/hitmonlee.pic"
-HitmonleePicBack::    INCBIN "pic/monback/hitmonleeb.pic"
-HitmonchanPicFront::  INCBIN "pic/bmon/hitmonchan.pic"
-HitmonchanPicBack::   INCBIN "pic/monback/hitmonchanb.pic"
-ArbokPicFront::       INCBIN "pic/bmon/arbok.pic"
-ArbokPicBack::        INCBIN "pic/monback/arbokb.pic"
-ParasectPicFront::    INCBIN "pic/bmon/parasect.pic"
-ParasectPicBack::     INCBIN "pic/monback/parasectb.pic"
-PsyduckPicFront::     INCBIN "pic/bmon/psyduck.pic"
-PsyduckPicBack::      INCBIN "pic/monback/psyduckb.pic"
-DrowzeePicFront::     INCBIN "pic/bmon/drowzee.pic"
-DrowzeePicBack::      INCBIN "pic/monback/drowzeeb.pic"
-GolemPicFront::       INCBIN "pic/bmon/golem.pic"
-GolemPicBack::        INCBIN "pic/monback/golemb.pic"
-MagmarPicFront::      INCBIN "pic/bmon/magmar.pic"
-MagmarPicBack::       INCBIN "pic/monback/magmarb.pic"
-ElectabuzzPicFront::  INCBIN "pic/bmon/electabuzz.pic"
-ElectabuzzPicBack::   INCBIN "pic/monback/electabuzzb.pic"
-MagnetonPicFront::    INCBIN "pic/bmon/magneton.pic"
-MagnetonPicBack::     INCBIN "pic/monback/magnetonb.pic"
-KoffingPicFront::     INCBIN "pic/bmon/koffing.pic"
-KoffingPicBack::      INCBIN "pic/monback/koffingb.pic"
-MankeyPicFront::      INCBIN "pic/bmon/mankey.pic"
-MankeyPicBack::       INCBIN "pic/monback/mankeyb.pic"
-SeelPicFront::        INCBIN "pic/bmon/seel.pic"
-SeelPicBack::         INCBIN "pic/monback/seelb.pic"
-DiglettPicFront::     INCBIN "pic/bmon/diglett.pic"
-DiglettPicBack::      INCBIN "pic/monback/diglettb.pic"
-TaurosPicFront::      INCBIN "pic/bmon/tauros.pic"
-TaurosPicBack::       INCBIN "pic/monback/taurosb.pic"
-FarfetchdPicFront::   INCBIN "pic/bmon/farfetchd.pic"
-FarfetchdPicBack::    INCBIN "pic/monback/farfetchdb.pic"
-VenonatPicFront::     INCBIN "pic/bmon/venonat.pic"
-VenonatPicBack::      INCBIN "pic/monback/venonatb.pic"
-DragonitePicFront::   INCBIN "pic/bmon/dragonite.pic"
-DragonitePicBack::    INCBIN "pic/monback/dragoniteb.pic"
-DoduoPicFront::       INCBIN "pic/bmon/doduo.pic"
-DoduoPicBack::        INCBIN "pic/monback/doduob.pic"
-PoliwagPicFront::     INCBIN "pic/bmon/poliwag.pic"
-PoliwagPicBack::      INCBIN "pic/monback/poliwagb.pic"
-JynxPicFront::        INCBIN "pic/bmon/jynx.pic"
-JynxPicBack::         INCBIN "pic/monback/jynxb.pic"
-MoltresPicFront::     INCBIN "pic/bmon/moltres.pic"
-MoltresPicBack::      INCBIN "pic/monback/moltresb.pic"
+GrowlithePicFront::   INCBIN "gfx/pokemon/front/growlithe.pic"
+GrowlithePicBack::    INCBIN "gfx/pokemon/back/growlitheb.pic"
+OnixPicFront::        INCBIN "gfx/pokemon/front/onix.pic"
+OnixPicBack::         INCBIN "gfx/pokemon/back/onixb.pic"
+FearowPicFront::      INCBIN "gfx/pokemon/front/fearow.pic"
+FearowPicBack::       INCBIN "gfx/pokemon/back/fearowb.pic"
+PidgeyPicFront::      INCBIN "gfx/pokemon/front/pidgey.pic"
+PidgeyPicBack::       INCBIN "gfx/pokemon/back/pidgeyb.pic"
+SlowpokePicFront::    INCBIN "gfx/pokemon/front/slowpoke.pic"
+SlowpokePicBack::     INCBIN "gfx/pokemon/back/slowpokeb.pic"
+KadabraPicFront::     INCBIN "gfx/pokemon/front/kadabra.pic"
+KadabraPicBack::      INCBIN "gfx/pokemon/back/kadabrab.pic"
+GravelerPicFront::    INCBIN "gfx/pokemon/front/graveler.pic"
+GravelerPicBack::     INCBIN "gfx/pokemon/back/gravelerb.pic"
+ChanseyPicFront::     INCBIN "gfx/pokemon/front/chansey.pic"
+ChanseyPicBack::      INCBIN "gfx/pokemon/back/chanseyb.pic"
+MachokePicFront::     INCBIN "gfx/pokemon/front/machoke.pic"
+MachokePicBack::      INCBIN "gfx/pokemon/back/machokeb.pic"
+MrMimePicFront::      INCBIN "gfx/pokemon/front/mr.mime.pic"
+MrMimePicBack::       INCBIN "gfx/pokemon/back/mr.mimeb.pic"
+HitmonleePicFront::   INCBIN "gfx/pokemon/front/hitmonlee.pic"
+HitmonleePicBack::    INCBIN "gfx/pokemon/back/hitmonleeb.pic"
+HitmonchanPicFront::  INCBIN "gfx/pokemon/front/hitmonchan.pic"
+HitmonchanPicBack::   INCBIN "gfx/pokemon/back/hitmonchanb.pic"
+ArbokPicFront::       INCBIN "gfx/pokemon/front/arbok.pic"
+ArbokPicBack::        INCBIN "gfx/pokemon/back/arbokb.pic"
+ParasectPicFront::    INCBIN "gfx/pokemon/front/parasect.pic"
+ParasectPicBack::     INCBIN "gfx/pokemon/back/parasectb.pic"
+PsyduckPicFront::     INCBIN "gfx/pokemon/front/psyduck.pic"
+PsyduckPicBack::      INCBIN "gfx/pokemon/back/psyduckb.pic"
+DrowzeePicFront::     INCBIN "gfx/pokemon/front/drowzee.pic"
+DrowzeePicBack::      INCBIN "gfx/pokemon/back/drowzeeb.pic"
+GolemPicFront::       INCBIN "gfx/pokemon/front/golem.pic"
+GolemPicBack::        INCBIN "gfx/pokemon/back/golemb.pic"
+MagmarPicFront::      INCBIN "gfx/pokemon/front/magmar.pic"
+MagmarPicBack::       INCBIN "gfx/pokemon/back/magmarb.pic"
+ElectabuzzPicFront::  INCBIN "gfx/pokemon/front/electabuzz.pic"
+ElectabuzzPicBack::   INCBIN "gfx/pokemon/back/electabuzzb.pic"
+MagnetonPicFront::    INCBIN "gfx/pokemon/front/magneton.pic"
+MagnetonPicBack::     INCBIN "gfx/pokemon/back/magnetonb.pic"
+KoffingPicFront::     INCBIN "gfx/pokemon/front/koffing.pic"
+KoffingPicBack::      INCBIN "gfx/pokemon/back/koffingb.pic"
+MankeyPicFront::      INCBIN "gfx/pokemon/front/mankey.pic"
+MankeyPicBack::       INCBIN "gfx/pokemon/back/mankeyb.pic"
+SeelPicFront::        INCBIN "gfx/pokemon/front/seel.pic"
+SeelPicBack::         INCBIN "gfx/pokemon/back/seelb.pic"
+DiglettPicFront::     INCBIN "gfx/pokemon/front/diglett.pic"
+DiglettPicBack::      INCBIN "gfx/pokemon/back/diglettb.pic"
+TaurosPicFront::      INCBIN "gfx/pokemon/front/tauros.pic"
+TaurosPicBack::       INCBIN "gfx/pokemon/back/taurosb.pic"
+FarfetchdPicFront::   INCBIN "gfx/pokemon/front/farfetchd.pic"
+FarfetchdPicBack::    INCBIN "gfx/pokemon/back/farfetchdb.pic"
+VenonatPicFront::     INCBIN "gfx/pokemon/front/venonat.pic"
+VenonatPicBack::      INCBIN "gfx/pokemon/back/venonatb.pic"
+DragonitePicFront::   INCBIN "gfx/pokemon/front/dragonite.pic"
+DragonitePicBack::    INCBIN "gfx/pokemon/back/dragoniteb.pic"
+DoduoPicFront::       INCBIN "gfx/pokemon/front/doduo.pic"
+DoduoPicBack::        INCBIN "gfx/pokemon/back/doduob.pic"
+PoliwagPicFront::     INCBIN "gfx/pokemon/front/poliwag.pic"
+PoliwagPicBack::      INCBIN "gfx/pokemon/back/poliwagb.pic"
+JynxPicFront::        INCBIN "gfx/pokemon/front/jynx.pic"
+JynxPicBack::         INCBIN "gfx/pokemon/back/jynxb.pic"
+MoltresPicFront::     INCBIN "gfx/pokemon/front/moltres.pic"
+MoltresPicBack::      INCBIN "gfx/pokemon/back/moltresb.pic"
 
 
 SECTION "Pics 3", ROMX
 
-ArticunoPicFront::    INCBIN "pic/bmon/articuno.pic"
-ArticunoPicBack::     INCBIN "pic/monback/articunob.pic"
-ZapdosPicFront::      INCBIN "pic/bmon/zapdos.pic"
-ZapdosPicBack::       INCBIN "pic/monback/zapdosb.pic"
-DittoPicFront::       INCBIN "pic/bmon/ditto.pic"
-DittoPicBack::        INCBIN "pic/monback/dittob.pic"
-MeowthPicFront::      INCBIN "pic/bmon/meowth.pic"
-MeowthPicBack::       INCBIN "pic/monback/meowthb.pic"
-KrabbyPicFront::      INCBIN "pic/bmon/krabby.pic"
-KrabbyPicBack::       INCBIN "pic/monback/krabbyb.pic"
-VulpixPicFront::      INCBIN "pic/bmon/vulpix.pic"
-VulpixPicBack::       INCBIN "pic/monback/vulpixb.pic"
-NinetalesPicFront::   INCBIN "pic/bmon/ninetales.pic"
-NinetalesPicBack::    INCBIN "pic/monback/ninetalesb.pic"
-PikachuPicFront::     INCBIN "pic/bmon/pikachu.pic"
-PikachuPicBack::      INCBIN "pic/monback/pikachub.pic"
-RaichuPicFront::      INCBIN "pic/bmon/raichu.pic"
-RaichuPicBack::       INCBIN "pic/monback/raichub.pic"
-DratiniPicFront::     INCBIN "pic/bmon/dratini.pic"
-DratiniPicBack::      INCBIN "pic/monback/dratinib.pic"
-DragonairPicFront::   INCBIN "pic/bmon/dragonair.pic"
-DragonairPicBack::    INCBIN "pic/monback/dragonairb.pic"
-KabutoPicFront::      INCBIN "pic/bmon/kabuto.pic"
-KabutoPicBack::       INCBIN "pic/monback/kabutob.pic"
-KabutopsPicFront::    INCBIN "pic/bmon/kabutops.pic"
-KabutopsPicBack::     INCBIN "pic/monback/kabutopsb.pic"
-HorseaPicFront::      INCBIN "pic/bmon/horsea.pic"
-HorseaPicBack::       INCBIN "pic/monback/horseab.pic"
-SeadraPicFront::      INCBIN "pic/bmon/seadra.pic"
-SeadraPicBack::       INCBIN "pic/monback/seadrab.pic"
-SandshrewPicFront::   INCBIN "pic/bmon/sandshrew.pic"
-SandshrewPicBack::    INCBIN "pic/monback/sandshrewb.pic"
-SandslashPicFront::   INCBIN "pic/bmon/sandslash.pic"
-SandslashPicBack::    INCBIN "pic/monback/sandslashb.pic"
-OmanytePicFront::     INCBIN "pic/bmon/omanyte.pic"
-OmanytePicBack::      INCBIN "pic/monback/omanyteb.pic"
-OmastarPicFront::     INCBIN "pic/bmon/omastar.pic"
-OmastarPicBack::      INCBIN "pic/monback/omastarb.pic"
-JigglypuffPicFront::  INCBIN "pic/bmon/jigglypuff.pic"
-JigglypuffPicBack::   INCBIN "pic/monback/jigglypuffb.pic"
-WigglytuffPicFront::  INCBIN "pic/bmon/wigglytuff.pic"
-WigglytuffPicBack::   INCBIN "pic/monback/wigglytuffb.pic"
-EeveePicFront::       INCBIN "pic/bmon/eevee.pic"
-EeveePicBack::        INCBIN "pic/monback/eeveeb.pic"
-FlareonPicFront::     INCBIN "pic/bmon/flareon.pic"
-FlareonPicBack::      INCBIN "pic/monback/flareonb.pic"
-JolteonPicFront::     INCBIN "pic/bmon/jolteon.pic"
-JolteonPicBack::      INCBIN "pic/monback/jolteonb.pic"
-VaporeonPicFront::    INCBIN "pic/bmon/vaporeon.pic"
-VaporeonPicBack::     INCBIN "pic/monback/vaporeonb.pic"
-MachopPicFront::      INCBIN "pic/bmon/machop.pic"
-MachopPicBack::       INCBIN "pic/monback/machopb.pic"
-ZubatPicFront::       INCBIN "pic/bmon/zubat.pic"
-ZubatPicBack::        INCBIN "pic/monback/zubatb.pic"
-EkansPicFront::       INCBIN "pic/bmon/ekans.pic"
-EkansPicBack::        INCBIN "pic/monback/ekansb.pic"
-ParasPicFront::       INCBIN "pic/bmon/paras.pic"
-ParasPicBack::        INCBIN "pic/monback/parasb.pic"
-PoliwhirlPicFront::   INCBIN "pic/bmon/poliwhirl.pic"
-PoliwhirlPicBack::    INCBIN "pic/monback/poliwhirlb.pic"
-PoliwrathPicFront::   INCBIN "pic/bmon/poliwrath.pic"
-PoliwrathPicBack::    INCBIN "pic/monback/poliwrathb.pic"
-WeedlePicFront::      INCBIN "pic/bmon/weedle.pic"
-WeedlePicBack::       INCBIN "pic/monback/weedleb.pic"
-KakunaPicFront::      INCBIN "pic/bmon/kakuna.pic"
-KakunaPicBack::       INCBIN "pic/monback/kakunab.pic"
-BeedrillPicFront::    INCBIN "pic/bmon/beedrill.pic"
-BeedrillPicBack::     INCBIN "pic/monback/beedrillb.pic"
+ArticunoPicFront::    INCBIN "gfx/pokemon/front/articuno.pic"
+ArticunoPicBack::     INCBIN "gfx/pokemon/back/articunob.pic"
+ZapdosPicFront::      INCBIN "gfx/pokemon/front/zapdos.pic"
+ZapdosPicBack::       INCBIN "gfx/pokemon/back/zapdosb.pic"
+DittoPicFront::       INCBIN "gfx/pokemon/front/ditto.pic"
+DittoPicBack::        INCBIN "gfx/pokemon/back/dittob.pic"
+MeowthPicFront::      INCBIN "gfx/pokemon/front/meowth.pic"
+MeowthPicBack::       INCBIN "gfx/pokemon/back/meowthb.pic"
+KrabbyPicFront::      INCBIN "gfx/pokemon/front/krabby.pic"
+KrabbyPicBack::       INCBIN "gfx/pokemon/back/krabbyb.pic"
+VulpixPicFront::      INCBIN "gfx/pokemon/front/vulpix.pic"
+VulpixPicBack::       INCBIN "gfx/pokemon/back/vulpixb.pic"
+NinetalesPicFront::   INCBIN "gfx/pokemon/front/ninetales.pic"
+NinetalesPicBack::    INCBIN "gfx/pokemon/back/ninetalesb.pic"
+PikachuPicFront::     INCBIN "gfx/pokemon/front/pikachu.pic"
+PikachuPicBack::      INCBIN "gfx/pokemon/back/pikachub.pic"
+RaichuPicFront::      INCBIN "gfx/pokemon/front/raichu.pic"
+RaichuPicBack::       INCBIN "gfx/pokemon/back/raichub.pic"
+DratiniPicFront::     INCBIN "gfx/pokemon/front/dratini.pic"
+DratiniPicBack::      INCBIN "gfx/pokemon/back/dratinib.pic"
+DragonairPicFront::   INCBIN "gfx/pokemon/front/dragonair.pic"
+DragonairPicBack::    INCBIN "gfx/pokemon/back/dragonairb.pic"
+KabutoPicFront::      INCBIN "gfx/pokemon/front/kabuto.pic"
+KabutoPicBack::       INCBIN "gfx/pokemon/back/kabutob.pic"
+KabutopsPicFront::    INCBIN "gfx/pokemon/front/kabutops.pic"
+KabutopsPicBack::     INCBIN "gfx/pokemon/back/kabutopsb.pic"
+HorseaPicFront::      INCBIN "gfx/pokemon/front/horsea.pic"
+HorseaPicBack::       INCBIN "gfx/pokemon/back/horseab.pic"
+SeadraPicFront::      INCBIN "gfx/pokemon/front/seadra.pic"
+SeadraPicBack::       INCBIN "gfx/pokemon/back/seadrab.pic"
+SandshrewPicFront::   INCBIN "gfx/pokemon/front/sandshrew.pic"
+SandshrewPicBack::    INCBIN "gfx/pokemon/back/sandshrewb.pic"
+SandslashPicFront::   INCBIN "gfx/pokemon/front/sandslash.pic"
+SandslashPicBack::    INCBIN "gfx/pokemon/back/sandslashb.pic"
+OmanytePicFront::     INCBIN "gfx/pokemon/front/omanyte.pic"
+OmanytePicBack::      INCBIN "gfx/pokemon/back/omanyteb.pic"
+OmastarPicFront::     INCBIN "gfx/pokemon/front/omastar.pic"
+OmastarPicBack::      INCBIN "gfx/pokemon/back/omastarb.pic"
+JigglypuffPicFront::  INCBIN "gfx/pokemon/front/jigglypuff.pic"
+JigglypuffPicBack::   INCBIN "gfx/pokemon/back/jigglypuffb.pic"
+WigglytuffPicFront::  INCBIN "gfx/pokemon/front/wigglytuff.pic"
+WigglytuffPicBack::   INCBIN "gfx/pokemon/back/wigglytuffb.pic"
+EeveePicFront::       INCBIN "gfx/pokemon/front/eevee.pic"
+EeveePicBack::        INCBIN "gfx/pokemon/back/eeveeb.pic"
+FlareonPicFront::     INCBIN "gfx/pokemon/front/flareon.pic"
+FlareonPicBack::      INCBIN "gfx/pokemon/back/flareonb.pic"
+JolteonPicFront::     INCBIN "gfx/pokemon/front/jolteon.pic"
+JolteonPicBack::      INCBIN "gfx/pokemon/back/jolteonb.pic"
+VaporeonPicFront::    INCBIN "gfx/pokemon/front/vaporeon.pic"
+VaporeonPicBack::     INCBIN "gfx/pokemon/back/vaporeonb.pic"
+MachopPicFront::      INCBIN "gfx/pokemon/front/machop.pic"
+MachopPicBack::       INCBIN "gfx/pokemon/back/machopb.pic"
+ZubatPicFront::       INCBIN "gfx/pokemon/front/zubat.pic"
+ZubatPicBack::        INCBIN "gfx/pokemon/back/zubatb.pic"
+EkansPicFront::       INCBIN "gfx/pokemon/front/ekans.pic"
+EkansPicBack::        INCBIN "gfx/pokemon/back/ekansb.pic"
+ParasPicFront::       INCBIN "gfx/pokemon/front/paras.pic"
+ParasPicBack::        INCBIN "gfx/pokemon/back/parasb.pic"
+PoliwhirlPicFront::   INCBIN "gfx/pokemon/front/poliwhirl.pic"
+PoliwhirlPicBack::    INCBIN "gfx/pokemon/back/poliwhirlb.pic"
+PoliwrathPicFront::   INCBIN "gfx/pokemon/front/poliwrath.pic"
+PoliwrathPicBack::    INCBIN "gfx/pokemon/back/poliwrathb.pic"
+WeedlePicFront::      INCBIN "gfx/pokemon/front/weedle.pic"
+WeedlePicBack::       INCBIN "gfx/pokemon/back/weedleb.pic"
+KakunaPicFront::      INCBIN "gfx/pokemon/front/kakuna.pic"
+KakunaPicBack::       INCBIN "gfx/pokemon/back/kakunab.pic"
+BeedrillPicFront::    INCBIN "gfx/pokemon/front/beedrill.pic"
+BeedrillPicBack::     INCBIN "gfx/pokemon/back/beedrillb.pic"
 
-FossilKabutopsPic::   INCBIN "pic/bmon/fossilkabutops.pic"
+FossilKabutopsPic::   INCBIN "gfx/pokemon/front/fossilkabutops.pic"
 
 
 SECTION "Pics 4", ROMX
 
-DodrioPicFront::       INCBIN "pic/bmon/dodrio.pic"
-DodrioPicBack::        INCBIN "pic/monback/dodriob.pic"
-PrimeapePicFront::     INCBIN "pic/bmon/primeape.pic"
-PrimeapePicBack::      INCBIN "pic/monback/primeapeb.pic"
-DugtrioPicFront::      INCBIN "pic/bmon/dugtrio.pic"
-DugtrioPicBack::       INCBIN "pic/monback/dugtriob.pic"
-VenomothPicFront::     INCBIN "pic/bmon/venomoth.pic"
-VenomothPicBack::      INCBIN "pic/monback/venomothb.pic"
-DewgongPicFront::      INCBIN "pic/bmon/dewgong.pic"
-DewgongPicBack::       INCBIN "pic/monback/dewgongb.pic"
-CaterpiePicFront::     INCBIN "pic/bmon/caterpie.pic"
-CaterpiePicBack::      INCBIN "pic/monback/caterpieb.pic"
-MetapodPicFront::      INCBIN "pic/bmon/metapod.pic"
-MetapodPicBack::       INCBIN "pic/monback/metapodb.pic"
-ButterfreePicFront::   INCBIN "pic/bmon/butterfree.pic"
-ButterfreePicBack::    INCBIN "pic/monback/butterfreeb.pic"
-MachampPicFront::      INCBIN "pic/bmon/machamp.pic"
-MachampPicBack::       INCBIN "pic/monback/machampb.pic"
-GolduckPicFront::      INCBIN "pic/bmon/golduck.pic"
-GolduckPicBack::       INCBIN "pic/monback/golduckb.pic"
-HypnoPicFront::        INCBIN "pic/bmon/hypno.pic"
-HypnoPicBack::         INCBIN "pic/monback/hypnob.pic"
-GolbatPicFront::       INCBIN "pic/bmon/golbat.pic"
-GolbatPicBack::        INCBIN "pic/monback/golbatb.pic"
-MewtwoPicFront::       INCBIN "pic/bmon/mewtwo.pic"
-MewtwoPicBack::        INCBIN "pic/monback/mewtwob.pic"
-SnorlaxPicFront::      INCBIN "pic/bmon/snorlax.pic"
-SnorlaxPicBack::       INCBIN "pic/monback/snorlaxb.pic"
-MagikarpPicFront::     INCBIN "pic/bmon/magikarp.pic"
-MagikarpPicBack::      INCBIN "pic/monback/magikarpb.pic"
-MukPicFront::          INCBIN "pic/bmon/muk.pic"
-MukPicBack::           INCBIN "pic/monback/mukb.pic"
-KinglerPicFront::      INCBIN "pic/bmon/kingler.pic"
-KinglerPicBack::       INCBIN "pic/monback/kinglerb.pic"
-CloysterPicFront::     INCBIN "pic/bmon/cloyster.pic"
-CloysterPicBack::      INCBIN "pic/monback/cloysterb.pic"
-ElectrodePicFront::    INCBIN "pic/bmon/electrode.pic"
-ElectrodePicBack::     INCBIN "pic/monback/electrodeb.pic"
-ClefablePicFront::     INCBIN "pic/bmon/clefable.pic"
-ClefablePicBack::      INCBIN "pic/monback/clefableb.pic"
-WeezingPicFront::      INCBIN "pic/bmon/weezing.pic"
-WeezingPicBack::       INCBIN "pic/monback/weezingb.pic"
-PersianPicFront::      INCBIN "pic/bmon/persian.pic"
-PersianPicBack::       INCBIN "pic/monback/persianb.pic"
-MarowakPicFront::      INCBIN "pic/bmon/marowak.pic"
-MarowakPicBack::       INCBIN "pic/monback/marowakb.pic"
-HaunterPicFront::      INCBIN "pic/bmon/haunter.pic"
-HaunterPicBack::       INCBIN "pic/monback/haunterb.pic"
-AbraPicFront::         INCBIN "pic/bmon/abra.pic"
-AbraPicBack::          INCBIN "pic/monback/abrab.pic"
-AlakazamPicFront::     INCBIN "pic/bmon/alakazam.pic"
-AlakazamPicBack::      INCBIN "pic/monback/alakazamb.pic"
-PidgeottoPicFront::    INCBIN "pic/bmon/pidgeotto.pic"
-PidgeottoPicBack::     INCBIN "pic/monback/pidgeottob.pic"
-PidgeotPicFront::      INCBIN "pic/bmon/pidgeot.pic"
-PidgeotPicBack::       INCBIN "pic/monback/pidgeotb.pic"
-StarmiePicFront::      INCBIN "pic/bmon/starmie.pic"
-StarmiePicBack::       INCBIN "pic/monback/starmieb.pic"
+DodrioPicFront::       INCBIN "gfx/pokemon/front/dodrio.pic"
+DodrioPicBack::        INCBIN "gfx/pokemon/back/dodriob.pic"
+PrimeapePicFront::     INCBIN "gfx/pokemon/front/primeape.pic"
+PrimeapePicBack::      INCBIN "gfx/pokemon/back/primeapeb.pic"
+DugtrioPicFront::      INCBIN "gfx/pokemon/front/dugtrio.pic"
+DugtrioPicBack::       INCBIN "gfx/pokemon/back/dugtriob.pic"
+VenomothPicFront::     INCBIN "gfx/pokemon/front/venomoth.pic"
+VenomothPicBack::      INCBIN "gfx/pokemon/back/venomothb.pic"
+DewgongPicFront::      INCBIN "gfx/pokemon/front/dewgong.pic"
+DewgongPicBack::       INCBIN "gfx/pokemon/back/dewgongb.pic"
+CaterpiePicFront::     INCBIN "gfx/pokemon/front/caterpie.pic"
+CaterpiePicBack::      INCBIN "gfx/pokemon/back/caterpieb.pic"
+MetapodPicFront::      INCBIN "gfx/pokemon/front/metapod.pic"
+MetapodPicBack::       INCBIN "gfx/pokemon/back/metapodb.pic"
+ButterfreePicFront::   INCBIN "gfx/pokemon/front/butterfree.pic"
+ButterfreePicBack::    INCBIN "gfx/pokemon/back/butterfreeb.pic"
+MachampPicFront::      INCBIN "gfx/pokemon/front/machamp.pic"
+MachampPicBack::       INCBIN "gfx/pokemon/back/machampb.pic"
+GolduckPicFront::      INCBIN "gfx/pokemon/front/golduck.pic"
+GolduckPicBack::       INCBIN "gfx/pokemon/back/golduckb.pic"
+HypnoPicFront::        INCBIN "gfx/pokemon/front/hypno.pic"
+HypnoPicBack::         INCBIN "gfx/pokemon/back/hypnob.pic"
+GolbatPicFront::       INCBIN "gfx/pokemon/front/golbat.pic"
+GolbatPicBack::        INCBIN "gfx/pokemon/back/golbatb.pic"
+MewtwoPicFront::       INCBIN "gfx/pokemon/front/mewtwo.pic"
+MewtwoPicBack::        INCBIN "gfx/pokemon/back/mewtwob.pic"
+SnorlaxPicFront::      INCBIN "gfx/pokemon/front/snorlax.pic"
+SnorlaxPicBack::       INCBIN "gfx/pokemon/back/snorlaxb.pic"
+MagikarpPicFront::     INCBIN "gfx/pokemon/front/magikarp.pic"
+MagikarpPicBack::      INCBIN "gfx/pokemon/back/magikarpb.pic"
+MukPicFront::          INCBIN "gfx/pokemon/front/muk.pic"
+MukPicBack::           INCBIN "gfx/pokemon/back/mukb.pic"
+KinglerPicFront::      INCBIN "gfx/pokemon/front/kingler.pic"
+KinglerPicBack::       INCBIN "gfx/pokemon/back/kinglerb.pic"
+CloysterPicFront::     INCBIN "gfx/pokemon/front/cloyster.pic"
+CloysterPicBack::      INCBIN "gfx/pokemon/back/cloysterb.pic"
+ElectrodePicFront::    INCBIN "gfx/pokemon/front/electrode.pic"
+ElectrodePicBack::     INCBIN "gfx/pokemon/back/electrodeb.pic"
+ClefablePicFront::     INCBIN "gfx/pokemon/front/clefable.pic"
+ClefablePicBack::      INCBIN "gfx/pokemon/back/clefableb.pic"
+WeezingPicFront::      INCBIN "gfx/pokemon/front/weezing.pic"
+WeezingPicBack::       INCBIN "gfx/pokemon/back/weezingb.pic"
+PersianPicFront::      INCBIN "gfx/pokemon/front/persian.pic"
+PersianPicBack::       INCBIN "gfx/pokemon/back/persianb.pic"
+MarowakPicFront::      INCBIN "gfx/pokemon/front/marowak.pic"
+MarowakPicBack::       INCBIN "gfx/pokemon/back/marowakb.pic"
+HaunterPicFront::      INCBIN "gfx/pokemon/front/haunter.pic"
+HaunterPicBack::       INCBIN "gfx/pokemon/back/haunterb.pic"
+AbraPicFront::         INCBIN "gfx/pokemon/front/abra.pic"
+AbraPicBack::          INCBIN "gfx/pokemon/back/abrab.pic"
+AlakazamPicFront::     INCBIN "gfx/pokemon/front/alakazam.pic"
+AlakazamPicBack::      INCBIN "gfx/pokemon/back/alakazamb.pic"
+PidgeottoPicFront::    INCBIN "gfx/pokemon/front/pidgeotto.pic"
+PidgeottoPicBack::     INCBIN "gfx/pokemon/back/pidgeottob.pic"
+PidgeotPicFront::      INCBIN "gfx/pokemon/front/pidgeot.pic"
+PidgeotPicBack::       INCBIN "gfx/pokemon/back/pidgeotb.pic"
+StarmiePicFront::      INCBIN "gfx/pokemon/front/starmie.pic"
+StarmiePicBack::       INCBIN "gfx/pokemon/back/starmieb.pic"
 
-RedPicBack::           INCBIN "pic/trainer/redb.pic"
-OldManPic::            INCBIN "pic/trainer/oldman.pic"
+RedPicBack::           INCBIN "gfx/player/redb.pic"
+OldManPic::            INCBIN "gfx/battle/oldman.pic"
 
 
 SECTION "Pics 5", ROMX
 
-BulbasaurPicFront::    INCBIN "pic/bmon/bulbasaur.pic"
-BulbasaurPicBack::     INCBIN "pic/monback/bulbasaurb.pic"
-VenusaurPicFront::     INCBIN "pic/bmon/venusaur.pic"
-VenusaurPicBack::      INCBIN "pic/monback/venusaurb.pic"
-TentacruelPicFront::   INCBIN "pic/bmon/tentacruel.pic"
-TentacruelPicBack::    INCBIN "pic/monback/tentacruelb.pic"
-GoldeenPicFront::      INCBIN "pic/bmon/goldeen.pic"
-GoldeenPicBack::       INCBIN "pic/monback/goldeenb.pic"
-SeakingPicFront::      INCBIN "pic/bmon/seaking.pic"
-SeakingPicBack::       INCBIN "pic/monback/seakingb.pic"
-PonytaPicFront::       INCBIN "pic/bmon/ponyta.pic"
-RapidashPicFront::     INCBIN "pic/bmon/rapidash.pic"
-PonytaPicBack::        INCBIN "pic/monback/ponytab.pic"
-RapidashPicBack::      INCBIN "pic/monback/rapidashb.pic"
-RattataPicFront::      INCBIN "pic/bmon/rattata.pic"
-RattataPicBack::       INCBIN "pic/monback/rattatab.pic"
-RaticatePicFront::     INCBIN "pic/bmon/raticate.pic"
-RaticatePicBack::      INCBIN "pic/monback/raticateb.pic"
-NidorinoPicFront::     INCBIN "pic/bmon/nidorino.pic"
-NidorinoPicBack::      INCBIN "pic/monback/nidorinob.pic"
-NidorinaPicFront::     INCBIN "pic/bmon/nidorina.pic"
-NidorinaPicBack::      INCBIN "pic/monback/nidorinab.pic"
-GeodudePicFront::      INCBIN "pic/bmon/geodude.pic"
-GeodudePicBack::       INCBIN "pic/monback/geodudeb.pic"
-PorygonPicFront::      INCBIN "pic/bmon/porygon.pic"
-PorygonPicBack::       INCBIN "pic/monback/porygonb.pic"
-AerodactylPicFront::   INCBIN "pic/bmon/aerodactyl.pic"
-AerodactylPicBack::    INCBIN "pic/monback/aerodactylb.pic"
-MagnemitePicFront::    INCBIN "pic/bmon/magnemite.pic"
-MagnemitePicBack::     INCBIN "pic/monback/magnemiteb.pic"
-CharmanderPicFront::   INCBIN "pic/bmon/charmander.pic"
-CharmanderPicBack::    INCBIN "pic/monback/charmanderb.pic"
-SquirtlePicFront::     INCBIN "pic/bmon/squirtle.pic"
-SquirtlePicBack::      INCBIN "pic/monback/squirtleb.pic"
-CharmeleonPicFront::   INCBIN "pic/bmon/charmeleon.pic"
-CharmeleonPicBack::    INCBIN "pic/monback/charmeleonb.pic"
-WartortlePicFront::    INCBIN "pic/bmon/wartortle.pic"
-WartortlePicBack::     INCBIN "pic/monback/wartortleb.pic"
-CharizardPicFront::    INCBIN "pic/bmon/charizard.pic"
-CharizardPicBack::     INCBIN "pic/monback/charizardb.pic"
-FossilAerodactylPic::  INCBIN "pic/bmon/fossilaerodactyl.pic"
-GhostPic::             INCBIN "pic/other/ghost.pic"
-OddishPicFront::       INCBIN "pic/bmon/oddish.pic"
-OddishPicBack::        INCBIN "pic/monback/oddishb.pic"
-GloomPicFront::        INCBIN "pic/bmon/gloom.pic"
-GloomPicBack::         INCBIN "pic/monback/gloomb.pic"
-VileplumePicFront::    INCBIN "pic/bmon/vileplume.pic"
-VileplumePicBack::     INCBIN "pic/monback/vileplumeb.pic"
-BellsproutPicFront::   INCBIN "pic/bmon/bellsprout.pic"
-BellsproutPicBack::    INCBIN "pic/monback/bellsproutb.pic"
-WeepinbellPicFront::   INCBIN "pic/bmon/weepinbell.pic"
-WeepinbellPicBack::    INCBIN "pic/monback/weepinbellb.pic"
-VictreebelPicFront::   INCBIN "pic/bmon/victreebel.pic"
-VictreebelPicBack::    INCBIN "pic/monback/victreebelb.pic"
+BulbasaurPicFront::    INCBIN "gfx/pokemon/front/bulbasaur.pic"
+BulbasaurPicBack::     INCBIN "gfx/pokemon/back/bulbasaurb.pic"
+VenusaurPicFront::     INCBIN "gfx/pokemon/front/venusaur.pic"
+VenusaurPicBack::      INCBIN "gfx/pokemon/back/venusaurb.pic"
+TentacruelPicFront::   INCBIN "gfx/pokemon/front/tentacruel.pic"
+TentacruelPicBack::    INCBIN "gfx/pokemon/back/tentacruelb.pic"
+GoldeenPicFront::      INCBIN "gfx/pokemon/front/goldeen.pic"
+GoldeenPicBack::       INCBIN "gfx/pokemon/back/goldeenb.pic"
+SeakingPicFront::      INCBIN "gfx/pokemon/front/seaking.pic"
+SeakingPicBack::       INCBIN "gfx/pokemon/back/seakingb.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/rattata.pic"
+RattataPicBack::       INCBIN "gfx/pokemon/back/rattatab.pic"
+RaticatePicFront::     INCBIN "gfx/pokemon/front/raticate.pic"
+RaticatePicBack::      INCBIN "gfx/pokemon/back/raticateb.pic"
+NidorinoPicFront::     INCBIN "gfx/pokemon/front/nidorino.pic"
+NidorinoPicBack::      INCBIN "gfx/pokemon/back/nidorinob.pic"
+NidorinaPicFront::     INCBIN "gfx/pokemon/front/nidorina.pic"
+NidorinaPicBack::      INCBIN "gfx/pokemon/back/nidorinab.pic"
+GeodudePicFront::      INCBIN "gfx/pokemon/front/geodude.pic"
+GeodudePicBack::       INCBIN "gfx/pokemon/back/geodudeb.pic"
+PorygonPicFront::      INCBIN "gfx/pokemon/front/porygon.pic"
+PorygonPicBack::       INCBIN "gfx/pokemon/back/porygonb.pic"
+AerodactylPicFront::   INCBIN "gfx/pokemon/front/aerodactyl.pic"
+AerodactylPicBack::    INCBIN "gfx/pokemon/back/aerodactylb.pic"
+MagnemitePicFront::    INCBIN "gfx/pokemon/front/magnemite.pic"
+MagnemitePicBack::     INCBIN "gfx/pokemon/back/magnemiteb.pic"
+CharmanderPicFront::   INCBIN "gfx/pokemon/front/charmander.pic"
+CharmanderPicBack::    INCBIN "gfx/pokemon/back/charmanderb.pic"
+SquirtlePicFront::     INCBIN "gfx/pokemon/front/squirtle.pic"
+SquirtlePicBack::      INCBIN "gfx/pokemon/back/squirtleb.pic"
+CharmeleonPicFront::   INCBIN "gfx/pokemon/front/charmeleon.pic"
+CharmeleonPicBack::    INCBIN "gfx/pokemon/back/charmeleonb.pic"
+WartortlePicFront::    INCBIN "gfx/pokemon/front/wartortle.pic"
+WartortlePicBack::     INCBIN "gfx/pokemon/back/wartortleb.pic"
+CharizardPicFront::    INCBIN "gfx/pokemon/front/charizard.pic"
+CharizardPicBack::     INCBIN "gfx/pokemon/back/charizardb.pic"
+FossilAerodactylPic::  INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"
+GhostPic::             INCBIN "gfx/battle/ghost.pic"
+OddishPicFront::       INCBIN "gfx/pokemon/front/oddish.pic"
+OddishPicBack::        INCBIN "gfx/pokemon/back/oddishb.pic"
+GloomPicFront::        INCBIN "gfx/pokemon/front/gloom.pic"
+GloomPicBack::         INCBIN "gfx/pokemon/back/gloomb.pic"
+VileplumePicFront::    INCBIN "gfx/pokemon/front/vileplume.pic"
+VileplumePicBack::     INCBIN "gfx/pokemon/back/vileplumeb.pic"
+BellsproutPicFront::   INCBIN "gfx/pokemon/front/bellsprout.pic"
+BellsproutPicBack::    INCBIN "gfx/pokemon/back/bellsproutb.pic"
+WeepinbellPicFront::   INCBIN "gfx/pokemon/front/weepinbell.pic"
+WeepinbellPicBack::    INCBIN "gfx/pokemon/back/weepinbellb.pic"
+VictreebelPicFront::   INCBIN "gfx/pokemon/front/victreebel.pic"
+VictreebelPicBack::    INCBIN "gfx/pokemon/back/victreebelb.pic"
 
 
 SECTION "Pics 6", ROMX
 
 TrainerPics::
-YoungsterPic::     INCBIN "pic/trainer/youngster.pic"
-BugCatcherPic::    INCBIN "pic/trainer/bugcatcher.pic"
-LassPic::          INCBIN "pic/trainer/lass.pic"
-SailorPic::        INCBIN "pic/trainer/sailor.pic"
-JrTrainerMPic::    INCBIN "pic/trainer/jr.trainerm.pic"
-JrTrainerFPic::    INCBIN "pic/trainer/jr.trainerf.pic"
-PokemaniacPic::    INCBIN "pic/trainer/pokemaniac.pic"
-SuperNerdPic::     INCBIN "pic/trainer/supernerd.pic"
-HikerPic::         INCBIN "pic/trainer/hiker.pic"
-BikerPic::         INCBIN "pic/trainer/biker.pic"
-BurglarPic::       INCBIN "pic/trainer/burglar.pic"
-EngineerPic::      INCBIN "pic/trainer/engineer.pic"
-FisherPic::        INCBIN "pic/trainer/fisher.pic"
-SwimmerPic::       INCBIN "pic/trainer/swimmer.pic"
-CueBallPic::       INCBIN "pic/trainer/cueball.pic"
-GamblerPic::       INCBIN "pic/trainer/gambler.pic"
-BeautyPic::        INCBIN "pic/trainer/beauty.pic"
-PsychicPic::       INCBIN "pic/trainer/psychic.pic"
-RockerPic::        INCBIN "pic/trainer/rocker.pic"
-JugglerPic::       INCBIN "pic/trainer/juggler.pic"
-TamerPic::         INCBIN "pic/trainer/tamer.pic"
-BirdKeeperPic::    INCBIN "pic/trainer/birdkeeper.pic"
-BlackbeltPic::     INCBIN "pic/trainer/blackbelt.pic"
-Rival1Pic::        INCBIN "pic/trainer/rival1.pic"
-ProfOakPic::       INCBIN "pic/trainer/prof.oak.pic"
+YoungsterPic::     INCBIN "gfx/trainers/youngster.pic"
+BugCatcherPic::    INCBIN "gfx/trainers/bugcatcher.pic"
+LassPic::          INCBIN "gfx/trainers/lass.pic"
+SailorPic::        INCBIN "gfx/trainers/sailor.pic"
+JrTrainerMPic::    INCBIN "gfx/trainers/jr.trainerm.pic"
+JrTrainerFPic::    INCBIN "gfx/trainers/jr.trainerf.pic"
+PokemaniacPic::    INCBIN "gfx/trainers/pokemaniac.pic"
+SuperNerdPic::     INCBIN "gfx/trainers/supernerd.pic"
+HikerPic::         INCBIN "gfx/trainers/hiker.pic"
+BikerPic::         INCBIN "gfx/trainers/biker.pic"
+BurglarPic::       INCBIN "gfx/trainers/burglar.pic"
+EngineerPic::      INCBIN "gfx/trainers/engineer.pic"
+FisherPic::        INCBIN "gfx/trainers/fisher.pic"
+SwimmerPic::       INCBIN "gfx/trainers/swimmer.pic"
+CueBallPic::       INCBIN "gfx/trainers/cueball.pic"
+GamblerPic::       INCBIN "gfx/trainers/gambler.pic"
+BeautyPic::        INCBIN "gfx/trainers/beauty.pic"
+PsychicPic::       INCBIN "gfx/trainers/psychic.pic"
+RockerPic::        INCBIN "gfx/trainers/rocker.pic"
+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/rival1.pic"
+ProfOakPic::       INCBIN "gfx/trainers/prof.oak.pic"
 ChiefPic::
-ScientistPic::     INCBIN "pic/trainer/scientist.pic"
-GiovanniPic::      INCBIN "pic/trainer/giovanni.pic"
-RocketPic::        INCBIN "pic/trainer/rocket.pic"
-CooltrainerMPic::  INCBIN "pic/trainer/cooltrainerm.pic"
-CooltrainerFPic::  INCBIN "pic/trainer/cooltrainerf.pic"
-BrunoPic::         INCBIN "pic/trainer/bruno.pic"
-BrockPic::         INCBIN "pic/trainer/brock.pic"
-MistyPic::         INCBIN "pic/trainer/misty.pic"
-LtSurgePic::       INCBIN "pic/trainer/lt.surge.pic"
-ErikaPic::         INCBIN "pic/trainer/erika.pic"
-KogaPic::          INCBIN "pic/trainer/koga.pic"
-BlainePic::        INCBIN "pic/trainer/blaine.pic"
-SabrinaPic::       INCBIN "pic/trainer/sabrina.pic"
-GentlemanPic::     INCBIN "pic/trainer/gentleman.pic"
-Rival2Pic::        INCBIN "pic/trainer/rival2.pic"
-Rival3Pic::        INCBIN "pic/trainer/rival3.pic"
-LoreleiPic::       INCBIN "pic/trainer/lorelei.pic"
-ChannelerPic::     INCBIN "pic/trainer/channeler.pic"
-AgathaPic::        INCBIN "pic/trainer/agatha.pic"
-LancePic::         INCBIN "pic/trainer/lance.pic"
+ScientistPic::     INCBIN "gfx/trainers/scientist.pic"
+GiovanniPic::      INCBIN "gfx/trainers/giovanni.pic"
+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/brock.pic"
+MistyPic::         INCBIN "gfx/trainers/misty.pic"
+LtSurgePic::       INCBIN "gfx/trainers/lt.surge.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/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"