Merge branch 'master' into unk_text_8095904

1 files changed, 14 insertions, 29 deletions

diff --git a/src/field/wallclock.c b/src/field/wallclock.c
index 2892d09f9..1f743a61a 100644
--- a/src/field/wallclock.c
+++ b/src/field/wallclock.c
@@ -10,7 +10,7 @@
 #include "strings2.h"
 #include "task.h"
 #include "trig.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 
 extern u16 gSpecialVar_0x8004;
 extern u8 gMiscClock_Gfx[];
@@ -190,10 +190,7 @@ static void WallClockVblankCallback(void)
 
 static void LoadWallClockGraphics(void)
 {
-    u8 *addr;
-    u32 size;
-
-    SetVBlankCallback(0);
+    SetVBlankCallback(NULL);
     REG_DISPCNT = 0;
     REG_BG3CNT = 0;
     REG_BG2CNT = 0;
@@ -208,19 +205,7 @@ static void LoadWallClockGraphics(void)
     REG_BG0HOFS = 0;
     REG_BG0VOFS = 0;
 
-    addr = (void *)VRAM;
-    size = 0x18000;
-    while (1)
-    {
-        DmaFill16(3, 0, addr, 0x1000);
-        addr += 0x1000;
-        size -= 0x1000;
-        if (size <= 0x1000)
-        {
-            DmaFill16(3, 0, addr, size);
-            break;
-        }
-    }
+    DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000);
     DmaClear32(3, OAM, OAM_SIZE);
     DmaClear16(3, PLTT, PLTT_SIZE);
 
@@ -229,15 +214,15 @@ static void LoadWallClockGraphics(void)
         LoadPalette(gMiscClockMale_Pal, 0, 32);
     else
         LoadPalette(gMiscClockFemale_Pal, 0, 32);
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
     FreeAllSpritePalettes();
     LoadCompressedObjectPic(&gUnknown_083F7A90[0]);
     LoadSpritePalettes(gUnknown_083F7AA0);
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
 }
 
 static void WallClockInit(void)
@@ -414,10 +399,10 @@ static void Task_SetClock2(u8 taskId)
 //Ask player "Is this the correct time?"
 static void Task_SetClock3(u8 taskId)
 {
-    MenuDrawTextWindow(2, 16, 27, 19);
-    MenuPrint(gOtherText_CorrectTimePrompt, 3, 17);
-    MenuDrawTextWindow(23, 8, 29, 13);
-    PrintMenuItems(24, 9, 2, gMenuYesNoItems);
+    Menu_DrawStdWindowFrame(2, 16, 27, 19);
+    Menu_PrintText(gOtherText_CorrectTimePrompt, 3, 17);
+    Menu_DrawStdWindowFrame(23, 8, 29, 13);
+    Menu_PrintItems(24, 9, 2, gMenuYesNoItems);
     InitMenu(0, 24, 9, 2, 1, 5);
     gTasks[taskId].func = Task_SetClock4;
 }
@@ -425,7 +410,7 @@ static void Task_SetClock3(u8 taskId)
 //Get menu selection
 static void Task_SetClock4(u8 taskId)
 {
-    switch (ProcessMenuInputNoWrap_())
+    switch (Menu_ProcessInputNoWrap_())
     {
     case 0:     //YES
         PlaySE(SE_SELECT);
@@ -433,10 +418,10 @@ static void Task_SetClock4(u8 taskId)
         return;
     case -1:    //B button
     case 1:     //NO
-        HandleDestroyMenuCursors();
+        Menu_DestroyCursor();
         PlaySE(SE_SELECT);
-        MenuZeroFillWindowRect(23, 8, 29, 13);
-        MenuZeroFillWindowRect(2, 16, 27, 19);
+        Menu_EraseWindowRect(23, 8, 29, 13);
+        Menu_EraseWindowRect(2, 16, 27, 19);
         gTasks[taskId].func = Task_SetClock2;   //Go back and let player adjust clock
     }
 }