summaryrefslogtreecommitdiff
path: root/src/debug/taya_debug_window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug/taya_debug_window.c')
-rw-r--r--src/debug/taya_debug_window.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index c20d9b87c..ce1cc47ee 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -13,12 +13,12 @@ void TayaDebugMenu_Trend()
" mov r5, r8\n"
" push {r5, r6, r7}\n"
" add sp, sp, #0xffffffd8\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" mov r0, #0x0\n"
" mov r1, #0x0\n"
" mov r2, #0x1e\n"
" mov r3, #0xb\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r5, ._3\n"
" mov r7, #0x0\n"
" mov r0, #0x1\n"
@@ -89,7 +89,7 @@ void TayaDebugMenu_Trend()
" lsr r2, r2, #0x18\n"
" mov r0, sp\n"
" mov r1, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r5, r5, #0x8\n"
" add r0, r7, #1\n"
" lsl r0, r0, #0x10\n"
@@ -136,7 +136,7 @@ void debug_sub_8090808()
"._7:\n"
" .word gMain\n"
"._5:\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl CloseMenu\n"
" mov r0, #0x1\n"
"._6:\n"
@@ -179,7 +179,7 @@ void TayaDebugMenu_TrendR()
" lsr r0, r0, #0x10\n"
" cmp r0, #0x4\n"
" bls ._10 @cond_branch\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl CloseMenu\n"
" mov r0, #0x1\n"
" pop {r4, r5, r6, r7}\n"
@@ -219,7 +219,7 @@ void debug_sub_809089C()
{
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"
@@ -303,12 +303,12 @@ void TayaDebugMenu_SimpleText()
" mov r1, #0x0\n"
" mov r2, #0xc\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._32\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, #0xb\n"
@@ -340,7 +340,7 @@ void debug_sub_8090984()
{
asm(
" push {r4, r5, r6, r7, lr}\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r2, r0, #0x18\n"
" asr r1, r2, #0x18\n"
" mov r0, #0x2\n"
@@ -432,12 +432,12 @@ void TayaDebugMenu_OldMan()
" mov r1, #0x0\n"
" mov r2, #0xa\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r3, ._48\n"
" mov r0, #0x1\n"
" mov r1, #0x1\n"
" mov r2, #0x8\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" bl GetCurrentMauvilleOldMan\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
@@ -471,7 +471,7 @@ void TayaDebugMenu_LanettesPC()
{
asm(
" push {lr}\n"
- " bl MenuZeroFillScreen\n"
+ " bl Menu_EraseScreen\n"
" bl ShowPokemonStorageSystem\n"
" mov r0, #0x1\n"
" pop {r1}\n"
@@ -658,7 +658,7 @@ void debug_sub_8090C44()
" add r0, r4, #0\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" add r0, r4, #0\n"
" mov r1, #0x0\n"
" mov r2, #0x5\n"
@@ -670,7 +670,7 @@ void debug_sub_8090C44()
" add r0, r4, #0\n"
" mov r1, #0x1\n"
" mov r2, #0x3\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" pop {r4, r5}\n"
" pop {r0}\n"
" bx r0\n"
@@ -874,7 +874,7 @@ void TayaDebugMenu_PKMNLottery()
" mov r1, #0x0\n"
" mov r2, #0x6\n"
" mov r3, #0x5\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" bl RetrieveLotteryNumber\n"
" ldr r2, ._83\n"
" ldr r0, ._83 + 4\n"
@@ -979,7 +979,7 @@ void TayaDebugMenu_PokenavD()
" mov r5, r8\n"
" push {r5, r6, r7}\n"
" add sp, sp, #0xffffffe4\n"
- " bl MenuDisplayMessageBox\n"
+ " bl Menu_DisplayDialogueFrame\n"
" mov r0, #0x0\n"
" mov sl, r0\n"
" mov r6, #0x1\n"
@@ -999,7 +999,7 @@ void TayaDebugMenu_PokenavD()
" add r0, r4, #0\n"
" mov r1, #0x2\n"
" mov r2, #0xf\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x0\n"
" mov r8, r0\n"
" str r5, [sp, #0x14]\n"
@@ -1299,7 +1299,7 @@ void TayaDebugMenu_8091190()
asm(
" push {r4, r5, lr}\n"
" add sp, sp, #0xfffffff8\n"
- " bl ProcessMenuInput\n"
+ " bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
" asr r3, r0, #0x18\n"
" mov r0, #0x2\n"
@@ -1370,12 +1370,12 @@ void TayaDebugMenu_8091190()
" ldrsb r1, [r5, r1]\n"
" cmp r0, r1\n"
" beq ._106 @cond_branch\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 r4, ._107 + 8\n"
" mov r0, #0x0\n"
" ldrsb r0, [r5, r0]\n"
@@ -1385,7 +1385,7 @@ void TayaDebugMenu_8091190()
" ldr r3, [r0]\n"
" mov r0, #0x1\n"
" mov r1, #0x1\n"
- " bl PrintMenuItems\n"
+ " bl Menu_PrintItems\n"
" mov r0, #0x0\n"
" ldrsb r0, [r5, r0]\n"
" lsl r0, r0, #0x3\n"
@@ -1427,18 +1427,18 @@ void InitTayaDebugWindow()
" ldr r1, ._109\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, #0xb\n"
" mov r3, #0x13\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" ldr r0, ._109 + 4\n"
" ldr r3, [r0]\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"
@@ -1944,29 +1944,29 @@ void debug_sub_80915BC()
" bls ._171 @cond_branch\n"
" ldr r4, ._172\n"
" add r0, r4, #0\n"
- " bl SetUpWindowConfig\n"
+ " bl Text_LoadWindowTemplate\n"
" add r0, r4, #0\n"
" bl InitMenuWindow\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 r0, ._172 + 4\n"
" mov r1, #0x1\n"
" mov r2, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" mov r0, #0x0\n"
" mov r1, #0x4\n"
" mov r2, #0x1d\n"
" mov r3, #0x11\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" mov r0, #0x0\n"
" mov r1, #0x12\n"
" mov r2, #0x1d\n"
" mov r3, #0x15\n"
- " bl MenuDrawTextWindow\n"
+ " bl Menu_DrawStdWindowFrame\n"
" mov r1, #0x80\n"
" lsl r1, r1, #0x13\n"
" mov r2, #0x8a\n"
@@ -2096,7 +2096,7 @@ void debug_sub_80916AC()
" add r0, r7, #0\n"
" add r0, r0, #0x12\n"
" mov r1, #0x1\n"
- " bl MenuPrint\n"
+ " bl Menu_PrintText\n"
" ldr r1, [sp]\n"
" lsl r0, r1, #0x18\n"
" lsr r6, r0, #0x18\n"