summaryrefslogtreecommitdiff
path: root/src/debug/start_menu_debug.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug/start_menu_debug.c')
-rw-r--r--src/debug/start_menu_debug.c224
1 files changed, 112 insertions, 112 deletions
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 28f3a26d1..6f9f0d02c 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -28,7 +28,7 @@ void debug_sub_8076AC8()
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuZeroFillWindowRect\n"
+ " bl Menu_EraseWindowRect\n"
" lsl r3, r4, #0x1\n"
" add r3, r3, #0x1\n"
" lsl r3, r3, #0x18\n"
@@ -36,7 +36,7 @@ void debug_sub_8076AC8()
" mov r0, #0x10\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
" ldr r3, ._3 + 8\n"
@@ -101,15 +101,15 @@ void debug_sub_8076B68()
" ldr r0, ._8\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r0, ._8 + 4\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r0, ._8 + 8\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x4\n"
" mov r1, #0xb\n"
" bl debug_sub_8077CF4\n"
@@ -143,11 +143,11 @@ void debug_sub_8076BB4()
" lsl r1, r1, #0x3\n"
" ldr r0, ._13\n"
" add r5, r1, r0\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" add r4, r0, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" lsr r1, r0, #0x18\n"
" lsl r4, r4, #0x18\n"
@@ -500,11 +500,11 @@ void DebugMenu_8076D6C()
" beq ._53 @cond_branch\n"
" b ._64\n"
"._49:\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._56\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._55\n"
"._57:\n"
" .align 2, 0\n"
@@ -516,11 +516,11 @@ void DebugMenu_8076D6C()
" and r1, r1, r2\n"
" cmp r1, #0\n"
" beq ._58 @cond_branch\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._60 + 4\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x49\n"
" bl PlaySE\n"
" bl RtcReset\n"
@@ -615,11 +615,11 @@ void DebugMenu_8076E30()
" beq ._75 @cond_branch\n"
" b ._86\n"
"._71:\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._78\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._77\n"
"._79:\n"
" .align 2, 0\n"
@@ -631,12 +631,12 @@ void DebugMenu_8076E30()
" and r1, r1, r2\n"
" cmp r1, #0\n"
" beq ._80 @cond_branch\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" bl sub_813B79C\n"
" ldr r0, ._82 + 4\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x49\n"
" bl PlaySE\n"
"._77:\n"
@@ -710,13 +710,13 @@ void DebugMenu_8076EF4()
" mov r1, #0x0\n"
" mov r2, #0xb\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r4, ._93\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x8\n"
" add r3, r4, #0\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r5, #0x0\n"
" add r4, r4, #0x4\n"
"._92:\n"
@@ -769,11 +769,11 @@ void DebugMenu_8076F60()
" push {r4, r5, lr}\n"
" lsl r0, r0, #0x18\n"
" lsr r5, r0, #0x18\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" add r4, r0, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" lsr r2, r0, #0x18\n"
" lsl r4, r4, #0x18\n"
@@ -785,7 +785,7 @@ void DebugMenu_8076F60()
" add r0, r0, #0x1\n"
" cmp r4, r0\n"
" bne ._96 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl debug_sub_8076B68\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
@@ -971,7 +971,7 @@ void DebugMenu_807709C()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._120 + 4\n"
" strb r0, [r1]\n"
"._115:\n"
@@ -983,7 +983,7 @@ void DebugMenu_807709C()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._120 + 4\n"
" strb r0, [r1]\n"
"._116:\n"
@@ -1097,7 +1097,7 @@ void DebugMenu_807719C()
" mov r1, #0x0\n"
" mov r2, #0xe\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._133\n"
" ldr r0, ._133 + 4\n"
" ldr r0, [r0]\n"
@@ -1154,11 +1154,11 @@ void DebugMenu_80771EC()
" mov r1, #0xc\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._135\n"
" mov r1, #0x14\n"
" mov r2, #0xd\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4}\n"
" pop {r0}\n"
" bx r0\n"
@@ -1281,7 +1281,7 @@ void DebugMenu_8077238()
" mov r1, #0x10\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._139 + 12\n"
" mov r1, #0x1d\n"
" ldr r2, [sp, #0x14]\n"
@@ -1289,7 +1289,7 @@ void DebugMenu_8077238()
" lsl r1, r1, #0x18\n"
" lsr r1, r1, #0x18\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add sp, sp, #0x18\n"
" pop {r3, r4, r5}\n"
" mov r8, r3\n"
@@ -1489,7 +1489,7 @@ void DebugMenu_8077434()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" cmp r0, #0x4\n"
@@ -1909,7 +1909,7 @@ void DebugMenu_EditPKMN()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl debug_sub_815FFDC\n"
" mov r0, #0x0\n"
" pop {r1}\n"
@@ -1940,7 +1940,7 @@ void DebugMenu_80776B4()
" mov r0, #0x19\n"
" add r1, r5, #0\n"
" mov r2, #0x1d\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r0, ._183 + 4\n"
" ldrb r0, [r0]\n"
" ASR r0, r4\n"
@@ -1950,7 +1950,7 @@ void DebugMenu_80776B4()
" add r0, r0, sp\n"
" mov r1, #0x19\n"
" add r2, r5, #0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add sp, sp, #0x8\n"
" pop {r4, r5}\n"
" pop {r0}\n"
@@ -1978,11 +1978,11 @@ void DebugMenu_8077704()
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x8\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" mov r0, sp\n"
" mov r1, #0x15\n"
" mov r2, #0x0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r2, ._185 + 4\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x13\n"
@@ -2027,7 +2027,7 @@ void DebugMenu_8077760()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._190 + 4\n"
" ldrb r0, [r1]\n"
" cmp r0, #0\n"
@@ -2052,7 +2052,7 @@ void DebugMenu_8077760()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._195\n"
" ldrb r0, [r1]\n"
" cmp r0, #0x3\n"
@@ -2076,7 +2076,7 @@ void DebugMenu_8077760()
" mov r0, #0x5\n"
" bl PlaySE\n"
" ldr r4, ._201\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" mov r1, #0x1\n"
@@ -2084,7 +2084,7 @@ void DebugMenu_8077760()
" ldrb r0, [r4]\n"
" eor r1, r1, r0\n"
" strb r1, [r4]\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
" bl DebugMenu_80776B4\n"
@@ -2133,7 +2133,7 @@ void DebugMenu_SwitchBG()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl DebugMenu_8077704\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
@@ -2177,13 +2177,13 @@ void DebugMenu_807786C()
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x3\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" lsl r0, r4, #0x1\n"
" add r0, r0, r4\n"
" add r0, r0, sp\n"
" mov r1, #0x1a\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add sp, sp, #0x8\n"
" pop {r4}\n"
" pop {r0}\n"
@@ -2250,7 +2250,7 @@ void DebugMenu_ControlEncounter()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._213\n"
" ldrb r0, [r0]\n"
" bl DebugMenu_807786C\n"
@@ -2345,7 +2345,7 @@ void DebugMenu_8077974()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r1, ._226\n"
" mov r0, #0x4\n"
" ldsb r0, [r1, r0]\n"
@@ -2494,7 +2494,7 @@ void DebugMenu_RematchTrainers()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._240\n"
" mov r1, #0xd\n"
" mov r2, #0x5\n"
@@ -2602,7 +2602,7 @@ void DebugMenu_8077B00()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl unref_sub_80C853C\n"
" cmp r0, #0\n"
" beq ._250 @cond_branch\n"
@@ -2660,7 +2660,7 @@ void DebugMenu_Safari()
" bl GetSafariZoneFlag\n"
" cmp r0, #0\n"
" beq ._258 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._260\n"
" mov r1, #0xe\n"
" mov r2, #0x5\n"
@@ -2803,7 +2803,7 @@ void DebugMenu_8077C14()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._264\n"
" mov r1, #0xa\n"
" mov r2, #0x9\n"
@@ -2945,7 +2945,7 @@ void debug_sub_8077CF4()
" add r0, r6, #0\n"
" add r1, r4, #0\n"
" add r2, r5, #0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
" bx r0\n"
@@ -2971,7 +2971,7 @@ void DebugMenu_8077D24()
" lsr r4, r4, #0x18\n"
" lsl r5, r5, #0x18\n"
" lsr r5, r5, #0x18\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" lsl r3, r5, #0x1\n"
" add r3, r3, #0x1\n"
" lsl r3, r3, #0x18\n"
@@ -2979,12 +2979,12 @@ void DebugMenu_8077D24()
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" add r2, r4, #0\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" mov r0, #0x1\n"
" mov r1, #0x1\n"
" add r2, r5, #0\n"
" add r3, r6, #0\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" sub r4, r4, #0x1\n"
@@ -3009,7 +3009,7 @@ void DebugMenu_8077D78()
asm(
" push {r4, r5, lr}\n"
" add r5, r0, #0\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r4, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -3019,7 +3019,7 @@ void DebugMenu_8077D78()
" add r0, r0, #0x1\n"
" cmp r4, r0\n"
" beq ._276 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._278\n"
" lsl r1, r4, #0x3\n"
" add r1, r1, r5\n"
@@ -3216,7 +3216,7 @@ void DebugMenu_8077EAC()
" add r4, r0, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r1, ._303 + 4\n"
" lsl r0, r4, #0x2\n"
" add r0, r0, r4\n"
@@ -3252,7 +3252,7 @@ void DebugMenu_8077EE0()
" mov r1, #0x11\n"
" mov r2, #0x16\n"
" mov r3, #0x12\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r5, ._305\n"
" add r0, r5, #0\n"
" add r1, r4, #0\n"
@@ -3262,12 +3262,12 @@ void DebugMenu_8077EE0()
" add r0, r5, #0\n"
" mov r1, #0x4\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r0, r4, #0\n"
" bl ItemId_GetItem\n"
" mov r1, #0x8\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
" mov r2, #0x1\n"
@@ -3276,7 +3276,7 @@ void DebugMenu_8077EE0()
" add r0, r5, #0\n"
" mov r1, #0x12\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
" bx r0\n"
@@ -3300,11 +3300,11 @@ void DebugMenu_8077F40()
" lsl r4, r4, #0x3\n"
" ldr r0, ._307\n"
" add r4, r4, r0\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._307 + 4\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldrh r0, [r4, #0xa]\n"
" ldrh r1, [r4, #0xc]\n"
" bl DebugMenu_8077EE0\n"
@@ -3341,11 +3341,11 @@ void DebugMenu_8077F7C()
" and r0, r0, r1\n"
" cmp r0, #0\n"
" beq ._309 @cond_branch\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._311 + 8\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldrh r0, [r4, #0xa]\n"
" ldrh r1, [r4, #0xc]\n"
" bl DebugMenu_8077EE0\n"
@@ -3466,7 +3466,7 @@ void DebugMenu_807806C()
" add r4, r0, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r4, #0\n"
" bl DestroyTask\n"
@@ -3493,16 +3493,16 @@ void DebugMenu_807808C()
" lsl r1, r4, #0x5\n"
" ldr r0, ._331\n"
" add r5, r1, r0\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x13\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._331 + 4\n"
" mov r1, #0x2\n"
" mov r2, #0x2\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, sp\n"
" add r1, r4, #0\n"
" mov r2, #0x1\n"
@@ -3511,7 +3511,7 @@ void DebugMenu_807808C()
" mov r0, sp\n"
" mov r1, #0xb\n"
" mov r2, #0x2\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldrh r1, [r5, #0x8]\n"
" mov r0, sp\n"
" mov r2, #0x1\n"
@@ -3520,7 +3520,7 @@ void DebugMenu_807808C()
" mov r0, sp\n"
" mov r1, #0xb\n"
" mov r2, #0x4\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r4, r5, #0\n"
" add r4, r4, #0xb\n"
" add r0, r4, #0\n"
@@ -3532,7 +3532,7 @@ void DebugMenu_807808C()
" add r0, r4, #0\n"
" mov r1, #0xb\n"
" mov r2, #0x6\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._330\n"
"._332:\n"
" .align 2, 0\n"
@@ -3543,7 +3543,7 @@ void DebugMenu_807808C()
" ldr r0, ._335\n"
" mov r1, #0xb\n"
" mov r2, #0x6\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._330:\n"
" add r4, r5, #0\n"
" add r4, r4, #0x16\n"
@@ -3556,7 +3556,7 @@ void DebugMenu_807808C()
" add r0, r4, #0\n"
" mov r1, #0xb\n"
" mov r2, #0x8\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._334\n"
"._336:\n"
" .align 2, 0\n"
@@ -3566,7 +3566,7 @@ void DebugMenu_807808C()
" ldr r0, ._337\n"
" mov r1, #0xb\n"
" mov r2, #0x8\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._334:\n"
" ldrb r1, [r5, #0xa]\n"
" mov r0, sp\n"
@@ -3576,7 +3576,7 @@ void DebugMenu_807808C()
" mov r0, sp\n"
" mov r1, #0xb\n"
" mov r2, #0xa\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, [r5]\n"
" mov r0, sp\n"
" mov r2, #0x2\n"
@@ -3585,7 +3585,7 @@ void DebugMenu_807808C()
" mov r0, sp\n"
" mov r1, #0xb\n"
" mov r2, #0xc\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add sp, sp, #0xc\n"
" pop {r4, r5}\n"
" pop {r0}\n"
@@ -3611,7 +3611,7 @@ void DebugMenu_807817C()
" and r0, r0, r1\n"
" cmp r0, #0\n"
" beq ._339 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" add r0, r4, #0\n"
" bl DestroyTask\n"
" bl ScriptContext2_Disable\n"
@@ -3685,7 +3685,7 @@ void DebugMenu_80781A8()
" mov r1, #0x11\n"
" mov r2, #0x16\n"
" mov r3, #0x12\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r4, ._351\n"
" mov r2, #0x8\n"
" ldsh r1, [r5, r2]\n"
@@ -3696,7 +3696,7 @@ void DebugMenu_80781A8()
" add r0, r4, #0\n"
" mov r1, #0x4\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._350:\n"
" pop {r4, r5}\n"
" pop {r0}\n"
@@ -3904,7 +3904,7 @@ void DebugMenu_8078310()
" cmp r0, #0\n"
" beq ._373 @cond_branch\n"
"._370:\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
" bl ScriptContext2_Disable\n"
@@ -4020,7 +4020,7 @@ void DebugMenu_ToggleClearFlag()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._390\n"
" bl FlagGet\n"
" mov r1, #0x1\n"
@@ -4099,7 +4099,7 @@ void DebugMenu_OpenWeatherEvents()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._404\n"
" bl FlagGet\n"
" mov r1, #0x0\n"
@@ -4170,7 +4170,7 @@ void DebugMenu_OpenMysteryEvent()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl IsMysteryGiftEnabled\n"
" mov r1, #0x0\n"
" cmp r0, #0\n"
@@ -4271,11 +4271,11 @@ void DebugMenu_8078550()
" mov r3, #0x2\n"
" bl ConvertIntToDecimalStringN\n"
"._423:\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._426 + 4\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4, r5, r6, r7}\n"
" pop {r0}\n"
" bx r0\n"
@@ -4379,7 +4379,7 @@ void DebugMenu_807860C()
" bl DebugMenu_8078550\n"
" b ._447\n"
"._434:\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
@@ -4589,7 +4589,7 @@ void DebugMenu_OpenLegendsRecord()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._464\n"
" mov r1, #0xc\n"
" mov r2, #0x3\n"
@@ -4710,13 +4710,13 @@ void DebugMenu_8078880()
" beq ._474 @cond_branch\n"
" b ._480\n"
"._470:\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" b ._476\n"
"._468:\n"
" ldr r0, ._478\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._476:\n"
" ldrh r0, [r4, #0x8]\n"
" add r0, r0, #0x1\n"
@@ -4733,7 +4733,7 @@ void DebugMenu_8078880()
" and r0, r0, r1\n"
" cmp r0, #0\n"
" beq ._480 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
@@ -4788,11 +4788,11 @@ void DebugMenu_OpenBerryInfo()
" mov r1, #0x0\n"
" mov r2, #0x13\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" add r0, r4, #0\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._487\n"
" ldr r0, ._487 + 4\n"
" str r0, [r1]\n"
@@ -4815,11 +4815,11 @@ void DebugMenu_8078950()
{
asm(
" push {lr}\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._489\n"
" mov r1, #0x4\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r0}\n"
" bx r0\n"
"._490:\n"
@@ -4858,7 +4858,7 @@ void DebugMenu_8078968()
" ldr r0, ._495\n"
" mov r1, #0x4\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r0}\n"
" bx r0\n"
"._496:\n"
@@ -4885,7 +4885,7 @@ void DebugMenu_80789A4()
" add r0, r4, #0\n"
" mov r1, #0x9\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4}\n"
" pop {r0}\n"
" bx r0\n"
@@ -5112,7 +5112,7 @@ void DebugMenu_8078B38()
" add r4, r0, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r4, #0\n"
" bl DestroyTask\n"
@@ -5250,7 +5250,7 @@ void DebugMenu_8078BD4()
" beq ._539 @cond_branch\n"
" mov r0, #0x49\n"
" bl PlaySE\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
" bl ScriptContext2_Disable\n"
@@ -5265,7 +5265,7 @@ void DebugMenu_8078BD4()
" and r0, r0, r1\n"
" cmp r0, #0\n"
" beq ._543 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
" bl ScriptContext2_Disable\n"
@@ -5314,11 +5314,11 @@ void DebugMenu_8078C80()
{
asm(
" push {lr}\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._548\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._548 + 4\n"
" ldr r0, ._548 + 8\n"
" str r0, [r1]\n"
@@ -5465,11 +5465,11 @@ void DebugMenu_8078D7C()
{
asm(
" push {lr}\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" ldr r0, ._565\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._565 + 4\n"
" ldr r0, ._565 + 8\n"
" str r0, [r1]\n"
@@ -5518,7 +5518,7 @@ void DebugMenu_MeTooBackupMan()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" ldr r0, ._571\n"
" mov r1, #0xc\n"
" mov r2, #0x2\n"
@@ -5655,7 +5655,7 @@ void DebugMenu_8078E80()
" mov r1, #0xf\n"
" mov r2, #0x16\n"
" mov r3, #0x10\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r1, ._581\n"
" mov r2, #0x0\n"
" ldsh r0, [r4, r2]\n"
@@ -5692,7 +5692,7 @@ void DebugMenu_8078EB0()
" add r0, r4, #0\n"
" mov r1, #0x2\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0xf0\n"
" mov r1, #0x5\n"
" mov r2, #0x11\n"
@@ -5706,7 +5706,7 @@ void DebugMenu_8078EB0()
" add r0, r4, #0\n"
" mov r1, #0x6\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0xf0\n"
" mov r1, #0x8\n"
" mov r2, #0x11\n"
@@ -5720,7 +5720,7 @@ void DebugMenu_8078EB0()
" add r0, r4, #0\n"
" mov r1, #0x9\n"
" mov r2, #0x11\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4, r5}\n"
" pop {r0}\n"
" bx r0\n"
@@ -5753,7 +5753,7 @@ void DebugMenu_8078F1C()
" strh r0, [r5, #0x4]\n"
" ldrb r0, [r1, #0x11]\n"
" strh r0, [r5, #0x6]\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" add r0, r5, #0\n"
" bl DebugMenu_8078EB0\n"
" add r0, r5, #0\n"
@@ -5888,7 +5888,7 @@ void DebugMenu_8079020()
" add r4, r0, #0\n"
" lsl r4, r4, #0x18\n"
" lsr r4, r4, #0x18\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r4, #0\n"
" bl DestroyTask\n"
@@ -5952,7 +5952,7 @@ void DebugMenu_8079058()
"._608:\n"
" ldr r0, ._615\n"
" str r1, [r0]\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" b ._614\n"
"._616:\n"
" .align 2, 0\n"
@@ -5962,7 +5962,7 @@ void DebugMenu_8079058()
" ldr r0, ._618\n"
" mov r1, #0x4\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x14\n"
" mov r1, #0x8\n"
" mov r2, #0x1\n"
@@ -5998,7 +5998,7 @@ void DebugMenu_8079058()
" mov r0, #0x0\n"
"._622:\n"
" str r0, [r1]\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"
@@ -6065,7 +6065,7 @@ void DebugMenu_8079110()
" beq ._635 @cond_branch\n"
" b ._642\n"
"._631:\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" b ._637\n"
"._629:\n"
" ldr r0, ._639\n"
@@ -6092,7 +6092,7 @@ void DebugMenu_8079110()
" and r0, r0, r1\n"
" cmp r0, #0\n"
" beq ._642 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ScriptContext2_Disable\n"
" add r0, r5, #0\n"
" bl DestroyTask\n"