through sub_8114758

2 files changed, 97 insertions, 251 deletions

diff --git a/asm/quest_log.s b/asm/quest_log.s
index afc89e1ab..8f47698ad 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -5,247 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8114578
-sub_8114578: @ 8114578
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0xE
-	strh r0, [r4]
-	ldr r0, _081145A0 @ =gUnknown_203AF98
-	ldrh r0, [r0]
-	strh r0, [r4, 0x2]
-	ldrb r0, [r1]
-	strb r0, [r4, 0x4]
-	adds r0, r4, 0x5
-	adds r1, 0x1
-	movs r2, 0x7
-	bl memcpy
-	adds r4, 0xC
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081145A0: .4byte gUnknown_203AF98
-	thumb_func_end sub_8114578
-
-	thumb_func_start sub_81145A4
-sub_81145A4: @ 81145A4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl UnkTextUtil_Reset
-	ldr r4, _081145F4 @ =gStringVar1
-	adds r0, r4, 0
-	movs r1, 0xFF
-	movs r2, 0x8
-	bl memset
-	adds r1, r5, 0x5
-	adds r0, r4, 0
-	movs r2, 0x7
-	bl memcpy
-	adds r0, r4, 0
-	bl sub_8115834
-	movs r0, 0
-	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
-	ldr r1, _081145F8 @ =gUnknown_8456AE4
-	ldrb r0, [r5, 0x4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
-	ldr r0, _081145FC @ =gStringVar4
-	ldr r1, _08114600 @ =gUnknown_841A477
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r5, 0xC
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081145F4: .4byte gStringVar1
-_081145F8: .4byte gUnknown_8456AE4
-_081145FC: .4byte gStringVar4
-_08114600: .4byte gUnknown_841A477
-	thumb_func_end sub_81145A4
-
-	thumb_func_start sub_8114604
-sub_8114604: @ 8114604
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0xF
-	strh r0, [r4]
-	ldr r0, _08114648 @ =gUnknown_203AF98
-	ldrh r0, [r0]
-	strh r0, [r4, 0x2]
-	ldrb r0, [r5]
-	strb r0, [r4, 0x4]
-	adds r0, r4, 0x5
-	adds r1, r5, 0x1
-	movs r2, 0x7
-	bl memcpy
-	adds r0, r4, 0
-	adds r0, 0xC
-	adds r1, r5, 0
-	adds r1, 0x8
-	movs r2, 0x7
-	bl memcpy
-	adds r0, r4, 0
-	adds r0, 0x13
-	adds r5, 0xF
-	adds r1, r5, 0
-	movs r2, 0x7
-	bl memcpy
-	adds r4, 0x1A
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114648: .4byte gUnknown_203AF98
-	thumb_func_end sub_8114604
-
-	thumb_func_start sub_811464C
-sub_811464C: @ 811464C
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r4, r0, 0
-	bl UnkTextUtil_Reset
-	ldr r0, _081146F4 @ =gStringVar1
-	mov r8, r0
-	movs r1, 0xFF
-	movs r2, 0x8
-	bl memset
-	ldr r6, _081146F8 @ =gStringVar2
-	adds r0, r6, 0
-	movs r1, 0xFF
-	movs r2, 0x8
-	bl memset
-	ldr r5, _081146FC @ =gStringVar3
-	adds r0, r5, 0
-	movs r1, 0xFF
-	movs r2, 0x8
-	bl memset
-	adds r1, r4, 0x5
-	mov r0, r8
-	bl StringCopy7
-	adds r1, r4, 0
-	adds r1, 0xC
-	adds r0, r6, 0
-	bl StringCopy7
-	adds r1, r4, 0
-	adds r1, 0x13
-	adds r0, r5, 0
-	bl StringCopy7
-	mov r0, r8
-	bl sub_8115834
-	adds r0, r6, 0
-	bl sub_8115834
-	adds r0, r5, 0
-	bl sub_8115834
-	ldr r0, _08114700 @ =gSaveBlock2Ptr
-	ldr r1, [r0]
-	movs r0, 0
-	bl UnkTextUtil_SetPtrI
-	movs r0, 0x1
-	mov r1, r8
-	bl UnkTextUtil_SetPtrI
-	movs r0, 0x2
-	adds r1, r6, 0
-	bl UnkTextUtil_SetPtrI
-	movs r0, 0x3
-	adds r1, r5, 0
-	bl UnkTextUtil_SetPtrI
-	ldr r1, _08114704 @ =gUnknown_8456AE4
-	ldrb r0, [r4, 0x4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	movs r0, 0x4
-	bl UnkTextUtil_SetPtrI
-	ldr r0, _08114708 @ =gStringVar4
-	ldr r1, _0811470C @ =gUnknown_841A4C6
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r4, 0x1A
-	adds r0, r4, 0
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081146F4: .4byte gStringVar1
-_081146F8: .4byte gStringVar2
-_081146FC: .4byte gStringVar3
-_08114700: .4byte gSaveBlock2Ptr
-_08114704: .4byte gUnknown_8456AE4
-_08114708: .4byte gStringVar4
-_0811470C: .4byte gUnknown_841A4C6
-	thumb_func_end sub_811464C
-
-	thumb_func_start sub_8114710
-sub_8114710: @ 8114710
-	movs r1, 0x10
-	strh r1, [r0]
-	ldr r1, _08114720 @ =gUnknown_203AF98
-	ldrh r1, [r1]
-	strh r1, [r0, 0x2]
-	adds r0, 0x4
-	bx lr
-	.align 2, 0
-_08114720: .4byte gUnknown_203AF98
-	thumb_func_end sub_8114710
-
-	thumb_func_start sub_8114724
-sub_8114724: @ 8114724
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _0811473C @ =gStringVar4
-	ldr r1, _08114740 @ =gUnknown_841A50B
-	bl StringExpandPlaceholders
-	adds r4, 0x4
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0811473C: .4byte gStringVar4
-_08114740: .4byte gUnknown_841A50B
-	thumb_func_end sub_8114724
-
-	thumb_func_start sub_8114744
-sub_8114744: @ 8114744
-	movs r1, 0x11
-	strh r1, [r0]
-	ldr r1, _08114754 @ =gUnknown_203AF98
-	ldrh r1, [r1]
-	strh r1, [r0, 0x2]
-	adds r0, 0x4
-	bx lr
-	.align 2, 0
-_08114754: .4byte gUnknown_203AF98
-	thumb_func_end sub_8114744
-
-	thumb_func_start sub_8114758
-sub_8114758: @ 8114758
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _08114770 @ =gStringVar4
-	ldr r1, _08114774 @ =gUnknown_841A732
-	bl StringExpandPlaceholders
-	adds r4, 0x4
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114770: .4byte gStringVar4
-_08114774: .4byte gUnknown_841A732
-	thumb_func_end sub_8114758
-
 	thumb_func_start sub_8114778
 sub_8114778: @ 8114778
 	push {r4,lr}
diff --git a/src/quest_log.c b/src/quest_log.c
index 57e5ac0b9..d664f3e25 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -3918,16 +3918,6 @@ const u16 * sub_811448C(const u16 * a0)
     return r6;
 }
 
-u16 * sub_81144EC(u16 * a0, const u16 * a1)
-{
-    a0[0] = 13;
-    a0[1] = gUnknown_203AF98;
-    *((u8 *)a0 + 4) = *((const u8 *)a1 + 0);
-    memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7);
-    a0 += 6;
-    return a0;
-}
-
 const u8 *const gUnknown_8456ACC[] = {
     gUnknown_841A74E,
     gUnknown_841A756,
@@ -3946,6 +3936,16 @@ const u8 *const gUnknown_8456AE4[] = {
     gUnknown_841AFD1
 };
 
+u16 * sub_81144EC(u16 * a0, const u16 * a1)
+{
+    a0[0] = 13;
+    a0[1] = gUnknown_203AF98;
+    *((u8 *)a0 + 4) = *((const u8 *)a1 + 0);
+    memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7);
+    a0 += 6;
+    return a0;
+}
+
 const u16 * sub_8114518(const u16 * a0)
 {
     UnkTextUtil_Reset();
@@ -3959,3 +3959,90 @@ const u16 * sub_8114518(const u16 * a0)
     a0 += 6;
     return a0;
 }
+
+u16 * sub_8114578(u16 * a0, const u16 * a1)
+{
+    a0[0] = 14;
+    a0[1] = gUnknown_203AF98;
+    *((u8 *)a0 + 4) = *((const u8 *)a1 + 0);
+    memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7);
+    a0 += 6;
+    return a0;
+}
+
+const u16 * sub_81145A4(const u16 * a0)
+{
+    UnkTextUtil_Reset();
+
+    memset(gStringVar1, EOS, 8);
+    memcpy(gStringVar1, (const u8 *)a0 + 5, 7);
+    sub_8115834(gStringVar1);
+    UnkTextUtil_SetPtrI(0, gStringVar1);
+    UnkTextUtil_SetPtrI(1, gUnknown_8456AE4[((const u8 *)a0)[4]]);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A477);
+    a0 += 6;
+    return a0;
+}
+
+u16 * sub_8114604(u16 * a0, const u16 * a1)
+{
+    a0[0] = 15;
+    a0[1] = gUnknown_203AF98;
+    *((u8 *)a0 + 4) = *((const u8 *)a1 + 0);
+    memcpy((u8 *)a0 +  5, (const u8 *)a1 +  1, 7);
+    memcpy((u8 *)a0 + 12, (const u8 *)a1 +  8, 7);
+    memcpy((u8 *)a0 + 19, (const u8 *)a1 + 15, 7);
+    a0 += 13;
+    return a0;
+}
+
+const u16 * sub_811464C(const u16 * a0)
+{
+    UnkTextUtil_Reset();
+
+    memset(gStringVar1, EOS, 8);
+    memset(gStringVar2, EOS, 8);
+    memset(gStringVar3, EOS, 8);
+    StringCopy7(gStringVar1, (const u8 *)a0 +  5);
+    StringCopy7(gStringVar2, (const u8 *)a0 + 12);
+    StringCopy7(gStringVar3, (const u8 *)a0 + 19);
+    sub_8115834(gStringVar1);
+    sub_8115834(gStringVar2);
+    sub_8115834(gStringVar3);
+    UnkTextUtil_SetPtrI(0, gSaveBlock2Ptr->playerName);
+    UnkTextUtil_SetPtrI(1, gStringVar1);
+    UnkTextUtil_SetPtrI(2, gStringVar2);
+    UnkTextUtil_SetPtrI(3, gStringVar3);
+    UnkTextUtil_SetPtrI(4, gUnknown_8456AE4[((const u8 *)a0)[4]]);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A4C6);
+    a0 += 13;
+    return a0;
+}
+
+u16 * sub_8114710(u16 * a0, const u16 * a1)
+{
+    a0[0] = 16;
+    a0[1] = gUnknown_203AF98;
+    return a0 + 2;
+}
+
+const u16 * sub_8114724(const u16 * a0)
+{
+    StringExpandPlaceholders(gStringVar4, gUnknown_841A50B);
+    a0 += 2;
+    return a0;
+}
+
+u16 * sub_8114744(u16 * a0, const u16 * a1)
+{
+    a0[0] = 17;
+    a0[1] = gUnknown_203AF98;
+    return a0 + 2;
+}
+
+const u16 * sub_8114758(const u16 * a0)
+{
+    StringExpandPlaceholders(gStringVar4, gUnknown_841A732);
+    a0 += 2;
+    return a0;
+}