through sub_8114CE4

3 files changed, 128 insertions, 329 deletions

diff --git a/asm/quest_log.s b/asm/quest_log.s
index f9b059837..2b2b22c14 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -5,335 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8114AA0
-sub_8114AA0: @ 8114AA0
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x18
-	adds r1, r2, 0
-	bl sub_8113DE0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08114AC0
-	ldrh r0, [r4]
-	strh r0, [r2]
-	ldrb r0, [r4, 0x4]
-	strb r0, [r2, 0x2]
-	adds r0, r2, 0x4
-	b _08114AC2
-_08114AC0:
-	movs r0, 0
-_08114AC2:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114AA0
-
-	thumb_func_start sub_8114AC8
-sub_8114AC8: @ 8114AC8
-	push {r4,r5,lr}
-	adds r1, r0, 0
-	movs r0, 0x18
-	bl sub_8113E88
-	adds r4, r0, 0
-	adds r5, r4, 0x2
-	bl UnkTextUtil_Reset
-	ldrb r0, [r4, 0x2]
-	bl GetBoxNamePtr
-	adds r1, r0, 0
-	movs r0, 0
-	bl UnkTextUtil_SetPtrI
-	ldrh r0, [r4]
-	movs r1, 0
-	movs r2, 0x1
-	bl QuestLog_AutoGetSpeciesName
-	ldr r0, _08114B04 @ =gStringVar4
-	ldr r1, _08114B08 @ =gUnknown_841A5FA
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r5, 0x2
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114B04: .4byte gStringVar4
-_08114B08: .4byte gUnknown_841A5FA
-	thumb_func_end sub_8114AC8
-
-	thumb_func_start sub_8114B0C
-sub_8114B0C: @ 8114B0C
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x19
-	adds r1, r2, 0
-	bl sub_8113DE0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08114B2C
-	ldrh r0, [r4]
-	strh r0, [r2]
-	ldrb r0, [r4, 0x4]
-	strb r0, [r2, 0x2]
-	adds r0, r2, 0x4
-	b _08114B2E
-_08114B2C:
-	movs r0, 0
-_08114B2E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114B0C
-
-	thumb_func_start sub_8114B34
-sub_8114B34: @ 8114B34
-	push {r4,r5,lr}
-	adds r1, r0, 0
-	movs r0, 0x19
-	bl sub_8113E88
-	adds r4, r0, 0
-	adds r5, r4, 0x2
-	bl UnkTextUtil_Reset
-	ldrb r0, [r4, 0x2]
-	bl GetBoxNamePtr
-	adds r1, r0, 0
-	movs r0, 0
-	bl UnkTextUtil_SetPtrI
-	ldrh r0, [r4]
-	movs r1, 0
-	movs r2, 0x1
-	bl QuestLog_AutoGetSpeciesName
-	ldr r0, _08114B70 @ =gStringVar4
-	ldr r1, _08114B74 @ =gUnknown_841A632
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r5, 0x2
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114B70: .4byte gStringVar4
-_08114B74: .4byte gUnknown_841A632
-	thumb_func_end sub_8114B34
-
-	thumb_func_start sub_8114B78
-sub_8114B78: @ 8114B78
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x1A
-	adds r1, r2, 0
-	bl sub_8113DE0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08114B98
-	ldrh r0, [r4]
-	strh r0, [r2]
-	ldrb r0, [r4, 0x4]
-	strb r0, [r2, 0x2]
-	adds r0, r2, 0x4
-	b _08114B9A
-_08114B98:
-	movs r0, 0
-_08114B9A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114B78
-
-	thumb_func_start sub_8114BA0
-sub_8114BA0: @ 8114BA0
-	push {r4,r5,lr}
-	adds r1, r0, 0
-	movs r0, 0x1A
-	bl sub_8113E88
-	adds r4, r0, 0
-	adds r5, r4, 0x2
-	bl UnkTextUtil_Reset
-	ldrh r0, [r4]
-	movs r1, 0
-	movs r2, 0
-	bl QuestLog_AutoGetSpeciesName
-	ldrb r0, [r4, 0x2]
-	bl GetBoxNamePtr
-	adds r1, r0, 0
-	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
-	ldr r0, _08114BDC @ =gStringVar4
-	ldr r1, _08114BE0 @ =gUnknown_841A64F
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r5, 0x2
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114BDC: .4byte gStringVar4
-_08114BE0: .4byte gUnknown_841A64F
-	thumb_func_end sub_8114BA0
-
-	thumb_func_start sub_8114BE4
-sub_8114BE4: @ 8114BE4
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x1B
-	adds r1, r2, 0
-	bl sub_8113DE0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08114C04
-	ldrb r0, [r4, 0x4]
-	strb r0, [r2]
-	ldrb r0, [r4, 0x5]
-	strb r0, [r2, 0x1]
-	adds r0, r2, 0x2
-	b _08114C06
-_08114C04:
-	movs r0, 0
-_08114C06:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114BE4
-
-	thumb_func_start sub_8114C0C
-sub_8114C0C: @ 8114C0C
-	push {r4,lr}
-	adds r1, r0, 0
-	movs r0, 0x1B
-	bl sub_8113E88
-	adds r4, r0, 0
-	bl UnkTextUtil_Reset
-	ldrb r0, [r4]
-	bl GetBoxNamePtr
-	adds r1, r0, 0
-	movs r0, 0
-	bl UnkTextUtil_SetPtrI
-	ldrb r0, [r4]
-	ldrb r1, [r4, 0x1]
-	cmp r0, r1
-	bne _08114C40
-	ldr r1, _08114C3C @ =gUnknown_841A694
-	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
-	b _08114C4E
-	.align 2, 0
-_08114C3C: .4byte gUnknown_841A694
-_08114C40:
-	ldrb r0, [r4, 0x1]
-	bl GetBoxNamePtr
-	adds r1, r0, 0
-	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
-_08114C4E:
-	ldr r0, _08114C60 @ =gStringVar4
-	ldr r1, _08114C64 @ =gUnknown_841A66E
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r0, r4, 0x2
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114C60: .4byte gStringVar4
-_08114C64: .4byte gUnknown_841A66E
-	thumb_func_end sub_8114C0C
-
-	thumb_func_start sub_8114C68
-sub_8114C68: @ 8114C68
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x1C
-	adds r1, r2, 0
-	bl sub_8113DE0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08114C84
-	ldrh r0, [r4]
-	strh r0, [r2]
-	adds r0, r2, 0x2
-	b _08114C86
-_08114C84:
-	movs r0, 0
-_08114C86:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114C68
-
-	thumb_func_start sub_8114C8C
-sub_8114C8C: @ 8114C8C
-	push {r4,lr}
-	adds r1, r0, 0
-	movs r0, 0x1C
-	bl sub_8113E88
-	adds r4, r0, 0
-	ldrh r0, [r4]
-	ldr r1, _08114CB4 @ =gStringVar1
-	bl sub_8099E90
-	ldr r0, _08114CB8 @ =gStringVar4
-	ldr r1, _08114CBC @ =gUnknown_841A391
-	bl StringExpandPlaceholders
-	adds r4, 0x2
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114CB4: .4byte gStringVar1
-_08114CB8: .4byte gStringVar4
-_08114CBC: .4byte gUnknown_841A391
-	thumb_func_end sub_8114C8C
-
-	thumb_func_start sub_8114CC0
-sub_8114CC0: @ 8114CC0
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x1D
-	adds r1, r2, 0
-	bl sub_8113DE0
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08114CDC
-	ldrh r0, [r4]
-	strh r0, [r2]
-	adds r0, r2, 0x2
-	b _08114CDE
-_08114CDC:
-	movs r0, 0
-_08114CDE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114CC0
-
-	thumb_func_start sub_8114CE4
-sub_8114CE4: @ 8114CE4
-	push {r4,lr}
-	adds r1, r0, 0
-	movs r0, 0x1D
-	bl sub_8113E88
-	adds r4, r0, 0
-	ldrh r0, [r4]
-	ldr r1, _08114D0C @ =gStringVar1
-	bl sub_8099E90
-	ldr r0, _08114D10 @ =gStringVar4
-	ldr r1, _08114D14 @ =gUnknown_841A3DA
-	bl StringExpandPlaceholders
-	adds r4, 0x2
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114D0C: .4byte gStringVar1
-_08114D10: .4byte gStringVar4
-_08114D14: .4byte gUnknown_841A3DA
-	thumb_func_end sub_8114CE4
-
 	thumb_func_start sub_8114D18
 sub_8114D18: @ 8114D18
 	push {r4,lr}
diff --git a/include/item.h b/include/item.h
index 199b3b65e..75c56c94d 100644
--- a/include/item.h
+++ b/include/item.h
@@ -62,5 +62,6 @@ u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
 void sub_809A2DC(void);
 void sub_809A2A4(void);
+void sub_8099E90(u16, u8 *);
 
 #endif // ITEM_H
diff --git a/src/quest_log.c b/src/quest_log.c
index 4dccdb890..f4b964d96 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -4205,3 +4205,130 @@ const u16 * sub_8114A4C(const u16 * a0)
     UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A59C);
     return (const u16 *)boxIdxs + 1;
 }
+
+u16 * sub_8114AA0(u16 * a0, const u16 * a1)
+{
+    u16 * r2;
+    r2 = sub_8113DE0(24, a0);
+    if (r2 == NULL)
+        return NULL;
+    r2[0] = a1[0];
+    *((u8 *)r2 + 2) = *((const u8 *)a1 + 4);
+    return r2 + 2;
+}
+
+const u16 * sub_8114AC8(const u16 * a0)
+{
+    const u8 * boxIdxs;
+    a0 = sub_8113E88(24, a0);
+    boxIdxs = (const u8 *)a0 + 2;
+    UnkTextUtil_Reset();
+    UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0]));
+    QuestLog_AutoGetSpeciesName(a0[0], NULL, 1);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A5FA);
+    return (const u16 *)boxIdxs + 1;
+}
+
+u16 * sub_8114B0C(u16 * a0, const u16 * a1)
+{
+    u16 * r2;
+    r2 = sub_8113DE0(25, a0);
+    if (r2 == NULL)
+        return NULL;
+    r2[0] = a1[0];
+    *((u8 *)r2 + 2) = *((const u8 *)a1 + 4);
+    return r2 + 2;
+}
+
+const u16 * sub_8114B34(const u16 * a0)
+{
+    const u8 * boxIdxs;
+    a0 = sub_8113E88(25, a0);
+    boxIdxs = (const u8 *)a0 + 2;
+    UnkTextUtil_Reset();
+    UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0]));
+    QuestLog_AutoGetSpeciesName(a0[0], NULL, 1);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A632);
+    return (const u16 *)boxIdxs + 1;
+}
+
+u16 * sub_8114B78(u16 * a0, const u16 * a1)
+{
+    u16 * r2;
+    r2 = sub_8113DE0(26, a0);
+    if (r2 == NULL)
+        return NULL;
+    r2[0] = a1[0];
+    *((u8 *)r2 + 2) = *((const u8 *)a1 + 4);
+    return r2 + 2;
+}
+
+const u16 * sub_8114BA0(const u16 * a0)
+{
+    const u8 * boxIdxs;
+    a0 = sub_8113E88(26, a0);
+    boxIdxs = (const u8 *)a0 + 2;
+    UnkTextUtil_Reset();
+    QuestLog_AutoGetSpeciesName(a0[0], NULL, 0);
+    UnkTextUtil_SetPtrI(1, GetBoxNamePtr(boxIdxs[0]));
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A64F);
+    return (const u16 *)boxIdxs + 1;
+}
+
+u16 * sub_8114BE4(u16 * a0, const u16 * a1)
+{
+    u16 * r2;
+    r2 = sub_8113DE0(27, a0);
+    if (r2 == NULL)
+        return NULL;
+    *((u8 *)r2 + 0) = *((const u8 *)a1 + 4);
+    *((u8 *)r2 + 1) = *((const u8 *)a1 + 5);
+    return r2 + 1;
+}
+
+const u16 * sub_8114C0C(const u16 * a0)
+{
+    const u16 *r4 = sub_8113E88(27, a0);
+    UnkTextUtil_Reset();
+    UnkTextUtil_SetPtrI(0, GetBoxNamePtr(*((const u8 *)r4 + 0)));
+    if (*((const u8 *)r4 + 0) == *((const u8 *)r4 + 1))
+        UnkTextUtil_SetPtrI(1, gUnknown_841A694);
+    else
+        UnkTextUtil_SetPtrI(1, GetBoxNamePtr(*((const u8 *)r4 + 1)));
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A66E);
+    return r4 + 1;
+}
+
+u16 * sub_8114C68(u16 * a0, const u16 * a1)
+{
+    a0 = sub_8113DE0(28, a0);
+    if (a0 == NULL)
+        return NULL;
+    a0[0] = a1[0];
+    return a0 + 1;
+}
+
+const u16 * sub_8114C8C(const u16 * a0)
+{
+    const u16 *r4 = sub_8113E88(28, a0);
+    sub_8099E90(r4[0], gStringVar1);
+    StringExpandPlaceholders(gStringVar4, gUnknown_841A391);
+    return r4 + 1;
+}
+
+u16 * sub_8114CC0(u16 * a0, const u16 * a1)
+{
+    a0 = sub_8113DE0(29, a0);
+    if (a0 == NULL)
+        return NULL;
+    a0[0] = a1[0];
+    return a0 + 1;
+}
+
+const u16 * sub_8114CE4(const u16 * a0)
+{
+    const u16 *r4 = sub_8113E88(29, a0);
+    sub_8099E90(r4[0], gStringVar1);
+    StringExpandPlaceholders(gStringVar4, gUnknown_841A3DA);
+    return r4 + 1;
+}