28 files changed, 122 insertions, 119 deletions

diff --git a/include/battle.h b/include/battle.h
index c9534745d..aac94da7b 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -33,7 +33,7 @@
 #define B_ACTION_RUN                       3
 #define B_ACTION_SAFARI_WATCH_CAREFULLY    4
 #define B_ACTION_SAFARI_BALL               5
-#define B_ACTION_SAFARI_POKEBLOCK          6
+#define B_ACTION_SAFARI_BAIT          6
 #define B_ACTION_SAFARI_GO_NEAR            7
 #define B_ACTION_SAFARI_RUN                8
 #define B_ACTION_OLDMAN_THROW              9
diff --git a/include/battle_anim.h b/include/battle_anim.h
index c8704707b..e987457c7 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -391,7 +391,7 @@ void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
 void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
 u8 GetBattleBgPaletteNum(void);
 void sub_8075458(bool8 arg0);
-void sub_8075490(struct Sprite *sprite);
+void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite);
 void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
 void InitAnimLinearTranslation(struct Sprite *sprite);
 void StartAnimLinearTranslation(struct Sprite *sprite);
diff --git a/include/cable_club.h b/include/cable_club.h
index ccdc6b98d..d89e8222c 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -8,7 +8,7 @@
 // Exported RAM declarations
 
 // Exported ROM declarations
-void sub_8081A90(u8 taskId);
+void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId);
 u8 CreateTask_ReestablishLinkInCableClubRoom(void);
 void CB2_ReturnFromCableClubBattle(void);
 bool32 GetSeeingLinkPlayerCardMsg(u8 who);
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index 962cad668..80be08905 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -276,7 +276,7 @@
 #define ANIM_TAG_GREEN_SPIKE                (ANIM_SPRITES_START + 266)
 #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT      (ANIM_SPRITES_START + 267)
 #define ANIM_TAG_GLOWY_BLUE_ORB             (ANIM_SPRITES_START + 268)
-#define ANIM_TAG_POKEBLOCK                  (ANIM_SPRITES_START + 269)
+#define ANIM_TAG_SAFARI_BAIT                  (ANIM_SPRITES_START + 269)
 #define ANIM_TAG_WHITE_FEATHER              (ANIM_SPRITES_START + 270)
 #define ANIM_TAG_SPARKLE_6                  (ANIM_SPRITES_START + 271)
 #define ANIM_TAG_SPLASH                     (ANIM_SPRITES_START + 272)
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index da979084a..e26f79be0 100644
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -16,12 +16,12 @@
 #define MB_OCEAN_WATER 0x15
 #define MB_PUDDLE 0x16
 #define MB_SHALLOW_WATER 0x17
-#define MB_19 0x19
+#define MB_UNDERWATER_BLOCKED_ABOVE 0x19
 #define MB_1A 0x1A
 #define MB_1B 0x1B
 #define MB_STRENGTH_BUTTON 0x20
 #define MB_SAND 0x21
-#define MB_22 0x22
+#define MB_SEAWEED 0x22
 #define MB_ICE 0x23
 #define MB_THIN_ICE 0x26
 #define MB_CRACKED_ICE 0x27
@@ -68,14 +68,14 @@
 #define MB_SOUTH_ARROW_WARP 0x65
 #define MB_FALL_WARP 0x66
 #define MB_REGULAR_WARP 0x67
-#define MB_68 0x68
+#define MB_LAVARIDGE_1F_WARP 0x68
 #define MB_WARP_DOOR 0x69
 #define MB_UP_ESCALATOR 0x6A
 #define MB_DOWN_ESCALATOR 0x6B
-#define MB_UNKNOWN_WARP_6C 0x6C
-#define MB_UNKNOWN_WARP_6D 0x6D
-#define MB_UNKNOWN_WARP_6E 0x6E
-#define MB_UNKNOWN_WARP_6F 0x6F
+#define MB_UP_RIGHT_STAIR_WARP 0x6C
+#define MB_UP_LEFT_STAIR_WARP 0x6D
+#define MB_DOWN_RIGHT_STAIR_WARP 0x6E
+#define MB_DOWN_LEFT_STAIR_WARP 0x6F
 #define MB_UNION_ROOM_WARP 0x71
 #define MB_COUNTER 0x80
 #define MB_BOOKSHELF 0x81
diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h
index b5494e7b9..3565c581e 100644
--- a/include/constants/quest_log.h
+++ b/include/constants/quest_log.h
@@ -1,10 +1,14 @@
 #ifndef GUARD_CONSTANTS_QUEST_LOG_H
 #define GUARD_CONSTANTS_QUEST_LOG_H
 
-// TODO: Name and use state constants
-#define QL_STATE_1  1
-#define QL_STATE_2  2
-#define QL_STATE_3  3
+#define QL_STATE_RECORDING     1
+#define QL_STATE_PLAYBACK      2
+#define QL_STATE_PLAYBACK_LAST 3
+
+#define QL_START_NORMAL 1
+#define QL_START_WARP   2
+
+#define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST)
 
 #define QL_EVENT_0                              0 // Null
 #define QL_EVENT_1                              1 // Null
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 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);
 
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 0c383b2bb..1b7ee756e 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -66,7 +66,7 @@ u8 GetObjectEventIdByXY(s16, s16);
 void SetObjectEventDirection(struct ObjectEvent *, u8);
 u8 sub_808D4F4(void);
 void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
-u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup);
+u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
 void LoadPlayerObjectReflectionPalette(u16, u8);
 void LoadSpecialObjectReflectionPalette(u16, u8);
 void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index e0873aa52..25eaf45ae 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -26,15 +26,15 @@ extern struct FieldInput gInputToStoreInQuestLogMaybe;
 void RestartWildEncounterImmunitySteps(void);
 void ClearPoisonStepCounter(void);
 int SetCableClubWarp(void);
-void sub_806DE28(struct ObjectEvent *);
+void HandleBoulderFallThroughHole(struct ObjectEvent *);
 bool8 dive_warp(struct MapPosition * pos, u16 behavior);
-bool8 sub_806DB84(u16 metatileBehavior, u8 playerDirection);
+bool8 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection);
 const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
 const u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position);
 void FieldClearPlayerInput(struct FieldInput *input);
 int ProcessPlayerFieldInput(struct FieldInput *input);
 void FieldInput_HandleCancelSignpost(struct FieldInput * input);
 void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys);
-void sub_806DE70(u16 x, u16 y);
+void HandleBoulderActivateVictoryRoadSwitch(u16 x, u16 y);
 
 #endif //GUARD_FIELD_CONTROL_AVATAR_H
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index b57ef14b0..0decdd9ff 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -10,7 +10,7 @@ void DoDoorWarp(void);
 
 void DoFallWarp(void);
 void DoTeleportWarp(void);
-void sub_807E500(void);
+void DoTeleport2Warp(void);
 void FieldCB_DefaultWarpExit(void);
 void WarpFadeOutScreen(void);
 void FieldCB_ContinueScriptHandleMusic(void);
@@ -22,7 +22,7 @@ void sub_807DCE4(void);
 
 bool32 FieldFadeTransitionBackgroundEffectIsFinished(void);
 void palette_bg_faded_fill_black(void);
-void sub_807E4A0(u16 metatileBehavior, u16 delay);
+void DoStairWarp(u16 metatileBehavior, u16 delay);
 void DoEscalatorWarp(u8 a0);
 void DoLavaridgeGymB1FWarp(void);
 void DoLavaridgeGym1FWarp(void);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index df9084eab..60ece38fe 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -14,7 +14,7 @@ u8 PlayerGetCopyableMovement(void);
 void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
 
 void MovementType_Player(struct Sprite * sprite);
-void sub_805C270(void);
+void HandleEnforcedLookDirectionOnPlayerStopMoving(void);
 void StopPlayerAvatar(void);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
 u8 GetPlayerAvatarGraphicsIdByStateId(u8);
@@ -22,7 +22,7 @@ void SetPlayerAvatarStateMask(u8 mask);
 void AlignFishingAnimationFrames(struct Sprite *sprite);
 void CreateStopSurfingTask_NoMusicChange(u8 direction);
 void SavePlayerFacingDirectionForTeleport(u8 direction);
-void SetPlayerAvatarTransitionFlags(u16 a);
+void SetPlayerAvatarTransitionFlags(u16 flags);
 bool8 IsPlayerFacingSurfableFishableWater(void);
 void StartFishing(u8 secondaryId);
 u8 GetPlayerAvatarObjectId(void);
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 06c56d38a..bf27cb49c 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -6,7 +6,7 @@
 void sub_80AF79C(void);
 void AnimateFlash(u8);
 void sub_80B0244(void);
-void sub_807E3EC(void);
+void FieldCB_SafariZoneRanOutOfBalls(void);
 void DoOutwardBarnDoorWipe(void);
 void Task_BarnDoorWipe(u8 taskId);
 void FieldCB_RushInjuredPokemonToCenter(void);
diff --git a/include/global.h b/include/global.h
index aa60be994..67084f2ef 100644
--- a/include/global.h
+++ b/include/global.h
@@ -544,42 +544,12 @@ struct QuestLogNPCData
     u32 movementType:8;
 };
 
-struct UnkStruct_203B024
-{
-    u16 unk_00;
-    u16 unk_02;
-    u16 unk_04[14];
-};
-
-union QuestLogScene
-{
-    u8 allocation[32];
-    u16 ident;
-};
-
-typedef union QuestLogScene QuestLogScene;
-
-// This name is a complete guess and may change.
-
 #define BERRY_TREES_COUNT  128
 #define FLAGS_COUNT        288 // 300
 #define VARS_COUNT         256
 #define MAIL_COUNT         (PARTY_SIZE + 10)
 #define PC_MAIL_NUM(i)     (PARTY_SIZE + (i))
 
-// Declare here so that it can be recursively referenced.
-union QuestLogMovement;
-
-// Define here
-union QuestLogMovement
-{
-    u16 ident_raw;
-    struct {
-        u16 ident:12;
-        u16 flags:4;
-    } ident_struct;
-};
-
 struct QuestLogObjectEvent
 {
     /*0x00*/ u8 active:1;
@@ -619,7 +589,7 @@ struct QuestLogObjectEvent
 
 struct QuestLog
 {
-    /*0x0000*/ u8 unk_000;
+    /*0x0000*/ u8 startType;
     /*0x0001*/ u8 mapGroup;
     /*0x0002*/ u8 mapNum;
     /*0x0003*/ u8 warpId;
@@ -632,7 +602,7 @@ struct QuestLog
     /*0x0148*/ u8 flags[FLAGS_COUNT];
     /*0x02c8*/ u16 vars[VARS_COUNT];
     /*0x0468*/ struct QuestLogNPCData npcData[64];
-    /*0x0568*/ u16 unk_568[128];
+    /*0x0568*/ u16 script[128];
     /*0x0668*/ u16 end[0];
 };
 
diff --git a/include/graphics.h b/include/graphics.h
index 8978719a8..40a41b87e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3943,7 +3943,7 @@ extern const u32 gBattleAnimSpriteGfx_IcicleSpear[];
 extern const u32 gBattleAnimSpriteGfx_Hail[];
 extern const u32 gBattleAnimSpriteGfx_GlowyRedOrb[];
 extern const u32 gBattleAnimSpriteGfx_GreenSpike[];
-extern const u32 gBattleAnimSpriteGfx_Pokeblock[];
+extern const u32 gBattleAnimSpriteGfx_SafariBait[];
 extern const u32 gBattleAnimSpriteGfx_WhiteFeather[];
 extern const u32 gBattleAnimSpriteGfx_Sparkle6[];
 extern const u32 gBattleAnimSpriteGfx_Splash[];
@@ -4196,7 +4196,7 @@ extern const u32 gBattleAnimSpritePal_GlowyGreenOrb[];
 extern const u32 gBattleAnimSpritePal_GreenSpike[];
 extern const u32 gBattleAnimSpritePal_WhiteCircleOfLight[];
 extern const u32 gBattleAnimSpritePal_GlowyBlueOrb[];
-extern const u32 gBattleAnimSpritePal_Pokeblock[];
+extern const u32 gBattleAnimSpritePal_SafariBait[];
 extern const u32 gBattleAnimSpritePal_WhiteFeather[];
 extern const u32 gBattleAnimSpritePal_Sparkle6[];
 extern const u32 gBattleAnimSpritePal_Splash[];
diff --git a/include/help_message.h b/include/help_message.h
new file mode 100644
index 000000000..df387c560
--- /dev/null
+++ b/include/help_message.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_HELP_MESSAGE_H
+#define GUARD_HELP_MESSAGE_H
+
+void DestroyHelpMessageWindow(u8 a0);
+u8 CreateHelpMessageWindow(void);
+void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
+void MapNamePopupWindowIdSetDummy(void);
+void sub_8112F18(u8 windowId);
+
+#endif //GUARD_HELP_MESSAGE_H
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/link.h b/include/link.h
index 899f0cb03..6329c197b 100644
--- a/include/link.h
+++ b/include/link.h
@@ -277,7 +277,7 @@ void ClearLinkCallback_2(void);
 void LinkRfu_SetRfuFuncToSend6600(void);
 void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
 bool8 IsWirelessAdapterConnected(void);
-bool8 sub_800A474(u8 blockRequestType);
+bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType);
 void LinkVSync(void);
 bool8 HandleLinkConnection(void);
 void PrepareLocalLinkPlayerBlock(void);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 31075be77..550b8225c 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -127,7 +127,7 @@ typedef struct UnkRfuStruct_2
     /* 0x010 */ u16 linkman_param[2];
     /* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14];
     /* 0x04c */ u8 unk_4c[14];
-    /* 0x05a */ u8 unk_5a;
+    /* 0x05a */ u8 cmdA100_blockRequestType;
     /* 0x05b */ u8 unk_5b;
     /* 0x05c */ u8 unk_5c[5];
     /* 0x061 */ u8 unk_61[5];
@@ -139,7 +139,7 @@ typedef struct UnkRfuStruct_2
     /* 0x0e4 */ u8 cmd5f00Ack[5];
     /* 0x0e9 */ u8 cmd_6600_recvd[5];
     /* 0x0ee */ vu8 errorState;
-    /* 0x0ef */ u8 unk_ef;
+    /* 0x0ef */ bool8 isShuttingDown;
     /* 0x0f0 */ u8 linkLossRecoveryState;
     /* 0x0f1 */ u8 unk_f1;
     /* 0x0f2 */ u16 unk_f2[6];
@@ -207,7 +207,7 @@ u8 GetRfuPlayerCount(void);
 void StartSendingKeysToRfu(void);
 u8 LinkRfu_GetMultiplayerId(void);
 bool32 Rfu_InitBlockSend(const u8 * src, size_t size);
-bool8 sub_80FA0F8(u8 a0);
+bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType);
 u8 Rfu_GetBlockReceivedStatus(void);
 void Rfu_SetBlockReceivedFlag(u8 who);
 void Rfu_ResetBlockReceivedFlag(u8 who);
@@ -219,7 +219,7 @@ bool32 IsRfuRecvQueueEmpty(void);
 u32 GetRfuRecvQueueLength(void);
 void LinkRfu_Shutdown(void);
 void LinkRfu_CreateIdleTask(void);
-bool8 sub_80FA484(bool32 a0);
+bool8 ToggleLMANlinkRecovery(bool32 a0);
 void var_800D_set_xB(void);
 struct GFtgtGname *GetHostRFUtgtGname(void);
 void UpdateWirelessStatusIndicatorSprite(void);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 793eeb8a1..8af4664a0 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -17,11 +17,11 @@ bool8 MetatileBehavior_IsIce(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior);
 bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6C(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6D(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior);
-bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior);
 bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
 bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
 bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior);
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/overworld.h b/include/overworld.h
index f5cb1987e..42451636f 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -110,10 +110,10 @@ u32 GetGameStat(u8 statId);
 void SetGameStat(u8 statId, u32 value);
 
 void CB2_ContinueSavedGame(void);
-void sub_8055D5C(struct WarpData *);
-void sub_80572A8(void);
-void sub_805726C(void);
-void sub_8057430(void);
+void Overworld_SetWarpDestinationFromWarp(struct WarpData *);
+void CB2_SetUpOverworldForQLPlayback(void);
+void CB2_SetUpOverworldForQLPlaybackWithWarpExit(void);
+void CB2_EnterFieldFromQuestLog(void);
 void Overworld_PlaySpecialMapMusic(void);
 
 u8 GetCurrentRegionMapSectionId(void);
@@ -133,7 +133,7 @@ extern bool8 (* gFieldCallback2)(void);
 
 void SetLastHealLocationWarp(u8 healLocaionId);
 void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum);
-void sub_80568FC(void);
+void CB2_ReturnToFieldFromDiploma(void);
 void CB2_OverworldBasic(void);
 void CB2_NewGame(void);
 bool8 IsMapTypeOutdoors(u8 mapType);
diff --git a/include/quest_log.h b/include/quest_log.h
index 090d0daf6..adf43de95 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -6,37 +6,53 @@
 #include "constants/quest_log.h"
 #include "field_control_avatar.h"
 
+struct QuestLogEntry
+{
+    u8 localId;
+    u8 mapNum;
+    u8 mapGroup;
+    u8 animId;
+    u16 duration;
+    u8 command;
+};
+
+struct UnkStruct_203B044
+{
+    u8 id;
+    u8 unk_1;
+    u16 unk_2;
+};
+
 extern u8 gQuestLogState;
-extern u8 gUnknown_3005E88;
+extern u8 gQuestLogPlaybackState;
 extern const u16 gUnknown_84566A8[];
 extern struct FieldInput gQuestLogFieldInput;
+extern struct UnkStruct_203B044 gUnknown_203B044;
+extern u16 *gUnknown_203AE04;
+extern u16 *sEventRecordingPointer;
+extern u16 sQuestLogCursor;
 
 void sub_8112720(u8);
 void SetQuestLogEvent(u16, const u16 *);
-void sub_811539C(void);
+void SetQLPlayedTheSlots(void);
 void QuestLog_RecordEnteredMap(u16);
 u8 sub_8112CAC(void);
 bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
 void sub_8111F38(u16 offset, u16 idx);
 void CommitQuestLogWindow1(void);
-void DestroyHelpMessageWindow(u8 a0);
-u8 CreateHelpMessageWindow(void);
-void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
-void MapNamePopupWindowIdSetDummy(void);
-void sub_8111CF0(void);
+void QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(void);
 void ResetQuestLog(void);
 void ResetTrainerFanClub(void);
 void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
 void SaveQuestLogData(void);
-void QuestLog_OnInteractionWithSpecialNpc(void);
+void QuestLog_CutRecording(void);
 u8 sub_8112CAC(void);
-void sub_81138F8(void);
-void sub_811231C(void);
+void ResetDeferredLinkEvent(void);
+void FinishRecordingQuestLogScene(void);
 void sub_81139BC(void);
 void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
 void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
-void sub_8110840(void *oldSave);
-void sub_8112F18(u8 windowId);
+void SetQuestLogRecordAndPlaybackPointers(void *oldSave);
 void sub_811246C(struct Sprite *sprite);
 void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3);
 bool8 sub_8111C2C(void);
@@ -53,14 +69,33 @@ void sub_81127F8(struct FieldInput * a0);
 void sub_8112B3C(void);
 void RunQuestLogCB(void);
 void sub_8111C68(void);
-bool8 sub_8111CD0(void);
+bool8 QuestLogScenePlaybackIsEnding(void);
 void sub_8115798(void);
-bool8 sub_8113748(void);
-void sub_81119C8(void);
+bool8 QuestLog_ShouldEndSceneOnMapChange(void);
+void QuestLog_AdvancePlayhead_(void);
 void sub_8111F14(void);
 void sub_8110FCC(void);
-u8 sub_8110AC8(void);
+u8 GetQuestLogStartType(void);
 void sub_81113E4(void);
 void sub_8111438(void);
+void StartRecordingQuestLogEntry(u16 eventId);
+bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size);
+bool8 sub_8110944(const void * a0, size_t cmdSize);
+
+void sub_8113BD8(void);
+void ResetUnk203B044(void);
+u16 *TryRecordEvent39_NoParams(u16 *);
+u16 *sub_8113C8C(u16 *, struct QuestLogEntry *);
+u16 *sub_8113CC8(u16 *, struct QuestLogEntry *);
+u16 *sub_8113D08(u16 *, struct QuestLogEntry *);
+u16 *sub_8113D48(u16 *, struct QuestLogEntry *);
+u16 *sub_8113D94(u16 *, struct QuestLogEntry *);
+void sub_811381C(void);
+u16 *QuestLog_SkipCommand(u16 *, u16 **);
+void sub_8113ABC(const u16 *);
+u16 *sub_8113C20(u16 *, struct QuestLogEntry *);
+bool8 sub_8113AE8(const u16 *);
+bool8 sub_8113B44(const u16 *);
+void TryRecordEvent41_IncCursor(u16);
 
 #endif //GUARD_QUEST_LOG_H
diff --git a/include/scrcmd.h b/include/scrcmd.h
deleted file mode 100644
index 0ef357ece..000000000
--- a/include/scrcmd.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_SCRCMD_H
-#define GUARD_SCRCMD_H
-
-extern struct ScriptContext * gUnknown_3005070;
-
-#endif //GUARD_SCRCMD_H
diff --git a/include/strings.h b/include/strings.h
index 6979f6757..57db7d509 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[];
@@ -838,7 +838,7 @@ extern const u8 gText_SixIsland[];
 extern const u8 gText_SevenIsland[];
 
 // trade
-extern const u8 gUnknown_841E0A5[];
+extern const u8 gText_IsThisTradeOkay[];
 extern const u8 gText_XWillBeSentToY[];
 extern const u8 gText_ByeByeVar1[];
 extern const u8 gText_XSentOverY[];
@@ -861,7 +861,7 @@ extern const u8 gUnknown_841E1C5[];
 extern const u8 gText_PkmnCantBeTradedNow[];
 extern const u8 gText_EggCantBeTradedNow[];
 extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
-extern const u8 gUnknown_841E09F[];
+extern const u8 gText_4Qmark[];
 
 extern const u8 gEasyChatGroupName_Pokemon[];
 extern const u8 gEasyChatGroupName_Trainer[];
diff --git a/include/text_window.h b/include/text_window.h
index 3796629b4..2e42558bf 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -9,22 +9,14 @@ struct TilesPal
     u16* pal;
 };
 
-const struct TilesPal* sub_8098758(u8 id);
-void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset);
-void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
-void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
-void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset);
-void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
-void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
 void rbox_fill_rectangle(u8 windowId);
 const u16* stdpal_get(u8 id);
 const u16* GetOverworldTextboxPalettePtr(void);
-void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
 void TextWindow_LoadResourcesStdFrame0(u8 windowId, u16 tileStart, u8 palette);
 void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette);
 void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette);
 void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette);
-void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
+void DrawWindowBorderWithStdpal3(u8 bgId, u16 tileStart, u8 palette);
 void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
 void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum);
 void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset);
diff --git a/include/trade.h b/include/trade.h
index f8e285e40..196a46587 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -14,7 +14,7 @@ extern const u8 gText_GenderlessSymbol[];
 
 extern const u16 gUnknown_826601C[];
 void CB2_ReturnFromLinkTrade(void);
-s32 sub_804FB34(void);
+s32 Trade_CalcLinkPlayerCompatibilityParam(void);
 s32 CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
 s32 GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
 
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