summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/pokemon/base_stats/abra.asm2
-rw-r--r--data/pokemon/base_stats/aerodactyl.asm2
-rw-r--r--data/pokemon/base_stats/alakazam.asm2
-rw-r--r--data/pokemon/base_stats/arbok.asm2
-rw-r--r--data/pokemon/base_stats/arcanine.asm2
-rw-r--r--data/pokemon/base_stats/articuno.asm2
-rw-r--r--data/pokemon/base_stats/beedrill.asm2
-rw-r--r--data/pokemon/base_stats/bellsprout.asm2
-rw-r--r--data/pokemon/base_stats/blastoise.asm2
-rw-r--r--data/pokemon/base_stats/bulbasaur.asm2
-rw-r--r--data/pokemon/base_stats/butterfree.asm2
-rw-r--r--data/pokemon/base_stats/caterpie.asm2
-rw-r--r--data/pokemon/base_stats/chansey.asm2
-rw-r--r--data/pokemon/base_stats/charizard.asm2
-rw-r--r--data/pokemon/base_stats/charmander.asm2
-rw-r--r--data/pokemon/base_stats/charmeleon.asm2
-rw-r--r--data/pokemon/base_stats/clefable.asm2
-rw-r--r--data/pokemon/base_stats/clefairy.asm2
-rw-r--r--data/pokemon/base_stats/cloyster.asm2
-rw-r--r--data/pokemon/base_stats/cubone.asm2
-rw-r--r--data/pokemon/base_stats/dewgong.asm2
-rw-r--r--data/pokemon/base_stats/diglett.asm2
-rw-r--r--data/pokemon/base_stats/ditto.asm2
-rw-r--r--data/pokemon/base_stats/dodrio.asm2
-rw-r--r--data/pokemon/base_stats/doduo.asm2
-rw-r--r--data/pokemon/base_stats/dragonair.asm2
-rw-r--r--data/pokemon/base_stats/dragonite.asm2
-rw-r--r--data/pokemon/base_stats/dratini.asm2
-rw-r--r--data/pokemon/base_stats/drowzee.asm2
-rw-r--r--data/pokemon/base_stats/dugtrio.asm2
-rw-r--r--data/pokemon/base_stats/eevee.asm2
-rw-r--r--data/pokemon/base_stats/ekans.asm2
-rw-r--r--data/pokemon/base_stats/electabuzz.asm2
-rw-r--r--data/pokemon/base_stats/electrode.asm2
-rw-r--r--data/pokemon/base_stats/exeggcute.asm2
-rw-r--r--data/pokemon/base_stats/exeggutor.asm2
-rw-r--r--data/pokemon/base_stats/farfetchd.asm2
-rw-r--r--data/pokemon/base_stats/fearow.asm2
-rw-r--r--data/pokemon/base_stats/flareon.asm2
-rw-r--r--data/pokemon/base_stats/gastly.asm2
-rw-r--r--data/pokemon/base_stats/gengar.asm2
-rw-r--r--data/pokemon/base_stats/geodude.asm2
-rw-r--r--data/pokemon/base_stats/gloom.asm2
-rw-r--r--data/pokemon/base_stats/golbat.asm2
-rw-r--r--data/pokemon/base_stats/goldeen.asm2
-rw-r--r--data/pokemon/base_stats/golduck.asm2
-rw-r--r--data/pokemon/base_stats/golem.asm2
-rw-r--r--data/pokemon/base_stats/graveler.asm2
-rw-r--r--data/pokemon/base_stats/grimer.asm2
-rw-r--r--data/pokemon/base_stats/growlithe.asm2
-rw-r--r--data/pokemon/base_stats/gyarados.asm2
-rw-r--r--data/pokemon/base_stats/haunter.asm2
-rw-r--r--data/pokemon/base_stats/hitmonchan.asm2
-rw-r--r--data/pokemon/base_stats/hitmonlee.asm2
-rw-r--r--data/pokemon/base_stats/horsea.asm2
-rw-r--r--data/pokemon/base_stats/hypno.asm2
-rw-r--r--data/pokemon/base_stats/ivysaur.asm2
-rw-r--r--data/pokemon/base_stats/jigglypuff.asm2
-rw-r--r--data/pokemon/base_stats/jolteon.asm2
-rw-r--r--data/pokemon/base_stats/jynx.asm2
-rw-r--r--data/pokemon/base_stats/kabuto.asm2
-rw-r--r--data/pokemon/base_stats/kabutops.asm2
-rw-r--r--data/pokemon/base_stats/kadabra.asm2
-rw-r--r--data/pokemon/base_stats/kakuna.asm2
-rw-r--r--data/pokemon/base_stats/kangaskhan.asm2
-rw-r--r--data/pokemon/base_stats/kingler.asm2
-rw-r--r--data/pokemon/base_stats/koffing.asm2
-rw-r--r--data/pokemon/base_stats/krabby.asm2
-rw-r--r--data/pokemon/base_stats/lapras.asm2
-rw-r--r--data/pokemon/base_stats/lickitung.asm2
-rw-r--r--data/pokemon/base_stats/machamp.asm2
-rw-r--r--data/pokemon/base_stats/machoke.asm2
-rw-r--r--data/pokemon/base_stats/machop.asm2
-rw-r--r--data/pokemon/base_stats/magikarp.asm2
-rw-r--r--data/pokemon/base_stats/magmar.asm2
-rw-r--r--data/pokemon/base_stats/magnemite.asm2
-rw-r--r--data/pokemon/base_stats/magneton.asm2
-rw-r--r--data/pokemon/base_stats/mankey.asm2
-rw-r--r--data/pokemon/base_stats/marowak.asm2
-rw-r--r--data/pokemon/base_stats/meowth.asm2
-rw-r--r--data/pokemon/base_stats/metapod.asm2
-rw-r--r--data/pokemon/base_stats/mew.asm2
-rw-r--r--data/pokemon/base_stats/mewtwo.asm2
-rw-r--r--data/pokemon/base_stats/moltres.asm2
-rw-r--r--data/pokemon/base_stats/mrmime.asm2
-rw-r--r--data/pokemon/base_stats/muk.asm2
-rw-r--r--data/pokemon/base_stats/nidoking.asm2
-rw-r--r--data/pokemon/base_stats/nidoqueen.asm2
-rw-r--r--data/pokemon/base_stats/nidoranf.asm2
-rw-r--r--data/pokemon/base_stats/nidoranm.asm2
-rw-r--r--data/pokemon/base_stats/nidorina.asm2
-rw-r--r--data/pokemon/base_stats/nidorino.asm2
-rw-r--r--data/pokemon/base_stats/ninetales.asm2
-rw-r--r--data/pokemon/base_stats/oddish.asm2
-rw-r--r--data/pokemon/base_stats/omanyte.asm2
-rw-r--r--data/pokemon/base_stats/omastar.asm2
-rw-r--r--data/pokemon/base_stats/onix.asm2
-rw-r--r--data/pokemon/base_stats/paras.asm2
-rw-r--r--data/pokemon/base_stats/parasect.asm2
-rw-r--r--data/pokemon/base_stats/persian.asm2
-rw-r--r--data/pokemon/base_stats/pidgeot.asm2
-rw-r--r--data/pokemon/base_stats/pidgeotto.asm2
-rw-r--r--data/pokemon/base_stats/pidgey.asm2
-rw-r--r--data/pokemon/base_stats/pikachu.asm2
-rw-r--r--data/pokemon/base_stats/pinsir.asm2
-rw-r--r--data/pokemon/base_stats/poliwag.asm2
-rw-r--r--data/pokemon/base_stats/poliwhirl.asm2
-rw-r--r--data/pokemon/base_stats/poliwrath.asm2
-rw-r--r--data/pokemon/base_stats/ponyta.asm2
-rw-r--r--data/pokemon/base_stats/porygon.asm2
-rw-r--r--data/pokemon/base_stats/primeape.asm2
-rw-r--r--data/pokemon/base_stats/psyduck.asm2
-rw-r--r--data/pokemon/base_stats/raichu.asm2
-rw-r--r--data/pokemon/base_stats/rapidash.asm2
-rw-r--r--data/pokemon/base_stats/raticate.asm2
-rw-r--r--data/pokemon/base_stats/rattata.asm2
-rw-r--r--data/pokemon/base_stats/rhydon.asm2
-rw-r--r--data/pokemon/base_stats/rhyhorn.asm2
-rw-r--r--data/pokemon/base_stats/sandshrew.asm2
-rw-r--r--data/pokemon/base_stats/sandslash.asm2
-rw-r--r--data/pokemon/base_stats/scyther.asm2
-rw-r--r--data/pokemon/base_stats/seadra.asm2
-rw-r--r--data/pokemon/base_stats/seaking.asm2
-rw-r--r--data/pokemon/base_stats/seel.asm2
-rw-r--r--data/pokemon/base_stats/shellder.asm2
-rw-r--r--data/pokemon/base_stats/slowbro.asm2
-rw-r--r--data/pokemon/base_stats/slowpoke.asm2
-rw-r--r--data/pokemon/base_stats/snorlax.asm2
-rw-r--r--data/pokemon/base_stats/spearow.asm2
-rw-r--r--data/pokemon/base_stats/squirtle.asm2
-rw-r--r--data/pokemon/base_stats/starmie.asm2
-rw-r--r--data/pokemon/base_stats/staryu.asm2
-rw-r--r--data/pokemon/base_stats/tangela.asm2
-rw-r--r--data/pokemon/base_stats/tauros.asm2
-rw-r--r--data/pokemon/base_stats/tentacool.asm2
-rw-r--r--data/pokemon/base_stats/tentacruel.asm2
-rw-r--r--data/pokemon/base_stats/vaporeon.asm2
-rw-r--r--data/pokemon/base_stats/venomoth.asm2
-rw-r--r--data/pokemon/base_stats/venonat.asm2
-rw-r--r--data/pokemon/base_stats/venusaur.asm2
-rw-r--r--data/pokemon/base_stats/victreebel.asm2
-rw-r--r--data/pokemon/base_stats/vileplume.asm2
-rw-r--r--data/pokemon/base_stats/voltorb.asm2
-rw-r--r--data/pokemon/base_stats/vulpix.asm2
-rw-r--r--data/pokemon/base_stats/wartortle.asm2
-rw-r--r--data/pokemon/base_stats/weedle.asm2
-rw-r--r--data/pokemon/base_stats/weepinbell.asm2
-rw-r--r--data/pokemon/base_stats/weezing.asm2
-rw-r--r--data/pokemon/base_stats/wigglytuff.asm2
-rw-r--r--data/pokemon/base_stats/zapdos.asm2
-rw-r--r--data/pokemon/base_stats/zubat.asm2
151 files changed, 151 insertions, 151 deletions
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
index 54c9a9c9..71fa12de 100644
--- a/data/pokemon/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
@@ -7,7 +7,7 @@
db 200 ; catch rate
db 73 ; base exp
- INCBIN "gfx/pokemon/front_yellow/abra.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions
dw AbraPicFront, AbraPicBack
db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 5ed73b3e..bff9155c 100644
--- a/data/pokemon/base_stats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 202 ; base exp
- INCBIN "gfx/pokemon/front_yellow/aerodactyl.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/aerodactyl.pic", 0, 1 ; sprite dimensions
dw AerodactylPicFront, AerodactylPicBack
db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index c3e1c4cd..32e68bb0 100644
--- a/data/pokemon/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
@@ -7,7 +7,7 @@
db 50 ; catch rate
db 186 ; base exp
- INCBIN "gfx/pokemon/front_yellow/alakazam.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions
dw AlakazamPicFront, AlakazamPicBack
db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index f981efae..1c234c94 100644
--- a/data/pokemon/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 147 ; base exp
- INCBIN "gfx/pokemon/front_yellow/arbok.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/arbok.pic", 0, 1 ; sprite dimensions
dw ArbokPicFront, ArbokPicBack
db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index 380be0a8..faec7f6c 100644
--- a/data/pokemon/base_stats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 213 ; base exp
- INCBIN "gfx/pokemon/front_yellow/arcanine.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions
dw ArcaninePicFront, ArcaninePicBack
db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset
diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index d53fc4fc..284ce5eb 100644
--- a/data/pokemon/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
@@ -7,7 +7,7 @@
db 3 ; catch rate
db 215 ; base exp
- INCBIN "gfx/pokemon/front_yellow/articuno.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions
dw ArticunoPicFront, ArticunoPicBack
db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index ac1c5757..3bace0b9 100644
--- a/data/pokemon/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 159 ; base exp
- INCBIN "gfx/pokemon/front_yellow/beedrill.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions
dw BeedrillPicFront, BeedrillPicBack
db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 8b46be24..b661b076 100644
--- a/data/pokemon/base_stats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 84 ; base exp
- INCBIN "gfx/pokemon/front_yellow/bellsprout.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/bellsprout.pic", 0, 1 ; sprite dimensions
dw BellsproutPicFront, BellsproutPicBack
db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 041db750..587d22f1 100644
--- a/data/pokemon/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 210 ; base exp
- INCBIN "gfx/pokemon/front_yellow/blastoise.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/blastoise.pic", 0, 1 ; sprite dimensions
dw BlastoisePicFront, BlastoisePicBack
db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset
diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index a20d2744..e2796f9e 100644
--- a/data/pokemon/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 64 ; base exp
- INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/bulbasaur.pic", 0, 1 ; sprite dimensions
dw BulbasaurPicFront, BulbasaurPicBack
db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index ca480b58..fb6a7841 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 160 ; base exp
- INCBIN "gfx/pokemon/front_yellow/butterfree.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions
dw ButterfreePicFront, ButterfreePicBack
db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index 1f048547..e9c196ab 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 53 ; base exp
- INCBIN "gfx/pokemon/front_yellow/caterpie.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/caterpie.pic", 0, 1 ; sprite dimensions
dw CaterpiePicFront, CaterpiePicBack
db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index 81da1513..17d1c31b 100644
--- a/data/pokemon/base_stats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
@@ -7,7 +7,7 @@
db 30 ; catch rate
db 255 ; base exp
- INCBIN "gfx/pokemon/front_yellow/chansey.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions
dw ChanseyPicFront, ChanseyPicBack
db POUND, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index 7154f472..3e162043 100644
--- a/data/pokemon/base_stats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 209 ; base exp
- INCBIN "gfx/pokemon/front_yellow/charizard.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/charizard.pic", 0, 1 ; sprite dimensions
dw CharizardPicFront, CharizardPicBack
db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset
diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index 4e3a7f59..8b754779 100644
--- a/data/pokemon/base_stats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 65 ; base exp
- INCBIN "gfx/pokemon/front_yellow/charmander.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions
dw CharmanderPicFront, CharmanderPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index e85ef0de..3c0549cb 100644
--- a/data/pokemon/base_stats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 142 ; base exp
- INCBIN "gfx/pokemon/front_yellow/charmeleon.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/charmeleon.pic", 0, 1 ; sprite dimensions
dw CharmeleonPicFront, CharmeleonPicBack
db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index c01ac2e6..3a962615 100644
--- a/data/pokemon/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
@@ -7,7 +7,7 @@
db 25 ; catch rate
db 129 ; base exp
- INCBIN "gfx/pokemon/front_yellow/clefable.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions
dw ClefablePicFront, ClefablePicBack
db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset
diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index a00ccafe..97a44bc0 100644
--- a/data/pokemon/base_stats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
@@ -7,7 +7,7 @@
db 150 ; catch rate
db 68 ; base exp
- INCBIN "gfx/pokemon/front_yellow/clefairy.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/clefairy.pic", 0, 1 ; sprite dimensions
dw ClefairyPicFront, ClefairyPicBack
db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index eb691a50..11b44938 100644
--- a/data/pokemon/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 203 ; base exp
- INCBIN "gfx/pokemon/front_yellow/cloyster.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions
dw CloysterPicFront, CloysterPicBack
db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset
diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index 53224fb8..80604b26 100644
--- a/data/pokemon/base_stats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 87 ; base exp
- INCBIN "gfx/pokemon/front_yellow/cubone.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions
dw CubonePicFront, CubonePicBack
db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index 7bb63662..b641bcdf 100644
--- a/data/pokemon/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 176 ; base exp
- INCBIN "gfx/pokemon/front_yellow/dewgong.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions
dw DewgongPicFront, DewgongPicBack
db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index 76721d69..5a1cab4d 100644
--- a/data/pokemon/base_stats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 81 ; base exp
- INCBIN "gfx/pokemon/front_yellow/diglett.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/diglett.pic", 0, 1 ; sprite dimensions
dw DiglettPicFront, DiglettPicBack
db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index a8a175ec..a3d919f4 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -7,7 +7,7 @@
db 35 ; catch rate
db 61 ; base exp
- INCBIN "gfx/pokemon/front_yellow/ditto.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/ditto.pic", 0, 1 ; sprite dimensions
dw DittoPicFront, DittoPicBack
db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index 481c021b..3da128c9 100644
--- a/data/pokemon/base_stats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 158 ; base exp
- INCBIN "gfx/pokemon/front_yellow/dodrio.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/dodrio.pic", 0, 1 ; sprite dimensions
dw DodrioPicFront, DodrioPicBack
db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index af9e2cf7..5b948b79 100644
--- a/data/pokemon/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 96 ; base exp
- INCBIN "gfx/pokemon/front_yellow/doduo.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions
dw DoduoPicFront, DoduoPicBack
db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index c50c8e74..461472d9 100644
--- a/data/pokemon/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
@@ -7,7 +7,7 @@
db 27 ; catch rate
db 144 ; base exp
- INCBIN "gfx/pokemon/front_yellow/dragonair.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions
dw DragonairPicFront, DragonairPicBack
db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index ff4aa45a..de337c7b 100644
--- a/data/pokemon/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
@@ -7,7 +7,7 @@
db 9 ; catch rate
db 218 ; base exp
- INCBIN "gfx/pokemon/front_yellow/dragonite.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions
dw DragonitePicFront, DragonitePicBack
db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset
diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index 28ac755b..4ad1a433 100644
--- a/data/pokemon/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 67 ; base exp
- INCBIN "gfx/pokemon/front_yellow/dratini.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions
dw DratiniPicFront, DratiniPicBack
db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 0c71b320..34eeaf42 100644
--- a/data/pokemon/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 102 ; base exp
- INCBIN "gfx/pokemon/front_yellow/drowzee.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/drowzee.pic", 0, 1 ; sprite dimensions
dw DrowzeePicFront, DrowzeePicBack
db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index e29c120b..3b70a603 100644
--- a/data/pokemon/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
@@ -7,7 +7,7 @@
db 50 ; catch rate
db 153 ; base exp
- INCBIN "gfx/pokemon/front_yellow/dugtrio.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions
dw DugtrioPicFront, DugtrioPicBack
db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index add50a6d..21883a6c 100644
--- a/data/pokemon/base_stats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 92 ; base exp
- INCBIN "gfx/pokemon/front_yellow/eevee.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions
dw EeveePicFront, EeveePicBack
db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index 0b6a8945..5350c43a 100644
--- a/data/pokemon/base_stats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 62 ; base exp
- INCBIN "gfx/pokemon/front_yellow/ekans.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/ekans.pic", 0, 1 ; sprite dimensions
dw EkansPicFront, EkansPicBack
db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index dfd153bb..b4afa84c 100644
--- a/data/pokemon/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 156 ; base exp
- INCBIN "gfx/pokemon/front_yellow/electabuzz.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/electabuzz.pic", 0, 1 ; sprite dimensions
dw ElectabuzzPicFront, ElectabuzzPicBack
db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index ae2e6cf4..c357c5ea 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 150 ; base exp
- INCBIN "gfx/pokemon/front_yellow/electrode.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/electrode.pic", 0, 1 ; sprite dimensions
dw ElectrodePicFront, ElectrodePicBack
db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index 418c3948..5bb47570 100644
--- a/data/pokemon/base_stats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 98 ; base exp
- INCBIN "gfx/pokemon/front_yellow/exeggcute.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/exeggcute.pic", 0, 1 ; sprite dimensions
dw ExeggcutePicFront, ExeggcutePicBack
db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index 236d706e..806b8f9e 100644
--- a/data/pokemon/base_stats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 212 ; base exp
- INCBIN "gfx/pokemon/front_yellow/exeggutor.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/exeggutor.pic", 0, 1 ; sprite dimensions
dw ExeggutorPicFront, ExeggutorPicBack
db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm
index d608b3fb..510f13a0 100644
--- a/data/pokemon/base_stats/farfetchd.asm
+++ b/data/pokemon/base_stats/farfetchd.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 94 ; base exp
- INCBIN "gfx/pokemon/front_yellow/farfetchd.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/farfetchd.pic", 0, 1 ; sprite dimensions
dw FarfetchdPicFront, FarfetchdPicBack
db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index afb89921..7bfc47de 100644
--- a/data/pokemon/base_stats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 162 ; base exp
- INCBIN "gfx/pokemon/front_yellow/fearow.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/fearow.pic", 0, 1 ; sprite dimensions
dw FearowPicFront, FearowPicBack
db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index 0a714783..ee244eb7 100644
--- a/data/pokemon/base_stats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 198 ; base exp
- INCBIN "gfx/pokemon/front_yellow/flareon.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/flareon.pic", 0, 1 ; sprite dimensions
dw FlareonPicFront, FlareonPicBack
db TACKLE, TAIL_WHIP, QUICK_ATTACK, EMBER ; level 1 learnset
diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index fc8c86ef..dc3605f4 100644
--- a/data/pokemon/base_stats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 95 ; base exp
- INCBIN "gfx/pokemon/front_yellow/gastly.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/gastly.pic", 0, 1 ; sprite dimensions
dw GastlyPicFront, GastlyPicBack
db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index dc9105c6..2a33ef0c 100644
--- a/data/pokemon/base_stats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 190 ; base exp
- INCBIN "gfx/pokemon/front_yellow/gengar.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/gengar.pic", 0, 1 ; sprite dimensions
dw GengarPicFront, GengarPicBack
db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index a2225f5c..c8fe8059 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 86 ; base exp
- INCBIN "gfx/pokemon/front_yellow/geodude.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/geodude.pic", 0, 1 ; sprite dimensions
dw GeodudePicFront, GeodudePicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 8c24985c..3c2c3a25 100644
--- a/data/pokemon/base_stats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 132 ; base exp
- INCBIN "gfx/pokemon/front_yellow/gloom.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/gloom.pic", 0, 1 ; sprite dimensions
dw GloomPicFront, GloomPicBack
db ABSORB, POISONPOWDER, STUN_SPORE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index 6eb60490..9c852c91 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 171 ; base exp
- INCBIN "gfx/pokemon/front_yellow/golbat.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions
dw GolbatPicFront, GolbatPicBack
db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index 662c6c93..ae9c6618 100644
--- a/data/pokemon/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
@@ -7,7 +7,7 @@
db 225 ; catch rate
db 111 ; base exp
- INCBIN "gfx/pokemon/front_yellow/goldeen.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions
dw GoldeenPicFront, GoldeenPicBack
db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index b7c035c6..cab8fef2 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 174 ; base exp
- INCBIN "gfx/pokemon/front_yellow/golduck.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions
dw GolduckPicFront, GolduckPicBack
db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index a8f5cbf9..66793ae6 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 177 ; base exp
- INCBIN "gfx/pokemon/front_yellow/golem.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/golem.pic", 0, 1 ; sprite dimensions
dw GolemPicFront, GolemPicBack
db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index d5dfda81..a09342fa 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 134 ; base exp
- INCBIN "gfx/pokemon/front_yellow/graveler.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/graveler.pic", 0, 1 ; sprite dimensions
dw GravelerPicFront, GravelerPicBack
db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index b2e0f08a..981ca190 100644
--- a/data/pokemon/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 90 ; base exp
- INCBIN "gfx/pokemon/front_yellow/grimer.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/grimer.pic", 0, 1 ; sprite dimensions
dw GrimerPicFront, GrimerPicBack
db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index 2c70184f..34ebb1d1 100644
--- a/data/pokemon/base_stats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 91 ; base exp
- INCBIN "gfx/pokemon/front_yellow/growlithe.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/growlithe.pic", 0, 1 ; sprite dimensions
dw GrowlithePicFront, GrowlithePicBack
db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 13c30ff8..7e6476e1 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 214 ; base exp
- INCBIN "gfx/pokemon/front_yellow/gyarados.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/gyarados.pic", 0, 1 ; sprite dimensions
dw GyaradosPicFront, GyaradosPicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index cf9df9ec..66ebf659 100644
--- a/data/pokemon/base_stats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 126 ; base exp
- INCBIN "gfx/pokemon/front_yellow/haunter.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/haunter.pic", 0, 1 ; sprite dimensions
dw HaunterPicFront, HaunterPicBack
db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index 1b7651ff..b9944f75 100644
--- a/data/pokemon/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 140 ; base exp
- INCBIN "gfx/pokemon/front_yellow/hitmonchan.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/hitmonchan.pic", 0, 1 ; sprite dimensions
dw HitmonchanPicFront, HitmonchanPicBack
db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index 51da5f75..f9b2a5bd 100644
--- a/data/pokemon/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 139 ; base exp
- INCBIN "gfx/pokemon/front_yellow/hitmonlee.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions
dw HitmonleePicFront, HitmonleePicBack
db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index 1a5a5aff..0336f23c 100644
--- a/data/pokemon/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
@@ -7,7 +7,7 @@
db 225 ; catch rate
db 83 ; base exp
- INCBIN "gfx/pokemon/front_yellow/horsea.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/horsea.pic", 0, 1 ; sprite dimensions
dw HorseaPicFront, HorseaPicBack
db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index b43cd961..1198a1e8 100644
--- a/data/pokemon/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 165 ; base exp
- INCBIN "gfx/pokemon/front_yellow/hypno.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/hypno.pic", 0, 1 ; sprite dimensions
dw HypnoPicFront, HypnoPicBack
db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset
diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index 3d69a8d7..3601a924 100644
--- a/data/pokemon/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 141 ; base exp
- INCBIN "gfx/pokemon/front_yellow/ivysaur.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions
dw IvysaurPicFront, IvysaurPicBack
db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index 8348431d..5b260326 100644
--- a/data/pokemon/base_stats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
@@ -7,7 +7,7 @@
db 170 ; catch rate
db 76 ; base exp
- INCBIN "gfx/pokemon/front_yellow/jigglypuff.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/jigglypuff.pic", 0, 1 ; sprite dimensions
dw JigglypuffPicFront, JigglypuffPicBack
db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index 3db8c96a..572519fa 100644
--- a/data/pokemon/base_stats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 197 ; base exp
- INCBIN "gfx/pokemon/front_yellow/jolteon.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/jolteon.pic", 0, 1 ; sprite dimensions
dw JolteonPicFront, JolteonPicBack
db TACKLE, TAIL_WHIP, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset
diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index f4fe28c7..e53acce1 100644
--- a/data/pokemon/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 137 ; base exp
- INCBIN "gfx/pokemon/front_yellow/jynx.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions
dw JynxPicFront, JynxPicBack
db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index d5d96d1f..c0b5a4fb 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 119 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kabuto.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kabuto.pic", 0, 1 ; sprite dimensions
dw KabutoPicFront, KabutoPicBack
db SCRATCH, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index f067949e..e1f45b8a 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 201 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kabutops.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kabutops.pic", 0, 1 ; sprite dimensions
dw KabutopsPicFront, KabutopsPicBack
db SCRATCH, HARDEN, ABSORB, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index 30d2feef..c157ad8c 100644
--- a/data/pokemon/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
@@ -7,7 +7,7 @@
db 100 ; catch rate
db 145 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kadabra.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kadabra.pic", 0, 1 ; sprite dimensions
dw KadabraPicFront, KadabraPicBack
db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index 39870dc4..c0cfb63c 100644
--- a/data/pokemon/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 71 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kakuna.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions
dw KakunaPicFront, KakunaPicBack
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 7d3cf971..828c81ba 100644
--- a/data/pokemon/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 175 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kangaskhan.pic", 0, 1 ; sprite dimensions
dw KangaskhanPicFront, KangaskhanPicBack
db COMET_PUNCH, RAGE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index c0d75d62..01eea56d 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 206 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kingler.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kingler.pic", 0, 1 ; sprite dimensions
dw KinglerPicFront, KinglerPicBack
db BUBBLE, LEER, VICEGRIP, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index 5b63ebc8..7acad16d 100644
--- a/data/pokemon/base_stats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 114 ; base exp
- INCBIN "gfx/pokemon/front_yellow/koffing.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/koffing.pic", 0, 1 ; sprite dimensions
dw KoffingPicFront, KoffingPicBack
db TACKLE, SMOG, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index dd0f739a..72e4102a 100644
--- a/data/pokemon/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
@@ -7,7 +7,7 @@
db 225 ; catch rate
db 115 ; base exp
- INCBIN "gfx/pokemon/front_yellow/krabby.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/krabby.pic", 0, 1 ; sprite dimensions
dw KrabbyPicFront, KrabbyPicBack
db BUBBLE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index eb45e08c..6c564568 100644
--- a/data/pokemon/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 219 ; base exp
- INCBIN "gfx/pokemon/front_yellow/lapras.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/lapras.pic", 0, 1 ; sprite dimensions
dw LaprasPicFront, LaprasPicBack
db WATER_GUN, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index eef13946..dab77382 100644
--- a/data/pokemon/base_stats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 127 ; base exp
- INCBIN "gfx/pokemon/front_yellow/lickitung.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions
dw LickitungPicFront, LickitungPicBack
db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index e00ccea6..fee3e41c 100644
--- a/data/pokemon/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 193 ; base exp
- INCBIN "gfx/pokemon/front_yellow/machamp.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/machamp.pic", 0, 1 ; sprite dimensions
dw MachampPicFront, MachampPicBack
db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index 0e1a1d46..cb95d663 100644
--- a/data/pokemon/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 146 ; base exp
- INCBIN "gfx/pokemon/front_yellow/machoke.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions
dw MachokePicFront, MachokePicBack
db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index 3c7b8491..eba3de67 100644
--- a/data/pokemon/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
@@ -7,7 +7,7 @@
db 180 ; catch rate
db 88 ; base exp
- INCBIN "gfx/pokemon/front_yellow/machop.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/machop.pic", 0, 1 ; sprite dimensions
dw MachopPicFront, MachopPicBack
db KARATE_CHOP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 8d7eef46..c2c2f8c2 100644
--- a/data/pokemon/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 20 ; base exp
- INCBIN "gfx/pokemon/front_yellow/magikarp.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/magikarp.pic", 0, 1 ; sprite dimensions
dw MagikarpPicFront, MagikarpPicBack
db SPLASH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index 1619e211..821a7e28 100644
--- a/data/pokemon/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 167 ; base exp
- INCBIN "gfx/pokemon/front_yellow/magmar.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/magmar.pic", 0, 1 ; sprite dimensions
dw MagmarPicFront, MagmarPicBack
db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index cb249496..7fcea714 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 89 ; base exp
- INCBIN "gfx/pokemon/front_yellow/magnemite.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/magnemite.pic", 0, 1 ; sprite dimensions
dw MagnemitePicFront, MagnemitePicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 36db2428..2061ce53 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 161 ; base exp
- INCBIN "gfx/pokemon/front_yellow/magneton.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions
dw MagnetonPicFront, MagnetonPicBack
db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index cb60435b..e1682079 100644
--- a/data/pokemon/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 74 ; base exp
- INCBIN "gfx/pokemon/front_yellow/mankey.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/mankey.pic", 0, 1 ; sprite dimensions
dw MankeyPicFront, MankeyPicBack
db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index bdd1636e..fdf11c15 100644
--- a/data/pokemon/base_stats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 124 ; base exp
- INCBIN "gfx/pokemon/front_yellow/marowak.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions
dw MarowakPicFront, MarowakPicBack
db BONE_CLUB, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index 9b06043b..6f7936ce 100644
--- a/data/pokemon/base_stats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 69 ; base exp
- INCBIN "gfx/pokemon/front_yellow/meowth.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/meowth.pic", 0, 1 ; sprite dimensions
dw MeowthPicFront, MeowthPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index 5d3d1740..e20b08bf 100644
--- a/data/pokemon/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 72 ; base exp
- INCBIN "gfx/pokemon/front_yellow/metapod.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions
dw MetapodPicFront, MetapodPicBack
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index caa7fb85..46753c12 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 64 ; base exp
- INCBIN "gfx/pokemon/front_yellow/mew.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/mew.pic", 0, 1 ; sprite dimensions
dw MewPicFront, MewPicBack
db POUND, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 99ff53fe..43817236 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
@@ -7,7 +7,7 @@
db 3 ; catch rate
db 220 ; base exp
- INCBIN "gfx/pokemon/front_yellow/mewtwo.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/mewtwo.pic", 0, 1 ; sprite dimensions
dw MewtwoPicFront, MewtwoPicBack
db CONFUSION, DISABLE, SWIFT, PSYCHIC_M ; level 1 learnset
diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index 50b23fd8..56bba4bb 100644
--- a/data/pokemon/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
@@ -7,7 +7,7 @@
db 3 ; catch rate
db 217 ; base exp
- INCBIN "gfx/pokemon/front_yellow/moltres.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions
dw MoltresPicFront, MoltresPicBack
db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm
index e6cdba21..2524b890 100644
--- a/data/pokemon/base_stats/mrmime.asm
+++ b/data/pokemon/base_stats/mrmime.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 136 ; base exp
- INCBIN "gfx/pokemon/front_yellow/mr.mime.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/mr.mime.pic", 0, 1 ; sprite dimensions
dw MrMimePicFront, MrMimePicBack
db CONFUSION, BARRIER, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm
index 42885050..18ec9d33 100644
--- a/data/pokemon/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 157 ; base exp
- INCBIN "gfx/pokemon/front_yellow/muk.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/muk.pic", 0, 1 ; sprite dimensions
dw MukPicFront, MukPicBack
db POUND, DISABLE, POISON_GAS, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index 602ed2ff..5f1db339 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 195 ; base exp
- INCBIN "gfx/pokemon/front_yellow/nidoking.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions
dw NidokingPicFront, NidokingPicBack
db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index 5fba3fed..c7f38bcc 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 194 ; base exp
- INCBIN "gfx/pokemon/front_yellow/nidoqueen.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/nidoqueen.pic", 0, 1 ; sprite dimensions
dw NidoqueenPicFront, NidoqueenPicBack
db TACKLE, SCRATCH, TAIL_WHIP, BODY_SLAM ; level 1 learnset
diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm
index 814e2dd7..0a6acaed 100644
--- a/data/pokemon/base_stats/nidoranf.asm
+++ b/data/pokemon/base_stats/nidoranf.asm
@@ -7,7 +7,7 @@
db 235 ; catch rate
db 59 ; base exp
- INCBIN "gfx/pokemon/front_yellow/nidoranf.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/nidoranf.pic", 0, 1 ; sprite dimensions
dw NidoranFPicFront, NidoranFPicBack
db GROWL, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm
index 05b3050a..75890d1d 100644
--- a/data/pokemon/base_stats/nidoranm.asm
+++ b/data/pokemon/base_stats/nidoranm.asm
@@ -7,7 +7,7 @@
db 235 ; catch rate
db 60 ; base exp
- INCBIN "gfx/pokemon/front_yellow/nidoranm.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/nidoranm.pic", 0, 1 ; sprite dimensions
dw NidoranMPicFront, NidoranMPicBack
db LEER, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index 9831db3e..27f9fb22 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 117 ; base exp
- INCBIN "gfx/pokemon/front_yellow/nidorina.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/nidorina.pic", 0, 1 ; sprite dimensions
dw NidorinaPicFront, NidorinaPicBack
db GROWL, TACKLE, SCRATCH, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index d8abd036..55c9d346 100644
--- a/data/pokemon/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 118 ; base exp
- INCBIN "gfx/pokemon/front_yellow/nidorino.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/nidorino.pic", 0, 1 ; sprite dimensions
dw NidorinoPicFront, NidorinoPicBack
db LEER, TACKLE, HORN_ATTACK, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index 7373d2e9..3e814fee 100644
--- a/data/pokemon/base_stats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 178 ; base exp
- INCBIN "gfx/pokemon/front_yellow/ninetales.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/ninetales.pic", 0, 1 ; sprite dimensions
dw NinetalesPicFront, NinetalesPicBack
db EMBER, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset
diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index de1498b9..953d8e11 100644
--- a/data/pokemon/base_stats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 78 ; base exp
- INCBIN "gfx/pokemon/front_yellow/oddish.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/oddish.pic", 0, 1 ; sprite dimensions
dw OddishPicFront, OddishPicBack
db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 1dff5d20..5021dfe2 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 120 ; base exp
- INCBIN "gfx/pokemon/front_yellow/omanyte.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/omanyte.pic", 0, 1 ; sprite dimensions
dw OmanytePicFront, OmanytePicBack
db WATER_GUN, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index 1deaf789..035473cf 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 199 ; base exp
- INCBIN "gfx/pokemon/front_yellow/omastar.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions
dw OmastarPicFront, OmastarPicBack
db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index 96048ee5..6ca93760 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 108 ; base exp
- INCBIN "gfx/pokemon/front_yellow/onix.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions
dw OnixPicFront, OnixPicBack
db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm
index 82e9920e..110e39d2 100644
--- a/data/pokemon/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 70 ; base exp
- INCBIN "gfx/pokemon/front_yellow/paras.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/paras.pic", 0, 1 ; sprite dimensions
dw ParasPicFront, ParasPicBack
db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index bcd47673..904543d8 100644
--- a/data/pokemon/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 128 ; base exp
- INCBIN "gfx/pokemon/front_yellow/parasect.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/parasect.pic", 0, 1 ; sprite dimensions
dw ParasectPicFront, ParasectPicBack
db SCRATCH, STUN_SPORE, LEECH_LIFE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm
index 4da05861..09477728 100644
--- a/data/pokemon/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 148 ; base exp
- INCBIN "gfx/pokemon/front_yellow/persian.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/persian.pic", 0, 1 ; sprite dimensions
dw PersianPicFront, PersianPicBack
db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset
diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index b4370201..7473d425 100644
--- a/data/pokemon/base_stats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 172 ; base exp
- INCBIN "gfx/pokemon/front_yellow/pidgeot.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/pidgeot.pic", 0, 1 ; sprite dimensions
dw PidgeotPicFront, PidgeotPicBack
db GUST, SAND_ATTACK, QUICK_ATTACK, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index c44325db..aeca9a6d 100644
--- a/data/pokemon/base_stats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 113 ; base exp
- INCBIN "gfx/pokemon/front_yellow/pidgeotto.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/pidgeotto.pic", 0, 1 ; sprite dimensions
dw PidgeottoPicFront, PidgeottoPicBack
db GUST, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index 0c1c241b..ba71d692 100644
--- a/data/pokemon/base_stats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 55 ; base exp
- INCBIN "gfx/pokemon/front_yellow/pidgey.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/pidgey.pic", 0, 1 ; sprite dimensions
dw PidgeyPicFront, PidgeyPicBack
db GUST, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index 8bef5f8b..ff881020 100644
--- a/data/pokemon/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 82 ; base exp
- INCBIN "gfx/pokemon/front_yellow/pikachu.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/pikachu.pic", 0, 1 ; sprite dimensions
dw PikachuPicFront, PikachuPicBack
db THUNDERSHOCK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index e67a2896..fa0aa5a4 100644
--- a/data/pokemon/base_stats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 200 ; base exp
- INCBIN "gfx/pokemon/front_yellow/pinsir.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/pinsir.pic", 0, 1 ; sprite dimensions
dw PinsirPicFront, PinsirPicBack
db VICEGRIP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index 04f0aae5..007881a1 100644
--- a/data/pokemon/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 77 ; base exp
- INCBIN "gfx/pokemon/front_yellow/poliwag.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/poliwag.pic", 0, 1 ; sprite dimensions
dw PoliwagPicFront, PoliwagPicBack
db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index 54673b74..f8212eaf 100644
--- a/data/pokemon/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 131 ; base exp
- INCBIN "gfx/pokemon/front_yellow/poliwhirl.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/poliwhirl.pic", 0, 1 ; sprite dimensions
dw PoliwhirlPicFront, PoliwhirlPicBack
db BUBBLE, HYPNOSIS, WATER_GUN, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 2c3b6bc5..2975365a 100644
--- a/data/pokemon/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 185 ; base exp
- INCBIN "gfx/pokemon/front_yellow/poliwrath.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions
dw PoliwrathPicFront, PoliwrathPicBack
db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index ee8e3389..1e6756f0 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 152 ; base exp
- INCBIN "gfx/pokemon/front_yellow/ponyta.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions
dw PonytaPicFront, PonytaPicBack
db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index 8be8923e..e487abe0 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 130 ; base exp
- INCBIN "gfx/pokemon/front_yellow/porygon.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions
dw PorygonPicFront, PorygonPicBack
db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index 57f6e901..67f52b4a 100644
--- a/data/pokemon/base_stats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 149 ; base exp
- INCBIN "gfx/pokemon/front_yellow/primeape.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions
dw PrimeapePicFront, PrimeapePicBack
db SCRATCH, LEER, LOW_KICK, KARATE_CHOP ; level 1 learnset
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 1f6c4437..1a8f1dfd 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 80 ; base exp
- INCBIN "gfx/pokemon/front_yellow/psyduck.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions
dw PsyduckPicFront, PsyduckPicBack
db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index 9ac93813..f5ea6bad 100644
--- a/data/pokemon/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 122 ; base exp
- INCBIN "gfx/pokemon/front_yellow/raichu.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/raichu.pic", 0, 1 ; sprite dimensions
dw RaichuPicFront, RaichuPicBack
db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 8a093859..faafafd5 100644
--- a/data/pokemon/base_stats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 192 ; base exp
- INCBIN "gfx/pokemon/front_yellow/rapidash.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/rapidash.pic", 0, 1 ; sprite dimensions
dw RapidashPicFront, RapidashPicBack
db EMBER, TAIL_WHIP, STOMP, GROWL ; level 1 learnset
diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 9dc46afb..4766a145 100644
--- a/data/pokemon/base_stats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 116 ; base exp
- INCBIN "gfx/pokemon/front_yellow/raticate.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/raticate.pic", 0, 1 ; sprite dimensions
dw RaticatePicFront, RaticatePicBack
db TACKLE, TAIL_WHIP, QUICK_ATTACK, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index 9cace629..62883493 100644
--- a/data/pokemon/base_stats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 57 ; base exp
- INCBIN "gfx/pokemon/front_yellow/rattata.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/rattata.pic", 0, 1 ; sprite dimensions
dw RattataPicFront, RattataPicBack
db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index f08f7255..bb83fa1b 100644
--- a/data/pokemon/base_stats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 204 ; base exp
- INCBIN "gfx/pokemon/front_yellow/rhydon.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions
dw RhydonPicFront, RhydonPicBack
db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset
diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index 3b8b1eb4..dd79d794 100644
--- a/data/pokemon/base_stats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 135 ; base exp
- INCBIN "gfx/pokemon/front_yellow/rhyhorn.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/rhyhorn.pic", 0, 1 ; sprite dimensions
dw RhyhornPicFront, RhyhornPicBack
db HORN_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index aa107190..c8b81bc6 100644
--- a/data/pokemon/base_stats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 93 ; base exp
- INCBIN "gfx/pokemon/front_yellow/sandshrew.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/sandshrew.pic", 0, 1 ; sprite dimensions
dw SandshrewPicFront, SandshrewPicBack
db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index 9c51bbba..e60c1e87 100644
--- a/data/pokemon/base_stats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
@@ -7,7 +7,7 @@
db 90 ; catch rate
db 163 ; base exp
- INCBIN "gfx/pokemon/front_yellow/sandslash.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/sandslash.pic", 0, 1 ; sprite dimensions
dw SandslashPicFront, SandslashPicBack
db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index de73eea4..802e6814 100644
--- a/data/pokemon/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 187 ; base exp
- INCBIN "gfx/pokemon/front_yellow/scyther.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions
dw ScytherPicFront, ScytherPicBack
db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index 89ab670f..2e38a5df 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 155 ; base exp
- INCBIN "gfx/pokemon/front_yellow/seadra.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions
dw SeadraPicFront, SeadraPicBack
db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index bcb0dd64..2b35197c 100644
--- a/data/pokemon/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 170 ; base exp
- INCBIN "gfx/pokemon/front_yellow/seaking.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions
dw SeakingPicFront, SeakingPicBack
db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index eba3d34d..04bbd488 100644
--- a/data/pokemon/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 100 ; base exp
- INCBIN "gfx/pokemon/front_yellow/seel.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/seel.pic", 0, 1 ; sprite dimensions
dw SeelPicFront, SeelPicBack
db HEADBUTT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index ed8cc154..4ed61a22 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 97 ; base exp
- INCBIN "gfx/pokemon/front_yellow/shellder.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/shellder.pic", 0, 1 ; sprite dimensions
dw ShellderPicFront, ShellderPicBack
db TACKLE, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index 33f02f22..fa6734ab 100644
--- a/data/pokemon/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 164 ; base exp
- INCBIN "gfx/pokemon/front_yellow/slowbro.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions
dw SlowbroPicFront, SlowbroPicBack
db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index 32eb6aa9..9082a0de 100644
--- a/data/pokemon/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 99 ; base exp
- INCBIN "gfx/pokemon/front_yellow/slowpoke.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/slowpoke.pic", 0, 1 ; sprite dimensions
dw SlowpokePicFront, SlowpokePicBack
db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index f835a4b9..b29c6fef 100644
--- a/data/pokemon/base_stats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
@@ -7,7 +7,7 @@
db 25 ; catch rate
db 154 ; base exp
- INCBIN "gfx/pokemon/front_yellow/snorlax.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/snorlax.pic", 0, 1 ; sprite dimensions
dw SnorlaxPicFront, SnorlaxPicBack
db HEADBUTT, AMNESIA, REST, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index c353fc89..344a13ef 100644
--- a/data/pokemon/base_stats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 58 ; base exp
- INCBIN "gfx/pokemon/front_yellow/spearow.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/spearow.pic", 0, 1 ; sprite dimensions
dw SpearowPicFront, SpearowPicBack
db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index 11db64ac..8444d11a 100644
--- a/data/pokemon/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 66 ; base exp
- INCBIN "gfx/pokemon/front_yellow/squirtle.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/squirtle.pic", 0, 1 ; sprite dimensions
dw SquirtlePicFront, SquirtlePicBack
db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index 6f9681a2..06a44b3d 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 207 ; base exp
- INCBIN "gfx/pokemon/front_yellow/starmie.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/starmie.pic", 0, 1 ; sprite dimensions
dw StarmiePicFront, StarmiePicBack
db TACKLE, WATER_GUN, HARDEN, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index 08b1250b..dfbb8290 100644
--- a/data/pokemon/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
@@ -7,7 +7,7 @@
db 225 ; catch rate
db 106 ; base exp
- INCBIN "gfx/pokemon/front_yellow/staryu.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/staryu.pic", 0, 1 ; sprite dimensions
dw StaryuPicFront, StaryuPicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index bb0bafd1..e7de04ea 100644
--- a/data/pokemon/base_stats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 166 ; base exp
- INCBIN "gfx/pokemon/front_yellow/tangela.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions
dw TangelaPicFront, TangelaPicBack
db CONSTRICT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 311eecad..b2cf9631 100644
--- a/data/pokemon/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 211 ; base exp
- INCBIN "gfx/pokemon/front_yellow/tauros.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions
dw TaurosPicFront, TaurosPicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index 7f128c3f..fa2a922f 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 105 ; base exp
- INCBIN "gfx/pokemon/front_yellow/tentacool.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/tentacool.pic", 0, 1 ; sprite dimensions
dw TentacoolPicFront, TentacoolPicBack
db ACID, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index eeea2d0f..5fc91308 100644
--- a/data/pokemon/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 205 ; base exp
- INCBIN "gfx/pokemon/front_yellow/tentacruel.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/tentacruel.pic", 0, 1 ; sprite dimensions
dw TentacruelPicFront, TentacruelPicBack
db ACID, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index bc800fea..ed7eb085 100644
--- a/data/pokemon/base_stats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 196 ; base exp
- INCBIN "gfx/pokemon/front_yellow/vaporeon.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions
dw VaporeonPicFront, VaporeonPicBack
db TACKLE, TAIL_WHIP, QUICK_ATTACK, WATER_GUN ; level 1 learnset
diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index 85c1de76..6ab27f83 100644
--- a/data/pokemon/base_stats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
@@ -7,7 +7,7 @@
db 75 ; catch rate
db 138 ; base exp
- INCBIN "gfx/pokemon/front_yellow/venomoth.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/venomoth.pic", 0, 1 ; sprite dimensions
dw VenomothPicFront, VenomothPicBack
db TACKLE, DISABLE, SUPERSONIC, CONFUSION ; level 1 learnset
diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index 47590f61..ec230b1c 100644
--- a/data/pokemon/base_stats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 75 ; base exp
- INCBIN "gfx/pokemon/front_yellow/venonat.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/venonat.pic", 0, 1 ; sprite dimensions
dw VenonatPicFront, VenonatPicBack
db TACKLE, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index d97b9c64..118ed64c 100644
--- a/data/pokemon/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 208 ; base exp
- INCBIN "gfx/pokemon/front_yellow/venusaur.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions
dw VenusaurPicFront, VenusaurPicBack
db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset
diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index 8fd9c2f9..a54b06de 100644
--- a/data/pokemon/base_stats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 191 ; base exp
- INCBIN "gfx/pokemon/front_yellow/victreebel.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/victreebel.pic", 0, 1 ; sprite dimensions
dw VictreebelPicFront, VictreebelPicBack
db SLEEP_POWDER, STUN_SPORE, ACID, RAZOR_LEAF ; level 1 learnset
diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index d6baddb9..adc6f686 100644
--- a/data/pokemon/base_stats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 184 ; base exp
- INCBIN "gfx/pokemon/front_yellow/vileplume.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/vileplume.pic", 0, 1 ; sprite dimensions
dw VileplumePicFront, VileplumePicBack
db STUN_SPORE, SLEEP_POWDER, ACID, PETAL_DANCE ; level 1 learnset
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 6234d3a4..3c0fa84b 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 103 ; base exp
- INCBIN "gfx/pokemon/front_yellow/voltorb.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/voltorb.pic", 0, 1 ; sprite dimensions
dw VoltorbPicFront, VoltorbPicBack
db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index 7aba033e..9c829a0c 100644
--- a/data/pokemon/base_stats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
@@ -7,7 +7,7 @@
db 190 ; catch rate
db 63 ; base exp
- INCBIN "gfx/pokemon/front_yellow/vulpix.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/vulpix.pic", 0, 1 ; sprite dimensions
dw VulpixPicFront, VulpixPicBack
db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index df4c7314..7c0ec7bf 100644
--- a/data/pokemon/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
@@ -7,7 +7,7 @@
db 45 ; catch rate
db 143 ; base exp
- INCBIN "gfx/pokemon/front_yellow/wartortle.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/wartortle.pic", 0, 1 ; sprite dimensions
dw WartortlePicFront, WartortlePicBack
db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index 67769f3b..f6aba236 100644
--- a/data/pokemon/base_stats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 52 ; base exp
- INCBIN "gfx/pokemon/front_yellow/weedle.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/weedle.pic", 0, 1 ; sprite dimensions
dw WeedlePicFront, WeedlePicBack
db POISON_STING, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index 90a3dc49..e978443d 100644
--- a/data/pokemon/base_stats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
@@ -7,7 +7,7 @@
db 120 ; catch rate
db 151 ; base exp
- INCBIN "gfx/pokemon/front_yellow/weepinbell.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/weepinbell.pic", 0, 1 ; sprite dimensions
dw WeepinbellPicFront, WeepinbellPicBack
db VINE_WHIP, GROWTH, WRAP, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index f5618bb0..f3c033c6 100644
--- a/data/pokemon/base_stats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
@@ -7,7 +7,7 @@
db 60 ; catch rate
db 173 ; base exp
- INCBIN "gfx/pokemon/front_yellow/weezing.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/weezing.pic", 0, 1 ; sprite dimensions
dw WeezingPicFront, WeezingPicBack
db TACKLE, SMOG, SLUDGE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index 2a6876b2..c72212f3 100644
--- a/data/pokemon/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
@@ -7,7 +7,7 @@
db 50 ; catch rate
db 109 ; base exp
- INCBIN "gfx/pokemon/front_yellow/wigglytuff.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions
dw WigglytuffPicFront, WigglytuffPicBack
db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset
diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 68b6396a..eca4ed22 100644
--- a/data/pokemon/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
@@ -7,7 +7,7 @@
db 3 ; catch rate
db 216 ; base exp
- INCBIN "gfx/pokemon/front_yellow/zapdos.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions
dw ZapdosPicFront, ZapdosPicBack
db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index 9e4fa80f..a637d6a5 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@@ -7,7 +7,7 @@
db 255 ; catch rate
db 54 ; base exp
- INCBIN "gfx/pokemon/front_yellow/zubat.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions
dw ZubatPicFront, ZubatPicBack
db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset