through sub_8114834

asm/quest_log.s

@@ -5,136 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8114778
-sub_8114778: @ 8114778
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r4, 0x8
-	movs r2, 0x12
-	strh r2, [r0]
-	ldr r2, _081147A4 @ =gUnknown_203AF98
-	ldrh r2, [r2]
-	strh r2, [r0, 0x2]
-	ldrh r2, [r1]
-	strh r2, [r0, 0x4]
-	ldrh r2, [r1, 0x2]
-	strh r2, [r0, 0x6]
-	adds r1, 0x4
-	adds r0, r4, 0
-	movs r2, 0x7
-	bl memcpy
-	adds r4, 0x8
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081147A4: .4byte gUnknown_203AF98
-	thumb_func_end sub_8114778
-
-	thumb_func_start sub_81147A8
-sub_81147A8: @ 81147A8
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r6, r5, 0
-	adds r6, 0x8
-	ldr r4, _081147F4 @ =gStringVar1
-	adds r0, r4, 0
-	movs r1, 0xFF
-	movs r2, 0x8
-	bl memset
-	adds r0, r4, 0
-	adds r1, r6, 0
-	movs r2, 0x7
-	bl memcpy
-	adds r0, r4, 0
-	bl sub_8115834
-	ldrh r0, [r5, 0x6]
-	ldr r1, _081147F8 @ =gStringVar2
-	movs r2, 0
-	bl QuestLog_AutoGetSpeciesName
-	ldrh r0, [r5, 0x4]
-	ldr r1, _081147FC @ =gStringVar3
-	movs r2, 0
-	bl QuestLog_AutoGetSpeciesName
-	ldr r0, _08114800 @ =gStringVar4
-	ldr r1, _08114804 @ =gUnknown_841A76A
-	bl StringExpandPlaceholders
-	adds r6, 0x8
-	adds r0, r6, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081147F4: .4byte gStringVar1
-_081147F8: .4byte gStringVar2
-_081147FC: .4byte gStringVar3
-_08114800: .4byte gStringVar4
-_08114804: .4byte gUnknown_841A76A
-	thumb_func_end sub_81147A8
-
-	thumb_func_start sub_8114808
-sub_8114808: @ 8114808
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x13
-	strh r0, [r4]
-	ldr r0, _08114830 @ =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
-_08114830: .4byte gUnknown_203AF98
-	thumb_func_end sub_8114808
-
-	thumb_func_start sub_8114834
-sub_8114834: @ 8114834
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _08114878 @ =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
-	ldr r0, _0811487C @ =gStringVar2
-	ldr r2, _08114880 @ =gUnknown_8456AE4
-	ldrb r1, [r5, 0x4]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl StringCopy
-	ldr r0, _08114884 @ =gStringVar4
-	ldr r1, _08114888 @ =gUnknown_841A7B0
-	bl StringExpandPlaceholders
-	adds r5, 0xC
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114878: .4byte gStringVar1
-_0811487C: .4byte gStringVar2
-_08114880: .4byte gUnknown_8456AE4
-_08114884: .4byte gStringVar4
-_08114888: .4byte gUnknown_841A7B0
-	thumb_func_end sub_8114834
-
 	thumb_func_start sub_811488C
 sub_811488C: @ 811488C
 	push {r4,lr}

src/quest_log.c

@@ -4046,3 +4046,49 @@ const u16 * sub_8114758(const u16 * a0)
     a0 += 2;
     return a0;
 }
+
+u16 * sub_8114778(u16 * a0, const u16 * a1)
+{
+    u8 * r4 = (u8 *)(a0 + 4);
+    a0[0] = 18;
+    a0[1] = gUnknown_203AF98;
+    a0[2] = a1[0];
+    a0[3] = a1[1];
+    memcpy(r4, a1 + 2, 7);
+    r4 += 8;
+    return (u16 *)r4;
+}
+
+const u16 * sub_81147A8(const u16 * a0)
+{
+    const u8 * r6 = (const u8 *)(a0 + 4);
+    memset(gStringVar1, EOS, 8);
+    memcpy(gStringVar1, r6, 7);
+    sub_8115834(gStringVar1);
+    QuestLog_AutoGetSpeciesName(a0[3], gStringVar2, 0);
+    QuestLog_AutoGetSpeciesName(a0[2], gStringVar3, 0);
+    StringExpandPlaceholders(gStringVar4, gUnknown_841A76A);
+    r6 += 8;
+    return (const u16 *)r6;
+}
+
+u16 * sub_8114808(u16 * a0, const u16 * a1)
+{
+    a0[0] = 19;
+    a0[1] = gUnknown_203AF98;
+    *(u8 *)&a0[2] = *(const u8 *)&a1[0];
+    memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7);
+    a0 += 6;
+    return a0;
+}
+
+const u16 * sub_8114834(const u16 * a0)
+{
+    memset(gStringVar1, EOS, 8);
+    memcpy(gStringVar1, (const u8 *)a0 + 5, 7);
+    sub_8115834(gStringVar1);
+    StringCopy(gStringVar2, gUnknown_8456AE4[*(const u8 *)&a0[2]]);
+    StringExpandPlaceholders(gStringVar4, gUnknown_841A7B0);
+    a0 += 6;
+    return a0;
+}