fix more false offsets

1 files changed, 81 insertions, 71 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"