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/map.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/map.asm')
| -rw-r--r-- | home/map.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/home/map.asm b/home/map.asm index 83b5adf11..1e409f0fc 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1241,10 +1241,10 @@ ScrollMapUp:: ; 2748 ld h, a ld bc, $0200 add hl, bc -; cap d at HIGH(VBGMap0) +; cap d at HIGH(vBGMap0) ld a, h and %00000011 - or HIGH(VBGMap0) + or HIGH(vBGMap0) ld e, l ld d, a call UpdateBGMapRow @@ -1369,10 +1369,10 @@ UpdateBGMapColumn:: ; 27f8 ld e, a jr nc, .skip inc d -; cap d at HIGH(VBGMap0) +; cap d at HIGH(vBGMap0) ld a, d and $3 - or HIGH(VBGMap0) + or HIGH(vBGMap0) ld d, a .skip @@ -1409,7 +1409,7 @@ LoadTilesetGFX:: ; 2821 call FarDecompress ld hl, wDecompressScratch - ld de, VTiles2 + ld de, vTiles2 ld bc, $60 tiles call CopyBytes @@ -1419,7 +1419,7 @@ LoadTilesetGFX:: ; 2821 ld [rVBK], a ld hl, wDecompressScratch + $60 tiles - ld de, VTiles2 + ld de, vTiles2 ld bc, $60 tiles call CopyBytes @@ -2305,7 +2305,7 @@ GetMapHeaderMusic:: ; 2cbd ret .radiotower - ld a, [StatusFlags2] + ld a, [wStatusFlags2] bit 0, a jr z, .clearedradiotower ld de, MUSIC_ROCKET_OVERTURE @@ -2320,7 +2320,7 @@ GetMapHeaderMusic:: ; 2cbd jr .done .mahoganymart - ld a, [StatusFlags2] + ld a, [wStatusFlags2] bit 7, a jr z, .clearedmahogany ld de, MUSIC_ROCKET_HIDEOUT |