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/sprites.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/sprites.asm')
| -rwxr-xr-x | engine/sprites.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/sprites.asm b/engine/sprites.asm index 4a33eb5cf..bee01414f 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -386,7 +386,7 @@ InitSpriteAnimBuffer: ; 8d0ec GetSpriteAnimVTile: ; 8d109 ; a = wSpriteAnimDict[a] if a in wSpriteAnimDict else 0 -; VTiles offset +; vTiles offset push hl push bc ld hl, wSpriteAnimDict @@ -631,7 +631,7 @@ AnimateEndOfExpBar: ; 8e79d ld de, SGBEndOfExpBarGFX .load - ld hl, VTiles0 tile $00 + ld hl, vTiles0 tile $00 lb bc, BANK(EndOfExpBarGFX), 1 call Request2bpp ld c, 8 |