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/routines/phonering_copytilemapatonce.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/routines/phonering_copytilemapatonce.asm')
-rw-r--r-- | engine/routines/phonering_copytilemapatonce.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/routines/phonering_copytilemapatonce.asm index 1780136d1..b1a726675 100644 --- a/engine/routines/phonering_copytilemapatonce.asm +++ b/engine/routines/phonering_copytilemapatonce.asm @@ -21,11 +21,11 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188 jr c, .wait di - ld a, BANK(VBGMap2) + ld a, BANK(vBGMap2) ld [rVBK], a hlcoord 0, 0, AttrMap call .CopyTilemapAtOnce - ld a, BANK(VBGMap0) + ld a, BANK(vBGMap0) ld [rVBK], a hlcoord 0, 0 call .CopyTilemapAtOnce |