8 files changed, 8 insertions, 17 deletions
diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h
index b6f8dc319..3565c581e 100644
--- a/include/constants/quest_log.h
+++ b/include/constants/quest_log.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_CONSTANTS_QUEST_LOG_H
 #define GUARD_CONSTANTS_QUEST_LOG_H
 
-// TODO: Name and use state constants
 #define QL_STATE_RECORDING     1
 #define QL_STATE_PLAYBACK      2
 #define QL_STATE_PLAYBACK_LAST 3
diff --git a/include/constants/trainer_types.h b/include/constants/trainer_types.h
index c2adf1e12..8886cf442 100644
--- a/include/constants/trainer_types.h
+++ b/include/constants/trainer_types.h
@@ -4,5 +4,6 @@
 #define TRAINER_TYPE_NONE               0
 #define TRAINER_TYPE_NORMAL             1
 #define TRAINER_TYPE_SEE_ALL_DIRECTIONS 2
+#define TRAINER_TYPE_BURIED             3
 
 #endif  // GUARD_CONSTANTS_TRAINER_TYPES_H
diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index de5b9903e..4de3174ed 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -9,7 +9,7 @@ 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);
 
diff --git a/include/item_use.h b/include/item_use.h
index 7e9f7a61d..d08878f72 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void sub_80A1E0C(u8);
+void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8);
 void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16);
 
 void FieldUseFunc_OrangeMail(u8 taskId);
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index 8e05f247f..eab3c0830 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -37,7 +37,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
 void sub_80F7768(u8 windowId, bool8 copyToVram);
 void Menu_LoadStdPal(void);
 void Menu_LoadStdPalAt(u16 offset);
-void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback);
+void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *src, TaskFunc callback);
 void DisplayYesNoMenuDefaultYes(void);
 void DisplayYesNoMenuDefaultNo(void);
 u8 GetTextSpeedSetting(void);
diff --git a/include/scrcmd.h b/include/scrcmd.h
deleted file mode 100644
index fca747fa0..000000000
--- a/include/scrcmd.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_SCRCMD_H
-#define GUARD_SCRCMD_H
-
-extern struct ScriptContext * sQuestLogScriptContextPtr;
-
-#endif //GUARD_SCRCMD_H
diff --git a/include/strings.h b/include/strings.h
index 5848d3ae8..21f970553 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -169,7 +169,7 @@ extern const u8 gText_WithdrawItem[];
 extern const u8 gText_Withdraw[];
 extern const u8 gText_ReturnToPC[];
 
-extern const u8 gUnknown_8416425[];
+extern const u8 gText_OakForbidsUseOfItemHere[];
 extern const u8 gUnknown_8416451[];
 extern const u8 gUnknown_8416537[];
 extern const u8 gUnknown_841658C[];
diff --git a/include/vs_seeker.h b/include/vs_seeker.h
index 6668cc6b4..43796b215 100644
--- a/include/vs_seeker.h
+++ b/include/vs_seeker.h
@@ -4,13 +4,10 @@
 #include "global.h"
 
 void Task_VsSeeker_0(u8 taskId);
-void sub_810CB90(void);
-void sub_810CDE8(void);
+void ClearRematchStateByTrainerId(void);
+void ClearRematchStateOfLastTalked(void);
 int GetRematchTrainerId(u16 a0);
-bool8 sub_810CF04(u8 a0);
-void sub_810D0D0(void);
-void sub_810CB90(void);
 bool8 UpdateVsSeekerStepCounter(void);
-void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum);
+void MapResetTrainerRematches(u16 mapGroup, u16 mapNum);
 
 #endif //GUARD_VS_SEEKER_H