summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 22:24:38 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 22:24:38 -0400
commitc85ba78b778a0e35c2fe7f97ed4e8fee1b3c7036 (patch)
treef3d25ab52cbb2d1e92c89e1ad976dcb929c05768 /engine/overworld
parent9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 (diff)
Use more assertions to ensure correct code and data
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/map_object_action.asm3
-rw-r--r--engine/overworld/warp_connection.asm3
2 files changed, 4 insertions, 2 deletions
diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm
index 35de22030..5c68f6b0f 100644
--- a/engine/overworld/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
@@ -273,7 +273,8 @@ SetFacingBoulderDust:
and 2
ld a, FACING_BOULDER_DUST_1
jr z, .ok
- inc a ; FACING_BOULDER_DUST_2
+ inc a
+ assert FACING_BOULDER_DUST_1 + 1 == FACING_BOULDER_DUST_2
.ok
ld [hl], a
ret
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index 866480d5c..a74f2015f 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -175,7 +175,8 @@ EnterMapWarp:
; MOUNT_MOON_SQUARE and TIN_TOWER_ROOF are outdoor maps within indoor maps.
; Dig and Escape Rope should not take you to them.
ld a, [wPrevMapGroup]
- cp GROUP_MOUNT_MOON_SQUARE ; aka GROUP_TIN_TOWER_ROOF
+ cp GROUP_MOUNT_MOON_SQUARE
+ 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