summaryrefslogtreecommitdiff
path: root/src/event_object_lock.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-07-08 16:03:32 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-07-08 16:03:32 -0400
commitbeeb673ba16e02cacadb2de0ee3608d2106ed14a (patch)
tree8924e783fc8af67286cf45abcef95c065a3fd223 /src/event_object_lock.c
parent2ed1f7c6f92abe93d86b921709576b82970f0848 (diff)
parentebade7affb31d5bcdc17cdcd3895758010ee6f66 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
Diffstat (limited to 'src/event_object_lock.c')
-rw-r--r--src/event_object_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index b728f7774..67652a99b 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -96,7 +96,7 @@ void ScriptUnfreezeObjectEvents(void)
UnfreezeObjectEvents();
}
-void sub_8098524(void)
+void UnionRoom_UnlockPlayerAndChatPartner(void)
{
u8 playerObjectId;