diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
commit | beeb673ba16e02cacadb2de0ee3608d2106ed14a (patch) | |
tree | 8924e783fc8af67286cf45abcef95c065a3fd223 /include/event_object_lock.h | |
parent | 2ed1f7c6f92abe93d86b921709576b82970f0848 (diff) | |
parent | ebade7affb31d5bcdc17cdcd3895758010ee6f66 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
Diffstat (limited to 'include/event_object_lock.h')
-rw-r--r-- | include/event_object_lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/event_object_lock.h b/include/event_object_lock.h index a3b350019..0226eb632 100644 --- a/include/event_object_lock.h +++ b/include/event_object_lock.h @@ -8,6 +8,6 @@ void LockSelectedObjectEvent(void); void sub_8098630(void); bool8 sub_8098734(void); void ScriptUnfreezeObjectEvents(void); -void sub_8098524(void); +void UnionRoom_UnlockPlayerAndChatPartner(void); #endif // GUARD_EVENT_OBJECT_LOCK_H |