diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:02 -0500 |
| commit | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch) | |
| tree | ab357b894c9457b3d1d38fd49300df34412168f8 /data/pokemon/base_stats/charmander.asm | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| parent | Sync more with pokered (diff) | |
| download | pokeyellow-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/charmander.asm')
| -rw-r--r-- | data/pokemon/base_stats/charmander.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 4e3a7f59..acf364ed 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 65 ; base exp - INCBIN "gfx/pokemon/front_yellow/charmander.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions dw CharmanderPicFront, CharmanderPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end |