summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/baseStats/abra.asm2
-rwxr-xr-xdata/baseStats/aerodactyl.asm2
-rwxr-xr-xdata/baseStats/alakazam.asm2
-rwxr-xr-xdata/baseStats/arbok.asm2
-rwxr-xr-xdata/baseStats/arcanine.asm2
-rwxr-xr-xdata/baseStats/articuno.asm2
-rwxr-xr-xdata/baseStats/beedrill.asm2
-rwxr-xr-xdata/baseStats/bellsprout.asm2
-rwxr-xr-xdata/baseStats/blastoise.asm2
-rwxr-xr-xdata/baseStats/bulbasaur.asm2
-rwxr-xr-xdata/baseStats/butterfree.asm2
-rwxr-xr-xdata/baseStats/caterpie.asm2
-rwxr-xr-xdata/baseStats/chansey.asm2
-rwxr-xr-xdata/baseStats/charizard.asm2
-rwxr-xr-xdata/baseStats/charmander.asm2
-rwxr-xr-xdata/baseStats/charmeleon.asm2
-rwxr-xr-xdata/baseStats/clefable.asm2
-rwxr-xr-xdata/baseStats/clefairy.asm2
-rwxr-xr-xdata/baseStats/cloyster.asm2
-rwxr-xr-xdata/baseStats/cubone.asm2
-rwxr-xr-xdata/baseStats/dewgong.asm2
-rwxr-xr-xdata/baseStats/diglett.asm2
-rwxr-xr-xdata/baseStats/ditto.asm2
-rwxr-xr-xdata/baseStats/dodrio.asm2
-rwxr-xr-xdata/baseStats/doduo.asm2
-rwxr-xr-xdata/baseStats/dragonair.asm2
-rwxr-xr-xdata/baseStats/dragonite.asm2
-rwxr-xr-xdata/baseStats/dratini.asm2
-rwxr-xr-xdata/baseStats/drowzee.asm2
-rwxr-xr-xdata/baseStats/dugtrio.asm2
-rwxr-xr-xdata/baseStats/eevee.asm2
-rwxr-xr-xdata/baseStats/ekans.asm2
-rwxr-xr-xdata/baseStats/electabuzz.asm2
-rwxr-xr-xdata/baseStats/electrode.asm2
-rwxr-xr-xdata/baseStats/exeggcute.asm2
-rwxr-xr-xdata/baseStats/exeggutor.asm2
-rwxr-xr-xdata/baseStats/farfetchd.asm2
-rwxr-xr-xdata/baseStats/fearow.asm2
-rwxr-xr-xdata/baseStats/flareon.asm2
-rwxr-xr-xdata/baseStats/gastly.asm2
-rwxr-xr-xdata/baseStats/gengar.asm2
-rwxr-xr-xdata/baseStats/geodude.asm2
-rwxr-xr-xdata/baseStats/gloom.asm2
-rwxr-xr-xdata/baseStats/golbat.asm2
-rwxr-xr-xdata/baseStats/goldeen.asm2
-rwxr-xr-xdata/baseStats/golduck.asm2
-rwxr-xr-xdata/baseStats/golem.asm2
-rwxr-xr-xdata/baseStats/graveler.asm2
-rwxr-xr-xdata/baseStats/grimer.asm2
-rwxr-xr-xdata/baseStats/growlithe.asm2
-rwxr-xr-xdata/baseStats/gyarados.asm2
-rwxr-xr-xdata/baseStats/haunter.asm2
-rwxr-xr-xdata/baseStats/hitmonchan.asm2
-rwxr-xr-xdata/baseStats/hitmonlee.asm2
-rwxr-xr-xdata/baseStats/horsea.asm2
-rwxr-xr-xdata/baseStats/hypno.asm2
-rwxr-xr-xdata/baseStats/ivysaur.asm2
-rwxr-xr-xdata/baseStats/jigglypuff.asm2
-rwxr-xr-xdata/baseStats/jolteon.asm2
-rwxr-xr-xdata/baseStats/jynx.asm2
-rwxr-xr-xdata/baseStats/kabuto.asm2
-rwxr-xr-xdata/baseStats/kabutops.asm2
-rwxr-xr-xdata/baseStats/kadabra.asm2
-rwxr-xr-xdata/baseStats/kakuna.asm2
-rwxr-xr-xdata/baseStats/kangaskhan.asm2
-rwxr-xr-xdata/baseStats/kingler.asm2
-rwxr-xr-xdata/baseStats/koffing.asm2
-rwxr-xr-xdata/baseStats/krabby.asm2
-rwxr-xr-xdata/baseStats/lapras.asm2
-rwxr-xr-xdata/baseStats/lickitung.asm2
-rwxr-xr-xdata/baseStats/machamp.asm2
-rwxr-xr-xdata/baseStats/machoke.asm2
-rwxr-xr-xdata/baseStats/machop.asm2
-rwxr-xr-xdata/baseStats/magikarp.asm2
-rwxr-xr-xdata/baseStats/magmar.asm2
-rwxr-xr-xdata/baseStats/magnemite.asm2
-rwxr-xr-xdata/baseStats/magneton.asm2
-rwxr-xr-xdata/baseStats/mankey.asm2
-rwxr-xr-xdata/baseStats/marowak.asm2
-rwxr-xr-xdata/baseStats/meowth.asm2
-rwxr-xr-xdata/baseStats/metapod.asm2
-rwxr-xr-xdata/baseStats/mew.asm2
-rwxr-xr-xdata/baseStats/mewtwo.asm2
-rwxr-xr-xdata/baseStats/moltres.asm2
-rwxr-xr-xdata/baseStats/mrmime.asm2
-rwxr-xr-xdata/baseStats/muk.asm2
-rwxr-xr-xdata/baseStats/nidoking.asm2
-rwxr-xr-xdata/baseStats/nidoqueen.asm2
-rwxr-xr-xdata/baseStats/nidoranf.asm2
-rwxr-xr-xdata/baseStats/nidoranm.asm2
-rwxr-xr-xdata/baseStats/nidorina.asm2
-rwxr-xr-xdata/baseStats/nidorino.asm2
-rwxr-xr-xdata/baseStats/ninetails.asm2
-rwxr-xr-xdata/baseStats/oddish.asm2
-rwxr-xr-xdata/baseStats/omanyte.asm2
-rwxr-xr-xdata/baseStats/omastar.asm2
-rwxr-xr-xdata/baseStats/onix.asm2
-rwxr-xr-xdata/baseStats/paras.asm2
-rwxr-xr-xdata/baseStats/parasect.asm2
-rwxr-xr-xdata/baseStats/persian.asm2
-rwxr-xr-xdata/baseStats/pidgeot.asm2
-rwxr-xr-xdata/baseStats/pidgeotto.asm2
-rwxr-xr-xdata/baseStats/pidgey.asm2
-rwxr-xr-xdata/baseStats/pikachu.asm2
-rwxr-xr-xdata/baseStats/pinsir.asm2
-rwxr-xr-xdata/baseStats/poliwag.asm2
-rwxr-xr-xdata/baseStats/poliwhirl.asm2
-rwxr-xr-xdata/baseStats/poliwrath.asm2
-rwxr-xr-xdata/baseStats/ponyta.asm2
-rwxr-xr-xdata/baseStats/porygon.asm2
-rwxr-xr-xdata/baseStats/primeape.asm2
-rwxr-xr-xdata/baseStats/psyduck.asm2
-rwxr-xr-xdata/baseStats/raichu.asm2
-rwxr-xr-xdata/baseStats/rapidash.asm2
-rwxr-xr-xdata/baseStats/raticate.asm2
-rwxr-xr-xdata/baseStats/rattata.asm2
-rwxr-xr-xdata/baseStats/rhydon.asm2
-rwxr-xr-xdata/baseStats/rhyhorn.asm2
-rwxr-xr-xdata/baseStats/sandshrew.asm2
-rwxr-xr-xdata/baseStats/sandslash.asm2
-rwxr-xr-xdata/baseStats/scyther.asm2
-rwxr-xr-xdata/baseStats/seadra.asm2
-rwxr-xr-xdata/baseStats/seaking.asm2
-rwxr-xr-xdata/baseStats/seel.asm2
-rwxr-xr-xdata/baseStats/shellder.asm2
-rwxr-xr-xdata/baseStats/slowbro.asm2
-rwxr-xr-xdata/baseStats/slowpoke.asm2
-rwxr-xr-xdata/baseStats/snorlax.asm2
-rwxr-xr-xdata/baseStats/spearow.asm2
-rwxr-xr-xdata/baseStats/squirtle.asm2
-rwxr-xr-xdata/baseStats/starmie.asm2
-rwxr-xr-xdata/baseStats/staryu.asm2
-rwxr-xr-xdata/baseStats/tangela.asm2
-rwxr-xr-xdata/baseStats/tauros.asm2
-rwxr-xr-xdata/baseStats/tentacool.asm2
-rwxr-xr-xdata/baseStats/tentacruel.asm2
-rwxr-xr-xdata/baseStats/vaporeon.asm2
-rwxr-xr-xdata/baseStats/venomoth.asm2
-rwxr-xr-xdata/baseStats/venonat.asm2
-rwxr-xr-xdata/baseStats/venusaur.asm2
-rwxr-xr-xdata/baseStats/victreebel.asm2
-rwxr-xr-xdata/baseStats/vileplume.asm2
-rwxr-xr-xdata/baseStats/voltorb.asm2
-rwxr-xr-xdata/baseStats/vulpix.asm2
-rwxr-xr-xdata/baseStats/wartortle.asm2
-rwxr-xr-xdata/baseStats/weedle.asm2
-rwxr-xr-xdata/baseStats/weepinbell.asm2
-rwxr-xr-xdata/baseStats/weezing.asm2
-rwxr-xr-xdata/baseStats/wigglytuff.asm2
-rwxr-xr-xdata/baseStats/zapdos.asm2
-rwxr-xr-xdata/baseStats/zubat.asm2
-rwxr-xr-xdata/pokedex_order.asm152
152 files changed, 151 insertions, 303 deletions
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm
index bb80e369..11da7015 100755
--- a/data/baseStats/abra.asm
+++ b/data/baseStats/abra.asm
@@ -1,5 +1,5 @@
AbraBaseStats: ; 38aa6 (e:4aa6)
-db DEX_ABRA ; pokedex id
+db ABRA ; pokedex id
db 25 ; base hp
db 20 ; base attack
db 15 ; base defense
diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm
index a939d147..33cd0f7e 100755
--- a/data/baseStats/aerodactyl.asm
+++ b/data/baseStats/aerodactyl.asm
@@ -1,5 +1,5 @@
AerodactylBaseStats: ; 3934a (e:534a)
-db DEX_AERODACTYL ; pokedex id
+db AERODACTYL ; pokedex id
db 80 ; base hp
db 105 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm
index d564a88d..a99ec58c 100755
--- a/data/baseStats/alakazam.asm
+++ b/data/baseStats/alakazam.asm
@@ -1,5 +1,5 @@
AlakazamBaseStats: ; 38ade (e:4ade)
-db DEX_ALAKAZAM ; pokedex id
+db ALAKAZAM ; pokedex id
db 55 ; base hp
db 50 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm
index ef169d49..621dbe24 100755
--- a/data/baseStats/arbok.asm
+++ b/data/baseStats/arbok.asm
@@ -1,5 +1,5 @@
ArbokBaseStats: ; 38662 (e:4662)
-db DEX_ARBOK ; pokedex id
+db ARBOK ; pokedex id
db 60 ; base hp
db 85 ; base attack
db 69 ; base defense
diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm
index 478c40e1..e53a8f04 100755
--- a/data/baseStats/arcanine.asm
+++ b/data/baseStats/arcanine.asm
@@ -1,5 +1,5 @@
ArcanineBaseStats: ; 38a36 (e:4a36)
-db DEX_ARCANINE ; pokedex id
+db ARCANINE ; pokedex id
db 90 ; base hp
db 110 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm
index 780da059..e95db9b4 100755
--- a/data/baseStats/articuno.asm
+++ b/data/baseStats/articuno.asm
@@ -1,5 +1,5 @@
ArticunoBaseStats: ; 39382 (e:5382)
-db DEX_ARTICUNO ; pokedex id
+db ARTICUNO ; pokedex id
db 90 ; base hp
db 85 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm
index e84fc370..dabb1df8 100755
--- a/data/baseStats/beedrill.asm
+++ b/data/baseStats/beedrill.asm
@@ -1,5 +1,5 @@
BeedrillBaseStats: ; 38566 (e:4566)
-db DEX_BEEDRILL ; pokedex id
+db BEEDRILL ; pokedex id
db 65 ; base hp
db 80 ; base attack
db 40 ; base defense
diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm
index 896c2f31..5cfa7fc6 100755
--- a/data/baseStats/bellsprout.asm
+++ b/data/baseStats/bellsprout.asm
@@ -1,5 +1,5 @@
BellsproutBaseStats: ; 38b4e (e:4b4e)
-db DEX_BELLSPROUT ; pokedex id
+db BELLSPROUT ; pokedex id
db 50 ; base hp
db 75 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm
index 4b2f2894..48fd4cce 100755
--- a/data/baseStats/blastoise.asm
+++ b/data/baseStats/blastoise.asm
@@ -1,5 +1,5 @@
BlastoiseBaseStats: ; 384be (e:44be)
-db DEX_BLASTOISE ; pokedex id
+db BLASTOISE ; pokedex id
db 79 ; base hp
db 83 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm
index 60b28605..3592d315 100755
--- a/data/baseStats/bulbasaur.asm
+++ b/data/baseStats/bulbasaur.asm
@@ -1,5 +1,5 @@
BulbasaurBaseStats: ; 383de (e:43de)
-db DEX_BULBASAUR ; pokedex id
+db BULBASAUR ; pokedex id
db 45 ; base hp
db 49 ; base attack
db 49 ; base defense
diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
index 32cf7c6b..73bff9f9 100755
--- a/data/baseStats/butterfree.asm
+++ b/data/baseStats/butterfree.asm
@@ -1,5 +1,5 @@
ButterfreeBaseStats: ; 38512 (e:4512)
-db DEX_BUTTERFREE ; pokedex id
+db BUTTERFREE ; pokedex id
db 60 ; base hp
db 45 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm
index 562eb1fc..f951f757 100755
--- a/data/baseStats/caterpie.asm
+++ b/data/baseStats/caterpie.asm
@@ -1,5 +1,5 @@
CaterpieBaseStats: ; 384da (e:44da)
-db DEX_CATERPIE ; pokedex id
+db CATERPIE ; pokedex id
db 45 ; base hp
db 30 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm
index 6cb6446c..35f9ecef 100755
--- a/data/baseStats/chansey.asm
+++ b/data/baseStats/chansey.asm
@@ -1,5 +1,5 @@
ChanseyBaseStats: ; 3901e (e:501e)
-db DEX_CHANSEY ; pokedex id
+db CHANSEY ; pokedex id
db 250 ; base hp
db 5 ; base attack
db 5 ; base defense
diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm
index 816f3305..a1725640 100755
--- a/data/baseStats/charizard.asm
+++ b/data/baseStats/charizard.asm
@@ -1,5 +1,5 @@
CharizardBaseStats: ; 3846a (e:446a)
-db DEX_CHARIZARD ; pokedex id
+db CHARIZARD ; pokedex id
db 78 ; base hp
db 84 ; base attack
db 78 ; base defense
diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm
index f5498845..557edd13 100755
--- a/data/baseStats/charmander.asm
+++ b/data/baseStats/charmander.asm
@@ -1,5 +1,5 @@
CharmanderBaseStats: ; 38432 (e:4432)
-db DEX_CHARMANDER ; pokedex id
+db CHARMANDER ; pokedex id
db 39 ; base hp
db 52 ; base attack
db 43 ; base defense
diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm
index 641e4a63..a5ac0d3e 100755
--- a/data/baseStats/charmeleon.asm
+++ b/data/baseStats/charmeleon.asm
@@ -1,5 +1,5 @@
CharmeleonBaseStats: ; 3844e (e:444e)
-db DEX_CHARMELEON ; pokedex id
+db CHARMELEON ; pokedex id
db 58 ; base hp
db 64 ; base attack
db 58 ; base defense
diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm
index e314736b..1bff4c19 100755
--- a/data/baseStats/clefable.asm
+++ b/data/baseStats/clefable.asm
@@ -1,5 +1,5 @@
ClefableBaseStats: ; 387b2 (e:47b2)
-db DEX_CLEFABLE ; pokedex id
+db CLEFABLE ; pokedex id
db 95 ; base hp
db 70 ; base attack
db 73 ; base defense
diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm
index 553c9bc7..59e7a8c6 100755
--- a/data/baseStats/clefairy.asm
+++ b/data/baseStats/clefairy.asm
@@ -1,5 +1,5 @@
ClefairyBaseStats: ; 38796 (e:4796)
-db DEX_CLEFAIRY ; pokedex id
+db CLEFAIRY ; pokedex id
db 70 ; base hp
db 45 ; base attack
db 48 ; base defense
diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm
index d209f24d..39632446 100755
--- a/data/baseStats/cloyster.asm
+++ b/data/baseStats/cloyster.asm
@@ -1,5 +1,5 @@
CloysterBaseStats: ; 38db6 (e:4db6)
-db DEX_CLOYSTER ; pokedex id
+db CLOYSTER ; pokedex id
db 50 ; base hp
db 95 ; base attack
db 180 ; base defense
diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm
index 1774ea89..28827260 100755
--- a/data/baseStats/cubone.asm
+++ b/data/baseStats/cubone.asm
@@ -1,5 +1,5 @@
CuboneBaseStats: ; 38f22 (e:4f22)
-db DEX_CUBONE ; pokedex id
+db CUBONE ; pokedex id
db 50 ; base hp
db 50 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm
index 57da1f82..e66c109b 100755
--- a/data/baseStats/dewgong.asm
+++ b/data/baseStats/dewgong.asm
@@ -1,5 +1,5 @@
DewgongBaseStats: ; 38d46 (e:4d46)
-db DEX_DEWGONG ; pokedex id
+db DEWGONG ; pokedex id
db 90 ; base hp
db 70 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm
index dea0d669..88015260 100755
--- a/data/baseStats/diglett.asm
+++ b/data/baseStats/diglett.asm
@@ -1,5 +1,5 @@
DiglettBaseStats: ; 3893a (e:493a)
-db DEX_DIGLETT ; pokedex id
+db DIGLETT ; pokedex id
db 10 ; base hp
db 55 ; base attack
db 25 ; base defense
diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm
index de511666..ae702d58 100755
--- a/data/baseStats/ditto.asm
+++ b/data/baseStats/ditto.asm
@@ -1,5 +1,5 @@
DittoBaseStats: ; 39232 (e:5232)
-db DEX_DITTO ; pokedex id
+db DITTO ; pokedex id
db 48 ; base hp
db 48 ; base attack
db 48 ; base defense
diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm
index 516111a1..b1001ae6 100755
--- a/data/baseStats/dodrio.asm
+++ b/data/baseStats/dodrio.asm
@@ -1,5 +1,5 @@
DodrioBaseStats: ; 38d0e (e:4d0e)
-db DEX_DODRIO ; pokedex id
+db DODRIO ; pokedex id
db 60 ; base hp
db 110 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm
index 8c75a0bf..afd1352d 100755
--- a/data/baseStats/doduo.asm
+++ b/data/baseStats/doduo.asm
@@ -1,5 +1,5 @@
DoduoBaseStats: ; 38cf2 (e:4cf2)
-db DEX_DODUO ; pokedex id
+db DODUO ; pokedex id
db 35 ; base hp
db 85 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm
index 5a205e03..8187ccef 100755
--- a/data/baseStats/dragonair.asm
+++ b/data/baseStats/dragonair.asm
@@ -1,5 +1,5 @@
DragonairBaseStats: ; 393f2 (e:53f2)
-db DEX_DRAGONAIR ; pokedex id
+db DRAGONAIR ; pokedex id
db 61 ; base hp
db 84 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm
index be0e7f25..9abfdce1 100755
--- a/data/baseStats/dragonite.asm
+++ b/data/baseStats/dragonite.asm
@@ -1,5 +1,5 @@
DragoniteBaseStats: ; 3940e (e:540e)
-db DEX_DRAGONITE ; pokedex id
+db DRAGONITE ; pokedex id
db 91 ; base hp
db 134 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm
index ea763a4d..1204ac73 100755
--- a/data/baseStats/dratini.asm
+++ b/data/baseStats/dratini.asm
@@ -1,5 +1,5 @@
DratiniBaseStats: ; 393d6 (e:53d6)
-db DEX_DRATINI ; pokedex id
+db DRATINI ; pokedex id
db 41 ; base hp
db 64 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm
index 6db0352b..40a571d7 100755
--- a/data/baseStats/drowzee.asm
+++ b/data/baseStats/drowzee.asm
@@ -1,5 +1,5 @@
DrowzeeBaseStats: ; 38e42 (e:4e42)
-db DEX_DROWZEE ; pokedex id
+db DROWZEE ; pokedex id
db 60 ; base hp
db 48 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm
index 6395a566..4a64ef1a 100755
--- a/data/baseStats/dugtrio.asm
+++ b/data/baseStats/dugtrio.asm
@@ -1,5 +1,5 @@
DugtrioBaseStats: ; 38956 (e:4956)
-db DEX_DUGTRIO ; pokedex id
+db DUGTRIO ; pokedex id
db 35 ; base hp
db 80 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm
index 843cb926..b29f9441 100755
--- a/data/baseStats/eevee.asm
+++ b/data/baseStats/eevee.asm
@@ -1,5 +1,5 @@
EeveeBaseStats: ; 3924e (e:524e)
-db DEX_EEVEE ; pokedex id
+db EEVEE ; pokedex id
db 55 ; base hp
db 55 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm
index 6cb435e1..7f685007 100755
--- a/data/baseStats/ekans.asm
+++ b/data/baseStats/ekans.asm
@@ -1,5 +1,5 @@
EkansBaseStats: ; 38646 (e:4646)
-db DEX_EKANS ; pokedex id
+db EKANS ; pokedex id
db 35 ; base hp
db 60 ; base attack
db 44 ; base defense
diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm
index 6c0a1972..12264e67 100755
--- a/data/baseStats/electabuzz.asm
+++ b/data/baseStats/electabuzz.asm
@@ -1,5 +1,5 @@
ElectabuzzBaseStats: ; 3916e (e:516e)
-db DEX_ELECTABUZZ ; pokedex id
+db ELECTABUZZ ; pokedex id
db 65 ; base hp
db 83 ; base attack
db 57 ; base defense
diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm
index 07a73c69..cba44737 100755
--- a/data/baseStats/electrode.asm
+++ b/data/baseStats/electrode.asm
@@ -1,5 +1,5 @@
ElectrodeBaseStats: ; 38ece (e:4ece)
-db DEX_ELECTRODE ; pokedex id
+db ELECTRODE ; pokedex id
db 60 ; base hp
db 50 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm
index e83593ed..d13e5732 100755
--- a/data/baseStats/exeggcute.asm
+++ b/data/baseStats/exeggcute.asm
@@ -1,5 +1,5 @@
ExeggcuteBaseStats: ; 38eea (e:4eea)
-db DEX_EXEGGCUTE ; pokedex id
+db EXEGGCUTE ; pokedex id
db 60 ; base hp
db 40 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm
index 7a6cde65..055a9039 100755
--- a/data/baseStats/exeggutor.asm
+++ b/data/baseStats/exeggutor.asm
@@ -1,5 +1,5 @@
ExeggutorBaseStats: ; 38f06 (e:4f06)
-db DEX_EXEGGUTOR ; pokedex id
+db EXEGGUTOR ; pokedex id
db 95 ; base hp
db 95 ; base attack
db 85 ; base defense
diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm
index d41193c2..b5159af7 100755
--- a/data/baseStats/farfetchd.asm
+++ b/data/baseStats/farfetchd.asm
@@ -1,5 +1,5 @@
FarfetchdBaseStats: ; 38cd6 (e:4cd6)
-db DEX_FARFETCH_D ; pokedex id
+db FARFETCH_D ; pokedex id
db 52 ; base hp
db 65 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm
index 9b6a8daf..23f0e253 100755
--- a/data/baseStats/fearow.asm
+++ b/data/baseStats/fearow.asm
@@ -1,5 +1,5 @@
FearowBaseStats: ; 3862a (e:462a)
-db DEX_FEAROW ; pokedex id
+db FEAROW ; pokedex id
db 65 ; base hp
db 90 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm
index dd6b8edb..34c2ee01 100755
--- a/data/baseStats/flareon.asm
+++ b/data/baseStats/flareon.asm
@@ -1,5 +1,5 @@
FlareonBaseStats: ; 392a2 (e:52a2)
-db DEX_FLAREON ; pokedex id
+db FLAREON ; pokedex id
db 65 ; base hp
db 130 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm
index 26d298a3..d397da00 100755
--- a/data/baseStats/gastly.asm
+++ b/data/baseStats/gastly.asm
@@ -1,5 +1,5 @@
GastlyBaseStats: ; 38dd2 (e:4dd2)
-db DEX_GASTLY ; pokedex id
+db GASTLY ; pokedex id
db 30 ; base hp
db 35 ; base attack
db 30 ; base defense
diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm
index 4fd92a96..d07dcd2a 100755
--- a/data/baseStats/gengar.asm
+++ b/data/baseStats/gengar.asm
@@ -1,5 +1,5 @@
GengarBaseStats: ; 38e0a (e:4e0a)
-db DEX_GENGAR ; pokedex id
+db GENGAR ; pokedex id
db 60 ; base hp
db 65 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm
index a164abd5..6a204979 100755
--- a/data/baseStats/geodude.asm
+++ b/data/baseStats/geodude.asm
@@ -1,5 +1,5 @@
GeodudeBaseStats: ; 38bda (e:4bda)
-db DEX_GEODUDE ; pokedex id
+db GEODUDE ; pokedex id
db 40 ; base hp
db 80 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm
index 4e601129..1f3b420b 100755
--- a/data/baseStats/gloom.asm
+++ b/data/baseStats/gloom.asm
@@ -1,5 +1,5 @@
GloomBaseStats: ; 38892 (e:4892)
-db DEX_GLOOM ; pokedex id
+db GLOOM ; pokedex id
db 60 ; base hp
db 65 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm
index 6150ab5a..82381e75 100755
--- a/data/baseStats/golbat.asm
+++ b/data/baseStats/golbat.asm
@@ -1,5 +1,5 @@
GolbatBaseStats: ; 3885a (e:485a)
-db DEX_GOLBAT ; pokedex id
+db GOLBAT ; pokedex id
db 75 ; base hp
db 80 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm
index 36bae537..6bcc4b6b 100755
--- a/data/baseStats/goldeen.asm
+++ b/data/baseStats/goldeen.asm
@@ -1,5 +1,5 @@
GoldeenBaseStats: ; 390aa (e:50aa)
-db DEX_GOLDEEN ; pokedex id
+db GOLDEEN ; pokedex id
db 45 ; base hp
db 67 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm
index 6080c0a7..16ef9390 100755
--- a/data/baseStats/golduck.asm
+++ b/data/baseStats/golduck.asm
@@ -1,5 +1,5 @@
GolduckBaseStats: ; 389c6 (e:49c6)
-db DEX_GOLDUCK ; pokedex id
+db GOLDUCK ; pokedex id
db 80 ; base hp
db 82 ; base attack
db 78 ; base defense
diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm
index 12e7c3d1..0b34ea0b 100755
--- a/data/baseStats/golem.asm
+++ b/data/baseStats/golem.asm
@@ -1,5 +1,5 @@
GolemBaseStats: ; 38c12 (e:4c12)
-db DEX_GOLEM ; pokedex id
+db GOLEM ; pokedex id
db 80 ; base hp
db 110 ; base attack
db 130 ; base defense
diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm
index c4291c47..5fa0f3f5 100755
--- a/data/baseStats/graveler.asm
+++ b/data/baseStats/graveler.asm
@@ -1,5 +1,5 @@
GravelerBaseStats: ; 38bf6 (e:4bf6)
-db DEX_GRAVELER ; pokedex id
+db GRAVELER ; pokedex id
db 55 ; base hp
db 95 ; base attack
db 115 ; base defense
diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm
index 8990ffa7..98d5855c 100755
--- a/data/baseStats/grimer.asm
+++ b/data/baseStats/grimer.asm
@@ -1,5 +1,5 @@
GrimerBaseStats: ; 38d62 (e:4d62)
-db DEX_GRIMER ; pokedex id
+db GRIMER ; pokedex id
db 80 ; base hp
db 80 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm
index 87f9336a..2b8db6e6 100755
--- a/data/baseStats/growlithe.asm
+++ b/data/baseStats/growlithe.asm
@@ -1,5 +1,5 @@
GrowlitheBaseStats: ; 38a1a (e:4a1a)
-db DEX_GROWLITHE ; pokedex id
+db GROWLITHE ; pokedex id
db 55 ; base hp
db 70 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm
index 08062e4f..33057525 100755
--- a/data/baseStats/gyarados.asm
+++ b/data/baseStats/gyarados.asm
@@ -1,5 +1,5 @@
GyaradosBaseStats: ; 391fa (e:51fa)
-db DEX_GYARADOS ; pokedex id
+db GYARADOS ; pokedex id
db 95 ; base hp
db 125 ; base attack
db 79 ; base defense
diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm
index a595b047..15483061 100755
--- a/data/baseStats/haunter.asm
+++ b/data/baseStats/haunter.asm
@@ -1,5 +1,5 @@
HaunterBaseStats: ; 38dee (e:4dee)
-db DEX_HAUNTER ; pokedex id
+db HAUNTER ; pokedex id
db 45 ; base hp
db 50 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm
index c10ba918..5f8bb1fd 100755
--- a/data/baseStats/hitmonchan.asm
+++ b/data/baseStats/hitmonchan.asm
@@ -1,5 +1,5 @@
HitmonchanBaseStats: ; 38f76 (e:4f76)
-db DEX_HITMONCHAN ; pokedex id
+db HITMONCHAN ; pokedex id
db 50 ; base hp
db 105 ; base attack
db 79 ; base defense
diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm
index 929a1b74..c7d86d11 100755
--- a/data/baseStats/hitmonlee.asm
+++ b/data/baseStats/hitmonlee.asm
@@ -1,5 +1,5 @@
HitmonleeBaseStats: ; 38f5a (e:4f5a)
-db DEX_HITMONLEE ; pokedex id
+db HITMONLEE ; pokedex id
db 50 ; base hp
db 120 ; base attack
db 53 ; base defense
diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm
index b68cc3c8..b3b66bd6 100755
--- a/data/baseStats/horsea.asm
+++ b/data/baseStats/horsea.asm
@@ -1,5 +1,5 @@
HorseaBaseStats: ; 39072 (e:5072)
-db DEX_HORSEA ; pokedex id
+db HORSEA ; pokedex id
db 30 ; base hp
db 40 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm
index df037e20..f1557fa9 100755
--- a/data/baseStats/hypno.asm
+++ b/data/baseStats/hypno.asm
@@ -1,5 +1,5 @@
HypnoBaseStats: ; 38e5e (e:4e5e)
-db DEX_HYPNO ; pokedex id
+db HYPNO ; pokedex id
db 85 ; base hp
db 73 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm
index 2b5718f2..f1d83fbf 100755
--- a/data/baseStats/ivysaur.asm
+++ b/data/baseStats/ivysaur.asm
@@ -1,5 +1,5 @@
IvysaurBaseStats: ; 383fa (e:43fa)
-db DEX_IVYSAUR ; pokedex id
+db IVYSAUR ; pokedex id
db 60 ; base hp
db 62 ; base attack
db 63 ; base defense
diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm
index 83d92145..35f6438c 100755
--- a/data/baseStats/jigglypuff.asm
+++ b/data/baseStats/jigglypuff.asm
@@ -1,5 +1,5 @@
JigglypuffBaseStats: ; 38806 (e:4806)
-db DEX_JIGGLYPUFF ; pokedex id
+db JIGGLYPUFF ; pokedex id
db 115 ; base hp
db 45 ; base attack
db 20 ; base defense
diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm
index 86716b98..c8ec9bdf 100755
--- a/data/baseStats/jolteon.asm
+++ b/data/baseStats/jolteon.asm
@@ -1,5 +1,5 @@
JolteonBaseStats: ; 39286 (e:5286)
-db DEX_JOLTEON ; pokedex id
+db JOLTEON ; pokedex id
db 65 ; base hp
db 65 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm
index 75278c94..33502abd 100755
--- a/data/baseStats/jynx.asm
+++ b/data/baseStats/jynx.asm
@@ -1,5 +1,5 @@
JynxBaseStats: ; 39152 (e:5152)
-db DEX_JYNX ; pokedex id
+db JYNX ; pokedex id
db 65 ; base hp
db 50 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm
index b058cea8..481fea4d 100755
--- a/data/baseStats/kabuto.asm
+++ b/data/baseStats/kabuto.asm
@@ -1,5 +1,5 @@
KabutoBaseStats: ; 39312 (e:5312)
-db DEX_KABUTO ; pokedex id
+db KABUTO ; pokedex id
db 30 ; base hp
db 80 ; base attack
db 90 ; base defense
diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm
index cba27a8d..127b7949 100755
--- a/data/baseStats/kabutops.asm
+++ b/data/baseStats/kabutops.asm
@@ -1,5 +1,5 @@
KabutopsBaseStats: ; 3932e (e:532e)
-db DEX_KABUTOPS ; pokedex id
+db KABUTOPS ; pokedex id
db 60 ; base hp
db 115 ; base attack
db 105 ; base defense
diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
index 9c494904..8a083fd1 100755
--- a/data/baseStats/kadabra.asm
+++ b/data/baseStats/kadabra.asm
@@ -1,5 +1,5 @@
KadabraBaseStats: ; 38ac2 (e:4ac2)
-db DEX_KADABRA ; pokedex id
+db KADABRA ; pokedex id
db 40 ; base hp
db 35 ; base attack
db 30 ; base defense
diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm
index 79a15125..ccd4d698 100755
--- a/data/baseStats/kakuna.asm
+++ b/data/baseStats/kakuna.asm
@@ -1,5 +1,5 @@
KakunaBaseStats: ; 3854a (e:454a)
-db DEX_KAKUNA ; pokedex id
+db KAKUNA ; pokedex id
db 45 ; base hp
db 25 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm
index 8dfd3fa2..6e6b086a 100755
--- a/data/baseStats/kangaskhan.asm
+++ b/data/baseStats/kangaskhan.asm
@@ -1,5 +1,5 @@
KangaskhanBaseStats: ; 39056 (e:5056)
-db DEX_KANGASKHAN ; pokedex id
+db KANGASKHAN ; pokedex id
db 105 ; base hp
db 95 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm
index 076b663f..30a9aac2 100755
--- a/data/baseStats/kingler.asm
+++ b/data/baseStats/kingler.asm
@@ -1,5 +1,5 @@
KinglerBaseStats: ; 38e96 (e:4e96)
-db DEX_KINGLER ; pokedex id
+db KINGLER ; pokedex id
db 55 ; base hp
db 130 ; base attack
db 115 ; base defense
diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm
index 2a0be49c..e6bcae60 100755
--- a/data/baseStats/koffing.asm
+++ b/data/baseStats/koffing.asm
@@ -1,5 +1,5 @@
KoffingBaseStats: ; 38fae (e:4fae)
-db DEX_KOFFING ; pokedex id
+db KOFFING ; pokedex id
db 40 ; base hp
db 65 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm
index d560811c..9777dfc9 100755
--- a/data/baseStats/krabby.asm
+++ b/data/baseStats/krabby.asm
@@ -1,5 +1,5 @@
KrabbyBaseStats: ; 38e7a (e:4e7a)
-db DEX_KRABBY ; pokedex id
+db KRABBY ; pokedex id
db 30 ; base hp
db 105 ; base attack
db 90 ; base defense
diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm
index 2eaebc11..639afbbd 100755
--- a/data/baseStats/lapras.asm
+++ b/data/baseStats/lapras.asm
@@ -1,5 +1,5 @@
LaprasBaseStats: ; 39216 (e:5216)
-db DEX_LAPRAS ; pokedex id
+db LAPRAS ; pokedex id
db 130 ; base hp
db 85 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm
index ca618263..dddf3876 100755
--- a/data/baseStats/lickitung.asm
+++ b/data/baseStats/lickitung.asm
@@ -1,5 +1,5 @@
LickitungBaseStats: ; 38f92 (e:4f92)
-db DEX_LICKITUNG ; pokedex id
+db LICKITUNG ; pokedex id
db 90 ; base hp
db 55 ; base attack
db 75 ; base defense
diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm
index d6abc5c7..e1a05beb 100755
--- a/data/baseStats/machamp.asm
+++ b/data/baseStats/machamp.asm
@@ -1,5 +1,5 @@
MachampBaseStats: ; 38b32 (e:4b32)
-db DEX_MACHAMP ; pokedex id
+db MACHAMP ; pokedex id
db 90 ; base hp
db 130 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm
index 08b43eb4..5f371b23 100755
--- a/data/baseStats/machoke.asm
+++ b/data/baseStats/machoke.asm
@@ -1,5 +1,5 @@
MachokeBaseStats: ; 38b16 (e:4b16)
-db DEX_MACHOKE ; pokedex id
+db MACHOKE ; pokedex id
db 80 ; base hp
db 100 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm
index f7eeabaa..3cf3e396 100755
--- a/data/baseStats/machop.asm
+++ b/data/baseStats/machop.asm
@@ -1,5 +1,5 @@
MachopBaseStats: ; 38afa (e:4afa)
-db DEX_MACHOP ; pokedex id
+db MACHOP ; pokedex id
db 70 ; base hp
db 80 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm
index d633960f..1dd7d592 100755
--- a/data/baseStats/magikarp.asm
+++ b/data/baseStats/magikarp.asm
@@ -1,5 +1,5 @@
MagikarpBaseStats: ; 391de (e:51de)
-db DEX_MAGIKARP ; pokedex id
+db MAGIKARP ; pokedex id
db 20 ; base hp
db 10 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm
index b5ad710f..5b7d9354 100755
--- a/data/baseStats/magmar.asm
+++ b/data/baseStats/magmar.asm
@@ -1,5 +1,5 @@
MagmarBaseStats: ; 3918a (e:518a)
-db DEX_MAGMAR ; pokedex id
+db MAGMAR ; pokedex id
db 65 ; base hp
db 95 ; base attack
db 57 ; base defense
diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm
index 0d23a234..272c2a79 100755
--- a/data/baseStats/magnemite.asm
+++ b/data/baseStats/magnemite.asm
@@ -1,5 +1,5 @@
MagnemiteBaseStats: ; 38c9e (e:4c9e)
-db DEX_MAGNEMITE ; pokedex id
+db MAGNEMITE ; pokedex id
db 25 ; base hp
db 35 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm
index 5f80d9a7..44ae0974 100755
--- a/data/baseStats/magneton.asm
+++ b/data/baseStats/magneton.asm
@@ -1,5 +1,5 @@
MagnetonBaseStats: ; 38cba (e:4cba)
-db DEX_MAGNETON ; pokedex id
+db MAGNETON ; pokedex id
db 50 ; base hp
db 60 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm
index fab45710..63394b2b 100755
--- a/data/baseStats/mankey.asm
+++ b/data/baseStats/mankey.asm
@@ -1,5 +1,5 @@
MankeyBaseStats: ; 389e2 (e:49e2)
-db DEX_MANKEY ; pokedex id
+db MANKEY ; pokedex id
db 40 ; base hp
db 80 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm
index 552bb94c..0ed93606 100755
--- a/data/baseStats/marowak.asm
+++ b/data/baseStats/marowak.asm
@@ -1,5 +1,5 @@
MarowakBaseStats: ; 38f3e (e:4f3e)
-db DEX_MAROWAK ; pokedex id
+db MAROWAK ; pokedex id
db 60 ; base hp
db 80 ; base attack
db 110 ; base defense
diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm
index 1d6c2ca7..c1868027 100755
--- a/data/baseStats/meowth.asm
+++ b/data/baseStats/meowth.asm
@@ -1,5 +1,5 @@
MeowthBaseStats: ; 38972 (e:4972)
-db DEX_MEOWTH ; pokedex id
+db MEOWTH ; pokedex id
db 40 ; base hp
db 45 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm
index 1dac4210..5dee6c4d 100755
--- a/data/baseStats/metapod.asm
+++ b/data/baseStats/metapod.asm
@@ -1,5 +1,5 @@
MetapodBaseStats: ; 384f6 (e:44f6)
-db DEX_METAPOD ; pokedex id
+db METAPOD ; pokedex id
db 50 ; base hp
db 20 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm
index c785a158..2c5288e8 100755
--- a/data/baseStats/mew.asm
+++ b/data/baseStats/mew.asm
@@ -1,5 +1,5 @@
MewBaseStats: ; 425b (1:425b)
-db DEX_MEW ; pokedex id
+db MEW ; pokedex id
db 100 ; base hp
db 100 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm
index 851217df..d8c39112 100755
--- a/data/baseStats/mewtwo.asm
+++ b/data/baseStats/mewtwo.asm
@@ -1,5 +1,5 @@
MewtwoBaseStats: ; 3942a (e:542a)
-db DEX_MEWTWO ; pokedex id
+db MEWTWO ; pokedex id
db 106 ; base hp
db 110 ; base attack
db 90 ; base defense
diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm
index 85562233..8f9b25af 100755
--- a/data/baseStats/moltres.asm
+++ b/data/baseStats/moltres.asm
@@ -1,5 +1,5 @@
MoltresBaseStats: ; 393ba (e:53ba)
-db DEX_MOLTRES ; pokedex id
+db MOLTRES ; pokedex id
db 90 ; base hp
db 100 ; base attack
db 90 ; base defense
diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm
index 1122816c..3b65c207 100755
--- a/data/baseStats/mrmime.asm
+++ b/data/baseStats/mrmime.asm
@@ -1,5 +1,5 @@
MrMimeBaseStats: ; 3911a (e:511a)
-db DEX_MR_MIME ; pokedex id
+db MR_MIME ; pokedex id
db 40 ; base hp
db 45 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm
index f75dccce..41aec013 100755
--- a/data/baseStats/muk.asm
+++ b/data/baseStats/muk.asm
@@ -1,5 +1,5 @@
MukBaseStats: ; 38d7e (e:4d7e)
-db DEX_MUK ; pokedex id
+db MUK ; pokedex id
db 105 ; base hp
db 105 ; base attack
db 75 ; base defense
diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm
index 80b8d9c2..6d663769 100755
--- a/data/baseStats/nidoking.asm
+++ b/data/baseStats/nidoking.asm
@@ -1,5 +1,5 @@
NidokingBaseStats: ; 3877a (e:477a)
-db DEX_NIDOKING ; pokedex id
+db NIDOKING ; pokedex id
db 81 ; base hp
db 92 ; base attack
db 77 ; base defense
diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm
index ccb48c50..aa699354 100755
--- a/data/baseStats/nidoqueen.asm
+++ b/data/baseStats/nidoqueen.asm
@@ -1,5 +1,5 @@
NidoqueenBaseStats: ; 38726 (e:4726)
-db DEX_NIDOQUEEN ; pokedex id
+db NIDOQUEEN ; pokedex id
db 90 ; base hp
db 82 ; base attack
db 87 ; base defense
diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm
index d07f0817..30d7d5be 100755
--- a/data/baseStats/nidoranf.asm
+++ b/data/baseStats/nidoranf.asm
@@ -1,5 +1,5 @@
NidoranFBaseStats: ; 386ee (e:46ee)
-db DEX_NIDORAN_F ; pokedex id
+db NIDORAN_F ; pokedex id
db 55 ; base hp
db 47 ; base attack
db 52 ; base defense
diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm
index 99a2c3c8..85a03b6b 100755
--- a/data/baseStats/nidoranm.asm
+++ b/data/baseStats/nidoranm.asm
@@ -1,5 +1,5 @@
NidoranMBaseStats: ; 38742 (e:4742)
-db DEX_NIDORAN_M ; pokedex id
+db NIDORAN_M ; pokedex id
db 46 ; base hp
db 57 ; base attack
db 40 ; base defense
diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm
index 92564eb5..fe2ce0cd 100755
--- a/data/baseStats/nidorina.asm
+++ b/data/baseStats/nidorina.asm
@@ -1,5 +1,5 @@
NidorinaBaseStats: ; 3870a (e:470a)
-db DEX_NIDORINA ; pokedex id
+db NIDORINA ; pokedex id
db 70 ; base hp
db 62 ; base attack
db 67 ; base defense
diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm
index c4229f6d..c0ff2d32 100755
--- a/data/baseStats/nidorino.asm
+++ b/data/baseStats/nidorino.asm
@@ -1,5 +1,5 @@
NidorinoBaseStats: ; 3875e (e:475e)
-db DEX_NIDORINO ; pokedex id
+db NIDORINO ; pokedex id
db 61 ; base hp
db 72 ; base attack
db 57 ; base defense
diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm
index 3ffc3ba2..41cb9163 100755
--- a/data/baseStats/ninetails.asm
+++ b/data/baseStats/ninetails.asm
@@ -1,5 +1,5 @@
NinetalesBaseStats: ; 387ea (e:47ea)
-db DEX_NINETALES ; pokedex id
+db NINETALES ; pokedex id
db 73 ; base hp
db 76 ; base attack
db 75 ; base defense
diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm
index aeba7afe..2ebbe87a 100755
--- a/data/baseStats/oddish.asm
+++ b/data/baseStats/oddish.asm
@@ -1,5 +1,5 @@
OddishBaseStats: ; 38876 (e:4876)
-db DEX_ODDISH ; pokedex id
+db ODDISH ; pokedex id
db 45 ; base hp
db 50 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm
index c11eb844..ff615cf1 100755
--- a/data/baseStats/omanyte.asm
+++ b/data/baseStats/omanyte.asm
@@ -1,5 +1,5 @@
OmanyteBaseStats: ; 392da (e:52da)
-db DEX_OMANYTE ; pokedex id
+db OMANYTE ; pokedex id
db 35 ; base hp
db 40 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm
index a41a146a..8616bb0e 100755
--- a/data/baseStats/omastar.asm
+++ b/data/baseStats/omastar.asm
@@ -1,5 +1,5 @@
OmastarBaseStats: ; 392f6 (e:52f6)
-db DEX_OMASTAR ; pokedex id
+db OMASTAR ; pokedex id
db 70 ; base hp
db 60 ; base attack
db 125 ; base defense
diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm
index a42c3dee..7c03e509 100755
--- a/data/baseStats/onix.asm
+++ b/data/baseStats/onix.asm
@@ -1,5 +1,5 @@
OnixBaseStats: ; 38e26 (e:4e26)
-db DEX_ONIX ; pokedex id
+db ONIX ; pokedex id
db 35 ; base hp
db 45 ; base attack
db 160 ; base defense
diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm
index c07a3e8a..3112aa18 100755
--- a/data/baseStats/paras.asm
+++ b/data/baseStats/paras.asm
@@ -1,5 +1,5 @@
ParasBaseStats: ; 388ca (e:48ca)
-db DEX_PARAS ; pokedex id
+db PARAS ; pokedex id
db 35 ; base hp
db 70 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm
index 98879ac8..4308c7ef 100755
--- a/data/baseStats/parasect.asm
+++ b/data/baseStats/parasect.asm
@@ -1,5 +1,5 @@
ParasectBaseStats: ; 388e6 (e:48e6)
-db DEX_PARASECT ; pokedex id
+db PARASECT ; pokedex id
db 60 ; base hp
db 95 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm
index 8d6b7d85..b2680c45 100755
--- a/data/baseStats/persian.asm
+++ b/data/baseStats/persian.asm
@@ -1,5 +1,5 @@
PersianBaseStats: ; 3898e (e:498e)
-db DEX_PERSIAN ; pokedex id
+db PERSIAN ; pokedex id
db 65 ; base hp
db 70 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm
index 28ecc858..5f13c94d 100755
--- a/data/baseStats/pidgeot.asm
+++ b/data/baseStats/pidgeot.asm
@@ -1,5 +1,5 @@
PidgeotBaseStats: ; 385ba (e:45ba)
-db DEX_PIDGEOT ; pokedex id
+db PIDGEOT ; pokedex id
db 83 ; base hp
db 80 ; base attack
db 75 ; base defense
diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm
index 349c3307..dc190eab 100755
--- a/data/baseStats/pidgeotto.asm
+++ b/data/baseStats/pidgeotto.asm
@@ -1,5 +1,5 @@
PidgeottoBaseStats: ; 3859e (e:459e)
-db DEX_PIDGEOTTO ; pokedex id
+db PIDGEOTTO ; pokedex id
db 63 ; base hp
db 60 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm
index 0eee7061..68d2e275 100755
--- a/data/baseStats/pidgey.asm
+++ b/data/baseStats/pidgey.asm
@@ -1,5 +1,5 @@
PidgeyBaseStats: ; 38582 (e:4582)
-db DEX_PIDGEY ; pokedex id
+db PIDGEY ; pokedex id
db 40 ; base hp
db 45 ; base attack
db 40 ; base defense
diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm
index 5aaba19c..504f6e62 100755
--- a/data/baseStats/pikachu.asm
+++ b/data/baseStats/pikachu.asm
@@ -1,5 +1,5 @@
PikachuBaseStats: ; 3867e (e:467e)
-db DEX_PIKACHU ; pokedex id
+db PIKACHU ; pokedex id
db 35 ; base hp
db 55 ; base attack
db 30 ; base defense
diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm
index bbb24a58..4d5a81e1 100755
--- a/data/baseStats/pinsir.asm
+++ b/data/baseStats/pinsir.asm
@@ -1,5 +1,5 @@
PinsirBaseStats: ; 391a6 (e:51a6)
-db DEX_PINSIR ; pokedex id
+db PINSIR ; pokedex id
db 65 ; base hp
db 125 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm
index 8e0a438f..21f5c88a 100755
--- a/data/baseStats/poliwag.asm
+++ b/data/baseStats/poliwag.asm
@@ -1,5 +1,5 @@
PoliwagBaseStats: ; 38a52 (e:4a52)
-db DEX_POLIWAG ; pokedex id
+db POLIWAG ; pokedex id
db 40 ; base hp
db 50 ; base attack
db 40 ; base defense
diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm
index 9e8b558b..0755656b 100755
--- a/data/baseStats/poliwhirl.asm
+++ b/data/baseStats/poliwhirl.asm
@@ -1,5 +1,5 @@
PoliwhirlBaseStats: ; 38a6e (e:4a6e)
-db DEX_POLIWHIRL ; pokedex id
+db POLIWHIRL ; pokedex id
db 65 ; base hp
db 65 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm
index 9beafe90..9de62f7b 100755
--- a/data/baseStats/poliwrath.asm
+++ b/data/baseStats/poliwrath.asm
@@ -1,5 +1,5 @@
PoliwrathBaseStats: ; 38a8a (e:4a8a)
-db DEX_POLIWRATH ; pokedex id
+db POLIWRATH ; pokedex id
db 90 ; base hp
db 85 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm
index a2b91ef5..9e03bdcc 100755
--- a/data/baseStats/ponyta.asm
+++ b/data/baseStats/ponyta.asm
@@ -1,5 +1,5 @@
PonytaBaseStats: ; 38c2e (e:4c2e)
-db DEX_PONYTA ; pokedex id
+db PONYTA ; pokedex id
db 50 ; base hp
db 85 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm
index 8e37134c..ff8ec4a2 100755
--- a/data/baseStats/porygon.asm
+++ b/data/baseStats/porygon.asm
@@ -1,5 +1,5 @@
PorygonBaseStats: ; 392be (e:52be)
-db DEX_PORYGON ; pokedex id
+db PORYGON ; pokedex id
db 65 ; base hp
db 60 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm
index 45ff6841..27799c68 100755
--- a/data/baseStats/primeape.asm
+++ b/data/baseStats/primeape.asm
@@ -1,5 +1,5 @@
PrimeapeBaseStats: ; 389fe (e:49fe)
-db DEX_PRIMEAPE ; pokedex id
+db PRIMEAPE ; pokedex id
db 65 ; base hp
db 105 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm
index 0877516f..fd9f2737 100755
--- a/data/baseStats/psyduck.asm
+++ b/data/baseStats/psyduck.asm
@@ -1,5 +1,5 @@
PsyduckBaseStats: ; 389aa (e:49aa)
-db DEX_PSYDUCK ; pokedex id
+db PSYDUCK ; pokedex id
db 50 ; base hp
db 52 ; base attack
db 48 ; base defense
diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm
index a449b81e..31b0a35c 100755
--- a/data/baseStats/raichu.asm
+++ b/data/baseStats/raichu.asm
@@ -1,5 +1,5 @@
RaichuBaseStats: ; 3869a (e:469a)
-db DEX_RAICHU ; pokedex id
+db RAICHU ; pokedex id
db 60 ; base hp
db 90 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm
index 800f3bb7..88e947ca 100755
--- a/data/baseStats/rapidash.asm
+++ b/data/baseStats/rapidash.asm
@@ -1,5 +1,5 @@
RapidashBaseStats: ; 38c4a (e:4c4a)
-db DEX_RAPIDASH ; pokedex id
+db RAPIDASH ; pokedex id
db 65 ; base hp
db 100 ; base attack
db 70 ; base defense
diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm
index 7427bb25..9e447e3f 100755
--- a/data/baseStats/raticate.asm
+++ b/data/baseStats/raticate.asm
@@ -1,5 +1,5 @@
RaticateBaseStats: ; 385f2 (e:45f2)
-db DEX_RATICATE ; pokedex id
+db RATICATE ; pokedex id
db 55 ; base hp
db 81 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm
index 256d8c38..d89b73d9 100755
--- a/data/baseStats/rattata.asm
+++ b/data/baseStats/rattata.asm
@@ -1,5 +1,5 @@
RattataBaseStats: ; 385d6 (e:45d6)
-db DEX_RATTATA ; pokedex id
+db RATTATA ; pokedex id
db 30 ; base hp
db 56 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm
index 8d8f370e..d71846a2 100755
--- a/data/baseStats/rhydon.asm
+++ b/data/baseStats/rhydon.asm
@@ -1,6 +1,6 @@
MonBaseStats:
RhydonBaseStats: ; 39002 (e:5002)
-db DEX_RHYDON ; pokedex id
+db RHYDON ; pokedex id
db 105 ; base hp
db 130 ; base attack
db 120 ; base defense
diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm
index cf98807e..d6fb0362 100755
--- a/data/baseStats/rhyhorn.asm
+++ b/data/baseStats/rhyhorn.asm
@@ -1,5 +1,5 @@
RhyhornBaseStats: ; 38fe6 (e:4fe6)
-db DEX_RHYHORN ; pokedex id
+db RHYHORN ; pokedex id
db 80 ; base hp
db 85 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm
index c02a1e8b..4bcf8297 100755
--- a/data/baseStats/sandshrew.asm
+++ b/data/baseStats/sandshrew.asm
@@ -1,5 +1,5 @@
SandshrewBaseStats: ; 386b6 (e:46b6)
-db DEX_SANDSHREW ; pokedex id
+db SANDSHREW ; pokedex id
db 50 ; base hp
db 75 ; base attack
db 85 ; base defense
diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm
index 2e887b87..06e3806d 100755
--- a/data/baseStats/sandslash.asm
+++ b/data/baseStats/sandslash.asm
@@ -1,5 +1,5 @@
SandslashBaseStats: ; 386d2 (e:46d2)
-db DEX_SANDSLASH ; pokedex id
+db SANDSLASH ; pokedex id
db 75 ; base hp
db 100 ; base attack
db 110 ; base defense
diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm
index 80145c97..4e155ac5 100755
--- a/data/baseStats/scyther.asm
+++ b/data/baseStats/scyther.asm
@@ -1,5 +1,5 @@
ScytherBaseStats: ; 39136 (e:5136)
-db DEX_SCYTHER ; pokedex id
+db SCYTHER ; pokedex id
db 70 ; base hp
db 110 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm
index f3cfc227..059cd107 100755
--- a/data/baseStats/seadra.asm
+++ b/data/baseStats/seadra.asm
@@ -1,5 +1,5 @@
SeadraBaseStats: ; 3908e (e:508e)
-db DEX_SEADRA ; pokedex id
+db SEADRA ; pokedex id
db 55 ; base hp
db 65 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm
index c467e782..cf65a2a2 100755
--- a/data/baseStats/seaking.asm
+++ b/data/baseStats/seaking.asm
@@ -1,5 +1,5 @@
SeakingBaseStats: ; 390c6 (e:50c6)
-db DEX_SEAKING ; pokedex id
+db SEAKING ; pokedex id
db 80 ; base hp
db 92 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm
index 0cd4a4a2..1f0ea3ca 100755
--- a/data/baseStats/seel.asm
+++ b/data/baseStats/seel.asm
@@ -1,5 +1,5 @@
SeelBaseStats: ; 38d2a (e:4d2a)
-db DEX_SEEL ; pokedex id
+db SEEL ; pokedex id
db 65 ; base hp
db 45 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm
index 8b805c26..158ba6be 100755
--- a/data/baseStats/shellder.asm
+++ b/data/baseStats/shellder.asm
@@ -1,5 +1,5 @@
ShellderBaseStats: ; 38d9a (e:4d9a)
-db DEX_SHELLDER ; pokedex id
+db SHELLDER ; pokedex id
db 30 ; base hp
db 65 ; base attack
db 100 ; base defense
diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm
index 1ae1ef64..5c6b721b 100755
--- a/data/baseStats/slowbro.asm
+++ b/data/baseStats/slowbro.asm
@@ -1,5 +1,5 @@
SlowbroBaseStats: ; 38c82 (e:4c82)
-db DEX_SLOWBRO ; pokedex id
+db SLOWBRO ; pokedex id
db 95 ; base hp
db 75 ; base attack
db 110 ; base defense
diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm
index cfef9bea..ce5bd44e 100755
--- a/data/baseStats/slowpoke.asm
+++ b/data/baseStats/slowpoke.asm
@@ -1,5 +1,5 @@
SlowpokeBaseStats: ; 38c66 (e:4c66)
-db DEX_SLOWPOKE ; pokedex id
+db SLOWPOKE ; pokedex id
db 90 ; base hp
db 65 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm
index f010f676..1cb44886 100755
--- a/data/baseStats/snorlax.asm
+++ b/data/baseStats/snorlax.asm
@@ -1,5 +1,5 @@
SnorlaxBaseStats: ; 39366 (e:5366)
-db DEX_SNORLAX ; pokedex id
+db SNORLAX ; pokedex id
db 160 ; base hp
db 110 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm
index f5ff8155..c8800fd7 100755
--- a/data/baseStats/spearow.asm
+++ b/data/baseStats/spearow.asm
@@ -1,5 +1,5 @@
SpearowBaseStats: ; 3860e (e:460e)
-db DEX_SPEAROW ; pokedex id
+db SPEAROW ; pokedex id
db 40 ; base hp
db 60 ; base attack
db 30 ; base defense
diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm
index 614da142..8e7c340f 100755
--- a/data/baseStats/squirtle.asm
+++ b/data/baseStats/squirtle.asm
@@ -1,5 +1,5 @@
SquirtleBaseStats: ; 38486 (e:4486)
-db DEX_SQUIRTLE ; pokedex id
+db SQUIRTLE ; pokedex id
db 44 ; base hp
db 48 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm
index e7a8af5f..ad642dc4 100755
--- a/data/baseStats/starmie.asm
+++ b/data/baseStats/starmie.asm
@@ -1,5 +1,5 @@
StarmieBaseStats: ; 390fe (e:50fe)
-db DEX_STARMIE ; pokedex id
+db STARMIE ; pokedex id
db 60 ; base hp
db 75 ; base attack
db 85 ; base defense
diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm
index c05ba8cd..f42f9abb 100755
--- a/data/baseStats/staryu.asm
+++ b/data/baseStats/staryu.asm
@@ -1,5 +1,5 @@
StaryuBaseStats: ; 390e2 (e:50e2)
-db DEX_STARYU ; pokedex id
+db STARYU ; pokedex id
db 30 ; base hp
db 45 ; base attack
db 55 ; base defense
diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm
index 896bfa90..4d15bd14 100755
--- a/data/baseStats/tangela.asm
+++ b/data/baseStats/tangela.asm
@@ -1,5 +1,5 @@
TangelaBaseStats: ; 3903a (e:503a)
-db DEX_TANGELA ; pokedex id
+db TANGELA ; pokedex id
db 65 ; base hp
db 55 ; base attack
db 115 ; base defense
diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm
index 7764897f..36f8246d 100755
--- a/data/baseStats/tauros.asm
+++ b/data/baseStats/tauros.asm
@@ -1,5 +1,5 @@
TaurosBaseStats: ; 391c2 (e:51c2)
-db DEX_TAUROS ; pokedex id
+db TAUROS ; pokedex id
db 75 ; base hp
db 100 ; base attack
db 95 ; base defense
diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm
index a8377c9d..99b1c86f 100755
--- a/data/baseStats/tentacool.asm
+++ b/data/baseStats/tentacool.asm
@@ -1,5 +1,5 @@
TentacoolBaseStats: ; 38ba2 (e:4ba2)
-db DEX_TENTACOOL ; pokedex id
+db TENTACOOL ; pokedex id
db 40 ; base hp
db 40 ; base attack
db 35 ; base defense
diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm
index 7b75519c..72fb7597 100755
--- a/data/baseStats/tentacruel.asm
+++ b/data/baseStats/tentacruel.asm
@@ -1,5 +1,5 @@
TentacruelBaseStats: ; 38bbe (e:4bbe)
-db DEX_TENTACRUEL ; pokedex id
+db TENTACRUEL ; pokedex id
db 80 ; base hp
db 70 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm
index 52fc8c12..0fb36075 100755
--- a/data/baseStats/vaporeon.asm
+++ b/data/baseStats/vaporeon.asm
@@ -1,5 +1,5 @@
VaporeonBaseStats: ; 3926a (e:526a)
-db DEX_VAPOREON ; pokedex id
+db VAPOREON ; pokedex id
db 130 ; base hp
db 65 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm
index 2dab911c..51cc33c5 100755
--- a/data/baseStats/venomoth.asm
+++ b/data/baseStats/venomoth.asm
@@ -1,5 +1,5 @@
VenomothBaseStats: ; 3891e (e:491e)
-db DEX_VENOMOTH ; pokedex id
+db VENOMOTH ; pokedex id
db 70 ; base hp
db 65 ; base attack
db 60 ; base defense
diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm
index 8fe6a735..b6ccc91c 100755
--- a/data/baseStats/venonat.asm
+++ b/data/baseStats/venonat.asm
@@ -1,5 +1,5 @@
VenonatBaseStats: ; 38902 (e:4902)
-db DEX_VENONAT ; pokedex id
+db VENONAT ; pokedex id
db 60 ; base hp
db 55 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm
index 9cc43fa8..bb3eb8c5 100755
--- a/data/baseStats/venusaur.asm
+++ b/data/baseStats/venusaur.asm
@@ -1,5 +1,5 @@
VenusaurBaseStats: ; 38416 (e:4416)
-db DEX_VENUSAUR ; pokedex id
+db VENUSAUR ; pokedex id
db 80 ; base hp
db 82 ; base attack
db 83 ; base defense
diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm
index c930e001..7b861dd4 100755
--- a/data/baseStats/victreebel.asm
+++ b/data/baseStats/victreebel.asm
@@ -1,5 +1,5 @@
VictreebelBaseStats: ; 38b86 (e:4b86)
-db DEX_VICTREEBEL ; pokedex id
+db VICTREEBEL ; pokedex id
db 80 ; base hp
db 105 ; base attack
db 65 ; base defense
diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm
index a728bbd0..71038242 100755
--- a/data/baseStats/vileplume.asm
+++ b/data/baseStats/vileplume.asm
@@ -1,5 +1,5 @@
VileplumeBaseStats: ; 388ae (e:48ae)
-db DEX_VILEPLUME ; pokedex id
+db VILEPLUME ; pokedex id
db 75 ; base hp
db 80 ; base attack
db 85 ; base defense
diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm
index cc47203b..efb0e1ab 100755
--- a/data/baseStats/voltorb.asm
+++ b/data/baseStats/voltorb.asm
@@ -1,5 +1,5 @@
VoltorbBaseStats: ; 38eb2 (e:4eb2)
-db DEX_VOLTORB ; pokedex id
+db VOLTORB ; pokedex id
db 40 ; base hp
db 30 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm
index af117d1b..335b3d8f 100755
--- a/data/baseStats/vulpix.asm
+++ b/data/baseStats/vulpix.asm
@@ -1,5 +1,5 @@
VulpixBaseStats: ; 387ce (e:47ce)
-db DEX_VULPIX ; pokedex id
+db VULPIX ; pokedex id
db 38 ; base hp
db 41 ; base attack
db 40 ; base defense
diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm
index 28139afe..94ca9bf9 100755
--- a/data/baseStats/wartortle.asm
+++ b/data/baseStats/wartortle.asm
@@ -1,5 +1,5 @@
WartortleBaseStats: ; 384a2 (e:44a2)
-db DEX_WARTORTLE ; pokedex id
+db WARTORTLE ; pokedex id
db 59 ; base hp
db 63 ; base attack
db 80 ; base defense
diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm
index f642b5fa..a7ebfc10 100755
--- a/data/baseStats/weedle.asm
+++ b/data/baseStats/weedle.asm
@@ -1,5 +1,5 @@
WeedleBaseStats: ; 3852e (e:452e)
-db DEX_WEEDLE ; pokedex id
+db WEEDLE ; pokedex id
db 40 ; base hp
db 35 ; base attack
db 30 ; base defense
diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm
index f8f497c4..bf96b83d 100755
--- a/data/baseStats/weepinbell.asm
+++ b/data/baseStats/weepinbell.asm
@@ -1,5 +1,5 @@
WeepinbellBaseStats: ; 38b6a (e:4b6a)
-db DEX_WEEPINBELL ; pokedex id
+db WEEPINBELL ; pokedex id
db 65 ; base hp
db 90 ; base attack
db 50 ; base defense
diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm
index a07c483a..cd5855fc 100755
--- a/data/baseStats/weezing.asm
+++ b/data/baseStats/weezing.asm
@@ -1,5 +1,5 @@
WeezingBaseStats: ; 38fca (e:4fca)
-db DEX_WEEZING ; pokedex id
+db WEEZING ; pokedex id
db 65 ; base hp
db 90 ; base attack
db 120 ; base defense
diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm
index 5dabd773..9acc16c2 100755
--- a/data/baseStats/wigglytuff.asm
+++ b/data/baseStats/wigglytuff.asm
@@ -1,5 +1,5 @@
WigglytuffBaseStats: ; 38822 (e:4822)
-db DEX_WIGGLYTUFF ; pokedex id
+db WIGGLYTUFF ; pokedex id
db 140 ; base hp
db 70 ; base attack
db 45 ; base defense
diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm
index 12eeec39..703d5953 100755
--- a/data/baseStats/zapdos.asm
+++ b/data/baseStats/zapdos.asm
@@ -1,5 +1,5 @@
ZapdosBaseStats: ; 3939e (e:539e)
-db DEX_ZAPDOS ; pokedex id
+db ZAPDOS ; pokedex id
db 90 ; base hp
db 90 ; base attack
db 85 ; base defense
diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm
index 252782e9..0df62df0 100755
--- a/data/baseStats/zubat.asm
+++ b/data/baseStats/zubat.asm
@@ -1,5 +1,5 @@
ZubatBaseStats: ; 3883e (e:483e)
-db DEX_ZUBAT ; pokedex id
+db ZUBAT ; pokedex id
db 40 ; base hp
db 45 ; base attack
db 35 ; base defense
diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
deleted file mode 100755
index 691571b0..00000000
--- a/data/pokedex_order.asm
+++ /dev/null
@@ -1,152 +0,0 @@
-PokedexOrder: ; 41024 (10:5024)
- db DEX_BULBASAUR
- db DEX_IVYSAUR
- db DEX_VENUSAUR
- db DEX_CHARMANDER
- db DEX_CHARMELEON
- db DEX_CHARIZARD
- db DEX_SQUIRTLE
- db DEX_WARTORTLE
- db DEX_BLASTOISE
- db DEX_CATERPIE
- db DEX_METAPOD
- db DEX_BUTTERFREE
- db DEX_WEEDLE
- db DEX_KAKUNA
- db DEX_BEEDRILL
- db DEX_PIDGEY
- db DEX_PIDGEOTTO
- db DEX_PIDGEOT
- db DEX_RATTATA
- db DEX_RATICATE
- db DEX_SPEAROW
- db DEX_FEAROW
- db DEX_EKANS
- db DEX_ARBOK
- db DEX_PIKACHU
- db DEX_RAICHU
- db DEX_SANDSHREW
- db DEX_SANDSLASH
- db DEX_NIDORAN_F
- db DEX_NIDORINA
- db DEX_NIDOQUEEN
- db DEX_NIDORAN_M
- db DEX_NIDORINO
- db DEX_NIDOKING
- db DEX_CLEFAIRY
- db DEX_CLEFABLE
- db DEX_VULPIX
- db DEX_NINETALES
- db DEX_JIGGLYPUFF
- db DEX_WIGGLYTUFF
- db DEX_ZUBAT
- db DEX_GOLBAT
- db DEX_ODDISH
- db DEX_GLOOM
- db DEX_VILEPLUME
- db DEX_PARAS
- db DEX_PARASECT
- db DEX_VENONAT
- db DEX_VENOMOTH
- db DEX_DIGLETT
- db DEX_DUGTRIO
- db DEX_MEOWTH
- db DEX_PERSIAN
- db DEX_PSYDUCK
- db DEX_GOLDUCK
- db DEX_MANKEY
- db DEX_PRIMEAPE
- db DEX_GROWLITHE
- db DEX_ARCANINE
- db DEX_POLIWAG
- db DEX_POLIWHIRL
- db DEX_POLIWRATH
- db DEX_ABRA
- db DEX_KADABRA
- db DEX_ALAKAZAM
- db DEX_MACHOP
- db DEX_MACHOKE
- db DEX_MACHAMP
- db DEX_BELLSPROUT
- db DEX_WEEPINBELL
- db DEX_VICTREEBEL
- db DEX_TENTACOOL
- db DEX_TENTACRUEL
- db DEX_GEODUDE
- db DEX_GRAVELER
- db DEX_GOLEM
- db DEX_PONYTA
- db DEX_RAPIDASH
- db DEX_SLOWPOKE
- db DEX_SLOWBRO
- db DEX_MAGNEMITE
- db DEX_MAGNETON
- db DEX_FARFETCH_D
- db DEX_DODUO
- db DEX_DODRIO
- db DEX_SEEL
- db DEX_DEWGONG
- db DEX_GRIMER
- db DEX_MUK
- db DEX_SHELLDER
- db DEX_CLOYSTER
- db DEX_GASTLY
- db DEX_HAUNTER
- db DEX_GENGAR
- db DEX_ONIX
- db DEX_DROWZEE
- db DEX_HYPNO
- db DEX_KRABBY
- db DEX_KINGLER
- db DEX_VOLTORB
- db DEX_ELECTRODE
- db DEX_EXEGGCUTE
- db DEX_EXEGGUTOR
- db DEX_CUBONE
- db DEX_MAROWAK
- db DEX_HITMONLEE
- db DEX_HITMONCHAN
- db DEX_LICKITUNG
- db DEX_KOFFING
- db DEX_WEEZING
- db DEX_RHYHORN
- db DEX_RHYDON
- db DEX_CHANSEY
- db DEX_TANGELA
- db DEX_KANGASKHAN
- db DEX_HORSEA
- db DEX_SEADRA
- db DEX_GOLDEEN
- db DEX_SEAKING
- db DEX_STARYU
- db DEX_STARMIE
- db DEX_MR_MIME
- db DEX_SCYTHER
- db DEX_JYNX
- db DEX_ELECTABUZZ
- db DEX_MAGMAR
- db DEX_PINSIR
- db DEX_TAUROS
- db DEX_MAGIKARP
- db DEX_GYARADOS
- db DEX_LAPRAS
- db DEX_DITTO
- db DEX_EEVEE
- db DEX_VAPOREON
- db DEX_JOLTEON
- db DEX_FLAREON
- db DEX_PORYGON
- db DEX_OMANYTE
- db DEX_OMASTAR
- db DEX_KABUTO
- db DEX_KABUTOPS
- db DEX_AERODACTYL
- db DEX_SNORLAX
- db DEX_ARTICUNO
- db DEX_ZAPDOS
- db DEX_MOLTRES
- db DEX_DRATINI
- db DEX_DRAGONAIR
- db DEX_DRAGONITE
- db DEX_MEWTWO
- db DEX_MEW