From e6caf0ff1019a1744df5b7c550a1a40db33d0154 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sun, 24 Mar 2019 17:20:35 -0500
Subject: Port mevent2.c from pokefirered

---
 src/easy_chat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/easy_chat.c')

diff --git a/src/easy_chat.c b/src/easy_chat.c
index 4cc8b9c5b..a6d22f8bf 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1318,7 +1318,7 @@ void ShowEasyChatScreen(void)
         words = gSaveBlock2Ptr->apprentices[0].easyChatWords;
         break;
     case EASY_CHAT_TYPE_QUESTIONNAIRE:
-        words = GetSaveBlock1Field3564();
+        words = sub_801B058();
         break;
     default:
         return;
@@ -5531,7 +5531,7 @@ void InitializeEasyChatWordArray(u16 *words, u16 length)
 void sub_811F8BC(void)
 {
     int i;
-    u16 *words = GetSaveBlock1Field3564();
+    u16 *words = sub_801B058();
     for (i = 0; i < 4; i++)
         words[i] = 0xFFFF;
 }
-- 
cgit v1.2.3


From d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sun, 24 Mar 2019 18:13:32 -0500
Subject: Cleanup mevent2

---
 src/easy_chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/easy_chat.c')

diff --git a/src/easy_chat.c b/src/easy_chat.c
index a6d22f8bf..2e384de6e 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -14,8 +14,8 @@
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "international_string_util.h"
-#include "link.h"
 #include "main.h"
+#include "mevent.h"
 #include "menu.h"
 #include "overworld.h"
 #include "palette.h"
-- 
cgit v1.2.3