Merge branch 'master' into pokemon_storage_system

1 files changed, 29 insertions, 29 deletions

diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index fe3aa7cc9..dc8bddd5a 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -17,7 +17,7 @@
 #include "strings.h"
 #include "strings2.h"
 #include "trig.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 
 extern void sub_8095C8C();
 extern void sub_809D104(void *, u16, u16, const void *, u16, u16, u16, u16);
@@ -1064,17 +1064,17 @@ void sub_80E91B0(const u8 *a, u8 b, u8 c, u8 d)
 
 void sub_80E91D4(u8 a)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 
     if (a == 10)
     {
-        MenuZeroFillWindowRect(3, 14, 26, 19);
+        Menu_EraseWindowRect(3, 14, 26, 19);
         sub_80E9198(10);
         return;
     }
 
     if (sub_80E91A4() == 10)
-        MenuDrawTextWindow(3, 14, 26, 19);
+        Menu_DrawStdWindowFrame(3, 14, 26, 19);
 
     sub_80E9198(a);
     switch (a)
@@ -1168,14 +1168,14 @@ void sub_80E9368(u8 a)
         break;
     }
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     gEasyChatStruct->unk9F8E[0] = EXT_CTRL_CODE_BEGIN;
     gEasyChatStruct->unk9F8E[1] = 5;
     gEasyChatStruct->unk9F8E[2] = 1;
     if (r4 != NULL)
     {
         sub_8072C74(gEasyChatStruct->unk9F8E + 3, r4, 240, 2);
-        MenuPrint(gEasyChatStruct->unk9F8E, 0, 0);
+        Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0);
     }
     else
     {
@@ -1186,10 +1186,10 @@ void sub_80E9368(u8 a)
         str[2] = 0x10;
         str[3] = EOS;
 
-        MenuPrint(gEasyChatStruct->unk9F8E, 0, 0);
-        MenuPrint(gEasyChatStruct->unk9F8E, 28, 0);
+        Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0);
+        Menu_PrintText(gEasyChatStruct->unk9F8E, 28, 0);
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E948C(void)
@@ -1219,7 +1219,7 @@ void sub_80E948C(void)
 
 void sub_80E95A4(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     switch (gEasyChatStruct->unk9)
     {
     case 4:
@@ -1241,7 +1241,7 @@ void sub_80E95A4(void)
         sub_80E9620(3, 6);
         break;
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E9620(u16 a, u16 b)
@@ -1259,7 +1259,7 @@ void sub_80E9620(u16 a, u16 b)
         {
             if (r10 >= gEasyChatStruct->unkA)
             {
-                MenuPrint(gUnknown_083DBEA8, r6, r7);
+                Menu_PrintText(gUnknown_083DBEA8, r6, r7);
                 break;
             }
             if (gEasyChatStruct->unkC[r10] == 0xFFFF)
@@ -1270,7 +1270,7 @@ void sub_80E9620(u16 a, u16 b)
             else
             {
                 sub_80EB218(gEasyChatStruct->unk9E14, gEasyChatStruct->unkC[r10], 11);
-                MenuPrint(gEasyChatStruct->unk9E14, r6, r7);
+                Menu_PrintText(gEasyChatStruct->unk9E14, r6, r7);
                 r6 += gEasyChatStruct->unk8C[i][j] + 11;
             }
             r10++;
@@ -1281,7 +1281,7 @@ void sub_80E9620(u16 a, u16 b)
 
 void sub_80E9744(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     switch (gEasyChatStruct->unk9)
     {
     case 4:
@@ -1303,7 +1303,7 @@ void sub_80E9744(void)
         sub_80E97C0(3, 6);
         break;
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E97C0(u16 a, u16 b)
@@ -1337,7 +1337,7 @@ void sub_80E97C0(u16 a, u16 b)
         r2[2] = r1 * 8;
         r2[3] = EOS;
 
-        MenuPrint(gEasyChatStruct->unk9E6E, b, a);
+        Menu_PrintText(gEasyChatStruct->unk9E6E, b, a);
 
         a += 2;
     }
@@ -1348,7 +1348,7 @@ void sub_80E98C4(void)
     u8 r1;
     u8 r3;
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     switch (gEasyChatStruct->unk9)
     {
     case 4:
@@ -1378,15 +1378,15 @@ void sub_80E98C4(void)
     default:
         return;
     }
-    MenuFillWindowRectWithBlankTile(2, r1, 27, r3 * 2 + r1 - 1);
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    Menu_BlankWindowRect(2, r1, 27, r3 * 2 + r1 - 1);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E9940(u8 *a, u8 b)
 {
     u8 r4 = (b & 7);
 
-    MenuFillWindowRectWithBlankTile(2, r4 * 2, 31, r4 * 2 + 1);
+    Menu_BlankWindowRect(2, r4 * 2, 31, r4 * 2 + 1);
     sub_80E9A7C(a, b);
     sub_80E9A60(a, 2, r4 * 2);
 }
@@ -1420,7 +1420,7 @@ const u8 *const gUnknown_083DBEAC[] =
 
 void sub_80E9974(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6D54);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D54);
     if (gEasyChatStruct->unk26 == 0)
     {
         u16 i;
@@ -1453,7 +1453,7 @@ void sub_80E9A4C(void)
 void sub_80E9A60(const u8 *a, u16 b, u16 c)
 {
     c &= 0xF;
-    MenuPrint(a, b, c);
+    Menu_PrintText(a, b, c);
 }
 
 void sub_80E9A7C(u8 *dest, u16 b)
@@ -1479,7 +1479,7 @@ void sub_80E9AD4(void)
 {
     u16 i;
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D54);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D54);
     for (i = 0; i < 16; i++)
         sub_80E9C74(i);
 }
@@ -1502,16 +1502,16 @@ void sub_80E9AF8(u16 a)
         for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++)
         {
             if (sub_80EB2D4(gEasyChatStruct->unk9A2A[a][i]) == 7)
-                BasicInitMenuWindow(&gWindowConfig_81E6D70);
+                BasicInitMenuWindow(&gWindowTemplate_81E6D70);
             else
-                BasicInitMenuWindow(&gWindowConfig_81E6D54);
+                BasicInitMenuWindow(&gWindowTemplate_81E6D54);
             sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9);
             sub_80E9A60(gEasyChatStruct->unk9E14, i * 11 + 4, a * 2);
         }
     }
     else
     {
-        BasicInitMenuWindow(&gWindowConfig_81E6D54);
+        BasicInitMenuWindow(&gWindowTemplate_81E6D54);
         for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++)
         {
             sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9);
@@ -1523,7 +1523,7 @@ void sub_80E9AF8(u16 a)
 void sub_80E9C74(u16 a)
 {
     a &= 7;
-    MenuFillWindowRectWithBlankTile(0, a * 2, 29, a * 2 + 1);
+    Menu_BlankWindowRect(0, a * 2, 29, a * 2 + 1);
 }
 
 void sub_80E9C94(void)
@@ -1562,7 +1562,7 @@ void sub_80E9D7C(void)
     u16 r4;
     u16 i;
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D54);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D54);
     if (gEasyChatStruct->unk1C0 < 0)
     {
         r6 = -gEasyChatStruct->unk1C0;
@@ -2053,7 +2053,7 @@ void sub_80EAD08(void)
     u16 r2;
     u16 i;
 
-    r4 = gUnknown_03004DE0[gUnknown_03004DC0.srcBank];
+    r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer];
     r4 += 88;
     r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF;