through sub_8111A34

2 files changed, 56 insertions, 141 deletions

diff --git a/asm/quest_log.s b/asm/quest_log.s
index b9ac6668c..553a50ace 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -5,147 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81119C8
-sub_81119C8: @ 81119C8
-	push {lr}
-	bl sub_8111914
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81119C8
-
-	thumb_func_start sub_81119D4
-sub_81119D4: @ 81119D4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _081119E8 @ =gUnknown_203ADFA
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _081119EC
-	cmp r0, 0x2
-	beq _081119F2
-	b _08111A2C
-	.align 2, 0
-_081119E8: .4byte gUnknown_203ADFA
-_081119EC:
-	bl sub_8112364
-	b _08111A2C
-_081119F2:
-	ldr r1, _08111A20 @ =gUnknown_3005E88
-	movs r0, 0x3
-	strb r0, [r1]
-	ldr r0, _08111A24 @ =sub_8111A34
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08111A28 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0
-	strh r2, [r1, 0x8]
-	strh r2, [r1, 0xA]
-	movs r1, 0xE
-	adds r2, r4, 0
-	bl SetWordTaskArg
-	movs r0, 0x1
-	b _08111A2E
-	.align 2, 0
-_08111A20: .4byte gUnknown_3005E88
-_08111A24: .4byte sub_8111A34
-_08111A28: .4byte gTasks
-_08111A2C:
-	movs r0, 0
-_08111A2E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81119D4
-
-	thumb_func_start sub_8111A34
-sub_8111A34: @ 8111A34
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _08111A54 @ =gTasks+0x8
-	adds r4, r0, r1
-	movs r0, 0x2
-	ldrsh r1, [r4, r0]
-	cmp r1, 0
-	beq _08111A58
-	cmp r1, 0x1
-	beq _08111A90
-	b _08111AC0
-	.align 2, 0
-_08111A54: .4byte gTasks+0x8
-_08111A58:
-	ldrh r0, [r4]
-	adds r0, 0x1
-	strh r0, [r4]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x7F
-	bne _08111AC0
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r2, _08111A8C @ =gUnknown_203AE94
-	ldrb r1, [r2]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-	ldrh r0, [r4, 0x2]
-	adds r0, 0x1
-	strh r0, [r4, 0x2]
-	b _08111AC0
-	.align 2, 0
-_08111A8C: .4byte gUnknown_203AE94
-_08111A90:
-	ldr r0, _08111AC8 @ =gUnknown_2037AB8
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _08111AC0
-	ldr r0, _08111ACC @ =gUnknown_3005E88
-	strb r1, [r0]
-	adds r0, r5, 0
-	movs r1, 0xE
-	bl GetWordTaskArg
-	cmp r0, 0
-	beq _08111AB4
-	bl _call_via_r0
-_08111AB4:
-	adds r0, r5, 0
-	bl DestroyTask
-	ldr r1, _08111AD0 @ =gUnknown_203AE8C
-	ldr r0, _08111AD4 @ =sub_8111914
-	str r0, [r1]
-_08111AC0:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08111AC8: .4byte gUnknown_2037AB8
-_08111ACC: .4byte gUnknown_3005E88
-_08111AD0: .4byte gUnknown_203AE8C
-_08111AD4: .4byte sub_8111914
-	thumb_func_end sub_8111A34
-
 	thumb_func_start sub_8111AD8
 sub_8111AD8: @ 8111AD8
 	push {r4,r5,lr}
diff --git a/src/quest_log.c b/src/quest_log.c
index b7e38ef40..c50771491 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -70,6 +70,8 @@ void sub_811175C(u8, struct UnkStruct_203AE98 *);
 void sub_81118F4(s8);
 void sub_8111914(void);
 void sub_8111984(void);
+void sub_8112364(void);
+void sub_8111A34(u8);
 bool8 sub_8111F60(void);
 void * sub_8113D08(void *, struct UnkStruct_203AE98 *);
 void * sub_8113D94(void *, struct UnkStruct_203AE98 *);
@@ -924,3 +926,57 @@ void sub_8111984(void)
     gUnknown_203ADFA = 3;
     gUnknown_203AE8C = NULL;
 }
+
+void sub_81119C8(void)
+{
+    sub_8111914();
+}
+
+bool8 sub_81119D4(void (*a0)(void))
+{
+    u8 taskId;
+
+    switch (gUnknown_203ADFA)
+    {
+        case 1:
+            sub_8112364();
+            break;
+        case 2:
+            gUnknown_3005E88 = 3;
+            taskId = CreateTask(sub_8111A34, 80);
+            gTasks[taskId].data[0] = 0;
+            gTasks[taskId].data[1] = 0;
+            SetWordTaskArg(taskId, 14, (u32)a0);
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8111A34(u8 taskId)
+{
+    void (*routine)(void);
+    s16 * data = gTasks[taskId].data;
+
+    switch (data[1])
+    {
+        case 0:
+            if (++data[0] == 0x7F)
+            {
+                BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+                gUnknown_203AE94.unk_0_6 = 2;
+                data[1]++;
+            }
+            break;
+        case 1:
+            if (!gUnknown_2037AB8.active)
+            {
+                gUnknown_3005E88 = 0;
+                routine = (void (*)(void)) GetWordTaskArg(taskId, 14);
+                if (routine != NULL)
+                    routine();
+                DestroyTask(taskId);
+                gUnknown_203AE8C = sub_8111914;
+            }
+            break;
+    }
+}