aboutsummaryrefslogtreecommitdiffstats
path: root/data/pokemon/base_stats/shellder.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/shellder.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/shellder.asm')
-rw-r--r--data/pokemon/base_stats/shellder.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index ed8cc154..b52f7cb4 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -7,16 +7,16 @@
db 190 ; catch rate
db 97 ; base exp
- INCBIN "gfx/pokemon/front_yellow/shellder.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/shellder.pic", 0, 1 ; sprite dimensions
dw ShellderPicFront, ShellderPicBack
db TACKLE, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
- tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
- ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \
- DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \
+ tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
+ ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \
+ DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \
REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF
; end