summaryrefslogtreecommitdiff
path: root/src/debug/tomomichi_debug_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug/tomomichi_debug_menu.c')
-rw-r--r--src/debug/tomomichi_debug_menu.c652
1 files changed, 326 insertions, 326 deletions
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index eb2fd8a7e..cc2bdd80e 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -36,17 +36,17 @@ void debug_sub_808B874()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0xd\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._1\n"
" mov r0, #0x1\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" ldr r0, ._1 + 4\n"
" ldrb r0, [r0]\n"
" str r0, [sp]\n"
@@ -90,7 +90,7 @@ void debug_sub_808B8C8()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._7 + 4\n"
" strb r0, [r1]\n"
"._3:\n"
@@ -102,7 +102,7 @@ void debug_sub_808B8C8()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._7 + 4\n"
" strb r0, [r1]\n"
"._4:\n"
@@ -154,21 +154,21 @@ void TomomichiDebugMenu_ContestGraphics()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x14\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._11\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r3, ._11 + 4\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x4\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x13\n"
@@ -218,21 +218,21 @@ void TomomichiDebugMenu_ArtMusGraphics()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x14\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._13\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r3, ._13 + 4\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x4\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x13\n"
@@ -282,21 +282,21 @@ void TomomichiDebugMenu_PreviewData()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x14\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._15\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r3, ._15 + 4\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x4\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x13\n"
@@ -346,21 +346,21 @@ void TomomichiDebugMenu_TrickHouse()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0x7\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._17\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r3, ._17 + 4\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" ldr r0, ._17 + 8\n"
" ldrb r0, [r0]\n"
" str r0, [sp]\n"
@@ -396,17 +396,17 @@ void TomomichiDebugMenu_ControlEvents()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._19\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" ldr r0, ._19 + 4\n"
" ldrb r0, [r0]\n"
" str r0, [sp]\n"
@@ -441,17 +441,17 @@ void TomomichiDebugMenu_ControlFlags()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._21\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" ldr r0, ._21 + 4\n"
" ldrb r0, [r0]\n"
" str r0, [sp]\n"
@@ -486,17 +486,17 @@ void TomomichiDebugMenu_ControlWorks()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._23\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" ldr r0, ._23 + 4\n"
" ldrb r0, [r0]\n"
" str r0, [sp]\n"
@@ -530,10 +530,10 @@ void debug_sub_808BC48()
{
asm(
" push {r4, lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" asr r0, r0, #0x18\n"
" cmp r0, #0x1\n"
@@ -598,10 +598,10 @@ void debug_sub_808BCBC()
{
asm(
" push {r4, lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" asr r0, r0, #0x18\n"
" cmp r0, #0x1\n"
@@ -666,10 +666,10 @@ void debug_sub_808BD30()
{
asm(
" push {r4, lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
- " bl GetMenuCursorPos\n"
+ " bl Menu_GetCursorPos\n"
" lsl r0, r0, #0x18\n"
" asr r0, r0, #0x18\n"
" cmp r0, #0x1\n"
@@ -744,7 +744,7 @@ void debug_sub_808BDA4()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._71 + 4\n"
" strb r0, [r1]\n"
"._67:\n"
@@ -756,7 +756,7 @@ void debug_sub_808BDA4()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._71 + 4\n"
" strb r0, [r1]\n"
"._68:\n"
@@ -817,7 +817,7 @@ void debug_sub_808BE2C()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._79 + 4\n"
" strb r0, [r1]\n"
"._75:\n"
@@ -829,7 +829,7 @@ void debug_sub_808BE2C()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._79 + 4\n"
" strb r0, [r1]\n"
"._76:\n"
@@ -890,7 +890,7 @@ void debug_sub_808BEB4()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._87 + 4\n"
" strb r0, [r1]\n"
"._83:\n"
@@ -902,7 +902,7 @@ void debug_sub_808BEB4()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._87 + 4\n"
" strb r0, [r1]\n"
"._84:\n"
@@ -963,7 +963,7 @@ void debug_sub_808BF3C()
" bl PlaySE\n"
" mov r0, #0x1\n"
" neg r0, r0\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._95 + 4\n"
" strb r0, [r1]\n"
"._91:\n"
@@ -975,7 +975,7 @@ void debug_sub_808BF3C()
" mov r0, #0x5\n"
" bl PlaySE\n"
" mov r0, #0x1\n"
- " bl MoveMenuCursor\n"
+ " bl Menu_MoveCursor\n"
" ldr r1, ._95 + 4\n"
" strb r0, [r1]\n"
"._92:\n"
@@ -1027,17 +1027,17 @@ void debug_sub_808BFC4()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._99\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -1070,17 +1070,17 @@ void debug_sub_808C014()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._101\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -1112,7 +1112,7 @@ void debug_sub_808C064()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -1155,7 +1155,7 @@ void debug_sub_808C0A8()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -1610,17 +1610,17 @@ void debug_sub_808C31C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._157\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -1652,7 +1652,7 @@ void debug_sub_808C36C()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -1696,17 +1696,17 @@ void debug_sub_808C3B0()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._165\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -1743,17 +1743,17 @@ void debug_sub_808C408()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._167\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -1790,17 +1790,17 @@ void debug_sub_808C460()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._169\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -1837,17 +1837,17 @@ void debug_sub_808C4B8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._171\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -1884,17 +1884,17 @@ void debug_sub_808C510()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._173\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -1931,17 +1931,17 @@ void debug_sub_808C568()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._175\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -1978,17 +1978,17 @@ void debug_sub_808C5C0()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._177\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2025,17 +2025,17 @@ void debug_sub_808C618()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._179\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2072,17 +2072,17 @@ void debug_sub_808C670()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x7\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._181\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2118,11 +2118,11 @@ void debug_sub_808C6C8()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._186\n"
" ldrb r0, [r5]\n"
@@ -2270,17 +2270,17 @@ void debug_sub_808C7C8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._197\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -2312,7 +2312,7 @@ void debug_sub_808C818()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -2356,17 +2356,17 @@ void debug_sub_808C85C()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._205\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -2403,17 +2403,17 @@ void debug_sub_808C8B4()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._207\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2450,17 +2450,17 @@ void debug_sub_808C90C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._209\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2497,17 +2497,17 @@ void debug_sub_808C964()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._211\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2544,17 +2544,17 @@ void debug_sub_808C9BC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._213\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2591,17 +2591,17 @@ void debug_sub_808CA14()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._215\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2638,17 +2638,17 @@ void debug_sub_808CA6C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._217\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2685,17 +2685,17 @@ void debug_sub_808CAC4()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._219\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -2732,17 +2732,17 @@ void debug_sub_808CB1C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._221\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -2778,11 +2778,11 @@ void debug_sub_808CB74()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._226\n"
" ldrb r0, [r5]\n"
@@ -2930,17 +2930,17 @@ void debug_sub_808CC74()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x7\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._237\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -2972,7 +2972,7 @@ void debug_sub_808CCC4()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -3016,17 +3016,17 @@ void debug_sub_808CD08()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._245\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x8\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -3063,17 +3063,17 @@ void debug_sub_808CD60()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x9\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._247\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x4\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3110,17 +3110,17 @@ void debug_sub_808CDB8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x3\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._249\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3156,11 +3156,11 @@ void debug_sub_808CE10()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._254\n"
" ldrb r0, [r5]\n"
@@ -3308,17 +3308,17 @@ void debug_sub_808CF10()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._265\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -3350,7 +3350,7 @@ void debug_sub_808CF60()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -3394,17 +3394,17 @@ void debug_sub_808CFA4()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._273\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x8\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -3441,17 +3441,17 @@ void debug_sub_808CFFC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._275\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3488,17 +3488,17 @@ void debug_sub_808D054()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._277\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3535,17 +3535,17 @@ void debug_sub_808D0AC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x9\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._279\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x4\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3582,17 +3582,17 @@ void debug_sub_808D104()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._281\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3629,17 +3629,17 @@ void debug_sub_808D15C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._283\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3676,17 +3676,17 @@ void debug_sub_808D1B4()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._285\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3723,17 +3723,17 @@ void debug_sub_808D20C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._287\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3770,17 +3770,17 @@ void debug_sub_808D264()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._289\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x5\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -3816,11 +3816,11 @@ void debug_sub_808D2BC()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._294\n"
" ldrb r0, [r5]\n"
@@ -3968,17 +3968,17 @@ void debug_sub_808D3BC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._305\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -4010,7 +4010,7 @@ void debug_sub_808D40C()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -4054,17 +4054,17 @@ void debug_sub_808D450()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._313\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -4101,17 +4101,17 @@ void debug_sub_808D4A8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._315\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -4147,11 +4147,11 @@ void debug_sub_808D500()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._320\n"
" ldrb r0, [r5]\n"
@@ -4299,17 +4299,17 @@ void debug_sub_808D600()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._331\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -4341,7 +4341,7 @@ void debug_sub_808D650()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -4385,17 +4385,17 @@ void debug_sub_808D694()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._339\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -4432,17 +4432,17 @@ void debug_sub_808D6EC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._341\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -4478,11 +4478,11 @@ void debug_sub_808D744()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._346\n"
" ldrb r0, [r5]\n"
@@ -4630,17 +4630,17 @@ void debug_sub_808D844()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1c\n"
" mov r3, #0x3\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._357\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1b\n"
@@ -4672,7 +4672,7 @@ void debug_sub_808D894()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r3, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -4715,17 +4715,17 @@ void debug_sub_808D8D8()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._365\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -4761,11 +4761,11 @@ void debug_sub_808D930()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._370\n"
" ldrb r0, [r5]\n"
@@ -4913,17 +4913,17 @@ void debug_sub_808DA30()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x3\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._381\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -4955,11 +4955,11 @@ void debug_sub_808DA80()
{
asm(
" push {r4, lr}\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"
" bl debug_sub_808DAD4\n"
" bl debug_sub_808DABC\n"
" lsl r4, r4, #0x18\n"
@@ -5054,17 +5054,17 @@ void debug_sub_808DB0C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._395\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x17\n"
@@ -5096,7 +5096,7 @@ void debug_sub_808DB5C()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -5140,17 +5140,17 @@ void debug_sub_808DBA0()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._403\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x8\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -5187,17 +5187,17 @@ void debug_sub_808DBF8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._405\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5234,17 +5234,17 @@ void debug_sub_808DC50()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._407\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5281,17 +5281,17 @@ void debug_sub_808DCA8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._409\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5328,17 +5328,17 @@ void debug_sub_808DD00()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._411\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5375,17 +5375,17 @@ void debug_sub_808DD58()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._413\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5422,17 +5422,17 @@ void debug_sub_808DDB0()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._415\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5469,17 +5469,17 @@ void debug_sub_808DE08()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._417\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5516,17 +5516,17 @@ void debug_sub_808DE60()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._419\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5562,11 +5562,11 @@ void debug_sub_808DEB8()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._424\n"
" ldrb r0, [r5]\n"
@@ -5723,17 +5723,17 @@ void debug_sub_808DFC0()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._437\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x17\n"
@@ -5765,7 +5765,7 @@ void debug_sub_808E010()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -5809,17 +5809,17 @@ void debug_sub_808E054()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._445\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -5856,17 +5856,17 @@ void debug_sub_808E0AC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._447\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x5\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5903,17 +5903,17 @@ void debug_sub_808E104()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._449\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5950,17 +5950,17 @@ void debug_sub_808E15C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._451\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -5997,17 +5997,17 @@ void debug_sub_808E1B4()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._453\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6044,17 +6044,17 @@ void debug_sub_808E20C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._455\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6090,11 +6090,11 @@ void debug_sub_808E264()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._460\n"
" ldrb r0, [r5]\n"
@@ -6251,17 +6251,17 @@ void debug_sub_808E36C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._473\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x5\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x17\n"
@@ -6293,7 +6293,7 @@ void debug_sub_808E3BC()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -6337,17 +6337,17 @@ void debug_sub_808E400()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x7\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._481\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -6384,17 +6384,17 @@ void debug_sub_808E458()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._483\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6431,17 +6431,17 @@ void debug_sub_808E4B0()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._485\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x6\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6478,17 +6478,17 @@ void debug_sub_808E508()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._487\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6525,17 +6525,17 @@ void debug_sub_808E560()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._489\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x5\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6571,11 +6571,11 @@ void debug_sub_808E5B8()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._494\n"
" ldrb r0, [r5]\n"
@@ -6732,17 +6732,17 @@ void debug_sub_808E6C0()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._507\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x17\n"
@@ -6774,7 +6774,7 @@ void debug_sub_808E710()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -6818,17 +6818,17 @@ void debug_sub_808E754()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._515\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -6865,17 +6865,17 @@ void debug_sub_808E7AC()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._517\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -6911,11 +6911,11 @@ void debug_sub_808E804()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._522\n"
" ldrb r0, [r5]\n"
@@ -7072,17 +7072,17 @@ void debug_sub_808E90C()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x18\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._535\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x2\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x17\n"
@@ -7114,7 +7114,7 @@ void debug_sub_808E95C()
{
asm(
" push {lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r1, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -7158,17 +7158,17 @@ void debug_sub_808E9A0()
asm(
" push {r4, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._543\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x9\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r4, #0x0\n"
" str r4, [sp]\n"
" mov r0, #0x1c\n"
@@ -7205,17 +7205,17 @@ void debug_sub_808E9F8()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xf\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._545\n"
" mov r0, #0x2\n"
" mov r1, #0x1\n"
" mov r2, #0x7\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0x1c\n"
@@ -7251,11 +7251,11 @@ void debug_sub_808EA50()
{
asm(
" push {r4, r5, lr}\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"
" add r1, r0, #0\n"
" ldr r5, ._550\n"
" ldrb r0, [r5]\n"
@@ -7412,21 +7412,21 @@ void debug_sub_808EB58()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0xc\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._563\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r3, ._563 + 4\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x8\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0xb\n"
@@ -7460,21 +7460,21 @@ void debug_sub_808EBB4()
asm(
" push {lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0xd\n"
" mov r3, #0xd\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._565\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r3, ._565 + 4\n"
" mov r0, #0x2\n"
" mov r1, #0x3\n"
" mov r2, #0x5\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" str r0, [sp]\n"
" mov r0, #0xc\n"
@@ -7507,11 +7507,11 @@ void debug_sub_808EC10()
{
asm(
" push {r4, lr}\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"
@@ -7553,11 +7553,11 @@ void debug_sub_808EC5C()
{
asm(
" push {r4, lr}\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"
@@ -8127,7 +8127,7 @@ void debug_sub_808EF8C()
" strb r1, [r0, #0x8]\n"
" mov r1, #0xc\n"
" mov r2, #0x5\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._653:\n"
" mov r3, #0x0\n"
" ldr r7, ._666\n"
@@ -8189,7 +8189,7 @@ void debug_sub_808EF8C()
" add r0, r7, #0\n"
" mov r1, #0x8\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._665\n"
"._667:\n"
" .align 2, 0\n"
@@ -8201,7 +8201,7 @@ void debug_sub_808EF8C()
" ldr r0, ._672\n"
" mov r1, #0xc\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._665:\n"
" ldr r5, ._672\n"
" mov r0, #0xff\n"
@@ -8229,7 +8229,7 @@ void debug_sub_808EF8C()
" add r0, r5, #0\n"
" mov r1, #0xc\n"
" mov r2, #0x3\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" cmp r6, #0x1\n"
" beq ._668 @cond_branch\n"
" cmp r6, #0x1\n"
@@ -8278,7 +8278,7 @@ void debug_sub_808EF8C()
" add r0, r5, #0\n"
" mov r1, #0xc\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._679\n"
"._681:\n"
" .align 2, 0\n"
@@ -8308,7 +8308,7 @@ void debug_sub_808EF8C()
" add r0, r5, #0\n"
" mov r1, #0xc\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._679:\n"
" pop {r3}\n"
" mov r8, r3\n"
@@ -8537,7 +8537,7 @@ void debug_sub_808F2E0()
" add r0, r1, #0\n"
" add r1, r4, #0\n"
" add r2, r3, #0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4}\n"
" pop {r0}\n"
" bx r0\n"
@@ -8615,7 +8615,7 @@ void debug_sub_808F31C()
" add r0, r5, #0\n"
" mov r1, r8\n"
" mov r2, r9\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r3, r4}\n"
" mov r8, r3\n"
" mov r9, r4\n"