diff options
Diffstat (limited to 'data')
214 files changed, 410 insertions, 1987 deletions
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index bb5b15e5..1a41bb5c 100755..100644 --- 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 index 949d39dc..874dd57d 100755..100644 --- 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 index f61e5a48..c20b6c41 100755..100644 --- 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 @@ -14,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/arbok.asm b/data/baseStats/arbok.asm index 34a73933..6beee569 100755..100644 --- 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 index 4d4e8f77..2a2dda3b 100755..100644 --- 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 index 31c328ed..ef791055 100755..100644 --- 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 index b3c85f3d..6bf091b8 100755..100644 --- 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 index d6297826..1c908bbb 100755..100644 --- 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 index e5ccd2db..eaf18b41 100755..100644 --- 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 index 261b28ee..7b3567b5 100755..100644 --- 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 index 74a6a0bb..c0fb5f6c 100755..100644 --- 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 @@ -25,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/caterpie.asm b/data/baseStats/caterpie.asm index 975f31a1..d26bc5d9 100755..100644 --- 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 index a830ae1e..434b1c26 100755..100644 --- 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 @@ -14,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 c75d9a34..2479a60c 100755..100644 --- 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 @@ -25,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/charmander.asm b/data/baseStats/charmander.asm index 936befa4..ccd53458 100755..100644 --- 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 index 8e2675f0..80aa2bca 100755..100644 --- 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 index e26f1445..17837da4 100755..100644 --- 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 index cc47df10..952391c7 100755..100644 --- 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 index aa09d48a..10f38bdb 100755..100644 --- 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 index 74584844..b1222d98 100755..100644 --- 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 index e7efc42b..fb0cf2c2 100755..100644 --- 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 index af0cab55..8ef6e381 100755..100644 --- 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 @@ -25,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/ditto.asm b/data/baseStats/ditto.asm index 88def477..90ea4c5e 100755..100644 --- 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 index 025204fb..99608f48 100755..100644 --- 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 index 091152dd..760c258b 100755..100644 --- 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 index b8f0a606..041300e0 100755..100644 --- 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 index 1000e384..442275b2 100755..100644 --- 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 index 37ed8f09..5fb5c75d 100755..100644 --- 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 index 6397eeaf..452db1bc 100755..100644 --- 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 index f60dc1c0..c763680f 100755..100644 --- 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 @@ -25,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 2c2114fb..51e36621 100755..100644 --- 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 @@ -14,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/ekans.asm b/data/baseStats/ekans.asm index 26e75eeb..b029a67c 100755..100644 --- 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 index 5dc76c37..4b44604e 100755..100644 --- 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 index dc9da8d3..1b292f2f 100755..100644 --- 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 index 4c77db2a..8503889b 100755..100644 --- 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 index f67857e2..4d739430 100755..100644 --- 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 index a1084b17..2aa7eca0 100755..100644 --- 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 index 8d3059db..4ad88723 100755..100644 --- 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 index 48c4b702..70621a6a 100755..100644 --- 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 @@ -14,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/gastly.asm b/data/baseStats/gastly.asm index c6e69bd2..fdcaaa71 100755..100644 --- 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 index 910903d0..0e3e877c 100755..100644 --- 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 index e185e3c0..a47a993a 100755..100644 --- 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 index efee0dae..f2153e5c 100755..100644 --- 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 index e6a22f70..845adf4b 100755..100644 --- 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 index 36cf0d96..ed3a4fdb 100755..100644 --- 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 index e063ae47..cce89da7 100755..100644 --- 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 index 1308bc78..28f2a326 100755..100644 --- 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 index 8cc740dd..08776ab1 100755..100644 --- 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 index 55aedc95..5f7a64a7 100755..100644 --- 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 index cc4d1ff7..df305636 100755..100644 --- 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 index 1b374f08..6bfc34a0 100755..100644 --- 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 @@ -13,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/haunter.asm b/data/baseStats/haunter.asm index a530108a..bd39eaf4 100755..100644 --- 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 index 4a717248..37021f65 100755..100644 --- 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 index e25bb725..d16db130 100755..100644 --- 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 index b754f425..01de3ff6 100755..100644 --- 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 index 3ba1ad30..4e4959b4 100755..100644 --- 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 index 9672935e..3e19f2a1 100755..100644 --- 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 index 5111e9c8..fac03fc9 100755..100644 --- 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 index 8ade6544..b33d6327 100755..100644 --- 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 @@ -14,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/jynx.asm b/data/baseStats/jynx.asm index 82778775..e69b87b9 100755..100644 --- 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 index 1fde7156..60f3e959 100755..100644 --- 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 index 170fee9b..dbddab2e 100755..100644 --- 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 index 5fa0e466..472cc4c5 100755..100644 --- 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 @@ -14,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/kakuna.asm b/data/baseStats/kakuna.asm index 4ee90925..ec593f91 100755..100644 --- 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 index a17cb653..6dcd1e3c 100755..100644 --- 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 index 7604bf80..8708d5cf 100755..100644 --- 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 index 24f47d17..fced6246 100755..100644 --- 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 index 3d901041..88d690b6 100755..100644 --- 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 index 71555c5e..3a897525 100755..100644 --- 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 index eec9d2f3..05020627 100755..100644 --- 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 index c9ca26dd..b461d45a 100755..100644 --- 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 index 6e2a977e..b8a41efd 100755..100644 --- 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 index 6e9f5ca0..9ed22dc2 100755..100644 --- 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 index 95f72547..50cc651c 100755..100644 --- 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 index 781c9edc..379e91df 100755..100644 --- 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 index 79f84923..ce042457 100755..100644 --- 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 index c8606619..a2890bbd 100755..100644 --- 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 index 759fe599..406a1364 100755..100644 --- 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 index 714a45d9..3b90dbb1 100755..100644 --- 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 @@ -14,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/meowth.asm b/data/baseStats/meowth.asm index 14f82ca4..dc146cf3 100755..100644 --- 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 index 981bbbfb..9da351ad 100755..100644 --- 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 index 1af20fa4..6919fd0e 100755..100644 --- 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 index 95127645..dc597345 100755..100644 --- 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 index 646d9a49..e9437405 100755..100644 --- 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 index 3182eca0..8640e340 100755..100644 --- 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 index 7ef711c3..cb15563e 100755..100644 --- 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 index 8802f52a..ebef0965 100755..100644 --- 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 index 5e6ab97b..9ea29a31 100755..100644 --- 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 index c3f9a6e3..67832f18 100755..100644 --- 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 index 14e9bc9f..a7882766 100755..100644 --- 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 index 902286c5..0ddecf70 100755..100644 --- 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 index db5844a9..fc435fc4 100755..100644 --- 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/ninetales.asm index f5339b35..e98028dc 100755..100644 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetales.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 index 895ccbe1..c91c5138 100755..100644 --- 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 index 9246a325..3c461876 100755..100644 --- 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 index 17b45efe..09a2ae77 100755..100644 --- 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 index 4f2f8e6b..6f3be4df 100755..100644 --- 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 index daf1aaa9..2c918e68 100755..100644 --- 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 index cacf8e4b..dfa0c73e 100755..100644 --- 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 index 69429830..2f5ef125 100755..100644 --- 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 index 19c9f2b4..05350d07 100755..100644 --- 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 index 96a58cc3..74440fcc 100755..100644 --- 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 index 6d5e238d..ec032d6b 100755..100644 --- 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 index 1cd96200..09971b79 100755..100644 --- 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 index 8f36d87d..08c0e95a 100755..100644 --- 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 index 7df20056..8014811e 100755..100644 --- 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 index a93d2674..6209da68 100755..100644 --- 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 index 4d35c2cc..9489a6a3 100755..100644 --- 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 index 9856ecbd..a6ff9e4b 100755..100644 --- 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 index 7ccee3c8..a049fa7f 100755..100644 --- 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 index e5ef5cc5..659edefd 100755..100644 --- 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 @@ -14,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/psyduck.asm b/data/baseStats/psyduck.asm index 469097fe..db3ac79f 100755..100644 --- 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 index c6757b0b..c830483c 100755..100644 --- 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 index 097b95bd..c452159e 100755..100644 --- 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 index 5fac0f1b..ff8373d5 100755..100644 --- 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 index dada06bc..7edfb626 100755..100644 --- 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 index eb2396e1..d7066906 100755..100644 --- 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 index 4e292406..a6491bd5 100755..100644 --- 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 index ff12e24f..a9875a8e 100755..100644 --- 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 index 2975b20f..30477eb4 100755..100644 --- 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 index f91327f4..13de0d2b 100755..100644 --- 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 index 4d28e2a3..9f28001b 100755..100644 --- 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 index d1087618..d4fbe8ea 100755..100644 --- 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 index b6546b6f..ef9c2898 100755..100644 --- 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 index fcb87404..7c2cdf9d 100755..100644 --- 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 index 2d1f8444..ffeda79e 100755..100644 --- 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 index e5edcdb9..ea238a6e 100755..100644 --- 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 index 0a91f37e..2d1fd6e3 100755..100644 --- 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 index 4e90e749..eb8ab1ec 100755..100644 --- 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 index 1257a3f0..f8dcd0a1 100755..100644 --- 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 index 94c8f2d9..686dfa57 100755..100644 --- 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 index 3afbb7a5..35f51a6a 100755..100644 --- 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 index a9cab332..b50a57bc 100755..100644 --- 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 index 39844f76..87f28ec6 100755..100644 --- 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 index 12ff9e0d..7237f083 100755..100644 --- 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 index 01a2f685..d3d93919 100755..100644 --- 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 index 21651202..e22b3185 100755..100644 --- 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 @@ -14,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 e4a86f5b..7a5bd981 100755..100644 --- 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 @@ -15,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 50177b34..aeadc6cd 100755..100644 --- 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 @@ -22,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/baseStats/venusaur.asm b/data/baseStats/venusaur.asm index 5052e9d0..0a457321 100755..100644 --- 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 index 0df7e22c..a56958ef 100755..100644 --- 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 index 20d1b4e4..17bb9739 100755..100644 --- 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 index 4267990f..92d2ccb3 100755..100644 --- 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 index 80a25853..9577ae30 100755..100644 --- 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 index b8d1f84f..bc86bd6f 100755..100644 --- 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 index ecd788db..8370dc41 100755..100644 --- 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 index 22c6a40b..735a453f 100755..100644 --- 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 index 265ed3c8..0dd09dfe 100755..100644 --- 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 index 13bf9b3a..d5fd08e2 100755..100644 --- 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 index 5ae1f25f..487052ba 100755..100644 --- 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 index bafac885..1caa4259 100755..100644 --- 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 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" diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index 85f7459a..35ae2e9d 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -1,75 +1,64 @@ ; mart inventories are below ; they are texts -; first byte $FE, next byte # of items, last byte $FF ; Viridian -ViridianMartText6:: ; 2442 (0:2442) - db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF +ViridianCashierText:: + TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL ; Pewter -PewterMartText1:: ; 2449 (0:2449) - db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF +PewterCashierText:: + TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL ; Cerulean -CeruleanMartText1:: ; 2453 (0:2453) - db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF +CeruleanCashierText:: + TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL ; Bike shop - db $FE,1,BICYCLE,$FF + TX_MART BICYCLE ; Vermilion -VermilionMartText1:: ; 2461 (0:2461) - db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL - db REPEL,$FF +VermilionCashierText:: + TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL ; Lavender -LavenderMartText1:: ; 246a (0:246a) - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL - db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF +LavenderCashierText:: + TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL ; Celadon Dept. Store 2F (1) -CeladonMart2Text1:: ; 2476 (0:2476) - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE - db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF +CeladonMart2Clerk1Text:: + TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL ; Celadon Dept. Store 2F (2) -CeladonMart2Text2:: ; 2482 (0:2482) - db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF +CeladonMart2Clerk2Text:: + TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17 ; Celadon Dept. Store 4F -CeladonMart4Text1:: ; 248e (0:248e) - db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF +CeladonMart4ClerkText:: + TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE ; Celadon Dept. Store 5F (1) -CeladonMart5Text3:: ; 2496 (0:2496) - db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED - db X_SPECIAL,$FF +CeladonMart5Clerk1Text:: + TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL ; Celadon Dept. Store 5F (2) -CeladonMart5Text4:: ; 24a0 (0:24a0) - db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF +CeladonMart5Clerk2Text:: + TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM ; Fuchsia -FuchsiaMartText1:: ; 24a8 (0:24a8) - db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL - db SUPER_REPEL,$FF +FuchsiaCashierText:: + TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL -; unused? 24b1 - db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF +; unused? + TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE ; Cinnabar -CinnabarMartText1:: ; 24b9 (0:24b9) - db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE - db FULL_HEAL,REVIVE,$FF +CinnabarCashierText:: + TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE ; Saffron -SaffronMartText1:: ; 24c3 (0:24c3) - db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL - db REVIVE,$FF +SaffronCashierText:: + TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE ; Indigo -IndigoPlateauLobbyText4:: ; 24cc (0:24cc) - db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL - db REVIVE,MAX_REPEL,$FF +IndigoCashierText:: + TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL 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/diglettscave.asm b/data/wildPokemon/diglettscave.asm index 0b8ec1c7..37512687 100755 --- a/data/wildPokemon/diglettscave.asm +++ b/data/wildPokemon/diglettscave.asm @@ -11,4 +11,3 @@ CaveMons: db 29,DUGTRIO db 31,DUGTRIO db $00 - diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index e96b9d42..22ad032b 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -12,8 +12,7 @@ MansionMons1: db 37,WEEZING db 39,MUK ENDC - - IF DEF(_GREEN) || DEF(_BLUE) + IF DEF(_BLUE) db 32,GRIMER db 30,GRIMER db 34,PONYTA @@ -25,19 +24,4 @@ MansionMons1: db 37,MUK db 39,WEEZING ENDC - - IF DEF(_YELLOW) - db 34,RATTATA - db 34,RATICATE - db 23,GRIMER - db 26,GROWLITHE - db 37,RATTATA - db 37,RATICATE - db 30,GROWLITHE - db 26,GRIMER - db 34,GROWLITHE - db 38,GROWLITHE - ENDC - db $00 - diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 77cce408..985474fc 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -12,8 +12,7 @@ MansionMons2: db 39,WEEZING db 37,MUK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 32,VULPIX db 34,GRIMER db 34,GRIMER @@ -25,32 +24,4 @@ MansionMons2: db 39,MUK db 37,WEEZING ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 32,GROWLITHE - db 34,GRIMER - db 34,GRIMER - db 30,PONYTA - db 30,GRIMER - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 39,MUK - db 37,WEEZING - ENDC - - IF DEF(_YELLOW) - db 37,RATTATA - db 37,RATICATE - db 26,GRIMER - db 29,GRIMER - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 35,MUK - db 38,MUK - ENDC - db $00 - diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index eceb0296..9c5521ae 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -12,8 +12,7 @@ MansionMons3: db 36,PONYTA db 42,MUK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 31,GRIMER db 33,VULPIX db 35,GRIMER @@ -25,32 +24,4 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,GRIMER - db 33,GROWLITHE - db 35,GRIMER - db 32,PONYTA - db 34,PONYTA - db 40,MUK - db 34,KOFFING - db 38,MUK - db 36,PONYTA - db 42,WEEZING - ENDC - - IF DEF(_YELLOW) - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 43,RATTATA - db 43,RATICATE - db 38,GRIMER - db 38,GRIMER - db 38,MUK - db 41,MUK - ENDC - db $00 - diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 9dcd9893..83266ddd 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -12,8 +12,7 @@ MansionMonsB1: db 42,WEEZING db 42,MUK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 33,GRIMER db 31,GRIMER db 35,VULPIX @@ -25,31 +24,4 @@ MansionMonsB1: db 38,MAGMAR db 42,WEEZING ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 33,GRIMER - db 31,GRIMER - db 35,GROWLITHE - db 32,PONYTA - db 31,GRIMER - db 40,MUK - db 34,PONYTA - db 35,KOFFING - db 38,MUK - db 42,WEEZING - ENDC - - IF DEF(_YELLOW) - db 35,GRIMER - db 38,GRIMER - db 37,RATICATE - db 40,RATICATE - db 41,MUK - db 43,RATICATE - db 24,DITTO - db 46,RATICATE - db 18,DITTO - db 12,DITTO - ENDC - db $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm index a8018b82..44b34c45 100755 --- a/data/wildPokemon/mtmoon1.asm +++ b/data/wildPokemon/mtmoon1.asm @@ -1,27 +1,13 @@ MoonMons1: db $0A - IF DEF(_YELLOW) - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - ELSE - db 8,ZUBAT - db 7,ZUBAT - db 9,ZUBAT - db 8,GEODUDE - db 6,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 8,PARAS - db 11,ZUBAT - db 8,CLEFAIRY - ENDC + db 8,ZUBAT + db 7,ZUBAT + db 9,ZUBAT + db 8,GEODUDE + db 6,ZUBAT + db 10,ZUBAT + db 10,GEODUDE + db 8,PARAS + db 11,ZUBAT + db 8,CLEFAIRY db $00 - diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index c78b8471..5c0d8a53 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -1,27 +1,13 @@ MoonMonsB1: db $0A - IF DEF(_YELLOW) - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - ELSE - db 8,ZUBAT - db 7,ZUBAT - db 7,GEODUDE - db 8,GEODUDE - db 9,ZUBAT - db 10,PARAS - db 10,ZUBAT - db 11,ZUBAT - db 9,CLEFAIRY - db 9,GEODUDE - ENDC + db 8,ZUBAT + db 7,ZUBAT + db 7,GEODUDE + db 8,GEODUDE + db 9,ZUBAT + db 10,PARAS + db 10,ZUBAT + db 11,ZUBAT + db 9,CLEFAIRY + db 9,GEODUDE db $00 - diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm index 0118a898..cbf97e7e 100755 --- a/data/wildPokemon/mtmoonb2.asm +++ b/data/wildPokemon/mtmoonb2.asm @@ -1,27 +1,13 @@ MoonMonsB2: db $0A - IF DEF(_YELLOW) - db 10,ZUBAT - db 11,GEODUDE - db 13,PARAS - db 11,ZUBAT - db 11,ZUBAT - db 12,ZUBAT - db 13,ZUBAT - db 9,CLEFAIRY - db 11,CLEFAIRY - db 13,CLEFAIRY - ELSE - db 9,ZUBAT - db 9,GEODUDE - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 10,PARAS - db 12,PARAS - db 10,CLEFAIRY - db 12,ZUBAT - db 12,CLEFAIRY - ENDC + db 9,ZUBAT + db 9,GEODUDE + db 10,ZUBAT + db 10,GEODUDE + db 11,ZUBAT + db 10,PARAS + db 12,PARAS + db 10,CLEFAIRY + db 12,ZUBAT + db 12,CLEFAIRY db $00 - diff --git a/data/wildPokemon/nomons.asm b/data/wildPokemon/nomons.asm index 895cf2e0..ce7f7ede 100755 --- a/data/wildPokemon/nomons.asm +++ b/data/wildPokemon/nomons.asm @@ -1,4 +1,3 @@ NoMons: db $00 db $00 - diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm index 4911c790..df951e70 100755 --- a/data/wildPokemon/pokemontower1.asm +++ b/data/wildPokemon/pokemontower1.asm @@ -1,4 +1,3 @@ TowerMons1: db $00 db $00 - diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm index a849668d..dcbe0da0 100755 --- a/data/wildPokemon/pokemontower2.asm +++ b/data/wildPokemon/pokemontower2.asm @@ -1,4 +1,3 @@ TowerMons2: db $00 db $00 - diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm index 4e3a7c62..135ed84f 100755 --- a/data/wildPokemon/pokemontower3.asm +++ b/data/wildPokemon/pokemontower3.asm @@ -1,29 +1,13 @@ TowerMons3: db $0A - - IF DEF(_YELLOW) - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,GASTLY - db 20,HAUNTER - db 25,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 24,GASTLY - db 20,CUBONE - db 22,CUBONE - db 25,HAUNTER - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 19,GASTLY + db 18,GASTLY + db 24,GASTLY + db 20,CUBONE + db 22,CUBONE + db 25,HAUNTER db $00 - diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm index e0de809f..0c84b0cf 100755 --- a/data/wildPokemon/pokemontower4.asm +++ b/data/wildPokemon/pokemontower4.asm @@ -1,29 +1,13 @@ TowerMons4: db $0A - - IF DEF(_YELLOW) - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,GASTLY - db 20,HAUNTER - db 25,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 19,GASTLY + db 18,GASTLY + db 25,HAUNTER + db 20,CUBONE + db 22,CUBONE + db 24,GASTLY db $00 - diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index 9f97b98e..440dbf8d 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,29 +1,13 @@ TowerMons5: db $0A - - IF DEF(_YELLOW) - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 20,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 19,GASTLY + db 18,GASTLY + db 25,HAUNTER + db 20,CUBONE + db 22,CUBONE + db 24,GASTLY db $00 - diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm index b97e2ddd..553fdb5d 100755 --- a/data/wildPokemon/pokemontower6.asm +++ b/data/wildPokemon/pokemontower6.asm @@ -1,29 +1,13 @@ TowerMons6: db $0F - - IF DEF(_YELLOW) - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 22,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - ELSE - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 19,GASTLY - db 26,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - ENDC - + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 20,GASTLY + db 19,GASTLY + db 26,HAUNTER + db 22,CUBONE + db 24,CUBONE + db 28,HAUNTER db $00 - diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index b0d94534..0f7e66e9 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,29 +1,13 @@ TowerMons7: db $0F - - IF DEF(_YELLOW) - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 27,GASTLY - db 28,GASTLY - db 23,GASTLY - db 24,CUBONE - db 29,GASTLY - db 24,HAUNTER - db 29,HAUNTER - ELSE - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 28,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - db 30,HAUNTER - ENDC - + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 20,GASTLY + db 28,HAUNTER + db 22,CUBONE + db 24,CUBONE + db 28,HAUNTER + db 30,HAUNTER db $00 - diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index f956fcf2..35eece95 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,34 +1,19 @@ PowerPlantMons: db $0A - - IF DEF(_YELLOW) - db 30,MAGNEMITE - db 35,MAGNEMITE - db 33,MAGNETON - db 33,VOLTORB - db 37,VOLTORB - db 33,GRIMER - db 37,GRIMER - db 38,MAGNETON - db 33,MUK - db 37,MUK - ELSE - db 21,VOLTORB - db 21,MAGNEMITE - db 20,PIKACHU - db 24,PIKACHU - db 23,MAGNEMITE - db 23,VOLTORB - db 32,MAGNETON - db 35,MAGNETON - IF DEF(_RED) - db 33,ELECTABUZZ - db 36,ELECTABUZZ - ENDC - IF DEF(_GREEN) || DEF(_BLUE) - db 33,RAICHU - db 36,RAICHU - ENDC + db 21,VOLTORB + db 21,MAGNEMITE + db 20,PIKACHU + db 24,PIKACHU + db 23,MAGNEMITE + db 23,VOLTORB + db 32,MAGNETON + db 35,MAGNETON + IF DEF(_RED) + db 33,ELECTABUZZ + db 36,ELECTABUZZ + ENDC + IF DEF(_BLUE) + db 33,RAICHU + db 36,RAICHU ENDC - db $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm index 992a4e73..a36f2092 100755 --- a/data/wildPokemon/rocktunnel1.asm +++ b/data/wildPokemon/rocktunnel1.asm @@ -1,34 +1,13 @@ TunnelMonsB1: db $0F - - IF DEF(_YELLOW) - db 15,ZUBAT - db 16,GEODUDE - db 17,ZUBAT - db 19,ZUBAT - db 18,GEODUDE - db 20,GEODUDE - db 21,ZUBAT - db 17,MACHOP - db 19,MACHOP - db 21,MACHOP - ELSE - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 18,ZUBAT - ENDC - IF (DEF(_BLUE) && DEF(_JAPAN)) - db 18,DITTO - ENDC - db 15,ZUBAT - db 17,MACHOP - db 13,ONIX - db 15,ONIX - ENDC - + db 16,ZUBAT + db 17,ZUBAT + db 17,GEODUDE + db 15,MACHOP + db 16,GEODUDE + db 18,ZUBAT + db 15,ZUBAT + db 17,MACHOP + db 13,ONIX + db 15,ONIX db $00 - diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm index 0a47d984..2fc7ef94 100755 --- a/data/wildPokemon/rocktunnel2.asm +++ b/data/wildPokemon/rocktunnel2.asm @@ -1,34 +1,13 @@ TunnelMonsB2: db $0F - - IF DEF(_YELLOW) - db 20,ZUBAT - db 17,GEODUDE - db 18,MACHOP - db 21,ZUBAT - db 22,ZUBAT - db 21,GEODUDE - db 20,MACHOP - db 14,ONIX - db 18,ONIX - db 22,ONIX - ELSE - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 18,ZUBAT - ENDC - IF DEF(_BLUE) && DEF(_JAPAN) - db 18,DITTO - ENDC - db 17,MACHOP - db 17,ONIX - db 13,ONIX - db 18,GEODUDE - ENDC - + db 16,ZUBAT + db 17,ZUBAT + db 17,GEODUDE + db 15,MACHOP + db 16,GEODUDE + db 18,ZUBAT + db 17,MACHOP + db 17,ONIX + db 13,ONIX + db 18,GEODUDE db $00 - diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm index 8e5b6897..f618c34f 100755 --- a/data/wildPokemon/route1.asm +++ b/data/wildPokemon/route1.asm @@ -1,27 +1,13 @@ Route1Mons: db $19 - IF DEF(_YELLOW) - db 3,PIDGEY - db 4,PIDGEY - db 2,RATTATA - db 3,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 5,PIDGEY - db 4,RATTATA - db 6,PIDGEY - db 7,PIDGEY - ELSE - db 3,PIDGEY - db 3,RATTATA - db 3,RATTATA - db 2,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 3,PIDGEY - db 4,RATTATA - db 4,PIDGEY - db 5,PIDGEY - ENDC + db 3,PIDGEY + db 3,RATTATA + db 3,RATTATA + db 2,RATTATA + db 2,PIDGEY + db 3,PIDGEY + db 3,PIDGEY + db 4,RATTATA + db 4,PIDGEY + db 5,PIDGEY db $00 - diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm index 7cfaf25c..34e0b5ee 100755 --- a/data/wildPokemon/route10.asm +++ b/data/wildPokemon/route10.asm @@ -1,6 +1,5 @@ Route10Mons: db $0F - IF DEF(_RED) db 16,VOLTORB db 16,SPEAROW @@ -13,8 +12,7 @@ Route10Mons: db 13,EKANS db 17,EKANS ENDC - - IF DEF(_BLUE) || DEF(_GREEN) + IF DEF(_BLUE) db 16,VOLTORB db 16,SPEAROW db 14,VOLTORB @@ -26,19 +24,4 @@ Route10Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - - IF DEF(_YELLOW) - db 16,MAGNEMITE - db 18,RATTATA - db 18,MAGNEMITE - db 20,MAGNEMITE - db 17,NIDORAN_M - db 17,NIDORAN_F - db 22,MAGNEMITE - db 20,RATICATE - db 16,MACHOP - db 18,MACHOP - ENDC - db $00 - diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm index 66c52c20..9e4e3644 100755 --- a/data/wildPokemon/route11.asm +++ b/data/wildPokemon/route11.asm @@ -1,6 +1,5 @@ Route11Mons: db $0F - IF DEF(_RED) db 14,EKANS db 15,SPEAROW @@ -13,8 +12,7 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - - IF DEF(_GREEN) || DEF(_BLUE) + IF DEF(_BLUE) db 14,SANDSHREW db 15,SPEAROW db 12,SANDSHREW @@ -26,19 +24,4 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - - IF DEF(_YELLOW) - db 16,PIDGEY - db 15,RATTATA - db 18,PIDGEY - db 15,DROWZEE - db 17,RATTATA - db 17,DROWZEE - db 18,PIDGEOTTO - db 20,PIDGEOTTO - db 19,DROWZEE - db 17,RATICATE - ENDC - db $00 - diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index 9bb26a6d..45dfbc9d 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,7 +1,6 @@ Route12Mons: db $0F - - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 25,PIDGEY db 23,PIDGEY @@ -12,10 +11,8 @@ Route12Mons: db 27,PIDGEY db 28,GLOOM db 30,GLOOM - db $00 ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 25,PIDGEY db 23,PIDGEY @@ -26,31 +23,5 @@ Route12Mons: db 27,PIDGEY db 28,WEEPINBELL db 30,WEEPINBELL - db $00 ENDC - - IF DEF(_YELLOW) - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEY - db 28,PIDGEOTTO - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCHD - db 31,FARFETCHD - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC - + db $00 diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index be8ce386..2a1a6cb5 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,5 +1,5 @@ Route13Mons: - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db $14 db 24,ODDISH db 25,PIDGEY @@ -11,10 +11,8 @@ Route13Mons: db 25,DITTO db 28,GLOOM db 30,GLOOM - db $00 ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db $14 db 24,BELLSPROUT db 25,PIDGEY @@ -26,32 +24,5 @@ Route13Mons: db 25,DITTO db 28,WEEPINBELL db 30,WEEPINBELL - db $00 ENDC - - IF DEF(_YELLOW) - db $0F - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEOTTO - db 28,PIDGEY - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCHD - db 31,FARFETCHD - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC - + db $00 diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index 999981af..aad5aa48 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,6 +1,6 @@ Route14Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 26,PIDGEY db 23,DITTO @@ -12,8 +12,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 26,PIDGEY db 23,DITTO @@ -25,19 +24,4 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 30,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - db $00 - diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm index d924052a..b4762230 100755 --- a/data/wildPokemon/route15.asm +++ b/data/wildPokemon/route15.asm @@ -1,6 +1,6 @@ Route15Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 26,DITTO db 23,PIDGEY @@ -12,8 +12,7 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 26,DITTO db 23,PIDGEY @@ -25,19 +24,4 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 32,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - db $00 - diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm index 468e3777..c2421c50 100755 --- a/data/wildPokemon/route16.asm +++ b/data/wildPokemon/route16.asm @@ -1,28 +1,13 @@ Route16Mons: db $19 - IF DEF(_YELLOW) - db 22,SPEAROW - db 22,DODUO - db 23,RATTATA - db 24,DODUO - db 24,RATTATA - db 26,DODUO - db 23,SPEAROW - db 24,FEAROW - db 25,RATICATE - db 26,RATICATE - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 18,RATTATA - db 20,DODUO - db 20,RATTATA - db 18,DODUO - db 22,DODUO - db 22,RATTATA - db 23,RATICATE - db 25,RATICATE - ENDC - + db 20,SPEAROW + db 22,SPEAROW + db 18,RATTATA + db 20,DODUO + db 20,RATTATA + db 18,DODUO + db 22,DODUO + db 22,RATTATA + db 23,RATICATE + db 25,RATICATE db $00 - diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm index 36283a99..8dffd9a3 100755 --- a/data/wildPokemon/route17.asm +++ b/data/wildPokemon/route17.asm @@ -1,29 +1,13 @@ Route17Mons: db $19 - - IF DEF(_YELLOW) - db 26,DODUO - db 27,FEAROW - db 27,DODUO - db 28,DODUO - db 28,PONYTA - db 30,PONYTA - db 29,FEAROW - db 28,DODUO - db 32,PONYTA - db 29,DODRIO - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 27,RATICATE - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 25,FEAROW - db 27,FEAROW - ENDC - + db 20,SPEAROW + db 22,SPEAROW + db 25,RATICATE + db 24,DODUO + db 27,RATICATE + db 26,DODUO + db 28,DODUO + db 29,RATICATE + db 25,FEAROW + db 27,FEAROW db $00 - diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm index e16fc8ac..47bd247d 100755 --- a/data/wildPokemon/route18.asm +++ b/data/wildPokemon/route18.asm @@ -1,29 +1,13 @@ Route18Mons: db $19 - - IF DEF(_YELLOW) - db 22,SPEAROW - db 22,DODUO - db 23,RATTATA - db 24,DODUO - db 24,RATTATA - db 26,DODUO - db 23,SPEAROW - db 24,FEAROW - db 25,RATICATE - db 26,RATICATE - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 25,FEAROW - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 27,FEAROW - db 29,FEAROW - ENDC - + db 20,SPEAROW + db 22,SPEAROW + db 25,RATICATE + db 24,DODUO + db 25,FEAROW + db 26,DODUO + db 28,DODUO + db 29,RATICATE + db 27,FEAROW + db 29,FEAROW db $00 - diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index 8f9eb4e5..fb3a5e82 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,39 +1,24 @@ Route2Mons: db $19 - - IF DEF(_YELLOW) - db 3,RATTATA - db 3,PIDGEY - db 4,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,PIDGEY - db 6,NIDORAN_M - db 6,NIDORAN_F - db 7,PIDGEY - db 7,PIDGEY - ELSE - db 3,RATTATA - db 3,PIDGEY - db 4,PIDGEY - db 4,RATTATA - db 5,PIDGEY - if DEF(_RED) - db 3,WEEDLE - ENDC - if DEF(_BLUE) - db 3,CATERPIE - ENDC - db 2,RATTATA - db 5,RATTATA - if DEF(_RED) - db 4,WEEDLE - db 5,WEEDLE - ENDC - if DEF(_BLUE) - db 4,CATERPIE - db 5,CATERPIE - ENDC + db 3,RATTATA + db 3,PIDGEY + db 4,PIDGEY + db 4,RATTATA + db 5,PIDGEY + if DEF(_RED) + db 3,WEEDLE + ENDC + if DEF(_BLUE) + db 3,CATERPIE + ENDC + db 2,RATTATA + db 5,RATTATA + if DEF(_RED) + db 4,WEEDLE + db 5,WEEDLE + ENDC + if DEF(_BLUE) + db 4,CATERPIE + db 5,CATERPIE ENDC db $00 - diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm index 7017081d..3cc73ba0 100755 --- a/data/wildPokemon/route21.asm +++ b/data/wildPokemon/route21.asm @@ -1,30 +1,15 @@ Route21Mons: db $19 - - IF DEF(_YELLOW) - db 15,PIDGEY - db 13,RATTATA - db 13,PIDGEY - db 11,PIDGEY - db 17,PIDGEY - db 15,RATTATA - db 15,RATICATE - db 17,PIDGEOTTO - db 19,PIDGEOTTO - db 15,PIDGEOTTO - ELSE - db 21,RATTATA - db 23,PIDGEY - db 30,RATICATE - db 23,RATTATA - db 21,PIDGEY - db 30,PIDGEOTTO - db 32,PIDGEOTTO - db 28,TANGELA - db 30,TANGELA - db 32,TANGELA - ENDC - + db 21,RATTATA + db 23,PIDGEY + db 30,RATICATE + db 23,RATTATA + db 21,PIDGEY + db 30,PIDGEOTTO + db 32,PIDGEOTTO + db 28,TANGELA + db 30,TANGELA + db 32,TANGELA db $05 db 5,TENTACOOL db 10,TENTACOOL @@ -36,4 +21,3 @@ Route21Mons: db 30,TENTACOOL db 35,TENTACOOL db 40,TENTACOOL - diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 78c5631a..750a2f4e 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,6 +1,6 @@ Route22Mons: db $19 - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 3,RATTATA db 3,NIDORAN_M db 4,RATTATA @@ -12,7 +12,7 @@ Route22Mons: db 3,NIDORAN_F db 4,NIDORAN_F ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 3,RATTATA db 3,NIDORAN_F db 4,RATTATA @@ -24,17 +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/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index 1320868c..a96a0d3c 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -1,39 +1,23 @@ Route23Mons: db $0A - - IF DEF(_YELLOW) - db 41,NIDORINO - db 41,NIDORINA - db 36,MANKEY - db 44,NIDORINO - db 44,NIDORINA - db 40,FEAROW - db 41,MANKEY - db 45,FEAROW - db 41,PRIMEAPE - db 46,PRIMEAPE - ELSE - IF DEF(_RED) - db 26,EKANS - ENDC - IF !DEF(_RED) - db 26,SANDSHREW - ENDC - db 33,DITTO - db 26,SPEAROW - db 38,FEAROW - db 38,DITTO - db 38,FEAROW - IF DEF(_RED) - db 41,ARBOK - ENDC - IF !DEF(_RED) - db 41,SANDSLASH - ENDC - db 43,DITTO - db 41,FEAROW - db 43,FEAROW + IF DEF(_RED) + db 26,EKANS ENDC - + IF !DEF(_RED) + db 26,SANDSHREW + ENDC + db 33,DITTO + db 26,SPEAROW + db 38,FEAROW + db 38,DITTO + db 38,FEAROW + IF DEF(_RED) + db 41,ARBOK + ENDC + IF !DEF(_RED) + db 41,SANDSLASH + ENDC + db 43,DITTO + db 41,FEAROW + db 43,FEAROW db $00 - diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm index d586927f..3a745f36 100755 --- a/data/wildPokemon/route24.asm +++ b/data/wildPokemon/route24.asm @@ -1,6 +1,5 @@ Route24Mons: db $19 - IF DEF(_RED) db 7,WEEDLE db 8,KAKUNA @@ -13,8 +12,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 7,CATERPIE db 8,METAPOD db 12,PIDGEY @@ -26,32 +24,4 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 7,CATERPIE - db 8,METAPOD - db 12,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 10,ABRA - db 14,ODDISH - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - - IF DEF(_YELLOW) - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - ENDC - db $00 - diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm index 4609c7cd..4884fa64 100755 --- a/data/wildPokemon/route25.asm +++ b/data/wildPokemon/route25.asm @@ -1,6 +1,5 @@ Route25Mons: db $0F - IF DEF(_RED) db 8,WEEDLE db 9,KAKUNA @@ -13,8 +12,7 @@ Route25Mons: db 7,METAPOD db 8,CATERPIE ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 8,CATERPIE db 9,METAPOD db 13,PIDGEY @@ -26,32 +24,4 @@ Route25Mons: db 7,KAKUNA db 8,WEEDLE ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 8,CATERPIE - db 9,METAPOD - db 13,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 12,ABRA - db 14,ODDISH - db 10,ABRA - db 7,KAKUNA - db 8,WEEDLE - ENDC - - IF DEF(_YELLOW) - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - ENDC - db $00 - diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm index fe7c5da9..dea820a4 100755 --- a/data/wildPokemon/route3.asm +++ b/data/wildPokemon/route3.asm @@ -1,27 +1,13 @@ Route3Mons: db $14 - IF DEF(_YELLOW) - db 8,SPEAROW - db 9,SPEAROW - db 9,MANKEY - db 10,SPEAROW - db 8,SANDSHREW - db 10,RATTATA - db 10,SANDSHREW - db 12,RATTATA - db 11,SPEAROW - db 12,SPEAROW - ELSE - db 6,PIDGEY - db 5,SPEAROW - db 7,PIDGEY - db 6,SPEAROW - db 7,SPEAROW - db 8,PIDGEY - db 8,SPEAROW - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - ENDC + db 6,PIDGEY + db 5,SPEAROW + db 7,PIDGEY + db 6,SPEAROW + db 7,SPEAROW + db 8,PIDGEY + db 8,SPEAROW + db 3,JIGGLYPUFF + db 5,JIGGLYPUFF + db 7,JIGGLYPUFF db $00 - diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm index 40c3b7b5..624d58de 100755 --- a/data/wildPokemon/route4.asm +++ b/data/wildPokemon/route4.asm @@ -1,6 +1,5 @@ Route4Mons: db $14 - IF DEF(_RED) db 10,RATTATA db 10,SPEAROW @@ -13,8 +12,7 @@ Route4Mons: db 8,EKANS db 12,EKANS ENDC - - IF DEF(_BLUE) || DEF(_GREEN) + IF DEF(_BLUE) db 10,RATTATA db 10,SPEAROW db 8,RATTATA @@ -26,19 +24,4 @@ Route4Mons: db 8,SANDSHREW db 12,SANDSHREW ENDC - - IF DEF(_YELLOW) - db 8,SPEAROW - db 9,SPEAROW - db 9,MANKEY - db 10,SPEAROW - db 8,SANDSHREW - db 10,RATTATA - db 10,SANDSHREW - db 12,RATTATA - db 11,SPEAROW - db 12,SPEAROW - ENDC - db $00 - diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm index aa67ca87..cb8c583b 100755 --- a/data/wildPokemon/route5.asm +++ b/data/wildPokemon/route5.asm @@ -1,6 +1,5 @@ Route5Mons: db $0F - IF DEF(_RED) db 13,ODDISH db 13,PIDGEY @@ -13,8 +12,7 @@ Route5Mons: db 14,MANKEY db 16,MANKEY ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 13,BELLSPROUT db 13,PIDGEY db 15,PIDGEY @@ -26,32 +24,4 @@ Route5Mons: db 14,MEOWTH db 16,MEOWTH ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - ENDC - db $00 - diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index 86e0c05f..92512ffb 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,6 +1,5 @@ Route6Mons: db $0F - IF DEF(_RED) db 13,ODDISH db 13,PIDGEY @@ -12,10 +11,8 @@ Route6Mons: db 16,PIDGEY db 14,MANKEY db 16,MANKEY - db $00 ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 13,BELLSPROUT db 13,PIDGEY db 15,PIDGEY @@ -26,45 +23,5 @@ Route6Mons: db 16,PIDGEY db 14,MEOWTH db 16,MEOWTH - db $00 ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - db $00 - ENDC - - IF DEF(_YELLOW) - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - - db $03 - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,GOLDUCK - db 20,GOLDUCK - ENDC - + db $00 diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index 505b632b..559c98ee 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,6 +1,5 @@ Route7Mons: db $0F - IF DEF(_RED) db 19,PIDGEY db 19,ODDISH @@ -13,8 +12,7 @@ Route7Mons: db 19,MANKEY db 20,MANKEY ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 19,PIDGEY db 19,BELLSPROUT db 17,MEOWTH @@ -26,32 +24,4 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 19,PIDGEY - db 19,ODDISH - db 17,MEOWTH - db 22,ODDISH - db 22,PIDGEY - db 18,MEOWTH - db 18,GROWLITHE - db 20,GROWLITHE - db 19,MEOWTH - db 20,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 26,ABRA - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 24,JIGGLYPUFF - ENDC - db $00 - diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm index 67905134..8a0bfa31 100755 --- a/data/wildPokemon/route8.asm +++ b/data/wildPokemon/route8.asm @@ -1,6 +1,5 @@ Route8Mons: db $0F - IF DEF(_RED) db 18,PIDGEY db 18,MANKEY @@ -13,8 +12,7 @@ Route8Mons: db 15,GROWLITHE db 18,GROWLITHE ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 18,PIDGEY db 18,MEOWTH db 17,SANDSHREW @@ -26,32 +24,4 @@ Route8Mons: db 15,VULPIX db 18,VULPIX ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 18,PIDGEY - db 18,MEOWTH - db 17,SANDSHREW - db 16,GROWLITHE - db 20,PIDGEY - db 20,MEOWTH - db 19,SANDSHREW - db 17,GROWLITHE - db 15,GROWLITHE - db 18,GROWLITHE - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 20,KADABRA - db 27,KADABRA - ENDC - db $00 - diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm index d563aa2b..716589b0 100755 --- a/data/wildPokemon/route9.asm +++ b/data/wildPokemon/route9.asm @@ -1,6 +1,5 @@ Route9Mons: db $0F - IF DEF(_RED) db 16,RATTATA db 16,SPEAROW @@ -13,8 +12,7 @@ Route9Mons: db 13,EKANS db 17,EKANS ENDC - - IF DEF(_GREEN) || DEF(_BLUE) + IF DEF(_BLUE) db 16,RATTATA db 16,SPEAROW db 14,RATTATA @@ -26,19 +24,4 @@ Route9Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - - IF DEF(_YELLOW) - db 16,NIDORAN_M - db 16,NIDORAN_F - db 18,RATTATA - db 18,NIDORAN_M - db 18,NIDORAN_F - db 17,SPEAROW - db 18,NIDORINO - db 18,NIDORINA - db 20,RATICATE - db 19,FEAROW - ENDC - db $00 - diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm index 3781af0e..3d77b6fe 100755 --- a/data/wildPokemon/safarizone1.asm +++ b/data/wildPokemon/safarizone1.asm @@ -1,6 +1,6 @@ ZoneMons1: db $1E - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,NIDORAN_M db 26,DODUO db 22,PARAS @@ -9,16 +9,10 @@ ZoneMons1: db 23,EXEGGCUTE db 24,NIDORAN_F db 25,PARASECT - IF DEF(_RED) - db 25,KANGASKHAN - ENDC - IF DEF(_JAPAN) && DEF(_BLUE) - db 25,LICKITUNG - ENDC + db 25,KANGASKHAN db 28,SCYTHER ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,NIDORAN_F db 26,DODUO db 22,PARAS @@ -30,19 +24,4 @@ ZoneMons1: db 25,KANGASKHAN db 28,PINSIR ENDC - - IF DEF(_YELLOW) - db 21,NIDORAN_M - db 29,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINA - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 21,CHANSEY - db 15,SCYTHER - ENDC - db $00 - diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index 5de4ad00..c1b6a547 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,48 +1,28 @@ ZoneMons2: db $1E - IF DEF(_YELLOW) - db 36,NIDORAN_M - db 14,NIDORAN_F - db 20,EXEGGCUTE - db 25,RHYHORN - db 23,NIDORINA - db 28,KANGASKHAN - db 16,CUBONE - db 33,KANGASKHAN - db 25,SCYTHER - db 15,PINSIR - ELSE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_M - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_F - ENDC - db 26,RHYHORN - db 23,PARAS - db 25,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - db 27,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - db 32,VENOMOTH - db 26,CHANSEY - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 28,TAUROS - ENDC - IF (DEF(_JAPAN) && DEF(_BLUE)) - db 28,PINSIR - ENDC + IF DEF(_RED) + db 22,NIDORAN_M ENDC - + IF DEF(_BLUE) + db 22,NIDORAN_F + ENDC + db 26,RHYHORN + db 23,PARAS + db 25,EXEGGCUTE + IF DEF(_RED) + db 30,NIDORINO + ENDC + IF DEF(_BLUE) + db 30,NIDORINA + ENDC + db 27,EXEGGCUTE + IF DEF(_RED) + db 30,NIDORINA + ENDC + IF DEF(_BLUE) + db 30,NIDORINO + ENDC + db 32,VENOMOTH + db 26,CHANSEY + db 28,TAUROS db $00 - diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm index c13cd378..47b6a102 100755 --- a/data/wildPokemon/safarizone3.asm +++ b/data/wildPokemon/safarizone3.asm @@ -12,8 +12,7 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 25,NIDORAN_F db 26,DODUO db 23,VENONAT @@ -25,32 +24,4 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 25,NIDORAN_M - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINO - db 26,EXEGGCUTE - db 25,NIDORAN_F - db 31,VENOMOTH - db 26,PINSIR - db 28,LICKITUNG - ENDC - - IF DEF(_YELLOW) - db 29,NIDORAN_M - db 21,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINO - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 25,PINSIR - db 27,TANGELA - ENDC - db $00 - diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm index 7b50e5b9..0cd5323a 100755 --- a/data/wildPokemon/safarizonecenter.asm +++ b/data/wildPokemon/safarizonecenter.asm @@ -12,8 +12,7 @@ ZoneMonsCenter: db 23,SCYTHER db 23,CHANSEY ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 22,NIDORAN_F db 25,RHYHORN db 22,VENONAT @@ -25,32 +24,4 @@ ZoneMonsCenter: db 23,PINSIR db 23,CHANSEY ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 22,NIDORAN_M - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINO - db 25,EXEGGCUTE - db 31,NIDORINA - db 30,PARASECT - db 23,SCYTHER - db 23,CHANSEY - ENDC - - IF DEF(_YELLOW) - db 14,NIDORAN_M - db 36,NIDORAN_F - db 24,EXEGGCUTE - db 20,RHYHORN - db 23,NIDORINO - db 27,PARASECT - db 27,PARAS - db 32,PARASECT - db 22,TANGELA - db 7,CHANSEY - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm index 45d0a707..3c431f9a 100755 --- a/data/wildPokemon/seafoamisland1.asm +++ b/data/wildPokemon/seafoamisland1.asm @@ -12,8 +12,7 @@ IslandMons1: db 28,SHELLDER db 38,GOLDUCK ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 30,SEEL db 30,PSYDUCK db 30,STARYU @@ -25,32 +24,4 @@ IslandMons1: db 28,STARYU db 38,SLOWBRO ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,HORSEA - db 30,STARYU - db 30,KRABBY - db 28,KRABBY - db 21,ZUBAT - db 29,GOLBAT - db 28,SLOWPOKE - db 28,STARYU - db 38,SLOWBRO - ENDC - - IF DEF(_YELLOW) - db 18,ZUBAT - db 25,KRABBY - db 27,KRABBY - db 27,ZUBAT - db 36,ZUBAT - db 28,SLOWPOKE - db 30,SLOWPOKE - db 9,ZUBAT - db 27,GOLBAT - db 36,GOLBAT - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm index 3f6ef7b6..6f96f240 100755 --- a/data/wildPokemon/seafoamislandb1.asm +++ b/data/wildPokemon/seafoamislandb1.asm @@ -12,8 +12,7 @@ IslandMonsB1: db 38,DEWGONG db 37,SEADRA ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 30,SHELLDER db 30,KRABBY db 32,STARYU @@ -25,32 +24,4 @@ IslandMonsB1: db 38,DEWGONG db 37,KINGLER ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SHELLDER - db 30,KRABBY - db 32,STARYU - db 32,KRABBY - db 28,HORSEA - db 30,SEEL - db 30,HORSEA - db 28,SEEL - db 38,DEWGONG - db 37,KINGLER - ENDC - - IF DEF(_YELLOW) - db 27,ZUBAT - db 26,KRABBY - db 36,ZUBAT - db 28,KRABBY - db 27,GOLBAT - db 29,SLOWPOKE - db 18,ZUBAT - db 28,KINGLER - db 22,SEEL - db 26,SEEL - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm index 5df1cca9..7191fea9 100755 --- a/data/wildPokemon/seafoamislandb2.asm +++ b/data/wildPokemon/seafoamislandb2.asm @@ -12,8 +12,7 @@ IslandMonsB2: db 30,GOLBAT db 37,SLOWBRO ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 30,SEEL db 30,PSYDUCK db 32,SEEL @@ -25,32 +24,4 @@ IslandMonsB2: db 30,GOLBAT db 37,GOLDUCK ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,HORSEA - db 32,SEEL - db 32,HORSEA - db 28,KRABBY - db 30,SHELLDER - db 30,KRABBY - db 28,STARYU - db 30,GOLBAT - db 37,JYNX - ENDC - - IF DEF(_YELLOW) - db 27,ZUBAT - db 27,KRABBY - db 36,ZUBAT - db 27,GOLBAT - db 28,KINGLER - db 24,SEEL - db 29,KRABBY - db 36,GOLBAT - db 31,SLOWPOKE - db 31,SLOWBRO - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm index e8560c9a..9778c0e9 100755 --- a/data/wildPokemon/seafoamislandb3.asm +++ b/data/wildPokemon/seafoamislandb3.asm @@ -12,8 +12,7 @@ IslandMonsB3: db 39,SEADRA db 37,DEWGONG ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 31,PSYDUCK db 31,SEEL db 33,PSYDUCK @@ -25,44 +24,4 @@ IslandMonsB3: db 39,KINGLER db 37,DEWGONG ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,HORSEA - db 31,SEEL - db 33,HORSEA - db 33,SEEL - db 29,KRABBY - db 31,STARYU - db 31,KRABBY - db 29,STARYU - db 39,KINGLER - db 37,DEWGONG - ENDC - - IF DEF(_YELLOW) - db 27,GOLBAT - db 36,ZUBAT - db 29,KRABBY - db 27,ZUBAT - db 30,KINGLER - db 26,SEEL - db 31,KRABBY - db 30,SEEL - db 28,DEWGONG - db 32,DEWGONG - - db $05 - db 25,TENTACOOL - db 30,TENTACOOL - db 20,TENTACOOL - db 30,STARYU - db 35,TENTACOOL - db 30,STARYU - db 40,TENTACOOL - db 30,STARYU - db 30,STARYU - db 30,STARYU - ENDC - db $00 - diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm index 7f8977d6..3948470b 100755 --- a/data/wildPokemon/seafoamislandb4.asm +++ b/data/wildPokemon/seafoamislandb4.asm @@ -12,8 +12,7 @@ IslandMonsB4: db 39,SLOWBRO db 32,GOLBAT ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 31,KRABBY db 31,STARYU db 33,KRABBY @@ -25,44 +24,4 @@ IslandMonsB4: db 39,GOLDUCK db 32,GOLBAT ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,KRABBY - db 31,STARYU - db 33,KRABBY - db 33,STARYU - db 29,HORSEA - db 31,SEEL - db 31,HORSEA - db 29,SEEL - db 39,JYNX - db 32,GOLBAT - ENDC - - IF DEF(_YELLOW) - db 36,GOLBAT - db 36,ZUBAT - db 30,KRABBY - db 32,KINGLER - db 28,SEEL - db 32,SEEL - db 27,GOLBAT - db 45,ZUBAT - db 30,DEWGONG - db 34,DEWGONG - - db $05 - db 25,TENTACOOL - db 30,TENTACOOL - db 20,TENTACOOL - db 30,STARYU - db 35,TENTACOOL - db 30,STARYU - db 40,TENTACOOL - db 30,STARYU - db 30,STARYU - db 30,STARYU - ENDC - db $00 - diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 504d32f1..70f680b7 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -1,38 +1,18 @@ DungeonMons1: db $0A - IF DEF(_YELLOW) - db 50,GOLBAT - db 55,GOLBAT - db 45,GRAVELER - db 55,GLOOM - db 55,WEEPINBELL + db 46,GOLBAT + db 46,HYPNO + db 46,MAGNETON + db 49,DODRIO + db 49,VENOMOTH + IF DEF(_RED) + db 52,ARBOK + ENDC + IF !DEF(_RED) db 52,SANDSLASH - db 54,VENOMOTH - db 54,PARASECT - db 55,DITTO - db 60,DITTO - ELSE - db 46,GOLBAT - db 46,HYPNO - db 46,MAGNETON - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 49,DODRIO - ENDC - IF DEF(_JAPAN) && DEF(_BLUE) - db 49,RAPIDASH - ENDC - db 49,VENOMOTH - IF DEF(_RED) - db 52,ARBOK - ENDC - IF !DEF(_RED) - db 52,SANDSLASH - ENDC - db 49,KADABRA - db 52,PARASECT - db 53,RAICHU - db 53,DITTO ENDC - + db 49,KADABRA + db 52,PARASECT + db 53,RAICHU + db 53,DITTO db $00 - diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm index 9422f3a0..5afe55ac 100755 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/unknowndungeon2.asm @@ -1,33 +1,13 @@ DungeonMons2: db $0F - IF DEF(_YELLOW) - db 52,GOLBAT - db 57,GOLBAT - db 50,GRAVELER - db 56,SANDSLASH - db 50,RHYHORN - db 60,DITTO - db 58,GLOOM - db 58,WEEPINBELL - db 60,RHYDON - db 58,RHYDON - ELSE - db 51,DODRIO - db 51,VENOMOTH - db 51,KADABRA - db 52,RHYDON - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 52,MAROWAK - ENDC - IF (DEF(_BLUE) && DEF(_JAPAN)) - db 52,MAROWAK - ENDC - db 52,ELECTRODE - db 56,CHANSEY - db 54,WIGGLYTUFF - db 55,DITTO - db 60,DITTO - ENDC - + db 51,DODRIO + db 51,VENOMOTH + db 51,KADABRA + db 52,RHYDON + db 52,MAROWAK + db 52,ELECTRODE + db 56,CHANSEY + db 54,WIGGLYTUFF + db 55,DITTO + db 60,DITTO db $00 - diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 6a88edb2..245d5912 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,33 +1,18 @@ DungeonMonsB1: db $19 - IF DEF(_YELLOW) - db 54,GOLBAT - db 59,GOLBAT - db 55,GRAVELER - db 52,RHYHORN - db 62,RHYDON - db 60,DITTO - db 56,CHANSEY - db 65,DITTO - db 55,LICKITUNG - db 50,LICKITUNG - ELSE - db 55,RHYDON - db 55,MAROWAK - db 55,ELECTRODE - db 64,CHANSEY - db 64,PARASECT - db 64,RAICHU - IF DEF(_RED) - db 57,ARBOK - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 57,SANDSLASH - ENDC - db 65,DITTO - db 63,DITTO - db 67,DITTO + db 55,RHYDON + db 55,MAROWAK + db 55,ELECTRODE + db 64,CHANSEY + db 64,PARASECT + db 64,RAICHU + IF DEF(_RED) + db 57,ARBOK ENDC - + IF DEF(_BLUE) + db 57,SANDSLASH + ENDC + db 65,DITTO + db 63,DITTO + db 67,DITTO db $00 - diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm index 98914a91..60aae31a 100755 --- a/data/wildPokemon/victoryroad1.asm +++ b/data/wildPokemon/victoryroad1.asm @@ -1,29 +1,13 @@ PlateauMons1: db $0F - - IF DEF(_YELLOW) - db 26,GEODUDE - db 31,GEODUDE - db 36,GEODUDE - db 39,ZUBAT - db 44,ZUBAT - db 41,GEODUDE - db 43,ONIX - db 45,ONIX - db 41,GRAVELER - db 47,GRAVELER - ELSE - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 43,MAROWAK - ENDC - + db 24,MACHOP + db 26,GEODUDE + db 22,ZUBAT + db 36,ONIX + db 39,ONIX + db 42,ONIX + db 41,GRAVELER + db 41,GOLBAT + db 42,MACHOKE + db 43,MAROWAK db $00 - diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm index ffe117bc..580d644d 100755 --- a/data/wildPokemon/victoryroad2.asm +++ b/data/wildPokemon/victoryroad2.asm @@ -1,29 +1,13 @@ PlateauMons2: db $0A - - IF DEF(_YELLOW) - db 31,GEODUDE - db 36,GEODUDE - db 41,GEODUDE - db 44,ZUBAT - db 39,GOLBAT - db 44,GRAVELER - db 45,ONIX - db 47,ONIX - db 39,MACHOKE - db 42,MACHOKE - ELSE - db 22,MACHOP - db 24,GEODUDE - db 26,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,MACHOKE - db 40,GOLBAT - db 40,MAROWAK - db 43,GRAVELER - ENDC - + db 22,MACHOP + db 24,GEODUDE + db 26,ZUBAT + db 36,ONIX + db 39,ONIX + db 42,ONIX + db 41,MACHOKE + db 40,GOLBAT + db 40,MAROWAK + db 43,GRAVELER db $00 - diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm index 7c1b2c1c..80d7ef3e 100755 --- a/data/wildPokemon/victoryroad3.asm +++ b/data/wildPokemon/victoryroad3.asm @@ -1,29 +1,13 @@ PlateauMons3: db $0F - - IF DEF(_YELLOW) - db 36,GEODUDE - db 44,GOLBAT - db 41,GEODUDE - db 49,ONIX - db 46,GEODUDE - db 41,GRAVELER - db 42,MACHOKE - db 45,MACHOKE - db 47,GRAVELER - db 47,GRAVELER - ELSE - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 42,ONIX - db 40,VENOMOTH - db 45,ONIX - db 43,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 45,MACHOKE - ENDC - + db 24,MACHOP + db 26,GEODUDE + db 22,ZUBAT + db 42,ONIX + db 40,VENOMOTH + db 45,ONIX + db 43,GRAVELER + db 41,GOLBAT + db 42,MACHOKE + db 45,MACHOKE db $00 - diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index f6e00ac3..ae9a5a70 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,43 +1,25 @@ ForestMons: - IF DEF(_YELLOW) - db $19 - db 3,CATERPIE + db $08 + IF DEF(_RED) + db 4,WEEDLE + db 5,KAKUNA + db 3,WEEDLE + db 5,WEEDLE + db 4,KAKUNA + db 6,KAKUNA db 4,METAPOD + db 3,CATERPIE + ENDC + IF DEF(_BLUE) db 4,CATERPIE + db 5,METAPOD + db 3,CATERPIE db 5,CATERPIE - db 4,PIDGEY - db 6,PIDGEY - db 6,CATERPIE + db 4,METAPOD db 6,METAPOD - db 8,PIDGEY - db 9,PIDGEOTTO - ELSE - db $08 - IF DEF(_RED) - db 4,WEEDLE - db 5,KAKUNA - db 3,WEEDLE - db 5,WEEDLE - db 4,KAKUNA - db 6,KAKUNA - db 4,METAPOD - db 3,CATERPIE - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 4,CATERPIE - db 5,METAPOD - db 3,CATERPIE - db 5,CATERPIE - db 4,METAPOD - db 6,METAPOD - db 4,KAKUNA - db 3,WEEDLE - ENDC - - db 3,PIKACHU - db 5,PIKACHU + db 4,KAKUNA + db 3,WEEDLE ENDC - - + db 3,PIKACHU + db 5,PIKACHU db $00 - diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm index ef2d39ea..07c6a187 100755 --- a/data/wildPokemon/waterpokemon.asm +++ b/data/wildPokemon/waterpokemon.asm @@ -1,6 +1,5 @@ WaterMons: db $00 - db $05 db 5,TENTACOOL db 10,TENTACOOL @@ -12,4 +11,3 @@ WaterMons: db 30,TENTACOOL db 35,TENTACOOL db 40,TENTACOOL - |