From 02e6e3765eb81beb2c8a518f37fdd93f6e1da170 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 May 2014 20:06:21 -0400 Subject: [PATCH] Fix capitalization, remove white space, remove vicctreebel.asm --- data/baseStats/abra.asm | 2 +- data/baseStats/aerodactyl.asm | 2 +- data/baseStats/alakazam.asm | 2 +- data/baseStats/arcanine.asm | 2 +- data/baseStats/articuno.asm | 2 +- data/baseStats/bellsprout.asm | 2 +- data/baseStats/chansey.asm | 2 +- data/baseStats/cloyster.asm | 2 +- data/baseStats/cubone.asm | 2 +- data/baseStats/dewgong.asm | 2 +- data/baseStats/ditto.asm | 2 +- 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/eevee.asm | 2 +- data/baseStats/ekans.asm | 2 +- data/baseStats/electabuzz.asm | 2 +- data/baseStats/electrode.asm | 2 +- data/baseStats/exeggcute.asm | 2 +- data/baseStats/exeggutor.asm | 2 +- data/baseStats/farfetchd.asm | 2 +- data/baseStats/flareon.asm | 2 +- data/baseStats/gastly.asm | 2 +- data/baseStats/gengar.asm | 2 +- data/baseStats/geodude.asm | 2 +- data/baseStats/goldeen.asm | 2 +- data/baseStats/golem.asm | 2 +- data/baseStats/graveler.asm | 2 +- data/baseStats/grimer.asm | 2 +- data/baseStats/growlithe.asm | 2 +- data/baseStats/gyarados.asm | 2 +- data/baseStats/haunter.asm | 2 +- data/baseStats/hitmonchan.asm | 2 +- data/baseStats/hitmonlee.asm | 2 +- data/baseStats/horsea.asm | 2 +- data/baseStats/hypno.asm | 2 +- data/baseStats/jolteon.asm | 2 +- data/baseStats/jynx.asm | 2 +- data/baseStats/kabuto.asm | 2 +- data/baseStats/kabutops.asm | 2 +- data/baseStats/kadabra.asm | 2 +- data/baseStats/kangaskhan.asm | 2 +- data/baseStats/kingler.asm | 2 +- data/baseStats/koffing.asm | 2 +- data/baseStats/krabby.asm | 2 +- data/baseStats/lapras.asm | 2 +- data/baseStats/lickitung.asm | 2 +- data/baseStats/machamp.asm | 2 +- data/baseStats/machoke.asm | 2 +- data/baseStats/machop.asm | 2 +- data/baseStats/magikarp.asm | 2 +- data/baseStats/magmar.asm | 2 +- data/baseStats/magnemite.asm | 2 +- data/baseStats/magneton.asm | 2 +- data/baseStats/mankey.asm | 2 +- data/baseStats/marowak.asm | 2 +- data/baseStats/meowth.asm | 2 +- data/baseStats/mewtwo.asm | 2 +- data/baseStats/moltres.asm | 2 +- data/baseStats/mrmime.asm | 2 +- data/baseStats/muk.asm | 2 +- data/baseStats/omanyte.asm | 2 +- data/baseStats/omastar.asm | 2 +- data/baseStats/onix.asm | 2 +- data/baseStats/pinsir.asm | 2 +- data/baseStats/poliwag.asm | 2 +- data/baseStats/poliwhirl.asm | 2 +- data/baseStats/poliwrath.asm | 2 +- data/baseStats/ponyta.asm | 2 +- data/baseStats/porygon.asm | 2 +- data/baseStats/primeape.asm | 2 +- data/baseStats/psyduck.asm | 2 +- data/baseStats/rapidash.asm | 2 +- data/baseStats/rhydon.asm | 2 +- data/baseStats/rhyhorn.asm | 2 +- data/baseStats/scyther.asm | 2 +- data/baseStats/seadra.asm | 2 +- data/baseStats/seaking.asm | 2 +- data/baseStats/seel.asm | 2 +- data/baseStats/shellder.asm | 2 +- data/baseStats/slowbro.asm | 2 +- data/baseStats/slowpoke.asm | 2 +- data/baseStats/snorlax.asm | 2 +- data/baseStats/starmie.asm | 2 +- data/baseStats/staryu.asm | 2 +- data/baseStats/tangela.asm | 2 +- data/baseStats/tauros.asm | 2 +- data/baseStats/tentacool.asm | 2 +- data/baseStats/tentacruel.asm | 2 +- data/baseStats/vaporeon.asm | 2 +- data/baseStats/vicctreebel.asm | 29 ----------------------------- data/baseStats/victreebel.asm | 2 +- data/baseStats/voltorb.asm | 2 +- data/baseStats/weepinbell.asm | 2 +- data/baseStats/weezing.asm | 2 +- data/baseStats/zapdos.asm | 2 +- data/base_stats.asm | 6 +++--- 100 files changed, 101 insertions(+), 130 deletions(-) delete mode 100755 data/baseStats/vicctreebel.asm diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index 4aceb5a8f..a5acd0bf1 100755 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -26,4 +26,4 @@ db %11110000 db %10000111 db %00111000 db %01000011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 72e4def12..9c11ed3e8 100755 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -26,4 +26,4 @@ db %11000000 db %01100011 db %00001100 db %00001010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 67efbf502..55a5e8211 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -32,4 +32,4 @@ db %11111000 db %10000111 db %00111000 db %01000011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 6ee9b1952..f96327789 100755 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -26,4 +26,4 @@ db %11101000 db %11100011 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index 749c99d19..e9d7318b8 100755 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -26,4 +26,4 @@ db %11000000 db %01000011 db %00001100 db %00001010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm index 5393c1c92..335c9ff13 100755 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -26,4 +26,4 @@ db %11000000 db %00000011 db %00001000 db %00000110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index eceb5491b..93cb1b4ae 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -31,4 +31,4 @@ db %11110001 db %10110111 db %00111001 db %01100011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index c32af3dc4..0b70c8de3 100755 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -26,4 +26,4 @@ db %11100000 db %01001011 db %01001000 db %00010011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index 0a9f0ecea..3ae28ee24 100755 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -26,4 +26,4 @@ db %11001110 db %10100010 db %00001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm index 3558b34c1..7dd2adbf0 100755 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -26,4 +26,4 @@ db %11000000 db %10000010 db %00001000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm index f377a3733..c607cdc7e 100755 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -26,4 +26,4 @@ db %00000000 db %00000000 db %00000000 db %00000000 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index fd1041968..53e386825 100755 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -26,4 +26,4 @@ db %11000000 db %10000011 db %00001100 db %00001011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index 239214a71..430b4162c 100755 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -26,4 +26,4 @@ db %11000000 db %10000011 db %00001100 db %00001011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index 92380dce9..7d9ad6300 100755 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -26,4 +26,4 @@ db %11000001 db %11100011 db %00011000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index 7a68d1297..769f9ab40 100755 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -26,4 +26,4 @@ db %11000001 db %11100011 db %00011000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index f3f66803d..0c890b2cd 100755 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -26,4 +26,4 @@ db %11000001 db %11100011 db %00011000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index 14c1aca19..10c3283b2 100755 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -26,4 +26,4 @@ db %11110000 db %10000111 db %00111010 db %01000011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 9f5935ef6..60fb6e583 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -31,4 +31,4 @@ db %11000000 db %11000011 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index 00bdcb259..45eae0d06 100755 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -26,4 +26,4 @@ db %11001110 db %10000010 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm index 340e0eb08..32fa0316d 100755 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -26,4 +26,4 @@ db %11110001 db %11000111 db %00111000 db %01100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index 3e7386922..3d2842c15 100755 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -26,4 +26,4 @@ db %11100001 db %11001011 db %01011000 db %01000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index aba88c7fe..6d7315712 100755 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -26,4 +26,4 @@ db %11110000 db %00011011 db %01101000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index 4e2820c26..98c629cd5 100755 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -26,4 +26,4 @@ db %11110000 db %00011011 db %01101000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index ee9770a87..22eeab6b9 100755 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -26,4 +26,4 @@ db %11000000 db %11000011 db %00001000 db %00001110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index 91a4b9554..cedc0ac37 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -31,4 +31,4 @@ db %11000000 db %11100011 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index f60d7f6d6..fddd51506 100755 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -26,4 +26,4 @@ db %11010001 db %00001010 db %01101010 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index 905fdc19b..9ab1eb9df 100755 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -26,4 +26,4 @@ db %11010001 db %10001110 db %01101010 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index a07fca426..fff0b4df9 100755 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -26,4 +26,4 @@ db %11001110 db %00101110 db %11001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm index 87401de1a..f00550688 100755 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -26,4 +26,4 @@ db %11000000 db %11000010 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index 0cfc10777..3a23f63f4 100755 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -26,4 +26,4 @@ db %11001110 db %00101110 db %11001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index c3e2b03fb..f4eab9269 100755 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -26,4 +26,4 @@ db %11001110 db %00101110 db %11001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index dcfda99d7..4c7871a83 100755 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -26,4 +26,4 @@ db %11000001 db %00101010 db %01001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index 715b0f73d..ddfd86fef 100755 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -26,4 +26,4 @@ db %11001000 db %11100011 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 0c74a43b7..5223b32a9 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -34,4 +34,4 @@ db %11000001 db %10100011 db %00001000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index ef46ea399..a35e1134b 100755 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -26,4 +26,4 @@ db %11010001 db %00001010 db %01101010 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index 25026ed4d..1acce4fe6 100755 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -26,4 +26,4 @@ db %11000000 db %11000110 db %00001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index 11c695086..3f96dadde 100755 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -26,4 +26,4 @@ db %11000000 db %11000110 db %00001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm index 22d0824cf..b53b92c14 100755 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -26,4 +26,4 @@ db %11000000 db %11000010 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 269656d87..0e4ff33f2 100755 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -26,4 +26,4 @@ db %11110000 db %10000111 db %00111010 db %01000011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index 6cf004e33..fd077d137 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -31,4 +31,4 @@ db %11000001 db %11000011 db %00011000 db %01000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index a6fe671ef..1b31bfa69 100755 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -26,4 +26,4 @@ db %11110000 db %10000111 db %00101000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 74f7539cb..380c3f8b6 100755 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -26,4 +26,4 @@ db %11000000 db %00000011 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index 7cf7ccb1f..a0ec27cc4 100755 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -26,4 +26,4 @@ db %11000000 db %10000011 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index eecfb266c..9ae3e47af 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -32,4 +32,4 @@ db %11111000 db %10000111 db %00111000 db %01000011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index 7bc066f43..4424107d7 100755 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -26,4 +26,4 @@ db %11000111 db %10100010 db %10001000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index 8d4d7c565..a3ce6f5b3 100755 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -26,4 +26,4 @@ db %11000000 db %00000010 db %00001000 db %00110110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index 7f86c2eff..0976b55a5 100755 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -26,4 +26,4 @@ db %11000001 db %00101010 db %01001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 64ce47a00..a6090a150 100755 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -26,4 +26,4 @@ db %11000000 db %00000010 db %00001000 db %00110110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm index 1dfc3f7bc..28d1302ce 100755 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -26,4 +26,4 @@ db %11010001 db %10000011 db %00101000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index 810936eed..abfb94a62 100755 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -26,4 +26,4 @@ db %11000111 db %10100010 db %00001000 db %00110110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index 9d105d0b5..0ccb8615e 100755 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -26,4 +26,4 @@ db %11001110 db %10100110 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index 4fd975671..b631bdf65 100755 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -26,4 +26,4 @@ db %11001110 db %10100110 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index 2b9250f12..ef0bdbe2a 100755 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -26,4 +26,4 @@ db %11001110 db %10100110 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm index a8a0ee136..9c1221d6a 100755 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -26,4 +26,4 @@ db %00000000 db %00000000 db %00000000 db %00000000 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index 915ed593e..fcaf24692 100755 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -26,4 +26,4 @@ db %11110000 db %10100110 db %00101000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm index d6f5d8029..2bd8817b6 100755 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -26,4 +26,4 @@ db %11100001 db %01000011 db %00011000 db %01000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm index 4cc2ad791..ed8f93fdd 100755 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -26,4 +26,4 @@ db %11100001 db %01000011 db %00011000 db %01000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 6177c52fd..c93f3c398 100755 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -26,4 +26,4 @@ db %11001001 db %11000110 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 6a2093611..be8930ae8 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -33,4 +33,4 @@ db %11001110 db %10100010 db %00001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index 89ccdf2f2..98b890a3a 100755 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -26,4 +26,4 @@ db %11000001 db %11000010 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index a5ddc9586..04d06e3d3 100755 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -26,4 +26,4 @@ db %11110001 db %10101111 db %00111000 db %01100011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index 85699f6e2..38beec71f 100755 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -26,4 +26,4 @@ db %11000000 db %01100011 db %00001100 db %00001010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index 8d3d8bd7c..d86fc002f 100755 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -26,4 +26,4 @@ db %11110001 db %10000111 db %00111000 db %01000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index 79c1e1be7..1b2843381 100755 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -26,4 +26,4 @@ db %11000001 db %00101010 db %01001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index 49deceeb8..a95ba1b7f 100755 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -26,4 +26,4 @@ db %11000000 db %00000011 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index d1462ac3d..0dc00a590 100755 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -26,4 +26,4 @@ db %11000000 db %10000011 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm index 2fd6d6d26..984fc53b1 100755 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -26,4 +26,4 @@ db %11001110 db %10001010 db %11001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index 1e57fcc4a..3eec99167 100755 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -26,4 +26,4 @@ db %11000000 db %00000010 db %00001000 db %00100110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm index 3d1e95348..307e20091 100755 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -26,4 +26,4 @@ db %11010000 db %10000010 db %00101000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm index 1b9cc03d8..953eea655 100755 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -26,4 +26,4 @@ db %11010110 db %10000110 db %00101000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index 3a8912090..369191251 100755 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -26,4 +26,4 @@ db %11010110 db %10000110 db %00101000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index 2b99f4b13..b791a349f 100755 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -26,4 +26,4 @@ db %11000000 db %11100011 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index 37a251747..14a1c4463 100755 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -26,4 +26,4 @@ db %11110001 db %11000011 db %00111000 db %01000011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index ea649a6f5..492fe8cad 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -31,4 +31,4 @@ db %11001001 db %11000110 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm index 921fd7e86..6ec1bd9f1 100755 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -26,4 +26,4 @@ db %11001000 db %11000010 db %00001000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index 7d6064ab8..c3fb4168e 100755 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -26,4 +26,4 @@ db %11000000 db %11100011 db %00001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index 4a867c05e..dd0e93834 100755 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -26,4 +26,4 @@ db %11001111 db %10100010 db %10001000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index 5ae2a56bf..8939e8521 100755 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -26,4 +26,4 @@ db %11001111 db %10100010 db %10001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm index a2f1cc730..ff7e9d29c 100755 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -26,4 +26,4 @@ db %11000000 db %11000010 db %00001000 db %00000110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index a824bde9e..1ba762c22 100755 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -26,4 +26,4 @@ db %11000000 db %11000010 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm index 0b0d40dc0..385ed0883 100755 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -26,4 +26,4 @@ db %11000000 db %11000010 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm index d721d2467..d448eaca4 100755 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -26,4 +26,4 @@ db %11000000 db %10000010 db %00001000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index 085674b3b..6a53479ed 100755 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -26,4 +26,4 @@ db %11100000 db %01001011 db %01001000 db %00010011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index 37e445a29..c8687d7ea 100755 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -26,4 +26,4 @@ db %11111110 db %11100011 db %00111000 db %01110011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index 61755e540..29eccdf3c 100755 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -26,4 +26,4 @@ db %11111110 db %11100011 db %00111000 db %01110011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index c3f0a9289..427ba99da 100755 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -26,4 +26,4 @@ db %11010111 db %10101111 db %10101000 db %00110010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm index f20bebb61..dbe27ac08 100755 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -26,4 +26,4 @@ db %11110001 db %11000011 db %00111000 db %01010011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm index e0208fc5c..043a86ad2 100755 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -26,4 +26,4 @@ db %11110001 db %11000011 db %00111000 db %01010011 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm index d140fe5a6..41af97aa5 100755 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -26,4 +26,4 @@ db %11000000 db %10000010 db %00001000 db %00000110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 6d6841cf2..47a70dab8 100755 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -26,4 +26,4 @@ db %11000111 db %10100010 db %00001000 db %00100010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm index 0bb1ff933..6d81f5ad7 100755 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -26,4 +26,4 @@ db %11000000 db %10000011 db %00001000 db %00010110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm index 25dff7147..13f49a8b2 100755 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -26,4 +26,4 @@ db %11000000 db %10000011 db %00001000 db %00010110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index f03808fe4..eca2309be 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -31,4 +31,4 @@ db %11000000 db %11000011 db %00001000 db %00010010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/vicctreebel.asm b/data/baseStats/vicctreebel.asm deleted file mode 100755 index 98e40bb1e..000000000 --- a/data/baseStats/vicctreebel.asm +++ /dev/null @@ -1,29 +0,0 @@ - BaseStats: ; 38b86 (e:4b86) -db DEX_ ; pokedex id -db 80 ; base hp -db 105 ; base attack -db 65 ; base defense -db 70 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 191 ; base exp yield -db $77 ; sprite dimensions -dw PicFront -dw PicBack -; attacks known at lvl 0 -db SLEEP_POWDER -db STUN_SPORE -db ACID -db RAZOR_LEAF -db 3 ; growth rate -; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 -db 0 ; padding diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index 39051f4f3..807dde1cf 100755 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -26,4 +26,4 @@ db %11000000 db %00000011 db %00001000 db %00000110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index 33cf8fe55..fed28364b 100755 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -26,4 +26,4 @@ db %11100001 db %01001011 db %01011000 db %01000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm index 522635052..e3e6bab13 100755 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -26,4 +26,4 @@ db %11000000 db %00000011 db %00001000 db %00000110 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index 72c373403..cc7f18d15 100755 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -26,4 +26,4 @@ db %11000001 db %00101010 db %01001000 db %00000010 -db 0 ; padding +db 0 ; padding diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index 32cc0fa68..26e3f14c9 100755 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -26,4 +26,4 @@ db %11000001 db %01000011 db %00011100 db %01001010 -db 0 ; padding +db 0 ; padding diff --git a/data/base_stats.asm b/data/base_stats.asm index 562f7c295..d7d265332 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -26,10 +26,10 @@ INCLUDE "data/baseStats/pikachu.asm" INCLUDE "data/baseStats/raichu.asm" INCLUDE "data/baseStats/sandshrew.asm" INCLUDE "data/baseStats/sandslash.asm" -INCLUDE "data/baseStats/nidoranF.asm" +INCLUDE "data/baseStats/nidoranf.asm" INCLUDE "data/baseStats/nidorina.asm" INCLUDE "data/baseStats/nidoqueen.asm" -INCLUDE "data/baseStats/nidoranM.asm" +INCLUDE "data/baseStats/nidoranm.asm" INCLUDE "data/baseStats/nidorino.asm" INCLUDE "data/baseStats/nidoking.asm" INCLUDE "data/baseStats/clefairy.asm" @@ -119,7 +119,7 @@ INCLUDE "data/baseStats/goldeen.asm" INCLUDE "data/baseStats/seaking.asm" INCLUDE "data/baseStats/staryu.asm" INCLUDE "data/baseStats/starmie.asm" -INCLUDE "data/baseStats/mrMime.asm" +INCLUDE "data/baseStats/mrmime.asm" INCLUDE "data/baseStats/scyther.asm" INCLUDE "data/baseStats/jynx.asm" INCLUDE "data/baseStats/electabuzz.asm"