summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-03-10 21:06:06 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-03-10 21:16:54 -0500
commitdbabd8b4a94014749a9c2a6f36ed524947c4403e (patch)
treea5b0868100d73df192381de9122cfe73689060b1 /engine/overworld
parent71073a5f3bcbf4f2725e16bdce147c070c8b833e (diff)
Define MAPGROUP_* constants and verify MapGroup_* table sizes
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/warp_connection.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index 0b87de722..eebbc91cf 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -176,14 +176,14 @@ EnterMapWarp:
; Dig and Escape Rope should not take you to them.
ld a, [wPrevMapGroup]
cp GROUP_MOUNT_MOON_SQUARE
+ jr nz, .not_mt_moon_square_or_tin_tower_roof
assert GROUP_MOUNT_MOON_SQUARE == GROUP_TIN_TOWER_ROOF
- jr nz, .not_mt_moon_or_tin_tower
ld a, [wPrevMapNumber]
cp MAP_MOUNT_MOON_SQUARE
ret z
cp MAP_TIN_TOWER_ROOF
ret z
-.not_mt_moon_or_tin_tower
+.not_mt_moon_square_or_tin_tower_roof
ld a, [wPrevWarp]
ld [wDigWarpNumber], a