From 6d16dba22e9ea2b40bf684f7549b73a583d143f6 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Mon, 8 Jan 2018 23:16:13 -0600
Subject: re-label some window and text code

---
 src/easy_chat_1.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/easy_chat_1.c')

diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c
index e5b6cf7c3..908e4b9d6 100644
--- a/src/easy_chat_1.c
+++ b/src/easy_chat_1.c
@@ -16,8 +16,8 @@
 #include "strings.h"
 #include "unknown_task.h"
 
-extern const struct WindowConfig gWindowConfig_81E6D54;
-extern const struct WindowConfig gWindowConfig_81E6DA8;
+extern const struct WindowTemplate gWindowConfig_81E6D54;
+extern const struct WindowTemplate gWindowConfig_81E6DA8;
 
 extern void sub_80546B8(void);
 
@@ -310,7 +310,7 @@ void sub_80E62F8(void)
     case 2:
         InitMenuWindow(&gWindowConfig_81E6D54);
         InitMenuWindow(&gWindowConfig_81E6DA8);
-        MenuZeroFillScreen();
+        Menu_EraseScreen();
         break;
     case 3:
         sub_80E6424();
@@ -732,7 +732,7 @@ void sub_80E6BC0(void)
         {
             sub_80E91D4(2);
             DisplayYesNoMenu(23, 8, 1);
-            MoveMenuCursor(1);
+            Menu_MoveCursor(1);
             gEasyChatStruct->unk24++;
         }
         break;
@@ -770,7 +770,7 @@ void sub_80E6C84(void)
         sub_80E8398(2);
         sub_80E91D4(3);
         DisplayYesNoMenu(23, 8, 0);
-        MoveMenuCursor(1);
+        Menu_MoveCursor(1);
         if (gEasyChatStruct->unk8 == 9
          || gEasyChatStruct->unk8 == 4
          || gEasyChatStruct->unk8 == 7
@@ -790,7 +790,7 @@ void sub_80E6C84(void)
         case 0:
             sub_80E91D4(4);
             DisplayYesNoMenu(23, 8, 0);
-            MoveMenuCursor(1);
+            Menu_MoveCursor(1);
             gEasyChatStruct->unk24++;
             break;
         case -1:
@@ -856,7 +856,7 @@ void sub_80E6D7C(void)
             sub_80E91D4(1);
             sub_80E9744();
             DisplayYesNoMenu(23, 8, 0);
-            MoveMenuCursor(0);
+            Menu_MoveCursor(0);
             gEasyChatStruct->unk24++;
         }
         break;
@@ -1738,5 +1738,5 @@ void sub_80E81FC(void)
 {
     PlaySE(SE_SELECT);
     sub_80E95A4();
-    MenuZeroFillWindowRect(0, 0, 29, 13);
+    Menu_EraseWindowRect(0, 0, 29, 13);
 }
-- 
cgit v1.2.3


From 8869cbc98e2f8e761e9ff89182933643992e2bd7 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 00:16:15 -0600
Subject: s/gWindowConfig/gWindowTemplate/g

---
 src/easy_chat_1.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/easy_chat_1.c')

diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c
index 908e4b9d6..8d68adfe9 100644
--- a/src/easy_chat_1.c
+++ b/src/easy_chat_1.c
@@ -16,8 +16,8 @@
 #include "strings.h"
 #include "unknown_task.h"
 
-extern const struct WindowTemplate gWindowConfig_81E6D54;
-extern const struct WindowTemplate gWindowConfig_81E6DA8;
+extern const struct WindowTemplate gWindowTemplate_81E6D54;
+extern const struct WindowTemplate gWindowTemplate_81E6DA8;
 
 extern void sub_80546B8(void);
 
@@ -305,11 +305,11 @@ void sub_80E62F8(void)
         FreeAllSpritePalettes();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E6DA8);
+        SetUpWindowConfig(&gWindowTemplate_81E6DA8);
         break;
     case 2:
-        InitMenuWindow(&gWindowConfig_81E6D54);
-        InitMenuWindow(&gWindowConfig_81E6DA8);
+        InitMenuWindow(&gWindowTemplate_81E6D54);
+        InitMenuWindow(&gWindowTemplate_81E6DA8);
         Menu_EraseScreen();
         break;
     case 3:
-- 
cgit v1.2.3


From 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 14:26:15 -0600
Subject: more text/menu renaming

---
 src/easy_chat_1.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/easy_chat_1.c')

diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c
index 8d68adfe9..cb0e98b71 100644
--- a/src/easy_chat_1.c
+++ b/src/easy_chat_1.c
@@ -305,7 +305,7 @@ void sub_80E62F8(void)
         FreeAllSpritePalettes();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowTemplate_81E6DA8);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6DA8);
         break;
     case 2:
         InitMenuWindow(&gWindowTemplate_81E6D54);
@@ -737,7 +737,7 @@ void sub_80E6BC0(void)
         }
         break;
     case 1:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
         {
         case 0:
             sub_80E7D6C();
@@ -785,7 +785,7 @@ void sub_80E6C84(void)
             gEasyChatStruct->unk24++;
         break;
     case 1:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
         {
         case 0:
             sub_80E91D4(4);
@@ -800,7 +800,7 @@ void sub_80E6C84(void)
         }
         break;
     case 2:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
         {
         case 0:
             gSpecialVar_Result = 0;
@@ -813,7 +813,7 @@ void sub_80E6C84(void)
         }
         break;
     case 0xFF:
-        HandleDestroyMenuCursors();
+        Menu_DestroyCursor();
         sub_80E81FC();
         sub_80E682C(sub_80E6AC4);
         break;
@@ -861,7 +861,7 @@ void sub_80E6D7C(void)
         }
         break;
     case 1:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
         {
         case 0:
             gSpecialVar_Result = (sub_80E7FA8() != 0);
@@ -883,7 +883,7 @@ void sub_80E6D7C(void)
             break;
         case -1:
         case 1:
-            HandleDestroyMenuCursors();
+            Menu_DestroyCursor();
             sub_80E81FC();
             if (gEasyChatStruct->unk8 == 6 && sub_80E7FA8() != 0)
             {
-- 
cgit v1.2.3