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 /mobile/mobile_menu.asm | |
parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'mobile/mobile_menu.asm')
-rwxr-xr-x | mobile/mobile_menu.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 468d77fff..e36e779ae 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -628,7 +628,7 @@ Function4a449: ; 4a449 Function4a485: ; 4a485 (12:6485) ld de, GFX_49c0c - ld hl, VTiles2 tile $00 + ld hl, vTiles2 tile $00 lb bc, BANK(GFX_49c0c), 13 call Get2bpp ret |