summaryrefslogtreecommitdiff
path: root/engine/warp_connection.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-28 20:56:21 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-28 20:56:21 -0500
commit4c35f3ac8506e5f326658bbab91c257584f7b716 (patch)
tree980025fbbc41e001e260a65ed7c035dd6073e864 /engine/warp_connection.asm
parentbb005694b31b6a8cbaeefa8751ea72117e904e02 (diff)
parent82a05a1752b476caab8951fe03f539dcc1a63669 (diff)
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # macros/scripts/maps.asm
Diffstat (limited to 'engine/warp_connection.asm')
-rwxr-xr-xengine/warp_connection.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm
index ca0daae73..a0784caac 100755
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -233,9 +233,9 @@ LoadMapTimeOfDay: ; 104750
ret
.ClearBGMap: ; 104770 (41:4770)
- ld a, HIGH(VBGMap0)
+ ld a, HIGH(vBGMap0)
ld [wBGMapAnchor + 1], a
- xor a ; LOW(VBGMap0)
+ xor a ; LOW(vBGMap0)
ld [wBGMapAnchor], a
ld [hSCY], a
ld [hSCX], a
@@ -247,7 +247,7 @@ LoadMapTimeOfDay: ; 104750
ld [rVBK], a
xor a
- ld bc, VBGMap1 - VBGMap0
+ ld bc, vBGMap1 - vBGMap0
hlbgcoord 0, 0
call ByteFill
@@ -255,7 +255,7 @@ LoadMapTimeOfDay: ; 104750
ld [rVBK], a
ld a, "<BLACK>"
- ld bc, VBGMap1 - VBGMap0
+ ld bc, vBGMap1 - vBGMap0
hlbgcoord 0, 0
call ByteFill
ret