diff options
Diffstat (limited to 'src/debug')
-rw-r--r-- | src/debug/kagaya_debug_menu.c | 6 | ||||
-rw-r--r-- | src/debug/nohara_debug_menu.c | 4 | ||||
-rw-r--r-- | src/debug/start_menu_debug.c | 10 | ||||
-rw-r--r-- | src/debug/taya_debug_window.c | 6 | ||||
-rw-r--r-- | src/debug/unk_debug_menu_3.c | 10 | ||||
-rw-r--r-- | src/debug/watanabe_debug_menu.c | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 8ece4ebec..321627a10 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -319,7 +319,7 @@ void debug_sub_80B0770() " .align 2, 0\n" "._30:\n" " .word gPlayerAvatar\n" - " .word gUnknown_0202FF84\n" + " .word gFieldEffectArguments\n" "._27:\n" " bl CloseMenu\n" "._29:\n" @@ -382,7 +382,7 @@ void debug_sub_80B07DC() "._37:\n" " .align 2, 0\n" "._36:\n" - " .word sub_80FC074+1\n" + " .word CB2_InitFlyRegionMap+1\n" "\n" ); } @@ -412,7 +412,7 @@ void debug_sub_80B0800() "._40:\n" " .align 2, 0\n" "._39:\n" - " .word gUnknown_0202FF84\n" + " .word gFieldEffectArguments\n" "\n" ); } diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 766137871..53c6394ba 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -419,7 +419,7 @@ void debug_sub_808F648() " bl debug_sub_808F6BC\n" " b ._40\n" "._32:\n" - " bl ProcessMenuInputNoWrap_\n" + " bl Menu_ProcessInputNoWrap_\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x1\n" @@ -998,7 +998,7 @@ void debug_sub_808FA88() " cmp r1, #0x21\n" " bls ._87 @cond_branch\n" " add r0, r7, #0\n" - " bl sub_80BFB54\n" + " bl GetTVChannelByShowType\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " add r1, r0, #0\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index e4ae404e2..321bbb951 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -949,7 +949,7 @@ void DebugMenu_807706C() "._114:\n" " .align 2, 0\n" "._113:\n" - " .word gWindowConfig_81E6CE4\n" + " .word gWindowTemplate_81E6CE4\n" " .word gCallback_03004AE8\n" " .word DebugMenu_807709C+1\n" "\n" @@ -1893,7 +1893,7 @@ void DebugMenu_Teleport() { asm( " push {lr}\n" - " bl sub_8053570\n" + " bl Overworld_SetWarpDestToLastHealLoc\n" " bl sub_8080E88\n" " bl ScriptContext2_Enable\n" " bl CloseMenu\n" @@ -2384,7 +2384,7 @@ void DebugMenu_8077974() " asr r1, r1, #0x18\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" - " bl sub_8082C0C\n" + " bl DoesSomeoneWantRematchIn\n" " cmp r0, #0\n" " beq ._228 @cond_branch\n" " ldr r0, ._230 + 12\n" @@ -5977,7 +5977,7 @@ void DebugMenu_8079058() "._618:\n" " .word gDebug0x839C60C\n" "._612:\n" - " bl ProcessMenuInputNoWrap_\n" + " bl Menu_ProcessInputNoWrap_\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -6082,7 +6082,7 @@ void DebugMenu_8079110() "._639:\n" " .word gDebug0x839C60C+0xe\n" "._635:\n" - " bl MenuUpdateWindowText\n" + " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " beq ._642 @cond_branch\n" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index ce1cc47ee..842837b18 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -41,7 +41,7 @@ void TayaDebugMenu_Trend() " strb r1, [r0]\n" " ldrh r1, [r5, #0x4]\n" " add r0, r6, #0\n" - " bl sub_80EB3FC\n" + " bl EasyChat_GetWordText\n" " mov r0, sl\n" " add r1, r6, #0\n" " mov r2, #0x0\n" @@ -50,7 +50,7 @@ void TayaDebugMenu_Trend() " add r4, r0, #0\n" " ldrh r1, [r5, #0x6]\n" " add r0, r6, #0\n" - " bl sub_80EB3FC\n" + " bl EasyChat_GetWordText\n" " add r0, r4, #0\n" " add r1, r6, #0\n" " mov r2, #0x0\n" @@ -1995,7 +1995,7 @@ void debug_sub_80915BC() "._173:\n" " .align 2, 0\n" "._172:\n" - " .word gWindowConfig_81E7224\n" + " .word gWindowTemplate_81E7224\n" " .word gUnknown_Debug_083C517C\n" " .word +0x2000000\n" " .word debug_sub_8091320+1\n" diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index a217a0258..dfb92feb9 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -356,7 +356,7 @@ void debug_sub_813C5B4() " .word gOtherText_DataCannotUseVersion+0x331\n" " .word gOtherText_DataCannotUseVersion+0x30d\n" " .word gOtherText_DataCannotUseVersion+0x861\n" - " .word gFlashSectors+0x8\n" + " .word sUnusedFlashSectors+0x8\n" " .word 0xfff\n" " .word 0x52f\n" "\n" @@ -417,8 +417,8 @@ void debug_sub_813C638() " .align 2, 0\n" "._25:\n" " .word 0x270f\n" - " .word gFlashSectors+0xc\n" - " .word gFlashSectors+0x14\n" + " .word sUnusedFlashSectors+0xc\n" + " .word sUnusedFlashSectors+0x14\n" "\n" ); } @@ -588,7 +588,7 @@ void debug_sub_813C740() " .word gOtherText_DataCannotUseVersion+0x99e\n" " .word gOtherText_DataCannotUseVersion+0xa4a\n" " .word gEnemyParty\n" - " .word gFlashSectors+0x4\n" + " .word sUnusedFlashSectors+0x4\n" " .word gOtherText_DataCannotUseVersion+0x9c2\n" " .word gOtherText_DataCannotUseVersion+0xa26\n" "\n" @@ -788,7 +788,7 @@ void debug_sub_813C93C() "._37:\n" " .word gOtherText_DataCannotUseVersion+0xa4a\n" " .word gOtherText_DataCannotUseVersion+0xb61\n" - " .word gFlashSectors+0x24\n" + " .word sUnusedFlashSectors+0x24\n" " .word 0x270f\n" " .word gOtherText_DataCannotUseVersion+0xa61\n" "\n" diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 731e58986..7288f602e 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -142,8 +142,8 @@ void debug_80C35DC() " .word 0x81000800\n" " .word stru_83F8828\n" " .word stru_83F8838\n" - " .word gWindowConfig_81E6C3C\n" - " .word gWindowConfig_81E6CE4\n" + " .word gWindowTemplate_81E6C3C\n" + " .word gWindowTemplate_81E6CE4\n" "\n" ); } |