diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-12 01:39:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 01:39:28 -0400 |
| commit | a274cc6a76a59768bcfaef345d55a39f6c1ddbac (patch) | |
| tree | e6977a9d8066e946148b8d1dfcf95e721b59e54f /include/event_object_lock.h | |
| parent | 810ca5f8ff79aeec6ffe8e982f4786aade616b4d (diff) | |
| parent | 876a89eba4903e5ef1ccad22b1ee52023fb24513 (diff) | |
Merge branch 'master' into flatten_sprite_pos
Diffstat (limited to 'include/event_object_lock.h')
| -rw-r--r-- | include/event_object_lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/event_object_lock.h b/include/event_object_lock.h index 9d31a25fd..0b1f5f098 100644 --- a/include/event_object_lock.h +++ b/include/event_object_lock.h @@ -2,9 +2,9 @@ #define GUARD_EVENT_OBJECT_LOCK_H bool8 IsFreezePlayerFinished(void); -void ScriptFreezeObjectEvents(void); bool8 IsFreezeSelectedObjectAndPlayerFinished(void); -void LockSelectedObjectEvent(void); +void FreezeObjects_WaitForPlayer(void); +void FreezeObjects_WaitForPlayerAndSelected(void); void FreezeForApproachingTrainers(void); bool8 IsFreezeObjectAndPlayerFinished(void); void ScriptUnfreezeObjectEvents(void); |