summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-07-03 11:21:10 -0400
committerGitHub <noreply@github.com>2021-07-03 11:21:10 -0400
commitb4f66496ed99adb4922d7fc799530a898a6e1944 (patch)
treeb5cbb9c34a22dcae4a12595549b6d3e0f241b5c3 /asm/macros
parent56b69157ef77e651aadf38ef2a7df23033474aac (diff)
parent4206359862da51e3cc3d6b36ab0a3280c1123b9e (diff)
Merge pull request #1471 from GriffinRichards/fix-lock
Fix some object lock names
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/event.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 915fc7142..73aef33b5 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -813,12 +813,12 @@
.byte 0x68
.endm
- @ Ceases movement for all Objects on-screen.
+ @ Freezes all objects immediately except the player. The player is frozen once their movement is finished.
.macro lockall
.byte 0x69
.endm
- @ If the script was called by an Object, then that Object's movement will cease.
+ @ Freezes all objects immediately except the player and the selected object. The player and selected object are frozen once their movement is finished.
.macro lock
.byte 0x6a
.endm