From 360a2200b17fbd7d19bc1fa5fa8eeb5641ff28ed Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sat, 30 Jan 2016 20:40:12 -0700 Subject: Remove misleading (unreferenced) labels. --- data/baseStats/abra.asm | 1 - data/baseStats/aerodactyl.asm | 1 - data/baseStats/alakazam.asm | 1 - data/baseStats/arbok.asm | 1 - data/baseStats/arcanine.asm | 1 - data/baseStats/articuno.asm | 1 - data/baseStats/beedrill.asm | 1 - data/baseStats/bellsprout.asm | 1 - data/baseStats/blastoise.asm | 1 - data/baseStats/bulbasaur.asm | 3 ++- data/baseStats/butterfree.asm | 1 - data/baseStats/caterpie.asm | 1 - data/baseStats/chansey.asm | 1 - data/baseStats/charizard.asm | 1 - data/baseStats/charmander.asm | 1 - data/baseStats/charmeleon.asm | 1 - data/baseStats/clefable.asm | 1 - data/baseStats/clefairy.asm | 1 - data/baseStats/cloyster.asm | 1 - data/baseStats/cubone.asm | 1 - data/baseStats/dewgong.asm | 1 - data/baseStats/diglett.asm | 1 - data/baseStats/ditto.asm | 1 - data/baseStats/dodrio.asm | 1 - data/baseStats/doduo.asm | 1 - data/baseStats/dragonair.asm | 1 - data/baseStats/dragonite.asm | 1 - data/baseStats/dratini.asm | 1 - data/baseStats/drowzee.asm | 1 - data/baseStats/dugtrio.asm | 1 - data/baseStats/eevee.asm | 1 - data/baseStats/ekans.asm | 1 - data/baseStats/electabuzz.asm | 1 - data/baseStats/electrode.asm | 1 - data/baseStats/exeggcute.asm | 1 - data/baseStats/exeggutor.asm | 1 - data/baseStats/farfetchd.asm | 1 - data/baseStats/fearow.asm | 1 - data/baseStats/flareon.asm | 1 - data/baseStats/gastly.asm | 1 - data/baseStats/gengar.asm | 1 - data/baseStats/geodude.asm | 1 - data/baseStats/gloom.asm | 1 - data/baseStats/golbat.asm | 1 - data/baseStats/goldeen.asm | 1 - data/baseStats/golduck.asm | 1 - data/baseStats/golem.asm | 1 - data/baseStats/graveler.asm | 1 - data/baseStats/grimer.asm | 1 - data/baseStats/growlithe.asm | 1 - data/baseStats/gyarados.asm | 1 - data/baseStats/haunter.asm | 1 - data/baseStats/hitmonchan.asm | 1 - data/baseStats/hitmonlee.asm | 1 - data/baseStats/horsea.asm | 1 - data/baseStats/hypno.asm | 1 - data/baseStats/ivysaur.asm | 1 - data/baseStats/jigglypuff.asm | 1 - data/baseStats/jolteon.asm | 1 - data/baseStats/jynx.asm | 1 - data/baseStats/kabuto.asm | 1 - data/baseStats/kabutops.asm | 1 - data/baseStats/kadabra.asm | 1 - data/baseStats/kakuna.asm | 1 - data/baseStats/kangaskhan.asm | 1 - data/baseStats/kingler.asm | 1 - data/baseStats/koffing.asm | 1 - data/baseStats/krabby.asm | 1 - data/baseStats/lapras.asm | 1 - data/baseStats/lickitung.asm | 1 - data/baseStats/machamp.asm | 1 - data/baseStats/machoke.asm | 1 - data/baseStats/machop.asm | 1 - data/baseStats/magikarp.asm | 1 - data/baseStats/magmar.asm | 1 - data/baseStats/magnemite.asm | 1 - data/baseStats/magneton.asm | 1 - data/baseStats/mankey.asm | 1 - data/baseStats/marowak.asm | 1 - data/baseStats/meowth.asm | 1 - data/baseStats/metapod.asm | 1 - data/baseStats/mew.asm | 2 +- data/baseStats/mewtwo.asm | 1 - data/baseStats/moltres.asm | 1 - data/baseStats/mrmime.asm | 1 - data/baseStats/muk.asm | 1 - data/baseStats/nidoking.asm | 1 - data/baseStats/nidoqueen.asm | 1 - data/baseStats/nidoranf.asm | 1 - data/baseStats/nidoranm.asm | 1 - data/baseStats/nidorina.asm | 1 - data/baseStats/nidorino.asm | 1 - data/baseStats/ninetails.asm | 1 - data/baseStats/oddish.asm | 1 - data/baseStats/omanyte.asm | 1 - data/baseStats/omastar.asm | 1 - data/baseStats/onix.asm | 1 - data/baseStats/paras.asm | 1 - data/baseStats/parasect.asm | 1 - data/baseStats/persian.asm | 1 - data/baseStats/pidgeot.asm | 1 - data/baseStats/pidgeotto.asm | 1 - data/baseStats/pidgey.asm | 1 - data/baseStats/pikachu.asm | 1 - data/baseStats/pinsir.asm | 1 - data/baseStats/poliwag.asm | 1 - data/baseStats/poliwhirl.asm | 1 - data/baseStats/poliwrath.asm | 1 - data/baseStats/ponyta.asm | 1 - data/baseStats/porygon.asm | 1 - data/baseStats/primeape.asm | 1 - data/baseStats/psyduck.asm | 1 - data/baseStats/raichu.asm | 1 - data/baseStats/rapidash.asm | 1 - data/baseStats/raticate.asm | 1 - data/baseStats/rattata.asm | 1 - data/baseStats/rhydon.asm | 3 --- data/baseStats/rhyhorn.asm | 1 - data/baseStats/sandshrew.asm | 1 - data/baseStats/sandslash.asm | 1 - data/baseStats/scyther.asm | 1 - data/baseStats/seadra.asm | 1 - data/baseStats/seaking.asm | 1 - data/baseStats/seel.asm | 1 - data/baseStats/shellder.asm | 1 - data/baseStats/slowbro.asm | 1 - data/baseStats/slowpoke.asm | 1 - data/baseStats/snorlax.asm | 1 - data/baseStats/spearow.asm | 1 - data/baseStats/squirtle.asm | 1 - data/baseStats/starmie.asm | 1 - data/baseStats/staryu.asm | 1 - data/baseStats/tangela.asm | 1 - data/baseStats/tauros.asm | 1 - data/baseStats/tentacool.asm | 1 - data/baseStats/tentacruel.asm | 1 - data/baseStats/vaporeon.asm | 1 - data/baseStats/venomoth.asm | 1 - data/baseStats/venonat.asm | 1 - data/baseStats/venusaur.asm | 1 - data/baseStats/victreebel.asm | 1 - data/baseStats/vileplume.asm | 1 - data/baseStats/voltorb.asm | 1 - data/baseStats/vulpix.asm | 1 - data/baseStats/wartortle.asm | 1 - data/baseStats/weedle.asm | 1 - data/baseStats/weepinbell.asm | 1 - data/baseStats/weezing.asm | 1 - data/baseStats/wigglytuff.asm | 1 - data/baseStats/zapdos.asm | 1 - data/baseStats/zubat.asm | 1 - 151 files changed, 3 insertions(+), 153 deletions(-) mode change 100755 => 100644 data/baseStats/abra.asm mode change 100755 => 100644 data/baseStats/aerodactyl.asm mode change 100755 => 100644 data/baseStats/alakazam.asm mode change 100755 => 100644 data/baseStats/arbok.asm mode change 100755 => 100644 data/baseStats/arcanine.asm mode change 100755 => 100644 data/baseStats/articuno.asm mode change 100755 => 100644 data/baseStats/beedrill.asm mode change 100755 => 100644 data/baseStats/bellsprout.asm mode change 100755 => 100644 data/baseStats/blastoise.asm mode change 100755 => 100644 data/baseStats/bulbasaur.asm mode change 100755 => 100644 data/baseStats/butterfree.asm mode change 100755 => 100644 data/baseStats/caterpie.asm mode change 100755 => 100644 data/baseStats/chansey.asm mode change 100755 => 100644 data/baseStats/charizard.asm mode change 100755 => 100644 data/baseStats/charmander.asm mode change 100755 => 100644 data/baseStats/charmeleon.asm mode change 100755 => 100644 data/baseStats/clefable.asm mode change 100755 => 100644 data/baseStats/clefairy.asm mode change 100755 => 100644 data/baseStats/cloyster.asm mode change 100755 => 100644 data/baseStats/cubone.asm mode change 100755 => 100644 data/baseStats/dewgong.asm mode change 100755 => 100644 data/baseStats/diglett.asm mode change 100755 => 100644 data/baseStats/ditto.asm mode change 100755 => 100644 data/baseStats/dodrio.asm mode change 100755 => 100644 data/baseStats/doduo.asm mode change 100755 => 100644 data/baseStats/dragonair.asm mode change 100755 => 100644 data/baseStats/dragonite.asm mode change 100755 => 100644 data/baseStats/dratini.asm mode change 100755 => 100644 data/baseStats/drowzee.asm mode change 100755 => 100644 data/baseStats/dugtrio.asm mode change 100755 => 100644 data/baseStats/eevee.asm mode change 100755 => 100644 data/baseStats/ekans.asm mode change 100755 => 100644 data/baseStats/electabuzz.asm mode change 100755 => 100644 data/baseStats/electrode.asm mode change 100755 => 100644 data/baseStats/exeggcute.asm mode change 100755 => 100644 data/baseStats/exeggutor.asm mode change 100755 => 100644 data/baseStats/farfetchd.asm mode change 100755 => 100644 data/baseStats/fearow.asm mode change 100755 => 100644 data/baseStats/flareon.asm mode change 100755 => 100644 data/baseStats/gastly.asm mode change 100755 => 100644 data/baseStats/gengar.asm mode change 100755 => 100644 data/baseStats/geodude.asm mode change 100755 => 100644 data/baseStats/gloom.asm mode change 100755 => 100644 data/baseStats/golbat.asm mode change 100755 => 100644 data/baseStats/goldeen.asm mode change 100755 => 100644 data/baseStats/golduck.asm mode change 100755 => 100644 data/baseStats/golem.asm mode change 100755 => 100644 data/baseStats/graveler.asm mode change 100755 => 100644 data/baseStats/grimer.asm mode change 100755 => 100644 data/baseStats/growlithe.asm mode change 100755 => 100644 data/baseStats/gyarados.asm mode change 100755 => 100644 data/baseStats/haunter.asm mode change 100755 => 100644 data/baseStats/hitmonchan.asm mode change 100755 => 100644 data/baseStats/hitmonlee.asm mode change 100755 => 100644 data/baseStats/horsea.asm mode change 100755 => 100644 data/baseStats/hypno.asm mode change 100755 => 100644 data/baseStats/ivysaur.asm mode change 100755 => 100644 data/baseStats/jigglypuff.asm mode change 100755 => 100644 data/baseStats/jolteon.asm mode change 100755 => 100644 data/baseStats/jynx.asm mode change 100755 => 100644 data/baseStats/kabuto.asm mode change 100755 => 100644 data/baseStats/kabutops.asm mode change 100755 => 100644 data/baseStats/kadabra.asm mode change 100755 => 100644 data/baseStats/kakuna.asm mode change 100755 => 100644 data/baseStats/kangaskhan.asm mode change 100755 => 100644 data/baseStats/kingler.asm mode change 100755 => 100644 data/baseStats/koffing.asm mode change 100755 => 100644 data/baseStats/krabby.asm mode change 100755 => 100644 data/baseStats/lapras.asm mode change 100755 => 100644 data/baseStats/lickitung.asm mode change 100755 => 100644 data/baseStats/machamp.asm mode change 100755 => 100644 data/baseStats/machoke.asm mode change 100755 => 100644 data/baseStats/machop.asm mode change 100755 => 100644 data/baseStats/magikarp.asm mode change 100755 => 100644 data/baseStats/magmar.asm mode change 100755 => 100644 data/baseStats/magnemite.asm mode change 100755 => 100644 data/baseStats/magneton.asm mode change 100755 => 100644 data/baseStats/mankey.asm mode change 100755 => 100644 data/baseStats/marowak.asm mode change 100755 => 100644 data/baseStats/meowth.asm mode change 100755 => 100644 data/baseStats/metapod.asm mode change 100755 => 100644 data/baseStats/mew.asm mode change 100755 => 100644 data/baseStats/mewtwo.asm mode change 100755 => 100644 data/baseStats/moltres.asm mode change 100755 => 100644 data/baseStats/mrmime.asm mode change 100755 => 100644 data/baseStats/muk.asm mode change 100755 => 100644 data/baseStats/nidoking.asm mode change 100755 => 100644 data/baseStats/nidoqueen.asm mode change 100755 => 100644 data/baseStats/nidoranf.asm mode change 100755 => 100644 data/baseStats/nidoranm.asm mode change 100755 => 100644 data/baseStats/nidorina.asm mode change 100755 => 100644 data/baseStats/nidorino.asm mode change 100755 => 100644 data/baseStats/ninetails.asm mode change 100755 => 100644 data/baseStats/oddish.asm mode change 100755 => 100644 data/baseStats/omanyte.asm mode change 100755 => 100644 data/baseStats/omastar.asm mode change 100755 => 100644 data/baseStats/onix.asm mode change 100755 => 100644 data/baseStats/paras.asm mode change 100755 => 100644 data/baseStats/parasect.asm mode change 100755 => 100644 data/baseStats/persian.asm mode change 100755 => 100644 data/baseStats/pidgeot.asm mode change 100755 => 100644 data/baseStats/pidgeotto.asm mode change 100755 => 100644 data/baseStats/pidgey.asm mode change 100755 => 100644 data/baseStats/pikachu.asm mode change 100755 => 100644 data/baseStats/pinsir.asm mode change 100755 => 100644 data/baseStats/poliwag.asm mode change 100755 => 100644 data/baseStats/poliwhirl.asm mode change 100755 => 100644 data/baseStats/poliwrath.asm mode change 100755 => 100644 data/baseStats/ponyta.asm mode change 100755 => 100644 data/baseStats/porygon.asm mode change 100755 => 100644 data/baseStats/primeape.asm mode change 100755 => 100644 data/baseStats/psyduck.asm mode change 100755 => 100644 data/baseStats/raichu.asm mode change 100755 => 100644 data/baseStats/rapidash.asm mode change 100755 => 100644 data/baseStats/raticate.asm mode change 100755 => 100644 data/baseStats/rattata.asm mode change 100755 => 100644 data/baseStats/rhydon.asm mode change 100755 => 100644 data/baseStats/rhyhorn.asm mode change 100755 => 100644 data/baseStats/sandshrew.asm mode change 100755 => 100644 data/baseStats/sandslash.asm mode change 100755 => 100644 data/baseStats/scyther.asm mode change 100755 => 100644 data/baseStats/seadra.asm mode change 100755 => 100644 data/baseStats/seaking.asm mode change 100755 => 100644 data/baseStats/seel.asm mode change 100755 => 100644 data/baseStats/shellder.asm mode change 100755 => 100644 data/baseStats/slowbro.asm mode change 100755 => 100644 data/baseStats/slowpoke.asm mode change 100755 => 100644 data/baseStats/snorlax.asm mode change 100755 => 100644 data/baseStats/spearow.asm mode change 100755 => 100644 data/baseStats/squirtle.asm mode change 100755 => 100644 data/baseStats/starmie.asm mode change 100755 => 100644 data/baseStats/staryu.asm mode change 100755 => 100644 data/baseStats/tangela.asm mode change 100755 => 100644 data/baseStats/tauros.asm mode change 100755 => 100644 data/baseStats/tentacool.asm mode change 100755 => 100644 data/baseStats/tentacruel.asm mode change 100755 => 100644 data/baseStats/vaporeon.asm mode change 100755 => 100644 data/baseStats/venomoth.asm mode change 100755 => 100644 data/baseStats/venonat.asm mode change 100755 => 100644 data/baseStats/venusaur.asm mode change 100755 => 100644 data/baseStats/victreebel.asm mode change 100755 => 100644 data/baseStats/vileplume.asm mode change 100755 => 100644 data/baseStats/voltorb.asm mode change 100755 => 100644 data/baseStats/vulpix.asm mode change 100755 => 100644 data/baseStats/wartortle.asm mode change 100755 => 100644 data/baseStats/weedle.asm mode change 100755 => 100644 data/baseStats/weepinbell.asm mode change 100755 => 100644 data/baseStats/weezing.asm mode change 100755 => 100644 data/baseStats/wigglytuff.asm mode change 100755 => 100644 data/baseStats/zapdos.asm mode change 100755 => 100644 data/baseStats/zubat.asm (limited to 'data/baseStats') diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm old mode 100755 new mode 100644 index bb5b15e5..1a41bb5c --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -1,4 +1,3 @@ -AbraBaseStats: ; 38aa6 (e:4aa6) db DEX_ABRA ; pokedex id db 25 ; base hp db 20 ; base attack diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm old mode 100755 new mode 100644 index 949d39dc..874dd57d --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -1,4 +1,3 @@ -AerodactylBaseStats: ; 3934a (e:534a) db DEX_AERODACTYL ; pokedex id db 80 ; base hp db 105 ; base attack diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm old mode 100755 new mode 100644 index f61e5a48..6762eb83 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -1,4 +1,3 @@ -AlakazamBaseStats: ; 38ade (e:4ade) db DEX_ALAKAZAM ; pokedex id db 55 ; base hp db 50 ; base attack diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm old mode 100755 new mode 100644 index 34a73933..6beee569 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -1,4 +1,3 @@ -ArbokBaseStats: ; 38662 (e:4662) db DEX_ARBOK ; pokedex id db 60 ; base hp db 85 ; base attack diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm old mode 100755 new mode 100644 index 4d4e8f77..2a2dda3b --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -1,4 +1,3 @@ -ArcanineBaseStats: ; 38a36 (e:4a36) db DEX_ARCANINE ; pokedex id db 90 ; base hp db 110 ; base attack diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm old mode 100755 new mode 100644 index 31c328ed..ef791055 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -1,4 +1,3 @@ -ArticunoBaseStats: ; 39382 (e:5382) db DEX_ARTICUNO ; pokedex id db 90 ; base hp db 85 ; base attack diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm old mode 100755 new mode 100644 index b3c85f3d..6bf091b8 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -1,4 +1,3 @@ -BeedrillBaseStats: ; 38566 (e:4566) db DEX_BEEDRILL ; pokedex id db 65 ; base hp db 80 ; base attack diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm old mode 100755 new mode 100644 index d6297826..1c908bbb --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -1,4 +1,3 @@ -BellsproutBaseStats: ; 38b4e (e:4b4e) db DEX_BELLSPROUT ; pokedex id db 50 ; base hp db 75 ; base attack diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm old mode 100755 new mode 100644 index e5ccd2db..eaf18b41 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -1,4 +1,3 @@ -BlastoiseBaseStats: ; 384be (e:44be) db DEX_BLASTOISE ; pokedex id db 79 ; base hp db 83 ; base attack diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm old mode 100755 new mode 100644 index 261b28ee..7b3567b5 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -1,4 +1,4 @@ -BulbasaurBaseStats: ; 383de (e:43de) +MonBaseStats: db DEX_BULBASAUR ; pokedex id db 45 ; base hp db 49 ; base attack @@ -27,3 +27,4 @@ db 3 ; growth rate tmlearn 44 tmlearn 50,51 db 0 ; padding +MonBaseStatsEnd: diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm old mode 100755 new mode 100644 index 74a6a0bb..75a0ee02 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -1,4 +1,3 @@ -ButterfreeBaseStats: ; 38512 (e:4512) db DEX_BUTTERFREE ; pokedex id db 60 ; base hp db 45 ; base attack diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm old mode 100755 new mode 100644 index 975f31a1..d26bc5d9 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -1,4 +1,3 @@ -CaterpieBaseStats: ; 384da (e:44da) db DEX_CATERPIE ; pokedex id db 45 ; base hp db 30 ; base attack diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm old mode 100755 new mode 100644 index a830ae1e..d9b8513d --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -1,4 +1,3 @@ -ChanseyBaseStats: ; 3901e (e:501e) db DEX_CHANSEY ; pokedex id db 250 ; base hp db 5 ; base attack diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm old mode 100755 new mode 100644 index c75d9a34..ea978159 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -1,4 +1,3 @@ -CharizardBaseStats: ; 3846a (e:446a) db DEX_CHARIZARD ; pokedex id db 78 ; base hp db 84 ; base attack diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm old mode 100755 new mode 100644 index 936befa4..ccd53458 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -1,4 +1,3 @@ -CharmanderBaseStats: ; 38432 (e:4432) db DEX_CHARMANDER ; pokedex id db 39 ; base hp db 52 ; base attack diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm old mode 100755 new mode 100644 index 8e2675f0..80aa2bca --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -1,4 +1,3 @@ -CharmeleonBaseStats: ; 3844e (e:444e) db DEX_CHARMELEON ; pokedex id db 58 ; base hp db 64 ; base attack diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm old mode 100755 new mode 100644 index e26f1445..17837da4 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -1,4 +1,3 @@ -ClefableBaseStats: ; 387b2 (e:47b2) db DEX_CLEFABLE ; pokedex id db 95 ; base hp db 70 ; base attack diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm old mode 100755 new mode 100644 index cc47df10..952391c7 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -1,4 +1,3 @@ -ClefairyBaseStats: ; 38796 (e:4796) db DEX_CLEFAIRY ; pokedex id db 70 ; base hp db 45 ; base attack diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm old mode 100755 new mode 100644 index aa09d48a..10f38bdb --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -1,4 +1,3 @@ -CloysterBaseStats: ; 38db6 (e:4db6) db DEX_CLOYSTER ; pokedex id db 50 ; base hp db 95 ; base attack diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm old mode 100755 new mode 100644 index 74584844..b1222d98 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -1,4 +1,3 @@ -CuboneBaseStats: ; 38f22 (e:4f22) db DEX_CUBONE ; pokedex id db 50 ; base hp db 50 ; base attack diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm old mode 100755 new mode 100644 index e7efc42b..fb0cf2c2 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -1,4 +1,3 @@ -DewgongBaseStats: ; 38d46 (e:4d46) db DEX_DEWGONG ; pokedex id db 90 ; base hp db 70 ; base attack diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm old mode 100755 new mode 100644 index af0cab55..173dfa3d --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -1,4 +1,3 @@ -DiglettBaseStats: ; 3893a (e:493a) db DEX_DIGLETT ; pokedex id db 10 ; base hp db 55 ; base attack diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm old mode 100755 new mode 100644 index 88def477..90ea4c5e --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -1,4 +1,3 @@ -DittoBaseStats: ; 39232 (e:5232) db DEX_DITTO ; pokedex id db 48 ; base hp db 48 ; base attack diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm old mode 100755 new mode 100644 index 025204fb..99608f48 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -1,4 +1,3 @@ -DodrioBaseStats: ; 38d0e (e:4d0e) db DEX_DODRIO ; pokedex id db 60 ; base hp db 110 ; base attack diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm old mode 100755 new mode 100644 index 091152dd..760c258b --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -1,4 +1,3 @@ -DoduoBaseStats: ; 38cf2 (e:4cf2) db DEX_DODUO ; pokedex id db 35 ; base hp db 85 ; base attack diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm old mode 100755 new mode 100644 index b8f0a606..041300e0 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -1,4 +1,3 @@ -DragonairBaseStats: ; 393f2 (e:53f2) db DEX_DRAGONAIR ; pokedex id db 61 ; base hp db 84 ; base attack diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm old mode 100755 new mode 100644 index 1000e384..442275b2 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -1,4 +1,3 @@ -DragoniteBaseStats: ; 3940e (e:540e) db DEX_DRAGONITE ; pokedex id db 91 ; base hp db 134 ; base attack diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm old mode 100755 new mode 100644 index 37ed8f09..5fb5c75d --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -1,4 +1,3 @@ -DratiniBaseStats: ; 393d6 (e:53d6) db DEX_DRATINI ; pokedex id db 41 ; base hp db 64 ; base attack diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm old mode 100755 new mode 100644 index 6397eeaf..452db1bc --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -1,4 +1,3 @@ -DrowzeeBaseStats: ; 38e42 (e:4e42) db DEX_DROWZEE ; pokedex id db 60 ; base hp db 48 ; base attack diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm old mode 100755 new mode 100644 index f60dc1c0..b70b5383 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -1,4 +1,3 @@ -DugtrioBaseStats: ; 38956 (e:4956) db DEX_DUGTRIO ; pokedex id db 35 ; base hp db 80 ; base attack diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm old mode 100755 new mode 100644 index 2c2114fb..0fa869fe --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -1,4 +1,3 @@ -EeveeBaseStats: ; 3924e (e:524e) db DEX_EEVEE ; pokedex id db 55 ; base hp db 55 ; base attack diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm old mode 100755 new mode 100644 index 26e75eeb..b029a67c --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -1,4 +1,3 @@ -EkansBaseStats: ; 38646 (e:4646) db DEX_EKANS ; pokedex id db 35 ; base hp db 60 ; base attack diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm old mode 100755 new mode 100644 index 5dc76c37..4b44604e --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -1,4 +1,3 @@ -ElectabuzzBaseStats: ; 3916e (e:516e) db DEX_ELECTABUZZ ; pokedex id db 65 ; base hp db 83 ; base attack diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm old mode 100755 new mode 100644 index dc9da8d3..1b292f2f --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -1,4 +1,3 @@ -ElectrodeBaseStats: ; 38ece (e:4ece) db DEX_ELECTRODE ; pokedex id db 60 ; base hp db 50 ; base attack diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm old mode 100755 new mode 100644 index 4c77db2a..8503889b --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -1,4 +1,3 @@ -ExeggcuteBaseStats: ; 38eea (e:4eea) db DEX_EXEGGCUTE ; pokedex id db 60 ; base hp db 40 ; base attack diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm old mode 100755 new mode 100644 index f67857e2..4d739430 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -1,4 +1,3 @@ -ExeggutorBaseStats: ; 38f06 (e:4f06) db DEX_EXEGGUTOR ; pokedex id db 95 ; base hp db 95 ; base attack diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm old mode 100755 new mode 100644 index a1084b17..2aa7eca0 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -1,4 +1,3 @@ -FarfetchdBaseStats: ; 38cd6 (e:4cd6) db DEX_FARFETCHD ; pokedex id db 52 ; base hp db 65 ; base attack diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm old mode 100755 new mode 100644 index 8d3059db..4ad88723 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -1,4 +1,3 @@ -FearowBaseStats: ; 3862a (e:462a) db DEX_FEAROW ; pokedex id db 65 ; base hp db 90 ; base attack diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm old mode 100755 new mode 100644 index 48c4b702..c6c0c060 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -1,4 +1,3 @@ -FlareonBaseStats: ; 392a2 (e:52a2) db DEX_FLAREON ; pokedex id db 65 ; base hp db 130 ; base attack diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm old mode 100755 new mode 100644 index c6e69bd2..fdcaaa71 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -1,4 +1,3 @@ -GastlyBaseStats: ; 38dd2 (e:4dd2) db DEX_GASTLY ; pokedex id db 30 ; base hp db 35 ; base attack diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm old mode 100755 new mode 100644 index 910903d0..0e3e877c --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -1,4 +1,3 @@ -GengarBaseStats: ; 38e0a (e:4e0a) db DEX_GENGAR ; pokedex id db 60 ; base hp db 65 ; base attack diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm old mode 100755 new mode 100644 index e185e3c0..a47a993a --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -1,4 +1,3 @@ -GeodudeBaseStats: ; 38bda (e:4bda) db DEX_GEODUDE ; pokedex id db 40 ; base hp db 80 ; base attack diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm old mode 100755 new mode 100644 index efee0dae..f2153e5c --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -1,4 +1,3 @@ -GloomBaseStats: ; 38892 (e:4892) db DEX_GLOOM ; pokedex id db 60 ; base hp db 65 ; base attack diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm old mode 100755 new mode 100644 index e6a22f70..845adf4b --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -1,4 +1,3 @@ -GolbatBaseStats: ; 3885a (e:485a) db DEX_GOLBAT ; pokedex id db 75 ; base hp db 80 ; base attack diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm old mode 100755 new mode 100644 index 36cf0d96..ed3a4fdb --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -1,4 +1,3 @@ -GoldeenBaseStats: ; 390aa (e:50aa) db DEX_GOLDEEN ; pokedex id db 45 ; base hp db 67 ; base attack diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm old mode 100755 new mode 100644 index e063ae47..cce89da7 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -1,4 +1,3 @@ -GolduckBaseStats: ; 389c6 (e:49c6) db DEX_GOLDUCK ; pokedex id db 80 ; base hp db 82 ; base attack diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm old mode 100755 new mode 100644 index 1308bc78..28f2a326 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -1,4 +1,3 @@ -GolemBaseStats: ; 38c12 (e:4c12) db DEX_GOLEM ; pokedex id db 80 ; base hp db 110 ; base attack diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm old mode 100755 new mode 100644 index 8cc740dd..08776ab1 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -1,4 +1,3 @@ -GravelerBaseStats: ; 38bf6 (e:4bf6) db DEX_GRAVELER ; pokedex id db 55 ; base hp db 95 ; base attack diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm old mode 100755 new mode 100644 index 55aedc95..5f7a64a7 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -1,4 +1,3 @@ -GrimerBaseStats: ; 38d62 (e:4d62) db DEX_GRIMER ; pokedex id db 80 ; base hp db 80 ; base attack diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm old mode 100755 new mode 100644 index cc4d1ff7..df305636 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -1,4 +1,3 @@ -GrowlitheBaseStats: ; 38a1a (e:4a1a) db DEX_GROWLITHE ; pokedex id db 55 ; base hp db 70 ; base attack diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm old mode 100755 new mode 100644 index 1b374f08..21214d0b --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -1,4 +1,3 @@ -GyaradosBaseStats: ; 391fa (e:51fa) db DEX_GYARADOS ; pokedex id db 95 ; base hp db 125 ; base attack diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm old mode 100755 new mode 100644 index a530108a..bd39eaf4 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -1,4 +1,3 @@ -HaunterBaseStats: ; 38dee (e:4dee) db DEX_HAUNTER ; pokedex id db 45 ; base hp db 50 ; base attack diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm old mode 100755 new mode 100644 index 4a717248..37021f65 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -1,4 +1,3 @@ -HitmonchanBaseStats: ; 38f76 (e:4f76) db DEX_HITMONCHAN ; pokedex id db 50 ; base hp db 105 ; base attack diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm old mode 100755 new mode 100644 index e25bb725..d16db130 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -1,4 +1,3 @@ -HitmonleeBaseStats: ; 38f5a (e:4f5a) db DEX_HITMONLEE ; pokedex id db 50 ; base hp db 120 ; base attack diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm old mode 100755 new mode 100644 index b754f425..01de3ff6 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -1,4 +1,3 @@ -HorseaBaseStats: ; 39072 (e:5072) db DEX_HORSEA ; pokedex id db 30 ; base hp db 40 ; base attack diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm old mode 100755 new mode 100644 index 3ba1ad30..4e4959b4 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -1,4 +1,3 @@ -HypnoBaseStats: ; 38e5e (e:4e5e) db DEX_HYPNO ; pokedex id db 85 ; base hp db 73 ; base attack diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm old mode 100755 new mode 100644 index 9672935e..3e19f2a1 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -1,4 +1,3 @@ -IvysaurBaseStats: ; 383fa (e:43fa) db DEX_IVYSAUR ; pokedex id db 60 ; base hp db 62 ; base attack diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm old mode 100755 new mode 100644 index 5111e9c8..fac03fc9 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -1,4 +1,3 @@ -JigglypuffBaseStats: ; 38806 (e:4806) db DEX_JIGGLYPUFF ; pokedex id db 115 ; base hp db 45 ; base attack diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm old mode 100755 new mode 100644 index 8ade6544..eb0bf305 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -1,4 +1,3 @@ -JolteonBaseStats: ; 39286 (e:5286) db DEX_JOLTEON ; pokedex id db 65 ; base hp db 65 ; base attack diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm old mode 100755 new mode 100644 index 82778775..e69b87b9 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -1,4 +1,3 @@ -JynxBaseStats: ; 39152 (e:5152) db DEX_JYNX ; pokedex id db 65 ; base hp db 50 ; base attack diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm old mode 100755 new mode 100644 index 1fde7156..60f3e959 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -1,4 +1,3 @@ -KabutoBaseStats: ; 39312 (e:5312) db DEX_KABUTO ; pokedex id db 30 ; base hp db 80 ; base attack diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm old mode 100755 new mode 100644 index 170fee9b..dbddab2e --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -1,4 +1,3 @@ -KabutopsBaseStats: ; 3932e (e:532e) db DEX_KABUTOPS ; pokedex id db 60 ; base hp db 115 ; base attack diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm old mode 100755 new mode 100644 index 5fa0e466..ad4ac7f7 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -1,4 +1,3 @@ -KadabraBaseStats: ; 38ac2 (e:4ac2) db DEX_KADABRA ; pokedex id db 40 ; base hp db 35 ; base attack diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm old mode 100755 new mode 100644 index 4ee90925..ec593f91 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -1,4 +1,3 @@ -KakunaBaseStats: ; 3854a (e:454a) db DEX_KAKUNA ; pokedex id db 45 ; base hp db 25 ; base attack diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm old mode 100755 new mode 100644 index a17cb653..6dcd1e3c --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -1,4 +1,3 @@ -KangaskhanBaseStats: ; 39056 (e:5056) db DEX_KANGASKHAN ; pokedex id db 105 ; base hp db 95 ; base attack diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm old mode 100755 new mode 100644 index 7604bf80..8708d5cf --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -1,4 +1,3 @@ -KinglerBaseStats: ; 38e96 (e:4e96) db DEX_KINGLER ; pokedex id db 55 ; base hp db 130 ; base attack diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm old mode 100755 new mode 100644 index 24f47d17..fced6246 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -1,4 +1,3 @@ -KoffingBaseStats: ; 38fae (e:4fae) db DEX_KOFFING ; pokedex id db 40 ; base hp db 65 ; base attack diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm old mode 100755 new mode 100644 index 3d901041..88d690b6 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -1,4 +1,3 @@ -KrabbyBaseStats: ; 38e7a (e:4e7a) db DEX_KRABBY ; pokedex id db 30 ; base hp db 105 ; base attack diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm old mode 100755 new mode 100644 index 71555c5e..3a897525 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -1,4 +1,3 @@ -LaprasBaseStats: ; 39216 (e:5216) db DEX_LAPRAS ; pokedex id db 130 ; base hp db 85 ; base attack diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm old mode 100755 new mode 100644 index eec9d2f3..05020627 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -1,4 +1,3 @@ -LickitungBaseStats: ; 38f92 (e:4f92) db DEX_LICKITUNG ; pokedex id db 90 ; base hp db 55 ; base attack diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm old mode 100755 new mode 100644 index c9ca26dd..b461d45a --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -1,4 +1,3 @@ -MachampBaseStats: ; 38b32 (e:4b32) db DEX_MACHAMP ; pokedex id db 90 ; base hp db 130 ; base attack diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm old mode 100755 new mode 100644 index 6e2a977e..b8a41efd --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -1,4 +1,3 @@ -MachokeBaseStats: ; 38b16 (e:4b16) db DEX_MACHOKE ; pokedex id db 80 ; base hp db 100 ; base attack diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm old mode 100755 new mode 100644 index 6e9f5ca0..9ed22dc2 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -1,4 +1,3 @@ -MachopBaseStats: ; 38afa (e:4afa) db DEX_MACHOP ; pokedex id db 70 ; base hp db 80 ; base attack diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm old mode 100755 new mode 100644 index 95f72547..50cc651c --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -1,4 +1,3 @@ -MagikarpBaseStats: ; 391de (e:51de) db DEX_MAGIKARP ; pokedex id db 20 ; base hp db 10 ; base attack diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm old mode 100755 new mode 100644 index 781c9edc..379e91df --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -1,4 +1,3 @@ -MagmarBaseStats: ; 3918a (e:518a) db DEX_MAGMAR ; pokedex id db 65 ; base hp db 95 ; base attack diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm old mode 100755 new mode 100644 index 79f84923..ce042457 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -1,4 +1,3 @@ -MagnemiteBaseStats: ; 38c9e (e:4c9e) db DEX_MAGNEMITE ; pokedex id db 25 ; base hp db 35 ; base attack diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm old mode 100755 new mode 100644 index c8606619..a2890bbd --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -1,4 +1,3 @@ -MagnetonBaseStats: ; 38cba (e:4cba) db DEX_MAGNETON ; pokedex id db 50 ; base hp db 60 ; base attack diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm old mode 100755 new mode 100644 index 759fe599..406a1364 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -1,4 +1,3 @@ -MankeyBaseStats: ; 389e2 (e:49e2) db DEX_MANKEY ; pokedex id db 40 ; base hp db 80 ; base attack diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm old mode 100755 new mode 100644 index 714a45d9..152b4aaf --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -1,4 +1,3 @@ -MarowakBaseStats: ; 38f3e (e:4f3e) db DEX_MAROWAK ; pokedex id db 60 ; base hp db 80 ; base attack diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm old mode 100755 new mode 100644 index 14f82ca4..dc146cf3 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -1,4 +1,3 @@ -MeowthBaseStats: ; 38972 (e:4972) db DEX_MEOWTH ; pokedex id db 40 ; base hp db 45 ; base attack diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm old mode 100755 new mode 100644 index 981bbbfb..9da351ad --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -1,4 +1,3 @@ -MetapodBaseStats: ; 384f6 (e:44f6) db DEX_METAPOD ; pokedex id db 50 ; base hp db 20 ; base attack diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm old mode 100755 new mode 100644 index 1af20fa4..6919fd0e --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -1,4 +1,4 @@ -MewBaseStats: ; 425b (1:425b) +MewBaseStats: db DEX_MEW ; pokedex id db 100 ; base hp db 100 ; base attack diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm old mode 100755 new mode 100644 index 95127645..dc597345 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -1,4 +1,3 @@ -MewtwoBaseStats: ; 3942a (e:542a) db DEX_MEWTWO ; pokedex id db 106 ; base hp db 110 ; base attack diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm old mode 100755 new mode 100644 index 646d9a49..e9437405 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -1,4 +1,3 @@ -MoltresBaseStats: ; 393ba (e:53ba) db DEX_MOLTRES ; pokedex id db 90 ; base hp db 100 ; base attack diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm old mode 100755 new mode 100644 index 3182eca0..8640e340 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -1,4 +1,3 @@ -MrMimeBaseStats: ; 3911a (e:511a) db DEX_MR_MIME ; pokedex id db 40 ; base hp db 45 ; base attack diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm old mode 100755 new mode 100644 index 7ef711c3..cb15563e --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -1,4 +1,3 @@ -MukBaseStats: ; 38d7e (e:4d7e) db DEX_MUK ; pokedex id db 105 ; base hp db 105 ; base attack diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm old mode 100755 new mode 100644 index 8802f52a..ebef0965 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -1,4 +1,3 @@ -NidokingBaseStats: ; 3877a (e:477a) db DEX_NIDOKING ; pokedex id db 81 ; base hp db 92 ; base attack diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm old mode 100755 new mode 100644 index 5e6ab97b..9ea29a31 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -1,4 +1,3 @@ -NidoqueenBaseStats: ; 38726 (e:4726) db DEX_NIDOQUEEN ; pokedex id db 90 ; base hp db 82 ; base attack diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm old mode 100755 new mode 100644 index c3f9a6e3..67832f18 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -1,4 +1,3 @@ -NidoranFBaseStats: ; 386ee (e:46ee) db DEX_NIDORAN_F ; pokedex id db 55 ; base hp db 47 ; base attack diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm old mode 100755 new mode 100644 index 14e9bc9f..a7882766 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -1,4 +1,3 @@ -NidoranMBaseStats: ; 38742 (e:4742) db DEX_NIDORAN_M ; pokedex id db 46 ; base hp db 57 ; base attack diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm old mode 100755 new mode 100644 index 902286c5..0ddecf70 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -1,4 +1,3 @@ -NidorinaBaseStats: ; 3870a (e:470a) db DEX_NIDORINA ; pokedex id db 70 ; base hp db 62 ; base attack diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm old mode 100755 new mode 100644 index db5844a9..fc435fc4 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -1,4 +1,3 @@ -NidorinoBaseStats: ; 3875e (e:475e) db DEX_NIDORINO ; pokedex id db 61 ; base hp db 72 ; base attack diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm old mode 100755 new mode 100644 index f5339b35..e98028dc --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetails.asm @@ -1,4 +1,3 @@ -NinetalesBaseStats: ; 387ea (e:47ea) db DEX_NINETALES ; pokedex id db 73 ; base hp db 76 ; base attack diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm old mode 100755 new mode 100644 index 895ccbe1..c91c5138 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -1,4 +1,3 @@ -OddishBaseStats: ; 38876 (e:4876) db DEX_ODDISH ; pokedex id db 45 ; base hp db 50 ; base attack diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm old mode 100755 new mode 100644 index 9246a325..3c461876 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -1,4 +1,3 @@ -OmanyteBaseStats: ; 392da (e:52da) db DEX_OMANYTE ; pokedex id db 35 ; base hp db 40 ; base attack diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm old mode 100755 new mode 100644 index 17b45efe..09a2ae77 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -1,4 +1,3 @@ -OmastarBaseStats: ; 392f6 (e:52f6) db DEX_OMASTAR ; pokedex id db 70 ; base hp db 60 ; base attack diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm old mode 100755 new mode 100644 index 4f2f8e6b..6f3be4df --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -1,4 +1,3 @@ -OnixBaseStats: ; 38e26 (e:4e26) db DEX_ONIX ; pokedex id db 35 ; base hp db 45 ; base attack diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm old mode 100755 new mode 100644 index daf1aaa9..2c918e68 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -1,4 +1,3 @@ -ParasBaseStats: ; 388ca (e:48ca) db DEX_PARAS ; pokedex id db 35 ; base hp db 70 ; base attack diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm old mode 100755 new mode 100644 index cacf8e4b..dfa0c73e --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -1,4 +1,3 @@ -ParasectBaseStats: ; 388e6 (e:48e6) db DEX_PARASECT ; pokedex id db 60 ; base hp db 95 ; base attack diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm old mode 100755 new mode 100644 index 69429830..2f5ef125 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -1,4 +1,3 @@ -PersianBaseStats: ; 3898e (e:498e) db DEX_PERSIAN ; pokedex id db 65 ; base hp db 70 ; base attack diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm old mode 100755 new mode 100644 index 19c9f2b4..05350d07 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -1,4 +1,3 @@ -PidgeotBaseStats: ; 385ba (e:45ba) db DEX_PIDGEOT ; pokedex id db 83 ; base hp db 80 ; base attack diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm old mode 100755 new mode 100644 index 96a58cc3..74440fcc --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -1,4 +1,3 @@ -PidgeottoBaseStats: ; 3859e (e:459e) db DEX_PIDGEOTTO ; pokedex id db 63 ; base hp db 60 ; base attack diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm old mode 100755 new mode 100644 index 6d5e238d..ec032d6b --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -1,4 +1,3 @@ -PidgeyBaseStats: ; 38582 (e:4582) db DEX_PIDGEY ; pokedex id db 40 ; base hp db 45 ; base attack diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm old mode 100755 new mode 100644 index 1cd96200..09971b79 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -1,4 +1,3 @@ -PikachuBaseStats: ; 3867e (e:467e) db DEX_PIKACHU ; pokedex id db 35 ; base hp db 55 ; base attack diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm old mode 100755 new mode 100644 index 8f36d87d..08c0e95a --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -1,4 +1,3 @@ -PinsirBaseStats: ; 391a6 (e:51a6) db DEX_PINSIR ; pokedex id db 65 ; base hp db 125 ; base attack diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm old mode 100755 new mode 100644 index 7df20056..8014811e --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -1,4 +1,3 @@ -PoliwagBaseStats: ; 38a52 (e:4a52) db DEX_POLIWAG ; pokedex id db 40 ; base hp db 50 ; base attack diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm old mode 100755 new mode 100644 index a93d2674..6209da68 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -1,4 +1,3 @@ -PoliwhirlBaseStats: ; 38a6e (e:4a6e) db DEX_POLIWHIRL ; pokedex id db 65 ; base hp db 65 ; base attack diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm old mode 100755 new mode 100644 index 4d35c2cc..9489a6a3 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -1,4 +1,3 @@ -PoliwrathBaseStats: ; 38a8a (e:4a8a) db DEX_POLIWRATH ; pokedex id db 90 ; base hp db 85 ; base attack diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm old mode 100755 new mode 100644 index 9856ecbd..a6ff9e4b --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -1,4 +1,3 @@ -PonytaBaseStats: ; 38c2e (e:4c2e) db DEX_PONYTA ; pokedex id db 50 ; base hp db 85 ; base attack diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm old mode 100755 new mode 100644 index 7ccee3c8..a049fa7f --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -1,4 +1,3 @@ -PorygonBaseStats: ; 392be (e:52be) db DEX_PORYGON ; pokedex id db 65 ; base hp db 60 ; base attack diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm old mode 100755 new mode 100644 index e5ef5cc5..389aa7f7 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -1,4 +1,3 @@ -PrimeapeBaseStats: ; 389fe (e:49fe) db DEX_PRIMEAPE ; pokedex id db 65 ; base hp db 105 ; base attack diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm old mode 100755 new mode 100644 index 469097fe..db3ac79f --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -1,4 +1,3 @@ -PsyduckBaseStats: ; 389aa (e:49aa) db DEX_PSYDUCK ; pokedex id db 50 ; base hp db 52 ; base attack diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm old mode 100755 new mode 100644 index c6757b0b..c830483c --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -1,4 +1,3 @@ -RaichuBaseStats: ; 3869a (e:469a) db DEX_RAICHU ; pokedex id db 60 ; base hp db 90 ; base attack diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm old mode 100755 new mode 100644 index 097b95bd..c452159e --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -1,4 +1,3 @@ -RapidashBaseStats: ; 38c4a (e:4c4a) db DEX_RAPIDASH ; pokedex id db 65 ; base hp db 100 ; base attack diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm old mode 100755 new mode 100644 index 5fac0f1b..ff8373d5 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -1,4 +1,3 @@ -RaticateBaseStats: ; 385f2 (e:45f2) db DEX_RATICATE ; pokedex id db 55 ; base hp db 81 ; base attack diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm old mode 100755 new mode 100644 index dada06bc..7edfb626 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -1,4 +1,3 @@ -RattataBaseStats: ; 385d6 (e:45d6) db DEX_RATTATA ; pokedex id db 30 ; base hp db 56 ; base attack diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm old mode 100755 new mode 100644 index eb2396e1..d7066906 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -1,5 +1,3 @@ -MonBaseStats: -RhydonBaseStats: ; 39002 (e:5002) db DEX_RHYDON ; pokedex id db 105 ; base hp db 130 ; base attack @@ -28,4 +26,3 @@ db 5 ; growth rate tmlearn 44,48 tmlearn 50,53,54 db 0 ; padding -MonBaseStatsEnd: diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm old mode 100755 new mode 100644 index 4e292406..a6491bd5 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -1,4 +1,3 @@ -RhyhornBaseStats: ; 38fe6 (e:4fe6) db DEX_RHYHORN ; pokedex id db 80 ; base hp db 85 ; base attack diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm old mode 100755 new mode 100644 index ff12e24f..a9875a8e --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -1,4 +1,3 @@ -SandshrewBaseStats: ; 386b6 (e:46b6) db DEX_SANDSHREW ; pokedex id db 50 ; base hp db 75 ; base attack diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm old mode 100755 new mode 100644 index 2975b20f..30477eb4 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -1,4 +1,3 @@ -SandslashBaseStats: ; 386d2 (e:46d2) db DEX_SANDSLASH ; pokedex id db 75 ; base hp db 100 ; base attack diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm old mode 100755 new mode 100644 index f91327f4..13de0d2b --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -1,4 +1,3 @@ -ScytherBaseStats: ; 39136 (e:5136) db DEX_SCYTHER ; pokedex id db 70 ; base hp db 110 ; base attack diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm old mode 100755 new mode 100644 index 4d28e2a3..9f28001b --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -1,4 +1,3 @@ -SeadraBaseStats: ; 3908e (e:508e) db DEX_SEADRA ; pokedex id db 55 ; base hp db 65 ; base attack diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm old mode 100755 new mode 100644 index d1087618..d4fbe8ea --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -1,4 +1,3 @@ -SeakingBaseStats: ; 390c6 (e:50c6) db DEX_SEAKING ; pokedex id db 80 ; base hp db 92 ; base attack diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm old mode 100755 new mode 100644 index b6546b6f..ef9c2898 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -1,4 +1,3 @@ -SeelBaseStats: ; 38d2a (e:4d2a) db DEX_SEEL ; pokedex id db 65 ; base hp db 45 ; base attack diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm old mode 100755 new mode 100644 index fcb87404..7c2cdf9d --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -1,4 +1,3 @@ -ShellderBaseStats: ; 38d9a (e:4d9a) db DEX_SHELLDER ; pokedex id db 30 ; base hp db 65 ; base attack diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm old mode 100755 new mode 100644 index 2d1f8444..ffeda79e --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -1,4 +1,3 @@ -SlowbroBaseStats: ; 38c82 (e:4c82) db DEX_SLOWBRO ; pokedex id db 95 ; base hp db 75 ; base attack diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm old mode 100755 new mode 100644 index e5edcdb9..ea238a6e --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -1,4 +1,3 @@ -SlowpokeBaseStats: ; 38c66 (e:4c66) db DEX_SLOWPOKE ; pokedex id db 90 ; base hp db 65 ; base attack diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm old mode 100755 new mode 100644 index 0a91f37e..2d1fd6e3 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -1,4 +1,3 @@ -SnorlaxBaseStats: ; 39366 (e:5366) db DEX_SNORLAX ; pokedex id db 160 ; base hp db 110 ; base attack diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm old mode 100755 new mode 100644 index 4e90e749..eb8ab1ec --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -1,4 +1,3 @@ -SpearowBaseStats: ; 3860e (e:460e) db DEX_SPEAROW ; pokedex id db 40 ; base hp db 60 ; base attack diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm old mode 100755 new mode 100644 index 1257a3f0..f8dcd0a1 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -1,4 +1,3 @@ -SquirtleBaseStats: ; 38486 (e:4486) db DEX_SQUIRTLE ; pokedex id db 44 ; base hp db 48 ; base attack diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm old mode 100755 new mode 100644 index 94c8f2d9..686dfa57 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -1,4 +1,3 @@ -StarmieBaseStats: ; 390fe (e:50fe) db DEX_STARMIE ; pokedex id db 60 ; base hp db 75 ; base attack diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm old mode 100755 new mode 100644 index 3afbb7a5..35f51a6a --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -1,4 +1,3 @@ -StaryuBaseStats: ; 390e2 (e:50e2) db DEX_STARYU ; pokedex id db 30 ; base hp db 45 ; base attack diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm old mode 100755 new mode 100644 index a9cab332..b50a57bc --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -1,4 +1,3 @@ -TangelaBaseStats: ; 3903a (e:503a) db DEX_TANGELA ; pokedex id db 65 ; base hp db 55 ; base attack diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm old mode 100755 new mode 100644 index 39844f76..87f28ec6 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -1,4 +1,3 @@ -TaurosBaseStats: ; 391c2 (e:51c2) db DEX_TAUROS ; pokedex id db 75 ; base hp db 100 ; base attack diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm old mode 100755 new mode 100644 index 12ff9e0d..7237f083 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -1,4 +1,3 @@ -TentacoolBaseStats: ; 38ba2 (e:4ba2) db DEX_TENTACOOL ; pokedex id db 40 ; base hp db 40 ; base attack diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm old mode 100755 new mode 100644 index 01a2f685..d3d93919 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -1,4 +1,3 @@ -TentacruelBaseStats: ; 38bbe (e:4bbe) db DEX_TENTACRUEL ; pokedex id db 80 ; base hp db 70 ; base attack diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm old mode 100755 new mode 100644 index 21651202..7243a39f --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -1,4 +1,3 @@ -VaporeonBaseStats: ; 3926a (e:526a) db DEX_VAPOREON ; pokedex id db 130 ; base hp db 65 ; base attack diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm old mode 100755 new mode 100644 index e4a86f5b..01a6c3d0 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -1,4 +1,3 @@ -VenomothBaseStats: ; 3891e (e:491e) db DEX_VENOMOTH ; pokedex id db 70 ; base hp db 65 ; base attack diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm old mode 100755 new mode 100644 index 50177b34..bc643c77 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -1,4 +1,3 @@ -VenonatBaseStats: ; 38902 (e:4902) db DEX_VENONAT ; pokedex id db 60 ; base hp db 55 ; base attack diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm old mode 100755 new mode 100644 index 5052e9d0..0a457321 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -1,4 +1,3 @@ -VenusaurBaseStats: ; 38416 (e:4416) db DEX_VENUSAUR ; pokedex id db 80 ; base hp db 82 ; base attack diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm old mode 100755 new mode 100644 index 0df7e22c..a56958ef --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -1,4 +1,3 @@ -VictreebelBaseStats: ; 38b86 (e:4b86) db DEX_VICTREEBEL ; pokedex id db 80 ; base hp db 105 ; base attack diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm old mode 100755 new mode 100644 index 20d1b4e4..17bb9739 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -1,4 +1,3 @@ -VileplumeBaseStats: ; 388ae (e:48ae) db DEX_VILEPLUME ; pokedex id db 75 ; base hp db 80 ; base attack diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm old mode 100755 new mode 100644 index 4267990f..92d2ccb3 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -1,4 +1,3 @@ -VoltorbBaseStats: ; 38eb2 (e:4eb2) db DEX_VOLTORB ; pokedex id db 40 ; base hp db 30 ; base attack diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm old mode 100755 new mode 100644 index 80a25853..9577ae30 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -1,4 +1,3 @@ -VulpixBaseStats: ; 387ce (e:47ce) db DEX_VULPIX ; pokedex id db 38 ; base hp db 41 ; base attack diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm old mode 100755 new mode 100644 index b8d1f84f..bc86bd6f --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -1,4 +1,3 @@ -WartortleBaseStats: ; 384a2 (e:44a2) db DEX_WARTORTLE ; pokedex id db 59 ; base hp db 63 ; base attack diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm old mode 100755 new mode 100644 index ecd788db..8370dc41 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -1,4 +1,3 @@ -WeedleBaseStats: ; 3852e (e:452e) db DEX_WEEDLE ; pokedex id db 40 ; base hp db 35 ; base attack diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm old mode 100755 new mode 100644 index 22c6a40b..735a453f --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -1,4 +1,3 @@ -WeepinbellBaseStats: ; 38b6a (e:4b6a) db DEX_WEEPINBELL ; pokedex id db 65 ; base hp db 90 ; base attack diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm old mode 100755 new mode 100644 index 265ed3c8..0dd09dfe --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -1,4 +1,3 @@ -WeezingBaseStats: ; 38fca (e:4fca) db DEX_WEEZING ; pokedex id db 65 ; base hp db 90 ; base attack diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm old mode 100755 new mode 100644 index 13bf9b3a..d5fd08e2 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -1,4 +1,3 @@ -WigglytuffBaseStats: ; 38822 (e:4822) db DEX_WIGGLYTUFF ; pokedex id db 140 ; base hp db 70 ; base attack diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm old mode 100755 new mode 100644 index 5ae1f25f..487052ba --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -1,4 +1,3 @@ -ZapdosBaseStats: ; 3939e (e:539e) db DEX_ZAPDOS ; pokedex id db 90 ; base hp db 90 ; base attack diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm old mode 100755 new mode 100644 index bafac885..1caa4259 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -1,4 +1,3 @@ -ZubatBaseStats: ; 3883e (e:483e) db DEX_ZUBAT ; pokedex id db 40 ; base hp db 45 ; base attack -- cgit v1.3.1-sl0p From 3fd678769231b76c17e4aab2f306892bd6988dc8 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Tue, 22 Mar 2016 00:10:23 -0600 Subject: Clean up more Yellow ifdefs. --- data/baseStats/alakazam.asm | 9 +-- data/baseStats/butterfree.asm | 4 - data/baseStats/chansey.asm | 6 +- data/baseStats/charizard.asm | 4 - data/baseStats/diglett.asm | 4 - data/baseStats/dugtrio.asm | 4 - data/baseStats/eevee.asm | 6 +- data/baseStats/flareon.asm | 6 +- data/baseStats/gyarados.asm | 7 -- data/baseStats/jolteon.asm | 6 +- data/baseStats/kadabra.asm | 9 +-- data/baseStats/marowak.asm | 12 +-- data/baseStats/primeape.asm | 7 +- data/baseStats/vaporeon.asm | 6 +- data/baseStats/venomoth.asm | 9 +-- data/baseStats/venonat.asm | 7 -- data/trades.asm | 13 ---- data/trainer_moves.asm | 165 ------------------------------------------ data/wildPokemon/route22.asm | 12 --- engine/battle/animations.asm | 3 - engine/battle/core.asm | 4 - engine/menu/bills_pc.asm | 3 - engine/menu/pokedex.asm | 3 - engine/oak_speech2.asm | 22 ------ engine/slot_machine.asm | 3 - 25 files changed, 15 insertions(+), 319 deletions(-) (limited to 'data/baseStats') diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 6762eb83..c20b6c41 100644 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -13,13 +13,8 @@ dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - db KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 75a0ee02..c0fb5f6c 100644 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 29,30,31,32 tmlearn 33,34,39 tmlearn 44,46 -IF DEF(_YELLOW) - tmlearn 50,55 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index d9b8513d..434b1c26 100644 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -13,11 +13,7 @@ dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 db POUND -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db DOUBLESLAP -ENDC +db DOUBLESLAP db 0 db 0 db 4 ; growth rate diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index ea978159..2479a60c 100644 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -24,9 +24,5 @@ db 3 ; growth rate tmlearn 26,27,28,31,32 tmlearn 33,34,38,39,40 tmlearn 44 -IF DEF(_YELLOW) - tmlearn 50,51,52,54 -ELSE tmlearn 50,51,54 -ENDC db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 173dfa3d..8ef6e381 100644 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 26,27,28,31,32 tmlearn 34 tmlearn 44,48 -IF DEF(_YELLOW) - tmlearn 50,51 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index b70b5383..c763680f 100644 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 26,27,28,31,32 tmlearn 34 tmlearn 44,48 -IF DEF(_YELLOW) - tmlearn 50,51 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 0fa869fe..51e36621 100644 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -13,11 +13,7 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db 0 db 0 db 0 ; growth rate diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index c6c0c060..70621a6a 100644 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -13,11 +13,7 @@ dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db EMBER db 0 ; growth rate diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 21214d0b..6bfc34a0 100644 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -12,17 +12,10 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 -IF DEF(_YELLOW) -db TACKLE -db 0 -db 0 -db 0 -ELSE db BITE db DRAGON_RAGE db LEER db HYDRO_PUMP -ENDC db 5 ; growth rate ; learnset tmlearn 6,8 diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index eb0bf305..b33d6327 100644 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -13,11 +13,7 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index ad4ac7f7..472cc4c5 100644 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -13,13 +13,8 @@ dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - DB KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 152b4aaf..3b90dbb1 100644 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -13,15 +13,9 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF DEF(_YELLOW) - db TAIL_WHIP - db 0 - db 0 -ELSE - db GROWL - db LEER - db FOCUS_ENERGY -ENDC +db GROWL +db LEER +db FOCUS_ENERGY db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index 389aa7f7..659edefd 100644 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -13,14 +13,9 @@ dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -IF !DEF(_YELLOW) - db LEER -ENDC +db LEER db KARATE_CHOP db FURY_SWIPES -IF DEF(_YELLOW) - db LOW_KICK -ENDC db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 7243a39f..e22b3185 100644 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -13,11 +13,7 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db WATER_GUN db 0 ; growth rate diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index 01a6c3d0..7a5bd981 100644 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -14,13 +14,8 @@ dw VenomothPicBack ; attacks known at lvl 0 db TACKLE db DISABLE -IF DEF(_YELLOW) - db SUPERSONIC - db CONFUSION -ELSE - db POISONPOWDER - db LEECH_LIFE -ENDC +db POISONPOWDER +db LEECH_LIFE db 0 ; growth rate ; learnset tmlearn 2,4,6 diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index bc643c77..aeadc6cd 100644 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -21,15 +21,8 @@ db 0 ; growth rate tmlearn 6 tmlearn 9,10 tmlearn 20,21,22 -IF DEF(_YELLOW) - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50,55 -ELSE tmlearn 29,31,32 tmlearn 33,34 tmlearn 44,46 tmlearn 50 -ENDC db 0 ; padding diff --git a/data/trades.asm b/data/trades.asm index 274b0297..e7f71233 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,17 +1,5 @@ TradeMons: ; 71b7b (1c:5b7b) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total -IF DEF(_YELLOW) - db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" - db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" - db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" - db KANGASKHAN,MUK, 0,"STICKY@@@@@" - db MEW, MEW, 2,"BART@@@@@@@" - db TANGELA, PARASECT, 0,"SPIKE@@@@@@" - db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" - db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" - db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" - db CUBONE, MACHOKE, 2,"RICKY@@@@@@" -ELSE db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@" db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" @@ -22,4 +10,3 @@ ELSE db RAICHU, ELECTRODE,1,"DORIS@@@@@@" db VENONAT, TANGELA, 2,"CRINKLES@@@" db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" -ENDC diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index 518dab42..a42364af 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,4 +1,3 @@ -IF !DEF(YELLOW) LoneMoves: ; 39d22 (e:5d22) ; these are used for gym leaders. ; this is not automatic! you have to write the number you want to wLoneAttackNo @@ -31,167 +30,3 @@ TeamMoves: ; 39d32 (e:5d32) db AGATHA,TOXIC db LANCE,BARRIER db $FF - -ELSE -; yellow has its own format. - -; entry ≔ trainerclass, trainerid, moveset+, 0 -; moveset ≔ partymon, partymon'smove, moveid - -LoneMoves: -TeamMoves: - db BUG_CATCHER,$f - db 2,2,TACKLE - db 2,3,STRING_SHOT - db 0 - - db YOUNGSTER,$e - db 1,4,FISSURE - db 0 - - db BROCK,$1 - db 2,3,BIND - db 2,4,BIDE - db 0 - - db MISTY,$1 - db 2,4,BUBBLEBEAM - db 0 - - db LT_SURGE,$1 - db 1,1,THUNDERBOLT - db 1,2,MEGA_PUNCH - db 1,3,MEGA_KICK - db 1,4,GROWL - db 0 - - db ERIKA,$1 - db 1,3,MEGA_DRAIN - db 2,1,RAZOR_LEAF - db 3,1,PETAL_DANCE - db 0 - - db KOGA,$1 - db 1,1,TOXIC - db 1,2,TACKLE - db 2,1,TOXIC - db 2,3,SUPERSONIC - db 3,1,TOXIC - db 3,2,DOUBLE_EDGE - db 4,1,LEECH_LIFE - db 4,2,DOUBLE_TEAM - db 4,3,PSYCHIC_M - db 4,4,TOXIC - db 0 - - db BLAINE,$1 - db 1,1,FLAMETHROWER - db 1,4,CONFUSE_RAY - db 3,1,FLAMETHROWER - db 3,2,FIRE_BLAST - db 3,3,REFLECT - db 0 - - db SABRINA,$1 - db 1,1,FLASH - db 2,1,KINESIS - db 2,4,PSYWAVE - db 3,1,PSYWAVE - db 0 - - db GIOVANNI,$3 - db 1,3,FISSURE - db 2,2,DOUBLE_TEAM - db 3,1,EARTHQUAKE - db 3,3,THUNDER - db 4,1,EARTHQUAKE - db 4,2,LEER - db 4,3,THUNDER - db 5,1,ROCK_SLIDE - db 5,4,EARTHQUAKE - db 0 - - db LORELEI,$1 - db 1,1,BUBBLEBEAM - db 2,3,ICE_BEAM - db 3,1,PSYCHIC_M - db 3,2,SURF - db 4,3,LOVELY_KISS - db 5,3,BLIZZARD - db 0 - - db BRUNO,$1 - db 1,1,ROCK_SLIDE - db 1,2,SCREECH - db 1,4,DIG - db 2,3,FIRE_PUNCH - db 2,4,DOUBLE_TEAM - db 3,1,DOUBLE_KICK - db 3,2,MEGA_KICK - db 3,4,DOUBLE_TEAM - db 4,1,ROCK_SLIDE - db 4,2,SCREECH - db 4,4,EARTHQUAKE - db 5,2,KARATE_CHOP - db 5,3,STRENGTH - db 0 - - db AGATHA,$1 - db 1,2,SUBSTITUTE - db 1,3,LICK - db 1,4,MEGA_DRAIN - db 2,2,TOXIC - db 2,4,LEECH_LIFE - db 3,2,LICK - db 4,1,WRAP - db 5,2,PSYCHIC_M - db 0 - - db LANCE,$1 - db 1,1,DRAGON_RAGE - db 2,1,THUNDER_WAVE - db 2,3,THUNDERBOLT - db 3,1,BUBBLEBEAM - db 3,2,WRAP - db 3,3,ICE_BEAM - db 4,1,WING_ATTACK - db 4,2,SWIFT - db 4,3,FLY - db 5,1,BLIZZARD - db 5,2,FIRE_BLAST - db 5,3,THUNDER - db 0 - - db SONY3,$1 - db 1,3,EARTHQUAKE - db 2,4,KINESIS - db 3,4,LEECH_SEED - db 4,1,ICE_BEAM - db 5,1,CONFUSE_RAY - db 5,4,FIRE_SPIN - db 6,3,QUICK_ATTACK - db 0 - - db SONY3,$2 - db 1,3,EARTHQUAKE - db 2,4,KINESIS - db 3,4,LEECH_SEED - db 4,1,THUNDERBOLT - db 5,1,ICE_BEAM - db 6,2,REFLECT - db 6,3,QUICK_ATTACK - db 0 - - db SONY3,$3 - db 1,3,EARTHQUAKE - db 2,4,KINESIS - db 3,4,LEECH_SEED - db 4,1,CONFUSE_RAY - db 4,4,FIRE_SPIN - db 5,1,THUNDERBOLT - db 6,1,AURORA_BEAM - db 6,3,QUICK_ATTACK - db 0 - - db $ff -endc diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 8a8f3fdb..750a2f4e 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -24,16 +24,4 @@ Route22Mons: db 3,NIDORAN_M db 4,NIDORAN_M ENDC - IF DEF(_YELLOW) - db 2,NIDORAN_M - db 2,NIDORAN_F - db 3,MANKEY - db 3,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,MANKEY - db 2,SPEAROW - db 4,SPEAROW - db 6,SPEAROW - ENDC db $00 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 31b490f3..be8d2b18 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -373,9 +373,6 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine2.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine2.2bpp" -ENDC MoveAnimation: ; 78d5e (1e:4d5e) push hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index ac808a34..fce78717 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2982,11 +2982,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) jp Delay3 DisabledText: ; 3d555 (f:5555) -IF DEF(_YELLOW) - db "Disabled!@" -ELSE db "disabled!@" -ENDC TypeText: ; 3d55f (f:555f) db "TYPE@" diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index d367bdb5..0be2e6b0 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -343,9 +343,6 @@ BillsPCMenuText: ; 216e1 (8:56e1) next "DEPOSIT ", $4a next "RELEASE ", $4a next "CHANGE BOX" -IF DEF(_YELLOW) - next "PRINT BOX" -ENDC next "SEE YA!" db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index a58523e8..3898ef43 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -367,9 +367,6 @@ PokedexMenuItemsText: ; 402af (10:42af) db "DATA" next "CRY" next "AREA" -IF DEF(_YELLOW) - next "PRNT" -ENDC next "QUIT@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 9b5622b8..61775531 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -219,22 +219,6 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC -IF DEF(_YELLOW) -DefaultNamesPlayer: - db "NEW NAME" - next "YELLOW" - next "ASH" - next "JACK" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" -ENDC - GetDefaultName: ; 6ad6 (1:6ad6) ; a = name index ; hl = name list @@ -271,12 +255,6 @@ DefaultNamesPlayerList: ; 6af2 (1:6af2) DefaultNamesRivalList: ; 6b08 (1:6b08) db "NEW NAME@RED@ASH@JACK@" ENDC -IF DEF(_YELLOW) -DefaultNamesPlayerList: - db "NEW NAME@YELLOW@ASH@JACK@" -DefaultNamesRivalList: - db "NEW NAME@BLUE@GARY@JOHN@" -ENDC TextTerminator_6b20: ; 6b20 (1:6b20) db "@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index b2917459..eb1cf3c3 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -888,6 +888,3 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine1.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine1.2bpp" -ENDC -- cgit v1.3.1-sl0p From 38ea9cd829c51fbfd1e5e89e94c073ea1987948d Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 25 Apr 2016 22:01:13 -0500 Subject: Fix typo: ninetails.asm -> ninetales.asm --- data/baseStats/ninetails.asm | 28 ---------------------------- data/baseStats/ninetales.asm | 28 ++++++++++++++++++++++++++++ data/base_stats.asm | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 data/baseStats/ninetails.asm create mode 100644 data/baseStats/ninetales.asm (limited to 'data/baseStats') diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm deleted file mode 100644 index e98028dc..00000000 --- a/data/baseStats/ninetails.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NINETALES ; pokedex id -db 73 ; base hp -db 76 ; base attack -db 75 ; base defense -db 100 ; base speed -db 100 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 75 ; catch rate -db 178 ; base exp yield -INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions -dw NinetalesPicFront -dw NinetalesPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db QUICK_ATTACK -db ROAR -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ninetales.asm b/data/baseStats/ninetales.asm new file mode 100644 index 00000000..e98028dc --- /dev/null +++ b/data/baseStats/ninetales.asm @@ -0,0 +1,28 @@ +db DEX_NINETALES ; pokedex id +db 73 ; base hp +db 76 ; base attack +db 75 ; base defense +db 100 ; base speed +db 100 ; base special +db FIRE ; species type 1 +db FIRE ; species type 2 +db 75 ; catch rate +db 178 ; base exp yield +INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions +dw NinetalesPicFront +dw NinetalesPicBack +; attacks known at lvl 0 +db EMBER +db TAIL_WHIP +db QUICK_ATTACK +db ROAR +db 0 ; growth rate +; learnset + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 +db 0 ; padding diff --git a/data/base_stats.asm b/data/base_stats.asm index d7d26533..a84693a4 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -35,7 +35,7 @@ INCLUDE "data/baseStats/nidoking.asm" INCLUDE "data/baseStats/clefairy.asm" INCLUDE "data/baseStats/clefable.asm" INCLUDE "data/baseStats/vulpix.asm" -INCLUDE "data/baseStats/ninetails.asm" +INCLUDE "data/baseStats/ninetales.asm" INCLUDE "data/baseStats/jigglypuff.asm" INCLUDE "data/baseStats/wigglytuff.asm" INCLUDE "data/baseStats/zubat.asm" -- cgit v1.3.1-sl0p