From e351447a6a2a3bfe116613d41886db6194b6b89e Mon Sep 17 00:00:00 2001 From: TheFakeMateo Date: Sat, 21 Mar 2015 11:13:24 -0500 Subject: [PATCH] TM stuff pt2 --- data/baseStats/abra.asm | 2 +- data/baseStats/aerodactyl.asm | 4 ++-- data/baseStats/alakazam.asm | 11 +++-------- data/baseStats/arbok.asm | 4 ++-- data/baseStats/arcanine.asm | 2 +- data/baseStats/articuno.asm | 2 +- data/baseStats/blastoise.asm | 4 ++-- data/baseStats/blissey.asm | 2 +- data/baseStats/butterfree.asm | 8 ++------ data/baseStats/chansey.asm | 2 +- data/baseStats/charizard.asm | 2 +- data/baseStats/charmander.asm | 2 +- data/baseStats/charmeleon.asm | 2 +- data/baseStats/clefable.asm | 4 ++-- data/baseStats/clefairy.asm | 4 ++-- data/baseStats/cloyster.asm | 2 +- data/baseStats/crobat.asm | 2 +- data/baseStats/cubone.asm | 2 +- data/baseStats/diglett.asm | 8 ++------ data/baseStats/dodrio.asm | 2 +- data/baseStats/doduo.asm | 2 +- data/baseStats/dragonair.asm | 2 +- data/baseStats/dragonite.asm | 2 +- data/baseStats/dratini.asm | 2 +- data/baseStats/drowzee.asm | 2 +- data/baseStats/dugtrio.asm | 8 ++------ data/baseStats/eevee.asm | 8 ++------ data/baseStats/ekans.asm | 4 ++-- data/baseStats/electivire.asm | 2 +- data/baseStats/electrode.asm | 2 +- data/baseStats/espeon.asm | 2 +- data/baseStats/exeggcute.asm | 2 +- data/baseStats/exeggutor.asm | 2 +- data/baseStats/fearow.asm | 2 +- data/baseStats/flareon.asm | 10 +++------- data/baseStats/gastly.asm | 4 ++-- data/baseStats/gengar.asm | 4 ++-- data/baseStats/geodude.asm | 2 +- data/baseStats/glaceon.asm | 2 +- data/baseStats/golbat.asm | 2 +- data/baseStats/golem.asm | 2 +- data/baseStats/graveler.asm | 2 +- data/baseStats/grimer.asm | 4 ++-- data/baseStats/growlithe.asm | 2 +- data/baseStats/gyarados.asm | 11 ++--------- data/baseStats/haunter.asm | 4 ++-- data/baseStats/heracross.asm | 2 +- data/baseStats/hitmonchan.asm | 2 +- data/baseStats/hitmonlee.asm | 2 +- data/baseStats/honchkrow.asm | 2 +- data/baseStats/houndoom.asm | 4 ++-- data/baseStats/houndour.asm | 4 ++-- data/baseStats/hypno.asm | 2 +- data/baseStats/jigglypuff.asm | 4 ++-- data/baseStats/jolteon.asm | 8 ++------ data/baseStats/jynx.asm | 2 +- data/baseStats/kabuto.asm | 2 +- data/baseStats/kabutops.asm | 2 +- data/baseStats/kadabra.asm | 11 +++-------- data/baseStats/kangaskhan.asm | 4 ++-- data/baseStats/kingdra.asm | 2 +- data/baseStats/kingler.asm | 2 +- data/baseStats/koffing.asm | 4 ++-- data/baseStats/krabby.asm | 2 +- data/baseStats/leafeon.asm | 2 +- data/baseStats/lickilicky.asm | 4 ++-- data/baseStats/lickitung.asm | 4 ++-- data/baseStats/lugia.asm | 4 ++-- data/baseStats/machamp.asm | 2 +- data/baseStats/machoke.asm | 2 +- data/baseStats/machop.asm | 2 +- data/baseStats/magmar.asm | 2 +- data/baseStats/magmortar.asm | 2 +- data/baseStats/mankey.asm | 2 +- data/baseStats/marowak.asm | 14 ++++---------- data/baseStats/meowth.asm | 2 +- data/baseStats/mewtwo.asm | 2 +- data/baseStats/moltres.asm | 4 ++-- data/baseStats/mrmime.asm | 2 +- data/baseStats/muk.asm | 4 ++-- data/baseStats/murkrow.asm | 2 +- data/baseStats/nidoking.asm | 4 ++-- data/baseStats/nidoqueen.asm | 4 ++-- data/baseStats/ninetails.asm | 4 ++-- data/baseStats/omanyte.asm | 2 +- data/baseStats/omastar.asm | 2 +- data/baseStats/persian.asm | 2 +- data/baseStats/pidgeot.asm | 2 +- data/baseStats/pidgeotto.asm | 2 +- data/baseStats/pidgey.asm | 2 +- data/baseStats/pinsir.asm | 2 +- data/baseStats/poliwrath.asm | 2 +- data/baseStats/ponyta.asm | 2 +- data/baseStats/porygon.asm | 2 +- data/baseStats/porygon2.asm | 2 +- data/baseStats/porygonz.asm | 2 +- data/baseStats/primeape.asm | 9 ++------- data/baseStats/rapidash.asm | 2 +- data/baseStats/raticate.asm | 2 +- data/baseStats/rattata.asm | 2 +- data/baseStats/rhydon.asm | 2 +- data/baseStats/rhyhorn.asm | 2 +- data/baseStats/rhyperior.asm | 2 +- data/baseStats/sandshrew.asm | 2 +- data/baseStats/sandslash.asm | 2 +- data/baseStats/seadra.asm | 2 +- data/baseStats/shellder.asm | 2 +- data/baseStats/slowbro.asm | 4 ++-- data/baseStats/slowking.asm | 4 ++-- data/baseStats/slowpoke.asm | 4 ++-- data/baseStats/snorlax.asm | 4 ++-- data/baseStats/spearow.asm | 2 +- data/baseStats/squirtle.asm | 2 +- data/baseStats/steelix.asm | 2 +- data/baseStats/sylveon.asm | 2 +- data/baseStats/tauros.asm | 2 +- data/baseStats/togekiss.asm | 4 ++-- data/baseStats/togepi.asm | 4 ++-- data/baseStats/togetic.asm | 4 ++-- data/baseStats/umbreon.asm | 2 +- data/baseStats/vaporeon.asm | 8 ++------ data/baseStats/voltorb.asm | 2 +- data/baseStats/vulpix.asm | 4 ++-- data/baseStats/wartortle.asm | 2 +- data/baseStats/weezing.asm | 4 ++-- data/baseStats/wigglytuff.asm | 4 ++-- data/baseStats/zapdos.asm | 2 +- data/baseStats/zubat.asm | 2 +- data/tms.asm | 2 +- 129 files changed, 179 insertions(+), 235 deletions(-) diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index fee2c0c5a..3832bf0ba 100755 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -24,6 +24,6 @@ db %00000011 db %00001111 db %11110000 db %10000111 -db %00111000 +db %00111001 db %01000011 db BANK(AbraPicFront) diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 065a5bc33..af3f2f069 100755 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -23,7 +23,7 @@ db %00101010 db %01000011 db %01001000 db %11000000 -db %01100011 -db %00001100 +db %01111011 +db %00001000 db %00001010 db BANK(AerodactylPicFront) diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 1b927fd6e..a12f2e9a8 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -14,13 +14,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 @@ -29,6 +24,6 @@ db %01000011 db %00001111 db %11111000 db %10000111 -db %00111000 +db %00111001 db %01000011 db BANK(AlakazamPicFront) diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm index 05e57c867..c8a0a80a5 100755 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -23,7 +23,7 @@ db %10100000 db %01000011 db %00011000 db %11001110 -db %10000010 -db %10001000 +db %10001010 +db %10001100 db %00100010 db BANK(ArbokPicFront) diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 3f755c9b3..096444fb4 100755 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -23,7 +23,7 @@ db %10100000 db %01000011 db %01001000 db %11101000 -db %11100011 +db %11110011 db %00001000 db %00000010 db BANK(ArcaninePicFront) diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index d47652024..38082d3b6 100755 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -24,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %01000011 -db %00001100 +db %00001000 db %00001010 db BANK(ArticunoPicFront) diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm index 7028a3a8f..8efe2effb 100755 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %00001111 db %11001110 -db %10000011 -db %00001000 +db %10001011 +db %00001100 db %00110010 db BANK(BlastoisePicFront) diff --git a/data/baseStats/blissey.asm b/data/baseStats/blissey.asm index 7ecfcb38b..379c80de2 100755 --- a/data/baseStats/blissey.asm +++ b/data/baseStats/blissey.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %10101111 db %11110001 -db %10110111 +db %10111111 db %00111001 db %01100011 db BANK(BlisseyPicFront) diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index e26e11e91..caa7fcd3d 100755 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -24,10 +24,6 @@ db %01000011 db %00111000 db %11110000 db %01000011 -db %00101000 -IF DEF(_YELLOW) - db %01000010 -ELSE - db %00000010 -ENDC +db %00101001 +db %01000010 db BANK(ButterfreePicFront) diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 295953827..41e534717 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %10101111 db %11110001 -db %10110111 +db %10111111 db %00111001 db %01100011 db BANK(ChanseyPicFront) diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index 0e5d5c67f..831016d27 100755 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -23,7 +23,7 @@ db %10110101 db %01000011 db %01001111 db %11001110 -db %11100011 +db %11111011 db %00001000 db %00101110 db BANK(CharizardPicFront) diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm index ee64601a4..616d4f1a6 100755 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -23,7 +23,7 @@ db %10110101 db %00000011 db %01001111 db %11001000 -db %11100011 +db %11111011 db %00001000 db %00100110 db BANK(CharmanderPicFront) diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm index ecf05c785..bb2542eeb 100755 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -23,7 +23,7 @@ db %10110101 db %00000011 db %01001111 db %11001000 -db %11100011 +db %11111011 db %00001000 db %00100110 db BANK(CharmeleonPicFront) diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm index aa8988e4c..cdbe1f2bb 100755 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %10101111 db %11110001 -db %10100111 -db %00111000 +db %10110111 +db %00111001 db %01100011 db BANK(ClefablePicFront) diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm index 526dd7e8f..84c9fb47a 100755 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %10101111 db %11110001 -db %10100111 -db %00111000 +db %10110111 +db %00111001 db %01100011 db BANK(ClefairyPicFront) diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index f0e4e5088..c09524729 100755 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -23,7 +23,7 @@ db %00100000 db %01111111 db %00001000 db %11100000 -db %01001011 +db %01000011 db %01001000 db %00010011 db BANK(CloysterPicFront) diff --git a/data/baseStats/crobat.asm b/data/baseStats/crobat.asm index cf3641e90..6b0dd2b7d 100755 --- a/data/baseStats/crobat.asm +++ b/data/baseStats/crobat.asm @@ -24,6 +24,6 @@ db %01000011 db %00011000 db %11000000 db %01000010 -db %00001000 +db %00001101 db %00000010 db BANK(CrobatPicFront) diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index d7fafba8c..90f44dcd7 100755 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %00001111 db %11001110 -db %10100010 +db %10111010 db %00001000 db %00100010 db BANK(CubonePicFront) diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index f5c1b8168..7c0e9db6d 100755 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -23,11 +23,7 @@ db %10100000 db %00000011 db %00001000 db %11001110 -db %00000010 +db %00001010 db %10001000 -IF DEF(_YELLOW) - db %00000110 -ELSE - db %00000010 -ENDC +db %00000110 db BANK(DiglettPicFront) diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index 1ec835989..8c7ab27d5 100755 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -24,6 +24,6 @@ db %01000011 db %00001000 db %11000000 db %10000011 -db %00001100 +db %00001000 db %00001011 db BANK(DodrioPicFront) diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index c3201098c..18fa17154 100755 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %10000011 -db %00001100 +db %00001000 db %00001011 db BANK(DoduoPicFront) diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index 047767480..48a260f19 100755 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -23,7 +23,7 @@ db %11100000 db %00111111 db %11001000 db %11000001 -db %11100011 +db %11110011 db %00011000 db %00010010 db BANK(DragonairPicFront) diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index dc387065b..5650f80ea 100755 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -23,7 +23,7 @@ db %11100010 db %01111111 db %11001000 db %11000001 -db %11100011 +db %11111011 db %00011000 db %00111010 db BANK(DragonitePicFront) diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index ab1cfd4d9..9137c604f 100755 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -23,7 +23,7 @@ db %10100000 db %00111111 db %11001000 db %11000001 -db %11100011 +db %11110011 db %00011000 db %00010010 db BANK(DratiniPicFront) diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index 0c228e324..774030d11 100755 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -24,6 +24,6 @@ db %00000011 db %00001111 db %11110000 db %10000111 -db %00111010 +db %00111011 db %01000011 db BANK(DrowzeePicFront) diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index 71df354d0..3b73abdc8 100755 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -23,11 +23,7 @@ db %10100000 db %01000011 db %00001000 db %11001110 -db %00000010 +db %00001010 db %10001000 -IF DEF(_YELLOW) - db %00000110 -ELSE - db %00000010 -ENDC +db %00000110 db BANK(DugtrioPicFront) diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 217023077..9d262f9b0 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -14,11 +14,7 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db 0 db 0 db 0 ; growth rate @@ -28,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001001 db %00000010 db BANK(EeveePicFront) diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index 20ee16285..eb3b6b306 100755 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -23,7 +23,7 @@ db %10100000 db %00000011 db %00011000 db %11001110 -db %10000010 -db %10001000 +db %10001010 +db %10001100 db %00100010 db BANK(EkansPicFront) diff --git a/data/baseStats/electivire.asm b/data/baseStats/electivire.asm index 0ab05dc27..3420b46b9 100755 --- a/data/baseStats/electivire.asm +++ b/data/baseStats/electivire.asm @@ -23,7 +23,7 @@ db %10110001 db %01000011 db %10001111 db %11110001 -db %11000111 +db %11010111 db %00111000 db %01100010 db BANK(ElectivirePicFront) diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index dfd4aae9e..e81c4fa84 100755 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -23,7 +23,7 @@ db %00100000 db %01000001 db %10001000 db %11100001 -db %11001011 +db %11000011 db %01011000 db %01000010 db BANK(ElectrodePicFront) diff --git a/data/baseStats/espeon.asm b/data/baseStats/espeon.asm index ffa91a92f..633253fa7 100755 --- a/data/baseStats/espeon.asm +++ b/data/baseStats/espeon.asm @@ -24,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001001 db %00010010 db BANK(EspeonPicFront) diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index cbe52fa0a..dc67ae503 100755 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -23,7 +23,7 @@ db %00100000 db %00000011 db %00001000 db %11110000 -db %00011011 +db %00000011 db %01101000 db %00000010 db BANK(ExeggcutePicFront) diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index 037c01ebc..467e467fa 100755 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -23,7 +23,7 @@ db %00100000 db %01000011 db %00111000 db %11110000 -db %00011011 +db %00000011 db %01101000 db %00100010 db BANK(ExeggutorPicFront) diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm index 46171a81d..9e6c5eb13 100755 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -24,6 +24,6 @@ db %01000011 db %00001000 db %11000000 db %01000010 -db %00001100 +db %00001000 db %00001010 db BANK(FearowPicFront) diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index 11cb112f3..27d1c8c44 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -14,11 +14,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 @@ -27,7 +23,7 @@ db %10100000 db %01000011 db %00001000 db %11000000 -db %11100011 -db %00001000 +db %11110011 +db %00001001 db %00000010 db BANK(FlareonPicFront) diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index cfeceaf98..9499a907a 100755 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -23,7 +23,7 @@ db %00100000 db %00000000 db %10011000 db %11010001 -db %00001010 -db %01101010 +db %00000010 +db %01101111 db %00000010 db BANK(GastlyPicFront) diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index 203358d4e..c9e41aa93 100755 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -23,7 +23,7 @@ db %10110001 db %01000011 db %10011111 db %11010001 -db %10001110 -db %01101010 +db %10000110 +db %01101111 db %00100010 db BANK(GengarPicFront) diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index 6f0df2c0d..6e27c6eab 100755 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -23,7 +23,7 @@ db %10100001 db %00000011 db %00001111 db %11001110 -db %00101110 +db %00111110 db %11001000 db %00100010 db BANK(GeodudePicFront) diff --git a/data/baseStats/glaceon.asm b/data/baseStats/glaceon.asm index 3bcf98c0e..2ca45c752 100755 --- a/data/baseStats/glaceon.asm +++ b/data/baseStats/glaceon.asm @@ -24,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001001 db %00010010 db BANK(GlaceonPicFront) diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm index f9589eb97..60ddb8e9d 100755 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -24,6 +24,6 @@ db %01000011 db %00011000 db %11000000 db %01000010 -db %00001000 +db %00001001 db %00000010 db BANK(GolbatPicFront) diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index 4c96bc566..cd746b36e 100755 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -23,7 +23,7 @@ db %10110001 db %01000011 db %00001111 db %11001110 -db %00101110 +db %00111110 db %11001000 db %00100010 db BANK(GolemPicFront) diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index 476d5ed2e..20c362f2d 100755 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -23,7 +23,7 @@ db %10100001 db %00000011 db %00001111 db %11001110 -db %00101110 +db %00111110 db %11001000 db %00100010 db BANK(GravelerPicFront) diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index 52bb943be..c5095a049 100755 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -23,7 +23,7 @@ db %10100000 db %00000000 db %10011000 db %11000001 -db %00101010 -db %01001000 +db %00111010 +db %01001001 db %00000010 db BANK(GrimerPicFront) diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index c8ee93e05..89479ec96 100755 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -23,7 +23,7 @@ db %10100000 db %00000011 db %01001000 db %11001000 -db %11100011 +db %11110011 db %00001000 db %00000010 db BANK(GrowlithePicFront) diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 098878b9a..02c2674f6 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -13,24 +13,17 @@ 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 db %10100000 db %01111111 db %11001000 db %11000001 -db %10100011 -db %00001000 +db %10110011 +db %00001100 db %00110010 db BANK(GyaradosPicFront) diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index aeccdd040..036bc1b5a 100755 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -23,7 +23,7 @@ db %00100000 db %00000000 db %10011000 db %11010001 -db %00001010 -db %01101010 +db %00000010 +db %01101111 db %00000010 db BANK(HaunterPicFront) diff --git a/data/baseStats/heracross.asm b/data/baseStats/heracross.asm index 9b88f1377..1800f1a63 100755 --- a/data/baseStats/heracross.asm +++ b/data/baseStats/heracross.asm @@ -23,7 +23,7 @@ db %10100100 db %01000011 db %00001101 db %11000000 -db %00000010 +db %00001010 db %00001000 db %00100110 db BANK(HeracrossPicFront) diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index fe13b0811..a59808e61 100755 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -23,7 +23,7 @@ db %10110001 db %00000011 db %00001111 db %11000000 -db %11000110 +db %11001110 db %00001000 db %00100010 db BANK(HitmonchanPicFront) diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index 8632d47f0..9fa7b5c0f 100755 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -23,7 +23,7 @@ db %10110001 db %00000011 db %00001111 db %11000000 -db %11000110 +db %11001110 db %00001000 db %00100010 db BANK(HitmonleePicFront) diff --git a/data/baseStats/honchkrow.asm b/data/baseStats/honchkrow.asm index d417681a5..775136643 100755 --- a/data/baseStats/honchkrow.asm +++ b/data/baseStats/honchkrow.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %01000010 -db %00001100 +db %00001101 db %00001010 db BANK(HonchkrowPicFront) diff --git a/data/baseStats/houndoom.asm b/data/baseStats/houndoom.asm index f3dc17d36..634e36fff 100755 --- a/data/baseStats/houndoom.asm +++ b/data/baseStats/houndoom.asm @@ -23,7 +23,7 @@ db %10100000 db %01000011 db %01001000 db %11101000 -db %11100011 -db %00001000 +db %11110011 +db %00001101 db %00000010 db BANK(HoundoomPicFront) diff --git a/data/baseStats/houndour.asm b/data/baseStats/houndour.asm index bb15cdac8..82ba2d804 100755 --- a/data/baseStats/houndour.asm +++ b/data/baseStats/houndour.asm @@ -23,7 +23,7 @@ db %10100000 db %00000011 db %01001000 db %11001000 -db %11100011 -db %00001000 +db %11110011 +db %00001101 db %00000010 db BANK(HoundourPicFront) diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 7bfc92b7f..18d530395 100755 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -24,6 +24,6 @@ db %01000011 db %00001111 db %11110000 db %10000111 -db %00111010 +db %00111011 db %01000011 db BANK(HypnoPicFront) diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm index 52b07eef6..89c66b2a5 100755 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %10101111 db %11110001 -db %10100011 -db %00111000 +db %10110011 +db %00111001 db %01100011 db BANK(JigglypuffPicFront) diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index dd2fe0938..665b6d8ce 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -14,11 +14,7 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate @@ -28,6 +24,6 @@ db %01000011 db %10001000 db %11000001 db %11000011 -db %00011000 +db %00011001 db %01000010 db BANK(JolteonPicFront) diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index dd9d76cc9..c41d37784 100755 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -24,6 +24,6 @@ db %01111111 db %00001111 db %11110000 db %10000111 -db %00101000 +db %00101001 db %00000010 db BANK(JynxPicFront) diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 32eb63a11..f7853c94b 100755 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -23,7 +23,7 @@ db %10100000 db %00111111 db %00001000 db %11000000 -db %00000011 +db %00001011 db %00001000 db %00010010 db BANK(KabutoPicFront) diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index 5ef987ec7..1d9711a31 100755 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -23,7 +23,7 @@ db %10110110 db %01111111 db %00001101 db %11000000 -db %10000011 +db %10001011 db %00001000 db %00010010 db BANK(KabutopsPicFront) diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 0792e3989..ee9d08016 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -14,13 +14,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 @@ -29,6 +24,6 @@ db %00000011 db %00001111 db %11111000 db %10000111 -db %00111000 +db %00111001 db %01000011 db BANK(KadabraPicFront) diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index 60eedaa78..b844cf558 100755 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %10001111 db %11000111 -db %10100010 -db %10001000 +db %10111010 +db %10001001 db %00110010 db BANK(KangaskhanPicFront) diff --git a/data/baseStats/kingdra.asm b/data/baseStats/kingdra.asm index 2c71455ed..68bd1a545 100755 --- a/data/baseStats/kingdra.asm +++ b/data/baseStats/kingdra.asm @@ -23,7 +23,7 @@ db %00100000 db %01111111 db %00001000 db %11000000 -db %11000010 +db %11010010 db %00001000 db %00010010 db BANK(KingdraPicFront) diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index d8fe3038c..ff6251ea1 100755 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -23,7 +23,7 @@ db %10100100 db %01111111 db %00001000 db %11000000 -db %00000010 +db %00001010 db %00001000 db %00110110 db BANK(KinglerPicFront) diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index 4ea9da1b7..b0f755e6f 100755 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -23,7 +23,7 @@ db %00100000 db %00000000 db %10001000 db %11000001 -db %00101010 -db %01001000 +db %00100010 +db %01001101 db %00000010 db BANK(KoffingPicFront) diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 39ff5d31f..42b03f227 100755 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -23,7 +23,7 @@ db %10100100 db %00111111 db %00001000 db %11000000 -db %00000010 +db %00001010 db %00001000 db %00110110 db BANK(KrabbyPicFront) diff --git a/data/baseStats/leafeon.asm b/data/baseStats/leafeon.asm index 65e8f8391..b2c571452 100755 --- a/data/baseStats/leafeon.asm +++ b/data/baseStats/leafeon.asm @@ -24,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001001 db %00010010 db BANK(LeafeonPicFront) diff --git a/data/baseStats/lickilicky.asm b/data/baseStats/lickilicky.asm index 3410caacc..78ccb2403 100755 --- a/data/baseStats/lickilicky.asm +++ b/data/baseStats/lickilicky.asm @@ -23,7 +23,7 @@ db %10110101 db %01111111 db %10001111 db %11000111 -db %10100010 -db %00001000 +db %10111010 +db %00001001 db %00110110 db BANK(LickilickyPicFront) diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index 04ffba1ef..a40a0bb2c 100755 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -23,7 +23,7 @@ db %10110101 db %01111111 db %10001111 db %11000111 -db %10100010 -db %00001000 +db %10111010 +db %00001001 db %00110110 db BANK(LickitungPicFront) diff --git a/data/baseStats/lugia.asm b/data/baseStats/lugia.asm index 7c6d0145b..3136f6dd1 100755 --- a/data/baseStats/lugia.asm +++ b/data/baseStats/lugia.asm @@ -23,7 +23,7 @@ db %00101010 ;8 - 1 db %01111111 ;16 - 9 db %11001000 ;24 - 17 db %11010111 ;32 - 25 -db %01000011 ;40 - 33 -db %00001100 ;48 - 41 +db %01010011 ;40 - 33 +db %00001101 ;48 - 41 db %00111010 ;H6 - 49 db BANK(LugiaPicFront) diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index 28d377cb6..1296c15b1 100755 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -23,7 +23,7 @@ db %10110001 db %01000011 db %00001111 db %11001110 -db %10100110 +db %10111110 db %10001000 db %00100010 db BANK(MachampPicFront) diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index 2873e9dcd..3df782f8d 100755 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -23,7 +23,7 @@ db %10110001 db %00000011 db %00001111 db %11001110 -db %10100110 +db %10111110 db %10001000 db %00100010 db BANK(MachokePicFront) diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index 851689cb8..eb259458a 100755 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -23,7 +23,7 @@ db %10110001 db %00000011 db %00001111 db %11001110 -db %10100110 +db %10111110 db %10001000 db %00100010 db BANK(MachopPicFront) diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index 4bf917db9..9ed9c72e4 100755 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -23,7 +23,7 @@ db %10110001 db %01000011 db %00001111 db %11110000 -db %10100110 +db %10110110 db %00101000 db %00100010 db BANK(MagmarPicFront) diff --git a/data/baseStats/magmortar.asm b/data/baseStats/magmortar.asm index d11b2c585..6747fab40 100755 --- a/data/baseStats/magmortar.asm +++ b/data/baseStats/magmortar.asm @@ -23,7 +23,7 @@ db %10110001 db %01000011 db %00001111 db %11110000 -db %10100110 +db %10110110 db %00101000 db %00100010 db BANK(MagmortarPicFront) diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 4c9f7dddb..34cfd513e 100755 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -23,7 +23,7 @@ db %10110001 db %10000011 db %10001111 db %11001001 -db %11000110 +db %11001110 db %10001000 db %00100010 db BANK(MankeyPicFront) diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 2c0e9271c..a8bde8de1 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -14,22 +14,16 @@ 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 db %10110001 db %01111111 db %00001111 db %11001110 -db %10100010 +db %10111010 db %00001000 db %00100010 db BANK(MarowakPicFront) diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index fbd4e0c23..d654d817b 100755 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -24,6 +24,6 @@ db %10001111 db %10001000 db %11000001 db %11000010 -db %00001000 +db %00001101 db %00000010 db BANK(MeowthPicFront) diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index 608e87b83..0186cb180 100755 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -24,6 +24,6 @@ db %11111111 db %10101111 db %11110001 db %10101111 -db %00111000 +db %00111001 db %01100011 db BANK(MewtwoPicFront) diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index 04f99dd00..3815cf159 100755 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -23,7 +23,7 @@ db %00101010 db %01000011 db %00001000 db %11000000 -db %01100011 -db %00001100 +db %01110011 +db %00001000 db %00001010 db BANK(MoltresPicFront) diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index fdb0651c3..ab6613e04 100755 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -24,6 +24,6 @@ db %01000011 db %10101111 db %11110001 db %10000111 -db %00111000 +db %00111001 db %01000010 db BANK(MrMimePicFront) diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index 18860608b..e8938116d 100755 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -23,7 +23,7 @@ db %10100000 db %01000000 db %10011000 db %11000001 -db %00101010 -db %01001000 +db %00111010 +db %01001101 db %00000010 db BANK(MukPicFront) diff --git a/data/baseStats/murkrow.asm b/data/baseStats/murkrow.asm index dc386daf6..b8ebdf069 100755 --- a/data/baseStats/murkrow.asm +++ b/data/baseStats/murkrow.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %01000010 -db %00001100 +db %00001101 db %00001010 db BANK(MurkrowPicFront) diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm index e50512a48..e99fc0ea0 100755 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -23,7 +23,7 @@ db %11110001 db %11111111 db %10001111 db %11000111 -db %10100011 -db %10001000 +db %10111011 +db %10001001 db %00110010 db BANK(NidokingPicFront) diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm index 1617cbae1..2a20c2ce7 100755 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -23,7 +23,7 @@ db %11110001 db %11111111 db %10001111 db %11000111 -db %10100011 -db %10001000 +db %10111011 +db %10001001 db %00110010 db BANK(NidoqueenPicFront) diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm index 719a66c2c..ff9052a66 100755 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetails.asm @@ -23,7 +23,7 @@ db %10100000 db %01000011 db %00001000 db %11001000 -db %11100011 -db %00001000 +db %11110011 +db %00001101 db %00000010 db BANK(NinetalesPicFront) diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index a5f8400dc..6262bf915 100755 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -23,7 +23,7 @@ db %10100000 db %00111111 db %00001000 db %11000000 -db %00000011 +db %00001011 db %00001000 db %00010010 db BANK(OmanytePicFront) diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index 176dfdacd..4fba37198 100755 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -23,7 +23,7 @@ db %11100000 db %01111111 db %00001101 db %11000000 -db %10000011 +db %10001011 db %00001000 db %00010010 db BANK(OmastarPicFront) diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm index c8004fa96..69f360a5d 100755 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -24,6 +24,6 @@ db %11001111 db %10001000 db %11000001 db %11000010 -db %00001000 +db %00001101 db %00000010 db BANK(PersianPicFront) diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm index aa5635d52..5018093df 100755 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -24,6 +24,6 @@ db %01000011 db %00001000 db %11000000 db %01000011 -db %00001100 +db %00001000 db %00001010 db BANK(PidgeotPicFront) diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm index 9247d2cb2..4c2b239bb 100755 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %01000011 -db %00001100 +db %00001000 db %00001010 db BANK(PidgeottoPicFront) diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm index bbb3b81ab..0748047b4 100755 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %01000011 -db %00001100 +db %00001000 db %00001010 db BANK(PidgeyPicFront) diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index 398fbc8a7..bab53fbd6 100755 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -23,7 +23,7 @@ db %10100100 db %01000011 db %00001101 db %11000000 -db %00000010 +db %00001010 db %00001000 db %00100110 db BANK(PinsirPicFront) diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index 6db4efda0..6d40ef541 100755 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %00001111 db %11010110 -db %10000110 +db %10001110 db %00101000 db %00110010 db BANK(PoliwrathPicFront) diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index ff58c4695..d86e7f7f2 100755 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -23,7 +23,7 @@ db %11100000 db %00000011 db %00001000 db %11000000 -db %11100011 +db %11110011 db %00001000 db %00000010 db BANK(PonytaPicFront) diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index b2ab0f8d3..fc3af79ad 100755 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -24,6 +24,6 @@ db %01110011 db %10001000 db %11110001 db %11000011 -db %00111000 +db %00111001 db %01000011 db BANK(PorygonPicFront) diff --git a/data/baseStats/porygon2.asm b/data/baseStats/porygon2.asm index 64eccbbbd..007274515 100755 --- a/data/baseStats/porygon2.asm +++ b/data/baseStats/porygon2.asm @@ -24,6 +24,6 @@ db %01110011 db %10001000 db %11110001 db %11000011 -db %00111000 +db %00111001 db %01000011 db BANK(Porygon2PicFront) diff --git a/data/baseStats/porygonz.asm b/data/baseStats/porygonz.asm index 89fd5ec3d..b4327116e 100755 --- a/data/baseStats/porygonz.asm +++ b/data/baseStats/porygonz.asm @@ -24,6 +24,6 @@ db %01110011 db %10001000 db %11110001 db %11000011 -db %00111000 +db %00111101 db %01000011 db BANK(PorygonZPicFront) diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index 9c9756263..0598f230c 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -14,21 +14,16 @@ 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 db %10110001 db %11000011 db %10001111 db %11001001 -db %11000110 +db %11001110 db %10001000 db %00100010 db BANK(PrimeapePicFront) diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index 0533562fe..5f6c1aa59 100755 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -23,7 +23,7 @@ db %11100000 db %01000011 db %00001000 db %11000000 -db %11100011 +db %11110011 db %00001000 db %00000010 db BANK(RapidashPicFront) diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm index c919b6d07..48247d29b 100755 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -24,6 +24,6 @@ db %01111111 db %10001000 db %11001001 db %11000010 -db %00001000 +db %00001001 db %00000010 db BANK(RaticatePicFront) diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm index 0eceb27fd..e5e0d523e 100755 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -24,6 +24,6 @@ db %00101111 db %10001000 db %11001001 db %11000010 -db %00001000 +db %00001001 db %00000010 db BANK(RattataPicFront) diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index a6dba6a19..0cb8c8fa8 100755 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -23,7 +23,7 @@ db %11110001 db %11111111 db %10001111 db %11001111 -db %10100010 +db %10111010 db %10001000 db %00110010 db BANK(RhydonPicFront) diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index fa2014224..84def298b 100755 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -23,7 +23,7 @@ db %11100000 db %00000011 db %10001000 db %11001111 -db %10100010 +db %10111010 db %10001000 db %00100010 db BANK(RhyhornPicFront) diff --git a/data/baseStats/rhyperior.asm b/data/baseStats/rhyperior.asm index 3b08b0031..40e6d4630 100755 --- a/data/baseStats/rhyperior.asm +++ b/data/baseStats/rhyperior.asm @@ -23,7 +23,7 @@ db %11110001 db %11111111 db %10001111 db %11001111 -db %10100010 +db %10111010 db %10001000 db %00110010 db BANK(RhyperiorPicFront) diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm index cb10899b5..fa305f5ac 100755 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -23,7 +23,7 @@ db %10100100 db %00000011 db %00001101 db %11001110 -db %11000010 +db %11001010 db %10001000 db %00100110 db BANK(SandshrewPicFront) diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm index 2c6e7257b..98fc09e28 100755 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -23,7 +23,7 @@ db %10100100 db %01000011 db %00001101 db %11001110 -db %11000010 +db %11001010 db %10001000 db %00100110 db BANK(SandslashPicFront) diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index f37b690d8..025901917 100755 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -23,7 +23,7 @@ db %00100000 db %01111111 db %00001000 db %11000000 -db %11000010 +db %11010010 db %00001000 db %00010010 db BANK(SeadraPicFront) diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index bc307920e..9aab3f66c 100755 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -23,7 +23,7 @@ db %00100000 db %00111111 db %00001000 db %11100000 -db %01001011 +db %01000011 db %01001000 db %00010011 db BANK(ShellderPicFront) diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index 3ae38bc28..bc9c3769d 100755 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -23,7 +23,7 @@ db %10110001 db %11111111 db %00001111 db %11111110 -db %11100011 -db %00111000 +db %11110011 +db %00111001 db %01110011 db BANK(SlowbroPicFront) diff --git a/data/baseStats/slowking.asm b/data/baseStats/slowking.asm index e91e08f1b..417e4da2a 100755 --- a/data/baseStats/slowking.asm +++ b/data/baseStats/slowking.asm @@ -23,7 +23,7 @@ db %10110001 db %11111111 db %00001111 db %11111110 -db %11100011 -db %00111000 +db %11110011 +db %00111001 db %01110011 db BANK(SlowkingPicFront) diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index 10dba7864..8713c54b5 100755 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -23,7 +23,7 @@ db %10100000 db %10111111 db %00001000 db %11111110 -db %11100011 -db %00111000 +db %11110011 +db %00111001 db %01110011 db BANK(SlowpokePicFront) diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index b7d78b9ca..b5ea95a38 100755 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -23,7 +23,7 @@ db %10110001 db %11111111 db %10101111 db %11010111 -db %10101111 -db %10101000 +db %10110111 +db %10101001 db %00110010 db BANK(SnorlaxPicFront) diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm index f51e68ea4..fd1fee9ab 100755 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11000000 db %01000010 -db %00001100 +db %00001000 db %00001010 db BANK(SpearowPicFront) diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm index af4a940bc..e9087e559 100755 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %00001111 db %11001000 -db %10000011 +db %10001011 db %00001000 db %00110010 db BANK(SquirtlePicFront) diff --git a/data/baseStats/steelix.asm b/data/baseStats/steelix.asm index 059728314..50f769296 100755 --- a/data/baseStats/steelix.asm +++ b/data/baseStats/steelix.asm @@ -24,6 +24,6 @@ db %00000011 db %00001000 db %11001110 db %10001010 -db %11001000 +db %11001100 db %00100010 db BANK(SteelixPicFront) diff --git a/data/baseStats/sylveon.asm b/data/baseStats/sylveon.asm index d56ec8acd..842e62c3e 100755 --- a/data/baseStats/sylveon.asm +++ b/data/baseStats/sylveon.asm @@ -24,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001001 db %00010010 db BANK(SylveonPicFront) diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 69c83d786..3c0718c58 100755 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -23,7 +23,7 @@ db %11100000 db %01110011 db %10001000 db %11000111 -db %10100010 +db %10111010 db %00001000 db %00100010 db BANK(TaurosPicFront) diff --git a/data/baseStats/togekiss.asm b/data/baseStats/togekiss.asm index 1248bd228..88e74b1a4 100755 --- a/data/baseStats/togekiss.asm +++ b/data/baseStats/togekiss.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %10101111 db %11110001 -db %10100111 -db %00111000 +db %10110111 +db %00111001 db %01100011 db BANK(TogekissPicFront) diff --git a/data/baseStats/togepi.asm b/data/baseStats/togepi.asm index 43d07cc8e..5abae0a66 100755 --- a/data/baseStats/togepi.asm +++ b/data/baseStats/togepi.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %10101111 db %11110001 -db %10100111 -db %00111000 +db %10110111 +db %00111001 db %01100011 db BANK(TogepiPicFront) diff --git a/data/baseStats/togetic.asm b/data/baseStats/togetic.asm index baee66b1b..73478ba12 100755 --- a/data/baseStats/togetic.asm +++ b/data/baseStats/togetic.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %10101111 db %11110001 -db %10100111 -db %00111000 +db %10110111 +db %00111001 db %01100011 db BANK(TogeticPicFront) diff --git a/data/baseStats/umbreon.asm b/data/baseStats/umbreon.asm index e8d92d1f6..655ff1210 100755 --- a/data/baseStats/umbreon.asm +++ b/data/baseStats/umbreon.asm @@ -24,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001101 db %00010010 db BANK(UmbreonPicFront) diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 0003c81b5..147ce40e8 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -14,11 +14,7 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db QUICK_ATTACK db WATER_GUN db 0 ; growth rate @@ -28,6 +24,6 @@ db %01111111 db %00001000 db %11000000 db %11000011 -db %00001000 +db %00001001 db %00010010 db BANK(VaporeonPicFront) diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index 48c9178c9..9bce7fe71 100755 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -23,7 +23,7 @@ db %00100000 db %00000001 db %10001000 db %11100001 -db %01001011 +db %01000011 db %01011000 db %01000010 db BANK(VoltorbPicFront) diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm index 1a9f768d3..290de9594 100755 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -23,7 +23,7 @@ db %10100000 db %00000011 db %00001000 db %11001000 -db %11100011 -db %00001000 +db %11110011 +db %00001101 db %00000010 db BANK(VulpixPicFront) diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm index 6619a07fc..2fb76e6bd 100755 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -23,7 +23,7 @@ db %10110001 db %00111111 db %00001111 db %11001000 -db %10000011 +db %10001011 db %00001000 db %00110010 db BANK(WartortlePicFront) diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index a119f8995..9fc8b6912 100755 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -23,7 +23,7 @@ db %00100000 db %01000000 db %10001000 db %11000001 -db %00101010 -db %01001000 +db %00100010 +db %01001101 db %00000010 db BANK(WeezingPicFront) diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm index 848b2aac2..a13694811 100755 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -23,7 +23,7 @@ db %10110001 db %01111111 db %10101111 db %11110001 -db %10100011 -db %00111000 +db %10110011 +db %00111001 db %01100011 db BANK(WigglytuffPicFront) diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index b93cd2304..e10191439 100755 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -24,6 +24,6 @@ db %01000011 db %10001000 db %11000001 db %01000011 -db %00011100 +db %00011000 db %01001010 db BANK(ZapdosPicFront) diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm index b9b5c0e6d..77bb9b313 100755 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -24,6 +24,6 @@ db %00000011 db %00011000 db %11000000 db %01000010 -db %00001000 +db %00001001 db %00000010 db BANK(ZubatPicFront) diff --git a/data/tms.asm b/data/tms.asm index 9d52fed8c..b6e3ef140 100755 --- a/data/tms.asm +++ b/data/tms.asm @@ -34,7 +34,7 @@ TechnicalMachines: ; 13773 (4:7773) db REFLECT db HEADBUTT db METRONOME - db SELFDESTRUCT + db ROCK_TOMB db FLAMETHROWER db FIRE_BLAST db SWIFT