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/grimer.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/grimer.asm')
| -rw-r--r-- | data/pokemon/base_stats/grimer.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index b2e0f08a..24e972ce 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 90 ; base exp - INCBIN "gfx/pokemon/front_yellow/grimer.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/grimer.pic", 0, 1 ; sprite dimensions dw GrimerPicFront, GrimerPicBack db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, RAGE, MEGA_DRAIN, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end |