diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-17 13:11:10 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-17 13:11:10 -0600 |
| commit | 6903b3626aed4e5521243b4517c43fed3c4d0ff5 (patch) | |
| tree | 34f75e24e1ef9d5c12c5a0f1e0210f67110d301d /src/debug/nakamura_debug_menu.c | |
| parent | d79f440b8d4c5af26a98011719807b05745533e1 (diff) | |
resolve some undefined references
Diffstat (limited to 'src/debug/nakamura_debug_menu.c')
| -rw-r--r-- | src/debug/nakamura_debug_menu.c | 272 |
1 files changed, 136 insertions, 136 deletions
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 343d56bc2..1d36d528f 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -178,17 +178,17 @@ void debug_sub_815F1B8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0xe\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._1\n" " mov r0, #0x10\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, #0xe\n" @@ -243,7 +243,7 @@ void debug_sub_815F214() " beq ._5 @cond_branch\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._5:\n" " ldrh r1, [r4, #0x2e]\n" " mov r0, #0x80\n" @@ -251,7 +251,7 @@ void debug_sub_815F214() " cmp r0, #0\n" " beq ._6 @cond_branch\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._6:\n" " ldrh r1, [r4, #0x2e]\n" " mov r0, #0x1\n" @@ -259,13 +259,13 @@ void debug_sub_815F214() " cmp r0, #0\n" " beq ._7 @cond_branch\n" " ldr r4, ._9 + 4\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, #0x4\n" " add r0, r0, r4\n" " ldr r4, [r0]\n" - " bl HandleDestroyMenuCursors\n" + " bl Menu_DestroyCursor\n" " bl _call_via_r4\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -331,7 +331,7 @@ u8 debug_sub_815F2B4() " push {lr}\n" " add sp, sp, #0xfffffffc\n" " bl CloseMenu\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r1, ._16\n" " ldr r0, ._16 + 4\n" " str r0, [r1, #0x8]\n" @@ -632,7 +632,7 @@ void debug_sub_815F4D8() " mov r1, #0x1\n" " mov r2, #0xa\n" " mov r3, #0xa\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r6, ._43\n" " ldr r7, ._43 + 4\n" " ldrb r1, [r7]\n" @@ -643,7 +643,7 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r2, ._43 + 8\n" " ldrb r1, [r7]\n" " lsl r0, r1, #0x2\n" @@ -669,11 +669,11 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._43 + 16\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, sp\n" " ldrb r1, [r0]\n" " add r0, r6, #0\n" @@ -683,11 +683,11 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._43 + 20\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrb r1, [r4]\n" " add r0, r6, #0\n" " mov r2, #0x0\n" @@ -696,11 +696,11 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x3\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._43 + 24\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrb r1, [r5]\n" " add r0, r6, #0\n" " mov r2, #0x0\n" @@ -709,7 +709,7 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x3\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._42:\n" " add sp, sp, #0x4\n" " pop {r4, r5, r6, r7}\n" @@ -811,12 +811,12 @@ u8 debug_sub_815F62C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_815F4D8\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -866,7 +866,7 @@ void debug_sub_815F668() " add r0, r5, #0\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " add r1, r6, #0\n" " bl __umodsi3\n" @@ -878,7 +878,7 @@ void debug_sub_815F668() " add r0, r5, #0\n" " mov r1, #0x7\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" @@ -902,7 +902,7 @@ void debug_sub_815F6E4() " mov r1, #0x3\n" " mov r2, #0xb\n" " mov r3, #0x4\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._63\n" " ldr r0, ._63 + 4\n" " ldrb r0, [r0]\n" @@ -919,7 +919,7 @@ void debug_sub_815F6E4() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -942,7 +942,7 @@ void debug_sub_815F72C() " mov r1, #0x1\n" " mov r2, #0xb\n" " mov r3, #0xa\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._66\n" " ldr r5, ._66 + 4\n" " ldrb r1, [r5]\n" @@ -953,7 +953,7 @@ void debug_sub_815F72C() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r2, ._66 + 8\n" " ldrb r1, [r5]\n" " lsl r0, r1, #0x2\n" @@ -991,7 +991,7 @@ void debug_sub_815F788() " mov r1, #0x5\n" " mov r2, #0xb\n" " mov r3, #0x6\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r0, ._68\n" " ldr r1, ._68 + 4\n" " ldrb r1, [r1]\n" @@ -999,7 +999,7 @@ void debug_sub_815F788() " lsl r1, r1, #0x18\n" " lsr r1, r1, #0x18\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._69:\n" @@ -1024,7 +1024,7 @@ void debug_sub_815F7B4() " mov r1, #0x1\n" " mov r2, #0xb\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " b ._71\n" "._73:\n" " .align 2, 0\n" @@ -1038,7 +1038,7 @@ void debug_sub_815F7B4() " add r0, r0, r1\n" " mov r1, #0xb\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._71:\n" " pop {r0}\n" " bx r0\n" @@ -1354,12 +1354,12 @@ void debug_sub_815F930() " mov r1, #0x5\n" " mov r2, #0xb\n" " mov r3, #0x6\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " mov r0, #0xb\n" " mov r1, #0x1\n" " mov r2, #0xb\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._133\n" " ldr r0, ._133 + 4\n" " str r0, [r1]\n" @@ -1413,7 +1413,7 @@ void debug_sub_815FA38() " beq ._141 @cond_branch\n" " mov r0, #0x2\n" "._138:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._161:\n" " mov r0, #0x0\n" " b ._142\n" @@ -1481,7 +1481,7 @@ void debug_sub_815FA38() " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._161 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " ldr r1, ._159 + 12\n" " strb r0, [r1]\n" " ldr r0, ._159 + 16\n" @@ -1535,12 +1535,12 @@ u8 debug_sub_815FB1C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xc\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_815F72C\n" " mov r0, #0x0\n" " str r0, [sp]\n" @@ -1591,7 +1591,7 @@ void debug_sub_815FB78() " beq ._168 @cond_branch\n" " mov r0, #0x1\n" "._165:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " mov r0, #0x0\n" " b ._177\n" "._168:\n" @@ -1600,7 +1600,7 @@ void debug_sub_815FB78() " cmp r0, #0\n" " beq ._170 @cond_branch\n" " bl CloseMenu\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0\n" @@ -1646,7 +1646,7 @@ u8 debug_sub_815FBE8() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " ldr r4, ._178 + 8\n" " add r0, r4, #0\n" " bl debug_sub_814A73C\n" @@ -1654,15 +1654,15 @@ u8 debug_sub_815FBE8() " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0x9\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 r0, ._178 + 12\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xa\n" @@ -1739,7 +1739,7 @@ u8 debug_sub_815FC94() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" " pop {r1}\n" @@ -1945,7 +1945,7 @@ void debug_sub_815FDE4() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" " b ._204\n" @@ -1971,16 +1971,16 @@ u8 debug_sub_815FE1C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x10\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._210\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r6, ._210 + 4\n" " mov r0, #0x0\n" " bl debug_sub_815FCB4\n" @@ -1994,7 +1994,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0x5\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x1\n" " bl debug_sub_815FCB4\n" " add r1, r0, #0\n" @@ -2007,7 +2007,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0x5\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x2\n" " bl debug_sub_815FCB4\n" " add r1, r0, #0\n" @@ -2020,7 +2020,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0x5\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " bl debug_sub_8092344\n" " add r1, r0, #0\n" @@ -2033,7 +2033,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0xb\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x1\n" " bl debug_sub_8092344\n" " add r1, r0, #0\n" @@ -2046,7 +2046,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0xb\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x2\n" " bl debug_sub_8092344\n" " add r1, r0, #0\n" @@ -2059,7 +2059,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0xb\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._210 + 8\n" " ldr r1, ._210 + 12\n" " add r0, r0, r1\n" @@ -2120,7 +2120,7 @@ u8 debug_sub_815FE1C() " lsr r2, r2, #0x18\n" " add r0, r6, #0\n" " add r1, r4, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" @@ -2139,7 +2139,7 @@ u8 debug_sub_815FE1C() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._210 + 16\n" " ldr r0, ._210 + 20\n" " str r0, [r1]\n" @@ -2171,16 +2171,16 @@ void debug_sub_815FFDC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0xe\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._214\n" " mov r1, #0x1\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r5, #0x0\n" " ldr r0, ._214 + 4\n" " mov r8, r0\n" @@ -2278,7 +2278,7 @@ void debug_sub_816009C() " lsl r2, r2, #0x18\n" " lsr r2, r2, #0x18\n" " mov r1, #0x10\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._220:\n" @@ -2330,7 +2330,7 @@ void debug_sub_81600D0() " lsl r2, r2, #0x18\n" " lsr r2, r2, #0x18\n" " mov r1, #0x17\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._226\n" "._228:\n" " .align 2, 0\n" @@ -2343,7 +2343,7 @@ void debug_sub_81600D0() " lsr r2, r2, #0x18\n" " mov r0, sp\n" " mov r1, #0x17\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._226:\n" " add sp, sp, #0x4\n" " pop {r4, r5}\n" @@ -2378,7 +2378,7 @@ void debug_sub_816013C() " add r0, r5, #0\n" " mov r1, #0x1a\n" " add r2, r4, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -2407,7 +2407,7 @@ void debug_sub_816017C() " lsr r3, r3, #0x18\n" " mov r0, #0x10\n" " mov r2, #0x1c\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._232\n" " lsl r0, r4, #0x2\n" " add r0, r0, r1\n" @@ -2634,7 +2634,7 @@ void debug_sub_8160308() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r2, #0x0\n" "._252:\n" " add r1, r2, #1\n" @@ -2748,7 +2748,7 @@ void debug_sub_81603B8() " lsl r3, r3, #0x18\n" " lsr r3, r3, #0x18\n" " add r0, r2, #0\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " cmp r6, #0\n" " bne ._256 @cond_branch\n" " cmp r4, #0\n" @@ -3698,7 +3698,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._423:\n" " .align 2, 0\n" @@ -3715,7 +3715,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._427:\n" " .align 2, 0\n" @@ -3731,7 +3731,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._431:\n" " .align 2, 0\n" @@ -3747,7 +3747,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._435:\n" " .align 2, 0\n" @@ -3763,7 +3763,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._439:\n" " .align 2, 0\n" @@ -3779,7 +3779,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._440:\n" " pop {r4}\n" " pop {r0}\n" @@ -3871,11 +3871,11 @@ void debug_sub_8160BB0() " mov r1, #0x1\n" " mov r2, #0x8\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -3898,32 +3898,32 @@ void debug_sub_8160BE4() " mov r1, #0x0\n" " mov r2, #0xc\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_8160BB0\n" " ldr r0, ._459\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 4\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 8\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 12\n" " mov r1, #0x2\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 16\n" " mov r1, #0x2\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 20\n" " mov r1, #0x2\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r4, #0x0\n" "._458:\n" " add r0, r4, #0\n" @@ -4057,7 +4057,7 @@ void debug_sub_8160CF4() " beq ._475 @cond_branch\n" " mov r0, #0x1\n" "._472:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " mov r0, #0x0\n" " b ._484\n" "._475:\n" @@ -4065,7 +4065,7 @@ void debug_sub_8160CF4() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._477 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r1, #0x1\n" @@ -4076,13 +4076,13 @@ void debug_sub_8160CF4() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._479 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r1, #0x1\n" "._478:\n" " bl debug_sub_8160B50\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " bl debug_sub_8160A80\n" @@ -4112,7 +4112,7 @@ void debug_sub_8160CF4() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._484:\n" @@ -4131,7 +4131,7 @@ u8 debug_sub_8160D98() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl debug_sub_8160BE4\n" " ldr r1, ._485\n" " ldr r0, ._485 + 4\n" @@ -4157,43 +4157,43 @@ void debug_sub_8160DC0() " mov r1, #0x0\n" " mov r2, #0x16\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._487\n" " mov r1, #0xb\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 4\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 8\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 12\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 16\n" " mov r1, #0x2\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 20\n" " mov r1, #0x2\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 24\n" " mov r1, #0x2\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 28\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 32\n" " mov r1, #0x2\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._488:\n" @@ -4222,7 +4222,7 @@ void debug_sub_8160E50() " mov r1, #0x1\n" " mov r2, #0xa\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r5, ._489\n" " add r0, r6, #0\n" " mov r1, #0x2\n" @@ -4231,12 +4231,12 @@ void debug_sub_8160E50() " add r0, r5, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xc\n" " mov r1, #0x1\n" " mov r2, #0x15\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r6, #0\n" " mov r1, #0xb\n" " bl GetMonData\n" @@ -4246,7 +4246,7 @@ void debug_sub_8160E50() " add r0, r0, r1\n" " mov r1, #0xc\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1a\n" " bl GetMonData\n" @@ -4262,11 +4262,11 @@ void debug_sub_8160E50() " mov r1, #0x3\n" " mov r2, #0x11\n" " mov r3, #0x4\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1b\n" " bl GetMonData\n" @@ -4284,11 +4284,11 @@ void debug_sub_8160E50() " mov r1, #0x5\n" " mov r2, #0x11\n" " mov r3, #0x6\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1c\n" " bl GetMonData\n" @@ -4306,11 +4306,11 @@ void debug_sub_8160E50() " mov r1, #0x7\n" " mov r2, #0x11\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1d\n" " bl GetMonData\n" @@ -4328,11 +4328,11 @@ void debug_sub_8160E50() " mov r1, #0x9\n" " mov r2, #0x11\n" " mov r3, #0xa\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1e\n" " bl GetMonData\n" @@ -4350,11 +4350,11 @@ void debug_sub_8160E50() " mov r1, #0xb\n" " mov r2, #0x11\n" " mov r3, #0xc\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1f\n" " bl GetMonData\n" @@ -4372,11 +4372,11 @@ void debug_sub_8160E50() " mov r1, #0xd\n" " mov r2, #0x11\n" " mov r3, #0xe\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #0\n" " add r1, r4, #0\n" " mov r2, #0x0\n" @@ -4386,11 +4386,11 @@ void debug_sub_8160E50() " mov r1, #0xf\n" " mov r2, #0x11\n" " mov r3, #0x10\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x20\n" " bl GetMonData\n" @@ -4403,11 +4403,11 @@ void debug_sub_8160E50() " mov r1, #0x11\n" " mov r2, #0x11\n" " mov r3, #0x12\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" @@ -4565,7 +4565,7 @@ void debug_sub_81610BC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._518:\n" @@ -4584,7 +4584,7 @@ void DebugMenu_EffortValues() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " ldr r1, ._519\n" " mov r0, #0x0\n" " strb r0, [r1]\n" @@ -4689,52 +4689,52 @@ void debug_sub_81611D8() " mov r1, #0x0\n" " mov r2, #0xf\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._531\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 4\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 8\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 12\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 16\n" " mov r1, #0x2\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 20\n" " mov r1, #0xd\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r4, ._531 + 24\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xe\n" @@ -4778,7 +4778,7 @@ void debug_sub_8161290() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -4812,7 +4812,7 @@ void debug_sub_81612B8() " add r0, r5, #0\n" " mov r1, #0x8\n" " add r2, r4, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -4858,7 +4858,7 @@ void debug_sub_81612EC() " beq ._542 @cond_branch\n" " mov r0, #0x1\n" "._539:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._565:\n" " mov r0, #0x0\n" " b ._543\n" @@ -4867,7 +4867,7 @@ void debug_sub_81612EC() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._544 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r4, r0, #0x18\n" " cmp r4, #0\n" @@ -4910,7 +4910,7 @@ void debug_sub_81612EC() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._552 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r4, r0, #0x18\n" " cmp r4, #0\n" @@ -4978,7 +4978,7 @@ void debug_sub_81612EC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._543:\n" @@ -5007,7 +5007,7 @@ void DebugMenu_RandomNumberTest() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl debug_sub_81611D8\n" " ldr r1, ._566 + 16\n" " ldr r0, ._566 + 20\n" |