summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-12-22 21:38:24 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-12-22 21:38:24 -0500
commit697093f7879ce1a45de8f26637f9758df885bbbf (patch)
treef8db91000ecd0ab46b407f86135d38998fe21e27
parent0b9bc28546f736d2e913adf5d41c8217c4280593 (diff)
Identify some overworld movement data
-rw-r--r--constants/map_object_constants.asm2
-rw-r--r--engine/events/overworld.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 4499b854..523e05b2 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 113c0fab..cee2ffbc 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1298,7 +1298,7 @@ TryRockSmashFromMenu:
call GetFacingObject
jr c, .no_rock
ld a, d
- cp $18
+ cp SPRITEMOVEDATA_SMASHABLE_ROCK
jr nz, .no_rock
ld hl, RockSmashFromMenuScript