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 /gfx/load_pics.asm | |
parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'gfx/load_pics.asm')
-rwxr-xr-x | gfx/load_pics.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index b8ddde182..1d685f1dd 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -132,7 +132,7 @@ GLOBAL PokemonPicPointers, UnownPicPointers ret GetAnimatedFrontpic: ; 51103 - ld a, BANK(VTiles3) + ld a, BANK(vTiles3) ld [rVBK], a push hl ld de, wDecompressScratch |