Merge pull request #1471 from GriffinRichards/fix-lock

Fix some object lock names

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);