diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 8cfc6b0a6..c6d90bd62 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -169,7 +169,7 @@ MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
 	const SPRITEMOVEDATA_SWIM_WANDER          ; 24
 NUM_SPRITEMOVEDATA EQU const_value
 
-; MapObjectMovementPattern.Pointers indexes (see engine/overworld/map_objects.asm)
+; StepFunction_FromMovement.Pointers indexes (see engine/overworld/map_objects.asm)
 	const_def
 	const SPRITEMOVEFN_00                    ; 00
 	const SPRITEMOVEFN_RANDOM_WALK_Y         ; 01
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index ec102744e..50190a02e 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1322,7 +1322,7 @@ TryRockSmashFromMenu:
 	call GetFacingObject
 	jr c, .no_rock
 	ld a, d
-	cp $18
+	cp SPRITEMOVEDATA_SMASHABLE_ROCK
 	jr nz, .no_rock
 
 	ld hl, RockSmashFromMenuScript