summaryrefslogtreecommitdiff
path: root/data/baseStats/kadabra.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/baseStats/kadabra.asm')
-rw-r--r--[-rwxr-xr-x]data/baseStats/kadabra.asm24
1 files changed, 9 insertions, 15 deletions
diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
index 85ee8a35..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,21 +13,16 @@ 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
-db %10110001
-db %00000011
-db %00001111
-db %11111000
-db %10000111
-db %00111000
-db %01000011
+ tmlearn 1,5,6,8
+ tmlearn 9,10
+ tmlearn 17,18,19,20
+ tmlearn 28,29,30,31,32
+ tmlearn 33,34,35,40
+ tmlearn 44,45,46
+ tmlearn 49,50,55
db 0 ; padding