Merge branch 'master' into unk_text_8095904

1 files changed, 44 insertions, 129 deletions

diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index bb80de6fe..efd952ef7 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -14,33 +14,24 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "ewram.h"
 
 extern u8 gUnknown_0203856C;
-extern s16 gUnknown_02038670[];
-extern s16 gUnknown_02038678[];
-extern s16 gUnknown_02038680[];
-extern u8 gContestFinalStandings[];
 extern u8 gUnknown_02038694;
-extern u8 gIsLinkContest;
-extern u8 gUnknown_0203869B;
-extern u8 gContestPlayerMonIndex;
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
 
-extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042A0;
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
-extern u16 gUnknown_030041B0;
-extern u16 gUnknown_030041B8;
-extern struct Window gUnknown_03004210;
-extern u8 (*gCallback_03004AE8)(void);
+extern u16 gBattle_BG3_X;
+extern u16 gBattle_BG3_Y;
 
-extern bool8 gReceivedRemoteLinkPlayers;
+extern u8 (*gMenuCallback)(void);
 
 static bool8 sub_80A9B78(void);
 static void sub_80A9BE4(u8 taskId);
@@ -247,24 +238,24 @@ static const struct OamData gUnknown_083C9400 =
 
 u8 unref_sub_80A9B28(void)
 {
-    MenuZeroFillScreen();
-    MenuDrawTextWindow(0, 0, 17, 18);
-    PrintMenuItems(1, 1, 7, gMatsudaDebugMenuActions);
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 17, 18);
+    Menu_PrintItems(1, 1, 7, gMatsudaDebugMenuActions);
     InitMenu(0, 1, 1, 7, 0, 16);
-    gCallback_03004AE8 = sub_80A9B78;
+    gMenuCallback = sub_80A9B78;
     return 0;
 }
 
 static bool8 sub_80A9B78(void)
 {
-    s8 choice = ProcessMenuInput();
+    s8 choice = Menu_ProcessInput();
 
     switch (choice)
     {
     case -2:
         return FALSE;
     default:
-        gCallback_03004AE8 = gMatsudaDebugMenuActions[choice].func;
+        gMenuCallback = gMatsudaDebugMenuActions[choice].func;
         return FALSE;
     case -1:
         CloseMenu();
@@ -449,48 +440,32 @@ static void sub_80A9F50(void)
 {
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP;
     REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON;
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitWindowFromConfig(&gMenuWindow, &gWindowConfig_81E6C3C);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C);
+    Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6C3C);
     REG_MOSAIC = 0;
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     REG_BLDY = 0;
     REG_BG0HOFS = 0;
     REG_BG0VOFS = 0;
-    gUnknown_030042A4 = 0;
-    gUnknown_030042A0 = 0;
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;
     gBattle_BG2_X = 0;
     gBattle_BG2_Y = 0;
-    gUnknown_030041B0 = 0;
-    gUnknown_030041B8 = 0;
+    gBattle_BG3_X = 0;
+    gBattle_BG3_Y = 0;
 }
 
 static void sub_80A9FE4(void)
 {
-    u8 *addr;
-    u32 i;
     u8 ptr[5];
 
     memcpy(ptr, gMatsudaDebugMenu_UnknownByteArray, 5);
-
-    addr = (void *)VRAM;
-    i = VRAM_SIZE;
-
-    while (1)
-    {
-        DmaFill32(3, 0, addr, 0x1000);
-        addr += 0x1000;
-        i -= 0x1000;
-        if (i <= 0x1000)
-        {
-            DmaFill32(3, 0, addr, i);
-            break;
-        }
-    }
+    DmaFill32Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
     sub_80034D4((void *)VRAM, ptr);
-    LoadFontDefaultPalette(&gWindowConfig_81E6C3C);
+    LoadFontDefaultPalette(&gWindowTemplate_81E6C3C);
 }
 
 static void sub_80AA064(void)
@@ -505,18 +480,18 @@ static void sub_80AA064(void)
 
 static void sub_80AA090(void)
 {
-    REG_BG0HOFS = gUnknown_030042A4;
-    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG0HOFS = gBattle_BG0_X;
+    REG_BG0VOFS = gBattle_BG0_Y;
     REG_BG1HOFS = gBattle_BG1_X;
     REG_BG1VOFS = gBattle_BG1_Y;
     REG_BG2HOFS = gBattle_BG2_X;
     REG_BG2VOFS = gBattle_BG2_Y;
-    REG_BG3HOFS = gUnknown_030041B0;
-    REG_BG3VOFS = gUnknown_030041B8;
+    REG_BG3HOFS = gBattle_BG3_X;
+    REG_BG3VOFS = gBattle_BG3_Y;
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    sub_8089668();
+    ScanlineEffect_InitHBlankDmaTransfer();
 }
 
 static void sub_80AA10C(void)
@@ -528,7 +503,7 @@ static void sub_80AA10C(void)
     gPaletteFade.bufferTransferDisabled = 1;
     SetVBlankCallback(0);
     sub_80A9F50();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
     ResetPaletteFade();
     ResetSpriteData();
     ResetTasks();
@@ -546,7 +521,7 @@ static void sub_80AA10C(void)
 
     for (i = 0; i < 6; i++)
     {
-        sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList1[i],
+        Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenuTextList1[i],
             (0xA * i + 0x2A), gMatsudaDebugMenuContestTopLeft[i][0],
             gMatsudaDebugMenuContestTopLeft[i][1]);
     }
@@ -555,8 +530,8 @@ static void sub_80AA10C(void)
     zero = 0; // it's possible this was some assignment that matsuda used to quickly edit and test things without changing whats passed to the later functions.
     sub_80AA5BC(zero);
     sub_80AA5E8(gSpecialVar_ContestRank);
-    sub_8003460(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12);
-    sub_8003460(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC);
+    Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12);
+    Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC);
     LoadSpriteSheet(gUnknown_083C92B4);
     LoadSpritePalette(gUnknown_083C92BC);
     sub_80AA280(3);
@@ -573,71 +548,71 @@ void sub_80AA280(u8 var) // no?
 {
     u8 i;
 
-    FillWindowRect_DefaultPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3);
+    Text_FillWindowRectDefPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3);
     StringCopy(gSharedMem, gMatsudaDebugMenu_StartText);
     StringAppend(gSharedMem, gContestMons[var].trainerName);
 
     for (i = 0; i < 4; i++)
     {
         if (var == i)
-            sub_8003460(&gMenuWindow, gSharedMem, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
+            Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
         else
-            sub_8003460(&gMenuWindow, gContestMons[i].trainerName, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
+            Text_InitWindowAndPrintText(&gMenuWindow, gContestMons[i].trainerName, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
     }
 }
 
 static void sub_80AA340(u8 var)
 {
     ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].cool, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]);
 }
 
 static void sub_80AA388(u8 var)
 {
     ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].cute, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]);
 }
 
 static void sub_80AA3D0(u8 var)
 {
     ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].beauty, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]);
 }
 
 static void sub_80AA418(u8 var)
 {
     ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].smart, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]);
 }
 
 static void sub_80AA460(u8 var)
 {
     ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].tough, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]);
 }
 
 static void sub_80AA4A8(u8 var)
 {
     ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].sheen, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]);
 }
 
 static void sub_80AA4F0(u8 var1, u8 var2)
 {
-    FillWindowRect_DefaultPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1);
-    sub_8003460(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]);
+    Text_FillWindowRectDefPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1);
+    Text_InitWindowAndPrintText(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]);
     ConvertIntToDecimalStringN(gStringVar1, gContestMons[var1].moves[var2], STR_CONV_MODE_LEADING_ZEROS, 3);
-    sub_8003460(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]);
+    Text_InitWindowAndPrintText(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]);
 }
 
 static void sub_80AA5BC(u8 var)
 {
-    sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12);
+    Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12);
 }
 
 void sub_80AA5E8(u8 var)
 {
-    sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4);
+    Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4);
 }
 
 static void sub_80AA614(u8 var1, u8 var2)
@@ -645,7 +620,7 @@ static void sub_80AA614(u8 var1, u8 var2)
     u16 var = sub_80AE770(var1, var2);
 
     ConvertIntToDecimalStringN(gSharedMem, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    sub_8003460(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC);
+    Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC);
 }
 
 void sub_80AA658(u8 var)
@@ -1032,63 +1007,3 @@ u8 MatsudaDebugMenu_SetArtMuseumItems(void)
     CloseMenu();
     return 1;
 }
-
-void unref_sub_80AB084(u8 *text)
-{
-    u16 savedIme;
-    u8 *addr;
-    size_t size;
-
-    REG_BG0HOFS = 0;
-    REG_BG0VOFS = 0;
-    REG_BG1HOFS = 0;
-    REG_BG1VOFS = 0;
-    REG_BG2HOFS = 0;
-    REG_BG2VOFS = 0;
-    REG_BG3HOFS = 0;
-    REG_BG3VOFS = 0;
-    REG_WIN0H = 0;
-    REG_WIN0V = 0;
-    REG_WIN1H = 0;
-    REG_WIN1V = 0;
-    REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
-
-    savedIme = REG_IME;
-    REG_IME = 0;
-    REG_IE |= INTR_FLAG_VBLANK;
-    REG_IME = savedIme;
-    REG_DISPSTAT = 8;
-    ResetTasks();
-    ResetSpriteData();
-    SetMainCallback2(sub_80AB184);
-
-    addr = (void *)VRAM;
-    size = 0x18000;
-    while (1)
-    {
-        DmaFill32(3, 0, addr, 0x1000);
-        addr += 0x1000;
-        size -= 0x1000;
-        if (size <= 0x1000)
-        {
-            DmaFill32(3, 0, addr, size);
-            break;
-        }
-    }
-    SetUpWindowConfig(&gWindowConfig_81E6FD8);
-    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6FD8);
-    LoadFontDefaultPalette(&gWindowConfig_81E6FD8);
-    sub_8003460(&gUnknown_03004210, text, 1, 9, 7);
-}
-
-void sub_80AB184(void)
-{
-    REG_BG0HOFS = 0;
-    REG_BG0VOFS = 0;
-    REG_BG1HOFS = 0;
-    REG_BG1VOFS = 0;
-    REG_BG2HOFS = 0;
-    REG_BG2VOFS = 0;
-    REG_BG3HOFS = 0;
-    REG_BG3VOFS = 0;
-}