summaryrefslogtreecommitdiff
path: root/include/event_object_lock.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-16 13:57:05 -0500
committerGitHub <noreply@github.com>2020-02-16 13:57:05 -0500
commitc1d17b2df183689c0befd3c7bc08810308f2bcd2 (patch)
treed2e6483613f61af4142e6c313ac1007552a52941 /include/event_object_lock.h
parent1cfeae9ffa11bb86a214721bb264f26ca8cb7d5a (diff)
parent13357596b7ed70246a00d438ee37dc1c84b78415 (diff)
Merge branch 'master' into doc-routes2
Diffstat (limited to 'include/event_object_lock.h')
-rw-r--r--include/event_object_lock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index 5c65585b5..1a0f452fc 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -11,6 +11,6 @@ void sub_8098630(void);
bool8 sub_8098734(void);
void sub_80696C0(void);
bool8 walkrun_is_standing_still(void);
-void sub_80696F0(void);
+void UnionRoom_UnlockPlayerAndChatPartner(void);
#endif // GUARD_EVENT_OBJECT_LOCK_H