aboutsummaryrefslogtreecommitdiffstats
path: root/data/pokemon/base_stats/kangaskhan.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-11-05 23:50:02 -0500
committerGitHub <noreply@github.com>2020-11-05 23:50:02 -0500
commit5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch)
treeab357b894c9457b3d1d38fd49300df34412168f8 /data/pokemon/base_stats/kangaskhan.asm
parentMerge pull request #59 from Rangi42/master (diff)
parentSync more with pokered (diff)
downloadpokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz
pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz
pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'data/pokemon/base_stats/kangaskhan.asm')
-rw-r--r--data/pokemon/base_stats/kangaskhan.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 7d3cf971..ccd36041 100644
--- a/data/pokemon/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
@@ -7,18 +7,18 @@
db 45 ; catch rate
db 175 ; base exp
- INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/kangaskhan.pic", 0, 1 ; sprite dimensions
dw KangaskhanPicFront, KangaskhanPicBack
db COMET_PUNCH, RAGE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
- DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
- HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
- THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \
- DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \
+ tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
+ DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
+ HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
+ THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \
+ DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \
ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH
; end