Document object lock and some trainer approach

7 files changed, 12 insertions, 12 deletions

diff --git a/include/battle_setup.h b/include/battle_setup.h
index 7fa0457a8..8f78bba3c 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -37,7 +37,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerSc
 void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript);
 void SetUpTwoTrainersBattle(void);
 bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
-void SetUpTrainerMovement(void);
+void SetTrainerFacingDirection(void);
 u8 GetTrainerBattleMode(void);
 bool8 GetTrainerFlag(void);
 bool8 HasTrainerBeenFought(u16 trainerId);
@@ -49,7 +49,7 @@ void ShowTrainerIntroSpeech(void);
 const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 const u8 *BattleSetup_GetTrainerPostBattleScript(void);
 void ShowTrainerCantBattleSpeech(void);
-void SetUpTrainerEncounterMusic(void);
+void PlayTrainerEncounterMusic(void);
 const u8 *GetTrainerALoseText(void);
 const u8 *GetTrainerBLoseText(void);
 const u8 *GetTrainerWonSpeech(void);
diff --git a/include/bike.h b/include/bike.h
index 46b668169..893b0b19e 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -71,7 +71,7 @@ void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
 void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys);
 bool8 RS_IsRunningDisallowed(u8 tile);
 bool8 IsBikingDisallowedByPlayer(void);
-bool8 player_should_look_direction_be_enforced_upon_movement(void);
+bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void);
 void GetOnOffBike(u8 transitionFlags);
 void BikeClearState(int newDirHistory, int newAbStartHistory);
 void Bike_UpdateBikeCounterSpeed(u8 counter);
diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index 0226eb632..9d31a25fd 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -1,12 +1,12 @@
 #ifndef GUARD_EVENT_OBJECT_LOCK_H
 #define GUARD_EVENT_OBJECT_LOCK_H
 
-bool8 sub_80983C4(void);
+bool8 IsFreezePlayerFinished(void);
 void ScriptFreezeObjectEvents(void);
-bool8 sub_809847C(void);
+bool8 IsFreezeSelectedObjectAndPlayerFinished(void);
 void LockSelectedObjectEvent(void);
-void sub_8098630(void);
-bool8 sub_8098734(void);
+void FreezeForApproachingTrainers(void);
+bool8 IsFreezeObjectAndPlayerFinished(void);
 void ScriptUnfreezeObjectEvents(void);
 void UnionRoom_UnlockPlayerAndChatPartner(void);
 
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 5b008ead6..ba2b5e5f6 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -189,7 +189,7 @@ void DestroyExtraMovementTask(u8);
 void UnfreezeObjectEvents(void);
 void FreezeObjectEventsExceptOne(u8 objectEventId);
 void TurnObjectEventSprite(u8, u8);
-void sub_8098074(u8 var1, u8 var2);
+void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2);
 void FreezeObjectEvents(void);
 bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent);
 u8 GetMoveDirectionFastAnimNum(u8);
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 851559724..199686655 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -3,7 +3,7 @@
 
 extern const u8 EventScript_TestSignpostMsg[];
 extern const u8 EventScript_TryGetTrainerScript[];
-extern const u8 EventScript_271354[];
+extern const u8 EventScript_StartTrainerApproach[];
 extern const u8 EventScript_DoNoIntroTrainerBattle[];
 extern const u8 EventScript_TryDoDoubleTrainerBattle[];
 extern const u8 EventScript_TryDoNormalTrainerBattle[];
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index aa1a2e0dc..c30ce0b6f 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -34,7 +34,7 @@ u8 PlayerGetZCoord(void);
 void SetPlayerAvatarTransitionFlags(u16 a);
 void sub_808BCE8(void);
 void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d);
-void sub_808B864(void);
+void PlayerFreeze(void);
 void sub_808BCF4(void);
 void SetSpinStartFacingDir(u8);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
diff --git a/include/trainer_see.h b/include/trainer_see.h
index 9d88e05fa..7a20671ea 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -17,8 +17,8 @@ extern bool8 gTrainerApproachedPlayer;
 extern u8 gApproachingTrainerId;
 
 bool8 CheckForTrainersWantingBattle(void);
-void sub_80B4578(struct ObjectEvent *var);
-void EndTrainerApproach(void);
+void SetHiddenTrainerMovement(struct ObjectEvent *var);
+void DoTrainerApproach(void);
 void TryPrepareSecondApproachingTrainer(void);
 u8 FldEff_ExclamationMarkIcon(void);
 u8 FldEff_QuestionMarkIcon(void);