1 files changed, 23 insertions, 23 deletions

diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c
index e5b6cf7c3..4b64846f9 100644
--- a/src/easy_chat_1.c
+++ b/src/easy_chat_1.c
@@ -14,10 +14,10 @@
 #include "sprite.h"
 #include "string_util.h"
 #include "strings.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 
-extern const struct WindowConfig gWindowConfig_81E6D54;
-extern const struct WindowConfig gWindowConfig_81E6DA8;
+extern const struct WindowTemplate gWindowTemplate_81E6D54;
+extern const struct WindowTemplate gWindowTemplate_81E6DA8;
 
 extern void sub_80546B8(void);
 
@@ -43,7 +43,7 @@ const u16 gBerryMasterWifePhrases[][2] =
 // const pointer to gEasyChatStruct-> easy_chat might be two separate files.
 struct Shared1000 *const gEasyChatStruct = (struct Shared1000 *)(gSharedMem + 0x1000);
 
-const struct UnknownTaskStruct gUnknown_083DB698 =
+const struct ScanlineEffectParams gUnknown_083DB698 =
 {
     &REG_BG3VOFS,
     ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
@@ -297,20 +297,20 @@ void sub_80E62F8(void)
         SetVBlankCallback(0);
         ResetPaletteFade();
         ResetSpriteData();
-        dp12_8087EA4();
-        remove_some_task();
+        ScanlineEffect_Clear();
+        ScanlineEffect_Stop();
         sub_80EAD08();
-        sub_80895F8(gUnknown_083DB698);
+        ScanlineEffect_SetParams(gUnknown_083DB698);
         FreeSpriteTileRanges();
         FreeAllSpritePalettes();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E6DA8);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6DA8);
         break;
     case 2:
-        InitMenuWindow(&gWindowConfig_81E6D54);
-        InitMenuWindow(&gWindowConfig_81E6DA8);
-        MenuZeroFillScreen();
+        InitMenuWindow(&gWindowTemplate_81E6D54);
+        InitMenuWindow(&gWindowTemplate_81E6DA8);
+        Menu_EraseScreen();
         break;
     case 3:
         sub_80E6424();
@@ -655,7 +655,7 @@ void sub_80E6A6C(void)
     ProcessSpriteCopyRequests();
     sub_80EAC5C();
     TransferPlttBuffer();
-    sub_8089668();
+    ScanlineEffect_InitHBlankDmaTransfer();
 }
 
 void sub_80E6A88(void)
@@ -732,12 +732,12 @@ void sub_80E6BC0(void)
         {
             sub_80E91D4(2);
             DisplayYesNoMenu(23, 8, 1);
-            MoveMenuCursor(1);
+            Menu_MoveCursor(1);
             gEasyChatStruct->unk24++;
         }
         break;
     case 1:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
         {
         case 0:
             sub_80E7D6C();
@@ -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
@@ -785,12 +785,12 @@ void sub_80E6C84(void)
             gEasyChatStruct->unk24++;
         break;
     case 1:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
         {
         case 0:
             sub_80E91D4(4);
             DisplayYesNoMenu(23, 8, 0);
-            MoveMenuCursor(1);
+            Menu_MoveCursor(1);
             gEasyChatStruct->unk24++;
             break;
         case -1:
@@ -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;
@@ -856,12 +856,12 @@ void sub_80E6D7C(void)
             sub_80E91D4(1);
             sub_80E9744();
             DisplayYesNoMenu(23, 8, 0);
-            MoveMenuCursor(0);
+            Menu_MoveCursor(0);
             gEasyChatStruct->unk24++;
         }
         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)
             {
@@ -1738,5 +1738,5 @@ void sub_80E81FC(void)
 {
     PlaySE(SE_SELECT);
     sub_80E95A4();
-    MenuZeroFillWindowRect(0, 0, 29, 13);
+    Menu_EraseWindowRect(0, 0, 29, 13);
 }