aboutsummaryrefslogtreecommitdiffstats
path: root/data/pokemon/base_stats/psyduck.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/psyduck.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/psyduck.asm')
-rw-r--r--data/pokemon/base_stats/psyduck.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 1f6c4437..b3fb9f41 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -7,17 +7,17 @@
db 190 ; catch rate
db 80 ; base exp
- INCBIN "gfx/pokemon/front_yellow/psyduck.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions
dw PsyduckPicFront, PsyduckPicBack
db SCRATCH, NO_MOVE, 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, \
- PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
- DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \
+ tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
+ DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
+ PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
+ DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \
SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH
; end