summaryrefslogtreecommitdiff
path: root/src/debug/nohara_debug_menu.c
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-17 13:11:10 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-17 13:11:10 -0600
commit6903b3626aed4e5521243b4517c43fed3c4d0ff5 (patch)
tree34f75e24e1ef9d5c12c5a0f1e0210f67110d301d /src/debug/nohara_debug_menu.c
parentd79f440b8d4c5af26a98011719807b05745533e1 (diff)
resolve some undefined references
Diffstat (limited to 'src/debug/nohara_debug_menu.c')
-rw-r--r--src/debug/nohara_debug_menu.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index 2e739ef4d..f929170fd 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -11,17 +11,17 @@ void InitNoharaDebugMenu()
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, #0x13\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._1\n"
" mov r0, #0x1\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, #0x12\n"
@@ -53,7 +53,7 @@ void debug_sub_808F414()
{
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"
@@ -97,17 +97,17 @@ void NoharaDebugMenu_TV()
" ldr r1, ._8\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0xa\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._8 + 4\n"
" mov r0, #0x1\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, #0x9\n"
@@ -140,7 +140,7 @@ void debug_sub_808F4AC()
{
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"
@@ -356,7 +356,7 @@ void debug_sub_808F5D8()
" add r0, r0, r8\n"
" ldrb r2, [r0]\n"
" add r0, r6, #0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
@@ -400,7 +400,7 @@ void debug_sub_808F648()
" mov r1, #0x0\n"
" mov r2, #0x1d\n"
" mov r3, #0xd\n"
- " bl MenuZeroFillWindowRect\n"
+ " bl Menu_EraseWindowRect\n"
" ldr r0, ._35 + 4\n"
" ldrb r1, [r0]\n"
" mov r2, #0x1\n"
@@ -478,7 +478,7 @@ void debug_sub_808F6BC()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
@@ -505,7 +505,7 @@ void debug_sub_808F6BC()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x3\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._47\n"
"._49:\n"
" .align 2, 0\n"
@@ -521,7 +521,7 @@ void debug_sub_808F6BC()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x6\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._47:\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
@@ -550,7 +550,7 @@ void debug_sub_808F6BC()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x9\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._52\n"
"._54:\n"
" .align 2, 0\n"
@@ -566,7 +566,7 @@ void debug_sub_808F6BC()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0xc\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._52:\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
@@ -607,7 +607,7 @@ void debug_sub_808F7B4()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x0\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
" lsr r4, r0, #0x18\n"
@@ -634,7 +634,7 @@ void debug_sub_808F7B4()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x3\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._58\n"
"._60:\n"
" .align 2, 0\n"
@@ -650,7 +650,7 @@ void debug_sub_808F7B4()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x6\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._58:\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
@@ -679,7 +679,7 @@ void debug_sub_808F7B4()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0x9\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" b ._63\n"
"._65:\n"
" .align 2, 0\n"
@@ -695,7 +695,7 @@ void debug_sub_808F7B4()
" lsr r1, r1, #0x18\n"
" add r0, r5, #0\n"
" mov r2, #0xc\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._63:\n"
" add r0, r4, #1\n"
" lsl r0, r0, #0x18\n"
@@ -745,17 +745,17 @@ void debug_sub_808F8CC()
" mov r1, #0x6\n"
" mov r2, #0x1a\n"
" mov r3, #0x8\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r0, ._69 + 8\n"
" ldr r0, [r0]\n"
" mov r1, #0xe\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x16\n"
" mov r1, #0x1\n"
" mov r2, #0x18\n"
" mov r3, #0x2\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r4, ._69 + 12\n"
" add r0, r4, #0\n"
" mov r1, #0x0\n"
@@ -765,7 +765,7 @@ void debug_sub_808F8CC()
" add r0, r4, #0\n"
" mov r1, #0x17\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._69 + 16\n"
" ldr r0, ._69 + 20\n"
" str r0, [r1]\n"
@@ -878,7 +878,7 @@ void debug_sub_808F93C()
" mov r1, #0x6\n"
" mov r2, #0x1a\n"
" mov r3, #0x8\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r1, ._83 + 12\n"
" ldr r0, ._83 + 8\n"
" ldrb r0, [r0]\n"
@@ -887,12 +887,12 @@ void debug_sub_808F93C()
" ldr r0, [r0]\n"
" mov r1, #0xe\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x16\n"
" mov r1, #0x1\n"
" mov r2, #0x18\n"
" mov r3, #0x2\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r4, ._83 + 16\n"
" ldr r0, ._83 + 4\n"
" ldrb r1, [r0]\n"
@@ -903,7 +903,7 @@ void debug_sub_808F93C()
" add r0, r4, #0\n"
" mov r1, #0x17\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._79:\n"
" ldr r4, ._83\n"
" ldrh r1, [r4, #0x2e]\n"
@@ -1483,17 +1483,17 @@ void debug_sub_808FECC()
" mov r1, #0x6\n"
" mov r2, #0x17\n"
" mov r3, #0x8\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r0, ._178 + 8\n"
" ldr r0, [r0]\n"
" mov r1, #0xe\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x16\n"
" mov r1, #0x1\n"
" mov r2, #0x18\n"
" mov r3, #0x2\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r4, ._178 + 12\n"
" add r0, r4, #0\n"
" mov r1, #0x0\n"
@@ -1503,7 +1503,7 @@ void debug_sub_808FECC()
" add r0, r4, #0\n"
" mov r1, #0x17\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._178 + 16\n"
" ldr r0, ._178 + 20\n"
" str r0, [r1]\n"
@@ -1616,7 +1616,7 @@ void debug_sub_808FF3C()
" mov r1, #0x6\n"
" mov r2, #0x17\n"
" mov r3, #0x8\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r1, ._192 + 12\n"
" ldr r0, ._192 + 8\n"
" ldrb r0, [r0]\n"
@@ -1625,12 +1625,12 @@ void debug_sub_808FF3C()
" ldr r0, [r0]\n"
" mov r1, #0xe\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x16\n"
" mov r1, #0x1\n"
" mov r2, #0x18\n"
" mov r3, #0x2\n"
- " bl MenuFillWindowRectWithBlankTile\n"
+ " bl Menu_BlankWindowRect\n"
" ldr r4, ._192 + 16\n"
" ldr r0, ._192 + 4\n"
" ldrb r1, [r0]\n"
@@ -1641,7 +1641,7 @@ void debug_sub_808FF3C()
" add r0, r4, #0\n"
" mov r1, #0x17\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
"._188:\n"
" ldr r4, ._192\n"
" ldrh r1, [r4, #0x2e]\n"
@@ -1816,17 +1816,17 @@ void NoharaDebugMenu_Fan()
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, #0xb\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._204\n"
" mov r0, #0x1\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, #0xa\n"
@@ -1858,7 +1858,7 @@ void debug_sub_80901A4()
{
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"
@@ -1926,7 +1926,7 @@ void debug_sub_80901F8()
" ldr r0, [r0]\n"
" mov r1, #0xe\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._211 + 8\n"
" ldr r0, ._211 + 12\n"
" str r0, [r1]\n"
@@ -1962,7 +1962,7 @@ void debug_sub_8090238()
" ldr r0, [r0]\n"
" mov r1, #0xe\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._213 + 8\n"
" ldr r0, ._213 + 12\n"
" str r0, [r1]\n"
@@ -2026,7 +2026,7 @@ void debug_sub_809029C()
" add r0, r4, #0\n"
" mov r1, #0x10\n"
" mov r2, #0x7\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, ._219 + 12\n"
" ldr r0, ._219 + 16\n"
" str r0, [r1]\n"