summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/baseStats/abra.asm2
-rw-r--r--data/baseStats/aerodactyl.asm2
-rw-r--r--data/baseStats/alakazam.asm2
-rw-r--r--data/baseStats/arbok.asm2
-rw-r--r--data/baseStats/arcanine.asm2
-rw-r--r--data/baseStats/articuno.asm2
-rw-r--r--data/baseStats/beedrill.asm2
-rw-r--r--data/baseStats/bellsprout.asm2
-rw-r--r--data/baseStats/blastoise.asm2
-rw-r--r--data/baseStats/bulbasaur.asm2
-rw-r--r--data/baseStats/butterfree.asm2
-rw-r--r--data/baseStats/caterpie.asm2
-rw-r--r--data/baseStats/chansey.asm2
-rw-r--r--data/baseStats/charizard.asm2
-rw-r--r--data/baseStats/charmander.asm2
-rw-r--r--data/baseStats/charmeleon.asm2
-rw-r--r--data/baseStats/clefable.asm2
-rw-r--r--data/baseStats/clefairy.asm2
-rw-r--r--data/baseStats/cloyster.asm2
-rw-r--r--data/baseStats/cubone.asm2
-rw-r--r--data/baseStats/dewgong.asm2
-rw-r--r--data/baseStats/diglett.asm2
-rw-r--r--data/baseStats/ditto.asm2
-rw-r--r--data/baseStats/dodrio.asm2
-rw-r--r--data/baseStats/doduo.asm2
-rw-r--r--data/baseStats/dragonair.asm2
-rw-r--r--data/baseStats/dragonite.asm2
-rw-r--r--data/baseStats/dratini.asm2
-rw-r--r--data/baseStats/drowzee.asm2
-rw-r--r--data/baseStats/dugtrio.asm2
-rw-r--r--data/baseStats/eevee.asm2
-rw-r--r--data/baseStats/ekans.asm2
-rw-r--r--data/baseStats/electabuzz.asm2
-rw-r--r--data/baseStats/electrode.asm2
-rw-r--r--data/baseStats/exeggcute.asm2
-rw-r--r--data/baseStats/exeggutor.asm2
-rw-r--r--data/baseStats/farfetchd.asm2
-rw-r--r--data/baseStats/fearow.asm2
-rw-r--r--data/baseStats/flareon.asm2
-rw-r--r--data/baseStats/gastly.asm2
-rw-r--r--data/baseStats/gengar.asm2
-rw-r--r--data/baseStats/geodude.asm2
-rw-r--r--data/baseStats/gloom.asm2
-rw-r--r--data/baseStats/golbat.asm2
-rw-r--r--data/baseStats/goldeen.asm2
-rw-r--r--data/baseStats/golduck.asm2
-rw-r--r--data/baseStats/golem.asm2
-rw-r--r--data/baseStats/graveler.asm2
-rw-r--r--data/baseStats/grimer.asm2
-rw-r--r--data/baseStats/growlithe.asm2
-rw-r--r--data/baseStats/gyarados.asm2
-rw-r--r--data/baseStats/haunter.asm2
-rw-r--r--data/baseStats/hitmonchan.asm2
-rw-r--r--data/baseStats/hitmonlee.asm2
-rw-r--r--data/baseStats/horsea.asm2
-rw-r--r--data/baseStats/hypno.asm2
-rw-r--r--data/baseStats/ivysaur.asm2
-rw-r--r--data/baseStats/jigglypuff.asm2
-rw-r--r--data/baseStats/jolteon.asm2
-rw-r--r--data/baseStats/jynx.asm2
-rw-r--r--data/baseStats/kabuto.asm2
-rw-r--r--data/baseStats/kabutops.asm2
-rw-r--r--data/baseStats/kadabra.asm2
-rw-r--r--data/baseStats/kakuna.asm2
-rw-r--r--data/baseStats/kangaskhan.asm2
-rw-r--r--data/baseStats/kingler.asm2
-rw-r--r--data/baseStats/koffing.asm2
-rw-r--r--data/baseStats/krabby.asm2
-rw-r--r--data/baseStats/lapras.asm2
-rw-r--r--data/baseStats/lickitung.asm2
-rw-r--r--data/baseStats/machamp.asm2
-rw-r--r--data/baseStats/machoke.asm2
-rw-r--r--data/baseStats/machop.asm2
-rw-r--r--data/baseStats/magikarp.asm2
-rw-r--r--data/baseStats/magmar.asm2
-rw-r--r--data/baseStats/magnemite.asm2
-rw-r--r--data/baseStats/magneton.asm2
-rw-r--r--data/baseStats/mankey.asm2
-rw-r--r--data/baseStats/marowak.asm2
-rw-r--r--data/baseStats/meowth.asm2
-rw-r--r--data/baseStats/metapod.asm2
-rw-r--r--data/baseStats/mew.asm2
-rw-r--r--data/baseStats/mewtwo.asm2
-rw-r--r--data/baseStats/moltres.asm2
-rw-r--r--data/baseStats/mrmime.asm2
-rw-r--r--data/baseStats/muk.asm2
-rw-r--r--data/baseStats/nidoking.asm2
-rw-r--r--data/baseStats/nidoqueen.asm2
-rw-r--r--data/baseStats/nidoranf.asm2
-rw-r--r--data/baseStats/nidoranm.asm2
-rw-r--r--data/baseStats/nidorina.asm2
-rw-r--r--data/baseStats/nidorino.asm2
-rw-r--r--data/baseStats/ninetales.asm2
-rw-r--r--data/baseStats/oddish.asm2
-rw-r--r--data/baseStats/omanyte.asm2
-rw-r--r--data/baseStats/omastar.asm2
-rw-r--r--data/baseStats/onix.asm2
-rw-r--r--data/baseStats/paras.asm2
-rw-r--r--data/baseStats/parasect.asm2
-rw-r--r--data/baseStats/persian.asm2
-rw-r--r--data/baseStats/pidgeot.asm2
-rw-r--r--data/baseStats/pidgeotto.asm2
-rw-r--r--data/baseStats/pidgey.asm2
-rw-r--r--data/baseStats/pikachu.asm2
-rw-r--r--data/baseStats/pinsir.asm2
-rw-r--r--data/baseStats/poliwag.asm2
-rw-r--r--data/baseStats/poliwhirl.asm2
-rw-r--r--data/baseStats/poliwrath.asm2
-rw-r--r--data/baseStats/ponyta.asm2
-rw-r--r--data/baseStats/porygon.asm2
-rw-r--r--data/baseStats/primeape.asm2
-rw-r--r--data/baseStats/psyduck.asm2
-rw-r--r--data/baseStats/raichu.asm2
-rw-r--r--data/baseStats/rapidash.asm2
-rw-r--r--data/baseStats/raticate.asm2
-rw-r--r--data/baseStats/rattata.asm2
-rw-r--r--data/baseStats/rhydon.asm2
-rw-r--r--data/baseStats/rhyhorn.asm2
-rw-r--r--data/baseStats/sandshrew.asm2
-rw-r--r--data/baseStats/sandslash.asm2
-rw-r--r--data/baseStats/scyther.asm2
-rw-r--r--data/baseStats/seadra.asm2
-rw-r--r--data/baseStats/seaking.asm2
-rw-r--r--data/baseStats/seel.asm2
-rw-r--r--data/baseStats/shellder.asm2
-rw-r--r--data/baseStats/slowbro.asm2
-rw-r--r--data/baseStats/slowpoke.asm2
-rw-r--r--data/baseStats/snorlax.asm2
-rw-r--r--data/baseStats/spearow.asm2
-rw-r--r--data/baseStats/squirtle.asm2
-rw-r--r--data/baseStats/starmie.asm2
-rw-r--r--data/baseStats/staryu.asm2
-rw-r--r--data/baseStats/tangela.asm2
-rw-r--r--data/baseStats/tauros.asm2
-rw-r--r--data/baseStats/tentacool.asm2
-rw-r--r--data/baseStats/tentacruel.asm2
-rw-r--r--data/baseStats/vaporeon.asm2
-rw-r--r--data/baseStats/venomoth.asm2
-rw-r--r--data/baseStats/venonat.asm2
-rw-r--r--data/baseStats/venusaur.asm2
-rw-r--r--data/baseStats/victreebel.asm2
-rw-r--r--data/baseStats/vileplume.asm2
-rw-r--r--data/baseStats/voltorb.asm2
-rw-r--r--data/baseStats/vulpix.asm2
-rw-r--r--data/baseStats/wartortle.asm2
-rw-r--r--data/baseStats/weedle.asm2
-rw-r--r--data/baseStats/weepinbell.asm2
-rw-r--r--data/baseStats/weezing.asm2
-rw-r--r--data/baseStats/wigglytuff.asm2
-rw-r--r--data/baseStats/zapdos.asm2
-rw-r--r--data/baseStats/zubat.asm2
151 files changed, 151 insertions, 151 deletions
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