diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-08-12 13:41:52 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-08-12 13:41:52 -0500 |
| commit | 3feff214d6ce2e3c6b4ae504c50bcdf09b47eac9 (patch) | |
| tree | b5c62e6af4cac0ee4a2031da318750241131b313 /data/baseStats | |
| parent | aa1e3eac34137d88d6bc1df4fac6f32ceab404b6 (diff) | |
Remove redundant index conversionpokedex-order
Diffstat (limited to 'data/baseStats')
151 files changed, 151 insertions, 151 deletions
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index da70fc63..f017b968 100644 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -1,4 +1,4 @@ -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 2b3520aa..07be62fe 100644 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -1,4 +1,4 @@ -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 1202fb3e..3dd9f581 100644 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -1,4 +1,4 @@ -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 5fdf2a79..6efca287 100644 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -1,4 +1,4 @@ -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 9cbd0d9b..68e6f4e5 100644 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -1,4 +1,4 @@ -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 95e5b3d2..05385931 100644 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -1,4 +1,4 @@ -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 39e8b2ce..aadec36e 100644 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -1,4 +1,4 @@ -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 82ce2e44..f3d5e14e 100644 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -1,4 +1,4 @@ -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 e3cd2af2..dd785292 100644 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -1,4 +1,4 @@ -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 ee68ca9d..72e11068 100644 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -1,5 +1,5 @@ MonBaseStats: -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 5e3b93ed..5efe6b1c 100644 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -1,4 +1,4 @@ -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 705ff047..b87d94f3 100644 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -1,4 +1,4 @@ -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 8f6cb92f..9592e68f 100644 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -1,4 +1,4 @@ -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 2ce5cc04..73bbe5fd 100644 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -1,4 +1,4 @@ -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 8cfaaf1d..d295dc81 100644 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -1,4 +1,4 @@ -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 21d7415a..9b2a214f 100644 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -1,4 +1,4 @@ -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 ce6d6de7..375a8651 100644 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -1,4 +1,4 @@ -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 16c06b42..1368da54 100644 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -1,4 +1,4 @@ -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 dbfd5d5b..2cdb33bb 100644 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -1,4 +1,4 @@ -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 3ba6758d..d3b3c850 100644 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -1,4 +1,4 @@ -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 85ade291..09edbd77 100644 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -1,4 +1,4 @@ -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 64a8a4af..c1d2ed12 100644 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -1,4 +1,4 @@ -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 d8300529..0a4dc6bb 100644 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -1,4 +1,4 @@ -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 0987d145..83515ca7 100644 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -1,4 +1,4 @@ -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 3f326784..0241fa05 100644 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -1,4 +1,4 @@ -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 8be1e0ed..68960f98 100644 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -1,4 +1,4 @@ -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 6d118a0d..dc3fe5a7 100644 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -1,4 +1,4 @@ -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 43a1ac0e..5137421e 100644 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -1,4 +1,4 @@ -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 4fd08a5d..04d005d0 100644 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -1,4 +1,4 @@ -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 174d18a4..ae1d5466 100644 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -1,4 +1,4 @@ -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 fc0faa0d..d3d05e25 100644 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -1,4 +1,4 @@ -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 32da306a..9cfbb0da 100644 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -1,4 +1,4 @@ -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 272f4471..0f41894c 100644 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -1,4 +1,4 @@ -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 b4e21e27..b9e3f5c4 100644 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -1,4 +1,4 @@ -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 1c317013..867a8713 100644 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -1,4 +1,4 @@ -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 9df74e4e..78736c02 100644 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -1,4 +1,4 @@ -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 996c2c5a..5b8db8d5 100644 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -1,4 +1,4 @@ -db DEX_FARFETCHD ; pokedex id +db FARFETCHD ; 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 7d3ea62c..780d85de 100644 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -1,4 +1,4 @@ -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 c404e5eb..f7bfe590 100644 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -1,4 +1,4 @@ -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 8a82bfe6..4560f439 100644 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -1,4 +1,4 @@ -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 50e1eaff..3f80f758 100644 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -1,4 +1,4 @@ -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 5ac57c29..dd7cb513 100644 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -1,4 +1,4 @@ -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 5861440d..3ca4fa4c 100644 --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -1,4 +1,4 @@ -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 206aa494..b840cffe 100644 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -1,4 +1,4 @@ -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 6941b085..06b3d8cb 100644 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -1,4 +1,4 @@ -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 9acb5d9b..d80cdab7 100644 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -1,4 +1,4 @@ -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 6b882f90..68707062 100644 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -1,4 +1,4 @@ -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 be42be38..e083414a 100644 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -1,4 +1,4 @@ -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 425ba9aa..37b72b2c 100644 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -1,4 +1,4 @@ -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 d6aec9ec..9401ec1b 100644 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -1,4 +1,4 @@ -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 729b8553..c973e44a 100644 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -1,4 +1,4 @@ -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 10a8cebc..b2e841a8 100644 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -1,4 +1,4 @@ -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 b2714eee..52275003 100644 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -1,4 +1,4 @@ -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 1133074e..e9b12982 100644 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -1,4 +1,4 @@ -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 141d2fb4..019818a2 100644 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -1,4 +1,4 @@ -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 7700050e..548a9182 100644 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -1,4 +1,4 @@ -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 b08cec77..1de9c7bb 100644 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -1,4 +1,4 @@ -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 da2e35a0..72220dbb 100644 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -1,4 +1,4 @@ -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 7df2abd5..f46a78eb 100644 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -1,4 +1,4 @@ -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 72ace22b..b4ad59e5 100644 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -1,4 +1,4 @@ -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 cf919834..de368b07 100644 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -1,4 +1,4 @@ -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 f5fe14d3..3e7cab21 100644 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -1,4 +1,4 @@ -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 a643cf57..6ec6bf61 100644 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -1,4 +1,4 @@ -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 910bee50..ee4d042e 100644 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -1,4 +1,4 @@ -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 3a229b42..be8a4b8d 100644 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -1,4 +1,4 @@ -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 9b4055d9..5978ba8e 100644 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -1,4 +1,4 @@ -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 13c446fb..379c15d9 100644 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -1,4 +1,4 @@ -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 70b2aeae..e76ee3c4 100644 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -1,4 +1,4 @@ -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 925731ba..4c92ad7d 100644 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -1,4 +1,4 @@ -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 17c25818..3f3d70ad 100644 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -1,4 +1,4 @@ -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 a1e62eca..7315af61 100644 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -1,4 +1,4 @@ -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 101206d4..82508453 100644 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -1,4 +1,4 @@ -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 338519fe..403118eb 100644 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -1,4 +1,4 @@ -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 104c1f54..92087168 100644 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -1,4 +1,4 @@ -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 03ec3745..92677b47 100644 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -1,4 +1,4 @@ -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 c4b10ff8..a2715a5c 100644 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -1,4 +1,4 @@ -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 76ea2361..006facbb 100644 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -1,4 +1,4 @@ -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 0a3851a8..2e666f7a 100644 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -1,4 +1,4 @@ -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 36b11bc3..eb724952 100644 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -1,4 +1,4 @@ -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 2c270631..4c261234 100644 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -1,4 +1,4 @@ -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 0d0a0ae2..bc27d15c 100644 --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -1,4 +1,4 @@ -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 5b12cc6e..6f040491 100644 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -1,5 +1,5 @@ MewBaseStats: -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 922b4da7..bfc14e2f 100644 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -1,4 +1,4 @@ -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 f9a13d39..12fbf243 100644 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -1,4 +1,4 @@ -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 2b8bf758..91eabd93 100644 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -1,4 +1,4 @@ -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 74bb12b0..521b0c0b 100644 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -1,4 +1,4 @@ -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 5d9dd903..09885396 100644 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -1,4 +1,4 @@ -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 2d3beb50..d593541e 100644 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -1,4 +1,4 @@ -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 43fd5571..25ca72da 100644 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -1,4 +1,4 @@ -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 5beca83d..c00c2555 100644 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -1,4 +1,4 @@ -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 f634caae..e10f6c66 100644 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -1,4 +1,4 @@ -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 c01c8b53..c4fcc2d9 100644 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -1,4 +1,4 @@ -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/ninetales.asm b/data/baseStats/ninetales.asm index 41b670c7..e19b4f76 100644 --- a/data/baseStats/ninetales.asm +++ b/data/baseStats/ninetales.asm @@ -1,4 +1,4 @@ -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 14aebeee..52a3e74b 100644 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -1,4 +1,4 @@ -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 73b2127d..5f8f2150 100644 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -1,4 +1,4 @@ -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 dafbd34f..74017926 100644 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -1,4 +1,4 @@ -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 477645ad..2ed8e079 100644 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -1,4 +1,4 @@ -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 57482d25..0924cf5d 100644 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -1,4 +1,4 @@ -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 eafc35e4..aec5214e 100644 --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -1,4 +1,4 @@ -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 afab78c6..7476edd7 100644 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -1,4 +1,4 @@ -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 bff841cd..6ef2af4c 100644 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -1,4 +1,4 @@ -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 e84e5584..8fd1729e 100644 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -1,4 +1,4 @@ -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 d6a48ad4..a3fa309e 100644 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -1,4 +1,4 @@ -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 d14a4a9b..08c0137a 100644 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -1,4 +1,4 @@ -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 753a5d66..224a96e9 100644 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -1,4 +1,4 @@ -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 6efeae28..8c399ce2 100644 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -1,4 +1,4 @@ -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 5e1b5161..1689a046 100644 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -1,4 +1,4 @@ -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 cb7c9e07..1cdd62ee 100644 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -1,4 +1,4 @@ -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 7367e3c4..7fa4a827 100644 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -1,4 +1,4 @@ -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 59875985..0cf700c1 100644 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -1,4 +1,4 @@ -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 5827c198..5739fd4d 100644 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -1,4 +1,4 @@ -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 5980faac..cedb9113 100644 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -1,4 +1,4 @@ -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 04e26ea6..33013ec8 100644 --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -1,4 +1,4 @@ -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 7b113801..f21d5b41 100644 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -1,4 +1,4 @@ -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 82896aa9..a5d89e07 100644 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -1,4 +1,4 @@ -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 838fcd9b..a0d65683 100644 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -1,4 +1,4 @@ -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 fa686a46..a1b3c373 100644 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -1,4 +1,4 @@ -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 79d27ce2..734b361b 100644 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -1,4 +1,4 @@ -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 1ad52514..7b83ce53 100644 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -1,4 +1,4 @@ -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 f123f78b..f09cb042 100644 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -1,4 +1,4 @@ -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 ea3fe52d..0cfc1be5 100644 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -1,4 +1,4 @@ -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 be718833..9c258a1c 100644 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -1,4 +1,4 @@ -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 0b751690..af1f98be 100644 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -1,4 +1,4 @@ -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 8d6a198c..fb0cdcda 100644 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -1,4 +1,4 @@ -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 ac006f70..2d1b3bf3 100644 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -1,4 +1,4 @@ -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 7c222bbc..53c8018c 100644 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -1,4 +1,4 @@ -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 834616d6..259cb627 100644 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -1,4 +1,4 @@ -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 8fe379ca..75a7c0cf 100644 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -1,4 +1,4 @@ -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 5627f394..ff693f94 100644 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -1,4 +1,4 @@ -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 10885091..e1f26036 100644 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -1,4 +1,4 @@ -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 42a47c7b..9fb4fb7c 100644 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -1,4 +1,4 @@ -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 2cec32d7..022c6c47 100644 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -1,4 +1,4 @@ -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 60600a01..bfc359d0 100644 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -1,4 +1,4 @@ -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 10b4f142..28ca024d 100644 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -1,4 +1,4 @@ -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 89767008..2c68b714 100644 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -1,4 +1,4 @@ -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 ed504594..202f1d75 100644 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -1,4 +1,4 @@ -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 74947c43..aa660d53 100644 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -1,4 +1,4 @@ -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 0535c62e..0330b4fd 100644 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -1,4 +1,4 @@ -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 11d409a5..4f5426e6 100644 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -1,4 +1,4 @@ -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 5ce09b48..f876dcb3 100644 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -1,4 +1,4 @@ -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 9c16d13d..f20f5d51 100644 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -1,4 +1,4 @@ -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 278806d7..31af3f07 100644 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -1,4 +1,4 @@ -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 1fe61a6b..ca52ba7b 100644 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -1,4 +1,4 @@ -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 f5a3ab5a..49d67126 100644 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -1,4 +1,4 @@ -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 1de0c252..ecc67da1 100644 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -1,4 +1,4 @@ -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 954f2847..3f40f898 100644 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -1,4 +1,4 @@ -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 1aa9b929..f7b000b7 100644 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -1,4 +1,4 @@ -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 44405ee3..f3afdd3c 100644 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -1,4 +1,4 @@ -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 c5719182..69952f5c 100644 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -1,4 +1,4 @@ -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 e4cba0ae..6a5cbeb1 100644 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -1,4 +1,4 @@ -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 a82630ac..b88055e2 100644 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -1,4 +1,4 @@ -db DEX_ZUBAT ; pokedex id +db ZUBAT ; pokedex id db 40 ; base hp db 45 ; base attack db 35 ; base defense |