aboutsummaryrefslogtreecommitdiffstats
path: root/data/pokemon/base_stats/voltorb.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/voltorb.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/voltorb.asm')
-rw-r--r--data/pokemon/base_stats/voltorb.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 6234d3a4..4ad65701 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -7,16 +7,16 @@
db 190 ; catch rate
db 103 ; base exp
- INCBIN "gfx/pokemon/front_yellow/voltorb.pic", 0, 1 ; sprite dimensions
+ INCBIN "gfx/pokemon/front/voltorb.pic", 0, 1 ; sprite dimensions
dw VoltorbPicFront, VoltorbPicBack
db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \
- TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
- SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \
+ tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \
+ TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
+ SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \
SUBSTITUTE, FLASH
; end