diff options
author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /engine/evolution_animation.asm | |
parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'engine/evolution_animation.asm')
-rwxr-xr-x | engine/evolution_animation.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 1fa55c10a..2e6e82e25 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -80,7 +80,7 @@ EvolutionAnimation: ; 4e5e1 jr c, .skip_cry ld a, [wEvolutionOldSpecies] - call PlayCry + call PlayMonCry .skip_cry ld de, MUSIC_EVOLUTION @@ -148,7 +148,7 @@ EvolutionAnimation: ; 4e5e1 ret c ld a, [PlayerHPPal] - call PlayCry + call PlayMonCry ret ; 4e703 @@ -168,7 +168,7 @@ EvolutionAnimation: ; 4e5e1 ld a, $1 ld [wBoxAlignment], a ld de, vTiles2 - predef GetAnimatedFrontpicPredef + predef GetAnimatedFrontpic xor a ld [wBoxAlignment], a ret @@ -346,15 +346,15 @@ EvolutionAnimation: ; 4e5e1 inc a and $7 ld b, a - ld hl, Sprites + 3 ; attributes - ld c, 40 + ld hl, Sprite01Attributes + ld c, NUM_SPRITE_OAM_STRUCTS .loop6 ld a, [hl] or b - ld [hli], a - inc hl - inc hl + ld [hli], a ; attributes +rept SPRITEOAMSTRUCT_LENGTH +- 1 inc hl +endr dec c jr nz, .loop6 pop bc |