summaryrefslogtreecommitdiff
path: root/data/baseStats/flareon.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/flareon.asm
parent93fe3064750c2b4ae6c243dafd9702c7248520c6 (diff)
parent38ea9cd829c51fbfd1e5e89e94c073ea1987948d (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/baseStats/flareon.asm')
-rw-r--r--[-rwxr-xr-x]data/baseStats/flareon.asm7
1 files changed, 1 insertions, 6 deletions
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