summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/load_map_part.asm6
-rw-r--r--engine/overworld/warp_connection.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm
index 2184ebf7e..9eeef7259 100644
--- a/engine/overworld/load_map_part.asm
+++ b/engine/overworld/load_map_part.asm
@@ -1,9 +1,9 @@
_LoadMapPart:: ; 4d15b
- ld hl, wMisc
+ ld hl, wSurroundingTiles
ld a, [wMetatileStandingY]
and a
jr z, .top_row
- ld bc, WMISC_WIDTH * 2
+ ld bc, SURROUNDING_WIDTH * 2
add hl, bc
.top_row
@@ -25,7 +25,7 @@ _LoadMapPart:: ; 4d15b
dec c
jr nz, .loop2
ld a, l
- add 4
+ add METATILE_WIDTH
ld l, a
jr nc, .carry
inc h
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index 069b72234..2f5e488cc 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -392,7 +392,7 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820)
GetCoordOfUpperLeftCorner:: ; 10486d
- ld hl, wOverworldMap
+ ld hl, wOverworldMapBlocks
ld a, [wXCoord]
bit 0, a
jr nz, .increment_then_halve1