diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/evolution_animation.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/evolution_animation.asm')
| -rwxr-xr-x | engine/evolution_animation.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index dd09f9eda..1fa55c10a 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -39,7 +39,7 @@ EvolutionAnimation: ; 4e5e1 farcall ClearSpriteAnims ld de, .GFX - ld hl, VTiles0 + ld hl, vTiles0 lb bc, BANK(.GFX), 8 call Request2bpp @@ -58,8 +58,8 @@ EvolutionAnimation: ; 4e5e1 ld [CurSpecies], a call .PlaceFrontpic - ld de, VTiles2 - ld hl, VTiles2 tile $31 + ld de, vTiles2 + ld hl, vTiles2 tile $31 ld bc, 7 * 7 call Request2bpp @@ -167,7 +167,7 @@ EvolutionAnimation: ; 4e5e1 call GetBaseData ld a, $1 ld [wBoxAlignment], a - ld de, VTiles2 + ld de, vTiles2 predef GetAnimatedFrontpicPredef xor a ld [wBoxAlignment], a |