summaryrefslogtreecommitdiff
path: root/data/baseStats/kadabra.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-06 13:51:06 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-01 17:32:39 -0400
commit8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch)
tree08106f9eec9cff1137269c20ccf848cfeffa71c6 /data/baseStats/kadabra.asm
parent10af88ddd712415f2a0a2b6124187d51075c95d5 (diff)
Build only Yellow
Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm
Diffstat (limited to 'data/baseStats/kadabra.asm')
-rwxr-xr-xdata/baseStats/kadabra.asm9
1 files changed, 2 insertions, 7 deletions
diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
index 85ee8a35..8d3c855c 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 KINESIS
+db 0
db 0
db 3 ; growth rate
; learnset