summaryrefslogtreecommitdiff
path: root/src/debug
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug')
-rw-r--r--src/debug/matsuda_debug_menu.c44
-rw-r--r--src/debug/mori_debug_menu.c12
-rw-r--r--src/debug/sound_check_menu.c80
-rw-r--r--src/debug/unknown_debug_menu.c6
4 files changed, 71 insertions, 71 deletions
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 49fe6864b..2c20ba72b 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -247,8 +247,8 @@ static const struct OamData gUnknown_083C9400 =
u8 unref_sub_80A9B28(void)
{
- MenuZeroFillScreen();
- MenuDrawTextWindow(0, 0, 17, 18);
+ Menu_EraseScreen();
+ Menu_DrawStdWindowFrame(0, 0, 17, 18);
PrintMenuItems(1, 1, 7, gMatsudaDebugMenuActions);
InitMenu(0, 1, 1, 7, 0, 16);
gCallback_03004AE8 = sub_80A9B78;
@@ -257,7 +257,7 @@ u8 unref_sub_80A9B28(void)
static bool8 sub_80A9B78(void)
{
- s8 choice = ProcessMenuInput();
+ s8 choice = Menu_ProcessInput();
switch (choice)
{
@@ -450,7 +450,7 @@ 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_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6C3C);
REG_MOSAIC = 0;
REG_BLDCNT = 0;
REG_BLDALPHA = 0;
@@ -546,7 +546,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 +555,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);
@@ -580,64 +580,64 @@ void sub_80AA280(u8 var) // no?
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_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 +645,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)
@@ -1076,9 +1076,9 @@ void unref_sub_80AB084(u8 *text)
}
}
SetUpWindowConfig(&gWindowConfig_81E6FD8);
- InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6FD8);
+ Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8);
LoadFontDefaultPalette(&gWindowConfig_81E6FD8);
- sub_8003460(&gUnknown_03004210, text, 1, 9, 7);
+ Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7);
}
void sub_80AB184(void)
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 83dba8b73..31f232d82 100644
--- a/src/debug/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
@@ -95,9 +95,9 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
StringAppend(localPtr, gUnknown_0839B24D);
StringAppend(localPtr, gSpeciesNames[eggSpecies]);
StringAppend(localPtr, gUnknown_0839B255);
- MenuZeroFillScreen();
- MenuDrawTextWindow(0, 14, 30, 19);
- MenuPrint(localPtr, 1, 15);
+ Menu_EraseScreen();
+ Menu_DrawStdWindowFrame(0, 14, 30, 19);
+ Menu_PrintText(localPtr, 1, 15);
gCallback_03004AE8 = sub_8083D4C;
return 0;
}
@@ -179,7 +179,7 @@ u8 MoriDebugMenu_PokeblockCase(void)
bool8 MoriDebugMenuProcessInput(void)
{
- s8 choice = ProcessMenuInput();
+ s8 choice = Menu_ProcessInput();
switch (choice)
{
@@ -196,8 +196,8 @@ bool8 MoriDebugMenuProcessInput(void)
s8 InitMoriDebugMenu(void)
{
- MenuZeroFillScreen();
- MenuDrawTextWindow(0, 0, 10, 19);
+ Menu_EraseScreen();
+ Menu_DrawStdWindowFrame(0, 0, 10, 19);
PrintMenuItems(1, 1, 9, gMoriDebugMenuActions);
InitMenu(0, 1, 1, 9, 0, 9);
gCallback_03004AE8 = MoriDebugMenuProcessInput;
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 968b047d9..4f4a7bd06 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -171,16 +171,16 @@ void Task_InitSoundCheckMenu(u8 taskId)
if (!gPaletteFade.active)
{
- MenuDrawTextWindow(2, 0, 27, 3);
- MenuDrawTextWindow(2, 5, 27, 10);
- MenuDrawTextWindow(2, 12, 27, 17);
- MenuPrint(soundcheckStr, 4, 1);
- MenuPrint(abDescStr, 14, 1);
- MenuPrint(bgmStr, 4, 6);
- MenuPrint(upDownStr, 14, 6);
- MenuPrint(seStr, 4, 13);
- MenuPrint(upDownStr, 14, 13);
- MenuPrint(driverStr, 14, 18);
+ Menu_DrawStdWindowFrame(2, 0, 27, 3);
+ Menu_DrawStdWindowFrame(2, 5, 27, 10);
+ Menu_DrawStdWindowFrame(2, 12, 27, 17);
+ Menu_PrintText(soundcheckStr, 4, 1);
+ Menu_PrintText(abDescStr, 14, 1);
+ Menu_PrintText(bgmStr, 4, 6);
+ Menu_PrintText(upDownStr, 14, 6);
+ Menu_PrintText(seStr, 4, 13);
+ Menu_PrintText(upDownStr, 14, 13);
+ Menu_PrintText(driverStr, 14, 18);
gTasks[taskId].func = sub_80BA384;
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(1, 31);
@@ -384,7 +384,7 @@ void PrintSoundNumber(u16 soundIndex, u16 x, u16 y) // PrintSoundNumber ?
str[1] = divisorValue + CHAR_0;
str[2] = ((soundIndex % 100) % 10) + CHAR_0;
- MenuPrint(str, x, y);
+ Menu_PrintText(str, x, y);
}
void sub_80BA79C(const u8 *const string, u16 x, u16 y)
@@ -400,7 +400,7 @@ void sub_80BA79C(const u8 *const string, u16 x, u16 y)
for (i = 0; string[i] != EOS && i < 10; i++)
str[i] = string[i];
- MenuPrint(str, x, y);
+ Menu_PrintText(str, x, y);
}
void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu
@@ -421,21 +421,21 @@ void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu
u8 stereoStr[] = _("すてれお‥‥‥‥"); // stereo
REG_DISPCNT = 0x3140;
- MenuDrawTextWindow(0, 0, 29, 19);
- MenuPrint(bbackStr, 19, 4);
- MenuPrint(aplayStr, 19, 2);
- MenuPrint(voiceStr, 2, 1);
- MenuPrint(volumeStr, 2, 3);
- MenuPrint(panpotStr, 2, 5);
- MenuPrint(pitchStr, 2, 7);
- MenuPrint(lengthStr, 2, 9);
- MenuPrint(releaseStr, 2, 11);
- MenuPrint(progressStr, 2, 13);
- MenuPrint(chorusStr, 2, 15);
- MenuPrint(priorityStr, 2, 17);
- MenuPrint(playingStr, 19, 16);
- MenuPrint(reverseStr, 19, 14);
- MenuPrint(stereoStr, 19, 12);
+ Menu_DrawStdWindowFrame(0, 0, 29, 19);
+ Menu_PrintText(bbackStr, 19, 4);
+ Menu_PrintText(aplayStr, 19, 2);
+ Menu_PrintText(voiceStr, 2, 1);
+ Menu_PrintText(volumeStr, 2, 3);
+ Menu_PrintText(panpotStr, 2, 5);
+ Menu_PrintText(pitchStr, 2, 7);
+ Menu_PrintText(lengthStr, 2, 9);
+ Menu_PrintText(releaseStr, 2, 11);
+ Menu_PrintText(progressStr, 2, 13);
+ Menu_PrintText(chorusStr, 2, 15);
+ Menu_PrintText(priorityStr, 2, 17);
+ Menu_PrintText(playingStr, 19, 16);
+ Menu_PrintText(reverseStr, 19, 14);
+ Menu_PrintText(stereoStr, 19, 12);
REG_WIN0H = WIN_RANGE(0, DISPLAY_WIDTH);
REG_WIN0V = WIN_RANGE(0, DISPLAY_HEIGHT);
sDriverTestSelection = 0;
@@ -465,7 +465,7 @@ void Task_ProcessDriverTestInput(u8 taskId)
REG_DISPCNT = 0x7140;
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(1, 31);
- MenuZeroFillWindowRect(0, 0, 29, 19);
+ Menu_EraseWindowRect(0, 0, 29, 19);
gTasks[taskId].func = Task_InitSoundCheckMenu;
return;
}
@@ -627,8 +627,8 @@ void sub_80BAE10(u8 var1, u8 var2)
u8 str1[] = _("▶");
u8 str2[] = _(" ");
- MenuPrint(str2, gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 1)]);
- MenuPrint(str1, gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 1)]);
+ Menu_PrintText(str2, gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 1)]);
+ Menu_PrintText(str1, gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 1)]);
}
void PrintSignedNumber(int n, u16 x, u16 y, u8 digits)
@@ -677,7 +677,7 @@ void PrintSignedNumber(int n, u16 x, u16 y, u8 digits)
n %= powersOfTen[i];
}
- MenuPrint(str, x, y);
+ Menu_PrintText(str, x, y);
}
static const s8 gUnknown_083D03F8[5] = { 0x3F, 0x00, 0xC0, 0x7F, 0x80 };
@@ -689,10 +689,10 @@ void sub_80BAF84(u8 taskId)
u8 playingStr[] = _("さいせいちゆう‥");
REG_DISPCNT = 0x3140;
- MenuDrawTextWindow(0, 0, 29, 19);
- MenuPrint(seStr, 3, 2);
- MenuPrint(panStr, 3, 4);
- MenuPrint(playingStr, 3, 8);
+ Menu_DrawStdWindowFrame(0, 0, 29, 19);
+ Menu_PrintText(seStr, 3, 2);
+ Menu_PrintText(panStr, 3, 4);
+ Menu_PrintText(playingStr, 3, 8);
REG_WIN0H = WIN_RANGE(0, DISPLAY_WIDTH);
REG_WIN0V = WIN_RANGE(0, DISPLAY_HEIGHT);
sSoundTestParams[CRY_TEST_VOICE] = 1;
@@ -739,7 +739,7 @@ void sub_80BB038(u8 taskId)
REG_DISPCNT = 0x7140;
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(1, 31);
- MenuZeroFillWindowRect(0, 0, 29, 19);
+ Menu_EraseWindowRect(0, 0, 29, 19);
gTasks[taskId].func = Task_InitSoundCheckMenu;
return;
}
@@ -806,10 +806,10 @@ void sub_80BB1D4(void)
switch (gUnknown_083D03F8[sSoundTestParams[CRY_TEST_PANPOT]])
{
case 127:
- MenuPrint(lrStr, 7, 4);
+ Menu_PrintText(lrStr, 7, 4);
break;
case -128:
- MenuPrint(rlStr, 7, 4);
+ Menu_PrintText(rlStr, 7, 4);
break;
default:
PrintSignedNumber(gUnknown_083D03F8[sSoundTestParams[CRY_TEST_PANPOT]], 7, 4, 3);
@@ -1247,7 +1247,7 @@ void Task_InitCryTest(u8 taskId)
while (ShowPokedexCryScreen(&cryStruct2, 2) == FALSE)
;
- MenuDrawTextWindow(0, 16, 5, 19);
+ Menu_DrawStdWindowFrame(0, 16, 5, 19);
PrintCryNumber();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
REG_BG2HOFS = 0;
@@ -1288,7 +1288,7 @@ void Task_ProcessCryTestInput(u8 taskId)
REG_DISPCNT = 0x7140;
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(1, 31);
- MenuZeroFillWindowRect(0, 0, 29, 19);
+ Menu_EraseWindowRect(0, 0, 29, 19);
gTasks[taskId].func = Task_InitSoundCheckMenu;
DestroyCryMeterNeedleSprite();
}
diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index a8c3ad16b..e95806c74 100644
--- a/src/debug/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
@@ -32,8 +32,8 @@ const struct MenuAction gUnknown_0842C29C[] = {
int unref_sub_814A414(void)
{
- MenuZeroFillScreen();
- MenuDrawTextWindow(0, 0, 16, 18);
+ Menu_EraseScreen();
+ Menu_DrawStdWindowFrame(0, 0, 16, 18);
PrintMenuItems(2, 1, 8, gUnknown_0842C29C);
InitMenu(0, 1, 1, 8, 0, 15);
gCallback_03004AE8 = sub_814A464;
@@ -42,7 +42,7 @@ int unref_sub_814A414(void)
static u8 sub_814A464(void)
{
- s8 result = ProcessMenuInput();
+ s8 result = Menu_ProcessInput();
if (result == -2)
{
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:56:01 +0000