diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/evolution_animation.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/evolution_animation.asm')
| -rwxr-xr-x | engine/evolution_animation.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 173a31bf2..dd09f9eda 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -36,7 +36,7 @@ EvolutionAnimation: ; 4e5e1 ld de, MUSIC_NONE call PlayMusic - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, .GFX ld hl, VTiles0 @@ -106,7 +106,7 @@ EvolutionAnimation: ; 4e5e1 ld c, $0 call .GetSGBLayout call .PlayEvolvedSFX - callba ClearSpriteAnims + farcall ClearSpriteAnims call .check_statused jr c, .no_anim @@ -143,7 +143,7 @@ EvolutionAnimation: ; 4e5e1 ld c, $0 call .GetSGBLayout call .PlayEvolvedSFX - callba ClearSpriteAnims + farcall ClearSpriteAnims call .check_statused ret c @@ -168,7 +168,7 @@ EvolutionAnimation: ; 4e5e1 ld a, $1 ld [wBoxAlignment], a ld de, VTiles2 - predef FrontpicPredef + predef GetAnimatedFrontpicPredef xor a ld [wBoxAlignment], a ret @@ -263,7 +263,7 @@ EvolutionAnimation: ; 4e5e1 call GetPartyLocation ld b, h ld c, l - callba CheckFaintedFrzSlp + farcall CheckFaintedFrzSlp ret ; 4e7a6 @@ -337,7 +337,7 @@ EvolutionAnimation: ; 4e5e1 .AnimateBallsOfLight: ; 4e80c push bc - callab PlaySpriteAnimations + callfar PlaySpriteAnimations ; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES ld a, [hVBlankCounter] and %1110 |