From 1049cd670d115c114f616e9118bc0fc9fb5fac64 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 2 Nov 2017 19:48:43 -0400
Subject: [PATCH] through sub_811A938

---
 asm/easy_chat.s | 64 -------------------------------------------------
 src/easy_chat.c | 22 ++++++++++++++++-
 2 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 5c89b1528d..2e2284aac1 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -5,70 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_811A8CC
-sub_811A8CC: @ 811A8CC
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00003b6e
-	adds r1, r0
-	ldr r2, =sub_80861B0
-	movs r0, 0xF
-	movs r3, 0x3
-	bl sub_811A20C
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_811A8CC
-
-	thumb_func_start sub_811A8F0
-sub_811A8F0: @ 811A8F0
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00003b5a
-	adds r1, r0
-	ldr r2, =sub_80861B0
-	movs r0, 0x10
-	movs r3, 0x3
-	bl sub_811A20C
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_811A8F0
-
-	thumb_func_start sub_811A914
-sub_811A914: @ 811A914
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00003b6c
-	adds r1, r0
-	ldr r2, =sub_80861B0
-	movs r0, 0x12
-	movs r3, 0x3
-	bl sub_811A20C
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_811A914
-
-	thumb_func_start sub_811A938
-sub_811A938: @ 811A938
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00003b5a
-	adds r1, r0
-	ldr r2, =sub_80861B0
-	movs r0, 0x11
-	movs r3, 0x3
-	bl sub_811A20C
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_811A938
-
 	thumb_func_start sub_811A95C
 sub_811A95C: @ 811A95C
 	push {r4-r7,lr}
diff --git a/src/easy_chat.c b/src/easy_chat.c
index de66fb9eb5..c1a68f4e25 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -30,7 +30,7 @@ static void sub_811A2FC(u8);
 /*static*/ void sub_811A4D0(MainCallback);
 static bool32 sub_811A88C(u16);
 static void sub_811A8A4(u16);
-void sub_811A8F0(void);
+static void sub_811A8F0(void);
 bool8 sub_811A95C(u8, u32, u8);
 void sub_811AA90(void);
 /*static*/ u16 sub_811AAAC(void);
@@ -366,3 +366,23 @@ static void sub_811A8A4(u16 word)
     ResetTasks();
     sub_811A4D0(gUnknown_08597530[i].callback);
 }
+
+static void sub_811A8CC(void)
+{
+    sub_811A20C(0xF, gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, sub_80861B0, 3);
+}
+
+static void sub_811A8F0(void)
+{
+    sub_811A20C(0x10, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, sub_80861B0, 3);
+}
+
+static void sub_811A914(void)
+{
+    sub_811A20C(0x12, gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, sub_80861B0, 3);
+}
+
+static void sub_811A938(void)
+{
+    sub_811A20C(0x11, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, sub_80861B0, 3);
+}