aboutsummaryrefslogtreecommitdiffstats
path: root/data/baseStats/butterfree.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
commit31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch)
tree6941b2b38a2615223b30e8cceb7aab636768dabd /data/baseStats/butterfree.asm
parentSplit default names strings into separate lines to make it less unpleasant to... (diff)
parentFix typo: ninetails.asm -> ninetales.asm (diff)
downloadpokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/baseStats/butterfree.asm')
-rw-r--r--[-rwxr-xr-x]data/baseStats/butterfree.asm5
1 files changed, 0 insertions, 5 deletions
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