Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

1 files changed, 3 insertions, 3 deletions

diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index 1a0f452fc..4de3174ed 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -3,13 +3,13 @@
 
 #include "global.h"
 
-bool8 sub_8069590(void);
+bool8 NativeScript_WaitPlayerStopMoving(void);
 void ScriptFreezeObjectEvents(void);
-bool8 sub_8069648(void);
+bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void);
 void LockSelectedObjectEvent(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
-void sub_80696C0(void);
+void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void);
 bool8 walkrun_is_standing_still(void);
 void UnionRoom_UnlockPlayerAndChatPartner(void);