through sub_81151DC

2 files changed, 28 insertions, 90 deletions

diff --git a/asm/quest_log.s b/asm/quest_log.s
index e6d9448f1..3ed9101ed 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -5,96 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81151C0
-sub_81151C0: @ 81151C0
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldr r1, _081151D8 @ =gUnknown_203B048
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x22
-	adds r1, r3, 0
-	bl sub_8114D18
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081151D8: .4byte gUnknown_203B048
-	thumb_func_end sub_81151C0
-
-	thumb_func_start sub_81151DC
-sub_81151DC: @ 81151DC
-	push {r4-r6,lr}
-	adds r1, r0, 0
-	movs r0, 0x22
-	bl sub_8113E88
-	adds r5, r0, 0
-	adds r6, r5, 0x6
-	bl UnkTextUtil_Reset
-	ldr r4, _0811522C @ =gStringVar1
-	ldrb r1, [r5, 0x6]
-	adds r0, r4, 0
-	bl sub_80C4DF8
-	movs r0, 0
-	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
-	ldr r3, _08115230 @ =gTrainers
-	ldrh r1, [r5, 0x4]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r2, r0, 3
-	adds r0, r2, r3
-	ldrb r0, [r0, 0x1]
-	cmp r0, 0x51
-	beq _0811521A
-	cmp r0, 0x59
-	beq _0811521A
-	cmp r0, 0x5A
-	bne _08115234
-_0811521A:
-	movs r0, 0x6
-	bl GetExpandedPlaceholder
-	adds r1, r0, 0
-	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
-	b _0811523E
-	.align 2, 0
-_0811522C: .4byte gStringVar1
-_08115230: .4byte gTrainers
-_08115234:
-	adds r1, r3, 0x4
-	adds r1, r2, r1
-	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
-_0811523E:
-	ldrh r0, [r5]
-	movs r1, 0
-	movs r2, 0x2
-	bl QuestLog_AutoGetSpeciesName
-	ldrh r0, [r5, 0x2]
-	movs r1, 0
-	movs r2, 0x3
-	bl QuestLog_AutoGetSpeciesName
-	ldr r1, _08115274 @ =gUnknown_8456ACC
-	ldrb r0, [r6, 0x1]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	movs r0, 0x4
-	bl UnkTextUtil_SetPtrI
-	ldr r0, _08115278 @ =gStringVar4
-	ldr r1, _0811527C @ =gUnknown_841AF6D
-	bl UnkTextUtil_StringExpandPlaceholders
-	adds r0, r6, 0x2
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08115274: .4byte gUnknown_8456ACC
-_08115278: .4byte gStringVar4
-_0811527C: .4byte gUnknown_841AF6D
-	thumb_func_end sub_81151DC
-
 	thumb_func_start sub_8115280
 sub_8115280: @ 8115280
 	push {r4,lr}
diff --git a/src/quest_log.c b/src/quest_log.c
index 9bd7d6227..08fb1fb37 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -4515,3 +4515,31 @@ const u16 * sub_81150CC(const u16 * a0)
     }
     return (const u16 *)(r5 + 2);
 }
+
+u16 * sub_81151C0(u16 * a0, const u16 * a1)
+{
+    gUnknown_203B048 = TRUE;
+    return sub_8114D18(34, a0, a1);
+}
+
+const u16 * sub_81151DC(const u16 * a0)
+{
+    const u16 * r5 = sub_8113E88(34, a0);
+    const u8 * r6 = (const u8 *)r5 + 6;
+    UnkTextUtil_Reset();
+    sub_80C4DF8(gStringVar1, r6[0]);
+    UnkTextUtil_SetPtrI(0, gStringVar1);
+    if (
+            gTrainers[r5[2]].trainerClass == 0x51
+         || gTrainers[r5[2]].trainerClass == 0x59
+         || gTrainers[r5[2]].trainerClass == 0x5A
+    )
+        UnkTextUtil_SetPtrI(1, GetExpandedPlaceholder(6));
+    else
+        UnkTextUtil_SetPtrI(1, gTrainers[r5[2]].trainerName);
+    QuestLog_AutoGetSpeciesName(r5[0], NULL, 2);
+    QuestLog_AutoGetSpeciesName(r5[1], NULL, 3);
+    UnkTextUtil_SetPtrI(4, gUnknown_8456ACC[r6[1]]);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AF6D);
+    return (const u16 *)(r6 + 2);
+}