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 /home.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -574,11 +574,11 @@ CopyTilemapAtOnce:: ; 323d jr c, .wait di - ld a, BANK(VTiles3) + ld a, BANK(vTiles3) ld [rVBK], a hlcoord 0, 0, AttrMap call .StackPointerMagic - ld a, BANK(VTiles0) + ld a, BANK(vTiles0) ld [rVBK], a hlcoord 0, 0 call .StackPointerMagic @@ -597,7 +597,7 @@ CopyTilemapAtOnce:: ; 323d ; 327b .StackPointerMagic: ; 327b -; Copy all tiles to VBGMap +; Copy all tiles to vBGMap ld [hSPBuffer], sp ld sp, hl ld a, [hBGMapAddress + 1] @@ -1074,7 +1074,7 @@ _PrepMonFrontpic:: ; 378b jr c, .not_pokemon push hl - ld de, VTiles2 + ld de, vTiles2 predef GetMonFrontpic pop hl xor a |