diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug/nakamura_debug_menu.c | 152 | ||||
| -rw-r--r-- | src/debug/start_menu_debug.c | 171 | ||||
| -rw-r--r-- | src/debug/taya_debug_window.c | 30 | ||||
| -rw-r--r-- | src/debug/tomomichi_debug_menu.c | 278 | ||||
| -rw-r--r-- | src/debug/watanabe_debug_menu.c | 211 | ||||
| -rw-r--r-- | src/engine/reset_rtc_screen.c | 8 |
6 files changed, 442 insertions, 408 deletions
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 67f4a1af7..328903126 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -2,9 +2,19 @@ #include "global.h" #include "menu.h" -EWRAM_DATA u8 _nakamuraData[0x10] = {0}; +EWRAM_DATA u8 _nakamuraData0 = 0; +EWRAM_DATA u8 _nakamuraData1 = 0; +EWRAM_DATA u8 _nakamuraData2 = 0; +EWRAM_DATA u8 _nakamuraData3 = 0; +EWRAM_DATA u8 _nakamuraData4 = 0; +EWRAM_DATA u8 _nakamuraData5 = 0; +EWRAM_DATA u16 _nakamuraData6 = 0; +EWRAM_DATA u16 _nakamuraData8 = 0; +EWRAM_DATA u16 _nakamuraDataA = 0; +EWRAM_DATA u16 _nakamuraDataC = 0; -static u8 _nakamuraStatic[32] __attribute__((unused)); +__attribute__((unused)) static u8 _nakamuraStatic0[0x18]; +__attribute__((unused)) static u8 _nakamuraStatic18; u8 debug_sub_815FC54(); u8 debug_sub_815F2B4(); @@ -605,7 +615,7 @@ void debug_sub_815F470() " .align 2, 0\n" "._39:\n" " .word gSaveBlock1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word 0x1a08\n" " .word _843E424\n" "._37:\n" @@ -719,7 +729,7 @@ void debug_sub_815F4D8() " .align 2, 0\n" "._43:\n" " .word gStringVar1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1\n" " .word 0x1a08\n" " .word Str_843E550\n" @@ -752,7 +762,7 @@ void debug_sub_815F5C4() " .align 2, 0\n" "._48:\n" " .word gMain\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._46:\n" " sub r0, r0, #0x1\n" " b ._50\n" @@ -770,7 +780,7 @@ void debug_sub_815F5C4() "._55:\n" " .align 2, 0\n" "._54:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._52:\n" " add r0, r0, #0x1\n" "._50:\n" @@ -824,7 +834,7 @@ u8 debug_sub_815F62C() "._60:\n" " .align 2, 0\n" "._59:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gMenuCallback\n" " .word debug_sub_815F5C4+1\n" "\n" @@ -885,7 +895,7 @@ void debug_sub_815F668() "._62:\n" " .align 2, 0\n" "._61:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a11\n" " .word gStringVar1\n" " .word 0x186a0\n" @@ -927,7 +937,7 @@ void debug_sub_815F6E4() " .align 2, 0\n" "._63:\n" " .word gStringVar1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a0a\n" "\n" ); @@ -975,7 +985,7 @@ void debug_sub_815F72C() " .align 2, 0\n" "._66:\n" " .word gStringVar1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1\n" " .word 0x1a08\n" "\n" @@ -1006,7 +1016,7 @@ void debug_sub_815F788() " .align 2, 0\n" "._68:\n" " .word Str_843E574\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "\n" ); } @@ -1029,7 +1039,7 @@ void debug_sub_815F7B4() "._73:\n" " .align 2, 0\n" "._72:\n" - " .word _nakamuraData+0x1\n" + " .word _nakamuraData1\n" "._70:\n" " ldr r0, ._74\n" " ldrb r0, [r0]\n" @@ -1045,7 +1055,7 @@ void debug_sub_815F7B4() "._75:\n" " .align 2, 0\n" "._74:\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData3\n" " .word Str_843E576\n" "\n" ); @@ -1115,9 +1125,9 @@ void debug_sub_815F7F0() "._79:\n" " .align 2, 0\n" "._78:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a11\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "\n" ); } @@ -1158,9 +1168,9 @@ void debug_sub_815F86C() "._85:\n" " .align 2, 0\n" "._84:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a0a\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "._80:\n" " ldr r0, ._87\n" " ldrb r0, [r0]\n" @@ -1174,7 +1184,7 @@ void debug_sub_815F86C() "._88:\n" " .align 2, 0\n" "._87:\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData3\n" " .word ._89\n" "._89:\n" " .word ._90\n" @@ -1229,7 +1239,7 @@ void debug_sub_815F86C() "._102:\n" " .align 2, 0\n" "._101:\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "\n" ); } @@ -1260,7 +1270,7 @@ void debug_sub_815F930() "._108:\n" " .align 2, 0\n" "._107:\n" - " .word _nakamuraData+0x1\n" + " .word _nakamuraData1\n" " .word gMain\n" "._105:\n" " mov r0, #0x1\n" @@ -1296,7 +1306,7 @@ void debug_sub_815F930() "._118:\n" " .align 2, 0\n" "._117:\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "._115:\n" " sub r0, r0, #0x1\n" "._116:\n" @@ -1319,7 +1329,7 @@ void debug_sub_815F930() "._124:\n" " .align 2, 0\n" "._123:\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "._121:\n" " add r0, r1, #1\n" " strb r0, [r2]\n" @@ -1344,7 +1354,7 @@ void debug_sub_815F930() "._130:\n" " .align 2, 0\n" "._129:\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData3\n" "._126:\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -1433,7 +1443,7 @@ void debug_sub_815FA38() "._147:\n" " .align 2, 0\n" "._146:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._144:\n" " sub r0, r0, #0x1\n" " b ._148\n" @@ -1453,7 +1463,7 @@ void debug_sub_815FA38() "._153:\n" " .align 2, 0\n" "._152:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._150:\n" " add r0, r0, #0x1\n" "._148:\n" @@ -1495,11 +1505,11 @@ void debug_sub_815FA38() "._160:\n" " .align 2, 0\n" "._159:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1\n" " .word 0x1a08\n" - " .word _nakamuraData+0x1\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData1\n" + " .word _nakamuraData2\n" " .word gMenuCallback\n" " .word debug_sub_815F930+1\n" "._155:\n" @@ -1558,8 +1568,8 @@ u8 debug_sub_815FB1C() "._163:\n" " .align 2, 0\n" "._162:\n" - " .word _nakamuraData\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData0\n" + " .word _nakamuraData3\n" " .word gMenuCallback\n" " .word debug_sub_815FA38+1\n" "\n" @@ -2216,7 +2226,7 @@ void debug_sub_815FFDC() " .align 2, 0\n" "._214:\n" " .word Str_843E5D4\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word gPlayerParty\n" "._212:\n" " mov r0, #0x1\n" @@ -2249,7 +2259,7 @@ void debug_sub_815FFDC() "._218:\n" " .align 2, 0\n" "._217:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" " .word gMenuCallback\n" " .word debug_sub_8160498+1\n" "\n" @@ -2284,7 +2294,7 @@ void debug_sub_816009C() "._220:\n" " .align 2, 0\n" "._219:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word gSpeciesNames\n" "\n" ); @@ -2386,7 +2396,7 @@ void debug_sub_816013C() " .align 2, 0\n" "._229:\n" " .word gStringVar1\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -2430,7 +2440,7 @@ void debug_sub_816017C() "._233:\n" " .align 2, 0\n" "._232:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -2508,7 +2518,7 @@ void debug_sub_81601C8() "._240:\n" " .align 2, 0\n" "._239:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word 0xfffffe65\n" " .word 0x19b\n" " .word gPlayerParty\n" @@ -2538,7 +2548,7 @@ void debug_sub_8160258() "._243:\n" " .align 2, 0\n" "._242:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -2613,7 +2623,7 @@ void debug_sub_816027C() "._248:\n" " .align 2, 0\n" "._247:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word gPlayerParty\n" " .word gBaseStats\n" " .word gExperienceTables\n" @@ -2759,7 +2769,7 @@ void debug_sub_81603B8() "._260:\n" " .align 2, 0\n" "._259:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" " .word _843E5D1\n" "._257:\n" " lsl r0, r5, #0x1\n" @@ -2780,7 +2790,7 @@ void debug_sub_81603B8() "._265:\n" " .align 2, 0\n" "._264:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._262:\n" " lsl r0, r5, #0x1\n" " add r0, r0, r5\n" @@ -2926,7 +2936,7 @@ void debug_sub_8160498() "._290:\n" " .align 2, 0\n" "._289:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._284:\n" " mov r0, #0x2\n" " and r0, r0, r1\n" @@ -2942,7 +2952,7 @@ void debug_sub_8160498() "._295:\n" " .align 2, 0\n" "._294:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._291:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -2985,7 +2995,7 @@ void debug_sub_8160498() "._302:\n" " .align 2, 0\n" "._301:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._296:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" @@ -3041,7 +3051,7 @@ void debug_sub_8160498() "._309:\n" " .align 2, 0\n" "._308:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._303:\n" " mov r0, #0x8\n" " and r0, r0, r2\n" @@ -3179,7 +3189,7 @@ void debug_sub_816062C() " .align 2, 0\n" "._323:\n" " .word gPlayerParty\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -3703,7 +3713,7 @@ void debug_sub_8160A80() "._423:\n" " .align 2, 0\n" "._422:\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" " .word gStringVar1\n" "._420:\n" " cmp r0, #0x1\n" @@ -3813,7 +3823,7 @@ void debug_sub_8160B50() "._446:\n" " .align 2, 0\n" "._445:\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" "._443:\n" " cmp r0, #0x1\n" " bne ._447 @cond_branch\n" @@ -3883,7 +3893,7 @@ void debug_sub_8160BB0() " .align 2, 0\n" "._456:\n" " .word gStringVar1\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" "\n" ); } @@ -4027,7 +4037,7 @@ void debug_sub_8160C7C() "._470:\n" " .align 2, 0\n" "._469:\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" "\n" ); } @@ -4462,7 +4472,7 @@ void debug_sub_8161028() "._497:\n" " .align 2, 0\n" "._496:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" " .word gPlayerParty\n" "._491:\n" " cmp r1, #0x1\n" @@ -4480,7 +4490,7 @@ void debug_sub_8161028() "._502:\n" " .align 2, 0\n" "._501:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" "._493:\n" " ldr r0, ._504\n" " strb r5, [r0]\n" @@ -4488,7 +4498,7 @@ void debug_sub_8161028() "._505:\n" " .align 2, 0\n" "._504:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" "._499:\n" " ldrb r1, [r4]\n" " mov r0, #0x64\n" @@ -4551,7 +4561,7 @@ void debug_sub_81610BC() "._516:\n" " .align 2, 0\n" "._515:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" " .word gPlayerParty\n" "._513:\n" " mov r0, #0x2\n" @@ -4600,7 +4610,7 @@ void DebugMenu_EffortValues() "._520:\n" " .align 2, 0\n" "._519:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" " .word gPlayerParty\n" " .word gMenuCallback\n" " .word debug_sub_81610BC+1\n" @@ -4628,8 +4638,8 @@ void debug_sub_8161160() "._524:\n" " .align 2, 0\n" "._523:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" "._521:\n" " ldrh r6, [r1]\n" " ldrh r5, [r2]\n" @@ -4673,8 +4683,8 @@ void debug_sub_8161160() "._530:\n" " .align 2, 0\n" "._529:\n" - " .word _nakamuraData+0xa\n" - " .word _nakamuraData+0xc\n" + " .word _nakamuraDataA\n" + " .word _nakamuraDataC\n" "\n" ); } @@ -4901,10 +4911,10 @@ void debug_sub_81612EC() "._551:\n" " .align 2, 0\n" "._550:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" - " .word _nakamuraData+0xc\n" - " .word _nakamuraData+0xa\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" + " .word _nakamuraDataC\n" + " .word _nakamuraDataA\n" "._544:\n" " mov r0, #0x10\n" " and r0, r0, r1\n" @@ -4944,10 +4954,10 @@ void debug_sub_81612EC() "._559:\n" " .align 2, 0\n" "._558:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" - " .word _nakamuraData+0xc\n" - " .word _nakamuraData+0xa\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" + " .word _nakamuraDataC\n" + " .word _nakamuraDataA\n" "._552:\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x1\n" @@ -4968,7 +4978,7 @@ void debug_sub_81612EC() "._564:\n" " .align 2, 0\n" "._563:\n" - " .word _nakamuraData+0xc\n" + " .word _nakamuraDataC\n" "._560:\n" " mov r0, #0x2\n" " and r0, r0, r1\n" @@ -5018,10 +5028,10 @@ void DebugMenu_RandomNumberTest() "._567:\n" " .align 2, 0\n" "._566:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" - " .word _nakamuraData+0xc\n" - " .word _nakamuraData+0xa\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" + " .word _nakamuraDataC\n" + " .word _nakamuraDataA\n" " .word gMenuCallback\n" " .word debug_sub_81612EC+1\n" "\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index d9f14a6b8..318785945 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -1,5 +1,14 @@ #if DEBUG +#include "global.h" + +__attribute__((unused)) static u8 gUnknown_030006B8[4]; +__attribute__((unused)) static u8 gUnknown_030006BC[4]; +__attribute__((unused)) static u8 gUnknown_030006C0; +__attribute__((unused)) static u8 gUnknown_030006C1; +__attribute__((unused)) static void *gUnknown_030006C4; +__attribute__((unused)) static u8 gUnknown_030006C8; + __attribute__((naked)) void debug_sub_8076AC8() { @@ -65,9 +74,9 @@ void debug_sub_8076AC8() "._4:\n" " .align 2, 0\n" "._3:\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" - " .word gUnknown_Debug_0839BBC1+0x153\n" - " .word gUnknown_Debug_0839BBC1+0xd3\n" + " .word gUnknown_030006C4 \n" + " .word Str_839BD14\n" + " .word gUnknown_Debug_839BC94\n" "\n" ); } @@ -178,8 +187,8 @@ void debug_sub_8076BB4() " .align 2, 0\n" "._13:\n" " .word gTasks+0x8\n" - " .word gUnknown_Debug_0839BBC1+0xd3\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word gUnknown_Debug_839BC94\n" + " .word gUnknown_030006C4 \n" "._10:\n" " ldr r0, ._18\n" " ldrh r1, [r0, #0x2e]\n" @@ -511,7 +520,7 @@ void DebugMenu_8076D6C() "._57:\n" " .align 2, 0\n" "._56:\n" - " .word gUnknown_Debug_0839BBC1+0x16b\n" + " .word Str_839BD2C\n" "._47:\n" " ldr r0, ._60\n" " ldrh r2, [r0, #0x2e]\n" @@ -535,7 +544,7 @@ void DebugMenu_8076D6C() " .align 2, 0\n" "._60:\n" " .word gMain\n" - " .word gUnknown_Debug_0839BBC1+0x18b\n" + " .word Str_839BD4C\n" "._58:\n" " mov r0, #0x2\n" " and r0, r0, r2\n" @@ -626,7 +635,7 @@ void DebugMenu_8076E30() "._79:\n" " .align 2, 0\n" "._78:\n" - " .word gUnknown_Debug_0839BBC1+0x199\n" + " .word Str_839BD5A\n" "._69:\n" " ldr r0, ._82\n" " ldrh r2, [r0, #0x2e]\n" @@ -650,7 +659,7 @@ void DebugMenu_8076E30() " .align 2, 0\n" "._82:\n" " .word gMain\n" - " .word gUnknown_Debug_0839BBC1+0x1bc\n" + " .word Str_839BD7D\n" "._80:\n" " mov r0, #0x2\n" " and r0, r0, r2\n" @@ -759,7 +768,7 @@ void DebugMenu_8076EF4() "._94:\n" " .align 2, 0\n" "._93:\n" - " .word gUnknown_Debug_0839BBC1+0x203\n" + " .word gUnknown_Debug_839BDC4\n" "\n" ); } @@ -816,7 +825,7 @@ void DebugMenu_8076F60() "._101:\n" " .align 2, 0\n" "._100:\n" - " .word gUnknown_Debug_0839BBC1+0x203\n" + " .word gUnknown_Debug_839BDC4\n" " .word gSaveBlock2\n" "._98:\n" " mov r0, #0x1\n" @@ -872,9 +881,9 @@ void DebugMenu_8077004() "._107:\n" " .align 2, 0\n" "._106:\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" - " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" - " .word gDebug0x839B9BC+0x1a8\n" + " .word gUnknown_030006C4 \n" + " .word gUnknown_030006C1 \n" + " .word gUnknown_Debug_839BB64\n" "\n" ); } @@ -1006,8 +1015,8 @@ void DebugMenu_807709C() " .align 2, 0\n" "._120:\n" " .word gMain\n" - " .word 0x030006c0 @ gNumTilesetAnimDmas\n" - " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + " .word gUnknown_030006C0 \n" + " .word gUnknown_030006C1 \n" "._118:\n" " sub r0, r0, #0x1\n" "._119:\n" @@ -1033,7 +1042,7 @@ void DebugMenu_807709C() " .align 2, 0\n" "._125:\n" " .word gMain\n" - " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + " .word gUnknown_030006C1 \n" "._123:\n" " add r0, r0, #0x1\n" "._124:\n" @@ -1069,8 +1078,8 @@ void DebugMenu_807709C() "._129:\n" " .word gMain\n" " .word gDebug0x839B9BC\n" - " .word 0x030006c0 @ gNumTilesetAnimDmas\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word gUnknown_030006C0 \n" + " .word gUnknown_030006C4 \n" "._127:\n" " mov r0, #0xa\n" " and r0, r0, r1\n" @@ -1127,8 +1136,8 @@ void DebugMenu_807719C() " .align 2, 0\n" "._133:\n" " .word gDebug0x839B9BC\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" - " .word 0x030006c0 @ gNumTilesetAnimDmas\n" + " .word gUnknown_030006C4 \n" + " .word gUnknown_030006C0 \n" "\n" ); } @@ -1168,7 +1177,7 @@ void DebugMenu_80771EC() " .align 2, 0\n" "._135:\n" " .word gStringVar4\n" - " .word gUnknown_Debug_0839BBC1+0x243\n" + " .word Str_839BE04\n" " .word gSaveBlock1\n" "\n" ); @@ -1303,9 +1312,9 @@ void DebugMenu_8077238() "._140:\n" " .align 2, 0\n" "._139:\n" - " .word gUnknown_Debug_0839BBC1+0x246\n" - " .word gUnknown_Debug_0839BBC1+0x248\n" - " .word gUnknown_Debug_0839BBC1+0x24b\n" + " .word Str_839BE07\n" + " .word Str_839BE09\n" + " .word Str_839BE0C\n" " .word gStringVar4\n" "\n" ); @@ -1527,7 +1536,7 @@ void DebugMenu_8077434() "._158:\n" " .align 2, 0\n" "._157:\n" - " .word gUnknown_Debug_0839BBC1+0x24e\n" + " .word Str_839BE0F\n" "._152:\n" " ldr r0, ._160\n" " mov r1, #0x2\n" @@ -1542,7 +1551,7 @@ void DebugMenu_8077434() "._161:\n" " .align 2, 0\n" "._160:\n" - " .word gUnknown_Debug_0839BBC1+0x251\n" + " .word Str_839BE12\n" "._153:\n" " ldr r0, ._163\n" " mov r1, #0x3\n" @@ -1556,7 +1565,7 @@ void DebugMenu_8077434() "._164:\n" " .align 2, 0\n" "._163:\n" - " .word gUnknown_Debug_0839BBC1+0x255\n" + " .word Str_839BE16\n" "._154:\n" " ldr r0, ._166\n" " mov r1, #0x4\n" @@ -1576,7 +1585,7 @@ void DebugMenu_8077434() "._167:\n" " .align 2, 0\n" "._166:\n" - " .word gUnknown_Debug_0839BBC1+0x259\n" + " .word Str_839BE1A\n" "._155:\n" " ldr r0, ._168\n" " mov r1, #0x4\n" @@ -1598,7 +1607,7 @@ void DebugMenu_8077434() "._169:\n" " .align 2, 0\n" "._168:\n" - " .word gUnknown_Debug_0839BBC1+0x25d\n" + " .word Str_839BE1E\n" "\n" ); } @@ -1617,7 +1626,7 @@ void DebugMenu_807750C() "._171:\n" " .align 2, 0\n" "._170:\n" - " .word gUnknown_Debug_0839BBC1+0x263\n" + " .word gUnknown_Debug_839BE24\n" "\n" ); } @@ -1640,7 +1649,7 @@ void DebugMenu_SetRamBerry() "._173:\n" " .align 2, 0\n" "._172:\n" - " .word gUnknown_Debug_0839BBC1+0x263\n" + " .word gUnknown_Debug_839BE24\n" " .word gMenuCallback\n" " .word DebugMenu_807750C+1\n" "\n" @@ -1960,8 +1969,8 @@ void DebugMenu_80776B4() "._184:\n" " .align 2, 0\n" "._183:\n" - " .word gUnknown_Debug_0839BBC1+0x28b\n" - " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word Str_839BE4C\n" + " .word gUnknown_030006C8 \n" "\n" ); } @@ -2007,8 +2016,8 @@ void DebugMenu_8077704() "._186:\n" " .align 2, 0\n" "._185:\n" - " .word gUnknown_Debug_0839BBC1+0x292\n" - " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word Str_839BE53\n" + " .word gUnknown_030006C8 \n" "\n" ); } @@ -2040,7 +2049,7 @@ void DebugMenu_8077760() " .align 2, 0\n" "._190:\n" " .word gMain\n" - " .word 0x030006b0+0x8 @ gMenu+0x8\n" + " .word gUnknown_030006B8 \n" "._188:\n" " mov r0, #0x3\n" "._189:\n" @@ -2064,7 +2073,7 @@ void DebugMenu_8077760() "._196:\n" " .align 2, 0\n" "._195:\n" - " .word 0x030006b0+0x8 @ gMenu+0x8\n" + " .word gUnknown_030006B8 \n" "._193:\n" " mov r0, #0x0\n" "._194:\n" @@ -2117,7 +2126,7 @@ void DebugMenu_8077760() "._202:\n" " .align 2, 0\n" "._201:\n" - " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word gUnknown_030006C8 \n" " .word 0xf0ff\n" "._199:\n" " mov r0, #0x0\n" @@ -2193,7 +2202,7 @@ void DebugMenu_807786C() "._206:\n" " .align 2, 0\n" "._205:\n" - " .word gUnknown_Debug_0839BBC1+0x2a3\n" + " .word Str_839BE64\n" "\n" ); } @@ -2370,7 +2379,7 @@ void DebugMenu_8077974() "._226:\n" " .word gSaveBlock1\n" " .word gStringVar1\n" - " .word gUnknown_Debug_0839BBC1+0x2cc\n" + " .word Str_839BE8D\n" "._224:\n" " ldr r0, ._230\n" " ldr r1, ._230 + 4\n" @@ -2397,10 +2406,10 @@ void DebugMenu_8077974() " .align 2, 0\n" "._230:\n" " .word gStringVar1\n" - " .word gUnknown_Debug_0839BBC1+0x2cf\n" + " .word Str_839BE90\n" " .word gSaveBlock1\n" " .word gStringVar2\n" - " .word gUnknown_Debug_0839BBC1+0x2cc\n" + " .word Str_839BE8D\n" "._228:\n" " ldr r0, ._232\n" " ldr r1, ._232 + 4\n" @@ -2418,8 +2427,8 @@ void DebugMenu_8077974() " .align 2, 0\n" "._232:\n" " .word gStringVar2\n" - " .word gUnknown_Debug_0839BBC1+0x2cf\n" - " .word gUnknown_Debug_0839BBC1+0x2aa\n" + " .word Str_839BE90\n" + " .word Str_839BE6B\n" " .word gMenuCallback\n" " .word DebugMenu_8077DB4+1\n" "\n" @@ -2486,7 +2495,7 @@ void DebugMenu_8077A60() "._239:\n" " .align 2, 0\n" "._238:\n" - " .word gUnknown_Debug_0839BBC1+0x323\n" + " .word gUnknown_Debug_839BEE4\n" "\n" ); } @@ -2510,7 +2519,7 @@ void DebugMenu_RematchTrainers() "._241:\n" " .align 2, 0\n" "._240:\n" - " .word gUnknown_Debug_0839BBC1+0x323\n" + " .word gUnknown_Debug_839BEE4\n" " .word gMenuCallback\n" " .word DebugMenu_8077A60+1\n" "\n" @@ -2614,7 +2623,7 @@ void DebugMenu_8077B00() "._253:\n" " .align 2, 0\n" "._252:\n" - " .word gUnknown_Debug_0839BBC1+0x353\n" + " .word Str_839BF14\n" "._250:\n" " ldr r0, ._254\n" " bl sub_8071F40\n" @@ -2628,7 +2637,7 @@ void DebugMenu_8077B00() "._255:\n" " .align 2, 0\n" "._254:\n" - " .word gUnknown_Debug_0839BBC1+0x35e\n" + " .word Str_839BF1F\n" " .word gMenuCallback\n" " .word DebugMenu_8077DB4+1\n" "\n" @@ -2649,7 +2658,7 @@ void DebugMenu_8077B3C() "._257:\n" " .align 2, 0\n" "._256:\n" - " .word gUnknown_Debug_0839BBC1+0x3ab\n" + " .word gUnknown_Debug_839BF6C\n" "\n" ); } @@ -2684,10 +2693,10 @@ void DebugMenu_Safari() "._261:\n" " .align 2, 0\n" "._260:\n" - " .word gUnknown_Debug_0839BBC1+0x3ab\n" + " .word gUnknown_Debug_839BF6C\n" " .word gStringVar1\n" " .word gSafariZoneStepCounter\n" - " .word gUnknown_Debug_0839BBC1+0x34b\n" + " .word Str_839BF0C\n" " .word gMenuCallback\n" " .word DebugMenu_8077B3C+1\n" "._258:\n" @@ -2795,7 +2804,7 @@ void DebugMenu_8077C00() "._263:\n" " .align 2, 0\n" "._262:\n" - " .word gUnknown_Debug_0839BBC1+0x3d3\n" + " .word gUnknown_Debug_839BF94\n" "\n" ); } @@ -2819,7 +2828,7 @@ void DebugMenu_8077C14() "._265:\n" " .align 2, 0\n" "._264:\n" - " .word gUnknown_Debug_0839BBC1+0x3d3\n" + " .word gUnknown_Debug_839BF94\n" " .word gMenuCallback\n" " .word DebugMenu_8077C00+1\n" "\n" @@ -2923,8 +2932,8 @@ void DebugMenu_8077C3C() "._272:\n" " .align 2, 0\n" "._271:\n" - " .word 0x030006b0+0xc @ gMenu+0xc\n" - " .word gUnknown_Debug_0839BBC1+0x427\n" + " .word gUnknown_030006BC \n" + " .word gUnknown_Debug_839BFE8\n" "\n" ); } @@ -3359,7 +3368,7 @@ void DebugMenu_8077F7C() "._311:\n" " .word gTasks\n" " .word gMain\n" - " .word gDebug0x839C008+0xc\n" + " .word Str_839C014\n" " .word DebugMenu_8077FFC+1\n" "._309:\n" " mov r0, #0x2\n" @@ -3540,7 +3549,7 @@ void DebugMenu_807808C() " .align 2, 0\n" "._331:\n" " .word gSaveBlock1+0x2ddc\n" - " .word gDebug0x839C008+0x16\n" + " .word Str_839C01E\n" "._329:\n" " ldr r0, ._335\n" " mov r1, #0xb\n" @@ -3563,7 +3572,7 @@ void DebugMenu_807808C() "._336:\n" " .align 2, 0\n" "._335:\n" - " .word gDebug0x839C008+0x45\n" + " .word Str_839C04D\n" "._333:\n" " ldr r0, ._337\n" " mov r1, #0xb\n" @@ -3595,7 +3604,7 @@ void DebugMenu_807808C() "._338:\n" " .align 2, 0\n" "._337:\n" - " .word gDebug0x839C008+0x45\n" + " .word Str_839C04D\n" "\n" ); } @@ -3840,7 +3849,7 @@ void DebugMenu_80782EC() " .align 2, 0\n" "._359:\n" " .word gStringVar1\n" - " .word gDebug0x839C008+0x4b\n" + " .word Str_839C053\n" "\n" ); } @@ -4232,9 +4241,9 @@ void DebugMenu_8078550() "._420:\n" " .word gStringVar1\n" " .word gStringVar2\n" - " .word gDebug0x839C008+0x264\n" + " .word gUnknown_Debug_839C26C\n" " .word gStringVar3\n" - " .word gDebug0x839C008+0x7d\n" + " .word Str_839C085\n" "._418:\n" " cmp r6, #0x1\n" " beq ._422 @cond_branch\n" @@ -4285,7 +4294,7 @@ void DebugMenu_8078550() " .align 2, 0\n" "._426:\n" " .word gStringVar3\n" - " .word gDebug0x839C008+0x74\n" + " .word Str_839C07C\n" "\n" ); } @@ -4445,7 +4454,7 @@ void DebugMenu_80786D0() " .align 2, 0\n" "._450:\n" " .word gTasks\n" - " .word gDebug0x839C008+0x264\n" + " .word gUnknown_Debug_839C26C\n" "\n" ); } @@ -4486,7 +4495,7 @@ void DebugMenu_8078714() " .align 2, 0\n" "._454:\n" " .word gTasks\n" - " .word gDebug0x839C008+0x264\n" + " .word gUnknown_Debug_839C26C\n" "\n" ); } @@ -4581,7 +4590,7 @@ void DebugMenu_80787B0() "._463:\n" " .align 2, 0\n" "._462:\n" - " .word gDebug0x839C008+0x3f4\n" + " .word gUnknown_Debug_839C3FC\n" "\n" ); } @@ -4605,7 +4614,7 @@ void DebugMenu_OpenLegendsRecord() "._465:\n" " .align 2, 0\n" "._464:\n" - " .word gDebug0x839C008+0x3f4\n" + " .word gUnknown_Debug_839C3FC\n" " .word gMenuCallback\n" " .word DebugMenu_80787B0+1\n" "\n" @@ -4677,7 +4686,7 @@ void DebugMenu_80787EC() " .word gStringVar2\n" " .word gStringVar3\n" " .word gStringVar4\n" - " .word gDebug0x839C008+0x40c\n" + " .word Str_839C414\n" "\n" ); } @@ -4827,7 +4836,7 @@ void DebugMenu_8078950() "._490:\n" " .align 2, 0\n" "._489:\n" - " .word gDebug0x839C008+0x426\n" + " .word Str_839C42E\n" "\n" ); } @@ -5166,7 +5175,7 @@ void DebugMenu_8078B70() " .align 2, 0\n" "._526:\n" " .word gStringVar1\n" - " .word gDebug0x839C008+0x430\n" + " .word Str_839C438\n" "\n" ); } @@ -5208,7 +5217,7 @@ void DebugMenu_8078B94() "._532:\n" " .align 2, 0\n" "._531:\n" - " .word gDebug0x839C008+0x43c\n" + " .word gUnknown_Debug_839C444\n" " .word gSaveBlock1+0x7f8\n" "\n" ); @@ -5330,7 +5339,7 @@ void DebugMenu_8078C80() "._549:\n" " .align 2, 0\n" "._548:\n" - " .word gDebug0x839C574+0x30\n" + " .word Str_839C5A4\n" " .word gMenuCallback\n" " .word DebugMenu_8078CA8+1\n" "\n" @@ -5397,7 +5406,7 @@ void DebugMenu_8078CE4() "._558:\n" " .word +0x2000000\n" " .word gStringVar4\n" - " .word gDebug0x839C574+0x58\n" + " .word Str_839C5CC\n" "._556:\n" " ldr r0, ._560\n" " ldr r1, ._560 + 4\n" @@ -5413,7 +5422,7 @@ void DebugMenu_8078CE4() " .align 2, 0\n" "._560:\n" " .word gStringVar4\n" - " .word gDebug0x839C574+0x6b\n" + " .word Str_839C5DF\n" " .word gMenuCallback\n" " .word DebugMenu_8078D7C+1\n" "\n" @@ -5455,7 +5464,7 @@ void DebugMenu_8078D30() "._563:\n" " .word +0x2000000\n" " .word gStringVar4\n" - " .word gDebug0x839C574+0x62\n" + " .word Str_839C5D6\n" " .word gMenuCallback\n" " .word DebugMenu_8078D7C+1\n" "\n" @@ -5534,7 +5543,7 @@ void DebugMenu_MeTooBackupMan() "._572:\n" " .align 2, 0\n" "._571:\n" - " .word gDebug0x839C574+0x20\n" + " .word gUnknown_Debug_839C594\n" " .word gMenuCallback\n" " .word DebugMenu_8078DF0+1\n" "\n" @@ -5555,7 +5564,7 @@ void DebugMenu_8078DF0() "._574:\n" " .align 2, 0\n" "._573:\n" - " .word gDebug0x839C574+0x20\n" + " .word gUnknown_Debug_839C594\n" "\n" ); } @@ -5673,7 +5682,7 @@ void DebugMenu_8078E80() "._582:\n" " .align 2, 0\n" "._581:\n" - " .word gDebug0x839C574+0x80\n" + " .word gUnknown_Debug_839C5F4\n" "\n" ); } @@ -5877,7 +5886,7 @@ void DebugMenu_8078F68() "._603:\n" " .align 2, 0\n" "._602:\n" - " .word gDebug0x839C574+0x80\n" + " .word gUnknown_Debug_839C5F4\n" "\n" ); } @@ -6082,7 +6091,7 @@ void DebugMenu_8079110() "._640:\n" " .align 2, 0\n" "._639:\n" - " .word gDebug0x839C60C+0xe\n" + " .word Str_839C61A\n" "._635:\n" " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 954974e50..d479c59c8 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -677,7 +677,7 @@ void debug_sub_8090C44() "._55:\n" " .align 2, 0\n" "._54:\n" - " .word +0x2000001\n" + " .word gSharedMem+1\n" "\n" ); } @@ -710,7 +710,7 @@ void debug_sub_8090C88() " .align 2, 0\n" "._59:\n" " .word gMain\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._67:\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" @@ -729,7 +729,7 @@ void debug_sub_8090C88() "._65:\n" " .align 2, 0\n" "._64:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._57:\n" " ldrh r1, [r3, #0x2e]\n" " mov r0, #0x10\n" @@ -858,7 +858,7 @@ void debug_sub_8090C88() "._82:\n" " .align 2, 0\n" "._81:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x2710\n" " .word 0xffff\n" "\n" @@ -892,7 +892,7 @@ void TayaDebugMenu_PKMNLottery() "._84:\n" " .align 2, 0\n" "._83:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gSpecialVar_Result\n" " .word gMenuCallback\n" " .word debug_sub_8090C88+1\n" @@ -1285,7 +1285,7 @@ void TayaDebugMenu_PokenavD() "._95:\n" " .align 2, 0\n" "._94:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gUnknown_Debug_083C4F94\n" " .word 0x19b\n" " .word gPokemonStorage+0x4\n" @@ -1559,7 +1559,7 @@ void debug_sub_8091334() "._124:\n" " .align 2, 0\n" "._123:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._119:\n" " add r5, r3, #0\n" " add r5, r5, #0x55\n" @@ -1603,7 +1603,7 @@ void debug_sub_8091334() " .align 2, 0\n" "._131:\n" " .word gMain\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._128:\n" " add r1, r5, #0\n" " add r1, r1, #0x54\n" @@ -1803,7 +1803,7 @@ void debug_sub_8091334() " .align 2, 0\n" "._159:\n" " .word gMain\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._157:\n" " mov r3, r9\n" " ldrh r1, [r3, #0x2e]\n" @@ -1926,7 +1926,7 @@ void debug_sub_80915BC() "._168:\n" " .word 0x4000010\n" " .word gUnknown_Debug_083C50EC\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gPlayerParty\n" "._166:\n" " add r0, r4, r5\n" @@ -1997,7 +1997,7 @@ void debug_sub_80915BC() "._172:\n" " .word gWindowTemplate_81E7224\n" " .word gUnknown_Debug_083C517C\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word debug_sub_8091320+1\n" " .word debug_sub_8091334+1\n" "\n" @@ -2041,9 +2041,9 @@ void debug_sub_80916AC() "._178:\n" " .align 2, 0\n" "._177:\n" - " .word +0x2000000\n" - " .word +0x2000012\n" - " .word +0x2000054\n" + " .word gSharedMem\n" + " .word gSharedMem+0x12\n" + " .word gSharedMem+0x54\n" "._175:\n" " mov r0, r8\n" " strb r0, [r2]\n" @@ -2114,7 +2114,7 @@ void debug_sub_80916AC() " .align 2, 0\n" "._183:\n" " .word gUnknown_Debug_083C50EC\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "\n" ); } diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 68c05270f..8451a104d 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -1,9 +1,21 @@ #if DEBUG #include "global.h" +// These should be static, uninitialized once it gets decompiled. #define BSS_DATA __attribute__((section(".bss"))) - -BSS_DATA u8 gDebug_03000700[0x24] = { 0 }; +BSS_DATA u8 gDebug_03000700[4] = {0}; +BSS_DATA u8 gDebug_03000704[4] = {0}; +BSS_DATA u8 gDebug_03000708[4] = {0}; +BSS_DATA u8 gDebug_0300070C = 0; +BSS_DATA u8 gDebug_0300070D = 0; +BSS_DATA u8 gDebug_0300070E = 0; +BSS_DATA u8 gDebug_0300070F = 0; +BSS_DATA u8 gDebug_03000710[13] = {0}; +BSS_DATA u8 gDebug_0300071D = 0; +BSS_DATA u8 gDebug_0300071E = 0; +BSS_DATA u8 gDebug_0300071F = 0; +BSS_DATA u8 gDebug_03000720 = 0; +BSS_DATA u8 gDebug_03000721 = 0; __attribute__((naked)) void InitTomomichiDebugWindow() @@ -68,7 +80,7 @@ void debug_sub_808B874() " .align 2, 0\n" "._1:\n" " .word gUnknown_Debug_083C0CBA\n" - " .word gDebug_03000700+0x1d\n" + " .word gDebug_0300071D\n" " .word gMenuCallback\n" " .word debug_sub_808B8C8+1\n" "\n" @@ -128,7 +140,7 @@ void debug_sub_808B8C8() " .align 2, 0\n" "._7:\n" " .word gMain\n" - " .word gDebug_03000700+0x1d\n" + " .word gDebug_0300071D\n" " .word gUnknown_Debug_083C0CBA\n" "._5:\n" " mov r0, #0xa\n" @@ -204,10 +216,10 @@ void TomomichiDebugMenu_ContestGraphics() " .word gMenuCallback\n" " .word debug_sub_808BC48+1\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" + " .word gDebug_03000704\n" " .word 0x6f33\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_03000708\n" + " .word gDebug_0300070C\n" "\n" ); } @@ -268,10 +280,10 @@ void TomomichiDebugMenu_ArtMusGraphics() " .word gMenuCallback\n" " .word debug_sub_808BCBC+1\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" + " .word gDebug_03000704\n" " .word 0x6f33\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_03000708\n" + " .word gDebug_0300070D\n" "\n" ); } @@ -332,10 +344,10 @@ void TomomichiDebugMenu_PreviewData() " .word gMenuCallback\n" " .word debug_sub_808BD30+1\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" + " .word gDebug_03000704\n" " .word 0x6f33\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_03000708\n" + " .word gDebug_0300070E\n" "\n" ); } @@ -383,7 +395,7 @@ void TomomichiDebugMenu_TrickHouse() "._17:\n" " .word gUnknown_Debug_083C0DF4\n" " .word gUnknown_Debug_083C0E15\n" - " .word gDebug_03000700+0x1e\n" + " .word gDebug_0300071E\n" " .word gMenuCallback\n" " .word debug_sub_808BDA4+1\n" "\n" @@ -428,7 +440,7 @@ void TomomichiDebugMenu_ControlEvents() " .align 2, 0\n" "._19:\n" " .word gUnknown_Debug_083C0E32\n" - " .word gDebug_03000700+0x1f\n" + " .word gDebug_0300071F\n" " .word gMenuCallback\n" " .word debug_sub_808BE2C+1\n" "\n" @@ -473,7 +485,7 @@ void TomomichiDebugMenu_ControlFlags() " .align 2, 0\n" "._21:\n" " .word gUnknown_Debug_083C0E7F\n" - " .word gDebug_03000700+0x20\n" + " .word gDebug_03000720\n" " .word gMenuCallback\n" " .word debug_sub_808BEB4+1\n" "\n" @@ -518,7 +530,7 @@ void TomomichiDebugMenu_ControlWorks() " .align 2, 0\n" "._23:\n" " .word gUnknown_Debug_083C0EF1\n" - " .word gDebug_03000700+0x21\n" + " .word gDebug_03000721\n" " .word gMenuCallback\n" " .word debug_sub_808BF3C+1\n" "\n" @@ -782,7 +794,7 @@ void debug_sub_808BDA4() " .align 2, 0\n" "._71:\n" " .word gMain\n" - " .word gDebug_03000700+0x1e\n" + " .word gDebug_0300071E\n" " .word gUnknown_Debug_083C0E15\n" "._69:\n" " mov r0, #0xa\n" @@ -855,7 +867,7 @@ void debug_sub_808BE2C() " .align 2, 0\n" "._79:\n" " .word gMain\n" - " .word gDebug_03000700+0x1f\n" + " .word gDebug_0300071F\n" " .word gUnknown_Debug_083C0E32\n" "._77:\n" " mov r0, #0xa\n" @@ -928,7 +940,7 @@ void debug_sub_808BEB4() " .align 2, 0\n" "._87:\n" " .word gMain\n" - " .word gDebug_03000700+0x20\n" + " .word gDebug_03000720\n" " .word gUnknown_Debug_083C0E7F\n" "._85:\n" " mov r0, #0xa\n" @@ -1001,7 +1013,7 @@ void debug_sub_808BF3C() " .align 2, 0\n" "._95:\n" " .word gMain\n" - " .word gDebug_03000700+0x21\n" + " .word gDebug_03000721\n" " .word gUnknown_Debug_083C0EF1\n" "._93:\n" " mov r0, #0xa\n" @@ -1730,7 +1742,7 @@ void debug_sub_808C3B0() " .align 2, 0\n" "._165:\n" " .word gUnknown_Debug_083C2938\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1777,7 +1789,7 @@ void debug_sub_808C408() " .align 2, 0\n" "._167:\n" " .word gUnknown_Debug_083C2A48\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1824,7 +1836,7 @@ void debug_sub_808C460() " .align 2, 0\n" "._169:\n" " .word gUnknown_Debug_083C2B4C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1871,7 +1883,7 @@ void debug_sub_808C4B8() " .align 2, 0\n" "._171:\n" " .word gUnknown_Debug_083C2C80\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1918,7 +1930,7 @@ void debug_sub_808C510() " .align 2, 0\n" "._173:\n" " .word gUnknown_Debug_083C2D8C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1965,7 +1977,7 @@ void debug_sub_808C568() " .align 2, 0\n" "._175:\n" " .word gUnknown_Debug_083C2EB0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2012,7 +2024,7 @@ void debug_sub_808C5C0() " .align 2, 0\n" "._177:\n" " .word gUnknown_Debug_083C2FE0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2059,7 +2071,7 @@ void debug_sub_808C618() " .align 2, 0\n" "._179:\n" " .word gUnknown_Debug_083C3100\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2106,7 +2118,7 @@ void debug_sub_808C670() " .align 2, 0\n" "._181:\n" " .word gUnknown_Debug_083C3194\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2147,7 +2159,7 @@ void debug_sub_808C6C8() "._187:\n" " .align 2, 0\n" "._186:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._184:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -2194,7 +2206,7 @@ void debug_sub_808C714() " .align 2, 0\n" "._191:\n" " .word gMain\n" - " .word gUnknown_Debug_083C31DC+0xa\n" + " .word gUnknown_Debug_83C31E6\n" "._189:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -2259,7 +2271,7 @@ void debug_sub_808C764() " .align 2, 0\n" "._195:\n" " .word gUnknown_Debug_083C31DC\n" - " .word gUnknown_Debug_083C31DC+0xa\n" + " .word gUnknown_Debug_83C31E6\n" "\n" ); } @@ -2390,7 +2402,7 @@ void debug_sub_808C85C() " .align 2, 0\n" "._205:\n" " .word gUnknown_Debug_083C1E0C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2437,7 +2449,7 @@ void debug_sub_808C8B4() " .align 2, 0\n" "._207:\n" " .word gUnknown_Debug_083C1F38\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2484,7 +2496,7 @@ void debug_sub_808C90C() " .align 2, 0\n" "._209:\n" " .word gUnknown_Debug_083C206C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2531,7 +2543,7 @@ void debug_sub_808C964() " .align 2, 0\n" "._211:\n" " .word gUnknown_Debug_083C2190\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2578,7 +2590,7 @@ void debug_sub_808C9BC() " .align 2, 0\n" "._213:\n" " .word gUnknown_Debug_083C2264\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2625,7 +2637,7 @@ void debug_sub_808CA14() " .align 2, 0\n" "._215:\n" " .word gUnknown_Debug_083C2370\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2672,7 +2684,7 @@ void debug_sub_808CA6C() " .align 2, 0\n" "._217:\n" " .word gUnknown_Debug_083C248C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2719,7 +2731,7 @@ void debug_sub_808CAC4() " .align 2, 0\n" "._219:\n" " .word gUnknown_Debug_083C259C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2766,7 +2778,7 @@ void debug_sub_808CB1C() " .align 2, 0\n" "._221:\n" " .word gUnknown_Debug_083C26C8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2807,7 +2819,7 @@ void debug_sub_808CB74() "._227:\n" " .align 2, 0\n" "._226:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._224:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -2854,7 +2866,7 @@ void debug_sub_808CBC0() " .align 2, 0\n" "._231:\n" " .word gMain\n" - " .word gUnknown_Debug_083C2710+0xa\n" + " .word gUnknown_Debug_083C271A\n" "._229:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -2919,7 +2931,7 @@ void debug_sub_808CC10() " .align 2, 0\n" "._235:\n" " .word gUnknown_Debug_083C2710\n" - " .word gUnknown_Debug_083C2710+0xa\n" + " .word gUnknown_Debug_083C271A\n" "\n" ); } @@ -3050,7 +3062,7 @@ void debug_sub_808CD08() " .align 2, 0\n" "._245:\n" " .word gUnknown_Debug_083C1B7C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CE10+1\n" "\n" @@ -3097,7 +3109,7 @@ void debug_sub_808CD60() " .align 2, 0\n" "._247:\n" " .word gUnknown_Debug_083C1BF0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CE10+1\n" "\n" @@ -3144,7 +3156,7 @@ void debug_sub_808CDB8() " .align 2, 0\n" "._249:\n" " .word gUnknown_Debug_083C1C2C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CE10+1\n" "\n" @@ -3185,7 +3197,7 @@ void debug_sub_808CE10() "._255:\n" " .align 2, 0\n" "._254:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._252:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -3232,7 +3244,7 @@ void debug_sub_808CE5C() " .align 2, 0\n" "._259:\n" " .word gMain\n" - " .word gUnknown_Debug_083C1C34+0x4\n" + " .word gUnknown_Debug_083C1C38\n" "._257:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -3297,7 +3309,7 @@ void debug_sub_808CEAC() " .align 2, 0\n" "._263:\n" " .word gUnknown_Debug_083C1C34\n" - " .word gUnknown_Debug_083C1C34+0x4\n" + " .word gUnknown_Debug_083C1C38\n" "\n" ); } @@ -3428,7 +3440,7 @@ void debug_sub_808CFA4() " .align 2, 0\n" "._273:\n" " .word gUnknown_Debug_083C13D8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3475,7 +3487,7 @@ void debug_sub_808CFFC() " .align 2, 0\n" "._275:\n" " .word gUnknown_Debug_083C1465\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3522,7 +3534,7 @@ void debug_sub_808D054() " .align 2, 0\n" "._277:\n" " .word gUnknown_Debug_083C1503\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3569,7 +3581,7 @@ void debug_sub_808D0AC() " .align 2, 0\n" "._279:\n" " .word gUnknown_Debug_083C158A\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3616,7 +3628,7 @@ void debug_sub_808D104() " .align 2, 0\n" "._281:\n" " .word gUnknown_Debug_083C1647\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3663,7 +3675,7 @@ void debug_sub_808D15C() " .align 2, 0\n" "._283:\n" " .word gUnknown_Debug_083C1712\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3710,7 +3722,7 @@ void debug_sub_808D1B4() " .align 2, 0\n" "._285:\n" " .word gUnknown_Debug_083C17F8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3757,7 +3769,7 @@ void debug_sub_808D20C() " .align 2, 0\n" "._287:\n" " .word gUnknown_Debug_083C18B8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3804,7 +3816,7 @@ void debug_sub_808D264() " .align 2, 0\n" "._289:\n" " .word gDebug_0x83C1974\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3845,7 +3857,7 @@ void debug_sub_808D2BC() "._295:\n" " .align 2, 0\n" "._294:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._292:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4088,7 +4100,7 @@ void debug_sub_808D450() " .align 2, 0\n" "._313:\n" " .word gUnknown_Debug_083C10BD\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D500+1\n" "\n" @@ -4135,7 +4147,7 @@ void debug_sub_808D4A8() " .align 2, 0\n" "._315:\n" " .word gUnknown_Debug_083C1149\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D500+1\n" "\n" @@ -4176,7 +4188,7 @@ void debug_sub_808D500() "._321:\n" " .align 2, 0\n" "._320:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._318:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4419,7 +4431,7 @@ void debug_sub_808D694() " .align 2, 0\n" "._339:\n" " .word gUnknown_Debug_083C1212\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D744+1\n" "\n" @@ -4466,7 +4478,7 @@ void debug_sub_808D6EC() " .align 2, 0\n" "._341:\n" " .word gUnknown_Debug_083C1288\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D744+1\n" "\n" @@ -4507,7 +4519,7 @@ void debug_sub_808D744() "._347:\n" " .align 2, 0\n" "._346:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._344:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4749,7 +4761,7 @@ void debug_sub_808D8D8() " .align 2, 0\n" "._365:\n" " .word gUnknown_Debug_083C1A9C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D930+1\n" "\n" @@ -4790,7 +4802,7 @@ void debug_sub_808D930() "._371:\n" " .align 2, 0\n" "._370:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._368:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4837,7 +4849,7 @@ void debug_sub_808D97C() " .align 2, 0\n" "._375:\n" " .word gMain\n" - " .word gUnknown_Debug_083C1AAC+0x2\n" + " .word gUnknown_Debug_083C1AAE\n" "._373:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -4902,7 +4914,7 @@ void debug_sub_808D9CC() " .align 2, 0\n" "._379:\n" " .word gUnknown_Debug_083C1AAC\n" - " .word gUnknown_Debug_083C1AAC+0x2\n" + " .word gUnknown_Debug_083C1AAE\n" "\n" ); } @@ -5174,7 +5186,7 @@ void debug_sub_808DBA0() " .align 2, 0\n" "._403:\n" " .word gUnknown_Debug_083C432C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5221,7 +5233,7 @@ void debug_sub_808DBF8() " .align 2, 0\n" "._405:\n" " .word gUnknown_Debug_083C436C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5268,7 +5280,7 @@ void debug_sub_808DC50() " .align 2, 0\n" "._407:\n" " .word gUnknown_Debug_083C43B4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5315,7 +5327,7 @@ void debug_sub_808DCA8() " .align 2, 0\n" "._409:\n" " .word gUnknown_Debug_083C43FC\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5362,7 +5374,7 @@ void debug_sub_808DD00() " .align 2, 0\n" "._411:\n" " .word gUnknown_Debug_083C4444\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5409,7 +5421,7 @@ void debug_sub_808DD58() " .align 2, 0\n" "._413:\n" " .word gUnknown_Debug_083C448C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5456,7 +5468,7 @@ void debug_sub_808DDB0() " .align 2, 0\n" "._415:\n" " .word gUnknown_Debug_83C44C4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5503,7 +5515,7 @@ void debug_sub_808DE08() " .align 2, 0\n" "._417:\n" " .word gUnknown_Debug_83C44EC\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5550,7 +5562,7 @@ void debug_sub_808DE60() " .align 2, 0\n" "._419:\n" " .word gUnknown_Debug_083C4534\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5591,7 +5603,7 @@ void debug_sub_808DEB8() "._425:\n" " .align 2, 0\n" "._424:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._422:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -5654,7 +5666,7 @@ void debug_sub_808DF04() " .align 2, 0\n" "._428:\n" " .word gUnknown_Debug_083C457C\n" - " .word gUnknown_Debug_083C457C+0xa\n" + " .word gUnknown_Debug_083C4586\n" "\n" ); } @@ -5712,7 +5724,7 @@ void debug_sub_808DF64() " .align 2, 0\n" "._435:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C457C+0xa\n" + " .word gUnknown_Debug_083C4586\n" "\n" ); } @@ -5843,7 +5855,7 @@ void debug_sub_808E054() " .align 2, 0\n" "._445:\n" " .word gUnknown_Debug_083C3AA0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -5890,7 +5902,7 @@ void debug_sub_808E0AC() " .align 2, 0\n" "._447:\n" " .word gUnknown_Debug_83C3AE0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -5937,7 +5949,7 @@ void debug_sub_808E104() " .align 2, 0\n" "._449:\n" " .word gUnknown_Debug_83C3B28\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -5984,7 +5996,7 @@ void debug_sub_808E15C() " .align 2, 0\n" "._451:\n" " .word gUnknown_Debug_83C3B70\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -6031,7 +6043,7 @@ void debug_sub_808E1B4() " .align 2, 0\n" "._453:\n" " .word gUnknown_Debug_83C3BB8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -6078,7 +6090,7 @@ void debug_sub_808E20C() " .align 2, 0\n" "._455:\n" " .word gUnknown_Debug_83C3C00\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -6119,7 +6131,7 @@ void debug_sub_808E264() "._461:\n" " .align 2, 0\n" "._460:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._458:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -6182,7 +6194,7 @@ void debug_sub_808E2B0() " .align 2, 0\n" "._464:\n" " .word gUnknown_Debug_083C3C48\n" - " .word gUnknown_Debug_083C3C48+0x6\n" + " .word gUnknown_Debug_83C3C4E\n" "\n" ); } @@ -6240,7 +6252,7 @@ void debug_sub_808E310() " .align 2, 0\n" "._471:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C3C48+0x6\n" + " .word gUnknown_Debug_83C3C4E\n" "\n" ); } @@ -6371,7 +6383,7 @@ void debug_sub_808E400() " .align 2, 0\n" "._481:\n" " .word gUnknown_Debug_083C347C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6418,7 +6430,7 @@ void debug_sub_808E458() " .align 2, 0\n" "._483:\n" " .word gUnknown_Debug_083C3494\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6465,7 +6477,7 @@ void debug_sub_808E4B0() " .align 2, 0\n" "._485:\n" " .word gUnknown_Debug_083C34A4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6512,7 +6524,7 @@ void debug_sub_808E508() " .align 2, 0\n" "._487:\n" " .word gUnknown_Debug_083C34D4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6559,7 +6571,7 @@ void debug_sub_808E560() " .align 2, 0\n" "._489:\n" " .word gUnknown_Debug_083C351C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6600,7 +6612,7 @@ void debug_sub_808E5B8() "._495:\n" " .align 2, 0\n" "._494:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._492:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -6665,7 +6677,7 @@ void debug_sub_808E604() " .align 2, 0\n" "._501:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C3544+0x6\n" + " .word gUnknown_Debug_083C354A\n" "\n" ); } @@ -6721,7 +6733,7 @@ void debug_sub_808E660() " .align 2, 0\n" "._505:\n" " .word gUnknown_Debug_083C3544\n" - " .word gUnknown_Debug_083C3544+0x6\n" + " .word gUnknown_Debug_083C354A\n" "\n" ); } @@ -6852,7 +6864,7 @@ void debug_sub_808E754() " .align 2, 0\n" "._515:\n" " .word gUnknown_Debug_083C470C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E804+1\n" "\n" @@ -6899,7 +6911,7 @@ void debug_sub_808E7AC() " .align 2, 0\n" "._517:\n" " .word gUnknown_Debug_083C4754C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E804+1\n" "\n" @@ -6940,7 +6952,7 @@ void debug_sub_808E804() "._523:\n" " .align 2, 0\n" "._522:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._520:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -7005,7 +7017,7 @@ void debug_sub_808E850() " .align 2, 0\n" "._529:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C478C+0x2\n" + " .word gUnknown_Debug_083C478E\n" "\n" ); } @@ -7061,7 +7073,7 @@ void debug_sub_808E8AC() " .align 2, 0\n" "._533:\n" " .word gUnknown_Debug_083C478C\n" - " .word gUnknown_Debug_083C478C+0x2\n" + " .word gUnknown_Debug_083C478E\n" "\n" ); } @@ -7192,7 +7204,7 @@ void debug_sub_808E9A0() " .align 2, 0\n" "._543:\n" " .word gUnknown_Debug_083C369C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808EA50+1\n" "\n" @@ -7239,7 +7251,7 @@ void debug_sub_808E9F8() " .align 2, 0\n" "._545:\n" " .word gUnknown_Debug_083C36E4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808EA50+1\n" "\n" @@ -7280,7 +7292,7 @@ void debug_sub_808EA50() "._551:\n" " .align 2, 0\n" "._550:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._548:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -7343,7 +7355,7 @@ void debug_sub_808EA9C() " .align 2, 0\n" "._554:\n" " .word gUnknown_Debug_083C371C\n" - " .word gUnknown_Debug_083C371C+0x2\n" + " .word gUnknown_Debug_083C371E\n" "\n" ); } @@ -7401,7 +7413,7 @@ void debug_sub_808EAFC() " .align 2, 0\n" "._561:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C371C+0x2\n" + " .word gUnknown_Debug_083C371E\n" "\n" ); } @@ -7802,7 +7814,7 @@ void debug_sub_808ED9C() " .align 2, 0\n" "._606:\n" " .word gMain\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000708\n" "._604:\n" " mov r0, #0x0\n" "._605:\n" @@ -7826,7 +7838,7 @@ void debug_sub_808ED9C() "._612:\n" " .align 2, 0\n" "._611:\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000708\n" "._609:\n" " mov r0, #0x1\n" " neg r0, r0\n" @@ -7850,7 +7862,7 @@ void debug_sub_808ED9C() "._615:\n" " .align 2, 0\n" "._614:\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000708\n" "\n" ); } @@ -7911,7 +7923,7 @@ void debug_sub_808EE3C() " .align 2, 0\n" "._622:\n" " .word gMain\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_0300070C\n" "\n" ); } @@ -7962,7 +7974,7 @@ void debug_sub_808EE9C() " .align 2, 0\n" "._631:\n" " .word gMain\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._629:\n" " mov r0, #0x0\n" "._630:\n" @@ -7983,7 +7995,7 @@ void debug_sub_808EE9C() "._637:\n" " .align 2, 0\n" "._636:\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._634:\n" " mov r0, #0xf\n" "._635:\n" @@ -8041,7 +8053,7 @@ void debug_sub_808EF14() " .align 2, 0\n" "._645:\n" " .word gMain\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "._643:\n" " mov r0, #0x0\n" "._644:\n" @@ -8062,7 +8074,7 @@ void debug_sub_808EF14() "._651:\n" " .align 2, 0\n" "._650:\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "._648:\n" " mov r0, #0xf\n" "._649:\n" @@ -8109,8 +8121,8 @@ void debug_sub_808EF8C() "._657:\n" " .align 2, 0\n" "._656:\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000708\n" + " .word gDebug_03000710\n" "._654:\n" " add r1, r3, r4\n" " add r0, r2, #0\n" @@ -8194,7 +8206,7 @@ void debug_sub_808EF8C() "._667:\n" " .align 2, 0\n" "._666:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" " .word gDebug_03000700\n" " .word gSpeciesNames\n" "._664:\n" @@ -8240,7 +8252,7 @@ void debug_sub_808EF8C() "._673:\n" " .align 2, 0\n" "._672:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" " .word gDebug_03000700\n" "._669:\n" " cmp r6, #0x2\n" @@ -8252,7 +8264,7 @@ void debug_sub_808EF8C() "._678:\n" " .align 2, 0\n" "._677:\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_0300070C\n" "._668:\n" " ldr r4, ._680\n" "._676:\n" @@ -8283,7 +8295,7 @@ void debug_sub_808EF8C() "._681:\n" " .align 2, 0\n" "._680:\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._674:\n" " ldr r4, ._682\n" " ldrb r0, [r4]\n" @@ -8318,7 +8330,7 @@ void debug_sub_808EF8C() "._683:\n" " .align 2, 0\n" "._682:\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "\n" ); } @@ -8354,8 +8366,8 @@ void debug_sub_808F168() "._686:\n" " .word +0x2015de0\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000704\n" + " .word gDebug_03000708\n" " .word ._688\n" "._688:\n" " .word ._689\n" @@ -8388,7 +8400,7 @@ void debug_sub_808F168() " .word +0x2000000\n" " .word 0x15ddf\n" " .word 0x15dde\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_0300070C\n" " .word gUnknown_Debug_083C48BB\n" "._690:\n" " ldr r1, ._699\n" @@ -8410,7 +8422,7 @@ void debug_sub_808F168() " .word +0x2000000\n" " .word 0x15ddf\n" " .word 0x15dde\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._691:\n" " ldr r1, ._702\n" " ldr r0, ._702 + 4\n" @@ -8432,7 +8444,7 @@ void debug_sub_808F168() " .word +0x2000000\n" " .word 0x15ddf\n" " .word 0x15dde\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "._692:\n" " ldr r1, ._705\n" " ldr r2, ._705 + 4\n" @@ -8526,7 +8538,7 @@ void debug_sub_808F2E0() "._715:\n" " .align 2, 0\n" "._714:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" "._712:\n" " ldr r1, ._716\n" " mov r0, #0xa2\n" @@ -8544,7 +8556,7 @@ void debug_sub_808F2E0() "._717:\n" " .align 2, 0\n" "._716:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" "\n" ); } @@ -8625,7 +8637,7 @@ void debug_sub_808F31C() "._719:\n" " .align 2, 0\n" "._718:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" " .word 0x2710\n" "\n" ); diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 58ae28510..cc53f8c95 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -1,7 +1,10 @@ #if DEBUG #include "global.h" -EWRAM_DATA u8 unk_debug_ewram_0[56] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_20389EC[0x20] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_2038A0C[0x10] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_2038A1C[4] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_2038A20[4] = { 0 }; u8 byte_3005E30[0x20]; @@ -655,7 +658,7 @@ void InitSizeComparison() " .align 2, 0\n" "._54:\n" " .word gReservedSpritePaletteCount\n" - " .word unk_debug_ewram_0\n" + " .word gUnknown_Debug_20389EC\n" " .word 0x4000208\n" " .word 0x4000200\n" " .word debug_80C3758+1\n" @@ -1611,7 +1614,7 @@ void InitBattleForDebug() "._139:\n" " .align 2, 0\n" "._138:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gSaveBlock2\n" " .word byte_3005E30\n" " .word debug_80C47BC+1\n" @@ -1640,7 +1643,7 @@ void debug_80C41A8() "._141:\n" " .align 2, 0\n" "._140:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word debug_80C47BC+1\n" "\n" ); @@ -1815,7 +1818,7 @@ void debug_80C42B8() "._150:\n" " .word gUnknown_Debug_083F8194\n" " .word gUnknown_Debug_083F81A0\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C44EC+1\n" "._148:\n" @@ -1883,7 +1886,7 @@ void debug_80C4348() "._155:\n" " .align 2, 0\n" "._154:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -1924,7 +1927,7 @@ void debug_80C43A8() " .align 2, 0\n" "._158:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gPlayerParty\n" " .word debug_80C41D4+1\n" "._156:\n" @@ -2014,7 +2017,7 @@ void debug_80C43A8() "._177:\n" " .align 2, 0\n" "._176:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._174:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -2053,7 +2056,7 @@ void debug_80C43A8() "._182:\n" " .align 2, 0\n" "._181:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gPlayerParty\n" " .word gTasks\n" " .word debug_80C4348+1\n" @@ -2105,7 +2108,7 @@ void debug_80C44EC() "._184:\n" " .align 2, 0\n" "._183:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x79ef\n" " .word 0x17f\n" @@ -2147,7 +2150,7 @@ void debug_80C4550() " .align 2, 0\n" "._187:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gEnemyParty\n" " .word debug_80C41F4+1\n" "._185:\n" @@ -2237,7 +2240,7 @@ void debug_80C4550() "._206:\n" " .align 2, 0\n" "._205:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._203:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -2276,7 +2279,7 @@ void debug_80C4550() "._211:\n" " .align 2, 0\n" "._210:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gEnemyParty\n" " .word gTasks\n" " .word debug_80C44EC+1\n" @@ -2432,7 +2435,7 @@ void debug_80C4774() "._222:\n" " .align 2, 0\n" "._221:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gPlayerParty\n" " .word gEnemyParty\n" "._219:\n" @@ -2543,7 +2546,7 @@ void debug_80C47BC() " .word gUnknown_Debug_083F81D6\n" " .word gUnknown_Debug_083F81E5\n" " .word gUnknown_Debug_083F8068\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C48A0+1\n" "\n" @@ -2593,7 +2596,7 @@ void debug_80C48A0() "._227:\n" " .align 2, 0\n" "._226:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -2654,7 +2657,7 @@ void debug_80C4900() " .word gMain\n" " .word debug_80C370C+1\n" " .word gSaveBlock2\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gBattleTypeFlags\n" " .word gUnknown_02023A14_50\n" " .word gTasks\n" @@ -2712,7 +2715,7 @@ void debug_80C4900() "._236:\n" " .word gBattleTypeFlags\n" " .word gUnknown_Debug_083F8068\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gUnknown_02023A14_50\n" " .word gTasks\n" " .word debug_80C4A60+1\n" @@ -2745,7 +2748,7 @@ void debug_80C4900() "._245:\n" " .align 2, 0\n" "._244:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._242:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -2775,7 +2778,7 @@ void debug_80C4900() "._249:\n" " .align 2, 0\n" "._248:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C48A0+1\n" "\n" @@ -2826,7 +2829,7 @@ void debug_80C4A60() "._251:\n" " .align 2, 0\n" "._250:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x79ef\n" " .word 0x17f\n" @@ -2880,7 +2883,7 @@ void debug_80C4AC4() "._256:\n" " .align 2, 0\n" "._255:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gMain\n" " .word gUnknown_Debug_083F80D8\n" " .word byte_3005E30\n" @@ -3231,7 +3234,7 @@ void debug_80C4D14() " .word gUnknown_Debug_083F81C7\n" " .word gUnknown_Debug_083F81F5\n" " .word gUnknown_Debug_083F8202\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C4DB8+1\n" "\n" @@ -3281,7 +3284,7 @@ void debug_80C4DB8() "._294:\n" " .align 2, 0\n" "._293:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -3319,7 +3322,7 @@ void debug_80C4E18() "._298:\n" " .align 2, 0\n" "._297:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gMain\n" " .word gTasks\n" " .word debug_80C42B8+1\n" @@ -3616,7 +3619,7 @@ void debug_80C5038() "._323:\n" " .align 2, 0\n" "._322:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -3680,7 +3683,7 @@ void debug_80C5098() " .align 2, 0\n" "._331:\n" " .word gSaveBlock2\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C42B8+1\n" "._329:\n" @@ -3698,7 +3701,7 @@ void debug_80C5098() "._337:\n" " .align 2, 0\n" "._336:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._334:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -3727,7 +3730,7 @@ void debug_80C5098() "._341:\n" " .align 2, 0\n" "._340:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C5038+1\n" "\n" @@ -3929,7 +3932,7 @@ void debug_80C5208() "._356:\n" " .align 2, 0\n" "._355:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word +0x2018000\n" " .word gSaveBlock2\n" "\n" @@ -3986,7 +3989,7 @@ void debug_80C527C() "._363:\n" " .align 2, 0\n" "._362:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -4079,7 +4082,7 @@ void InitCreatePokemon() " .word debug_80C3758+1\n" " .word debug_80C370C+1\n" " .word debug_80C53A4+1\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "\n" ); @@ -4194,7 +4197,7 @@ void debug_80C53F0() " .align 2, 0\n" "._372:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F8698\n" " .word 0x169\n" " .word gTasks\n" @@ -4255,7 +4258,7 @@ void debug_80C53F0() "._382:\n" " .align 2, 0\n" "._381:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F872A\n" "._379:\n" " ldr r0, ._384\n" @@ -4299,7 +4302,7 @@ void debug_80C53F0() "._389:\n" " .align 2, 0\n" "._388:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._386:\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -4342,7 +4345,7 @@ void debug_80C53F0() "._398:\n" " .align 2, 0\n" "._397:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "._395:\n" " ldrh r1, [r4, #0x2e]\n" @@ -4383,7 +4386,7 @@ void debug_80C53F0() "._402:\n" " .align 2, 0\n" "._401:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gTasks\n" " .word debug_80C53C0+1\n" @@ -4438,7 +4441,7 @@ void debug_80C55E4() " .align 2, 0\n" "._405:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gMain\n" " .word gTasks\n" @@ -4645,7 +4648,7 @@ void debug_80C5738() " .align 2, 0\n" "._428:\n" " .word gUnknown_Debug_083F850A\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F8514\n" " .word gUnknown_Debug_083F851C\n" "._426:\n" @@ -4702,7 +4705,7 @@ void debug_80C5738() " .align 2, 0\n" "._432:\n" " .word gUnknown_Debug_083F8524\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F852D\n" " .word gUnknown_Debug_083F8537\n" "._430:\n" @@ -4835,7 +4838,7 @@ void debug_80C5738() "._478:\n" " .align 2, 0\n" "._477:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gSpeciesNames\n" "._445:\n" " ldr r0, ._483\n" @@ -4853,7 +4856,7 @@ void debug_80C5738() "._484:\n" " .align 2, 0\n" "._483:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._480:\n" " add r0, r6, #0\n" " add r0, r0, #0xa\n" @@ -4918,7 +4921,7 @@ void debug_80C5738() "._496:\n" " .align 2, 0\n" "._495:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gMoveNames\n" "._451:\n" " add r0, r6, #0\n" @@ -4957,7 +4960,7 @@ void debug_80C5738() "._500:\n" " .align 2, 0\n" "._499:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._497:\n" " add r0, r5, #0\n" " add r0, r0, #0xe\n" @@ -5000,7 +5003,7 @@ void debug_80C5738() "._506:\n" " .align 2, 0\n" "._505:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gAbilityNames\n" "._474:\n" " add r0, r6, #0\n" @@ -5019,7 +5022,7 @@ void debug_80C5738() " .align 2, 0\n" "._508:\n" " .word gUnknown_Debug_083F86E8\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._472:\n" " add r0, r6, #0\n" " add r0, r0, #0xc\n" @@ -5034,7 +5037,7 @@ void debug_80C5738() "._512:\n" " .align 2, 0\n" "._511:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._473:\n" " ldr r0, ._515\n" " ldr r0, [r0]\n" @@ -5050,7 +5053,7 @@ void debug_80C5738() "._516:\n" " .align 2, 0\n" "._515:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F854A\n" "._513:\n" " add r0, r6, #0\n" @@ -5090,7 +5093,7 @@ void debug_80C5738() " .align 2, 0\n" "._520:\n" " .word gNatureNames\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5110,7 +5113,7 @@ void debug_80C5B60() "._523:\n" " .align 2, 0\n" "._522:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5172,7 +5175,7 @@ void debug_80C5B74() "._555:\n" " .align 2, 0\n" "._554:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._532:\n" " ldr r0, ._557\n" " ldr r0, [r0]\n" @@ -5184,7 +5187,7 @@ void debug_80C5B74() "._558:\n" " .align 2, 0\n" "._557:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._529:\n" " ldr r4, ._560\n" " ldr r1, [r4]\n" @@ -5219,7 +5222,7 @@ void debug_80C5B74() "._561:\n" " .align 2, 0\n" "._560:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gExperienceTables\n" " .word gBaseStats\n" "._530:\n" @@ -5233,7 +5236,7 @@ void debug_80C5B74() "._564:\n" " .align 2, 0\n" "._563:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._552:\n" " ldr r0, ._565\n" " ldr r0, [r0]\n" @@ -5248,7 +5251,7 @@ void debug_80C5B74() "._566:\n" " .align 2, 0\n" "._565:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5414,7 +5417,7 @@ void debug_80C5C94() "._568:\n" " .align 2, 0\n" "._567:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5537,7 +5540,7 @@ void debug_80C5DEC() "._570:\n" " .align 2, 0\n" "._569:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5660,7 +5663,7 @@ void debug_80C5EF4() "._572:\n" " .align 2, 0\n" "._571:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5953,7 +5956,7 @@ void debug_80C5FFC() "._578:\n" " .word gUnknown_Debug_083F8758\n" " .word gUnknown_Debug_083F875C\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F86E8+0x4\n" "\n" ); @@ -6002,7 +6005,7 @@ void debug_80C627C() "._590:\n" " .align 2, 0\n" "._589:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "._580:\n" " ldr r4, ._593\n" @@ -6051,7 +6054,7 @@ void debug_80C627C() "._594:\n" " .align 2, 0\n" "._593:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gUnknown_Debug_083F8698\n" "._586:\n" @@ -6094,7 +6097,7 @@ void debug_80C627C() "._597:\n" " .align 2, 0\n" "._596:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "\n" ); @@ -6191,7 +6194,7 @@ void debug_80C6384() " .align 2, 0\n" "._600:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x16b\n" " .word 0x16d\n" "\n" @@ -6267,7 +6270,7 @@ void debug_80C643C() " .align 2, 0\n" "._605:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x16b\n" " .word 0x169\n" " .word 0x16d\n" @@ -6402,7 +6405,7 @@ void debug_80C6544() " .align 2, 0\n" "._614:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gUnknown_Debug_083F8554\n" " .word gUnknown_Debug_083F8768\n" @@ -6458,7 +6461,7 @@ void debug_80C6544() " .align 2, 0\n" "._624:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "\n" ); @@ -6497,7 +6500,7 @@ void debug_80C6630() "._630:\n" " .align 2, 0\n" "._629:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._627:\n" " mov r0, #0x4\n" "._626:\n" @@ -7065,7 +7068,7 @@ void InitSeePokemonGraphics() " .word 0x1f0b\n" " .word 0x1e0a\n" " .word debug_80C6B00+1\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word +0x2018000\n" " .word 0x115\n" " .word gSpriteTemplate_83F8874\n" @@ -7504,7 +7507,7 @@ void debug_80C6CB8() "._669:\n" " .align 2, 0\n" "._668:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gMonFrontPicTable\n" " .word gMonFrontPicCoords\n" " .word gUnknown_081FAF4C\n" @@ -7615,7 +7618,7 @@ void debug_80C6EE8() " .align 2, 0\n" "._670:\n" " .word gPlttBufferUnfaded+0x100\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0xffffff00\n" " .word 0xfffffc1f\n" " .word gUnknown_Debug_083F8813\n" @@ -7681,7 +7684,7 @@ void debug_80C6FA8() "._679:\n" " .align 2, 0\n" "._678:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._676:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" @@ -7707,7 +7710,7 @@ void debug_80C6FA8() "._683:\n" " .align 2, 0\n" "._682:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C71FC+1\n" "._680:\n" @@ -7738,7 +7741,7 @@ void debug_80C6FA8() "._687:\n" " .align 2, 0\n" "._686:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x4167\n" @@ -7766,7 +7769,7 @@ void debug_80C6FA8() "._692:\n" " .align 2, 0\n" "._691:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000102\n" "._689:\n" " ldrh r1, [r4, #0x30]\n" @@ -7792,7 +7795,7 @@ void debug_80C6FA8() "._697:\n" " .align 2, 0\n" "._696:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000102\n" "._694:\n" " ldrh r1, [r4, #0x2e]\n" @@ -7827,7 +7830,7 @@ void debug_80C6FA8() "._702:\n" " .align 2, 0\n" "._701:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._699:\n" " ldrh r0, [r1]\n" " mov r1, #0x0\n" @@ -7872,7 +7875,7 @@ void debug_80C6FA8() "._705:\n" " .align 2, 0\n" "._704:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded+0x200\n" " .word 0xffffff00\n" " .word gPlttBufferFaded+0x100\n" @@ -7919,7 +7922,7 @@ void debug_80C6FA8() "._708:\n" " .align 2, 0\n" "._707:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000142\n" " .word gUnknown_Debug_083F8790\n" "\n" @@ -7995,7 +7998,7 @@ void debug_80C71FC() " .align 2, 0\n" "._709:\n" " .word gSprites\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C6CB8+1\n" "\n" @@ -8033,7 +8036,7 @@ void debug_80C7294() " .align 2, 0\n" "._713:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -8099,7 +8102,7 @@ void debug_80C7294() "._718:\n" " .align 2, 0\n" "._717:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -8124,7 +8127,7 @@ void debug_80C7294() "._723:\n" " .align 2, 0\n" "._722:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._720:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x40\n" @@ -8142,7 +8145,7 @@ void debug_80C7294() "._728:\n" " .align 2, 0\n" "._727:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._725:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x10\n" @@ -8162,7 +8165,7 @@ void debug_80C7294() "._735:\n" " .align 2, 0\n" "._734:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._731:\n" " cmp r0, #0x2\n" " beq ._736 @cond_branch\n" @@ -8235,7 +8238,7 @@ void debug_80C7294() "._752:\n" " .align 2, 0\n" "._751:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._748:\n" " cmp r0, #0x2\n" " beq ._753 @cond_branch\n" @@ -8391,7 +8394,7 @@ void debug_80C74E4() "._765:\n" " .align 2, 0\n" "._764:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded\n" " .word gPlttBufferFaded\n" " .word 0x101\n" @@ -8428,7 +8431,7 @@ void debug_80C7584() "._772:\n" " .align 2, 0\n" "._771:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._767:\n" " ldrh r0, [r3, #0xc]\n" " lsl r0, r0, #0x16\n" @@ -8639,7 +8642,7 @@ void InitSeeTrainers() " .word 0x1f0b\n" " .word 0x1e0a\n" " .word debug_80C777C+1\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word +0x2018000\n" " .word gSpriteTemplate_83F8874\n" " .word gSprites\n" @@ -8970,7 +8973,7 @@ void debug_80C7934() "._787:\n" " .align 2, 0\n" "._786:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTrainerFrontPicTable\n" " .word gTrainerFrontPicCoords\n" " .word gUnknown_081FAF4C\n" @@ -9072,7 +9075,7 @@ void debug_80C7A54() " .align 2, 0\n" "._788:\n" " .word gPlttBufferUnfaded+0x100\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0xffffff00\n" " .word 0xfffffc1f\n" " .word gUnknown_Debug_083F8813\n" @@ -9138,7 +9141,7 @@ void debug_80C7B14() "._797:\n" " .align 2, 0\n" "._796:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._794:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" @@ -9164,7 +9167,7 @@ void debug_80C7B14() "._801:\n" " .align 2, 0\n" "._800:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C7D44+1\n" "._798:\n" @@ -9195,7 +9198,7 @@ void debug_80C7B14() "._805:\n" " .align 2, 0\n" "._804:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x4167\n" @@ -9223,7 +9226,7 @@ void debug_80C7B14() "._810:\n" " .align 2, 0\n" "._809:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000102\n" "._807:\n" " ldrh r1, [r4, #0x30]\n" @@ -9282,7 +9285,7 @@ void debug_80C7B14() "._820:\n" " .align 2, 0\n" "._819:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._817:\n" " ldrh r0, [r1]\n" " mov r1, #0x0\n" @@ -9327,7 +9330,7 @@ void debug_80C7B14() "._823:\n" " .align 2, 0\n" "._822:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded+0x200\n" " .word 0xffffff00\n" " .word gPlttBufferFaded+0x100\n" @@ -9437,7 +9440,7 @@ void debug_80C7D44() " .align 2, 0\n" "._826:\n" " .word gSprites\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C7934+1\n" "\n" @@ -9475,7 +9478,7 @@ void debug_80C7DDC() " .align 2, 0\n" "._830:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -9541,7 +9544,7 @@ void debug_80C7DDC() "._835:\n" " .align 2, 0\n" "._834:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -9566,7 +9569,7 @@ void debug_80C7DDC() "._840:\n" " .align 2, 0\n" "._839:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._837:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x40\n" @@ -9584,7 +9587,7 @@ void debug_80C7DDC() "._845:\n" " .align 2, 0\n" "._844:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._842:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x10\n" @@ -9604,7 +9607,7 @@ void debug_80C7DDC() "._852:\n" " .align 2, 0\n" "._851:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._848:\n" " cmp r0, #0x2\n" " beq ._853 @cond_branch\n" @@ -9677,7 +9680,7 @@ void debug_80C7DDC() "._869:\n" " .align 2, 0\n" "._868:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._865:\n" " cmp r0, #0x2\n" " beq ._870 @cond_branch\n" @@ -9833,7 +9836,7 @@ void debug_80C802C() "._882:\n" " .align 2, 0\n" "._881:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded\n" " .word gPlttBufferFaded\n" " .word 0x101\n" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 45cde2cc0..9324ea1c1 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -817,10 +817,10 @@ void debug_sub_806F9E4() ._159:\n\ .align 2, 0\n\ ._158:\n\ - .word gUnknown_08376500+0x4\n\ - .word gUnknown_08376500+0x9\n\ - .word gUnknown_08376500+0x17\n\ - .word gUnknown_08376500+0xd\n\ + .word gUnknown_Debug_0839AE94\n\ + .word gUnknown_Debug_0839AE99\n\ + .word gUnknown_Debug_0839AEA7\n\ + .word gUnknown_Debug_0839AE9D\n\ ._155:\n\ bl RtcCalcLocalTime\n\ add r0, r6, #0\n\ |