diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-03 11:21:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-03 11:21:10 -0400 |
commit | b4f66496ed99adb4922d7fc799530a898a6e1944 (patch) | |
tree | b5cbb9c34a22dcae4a12595549b6d3e0f241b5c3 /src/event_object_lock.c | |
parent | 56b69157ef77e651aadf38ef2a7df23033474aac (diff) | |
parent | 4206359862da51e3cc3d6b36ab0a3280c1123b9e (diff) |
Merge pull request #1471 from GriffinRichards/fix-lock
Fix some object lock names
Diffstat (limited to 'src/event_object_lock.c')
-rw-r--r-- | src/event_object_lock.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/event_object_lock.c b/src/event_object_lock.c index dec2d7906..179c72813 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -40,7 +40,7 @@ bool8 IsFreezePlayerFinished(void) } -void ScriptFreezeObjectEvents(void) +void FreezeObjects_WaitForPlayer(void) { FreezeObjectEvents(); CreateTask(Task_FreezePlayer, 80); @@ -82,7 +82,9 @@ bool8 IsFreezeSelectedObjectAndPlayerFinished(void) } } -void LockSelectedObjectEvent(void) +// Freeze all objects immediately except the selected object and the player. +// The selected object and player are frozen once their movement is finished. +void FreezeObjects_WaitForPlayerAndSelected(void) { u8 taskId; FreezeObjectEventsExceptOne(gSelectedObjectEvent); @@ -144,6 +146,8 @@ static void Task_FreezeObjectAndPlayer(u8 taskId) DestroyTask(taskId); } +// Freeze all objects immediately except the player and the approaching trainers. +// The approaching trainers and player are frozen once their movement is finished void FreezeForApproachingTrainers(void) { u8 trainerObjectId1, trainerObjectId2, taskId; |