From fdea92edffb4360db50cb0e7dcc044dc7242defe Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 11:48:11 -0400
Subject: [PATCH] through sub_818E3E0

---
 asm/lilycove_lady.s | 65 ---------------------------------------------
 include/item_menu.h |  1 +
 src/lilycove_lady.c | 29 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 65 deletions(-)

diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s
index 0c46932cf0..72b321ef80 100644
--- a/asm/lilycove_lady.s
+++ b/asm/lilycove_lady.s
@@ -5,71 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_818E358
-sub_818E358: @ 818E358
-	ldr r1, =gUnknown_0203CD68
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r0, [r0, 0x28]
-	strh r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_818E358
-
-	thumb_func_start sub_818E37C
-sub_818E37C: @ 818E37C
-	ldr r1, =gUnknown_0203CD68
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	movs r1, 0x1
-	strb r1, [r0, 0x1]
-	bx lr
-	.pool
-	thumb_func_end sub_818E37C
-
-	thumb_func_start sub_818E39C
-sub_818E39C: @ 818E39C
-	ldr r1, =gUnknown_0203CD68
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	movs r1, 0x2
-	strb r1, [r0, 0x1]
-	bx lr
-	.pool
-	thumb_func_end sub_818E39C
-
-	thumb_func_start sub_818E3BC
-sub_818E3BC: @ 818E3BC
-	ldr r1, =gUnknown_0203CD68
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	ldr r1, =0x0000ffff
-	strh r1, [r0, 0x16]
-	bx lr
-	.pool
-	thumb_func_end sub_818E3BC
-
-	thumb_func_start sub_818E3E0
-sub_818E3E0: @ 818E3E0
-	push {lr}
-	bl sub_81AAC70
-	pop {r0}
-	bx r0
-	thumb_func_end sub_818E3E0
-
 	thumb_func_start sub_818E3EC
 sub_818E3EC: @ 818E3EC
 	push {r4,lr}
diff --git a/include/item_menu.h b/include/item_menu.h
index f402f5cdde..85655e9d59 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -7,5 +7,6 @@
 
 // Exported ROM declarations
 void sub_81AAC50(void);
+void sub_81AAC70(void);
 
 #endif //GUARD_item_menu_H
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 485a0c9d4c..c4a0b9c115 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -593,3 +593,32 @@ bool8 sub_818E308(void)
     CopyEasyChatWord(gStringVar2, gUnknown_0203CD68->unk_016);
     return StringCompare(gStringVar1, gStringVar2) ? FALSE : TRUE;
 }
+
+void sub_818E358(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gSpecialVar_0x8005 = gUnknown_0203CD68->itemId;
+}
+
+void sub_818E37C(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_001 = 1;
+}
+
+void sub_818E39C(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_001 = 2;
+}
+
+void sub_818E3BC(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_016 = -1;
+}
+
+void sub_818E3E0(void)
+{
+    sub_81AAC70();
+}