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/hypno.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/hypno.asm')
| -rw-r--r-- | data/pokemon/base_stats/hypno.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index b43cd961..760276db 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 165 ; base exp - INCBIN "gfx/pokemon/front_yellow/hypno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/hypno.pic", 0, 1 ; sprite dimensions dw HypnoPicFront, HypnoPicBack db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, METRONOME, SKULL_BASH, DREAM_EATER, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end |