through sub_81128BC

2 files changed, 43 insertions, 103 deletions

diff --git a/asm/quest_log.s b/asm/quest_log.s
index 09f621d43..69def6a01 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -5,109 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8112888
-sub_8112888: @ 8112888
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08112898
-	cmp r0, 0x2
-	beq _081128A8
-	b _081128B4
-_08112898:
-	ldr r1, _081128A4 @ =gUnknown_3005E88
-	ldrb r0, [r1]
-	cmp r0, 0x1
-	bne _081128B4
-	movs r0, 0x3
-	b _081128B2
-	.align 2, 0
-_081128A4: .4byte gUnknown_3005E88
-_081128A8:
-	ldr r1, _081128B8 @ =gUnknown_3005E88
-	ldrb r0, [r1]
-	cmp r0, 0x3
-	bne _081128B4
-	movs r0, 0x1
-_081128B2:
-	strb r0, [r1]
-_081128B4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081128B8: .4byte gUnknown_3005E88
-	thumb_func_end sub_8112888
-
-	thumb_func_start sub_81128BC
-sub_81128BC: @ 81128BC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_8112CAC
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r4, 0x1
-	beq _081128D4
-	cmp r4, 0x2
-	beq _08112928
-	b _08112934
-_081128D4:
-	cmp r1, 0x1
-	bne _081128E4
-	ldr r1, _081128E0 @ =gUnknown_3005E88
-	movs r0, 0x3
-	strb r0, [r1]
-	b _08112934
-	.align 2, 0
-_081128E0: .4byte gUnknown_3005E88
-_081128E4:
-	cmp r1, 0x2
-	bne _08112934
-	ldr r2, _08112918 @ =gUnknown_203AF98
-	ldrh r1, [r2]
-	ldr r0, _0811291C @ =gUnknown_3005E94
-	ldr r3, [r0]
-	lsls r1, 3
-	adds r1, r3
-	ldr r4, _08112920 @ =gUnknown_203B01A
-	ldrh r0, [r4]
-	movs r5, 0
-	strh r0, [r1, 0x4]
-	ldrh r0, [r2]
-	lsls r0, 3
-	adds r0, r3
-	movs r1, 0x3
-	strb r1, [r0, 0x6]
-	ldrh r0, [r2]
-	adds r0, 0x1
-	strh r0, [r2]
-	strh r5, [r4]
-	ldr r1, _08112924 @ =gUnknown_3005E88
-	movs r0, 0x4
-	strb r0, [r1]
-	b _08112934
-	.align 2, 0
-_08112918: .4byte gUnknown_203AF98
-_0811291C: .4byte gUnknown_3005E94
-_08112920: .4byte gUnknown_203B01A
-_08112924: .4byte gUnknown_3005E88
-_08112928:
-	cmp r1, 0x1
-	beq _08112930
-	cmp r1, 0x2
-	bne _08112934
-_08112930:
-	ldr r0, _0811293C @ =gUnknown_3005E88
-	strb r1, [r0]
-_08112934:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811293C: .4byte gUnknown_3005E88
-	thumb_func_end sub_81128BC
-
 	thumb_func_start sub_8112940
 sub_8112940: @ 8112940
 	push {r4-r7,lr}
diff --git a/src/quest_log.c b/src/quest_log.c
index 14809b8e4..834585ac9 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -114,6 +114,7 @@ void sub_811229C(void);
 void sub_8112364(void);
 void sub_8112888(u8);
 void sub_8112940(u8, struct UnkStruct_203AE98 *, u16);
+u8 sub_8112CAC(void);
 bool8 sub_8112CEC(void);
 bool8 sub_8112D1C(void);
 void sub_8113A1C(u8);
@@ -1564,3 +1565,45 @@ void sub_81127F8(u32 * a0)
             gUnknown_203B01A = FALSE;
     }
 }
+
+void sub_8112888(u8 a0)
+{
+    switch (a0)
+    {
+        case 1:
+            if (gUnknown_3005E88 == 1)
+                gUnknown_3005E88 = 3;
+            break;
+        case 2:
+            if (gUnknown_3005E88 == 3)
+                gUnknown_3005E88 = 1;
+            break;
+    }
+}
+
+void sub_81128BC(u8 a0)
+{
+    u8 r1 = sub_8112CAC();
+
+    switch (a0)
+    {
+        case 1:
+            if (r1 == 1)
+                gUnknown_3005E88 = 3;
+            else if (r1 == 2)
+            {
+                gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A;
+                gUnknown_3005E94[gUnknown_203AF98].unk_6 = 3;
+                gUnknown_203AF98++;
+                gUnknown_203B01A = 0;
+                gUnknown_3005E88 = 4;
+            }
+            break;
+        case 2:
+            if (r1 == 1)
+                gUnknown_3005E88 = 1;
+            else if (r1 == 2)
+                gUnknown_3005E88 = 2;
+            break;
+    }
+}