through PlayerSetAnimId; some quest log doc

asm/field_player_avatar.s

@@ -5,63 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_805BFFC
-sub_805BFFC: @ 805BFFC
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _0805C01C @ =gPlayerAvatar
-	ldrb r2, [r0, 0x5]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, _0805C020 @ =gObjectEvents
-	adds r0, r2
-	bl ObjectEventForceSetHeldMovement
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805C01C: .4byte gPlayerAvatar
-_0805C020: .4byte gObjectEvents
-	thumb_func_end sub_805BFFC
-
-	thumb_func_start PlayerSetAnimId
-PlayerSetAnimId: @ 805C024
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl PlayerIsAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805C05E
-	adds r0, r4, 0
-	bl PlayerSetCopyableMovement
-	ldr r0, _0805C064 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0805C068 @ =gObjectEvents
-	adds r0, r1
-	adds r1, r5, 0
-	bl ObjectEventSetHeldMovement
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805C05E
-	adds r0, r5, 0
-	bl sub_8112628
-_0805C05E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805C064: .4byte gPlayerAvatar
-_0805C068: .4byte gObjectEvents
-	thumb_func_end PlayerSetAnimId
-
 	thumb_func_start sub_805C06C
 sub_805C06C: @ 805C06C
 	push {r4,lr}
@@ -378,7 +321,7 @@ _0805C27E:
 	bl GetFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_805BFFC
+	bl PlayerForceSetHeldMovement
 _0805C2A6:
 	pop {r4}
 	pop {r0}

common_syms/quest_log.txt

@@ -1,4 +1,4 @@
 gUnknown_3005E88
-sNumQuestLogs
+sNumEventsInLogEntry
 gUnknown_3005E90
-gUnknown_3005E94
+sCurQuestLogEntry

include/constants/vars.h

@@ -221,11 +221,10 @@
 #define VAR_0x40A7                 0x40A7
 #define VAR_0x40A8                 0x40A8
 #define VAR_0x40A9                 0x40A9
-#define VAR_0x40AA                 0x40AA
-#define VAR_0x40AB                 0x40AB
-#define VAR_0x40AC                 0x40AC
-#define VAR_0x40AD                 0x40AD
-#define VAR_0x40AE                 0x40AE
+
+#define VAR_QLBAK_TRAINER_REMATCHES 0x40AA // array of 4
+#define VAR_QLBAK_MAP_LAYOUT        0x40AE
+
 #define VAR_0x40AF                 0x40AF
 #define VAR_0x40B0                 0x40B0
 #define VAR_0x40B1                 0x40B1

include/quest_log.h

@@ -18,9 +18,9 @@ struct UnkStruct_3005E90
 
 extern u8 gQuestLogState;
 extern u8 gUnknown_3005E88;
-extern u16 sNumQuestLogs;
+extern u16 sNumEventsInLogEntry;
 extern struct UnkStruct_3005E90 gUnknown_3005E90;
-extern struct UnkStruct_203AE98 * gUnknown_3005E94;
+extern struct QuestLogEntry * sCurQuestLogEntry;
 extern const u16 gUnknown_84566A8[];
 
 void sub_8112720(u8);
@@ -30,7 +30,7 @@ void QuestLog_RecordEnteredMap(u16);
 u8 sub_8112CAC(void);
 bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
 void sub_8111F38(u16 offset, u16 idx);
-void sub_8111134(void);
+void CommitQuestLogWindow1(void);
 void DestroyHelpMessageWindow(u8 a0);
 u8 CreateHelpMessageWindow(void);
 void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
@@ -53,7 +53,8 @@ void sub_811246C(struct Sprite *sprite);
 void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3);
 bool8 sub_8111C2C(void);
 void sub_81128BC(u8 a0);
-void sub_811278C(u8, u8);
+void sub_811278C(u8 movementActionId, u8 duration);
 void Special_UpdateTrainerFansAfterLinkBattle(void);
+void sub_8112628(u8 movementActionId);
 
 #endif //GUARD_QUEST_LOG_H

include/quest_log_objects.h

@@ -4,6 +4,6 @@
 #include "global.h"
 
 void SetQuestLogObjectEventsData(struct QuestLog *);
-void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *);
+void SetSav1ObjectEventsFromQuestLog(struct QuestLog *, struct ObjectEventTemplate *);
 
 #endif //GUARD_QUEST_LOG_OBJECTS_H

src/field_player_avatar.c

@@ -764,3 +764,18 @@ u8 PlayerGetCopyableMovement(void)
 {
     return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement;
 }
+
+void PlayerForceSetHeldMovement(u8 a)
+{
+    ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a);
+}
+
+void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
+{
+    if (!PlayerIsAnimActive())
+    {
+        PlayerSetCopyableMovement(copyableMovement);
+        if (!ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId))
+            sub_8112628(movementActionId);
+    }
+}

src/new_menu_helpers.c

@@ -496,7 +496,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
     if (copyToVram == TRUE)
         CopyWindowToVram(windowId, 3);
     if (gQuestLogState == 2)
-        sub_8111134();
+        CommitQuestLogWindow1();
 }
 
 void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram)

src/quest_log_objects.c

@@ -45,7 +45,7 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
     }
 }
 
-void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
+void SetSav1ObjectEventsFromQuestLog(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
 {
     u32 i, j;
     const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
@@ -131,7 +131,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
 
 void sub_815A540(void)
 {
-    if (gQuestLogState == 2)
+    if (gQuestLogState == QL_STATE_2)
     {
         s16 x, y;