summaryrefslogtreecommitdiff
path: root/src/debug
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug')
-rw-r--r--src/debug/crash.c55
-rw-r--r--src/debug/kagaya_debug_menu.c12
-rw-r--r--src/debug/matsuda_debug_menu.c86
-rw-r--r--src/debug/mori_debug_menu.c8
-rw-r--r--src/debug/nakamura_debug_menu.c22
-rw-r--r--src/debug/nohara_debug_menu.c26
-rw-r--r--src/debug/start_menu_debug.c48
-rw-r--r--src/debug/taya_debug_window.c20
-rw-r--r--src/debug/tomomichi_debug_menu.c208
-rw-r--r--src/debug/unknown_debug_menu.c6
10 files changed, 235 insertions, 256 deletions
diff --git a/src/debug/crash.c b/src/debug/crash.c
new file mode 100644
index 000000000..85058d285
--- /dev/null
+++ b/src/debug/crash.c
@@ -0,0 +1,55 @@
+#include "global.h"
+#include "main.h"
+#include "task.h"
+#include "text.h"
+#include "palette.h"
+
+extern struct Window gUnknown_03004210;
+
+static void CB2_CrashIdle(void);
+
+// unused exception handler. Takes a string input describing the exception
+// and halts on a black screen. Used in German Debug Ruby.
+void Crash(u8 *text)
+{
+ u16 savedIme;
+
+ REG_BG0HOFS = 0;
+ REG_BG0VOFS = 0;
+ REG_BG1HOFS = 0;
+ REG_BG1VOFS = 0;
+ REG_BG2HOFS = 0;
+ REG_BG2VOFS = 0;
+ REG_BG3HOFS = 0;
+ REG_BG3VOFS = 0;
+ REG_WIN0H = 0;
+ REG_WIN0V = 0;
+ REG_WIN1H = 0;
+ REG_WIN1V = 0;
+ REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
+ savedIme = REG_IME;
+ REG_IME = 0;
+ REG_IE |= INTR_FLAG_VBLANK;
+ REG_IME = savedIme;
+ REG_DISPSTAT = 8;
+ ResetTasks();
+ ResetSpriteData();
+ SetMainCallback2(CB2_CrashIdle);
+ DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8);
+ Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8);
+ LoadFontDefaultPalette(&gWindowTemplate_81E6FD8);
+ Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7);
+}
+
+static void CB2_CrashIdle(void)
+{
+ REG_BG0HOFS = 0;
+ REG_BG0VOFS = 0;
+ REG_BG1HOFS = 0;
+ REG_BG1VOFS = 0;
+ REG_BG2HOFS = 0;
+ REG_BG2VOFS = 0;
+ REG_BG3HOFS = 0;
+ REG_BG3VOFS = 0;
+}
diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c
index 321627a10..53e3fac1a 100644
--- a/src/debug/kagaya_debug_menu.c
+++ b/src/debug/kagaya_debug_menu.c
@@ -65,7 +65,7 @@ void InitKagayaDebugMenu_B()
" .align 2, 0\n"
"._1:\n"
" .word _83EBB64\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_80B061C+1\n"
"\n"
);
@@ -102,7 +102,7 @@ void debug_sub_80B061C()
"._8:\n"
" .align 2, 0\n"
"._7:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word _83EBB64\n"
"._5:\n"
" bl CloseMenu\n"
@@ -137,7 +137,7 @@ u8 KagayaDebugMenu_TrainerCard()
"._10:\n"
" .align 2, 0\n"
"._9:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_80B068C+1\n"
"\n"
);
@@ -194,7 +194,7 @@ u8 KagayaDebugMenu_CardToExchange()
"._16:\n"
" .align 2, 0\n"
"._15:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_80B06E0+1\n"
"\n"
);
@@ -251,7 +251,7 @@ u8 KagayaDebugMenu_SlotMachine()
"._22:\n"
" .align 2, 0\n"
"._21:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word Kagaya_80B0734+1\n"
"\n"
);
@@ -354,7 +354,7 @@ void debug_sub_80B07B0()
"._33:\n"
" .align 2, 0\n"
"._32:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_80B07DC+1\n"
"\n"
);
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 1da337b04..da1937adb 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -37,8 +37,8 @@ extern u16 gBattle_BG2_X;
extern u16 gBattle_BG2_Y;
extern u16 gBattle_BG3_X;
extern u16 gBattle_BG3_Y;
-extern struct Window gUnknown_03004210;
-extern u8 (*gCallback_03004AE8)(void);
+
+extern u8 (*gMenuCallback)(void);
extern bool8 gReceivedRemoteLinkPlayers;
@@ -251,7 +251,7 @@ u8 unref_sub_80A9B28(void)
Menu_DrawStdWindowFrame(0, 0, 17, 18);
Menu_PrintItems(1, 1, 7, gMatsudaDebugMenuActions);
InitMenu(0, 1, 1, 7, 0, 16);
- gCallback_03004AE8 = sub_80A9B78;
+ gMenuCallback = sub_80A9B78;
return 0;
}
@@ -264,7 +264,7 @@ static bool8 sub_80A9B78(void)
case -2:
return FALSE;
default:
- gCallback_03004AE8 = gMatsudaDebugMenuActions[choice].func;
+ gMenuCallback = gMatsudaDebugMenuActions[choice].func;
return FALSE;
case -1:
CloseMenu();
@@ -469,26 +469,10 @@ static void sub_80A9F50(void)
static void sub_80A9FE4(void)
{
- u8 *addr;
- u32 i;
u8 ptr[5];
memcpy(ptr, gMatsudaDebugMenu_UnknownByteArray, 5);
-
- addr = (void *)VRAM;
- i = VRAM_SIZE;
-
- while (1)
- {
- DmaFill32(3, 0, addr, 0x1000);
- addr += 0x1000;
- i -= 0x1000;
- if (i <= 0x1000)
- {
- DmaFill32(3, 0, addr, i);
- break;
- }
- }
+ DmaFill32Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
sub_80034D4((void *)VRAM, ptr);
LoadFontDefaultPalette(&gWindowTemplate_81E6C3C);
}
@@ -1032,63 +1016,3 @@ u8 MatsudaDebugMenu_SetArtMuseumItems(void)
CloseMenu();
return 1;
}
-
-void unref_sub_80AB084(u8 *text)
-{
- u16 savedIme;
- u8 *addr;
- size_t size;
-
- REG_BG0HOFS = 0;
- REG_BG0VOFS = 0;
- REG_BG1HOFS = 0;
- REG_BG1VOFS = 0;
- REG_BG2HOFS = 0;
- REG_BG2VOFS = 0;
- REG_BG3HOFS = 0;
- REG_BG3VOFS = 0;
- REG_WIN0H = 0;
- REG_WIN0V = 0;
- REG_WIN1H = 0;
- REG_WIN1V = 0;
- REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
-
- savedIme = REG_IME;
- REG_IME = 0;
- REG_IE |= INTR_FLAG_VBLANK;
- REG_IME = savedIme;
- REG_DISPSTAT = 8;
- ResetTasks();
- ResetSpriteData();
- SetMainCallback2(sub_80AB184);
-
- addr = (void *)VRAM;
- size = 0x18000;
- while (1)
- {
- DmaFill32(3, 0, addr, 0x1000);
- addr += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill32(3, 0, addr, size);
- break;
- }
- }
- Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8);
- Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8);
- LoadFontDefaultPalette(&gWindowTemplate_81E6FD8);
- Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7);
-}
-
-void sub_80AB184(void)
-{
- REG_BG0HOFS = 0;
- REG_BG0VOFS = 0;
- REG_BG1HOFS = 0;
- REG_BG1VOFS = 0;
- REG_BG2HOFS = 0;
- REG_BG2VOFS = 0;
- REG_BG3HOFS = 0;
- REG_BG3VOFS = 0;
-}
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 7b9a579a7..767f4cda0 100644
--- a/src/debug/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
@@ -12,7 +12,7 @@
#define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
-extern u8 (*gCallback_03004AE8)(void);
+extern u8 (*gMenuCallback)(void);
u8 gUnknown_03004DA0[0x20];
@@ -98,7 +98,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
Menu_EraseScreen();
Menu_DrawStdWindowFrame(0, 14, 30, 19);
Menu_PrintText(localPtr, 1, 15);
- gCallback_03004AE8 = sub_8083D4C;
+ gMenuCallback = sub_8083D4C;
return 0;
}
@@ -184,7 +184,7 @@ bool8 MoriDebugMenuProcessInput(void)
switch (choice)
{
default:
- gCallback_03004AE8 = gMoriDebugMenuActions[choice].func;
+ gMenuCallback = gMoriDebugMenuActions[choice].func;
return FALSE;
case -2:
return FALSE;
@@ -200,6 +200,6 @@ s8 InitMoriDebugMenu(void)
Menu_DrawStdWindowFrame(0, 0, 10, 19);
Menu_PrintItems(1, 1, 9, gMoriDebugMenuActions);
InitMenu(0, 1, 1, 9, 0, 9);
- gCallback_03004AE8 = MoriDebugMenuProcessInput;
+ gMenuCallback = MoriDebugMenuProcessInput;
return 0;
}
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index b86fa0abf..67f4a1af7 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -224,7 +224,7 @@ void InitNakamuraDebugMenu()
"._4:\n"
" .align 2, 0\n"
"._3:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815F214+1\n"
"\n"
);
@@ -825,7 +825,7 @@ u8 debug_sub_815F62C()
" .align 2, 0\n"
"._59:\n"
" .word _nakamuraData\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815F5C4+1\n"
"\n"
);
@@ -1367,7 +1367,7 @@ void debug_sub_815F930()
"._134:\n"
" .align 2, 0\n"
"._133:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815FA38+1\n"
"._131:\n"
" mov r0, #0x2\n"
@@ -1500,7 +1500,7 @@ void debug_sub_815FA38()
" .word 0x1a08\n"
" .word _nakamuraData+0x1\n"
" .word _nakamuraData+0x2\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815F930+1\n"
"._155:\n"
" mov r0, #0x2\n"
@@ -1560,7 +1560,7 @@ u8 debug_sub_815FB1C()
"._162:\n"
" .word _nakamuraData\n"
" .word _nakamuraData+0x3\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815FA38+1\n"
"\n"
);
@@ -1680,7 +1680,7 @@ u8 debug_sub_815FBE8()
"._179:\n"
" .align 2, 0\n"
"._178:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815FB78+1\n"
" .word gStringVar1\n"
" .word Str_843E580\n"
@@ -2154,7 +2154,7 @@ u8 debug_sub_815FE1C()
" .word gStringVar1\n"
" .word gSaveBlock1\n"
" .word 0x2dd6\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_815FDE4+1\n"
"\n"
);
@@ -2250,7 +2250,7 @@ void debug_sub_815FFDC()
" .align 2, 0\n"
"._217:\n"
" .word _nakamuraData+0x4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8160498+1\n"
"\n"
);
@@ -4142,7 +4142,7 @@ u8 debug_sub_8160D98()
"._486:\n"
" .align 2, 0\n"
"._485:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8160CF4+1\n"
"\n"
);
@@ -4602,7 +4602,7 @@ void DebugMenu_EffortValues()
"._519:\n"
" .word _nakamuraData+0x5\n"
" .word gPlayerParty\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_81610BC+1\n"
"\n"
);
@@ -5022,7 +5022,7 @@ void DebugMenu_RandomNumberTest()
" .word _nakamuraData+0x8\n"
" .word _nakamuraData+0xc\n"
" .word _nakamuraData+0xa\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_81612EC+1\n"
"\n"
);
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index 629b7b9eb..a932fee8d 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -42,7 +42,7 @@ void InitNoharaDebugMenu()
" .align 2, 0\n"
"._1:\n"
" .word gUnknown_Debug_083C4938\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808F414+1\n"
"\n"
);
@@ -76,7 +76,7 @@ void debug_sub_808F414()
"._7:\n"
" .align 2, 0\n"
"._6:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C4938\n"
"._4:\n"
" bl CloseMenu\n"
@@ -129,7 +129,7 @@ void NoharaDebugMenu_TV()
"._8:\n"
" .word gDebug_03000724+0x2\n"
" .word gUnknown_Debug_083C4B8C\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808F4AC+1\n"
"\n"
);
@@ -163,7 +163,7 @@ void debug_sub_808F4AC()
"._14:\n"
" .align 2, 0\n"
"._13:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C4B8C\n"
"._11:\n"
" bl CloseMenu\n"
@@ -196,7 +196,7 @@ void debug_sub_808F4EC()
" .align 2, 0\n"
"._15:\n"
" .word gUnknown_Debug_083C4980\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808F648+1\n"
"\n"
);
@@ -379,7 +379,7 @@ void debug_sub_808F5D8()
" .word gStringVar1\n"
" .word gUnknown_Debug_083C4BD4\n"
" .word gSpecialVar_0x8004\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090278+1\n"
"\n"
);
@@ -779,7 +779,7 @@ void debug_sub_808F8CC()
" .word gUnknown_Debug_083C49CA\n"
" .word gUnknown_Debug_083C4ABD+0xf\n"
" .word gStringVar1\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808F93C+1\n"
"\n"
);
@@ -1517,7 +1517,7 @@ void debug_sub_808FECC()
" .word gUnknown_Debug_083C49CA\n"
" .word gUnknown_Debug_083C4B20+0x4\n"
" .word gStringVar1\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808FF3C+1\n"
"\n"
);
@@ -1847,7 +1847,7 @@ void NoharaDebugMenu_Fan()
" .align 2, 0\n"
"._204:\n"
" .word gUnknown_Debug_083C4D28\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_80901A4+1\n"
"\n"
);
@@ -1881,7 +1881,7 @@ void debug_sub_80901A4()
"._210:\n"
" .align 2, 0\n"
"._209:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C4D28\n"
"._207:\n"
" bl CloseMenu\n"
@@ -1938,7 +1938,7 @@ void debug_sub_80901F8()
"._211:\n"
" .word gUnknown_Debug_083C4CA8\n"
" .word gUnknown_083F8408\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090278+1\n"
"\n"
);
@@ -1974,7 +1974,7 @@ void debug_sub_8090238()
"._213:\n"
" .word gUnknown_Debug_083C4CA8\n"
" .word gUnknown_083F8410\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090278+1\n"
"\n"
);
@@ -2040,7 +2040,7 @@ void debug_sub_809029C()
" .word gStringVar1\n"
" .word gSaveBlock1\n"
" .word 0x13c2\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090278+1\n"
"\n"
);
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index b376a4076..f8e10baa2 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -900,7 +900,7 @@ void DebugMenu_8077020()
"._110:\n"
" .align 2, 0\n"
"._109:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
"\n"
);
}
@@ -922,7 +922,7 @@ void DebugMenu_8077048()
"._112:\n"
" .align 2, 0\n"
"._111:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_807706C+1\n"
" .word DebugMenu_8077020+1\n"
"\n"
@@ -950,7 +950,7 @@ void DebugMenu_807706C()
" .align 2, 0\n"
"._113:\n"
" .word gWindowTemplate_81E6CE4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_807709C+1\n"
"\n"
);
@@ -1639,7 +1639,7 @@ void DebugMenu_SetRamBerry()
" .align 2, 0\n"
"._172:\n"
" .word gUnknown_Debug_0839BBC1+0x263\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_807750C+1\n"
"\n"
);
@@ -2154,7 +2154,7 @@ void DebugMenu_SwitchBG()
"._204:\n"
" .align 2, 0\n"
"._203:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077760+1\n"
"\n"
);
@@ -2264,7 +2264,7 @@ void DebugMenu_ControlEncounter()
" .align 2, 0\n"
"._213:\n"
" .word sWildEncountersDisabled\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_80778A8+1\n"
"\n"
);
@@ -2282,7 +2282,7 @@ void DebugMenu_UseHM()
"._216:\n"
" .align 2, 0\n"
"._215:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077C14+1\n"
"\n"
);
@@ -2418,7 +2418,7 @@ void DebugMenu_8077974()
" .word gStringVar2\n"
" .word gUnknown_Debug_0839BBC1+0x2cf\n"
" .word gUnknown_Debug_0839BBC1+0x2aa\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077DB4+1\n"
"\n"
);
@@ -2509,7 +2509,7 @@ void DebugMenu_RematchTrainers()
" .align 2, 0\n"
"._240:\n"
" .word gUnknown_Debug_0839BBC1+0x323\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077A60+1\n"
"\n"
);
@@ -2627,7 +2627,7 @@ void DebugMenu_8077B00()
" .align 2, 0\n"
"._254:\n"
" .word gUnknown_Debug_0839BBC1+0x35e\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077DB4+1\n"
"\n"
);
@@ -2686,7 +2686,7 @@ void DebugMenu_Safari()
" .word gStringVar1\n"
" .word gSafariZoneStepCounter\n"
" .word gUnknown_Debug_0839BBC1+0x34b\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077B3C+1\n"
"._258:\n"
" bl CloseMenu\n"
@@ -2818,7 +2818,7 @@ void DebugMenu_8077C14()
" .align 2, 0\n"
"._264:\n"
" .word gUnknown_Debug_0839BBC1+0x3d3\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077C00+1\n"
"\n"
);
@@ -3031,7 +3031,7 @@ void DebugMenu_8077D78()
"._279:\n"
" .align 2, 0\n"
"._278:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
"._276:\n"
" bl CloseMenu\n"
" mov r0, #0x1\n"
@@ -4038,7 +4038,7 @@ void DebugMenu_ToggleClearFlag()
" .align 2, 0\n"
"._390:\n"
" .word 0x804\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_80783C8+1\n"
"\n"
);
@@ -4120,7 +4120,7 @@ void DebugMenu_OpenWeatherEvents()
" .align 2, 0\n"
"._404:\n"
" .word 0x82a\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078464+1\n"
"\n"
);
@@ -4188,7 +4188,7 @@ void DebugMenu_OpenMysteryEvent()
"._417:\n"
" .align 2, 0\n"
"._416:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_80784E8+1\n"
"\n"
);
@@ -4604,7 +4604,7 @@ void DebugMenu_OpenLegendsRecord()
" .align 2, 0\n"
"._464:\n"
" .word gDebug0x839C008+0x3f4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_80787B0+1\n"
"\n"
);
@@ -4804,7 +4804,7 @@ void DebugMenu_OpenBerryInfo()
"._488:\n"
" .align 2, 0\n"
"._487:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8077DB4+1\n"
"\n"
);
@@ -5329,7 +5329,7 @@ void DebugMenu_8078C80()
" .align 2, 0\n"
"._548:\n"
" .word gDebug0x839C574+0x30\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078CA8+1\n"
"\n"
);
@@ -5355,7 +5355,7 @@ void DebugMenu_8078CA8()
" .align 2, 0\n"
"._552:\n"
" .word gMain\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078CE4+1\n"
"._550:\n"
" mov r0, #0x2\n"
@@ -5412,7 +5412,7 @@ void DebugMenu_8078CE4()
"._560:\n"
" .word gStringVar4\n"
" .word gDebug0x839C574+0x6b\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078D7C+1\n"
"\n"
);
@@ -5454,7 +5454,7 @@ void DebugMenu_8078D30()
" .word +0x2000000\n"
" .word gStringVar4\n"
" .word gDebug0x839C574+0x62\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078D7C+1\n"
"\n"
);
@@ -5480,7 +5480,7 @@ void DebugMenu_8078D7C()
" .align 2, 0\n"
"._565:\n"
" .word gStringVar4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078DA4+1\n"
"\n"
);
@@ -5533,7 +5533,7 @@ void DebugMenu_MeTooBackupMan()
" .align 2, 0\n"
"._571:\n"
" .word gDebug0x839C574+0x20\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word DebugMenu_8078DF0+1\n"
"\n"
);
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index 8b586deb2..954974e50 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -112,7 +112,7 @@ void TayaDebugMenu_Trend()
" .align 2, 0\n"
"._3:\n"
" .word gSaveBlock1+0x2dd4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090808+1\n"
"\n"
);
@@ -273,7 +273,7 @@ void debug_sub_809089C()
"._27:\n"
" mov r0, #0x1\n"
" mov r1, #0x0\n"
- " bl fade_screen\n"
+ " bl FadeScreen\n"
" ldr r1, ._30 + 8\n"
" ldr r0, ._30 + 12\n"
" str r0, [r1]\n"
@@ -287,7 +287,7 @@ void debug_sub_809089C()
"._30:\n"
" .word gSpecialVar_0x8005\n"
" .word gSpecialVar_0x8006\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090880+1\n"
"\n"
);
@@ -329,7 +329,7 @@ void TayaDebugMenu_SimpleText()
" .align 2, 0\n"
"._32:\n"
" .word gUnknown_Debug_083C4EC0\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_809089C+1\n"
"\n"
);
@@ -460,7 +460,7 @@ void TayaDebugMenu_OldMan()
" .align 2, 0\n"
"._48:\n"
" .word gUnknown_Debug_083C4F54\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090984+1\n"
"\n"
);
@@ -894,7 +894,7 @@ void TayaDebugMenu_PKMNLottery()
"._83:\n"
" .word +0x2000000\n"
" .word gSpecialVar_Result\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_8090C88+1\n"
"\n"
);
@@ -1328,7 +1328,7 @@ void TayaDebugMenu_8091190()
"._100:\n"
" .align 2, 0\n"
"._99:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_83C5068\n"
" .word unk_2030224\n"
"._96:\n"
@@ -1460,7 +1460,7 @@ void InitTayaDebugWindow()
"._109:\n"
" .word unk_2030224\n"
" .word gUnknown_Debug_83C5068\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word TayaDebugMenu_8091190+1\n"
"\n"
);
@@ -1505,7 +1505,7 @@ void debug_sub_8091300()
" push {lr}\n"
" mov r0, #0x1\n"
" mov r1, #0x0\n"
- " bl fade_screen\n"
+ " bl FadeScreen\n"
" ldr r1, ._117\n"
" ldr r0, ._117 + 4\n"
" str r0, [r1]\n"
@@ -1515,7 +1515,7 @@ void debug_sub_8091300()
"._118:\n"
" .align 2, 0\n"
"._117:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_80912D8+1\n"
"\n"
);
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 28bb2717d..0549cb5c0 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -69,7 +69,7 @@ void debug_sub_808B874()
"._1:\n"
" .word gUnknown_Debug_083C0CBA\n"
" .word gDebug_03000700+0x1d\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808B8C8+1\n"
"\n"
);
@@ -201,7 +201,7 @@ void TomomichiDebugMenu_ContestGraphics()
"._11:\n"
" .word gUnknown_Debug_083C0CF4\n"
" .word gUnknown_Debug_083C0D2C\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BC48+1\n"
" .word gDebug_03000700\n"
" .word gDebug_03000700+0x4\n"
@@ -265,7 +265,7 @@ void TomomichiDebugMenu_ArtMusGraphics()
"._13:\n"
" .word gUnknown_Debug_083C0D4C\n"
" .word gUnknown_Debug_083C0D83\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BCBC+1\n"
" .word gDebug_03000700\n"
" .word gDebug_03000700+0x4\n"
@@ -329,7 +329,7 @@ void TomomichiDebugMenu_PreviewData()
"._15:\n"
" .word gUnknown_Debug_083C0DA4\n"
" .word gUnknown_Debug_083C0DD4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BD30+1\n"
" .word gDebug_03000700\n"
" .word gDebug_03000700+0x4\n"
@@ -384,7 +384,7 @@ void TomomichiDebugMenu_TrickHouse()
" .word gUnknown_Debug_083C0DF4\n"
" .word gUnknown_Debug_083C0E15\n"
" .word gDebug_03000700+0x1e\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BDA4+1\n"
"\n"
);
@@ -429,7 +429,7 @@ void TomomichiDebugMenu_ControlEvents()
"._19:\n"
" .word gUnknown_Debug_083C0E32\n"
" .word gDebug_03000700+0x1f\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BE2C+1\n"
"\n"
);
@@ -474,7 +474,7 @@ void TomomichiDebugMenu_ControlFlags()
"._21:\n"
" .word gUnknown_Debug_083C0E7F\n"
" .word gDebug_03000700+0x20\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BEB4+1\n"
"\n"
);
@@ -519,7 +519,7 @@ void TomomichiDebugMenu_ControlWorks()
"._23:\n"
" .word gUnknown_Debug_083C0EF1\n"
" .word gDebug_03000700+0x21\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808BF3C+1\n"
"\n"
);
@@ -587,7 +587,7 @@ void debug_sub_808BC48()
"._38:\n"
" .align 2, 0\n"
"._37:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C0D2C\n"
"\n"
);
@@ -655,7 +655,7 @@ void debug_sub_808BCBC()
"._52:\n"
" .align 2, 0\n"
"._51:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C0D83\n"
"\n"
);
@@ -723,7 +723,7 @@ void debug_sub_808BD30()
"._66:\n"
" .align 2, 0\n"
"._65:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C0DD4\n"
"\n"
);
@@ -1058,7 +1058,7 @@ void debug_sub_808BFC4()
" .align 2, 0\n"
"._99:\n"
" .word gUnknown_Debug_083C0F79\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C064+1\n"
"\n"
);
@@ -1101,7 +1101,7 @@ void debug_sub_808C014()
" .align 2, 0\n"
"._101:\n"
" .word gUnknown_Debug_083C0FFC\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C0A8+1\n"
"\n"
);
@@ -1138,7 +1138,7 @@ void debug_sub_808C064()
"._108:\n"
" .align 2, 0\n"
"._107:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C0F79\n"
"._105:\n"
" bl CloseMenu\n"
@@ -1181,7 +1181,7 @@ void debug_sub_808C0A8()
"._114:\n"
" .align 2, 0\n"
"._113:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C0FFC\n"
"._111:\n"
" bl CloseMenu\n"
@@ -1501,7 +1501,7 @@ void TomomichiDebugMenu_ContestGraphics_Show()
"._146:\n"
" .align 2, 0\n"
"._145:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C280+1\n"
"\n"
);
@@ -1564,7 +1564,7 @@ void TomomichiDebugMenu_MuseumGraphics_Show()
"._152:\n"
" .align 2, 0\n"
"._151:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C2E4+1\n"
"\n"
);
@@ -1641,7 +1641,7 @@ void debug_sub_808C31C()
" .align 2, 0\n"
"._157:\n"
" .word gUnknown_Debug_083C2828\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C36C+1\n"
"\n"
);
@@ -1678,7 +1678,7 @@ void debug_sub_808C36C()
"._164:\n"
" .align 2, 0\n"
"._163:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C2828\n"
"._161:\n"
" bl CloseMenu\n"
@@ -1731,7 +1731,7 @@ void debug_sub_808C3B0()
"._165:\n"
" .word gUnknown_Debug_083C2938\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -1778,7 +1778,7 @@ void debug_sub_808C408()
"._167:\n"
" .word gUnknown_Debug_083C2A48\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -1825,7 +1825,7 @@ void debug_sub_808C460()
"._169:\n"
" .word gUnknown_Debug_083C2B4C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -1872,7 +1872,7 @@ void debug_sub_808C4B8()
"._171:\n"
" .word gUnknown_Debug_083C2C80\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -1919,7 +1919,7 @@ void debug_sub_808C510()
"._173:\n"
" .word gUnknown_Debug_083C2D8C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -1966,7 +1966,7 @@ void debug_sub_808C568()
"._175:\n"
" .word gUnknown_Debug_083C2EB0\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -2013,7 +2013,7 @@ void debug_sub_808C5C0()
"._177:\n"
" .word gUnknown_Debug_083C2FE0\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -2060,7 +2060,7 @@ void debug_sub_808C618()
"._179:\n"
" .word gUnknown_Debug_083C3100\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -2107,7 +2107,7 @@ void debug_sub_808C670()
"._181:\n"
" .word gUnknown_Debug_083C3194\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C6C8+1\n"
"\n"
);
@@ -2301,7 +2301,7 @@ void debug_sub_808C7C8()
" .align 2, 0\n"
"._197:\n"
" .word gUnknown_Debug_083C1CE8\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808C818+1\n"
"\n"
);
@@ -2338,7 +2338,7 @@ void debug_sub_808C818()
"._204:\n"
" .align 2, 0\n"
"._203:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C1CE8\n"
"._201:\n"
" bl CloseMenu\n"
@@ -2391,7 +2391,7 @@ void debug_sub_808C85C()
"._205:\n"
" .word gUnknown_Debug_083C1E0C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2438,7 +2438,7 @@ void debug_sub_808C8B4()
"._207:\n"
" .word gUnknown_Debug_083C1F38\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2485,7 +2485,7 @@ void debug_sub_808C90C()
"._209:\n"
" .word gUnknown_Debug_083C206C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2532,7 +2532,7 @@ void debug_sub_808C964()
"._211:\n"
" .word gUnknown_Debug_083C2190\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2579,7 +2579,7 @@ void debug_sub_808C9BC()
"._213:\n"
" .word gUnknown_Debug_083C2264\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2626,7 +2626,7 @@ void debug_sub_808CA14()
"._215:\n"
" .word gUnknown_Debug_083C2370\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2673,7 +2673,7 @@ void debug_sub_808CA6C()
"._217:\n"
" .word gUnknown_Debug_083C248C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2720,7 +2720,7 @@ void debug_sub_808CAC4()
"._219:\n"
" .word gUnknown_Debug_083C259C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2767,7 +2767,7 @@ void debug_sub_808CB1C()
"._221:\n"
" .word gUnknown_Debug_083C26C8\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CB74+1\n"
"\n"
);
@@ -2961,7 +2961,7 @@ void debug_sub_808CC74()
" .align 2, 0\n"
"._237:\n"
" .word gUnknown_Debug_083C1ADC\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CCC4+1\n"
"\n"
);
@@ -2998,7 +2998,7 @@ void debug_sub_808CCC4()
"._244:\n"
" .align 2, 0\n"
"._243:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C1ADC\n"
"._241:\n"
" bl CloseMenu\n"
@@ -3051,7 +3051,7 @@ void debug_sub_808CD08()
"._245:\n"
" .word gUnknown_Debug_083C1B7C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CE10+1\n"
"\n"
);
@@ -3098,7 +3098,7 @@ void debug_sub_808CD60()
"._247:\n"
" .word gUnknown_Debug_083C1BF0\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CE10+1\n"
"\n"
);
@@ -3145,7 +3145,7 @@ void debug_sub_808CDB8()
"._249:\n"
" .word gUnknown_Debug_083C1C2C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CE10+1\n"
"\n"
);
@@ -3339,7 +3339,7 @@ void debug_sub_808CF10()
" .align 2, 0\n"
"._265:\n"
" .word gUnknown_Debug_083C1330\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808CF60+1\n"
"\n"
);
@@ -3376,7 +3376,7 @@ void debug_sub_808CF60()
"._272:\n"
" .align 2, 0\n"
"._271:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C1330\n"
"._269:\n"
" bl CloseMenu\n"
@@ -3429,7 +3429,7 @@ void debug_sub_808CFA4()
"._273:\n"
" .word gUnknown_Debug_083C13D8\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3476,7 +3476,7 @@ void debug_sub_808CFFC()
"._275:\n"
" .word gUnknown_Debug_083C1465\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3523,7 +3523,7 @@ void debug_sub_808D054()
"._277:\n"
" .word gUnknown_Debug_083C1503\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3570,7 +3570,7 @@ void debug_sub_808D0AC()
"._279:\n"
" .word gUnknown_Debug_083C158A\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3617,7 +3617,7 @@ void debug_sub_808D104()
"._281:\n"
" .word gUnknown_Debug_083C1647\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3664,7 +3664,7 @@ void debug_sub_808D15C()
"._283:\n"
" .word gUnknown_Debug_083C1712\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3711,7 +3711,7 @@ void debug_sub_808D1B4()
"._285:\n"
" .word gUnknown_Debug_083C17F8\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3758,7 +3758,7 @@ void debug_sub_808D20C()
"._287:\n"
" .word gUnknown_Debug_083C18B8\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3805,7 +3805,7 @@ void debug_sub_808D264()
"._289:\n"
" .word gDebug_0x83C1974\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D2BC+1\n"
"\n"
);
@@ -3999,7 +3999,7 @@ void debug_sub_808D3BC()
" .align 2, 0\n"
"._305:\n"
" .word gUnknown_Debug_083C105C\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D40C+1\n"
"\n"
);
@@ -4036,7 +4036,7 @@ void debug_sub_808D40C()
"._312:\n"
" .align 2, 0\n"
"._311:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C105C\n"
"._309:\n"
" bl CloseMenu\n"
@@ -4089,7 +4089,7 @@ void debug_sub_808D450()
"._313:\n"
" .word gUnknown_Debug_083C10BD\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D500+1\n"
"\n"
);
@@ -4136,7 +4136,7 @@ void debug_sub_808D4A8()
"._315:\n"
" .word gUnknown_Debug_083C1149\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D500+1\n"
"\n"
);
@@ -4330,7 +4330,7 @@ void debug_sub_808D600()
" .align 2, 0\n"
"._331:\n"
" .word gUnknown_Debug_083C11CC\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D650+1\n"
"\n"
);
@@ -4367,7 +4367,7 @@ void debug_sub_808D650()
"._338:\n"
" .align 2, 0\n"
"._337:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C11CC\n"
"._335:\n"
" bl CloseMenu\n"
@@ -4420,7 +4420,7 @@ void debug_sub_808D694()
"._339:\n"
" .word gUnknown_Debug_083C1212\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D744+1\n"
"\n"
);
@@ -4467,7 +4467,7 @@ void debug_sub_808D6EC()
"._341:\n"
" .word gUnknown_Debug_083C1288\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D744+1\n"
"\n"
);
@@ -4661,7 +4661,7 @@ void debug_sub_808D844()
" .align 2, 0\n"
"._357:\n"
" .word gUnknown_Debug_083C1A78\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D894+1\n"
"\n"
);
@@ -4697,7 +4697,7 @@ void debug_sub_808D894()
"._364:\n"
" .align 2, 0\n"
"._363:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C1A78\n"
"._361:\n"
" bl CloseMenu\n"
@@ -4750,7 +4750,7 @@ void debug_sub_808D8D8()
"._365:\n"
" .word gUnknown_Debug_083C1A9C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808D930+1\n"
"\n"
);
@@ -4944,7 +4944,7 @@ void debug_sub_808DA30()
" .align 2, 0\n"
"._381:\n"
" .word gUnknown_Debug_083C103A\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DA80+1\n"
"\n"
);
@@ -5085,7 +5085,7 @@ void debug_sub_808DB0C()
" .align 2, 0\n"
"._395:\n"
" .word gUnknown_Debug_083C3D08\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DB5C+1\n"
"\n"
);
@@ -5122,7 +5122,7 @@ void debug_sub_808DB5C()
"._402:\n"
" .align 2, 0\n"
"._401:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C3D08\n"
"._399:\n"
" bl CloseMenu\n"
@@ -5175,7 +5175,7 @@ void debug_sub_808DBA0()
"._403:\n"
" .word gUnknown_Debug_083C432C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5222,7 +5222,7 @@ void debug_sub_808DBF8()
"._405:\n"
" .word gUnknown_Debug_083C436C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5269,7 +5269,7 @@ void debug_sub_808DC50()
"._407:\n"
" .word gUnknown_Debug_083C43B4\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5316,7 +5316,7 @@ void debug_sub_808DCA8()
"._409:\n"
" .word gUnknown_Debug_083C43FC\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5363,7 +5363,7 @@ void debug_sub_808DD00()
"._411:\n"
" .word gUnknown_Debug_083C4444\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5410,7 +5410,7 @@ void debug_sub_808DD58()
"._413:\n"
" .word gUnknown_Debug_083C448C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5457,7 +5457,7 @@ void debug_sub_808DDB0()
"._415:\n"
" .word gUnknown_Debug_83C44C4\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5504,7 +5504,7 @@ void debug_sub_808DE08()
"._417:\n"
" .word gUnknown_Debug_83C44EC\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5551,7 +5551,7 @@ void debug_sub_808DE60()
"._419:\n"
" .word gUnknown_Debug_083C4534\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808DEB8+1\n"
"\n"
);
@@ -5754,7 +5754,7 @@ void debug_sub_808DFC0()
" .align 2, 0\n"
"._437:\n"
" .word gUnknown_Debug_083C377C\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E010+1\n"
"\n"
);
@@ -5791,7 +5791,7 @@ void debug_sub_808E010()
"._444:\n"
" .align 2, 0\n"
"._443:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C377C\n"
"._441:\n"
" bl CloseMenu\n"
@@ -5844,7 +5844,7 @@ void debug_sub_808E054()
"._445:\n"
" .word gUnknown_Debug_083C3AA0\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E264+1\n"
"\n"
);
@@ -5891,7 +5891,7 @@ void debug_sub_808E0AC()
"._447:\n"
" .word gUnknown_Debug_83C3AE0\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E264+1\n"
"\n"
);
@@ -5938,7 +5938,7 @@ void debug_sub_808E104()
"._449:\n"
" .word gUnknown_Debug_83C3B28\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E264+1\n"
"\n"
);
@@ -5985,7 +5985,7 @@ void debug_sub_808E15C()
"._451:\n"
" .word gUnknown_Debug_83C3B70\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E264+1\n"
"\n"
);
@@ -6032,7 +6032,7 @@ void debug_sub_808E1B4()
"._453:\n"
" .word gUnknown_Debug_83C3BB8\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E264+1\n"
"\n"
);
@@ -6079,7 +6079,7 @@ void debug_sub_808E20C()
"._455:\n"
" .word gUnknown_Debug_83C3C00\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E264+1\n"
"\n"
);
@@ -6282,7 +6282,7 @@ void debug_sub_808E36C()
" .align 2, 0\n"
"._473:\n"
" .word gUnknown_Debug_083C32AC\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E3BC+1\n"
"\n"
);
@@ -6319,7 +6319,7 @@ void debug_sub_808E3BC()
"._480:\n"
" .align 2, 0\n"
"._479:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C32AC\n"
"._477:\n"
" bl CloseMenu\n"
@@ -6372,7 +6372,7 @@ void debug_sub_808E400()
"._481:\n"
" .word gUnknown_Debug_083C347C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E5B8+1\n"
"\n"
);
@@ -6419,7 +6419,7 @@ void debug_sub_808E458()
"._483:\n"
" .word gUnknown_Debug_083C3494\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E5B8+1\n"
"\n"
);
@@ -6466,7 +6466,7 @@ void debug_sub_808E4B0()
"._485:\n"
" .word gUnknown_Debug_083C34A4\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E5B8+1\n"
"\n"
);
@@ -6513,7 +6513,7 @@ void debug_sub_808E508()
"._487:\n"
" .word gUnknown_Debug_083C34D4\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E5B8+1\n"
"\n"
);
@@ -6560,7 +6560,7 @@ void debug_sub_808E560()
"._489:\n"
" .word gUnknown_Debug_083C351C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E5B8+1\n"
"\n"
);
@@ -6763,7 +6763,7 @@ void debug_sub_808E6C0()
" .align 2, 0\n"
"._507:\n"
" .word gUnknown_Debug_083C4644\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E710+1\n"
"\n"
);
@@ -6800,7 +6800,7 @@ void debug_sub_808E710()
"._514:\n"
" .align 2, 0\n"
"._513:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C4644\n"
"._511:\n"
" bl CloseMenu\n"
@@ -6853,7 +6853,7 @@ void debug_sub_808E754()
"._515:\n"
" .word gUnknown_Debug_083C470C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E804+1\n"
"\n"
);
@@ -6900,7 +6900,7 @@ void debug_sub_808E7AC()
"._517:\n"
" .word gUnknown_Debug_083C4754C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E804+1\n"
"\n"
);
@@ -7103,7 +7103,7 @@ void debug_sub_808E90C()
" .align 2, 0\n"
"._535:\n"
" .word gUnknown_Debug_083C35C4\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808E95C+1\n"
"\n"
);
@@ -7140,7 +7140,7 @@ void debug_sub_808E95C()
"._542:\n"
" .align 2, 0\n"
"._541:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word gUnknown_Debug_083C35C4\n"
"._539:\n"
" bl CloseMenu\n"
@@ -7193,7 +7193,7 @@ void debug_sub_808E9A0()
"._543:\n"
" .word gUnknown_Debug_083C369C\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808EA50+1\n"
"\n"
);
@@ -7240,7 +7240,7 @@ void debug_sub_808E9F8()
"._545:\n"
" .word gUnknown_Debug_083C36E4\n"
" .word gDebug_03000700+0xf\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808EA50+1\n"
"\n"
);
@@ -7448,7 +7448,7 @@ void debug_sub_808EB58()
"._563:\n"
" .word gUnknown_Debug_083C47B2\n"
" .word gUnknown_Debug_083C47F0\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808EC10+1\n"
"\n"
);
@@ -7496,7 +7496,7 @@ void debug_sub_808EBB4()
"._565:\n"
" .word gUnknown_Debug_083C4830\n"
" .word gUnknown_Debug_083C4888\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808EC5C+1\n"
"\n"
);
@@ -7615,7 +7615,7 @@ void debug_sub_808ECA4()
"._578:\n"
" .align 2, 0\n"
"._577:\n"
- " .word gCallback_03004AE8\n"
+ " .word gMenuCallback\n"
" .word debug_sub_808ECD0+1\n"
"\n"
);
diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index 9cece924d..ef3e0e66c 100644
--- a/src/debug/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
@@ -4,7 +4,7 @@
extern u8 gBattleCommunication[];
-extern u8 (*gCallback_03004AE8)(void);
+extern u8 (*gMenuCallback)(void);
static u8 sub_814A4B8(void);
static u8 sub_814A464(void);
@@ -36,7 +36,7 @@ int unref_sub_814A414(void)
Menu_DrawStdWindowFrame(0, 0, 16, 18);
Menu_PrintItems(2, 1, 8, gUnknown_0842C29C);
InitMenu(0, 1, 1, 8, 0, 15);
- gCallback_03004AE8 = sub_814A464;
+ gMenuCallback = sub_814A464;
return 0;
}
@@ -55,7 +55,7 @@ static u8 sub_814A464(void)
else
{
gBattleCommunication[0] = result;
- gCallback_03004AE8 = gUnknown_0842C29C[result].func;
+ gMenuCallback = gUnknown_0842C29C[result].func;
return 0;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 12:31:25 +0000