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/lapras.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/lapras.asm')
| -rw-r--r-- | data/pokemon/base_stats/lapras.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index eb45e08c..5e31f7f5 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 219 ; base exp - INCBIN "gfx/pokemon/front_yellow/lapras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/lapras.pic", 0, 1 ; sprite dimensions dw LaprasPicFront, LaprasPicBack db WATER_GUN, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ STRENGTH ; end |