summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/btl_attrs.s34
-rw-r--r--src/battle/battle_2.c218
-rw-r--r--src/battle/battle_4.c4
-rw-r--r--src/battle/battle_ai.c16
-rw-r--r--src/battle/battle_controller_opponent.c12
-rw-r--r--src/battle/battle_controller_player.c4
-rw-r--r--src/battle/battle_records.c4
-rw-r--r--src/battle/battle_util.c12
-rw-r--r--src/contest.c14
-rw-r--r--src/debug/nohara_debug_menu.c14
-rw-r--r--src/engine/link.c13
-rw-r--r--src/engine/mystery_event_menu.c2
-rw-r--r--src/field/berry.c4
-rw-r--r--src/field/field_weather.c13
-rw-r--r--src/field/slot_machine.c104
-rw-r--r--src/pokenav_before.c322
-rw-r--r--sym_common.txt2
-rw-r--r--sym_ewram.txt40
18 files changed, 442 insertions, 390 deletions
diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 5f44a87b8..8d6e643c8 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -206,7 +206,31 @@ gSpriteTemplate_81F96D0:: @ 81F96D0
.if DEBUG
UnkDebug0:: @ 0x821F3B8
- .incbin "baserom_de_debug.gba", 0x21F3B8, 620
+ .incbin "baserom_de_debug.gba", 0x21F3B8, 108
+
+gUnknown_Debug_821F424::
+ .incbin "baserom_de_debug.gba", 0x21F424, 320
+
+gUnknown_Debug_821F564::
+ .incbin "baserom_de_debug.gba", 0x21F564, 2
+
+gUnknown_Debug_821F566::
+ .incbin "baserom_de_debug.gba", 0x21F566, 2
+
+gUnknown_Debug_821F568::
+ .incbin "baserom_de_debug.gba", 0x21F568, 4
+
+gUnknown_Debug_821F56C::
+ .incbin "baserom_de_debug.gba", 0x21F56C, 32
+
+gUnknown_Debug_821F58C::
+ .incbin "baserom_de_debug.gba", 0x21F58C, 12
+
+gUnknown_Debug_821F598::
+ .incbin "baserom_de_debug.gba", 0x21F598, 20
+
+gUnknown_Debug_821F5AC::
+ .incbin "baserom_de_debug.gba", 0x21F5AC, 120
Str_821F624:: @ 0x821F624
.string "ーーーーーーーーーーーー$"
@@ -242,7 +266,13 @@ debug_unk_0b::
@ 0x821F66D
.string "せつぞくエラー$"
-.incbin "baserom_de_debug.gba", 0x21F675, 323
+ .incbin "baserom_de_debug.gba", 0x21F675, 11
+
+gUnknown_Debug_821F680::
+ .incbin "baserom_de_debug.gba", 0x21F680, 280
+
+gUnknown_Debug_821F798::
+ .incbin "baserom_de_debug.gba", 0x21F798, 312-280
Str_821F7B8:: @ 0x821F7B8
.string "たかさ　$"
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 41d00546d..6808ad61c 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -354,7 +354,7 @@ void InitBattle(void)
" .word gBattle_BG2_Y\n"
" .word gBattle_BG3_X\n"
" .word gBattle_BG3_Y\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
" .word gBattleTerrain\n"
" .word gUnknown_03004210\n"
" .word gUnknown_030041D0\n"
@@ -417,7 +417,7 @@ void InitBattle(void)
"._15:\n"
" .word sub_800EC9C+1\n"
" .word gBattleTypeFlags\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
" .word gEnemyParty\n"
" .word gTrainerBattleOpponent\n"
" .word gMain\n"
@@ -638,7 +638,7 @@ void sub_800EC9C()
"._56:\n"
" .align 2, 0\n"
"._55:\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x160cb\n"
" .word gBattleCommunication\n"
" .word ._57\n"
@@ -710,8 +710,8 @@ void sub_800EC9C()
"._76:\n"
" .word gBattleTypeFlags\n"
" .word gReceivedRemoteLinkPlayers\n"
- " .word +0x2000000\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gSharedMem\n"
+ " .word gUnknown_02023A14_50\n"
" .word 0x2211\n"
" .word gLinkPlayers\n"
" .word gBattleCommunication\n"
@@ -873,7 +873,7 @@ void sub_800EC9C()
"._106:\n"
" .word sub_800DE30+1\n"
" .word gTasks\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word gBlockRecvBuffer\n"
"._60:\n"
" bl sub_8007ECC\n"
@@ -1295,7 +1295,7 @@ void sub_800F104()
"._152:\n"
" .align 2, 0\n"
"._151:\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x160cb\n"
" .word 0x160c4\n"
" .word gBattleCommunication\n"
@@ -1355,10 +1355,10 @@ void sub_800F104()
" .align 2, 0\n"
"._165:\n"
" .word gReceivedRemoteLinkPlayers\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
" .word 0x2211\n"
" .word gLinkPlayers\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word gBattleCommunication\n"
"._147:\n"
" bl GetBlockReceivedStatus\n"
@@ -1586,7 +1586,7 @@ void sub_800F298()
"._189:\n"
" .align 2, 0\n"
"._188:\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x160cb\n"
" .word gBattleCommunication\n"
" .word ._190\n"
@@ -1646,10 +1646,10 @@ void sub_800F298()
" .align 2, 0\n"
"._206:\n"
" .word gReceivedRemoteLinkPlayers\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
" .word 0x2211\n"
" .word gLinkPlayers\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
"._192:\n"
" bl GetBlockReceivedStatus\n"
" mov r1, #0xf\n"
@@ -3181,12 +3181,12 @@ void debug_sub_8010818()
"._502:\n"
" .align 2, 0\n"
"._501:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word 0x115\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
" .word gUnknown_Debug_030043A8\n"
- " .word gUnknown_02023A14+0xde\n"
- " .word UnkDebug0+0x1b4\n"
+ " .word gUnknown_Debug_2023B02\n"
+ " .word gUnknown_Debug_821F56C\n"
"\n"
);
}
@@ -3345,7 +3345,7 @@ void debug_sub_80108B8()
" .word 0x4000050\n"
" .word gMonShinyPalette_CircledQuestionMark+0x18\n"
" .word gMonShinyPalette_CircledQuestionMark+0x834\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word gMonShinyPalette_CircledQuestionMark+0xa8c\n"
" .word 0x50001e0\n"
" .word debug_sub_8011D40+1\n"
@@ -3356,7 +3356,7 @@ void debug_sub_80108B8()
" .word gUnknown_Debug_030043A0\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_030043A8\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._505:\n"
" ldr r0, ._510\n"
" mov r1, #0x0\n"
@@ -3377,7 +3377,7 @@ void debug_sub_80108B8()
"._511:\n"
" .align 2, 0\n"
"._510:\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x160bb\n"
"\n"
);
@@ -3458,7 +3458,7 @@ void debug_sub_8010AAC()
" .align 2, 0\n"
"._520:\n"
" .word gBaseStats\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004360\n"
"._517:\n"
@@ -3607,7 +3607,7 @@ void debug_sub_8010B80()
"._535:\n"
" .align 2, 0\n"
"._534:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_030043A0\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004360\n"
@@ -3800,8 +3800,8 @@ void debug_sub_8010CAC()
" .word gUnknown_Debug_030043A0\n"
" .word debug_sub_80108B8+1\n"
" .word gPlayerParty\n"
- " .word gUnknown_02023A14+0x52\n"
- " .word gUnknown_02023A14+0xde\n"
+ " .word gUnknown_Debug_2023A76\n"
+ " .word gUnknown_Debug_2023B02\n"
" .word gBattleMoves+0x4\n"
"._550:\n"
" ldr r1, ._556\n"
@@ -4078,7 +4078,7 @@ void debug_sub_8010CAC()
"._598:\n"
" .align 2, 0\n"
"._597:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_030043A4\n"
"._593:\n"
" ldr r1, ._600\n"
@@ -4089,7 +4089,7 @@ void debug_sub_8010CAC()
"._601:\n"
" .align 2, 0\n"
"._600:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._594:\n"
" ldr r3, ._604\n"
" add r2, r3, #0\n"
@@ -4110,7 +4110,7 @@ void debug_sub_8010CAC()
"._605:\n"
" .align 2, 0\n"
"._604:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._602:\n"
" mov r1, #0x8\n"
" strh r1, [r2]\n"
@@ -4250,11 +4250,11 @@ void debug_sub_8010CAC()
"._619:\n"
" .align 2, 0\n"
"._618:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_030043A0\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004360\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
" .word gMain\n"
" .word ._620\n"
"._620:\n"
@@ -4287,7 +4287,7 @@ void debug_sub_8010CAC()
"._629:\n"
" .align 2, 0\n"
"._628:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_030043A4\n"
"._624:\n"
" ldr r1, ._631\n"
@@ -4298,7 +4298,7 @@ void debug_sub_8010CAC()
"._632:\n"
" .align 2, 0\n"
"._631:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._625:\n"
" ldr r3, ._635\n"
" add r2, r3, #0\n"
@@ -4319,7 +4319,7 @@ void debug_sub_8010CAC()
"._636:\n"
" .align 2, 0\n"
"._635:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._633:\n"
" mov r1, #0x0\n"
" strh r1, [r2]\n"
@@ -4456,11 +4456,11 @@ void debug_sub_8010CAC()
"._651:\n"
" .align 2, 0\n"
"._650:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_030043A0\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004360\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
" .word gMain\n"
"._648:\n"
" mov r4, r8\n"
@@ -4492,9 +4492,9 @@ void debug_sub_8010CAC()
"._656:\n"
" .align 2, 0\n"
"._655:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004360\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
"._657:\n"
" add r0, r5, #6\n"
" add r0, r1, r0\n"
@@ -4614,9 +4614,9 @@ void debug_sub_8010CAC()
"._669:\n"
" .align 2, 0\n"
"._668:\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004360\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
"._670:\n"
" ldrh r0, [r3]\n"
" sub r0, r0, r1\n"
@@ -4913,9 +4913,9 @@ void debug_sub_8011498()
" .word gMain\n"
" .word debug_sub_8010CAC+1\n"
" .word gUnknown_Debug_030043A8\n"
- " .word gUnknown_02023A14+0xde\n"
+ " .word gUnknown_Debug_2023B02\n"
" .word gUnknown_Debug_03004360\n"
- " .word UnkDebug0+0x1ac\n"
+ " .word gUnknown_Debug_821F564\n"
"._689:\n"
" add r0, r6, #6\n"
" add r0, r2, r0\n"
@@ -4988,10 +4988,10 @@ void debug_sub_8011498()
" .align 2, 0\n"
"._692:\n"
" .word gMain\n"
- " .word gUnknown_02023A14+0xde\n"
+ " .word gUnknown_Debug_2023B02\n"
" .word gUnknown_Debug_030043A8\n"
" .word gUnknown_Debug_03004360\n"
- " .word UnkDebug0+0x1ac\n"
+ " .word gUnknown_Debug_821F564\n"
"._694:\n"
" ldrh r0, [r4]\n"
" sub r0, r0, r1\n"
@@ -5156,10 +5156,10 @@ void debug_sub_801174C()
" .word gUnknown_020297ED\n"
" .word gSaveBlock2\n"
" .word str_821F631\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gBattleTypeFlags\n"
- " .word UnkDebug0+0x1e0\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_Debug_821F598\n"
+ " .word gUnknown_02023A14_50\n"
" .word gBattleTerrain\n"
" .word gTrainerBattleOpponent\n"
" .word gPlayerPartyCount\n"
@@ -5272,8 +5272,8 @@ void debug_sub_801174C()
" .align 2, 0\n"
"._719:\n"
" .word gEnemyParty\n"
- " .word gUnknown_02023A14+0x52\n"
- " .word gUnknown_02023A14+0x56\n"
+ " .word gUnknown_Debug_2023A76\n"
+ " .word gUnknown_Debug_2023A7A\n"
"._717:\n"
" mov r2, #0x0\n"
" ldsh r0, [r0, r2]\n"
@@ -5316,7 +5316,7 @@ void debug_sub_801174C()
" .align 2, 0\n"
"._726:\n"
" .word gEnemyParty\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._723:\n"
" cmp r0, #0x2\n"
" beq ._728 @cond_branch\n"
@@ -5429,10 +5429,10 @@ void debug_sub_801174C()
" .align 2, 0\n"
"._741:\n"
" .word gPlayerParty\n"
- " .word gUnknown_02023A14+0x98\n"
+ " .word gUnknown_Debug_2023ABC\n"
" .word gPlayerPartyCount\n"
- " .word gUnknown_02023A14+0x9c\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023AC0\n"
+ " .word gUnknown_Debug_2023A76\n"
"._739:\n"
" mov r1, #0x0\n"
" ldsh r0, [r0, r1]\n"
@@ -5574,14 +5574,14 @@ void debug_sub_801174C()
" .align 2, 0\n"
"._750:\n"
" .word gPlayerParty\n"
- " .word gUnknown_02023A14+0x98\n"
+ " .word gUnknown_Debug_2023ABC\n"
" .word Str_821F649\n"
- " .word gUnknown_02023A14+0x50\n"
- " .word gUnknown_02023A14+0xde\n"
+ " .word gUnknown_02023A14_50\n"
+ " .word gUnknown_Debug_2023B02\n"
" .word gEnemyParty\n"
" .word gBattleMoves+0x4\n"
- " .word gUnknown_02023A14+0x10e\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023B32\n"
+ " .word gUnknown_Debug_2023A76\n"
"._748:\n"
" cmp r0, #0x7\n"
" bne ._752 @cond_branch\n"
@@ -5592,7 +5592,7 @@ void debug_sub_801174C()
"._755:\n"
" .align 2, 0\n"
"._754:\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
"._752:\n"
" cmp r0, #0x6\n"
" bne ._756 @cond_branch\n"
@@ -5614,8 +5614,8 @@ void debug_sub_801174C()
"._760:\n"
" .align 2, 0\n"
"._759:\n"
- " .word gUnknown_02023A14+0x50\n"
- " .word +0x2000000\n"
+ " .word gUnknown_02023A14_50\n"
+ " .word gSharedMem\n"
" .word 0x160a3\n"
"._757:\n"
" ldr r0, ._762\n"
@@ -5625,7 +5625,7 @@ void debug_sub_801174C()
"._763:\n"
" .align 2, 0\n"
"._762:\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x160a3\n"
"._756:\n"
" cmp r0, #0x5\n"
@@ -5642,7 +5642,7 @@ void debug_sub_801174C()
"._767:\n"
" .align 2, 0\n"
"._766:\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
"._764:\n"
" mov r0, #0x1\n"
" and r0, r0, r1\n"
@@ -5772,11 +5772,11 @@ void debug_sub_801174C()
"._773:\n"
" .align 2, 0\n"
"._772:\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
" .word gMain\n"
" .word debug_sub_80108B8+1\n"
" .word unref_sub_800D684+1\n"
- " .word UnkDebug0+0x1f4\n"
+ " .word gUnknown_Debug_821F5AC\n"
"\n"
);
}
@@ -5834,7 +5834,7 @@ void debug_sub_8011D40()
" .align 2, 0\n"
"._774:\n"
" .word 0x40000d4\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x6004000\n"
" .word 0x80000800\n"
" .word gBattle_BG0_X\n"
@@ -6121,9 +6121,9 @@ void debug_sub_8011EA0()
" .align 2, 0\n"
"._823:\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
" .word gUnknown_Debug_03004370\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004360\n"
" .word gSpeciesNames\n"
"._817:\n"
@@ -6147,7 +6147,7 @@ void debug_sub_8011EA0()
" .align 2, 0\n"
"._826:\n"
" .word gBattleTextBuff1\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004360\n"
"._814:\n"
" mov r0, #0x0\n"
@@ -6226,9 +6226,9 @@ void debug_sub_8011EA0()
"._830:\n"
" .word gUnknown_Debug_03004370\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
" .word gUnknown_Debug_03004360\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
"._828:\n"
" ldr r1, ._833\n"
" mov r0, sl\n"
@@ -6257,10 +6257,10 @@ void debug_sub_8011EA0()
"._834:\n"
" .align 2, 0\n"
"._833:\n"
- " .word UnkDebug0+0x26c\n"
+ " .word Str_821F624\n"
" .word gUnknown_Debug_03004370\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
"._816:\n"
" mov r0, #0x0\n"
" mov r1, #0x4\n"
@@ -6308,8 +6308,8 @@ void debug_sub_8011EA0()
"._839:\n"
" .word gUnknown_Debug_03004370\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x6c\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_821F424\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004360\n"
"._836:\n"
" cmp r0, #0x2\n"
@@ -6373,7 +6373,7 @@ void debug_sub_8011EA0()
"._849:\n"
" .word gBattleTextBuff1\n"
" .word gUnknown_Debug_03004370\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
"._815:\n"
" ldr r6, ._851\n"
" ldr r3, ._851 + 4\n"
@@ -6422,10 +6422,10 @@ void debug_sub_8011EA0()
" .align 2, 0\n"
"._851:\n"
" .word gBattleTextBuff1\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004360\n"
" .word gUnknown_Debug_03004370\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
"\n"
);
}
@@ -6572,12 +6572,12 @@ void debug_sub_8012294()
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004370\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x1ac\n"
+ " .word gUnknown_Debug_821F564\n"
" .word gUnknown_Debug_030043A8\n"
- " .word UnkDebug0+0x1ae\n"
- " .word UnkDebug0+0x1b0\n"
+ " .word gUnknown_Debug_821F566\n"
+ " .word gUnknown_Debug_821F568\n"
" .word gUnknown_Debug_03004360\n"
- " .word gUnknown_02023A14+0xde\n"
+ " .word gUnknown_Debug_2023B02\n"
" .word gMoveNames\n"
"\n"
);
@@ -6700,9 +6700,9 @@ void debug_sub_80123D8()
"._858:\n"
" .word gUnknown_Debug_03004370\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x1d4\n"
+ " .word gUnknown_Debug_821F58C\n"
" .word gUnknown_Debug_03004360\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gBaseStats\n"
" .word gAbilityNames\n"
"._856:\n"
@@ -6745,7 +6745,7 @@ void debug_sub_80123D8()
" .word gBattleTextBuff1\n"
" .word gAbilityNames\n"
" .word gUnknown_Debug_03004370\n"
- " .word UnkDebug0+0x1d4\n"
+ " .word gUnknown_Debug_821F58C\n"
"\n"
);
}
@@ -6792,9 +6792,9 @@ void debug_sub_8012540()
" .align 2, 0\n"
"._862:\n"
" .word gBattleTextBuff1\n"
- " .word gUnknown_02023A14+0x52\n"
+ " .word gUnknown_Debug_2023A76\n"
" .word gUnknown_Debug_03004370\n"
- " .word UnkDebug0+0x6c\n"
+ " .word gUnknown_Debug_821F424\n"
"\n"
);
}
@@ -6839,8 +6839,8 @@ void debug_sub_80125A0()
"._865:\n"
" .align 2, 0\n"
"._864:\n"
- " .word +0x2000000\n"
- " .word UnkDebug0+0x2c8\n"
+ " .word gSharedMem\n"
+ " .word gUnknown_Debug_821F680\n"
" .word gUnknown_Debug_030043A0\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004360\n"
@@ -6879,8 +6879,8 @@ void debug_sub_80125E4()
"._867:\n"
" .align 2, 0\n"
"._866:\n"
- " .word +0x2000000\n"
- " .word UnkDebug0+0x2c8\n"
+ " .word gSharedMem\n"
+ " .word gUnknown_Debug_821F680\n"
" .word gUnknown_Debug_030043A0\n"
" .word gUnknown_Debug_030043A4\n"
" .word gUnknown_Debug_03004360\n"
@@ -6910,8 +6910,8 @@ void debug_sub_8012628()
"._869:\n"
" .align 2, 0\n"
"._868:\n"
- " .word +0x2000000\n"
- " .word UnkDebug0+0x3e0\n"
+ " .word gSharedMem\n"
+ " .word gUnknown_Debug_821F798\n"
" .word gUnknown_Debug_030043A8\n"
" .word gUnknown_Debug_03004360\n"
"\n"
@@ -6940,8 +6940,8 @@ void debug_sub_8012658()
"._871:\n"
" .align 2, 0\n"
"._870:\n"
- " .word +0x2000000\n"
- " .word UnkDebug0+0x3e0\n"
+ " .word gSharedMem\n"
+ " .word gUnknown_Debug_821F798\n"
" .word gUnknown_Debug_030043A8\n"
" .word gUnknown_Debug_03004360\n"
"\n"
@@ -7126,7 +7126,7 @@ void debug_sub_8012688()
"._874:\n"
" .align 2, 0\n"
"._873:\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word 0x40000d4\n"
" .word 0x85006000\n"
" .word 0x400004c\n"
@@ -7341,8 +7341,8 @@ void debug_sub_8012938()
"._880:\n"
" .word gUnknown_03004210\n"
" .word gBattleTextBuff1\n"
- " .word UnkDebug0+0x400\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word Str_821F7B8\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word gCurrentMove\n"
" .word gSprites\n"
" .word gTasks\n"
@@ -7444,7 +7444,7 @@ void debug_sub_80129F8()
" .word gMonPaletteTable\n"
" .word gSprites\n"
" .word gTasks\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
"\n"
);
}
@@ -7638,7 +7638,7 @@ void debug_sub_8012B70()
"._901:\n"
" .word gTasks\n"
" .word gUnknown_03004210\n"
- " .word UnkDebug0+0x422\n"
+ " .word Str_821F7DA\n"
"\n"
);
}
@@ -7762,7 +7762,7 @@ void debug_sub_8012C08()
" .align 2, 0\n"
"._907:\n"
" .word gTasks\n"
- " .word UnkDebug0+0x432\n"
+ " .word Str_821F7EA\n"
" .word gUnknown_03004210\n"
" .word BattleText_YesNo\n"
"\n"
@@ -7833,7 +7833,7 @@ void debug_sub_8012D10()
" .align 2, 0\n"
"._920:\n"
" .word gUnknown_03004210\n"
- " .word UnkDebug0+0x405\n"
+ " .word Str_821F7BD\n"
" .word gTasks\n"
"._915:\n"
" ldr r2, ._924\n"
@@ -7988,7 +7988,7 @@ void debug_sub_8012D10()
"._953:\n"
" .align 2, 0\n"
"._952:\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word gCurrentMove\n"
"._939:\n"
" mov r0, #0x1\n"
@@ -8059,7 +8059,7 @@ void debug_sub_8012D10()
"._974:\n"
" .align 2, 0\n"
"._973:\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word gCurrentMove\n"
"._968:\n"
" ldr r1, ._977\n"
@@ -8135,7 +8135,7 @@ void debug_sub_8012D10()
"._996:\n"
" .align 2, 0\n"
"._995:\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word gCurrentMove\n"
"._983:\n"
" mov r0, #0x1\n"
@@ -8218,7 +8218,7 @@ void debug_sub_8012D10()
"._1021:\n"
" .align 2, 0\n"
"._1020:\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word gCurrentMove\n"
"._1018:\n"
" strb r3, [r2]\n"
@@ -8372,7 +8372,7 @@ void debug_sub_8012D10()
" .align 2, 0\n"
"._1050:\n"
" .word gTasks\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word 0x19b\n"
"._1047:\n"
" mov r0, #0x2\n"
@@ -8458,7 +8458,7 @@ void debug_sub_8012D10()
" .align 2, 0\n"
"._1065:\n"
" .word gTasks\n"
- " .word gUnknown_02023A14+0x13e\n"
+ " .word gUnknown_Debug_2023B62\n"
" .word 0x19b\n"
"._1062:\n"
" mov r0, #0x2\n"
@@ -8912,7 +8912,7 @@ void debug_sub_80138CC()
" .align 2, 0\n"
"._1167:\n"
" .word gActiveBank\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x160fd\n"
" .word ._1169\n"
"._1169:\n"
@@ -9095,7 +9095,7 @@ void debug_sub_80139E4()
"._1199:\n"
" .align 2, 0\n"
"._1198:\n"
- " .word gUnknown_02023A14+0x50\n"
+ " .word gUnknown_02023A14_50\n"
" .word gActiveBank\n"
" .word gNoOfAllBanks\n"
" .word gBattleMainFunc\n"
@@ -9471,7 +9471,7 @@ void sub_8010874()
" .word gStatuses3\n"
" .word gUnknown_02024C70\n"
" .word gUnknown_02024C5C\n"
- " .word +0x2017100\n"
+ " .word gSharedMem+0x17100\n"
" .word gSideTimers\n"
" .word gSideAffecting\n"
" .word gBankAttacker\n"
@@ -9481,7 +9481,7 @@ void sub_8010874()
" .word gHitMarker\n"
" .word gBattleTypeFlags\n"
" .word gSaveBlock2\n"
- " .word +0x2000000\n"
+ " .word gSharedMem\n"
" .word 0x16084\n"
" .word gMultiHitCounter\n"
" .word gBattleOutcome\n"
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 3415d9337..9fe1f6cb0 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -1090,7 +1090,7 @@ static const u8 sTerrainToType[] =
TYPE_NORMAL, // plain
};
-const u8 sBallCatchBonuses[] =
+static const u8 sBallCatchBonuses[] =
{
20, 15, 10, 15 // Ultra, Great, Poke, Safari
};
@@ -5103,7 +5103,7 @@ static void atk15_seteffectwithchance(void)
._1045:\n\
.word gBattleMoves\n\
.word gCurrentMove\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleCommunication\n\
.word gBattleMoveFlags\n\
._1043:\n\
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index ffc9281e4..87a66c2c7 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -381,7 +381,7 @@ void BattleAI_SetupAIData()
"._17:\n"
" .align 2, 0\n"
"._16:\n"
- " .word +0x2016800\n"
+ " .word gSharedMem+0x16800\n"
" .word gActiveBank\n"
" .word gBitTable\n"
" .word +0x2016c00\n"
@@ -410,7 +410,7 @@ void BattleAI_SetupAIData()
"._20:\n"
" .word gBankTarget\n"
" .word gBattleTypeFlags\n"
- " .word +0x2016800\n"
+ " .word gSharedMem+0x16800\n"
"._18:\n"
" mov r2, #0x80\n"
" lsl r2, r2, #0x3\n"
@@ -425,7 +425,7 @@ void BattleAI_SetupAIData()
"._25:\n"
" .align 2, 0\n"
"._24:\n"
- " .word +0x2016800\n"
+ " .word gSharedMem+0x16800\n"
"._22:\n"
" mov r0, #0x10\n"
" and r0, r0, r1\n"
@@ -438,7 +438,7 @@ void BattleAI_SetupAIData()
"._29:\n"
" .align 2, 0\n"
"._28:\n"
- " .word +0x2016800\n"
+ " .word gSharedMem+0x16800\n"
"._26:\n"
" mov r0, #0x90\n"
" lsl r0, r0, #0x4\n"
@@ -460,7 +460,7 @@ void BattleAI_SetupAIData()
" .align 2, 0\n"
"._33:\n"
" .word gTrainerBattleOpponent\n"
- " .word +0x2016800\n"
+ " .word gSharedMem+0x16800\n"
"._31:\n"
" ldr r3, ._36\n"
" ldr r2, ._36 + 4\n"
@@ -489,10 +489,10 @@ void BattleAI_SetupAIData()
"._37:\n"
" .align 2, 0\n"
"._36:\n"
- " .word +0x2016800\n"
+ " .word gSharedMem+0x16800\n"
" .word gTrainers\n"
- " .word gUnknown_02023A14+0x50\n"
- " .word gUnknown_02023A14+0x4c\n"
+ " .word gUnknown_02023A14_50\n"
+ " .word gUnknown_02023A14_4C\n"
"\n"
);
}
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index cc69c0120..d2045b6c4 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -1232,7 +1232,7 @@ void OpponentHandleTrainerThrow(void)
._481:\n\
.align 2, 0\n\
._480:\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word +0x2000000\n\
.word 0x160a3\n\
._478:\n\
@@ -1718,8 +1718,8 @@ void OpponentHandlecmd20(void)
.align 2, 0\n\
._549:\n\
.word gActiveBank\n\
- .word gUnknown_02023A64\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gBattleBufferA+4\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleMoves\n\
.word +0x2000000\n\
.word 0x1609e\n\
@@ -1781,7 +1781,7 @@ void OpponentHandlecmd20(void)
.align 2, 0\n\
._559:\n\
.word gBattleTypeFlags\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
._556:\n\
bl Random\n\
add r1, r5, #0\n\
@@ -2048,7 +2048,7 @@ void OpponentHandlecmd20(void)
ldr r6, _0803545C @ =gActiveBank\n\
ldrb r0, [r6]\n\
lsls r0, 9\n\
- ldr r1, _08035460 @ =gUnknown_02023A64\n\
+ ldr r1, _08035460 @ =gBattleBufferA+4\n\
adds r5, r0, r1\n\
ldr r0, _08035464 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
@@ -2070,7 +2070,7 @@ void OpponentHandlecmd20(void)
b _0803546C\n\
.align 2, 0\n\
_0803545C: .4byte gActiveBank\n\
-_08035460: .4byte gUnknown_02023A64\n\
+_08035460: .4byte gBattleBufferA+4\n\
_08035464: .4byte gBattleTypeFlags\n\
_08035468:\n\
movs r0, 0x1\n\
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index cbca4a586..8875d5148 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -674,7 +674,7 @@ void sub_802C68C(void)
.align 2, 0\n\
._131:\n\
.word gActiveBank\n\
- .word gUnknown_02023A64\n\
+ .word gBattleBufferA+4\n\
.word gMain\n\
.word gMoveSelectionCursor\n\
._128:\n\
@@ -1328,7 +1328,7 @@ void sub_802C68C(void)
.word gPlayerParty\n\
.word gMoveNames\n\
.word gDisplayedStringBattle\n\
- .word sBallCatchBonuses+0x4\n\
+ .word gString_TurnJP\n\
.word gAnimMoveTurn\n\
.word gSprites\n\
.word gOamMatrixAllocBitmap\n\
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c
index 4fce958fa..9dd1d7b53 100644
--- a/src/battle/battle_records.c
+++ b/src/battle/battle_records.c
@@ -275,9 +275,9 @@ void debug_sub_81257E0(void)
._63:\n\
.align 2, 0\n\
._62:\n\
- .word gUnknown_083F8410+0xa\n\
+ .word gUnknown_Debug_4245CC+2\n\
.word gLinkPlayers\n\
- .word gUnknown_083F8410+0x5c\n\
+ .word gUnknown_Debug_8424620\n\
.word gLinkPlayerMapObjects\n\
.word gSaveBlock1+0x30b8");
}
diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c
index 817382911..620e0690a 100644
--- a/src/battle/battle_util.c
+++ b/src/battle/battle_util.c
@@ -3255,7 +3255,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
._1079:\n\
.align 2, 0\n\
._1078:\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleMoveFlags\n\
.word gBattleMons\n\
.word gBankAttacker\n\
@@ -3465,7 +3465,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
._1112:\n\
.align 2, 0\n\
._1111:\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleMoveFlags\n\
.word gBattleMons\n\
.word gBankAttacker\n\
@@ -3660,7 +3660,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
._1143:\n\
.align 2, 0\n\
._1142:\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleMoveFlags\n\
.word gBattleMons\n\
.word gBankAttacker\n\
@@ -3855,7 +3855,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
._1174:\n\
.align 2, 0\n\
._1173:\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleMoveFlags\n\
.word gBattleMons\n\
.word gBankAttacker\n\
@@ -4118,7 +4118,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
._1218:\n\
.align 2, 0\n\
._1217:\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
.word gBattleMoveFlags\n\
.word gBattleMons\n\
.word gBankAttacker\n\
@@ -7489,7 +7489,7 @@ u8 IsMonDisobedient(void)
.word gBattleTypeFlags\n\
.word gBankAttacker\n\
.word gBattleMons\n\
- .word gUnknown_02023A14+0x50\n\
+ .word gUnknown_02023A14_50\n\
._1783:\n\
ldr r0, ._1794\n\
bl FlagGet\n\
diff --git a/src/contest.c b/src/contest.c
index 834d641d0..950b26d0c 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -919,7 +919,7 @@ void sub_80ABEA0(u8 taskId)
._180:\n\
.word gDisplayedStringBattle\n\
.word gText_Contest_ButItCantParticipate\n\
- .word +0x2019204\n\
+ .word gSharedMem+0x19204\n\
.word gStringVar4\n\
.word gMenuWindow\n\
.word gBattle_BG0_Y\n\
@@ -939,7 +939,7 @@ void sub_80ABEA0(u8 taskId)
._185:\n\
.align 2, 0\n\
._184:\n\
- .word +0x2019204\n\
+ .word gSharedMem+0x19204\n\
._182:\n\
sub r0, r0, #0x1\n\
b ._186\n\
@@ -957,7 +957,7 @@ void sub_80ABEA0(u8 taskId)
._190:\n\
.align 2, 0\n\
._189:\n\
- .word +0x2019204\n\
+ .word gSharedMem+0x19204\n\
._187:\n\
add r0, r1, #1\n\
._186:\n\
@@ -987,7 +987,7 @@ void sub_80ABEA0(u8 taskId)
._194:\n\
.align 2, 0\n\
._193:\n\
- .word +0x2019204\n\
+ .word gSharedMem+0x19204\n\
.word gContestMons\n\
.word gContestPlayerMonIndex\n\
._168:\n\
@@ -1445,7 +1445,7 @@ void debug_sub_80BA054()
._263:\n\
.align 2, 0\n\
._262:\n\
- .word +0x2019348\n\
+ .word gSharedMem+0x19348\n\
.word gBattleMonForms\n\
.word gContestPlayerMonIndex\n\
.word gContestMons\n\
@@ -1501,7 +1501,7 @@ void debug_sub_80BA054()
.word gSprites\n\
.word SpriteCallbackDummy+1\n\
.word gContestPlayerMonIndex\n\
- .word +0x2019260\n\
+ .word gSharedMem+0x19260\n\
._241:\n\
ldr r0, ._273\n\
ldr r0, [r0]\n\
@@ -1535,7 +1535,7 @@ void debug_sub_80BA054()
.word gAnimScriptCallback\n\
.word gAnimScriptActive\n\
.word gContestPlayerMonIndex\n\
- .word +0x2019204\n\
+ .word gSharedMem+0x19204\n\
.word gTasks\n\
._271:\n\
ldr r0, ._276\n\
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c
index a932fee8d..bdfc8f9c5 100644
--- a/src/debug/nohara_debug_menu.c
+++ b/src/debug/nohara_debug_menu.c
@@ -1,9 +1,9 @@
#if DEBUG
#include "global.h"
-#define BSS_DATA __attribute__((section(".bss")))
-
-BSS_DATA u8 gDebug_03000724[4] = { 0 };
+__attribute__((unused)) static u8 gDebug_03000724;
+__attribute__((unused)) static u8 gDebug_03000725;
+__attribute__((unused)) static u8 gDebug_03000726;
__attribute__((naked))
void InitNoharaDebugMenu()
@@ -127,7 +127,7 @@ void NoharaDebugMenu_TV()
"._9:\n"
" .align 2, 0\n"
"._8:\n"
- " .word gDebug_03000724+0x2\n"
+ " .word gDebug_03000726\n"
" .word gUnknown_Debug_083C4B8C\n"
" .word gMenuCallback\n"
" .word debug_sub_808F4AC+1\n"
@@ -414,7 +414,7 @@ void debug_sub_808F648()
" .align 2, 0\n"
"._35:\n"
" .word gMain\n"
- " .word gDebug_03000724+0x2\n"
+ " .word gDebug_03000726\n"
"._33:\n"
" bl debug_sub_808F6BC\n"
" b ._40\n"
@@ -933,7 +933,7 @@ void debug_sub_808F93C()
" .align 2, 0\n"
"._83:\n"
" .word gMain\n"
- " .word gDebug_03000724+0x1\n"
+ " .word gDebug_03000725\n"
" .word gDebug_03000724\n"
" .word gUnknown_Debug_083C4ABD+0xf\n"
" .word gStringVar1\n"
@@ -1671,7 +1671,7 @@ void debug_sub_808FF3C()
" .align 2, 0\n"
"._192:\n"
" .word gMain\n"
- " .word gDebug_03000724+0x1\n"
+ " .word gDebug_03000725\n"
" .word gDebug_03000724\n"
" .word gUnknown_Debug_083C4B20+0x4\n"
" .word gStringVar1\n"
diff --git a/src/engine/link.c b/src/engine/link.c
index 5785a5a56..eb0ae4731 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -147,6 +147,9 @@ void (*gLinkCallback)(void);
struct LinkPlayer gSavedLinkPlayers[MAX_LINK_PLAYERS];
u8 gShouldAdvanceLinkState;
u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS];
+#if DEBUG
+u8 gUnknown_Debug_30030E0;
+#endif
u8 gBlockRequestType;
u8 gLastSendQueueCount;
struct Link gLink;
@@ -158,11 +161,11 @@ u8 deUnkValue1;
u8 deUnkValue2;
#endif
-EWRAM_DATA bool8 gLinkTestDebugValuesEnabled = {0};
-EWRAM_DATA bool8 gLinkTestDummyBool = {0};
-EWRAM_DATA u32 gFiller_20238B8 = {0};
-EWRAM_DATA u32 dword_20238BC = {0};
-EWRAM_DATA bool8 gLinkOpen = {0};
+EWRAM_DATA bool8 gLinkTestDebugValuesEnabled = 0;
+EWRAM_DATA bool8 gLinkTestDummyBool = 0;
+EWRAM_DATA u32 gFiller_20238B8 = 0;
+EWRAM_DATA u32 dword_20238BC = 0;
+EWRAM_DATA bool8 gLinkOpen = 0;
static const u16 sLinkTestDigitPalette[] = INCBIN_U16("graphics/interface/link_test_digits.gbapal");
static const u32 sLinkTestDigitTiles[] = INCBIN_U32("graphics/interface/link_test_digits.4bpp");
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index c80a8f3e9..2e526bb4a 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -602,7 +602,7 @@ void debug_sub_815D1D8()
" .align 2, 0\n"
"._161:\n"
" .word gPaletteFade\n"
- " .word gLinkTestBlockChecksums+0x8\n"
+ " .word gUnknown_Debug_30030E0\n"
" .word Str_843DA70\n"
" .word 0x43c\n"
"._144:\n"
diff --git a/src/field/berry.c b/src/field/berry.c
index d6982479e..5c1ecd699 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -1245,8 +1245,8 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
" .word 0x3170\n"
" .word 0x47f\n"
" .word 0x317c\n"
- " .word gSpriteImage_83C172C+0x80\n"
- " .word gSpriteImage_83C172C+0x500\n"
+ " .word gSpriteImage_UnusedCherry\n"
+ " .word gSpritePalette_UnusedCherry\n"
" .word 0x35fc\n"
" .word gSaveBlock1+0x3676\n"
" .word gUnknown_Debug_839B6CE\n"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index cf96b2e87..c411bf20b 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -43,7 +43,10 @@ struct WeatherCallbacks
EWRAM_DATA struct Weather gWeather = {0};
EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0};
-EWRAM_DATA u16 gUnknown_0202FF58 = {0};
+EWRAM_DATA u16 gUnknown_0202FF58 = 0;
+#if DEBUG
+EWRAM_DATA u16 gUnknown_Debug_20301FE = 0;
+#endif
static const u8 *sPaletteGammaTypes;
@@ -1297,7 +1300,7 @@ u8 debug_sub_8085564(void)
.align 2, 0\n\
._375:\n\
.word gMain\n\
- .word gUnknown_0202FF58+0x2\n\
+ .word gUnknown_Debug_20301FE\n\
._373:\n\
mov r0, #0xe\n\
._374:\n\
@@ -1333,7 +1336,7 @@ u8 debug_sub_8085564(void)
.align 2, 0\n\
._380:\n\
.word gDebugText_Weather\n\
- .word gUnknown_0202FF58+0x2\n\
+ .word gUnknown_Debug_20301FE\n\
.word gMain\n\
._378:\n\
ldr r0, ._382\n\
@@ -1347,7 +1350,7 @@ u8 debug_sub_8085564(void)
._383:\n\
.align 2, 0\n\
._382:\n\
- .word gUnknown_0202FF58+0x2");
+ .word gUnknown_Debug_20301FE");
}
__attribute__((naked))
@@ -1386,7 +1389,7 @@ u8 debug_sub_808560C(void)
._385:\n\
.align 2, 0\n\
._384:\n\
- .word gUnknown_0202FF58+0x2\n\
+ .word gUnknown_Debug_20301FE\n\
.word gWeather\n\
.word gDebugText_Weather\n\
.word gMenuCallback\n\
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index b5b13c533..99770f6e3 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -226,6 +226,15 @@ static void sub_81064B8(void);
static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4);
static void sub_81065DC(void);
+#if DEBUG
+__attribute__((section(".bss"))) u8 unk_debug_bss_1_0 = 0;
+__attribute__((section(".bss"))) u8 unk_debug_bss_1_1 = 0;
+__attribute__((section(".bss"))) u8 unk_debug_bss_1_2 = 0;
+__attribute__((section(".bss"))) u8 unk_debug_bss_1_3 = 0;
+__attribute__((section(".bss"))) u8 unk_debug_bss_1_4 = 0;
+__attribute__((section(".bss"))) u32 unk_debug_bss_1_8 = 0;
+#endif
+
static const struct UnkStruct1 *const gUnknown_083ED048[];
static const u16 gPalette_83EDE24[];
static const u8 gUnknown_083ECD04[][3];
@@ -252,7 +261,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
._2:\n\
.align 2, 0\n\
._1:\n\
- .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1_1\n\
.word CB2_SlotMachineSetup+1");
}
#else
@@ -282,7 +291,7 @@ void debug_sub_811609C()
._4:\n\
.align 2, 0\n\
._3:\n\
- .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1_1\n\
.word CB2_SlotMachineSetup+1");
}
#endif
@@ -544,7 +553,7 @@ static void SlotMachineSetup_0_1(void)
.word gSaveBlock1\n\
.word 0x494\n\
.word gUnknown_083ECCF8\n\
- .word unk_debug_bss_1+0x1");
+ .word unk_debug_bss_1_1");
}
#else
static void SlotMachineSetup_0_1(void)
@@ -744,8 +753,8 @@ static bool8 sub_8101E10(struct Task *task)
.align 2, 0\n\
._70:\n\
.word +0x2000000\n\
- .word unk_debug_bss_1+0x1\n\
- .word unk_debug_bss_1+0x4\n\
+ .word unk_debug_bss_1_1\n\
+ .word unk_debug_bss_1_4\n\
.word 0x270e");
}
#else
@@ -794,9 +803,9 @@ static bool8 sub_8101E3C(struct Task *task)
._78:\n\
.align 2, 0\n\
._77:\n\
- .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1_1\n\
.word gMain\n\
- .word unk_debug_bss_1+0x4\n\
+ .word unk_debug_bss_1_4\n\
.word +0x2000000\n\
._75:\n\
mov r0, #0x0\n\
@@ -1101,7 +1110,7 @@ static bool8 sub_8101FA4(struct Task *task)
.align 2, 0\n\
._119:\n\
.word +0x2000000\n\
- .word unk_debug_bss_1+0x1");
+ .word unk_debug_bss_1_1");
}
#else
static bool8 sub_8101FA4(struct Task *task)
@@ -1182,9 +1191,9 @@ static bool8 sub_8102034(struct Task *task)
._128:\n\
.align 2, 0\n\
._127:\n\
- .word unk_debug_bss_1+0x1\n\
- .word unk_debug_bss_1+0x4\n\
- .word unk_debug_bss_1+0x8\n\
+ .word unk_debug_bss_1_1\n\
+ .word unk_debug_bss_1_4\n\
+ .word unk_debug_bss_1_8\n\
.word +0x2000000");
}
#else
@@ -1235,9 +1244,9 @@ static bool8 sub_8102058(struct Task *task)
._134:\n\
.align 2, 0\n\
._133:\n\
- .word unk_debug_bss_1+0x1\n\
- .word unk_debug_bss_1+0x4\n\
- .word unk_debug_bss_1+0x8\n\
+ .word unk_debug_bss_1_1\n\
+ .word unk_debug_bss_1_4\n\
+ .word unk_debug_bss_1_8\n\
.word +0x2000000\n\
._130:\n\
ldr r0, ._136\n\
@@ -1322,7 +1331,7 @@ static bool8 sub_8102090(struct Task *task)
.align 2, 0\n\
._146:\n\
.word +0x2000000\n\
- .word unk_debug_bss_1\n\
+ .word unk_debug_bss_1_0\n\
._143:\n\
cmp r0, #0x4\n\
beq ._148 @cond_branch\n\
@@ -1821,7 +1830,7 @@ static bool8 sub_8102424(struct Task *task)
._235:\n\
.align 2, 0\n\
._234:\n\
- .word unk_debug_bss_1+0x1\n\
+ .word unk_debug_bss_1_1\n\
.word gSaveBlock1\n\
.word +0x2000000\n\
.word 0x494");
@@ -1980,9 +1989,9 @@ static void sub_8102484(void)
.align 2, 0\n\
._256:\n\
.word +0x2000000\n\
- .word unk_debug_bss_1+0x1\n\
- .word unk_debug_bss_1+0x2\n\
- .word unk_debug_bss_1+0x3\n\
+ .word unk_debug_bss_1_1\n\
+ .word unk_debug_bss_1_2\n\
+ .word unk_debug_bss_1_3\n\
._245:\n\
add r5, r4, #0\n\
ldrb r1, [r5, #0x4]\n\
@@ -4047,11 +4056,6 @@ static void sub_8104C5C(void)
static void LoadSlotMachineWheelOverlay(void);
-#if DEBUG
-// should be static
-__attribute__((section(".bss"))) u8 unk_debug_bss_1[0xC] = { 0 };
-#endif
-
static void sub_8104CAC(u8 arg0)
{
u8 i;
@@ -5186,8 +5190,8 @@ void debug_sub_811B1C4()
".__2_:\n"
" .align 2, 0\n"
".__1_:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5212,8 +5216,8 @@ void debug_sub_811B1EC()
".__4:\n"
" .align 2, 0\n"
".__3:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5240,8 +5244,8 @@ void debug_sub_811B210()
".__6:\n"
" .align 2, 0\n"
".__5:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5268,8 +5272,8 @@ void debug_sub_811B238()
".__8:\n"
" .align 2, 0\n"
".__7:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5296,8 +5300,8 @@ void debug_sub_811B260()
".__10:\n"
" .align 2, 0\n"
".__9:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5324,8 +5328,8 @@ void debug_sub_811B288()
".__12:\n"
" .align 2, 0\n"
".__11:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5352,8 +5356,8 @@ void debug_sub_811B2B0()
".__14:\n"
" .align 2, 0\n"
".__13:\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_0\n"
"\n"
);
}
@@ -5371,7 +5375,7 @@ void debug_sub_811B2D8()
".__16:\n"
" .align 2, 0\n"
".__15:\n"
- " .word unk_debug_bss_1+0x3\n"
+ " .word unk_debug_bss_1_3\n"
"\n"
);
}
@@ -5650,7 +5654,7 @@ void debug_sub_811B310()
".__30:\n"
" .word Str_841B249\n"
" .word +0x2000000\n"
- " .word unk_debug_bss_1\n"
+ " .word unk_debug_bss_1_0\n"
".__27:\n"
" cmp r0, #0x4\n"
" beq .__32 @cond_branch\n"
@@ -5765,10 +5769,10 @@ void debug_sub_811B5D0()
".__52:\n"
" .align 2, 0\n"
".__51:\n"
- " .word unk_debug_bss_1\n"
- " .word unk_debug_bss_1+0x2\n"
- " .word unk_debug_bss_1+0x3\n"
- " .word unk_debug_bss_1+0x4\n"
+ " .word unk_debug_bss_1_0\n"
+ " .word unk_debug_bss_1_2\n"
+ " .word unk_debug_bss_1_3\n"
+ " .word unk_debug_bss_1_4\n"
" .word +0x2000000\n"
"\n"
);
@@ -5994,11 +5998,11 @@ void debug_sub_811B654()
".__92:\n"
" .align 2, 0\n"
".__91:\n"
- " .word unk_debug_bss_1+0x2\n"
- " .word unk_debug_bss_1+0x3\n"
+ " .word unk_debug_bss_1_2\n"
+ " .word unk_debug_bss_1_3\n"
" .word Str_841B254\n"
" .word _841B270\n"
- " .word unk_debug_bss_1+0x4\n"
+ " .word unk_debug_bss_1_4\n"
".__66:\n"
" bl Menu_ProcessInput\n"
" lsl r0, r0, #0x18\n"
@@ -6027,7 +6031,7 @@ void debug_sub_811B654()
".__97:\n"
" .align 2, 0\n"
".__96:\n"
- " .word unk_debug_bss_1+0x2\n"
+ " .word unk_debug_bss_1_2\n"
" .word _841B270\n"
".__68:\n"
" ldr r2, .__100\n"
@@ -6183,7 +6187,7 @@ void debug_sub_811B894()
" .word +0x2000000\n"
" .word 0x270f\n"
" .word Str_841B2B0\n"
- " .word unk_debug_bss_1+0x4\n"
+ " .word unk_debug_bss_1_4\n"
" .word Str_841B2D3\n"
".__117:\n"
" lsl r0, r2, #0x10\n"
@@ -6373,7 +6377,7 @@ void debug_sub_811B894()
" .align 2, 0\n"
".__163:\n"
" .word Str_841B2E4\n"
- " .word unk_debug_bss_1+0x4\n"
+ " .word unk_debug_bss_1_4\n"
" .word +0x2000000\n"
" .word Str_841B2BF\n"
"\n"
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index f9e2beccb..b292e80c4 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -497,7 +497,7 @@ void sub_80EBDD8()
._65:\n\
.align 2, 0\n\
._64:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._66\n\
._66:\n\
.word ._67\n\
@@ -543,7 +543,7 @@ void sub_80EBDD8()
._87:\n\
.align 2, 0\n\
._86:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6ddc\n\
.word 0x6dae\n\
._68:\n\
@@ -570,7 +570,7 @@ void sub_80EBDD8()
._92:\n\
.align 2, 0\n\
._91:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._70:\n\
bl sub_80F2598\n\
ldr r1, ._94\n\
@@ -581,7 +581,7 @@ void sub_80EBDD8()
._95:\n\
.align 2, 0\n\
._94:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._71:\n\
bl sub_80EEE20\n\
ldr r1, ._99\n\
@@ -607,7 +607,7 @@ void sub_80EBDD8()
._100:\n\
.align 2, 0\n\
._99:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._73:\n\
mov r0, #0x0\n\
bl sub_80EF248\n\
@@ -630,7 +630,7 @@ void sub_80EBDD8()
._105:\n\
.align 2, 0\n\
._104:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._75:\n\
mov r0, #0x0\n\
bl sub_80F1B8C\n\
@@ -655,7 +655,7 @@ void sub_80EBDD8()
._109:\n\
.align 2, 0\n\
._108:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._77:\n\
ldr r0, ._111\n\
bl SetVBlankCallback\n\
@@ -680,7 +680,7 @@ void sub_80EBDD8()
._115:\n\
.align 2, 0\n\
._114:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._79:\n\
mov r0, #0x0\n\
bl sub_80EED2C\n\
@@ -692,7 +692,7 @@ void sub_80EBDD8()
._118:\n\
.align 2, 0\n\
._117:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._80:\n\
ldr r0, ._121\n\
ldrb r1, [r0, #0x7]\n\
@@ -732,7 +732,7 @@ void sub_80EBDD8()
._126:\n\
.align 2, 0\n\
._125:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._83:\n\
bl sub_80F1DF0\n\
._110:\n\
@@ -748,7 +748,7 @@ void sub_80EBDD8()
._129:\n\
.align 2, 0\n\
._128:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._84:\n\
bl sub_80F1E50\n\
lsl r0, r0, #0x18\n\
@@ -895,7 +895,7 @@ void sub_80EC00C()
._137:\n\
.align 2, 0\n\
._136:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._138\n\
._138:\n\
.word ._139\n\
@@ -945,7 +945,7 @@ void sub_80EC00C()
.align 2, 0\n\
._156:\n\
.word sub_80EBD80+1\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6ddc\n\
.word 0x6dad\n\
.word 0x6dae\n\
@@ -975,7 +975,7 @@ void sub_80EC00C()
._162:\n\
.align 2, 0\n\
._161:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._142:\n\
mov r0, #0x0\n\
bl sub_80F1B8C\n\
@@ -1002,7 +1002,7 @@ void sub_80EC00C()
._167:\n\
.align 2, 0\n\
._166:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._144:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -1041,7 +1041,7 @@ void sub_80EC00C()
._175:\n\
.align 2, 0\n\
._174:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._147:\n\
ldr r0, ._178\n\
ldrb r1, [r0, #0x7]\n\
@@ -1067,7 +1067,7 @@ void sub_80EC00C()
._182:\n\
.align 2, 0\n\
._181:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._149:\n\
mov r0, #0x0\n\
bl sub_80F2C80\n\
@@ -1092,7 +1092,7 @@ void sub_80EC00C()
._186:\n\
.align 2, 0\n\
._185:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._151:\n\
bl sub_80F1DF0\n\
._169:\n\
@@ -1108,7 +1108,7 @@ void sub_80EC00C()
._189:\n\
.align 2, 0\n\
._188:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._152:\n\
bl sub_80F1E50\n\
lsl r0, r0, #0x18\n\
@@ -1139,7 +1139,7 @@ void sub_80EC00C()
._193:\n\
.align 2, 0\n\
._192:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6dad\n\
.word sub_80EC268+1\n\
.word gLinkOpen\n\
@@ -1367,7 +1367,7 @@ void sub_80EC4A0()
._286:\n\
.align 2, 0\n\
._285:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._287\n\
._287:\n\
.word ._288\n\
@@ -1417,7 +1417,7 @@ void sub_80EC4A0()
.align 2, 0\n\
._308:\n\
.word gSaveBlock2\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._290:\n\
bl sub_80EEF34\n\
lsl r0, r0, #0x18\n\
@@ -1444,7 +1444,7 @@ void sub_80EC4A0()
._314:\n\
.align 2, 0\n\
._313:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._291:\n\
ldr r0, ._318\n\
ldrb r1, [r0, #0x7]\n\
@@ -1472,7 +1472,7 @@ void sub_80EC4A0()
._322:\n\
.align 2, 0\n\
._321:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._293:\n\
bl sub_80EF814\n\
b ._336\n\
@@ -1496,7 +1496,7 @@ void sub_80EC4A0()
._327:\n\
.align 2, 0\n\
._326:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._296:\n\
mov r0, #0x4\n\
bl sub_80F2C80\n\
@@ -1514,7 +1514,7 @@ void sub_80EC4A0()
._330:\n\
.align 2, 0\n\
._329:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._298:\n\
bl sub_80F2DD8\n\
ldr r0, ._332\n\
@@ -1528,7 +1528,7 @@ void sub_80EC4A0()
.align 2, 0\n\
._332:\n\
.word sub_80EBD30+1\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._299:\n\
bl sub_8055870\n\
b ._334\n\
@@ -1576,7 +1576,7 @@ void sub_80EC4A0()
.word gLinkOpen\n\
.word 0x60075e0\n\
.word 0x600f800\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._302:\n\
ldr r0, ._341\n\
ldrb r1, [r0, #0x7]\n\
@@ -1709,7 +1709,7 @@ void sub_80EC67C()
._346:\n\
.align 2, 0\n\
._345:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._347\n\
._347:\n\
.word ._348\n\
@@ -1754,7 +1754,7 @@ void sub_80EC67C()
._365:\n\
.align 2, 0\n\
._364:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._359:\n\
mov r0, #0x5\n\
bl PlaySE\n\
@@ -1768,7 +1768,7 @@ void sub_80EC67C()
._368:\n\
.align 2, 0\n\
._367:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._349:\n\
ldr r1, ._371\n\
add r0, r4, r1\n\
@@ -1812,7 +1812,7 @@ void sub_80EC67C()
._379:\n\
.align 2, 0\n\
._378:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6e90\n\
._376:\n\
mov r0, #0xc1\n\
@@ -1836,7 +1836,7 @@ void sub_80EC67C()
._384:\n\
.align 2, 0\n\
._383:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._352:\n\
mov r2, #0xc2\n\
lsl r2, r2, #0x2\n\
@@ -1911,7 +1911,7 @@ void sub_80EC67C()
._389:\n\
.word gPaletteFade\n\
.word gSaveBlock2\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6e90\n\
.word sub_80EC00C+1\n\
.word gLinkOpen\n\
@@ -2110,7 +2110,7 @@ void sub_80ECA10()
._457:\n\
.align 2, 0\n\
._456:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._458\n\
._458:\n\
.word ._459\n\
@@ -2160,7 +2160,7 @@ void sub_80ECA10()
.align 2, 0\n\
._476:\n\
.word sub_80EBD80+1\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6df0\n\
.word 0x6dad\n\
.word 0x6dae\n\
@@ -2190,7 +2190,7 @@ void sub_80ECA10()
._482:\n\
.align 2, 0\n\
._481:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._462:\n\
mov r0, #0x1\n\
bl sub_80F1B8C\n\
@@ -2217,7 +2217,7 @@ void sub_80ECA10()
._487:\n\
.align 2, 0\n\
._486:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._464:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -2256,7 +2256,7 @@ void sub_80ECA10()
._495:\n\
.align 2, 0\n\
._494:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._467:\n\
bl sub_80F2598\n\
b ._496\n\
@@ -2299,7 +2299,7 @@ void sub_80ECA10()
._504:\n\
.align 2, 0\n\
._503:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._471:\n\
bl sub_80F1DF0\n\
._496:\n\
@@ -2315,7 +2315,7 @@ void sub_80ECA10()
._507:\n\
.align 2, 0\n\
._506:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._472:\n\
bl sub_80F1E50\n\
lsl r0, r0, #0x18\n\
@@ -2346,7 +2346,7 @@ void sub_80ECA10()
._511:\n\
.align 2, 0\n\
._510:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6dad\n\
.word sub_80EC86C+1\n\
.word gLinkOpen\n\
@@ -2506,7 +2506,7 @@ void sub_80ECD80()
._565:\n\
.align 2, 0\n\
._564:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._566\n\
._566:\n\
.word ._567\n\
@@ -2587,7 +2587,7 @@ void sub_80ECD80()
._601:\n\
.align 2, 0\n\
._600:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._571:\n\
mov r0, #0x1\n\
bl sub_80F2D6C\n\
@@ -2599,7 +2599,7 @@ void sub_80ECD80()
._604:\n\
.align 2, 0\n\
._603:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._572:\n\
mov r0, #0x5\n\
bl sub_80F2D6C\n\
@@ -2648,7 +2648,7 @@ void sub_80ECD80()
._613:\n\
.align 2, 0\n\
._612:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._576:\n\
mov r0, #0x2\n\
bl sub_80F1B8C\n\
@@ -2675,7 +2675,7 @@ void sub_80ECD80()
._618:\n\
.align 2, 0\n\
._617:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._578:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -2719,7 +2719,7 @@ void sub_80ECD80()
._628:\n\
.align 2, 0\n\
._627:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._582:\n\
ldr r0, ._631\n\
ldrb r1, [r0, #0x7]\n\
@@ -2766,7 +2766,7 @@ void sub_80ECD80()
._636:\n\
.align 2, 0\n\
._635:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x306\n\
._585:\n\
mov r0, #0x5\n\
@@ -2798,7 +2798,7 @@ void sub_80ECD80()
._640:\n\
.align 2, 0\n\
._639:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._587:\n\
bl sub_80F1E50\n\
lsl r0, r0, #0x18\n\
@@ -2829,7 +2829,7 @@ void sub_80ECD80()
._644:\n\
.align 2, 0\n\
._643:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6dad\n\
.word sub_80ECC08+1\n\
.word gLinkOpen\n\
@@ -2970,7 +2970,7 @@ void sub_80ED01C()
._648:\n\
.align 2, 0\n\
._647:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._649\n\
._649:\n\
.word ._650\n\
@@ -3007,7 +3007,7 @@ void sub_80ED01C()
._672:\n\
.align 2, 0\n\
._671:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._651:\n\
bl sub_80F1F10\n\
lsl r0, r0, #0x18\n\
@@ -3025,7 +3025,7 @@ void sub_80ED01C()
._677:\n\
.align 2, 0\n\
._676:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._652:\n\
bl sub_80EEF34\n\
lsl r0, r0, #0x18\n\
@@ -3052,7 +3052,7 @@ void sub_80ED01C()
._682:\n\
.align 2, 0\n\
._681:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._653:\n\
ldr r0, ._686\n\
ldrb r1, [r0, #0x7]\n\
@@ -3075,7 +3075,7 @@ void sub_80ED01C()
.align 2, 0\n\
._686:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._654:\n\
bl sub_80F2620\n\
ldr r1, ._689\n\
@@ -3086,7 +3086,7 @@ void sub_80ED01C()
._690:\n\
.align 2, 0\n\
._689:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._655:\n\
bl sub_80F4D44\n\
ldr r1, ._693\n\
@@ -3112,7 +3112,7 @@ void sub_80ED01C()
._694:\n\
.align 2, 0\n\
._693:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._691:\n\
ldr r1, ._696\n\
mov r0, #0xc1\n\
@@ -3122,7 +3122,7 @@ void sub_80ED01C()
._697:\n\
.align 2, 0\n\
._696:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._657:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -3140,7 +3140,7 @@ void sub_80ED01C()
._702:\n\
.align 2, 0\n\
._701:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._658:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -3155,7 +3155,7 @@ void sub_80ED01C()
._707:\n\
.align 2, 0\n\
._706:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._659:\n\
mov r0, #0x0\n\
bl sub_80F0264\n\
@@ -3181,7 +3181,7 @@ void sub_80ED01C()
._712:\n\
.align 2, 0\n\
._711:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._661:\n\
mov r0, #0x0\n\
bl sub_80F3008\n\
@@ -3193,7 +3193,7 @@ void sub_80ED01C()
._715:\n\
.align 2, 0\n\
._714:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._662:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -3208,7 +3208,7 @@ void sub_80ED01C()
._720:\n\
.align 2, 0\n\
._719:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._663:\n\
mov r1, #0xc2\n\
lsl r1, r1, #0x2\n\
@@ -3242,7 +3242,7 @@ void sub_80ED01C()
._726:\n\
.align 2, 0\n\
._725:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._665:\n\
ldr r0, ._729\n\
ldrb r1, [r0, #0x7]\n\
@@ -3299,7 +3299,7 @@ void sub_80ED01C()
._734:\n\
.align 2, 0\n\
._733:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x306\n\
._668:\n\
ldr r4, ._737\n\
@@ -3347,7 +3347,7 @@ void sub_80ED01C()
._738:\n\
.align 2, 0\n\
._737:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6dfc\n\
.word sub_80ED31C+1\n\
.word gLinkOpen\n\
@@ -3487,7 +3487,7 @@ void sub_80ED31C()
._744:\n\
.align 2, 0\n\
._743:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._740:\n\
cmp r0, #0x2\n\
beq ._745 @cond_branch\n\
@@ -3655,7 +3655,7 @@ void sub_80ED3D0()
._768:\n\
.align 2, 0\n\
._767:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._769\n\
._769:\n\
.word ._770\n\
@@ -3678,7 +3678,7 @@ void sub_80ED3D0()
._781:\n\
.align 2, 0\n\
._780:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._771:\n\
bl sub_80EED0C\n\
bl sub_80F6134\n\
@@ -3690,7 +3690,7 @@ void sub_80ED3D0()
._784:\n\
.align 2, 0\n\
._783:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._772:\n\
mov r0, #0x0\n\
bl sub_80EEFBC\n\
@@ -3702,7 +3702,7 @@ void sub_80ED3D0()
._787:\n\
.align 2, 0\n\
._786:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._773:\n\
mov r0, #0x0\n\
bl sub_80F0264\n\
@@ -3726,7 +3726,7 @@ void sub_80ED3D0()
._791:\n\
.align 2, 0\n\
._790:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._775:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -3739,7 +3739,7 @@ void sub_80ED3D0()
._795:\n\
.align 2, 0\n\
._794:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._776:\n\
mov r0, #0x0\n\
bl sub_80F3008\n\
@@ -3768,7 +3768,7 @@ void sub_80ED3D0()
._798:\n\
.align 2, 0\n\
._797:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word sub_80EBD18+1\n\
._777:\n\
mov r0, #0x4\n\
@@ -3793,7 +3793,7 @@ void sub_80ED3D0()
._802:\n\
.align 2, 0\n\
._801:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
.word 0x600f800\n\
@@ -3890,7 +3890,7 @@ void sub_80ED4D8()
._809:\n\
.align 2, 0\n\
._808:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._810\n\
._810:\n\
.word ._811\n\
@@ -3936,7 +3936,7 @@ void sub_80ED4D8()
.align 2, 0\n\
._824:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._813:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -3949,7 +3949,7 @@ void sub_80ED4D8()
._829:\n\
.align 2, 0\n\
._828:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._814:\n\
bl sub_80F4CF0\n\
ldr r1, ._831\n\
@@ -3960,7 +3960,7 @@ void sub_80ED4D8()
._832:\n\
.align 2, 0\n\
._831:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._815:\n\
bl sub_80EFF34\n\
ldr r1, ._835\n\
@@ -3983,7 +3983,7 @@ void sub_80ED4D8()
._836:\n\
.align 2, 0\n\
._835:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._817:\n\
bl sub_80F35B4\n\
mov r0, #0x2\n\
@@ -4014,7 +4014,7 @@ void sub_80ED4D8()
._839:\n\
.align 2, 0\n\
._838:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word sub_80EBD4C+1\n\
._818:\n\
mov r0, #0x2\n\
@@ -4039,7 +4039,7 @@ void sub_80ED4D8()
._843:\n\
.align 2, 0\n\
._842:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
.word 0x600f000\n\
@@ -4141,7 +4141,7 @@ void sub_80ED620()
._850:\n\
.align 2, 0\n\
._849:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._851\n\
._851:\n\
.word ._852\n\
@@ -4173,7 +4173,7 @@ void sub_80ED620()
._871:\n\
.align 2, 0\n\
._870:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._853:\n\
bl sub_80F1F10\n\
lsl r0, r0, #0x18\n\
@@ -4210,7 +4210,7 @@ void sub_80ED620()
._879:\n\
.align 2, 0\n\
._878:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._855:\n\
ldr r0, ._883\n\
ldrb r1, [r0, #0x7]\n\
@@ -4241,7 +4241,7 @@ void sub_80ED620()
.align 2, 0\n\
._883:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x76aa\n\
._856:\n\
bl sub_80F2620\n\
@@ -4275,7 +4275,7 @@ void sub_80ED620()
._891:\n\
.align 2, 0\n\
._890:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._860:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -4288,7 +4288,7 @@ void sub_80ED620()
._895:\n\
.align 2, 0\n\
._894:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._861:\n\
bl sub_8055870\n\
b ._896\n\
@@ -4315,7 +4315,7 @@ void sub_80ED620()
._899:\n\
.align 2, 0\n\
._898:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word sub_80EBD4C+1\n\
._863:\n\
mov r0, #0x2\n\
@@ -4328,7 +4328,7 @@ void sub_80ED620()
._902:\n\
.align 2, 0\n\
._901:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._864:\n\
ldr r0, ._905\n\
ldrb r1, [r0, #0x7]\n\
@@ -4375,7 +4375,7 @@ void sub_80ED620()
._910:\n\
.align 2, 0\n\
._909:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._867:\n\
mov r0, #0x6\n\
bl sub_80F2C80\n\
@@ -4411,7 +4411,7 @@ void sub_80ED620()
._914:\n\
.align 2, 0\n\
._913:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word sub_80ED858+1\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
@@ -4702,7 +4702,7 @@ void sub_80ED858()
._918:\n\
.align 2, 0\n\
._917:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._919\n\
._919:\n\
.word ._920\n\
@@ -4730,7 +4730,7 @@ void sub_80ED858()
._934:\n\
.align 2, 0\n\
._933:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._921:\n\
bl sub_80F5B50\n\
lsl r0, r0, #0x18\n\
@@ -4748,7 +4748,7 @@ void sub_80ED858()
._939:\n\
.align 2, 0\n\
._938:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._922:\n\
mov r0, #0x1\n\
bl sub_80F0174\n\
@@ -4762,7 +4762,7 @@ void sub_80ED858()
._942:\n\
.align 2, 0\n\
._941:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._923:\n\
bl sub_80F4FB4\n\
lsl r0, r0, #0x18\n\
@@ -4879,7 +4879,7 @@ void sub_80ED858()
._963:\n\
.align 2, 0\n\
._962:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._960:\n\
mov r0, #0x1\n\
and r0, r0, r2\n\
@@ -4958,7 +4958,7 @@ void sub_80ED858()
._981:\n\
.align 2, 0\n\
._980:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._926:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -4971,7 +4971,7 @@ void sub_80ED858()
._985:\n\
.align 2, 0\n\
._984:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._927:\n\
mov r0, #0x3\n\
bl sub_80EEFBC\n\
@@ -4986,7 +4986,7 @@ void sub_80ED858()
._988:\n\
.align 2, 0\n\
._987:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._928:\n\
bl sub_80F7500\n\
lsl r0, r0, #0x18\n\
@@ -5007,7 +5007,7 @@ void sub_80ED858()
._992:\n\
.align 2, 0\n\
._991:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._929:\n\
bl sub_80F5038\n\
lsl r0, r0, #0x18\n\
@@ -5037,7 +5037,7 @@ void sub_80ED858()
._996:\n\
.align 2, 0\n\
._995:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._931:\n\
ldr r0, ._1000\n\
ldrb r1, [r0, #0x7]\n\
@@ -5065,7 +5065,7 @@ void sub_80ED858()
.align 2, 0\n\
._1000:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x76aa\n\
.word sub_80ECA10+1\n\
._998:\n\
@@ -5501,7 +5501,7 @@ void sub_80EDB88()
._1008:\n\
.align 2, 0\n\
._1007:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._1009\n\
._1009:\n\
.word ._1010\n\
@@ -5534,7 +5534,7 @@ void sub_80EDB88()
._1030:\n\
.align 2, 0\n\
._1029:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1011:\n\
bl sub_80F1F10\n\
lsl r0, r0, #0x18\n\
@@ -5552,7 +5552,7 @@ void sub_80EDB88()
._1035:\n\
.align 2, 0\n\
._1034:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1012:\n\
bl sub_80EEF34\n\
lsl r0, r0, #0x18\n\
@@ -5576,7 +5576,7 @@ void sub_80EDB88()
._1040:\n\
.align 2, 0\n\
._1039:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1013:\n\
ldr r0, ._1044\n\
ldrb r1, [r0, #0x7]\n\
@@ -5599,7 +5599,7 @@ void sub_80EDB88()
.align 2, 0\n\
._1044:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1014:\n\
bl sub_80F2620\n\
ldr r1, ._1047\n\
@@ -5610,7 +5610,7 @@ void sub_80EDB88()
._1048:\n\
.align 2, 0\n\
._1047:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1015:\n\
bl sub_80F638C\n\
ldr r1, ._1051\n\
@@ -5636,7 +5636,7 @@ void sub_80EDB88()
._1052:\n\
.align 2, 0\n\
._1051:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1049:\n\
ldr r1, ._1054\n\
mov r0, #0xc1\n\
@@ -5646,7 +5646,7 @@ void sub_80EDB88()
._1055:\n\
.align 2, 0\n\
._1054:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1017:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -5664,7 +5664,7 @@ void sub_80EDB88()
._1060:\n\
.align 2, 0\n\
._1059:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1018:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -5679,7 +5679,7 @@ void sub_80EDB88()
._1065:\n\
.align 2, 0\n\
._1064:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1019:\n\
mov r0, #0x1\n\
bl sub_80F0264\n\
@@ -5703,7 +5703,7 @@ void sub_80EDB88()
._1069:\n\
.align 2, 0\n\
._1068:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1021:\n\
mov r0, #0x2\n\
bl sub_80F2C80\n\
@@ -5728,7 +5728,7 @@ void sub_80EDB88()
._1073:\n\
.align 2, 0\n\
._1072:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1023:\n\
mov r0, #0x1\n\
bl sub_80F3008\n\
@@ -5740,7 +5740,7 @@ void sub_80EDB88()
._1076:\n\
.align 2, 0\n\
._1075:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1024:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -5753,7 +5753,7 @@ void sub_80EDB88()
._1080:\n\
.align 2, 0\n\
._1079:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1025:\n\
mov r1, #0xc2\n\
lsl r1, r1, #0x2\n\
@@ -5804,7 +5804,7 @@ void sub_80EDB88()
._1087:\n\
.align 2, 0\n\
._1086:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
.word 0x600f800\n\
@@ -5943,7 +5943,7 @@ void sub_80EDDBC()
._1096:\n\
.align 2, 0\n\
._1095:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1092:\n\
cmp r0, #0x2\n\
beq ._1097 @cond_branch\n\
@@ -6136,7 +6136,7 @@ void sub_80EDEE4()
._1135:\n\
.align 2, 0\n\
._1134:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._1136\n\
._1136:\n\
.word ._1137\n\
@@ -6184,7 +6184,7 @@ void sub_80EDEE4()
.align 2, 0\n\
._1152:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1139:\n\
bl sub_80F66E0\n\
bl sub_80EEE08\n\
@@ -6196,7 +6196,7 @@ void sub_80EDEE4()
._1156:\n\
.align 2, 0\n\
._1155:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1140:\n\
bl sub_80F1080\n\
lsl r0, r0, #0x18\n\
@@ -6210,7 +6210,7 @@ void sub_80EDEE4()
._1160:\n\
.align 2, 0\n\
._1159:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1141:\n\
mov r0, #0x5\n\
bl sub_80EEFBC\n\
@@ -6235,7 +6235,7 @@ void sub_80EDEE4()
._1164:\n\
.align 2, 0\n\
._1163:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1143:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -6248,7 +6248,7 @@ void sub_80EDEE4()
._1168:\n\
.align 2, 0\n\
._1167:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1144:\n\
mov r1, #0xc2\n\
lsl r1, r1, #0x2\n\
@@ -6291,7 +6291,7 @@ void sub_80EDEE4()
._1175:\n\
.align 2, 0\n\
._1174:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
.word 0x600f000\n\
@@ -6417,7 +6417,7 @@ void sub_80EE06C()
._1186:\n\
.align 2, 0\n\
._1185:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._1187\n\
._1187:\n\
.word ._1188\n\
@@ -6439,7 +6439,7 @@ void sub_80EE06C()
._1199:\n\
.align 2, 0\n\
._1198:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1189:\n\
ldr r2, ._1203\n\
ldrh r1, [r2, #0x30]\n\
@@ -6515,7 +6515,7 @@ void sub_80EE06C()
._1213:\n\
.align 2, 0\n\
._1212:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1210:\n\
mov r0, #0x2\n\
and r0, r0, r2\n\
@@ -6547,7 +6547,7 @@ void sub_80EE06C()
._1223:\n\
.align 2, 0\n\
._1222:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1191:\n\
bl sub_8055870\n\
add r1, r0, #0\n\
@@ -6562,7 +6562,7 @@ void sub_80EE06C()
._1227:\n\
.align 2, 0\n\
._1226:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1192:\n\
bl sub_80F3B00\n\
ldr r1, ._1229\n\
@@ -6577,7 +6577,7 @@ void sub_80EE06C()
._1230:\n\
.align 2, 0\n\
._1229:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1193:\n\
bl sub_80F3B58\n\
lsl r0, r0, #0x18\n\
@@ -6596,7 +6596,7 @@ void sub_80EE06C()
._1234:\n\
.align 2, 0\n\
._1233:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1194:\n\
bl sub_80F68E8\n\
lsl r0, r0, #0x18\n\
@@ -6618,7 +6618,7 @@ void sub_80EE06C()
._1239:\n\
.align 2, 0\n\
._1238:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1236:\n\
ldr r0, ._1242\n\
ldrh r1, [r0, #0x2e]\n\
@@ -6640,7 +6640,7 @@ void sub_80EE06C()
.align 2, 0\n\
._1242:\n\
.word gMain\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1195:\n\
bl sub_80F3BD4\n\
lsl r0, r0, #0x18\n\
@@ -6657,7 +6657,7 @@ void sub_80EE06C()
._1247:\n\
.align 2, 0\n\
._1246:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1196:\n\
bl sub_80F3BD4\n\
lsl r0, r0, #0x18\n\
@@ -6694,7 +6694,7 @@ void sub_80EE06C()
._1251:\n\
.align 2, 0\n\
._1250:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word gLink\n\
.word 0xfbd");
@@ -6812,7 +6812,7 @@ void sub_80EE294()
._1255:\n\
.align 2, 0\n\
._1254:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._1256\n\
._1256:\n\
.word ._1257\n\
@@ -6858,7 +6858,7 @@ void sub_80EE294()
.align 2, 0\n\
._1270:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1259:\n\
bl sub_80F6134\n\
mov r0, #0x1\n\
@@ -6883,7 +6883,7 @@ void sub_80EE294()
._1275:\n\
.align 2, 0\n\
._1274:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1261:\n\
mov r0, #0x4\n\
bl sub_80EEFBC\n\
@@ -6900,7 +6900,7 @@ void sub_80EE294()
.align 2, 0\n\
._1277:\n\
.word sub_80EBD18+1\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1262:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -6913,7 +6913,7 @@ void sub_80EE294()
._1282:\n\
.align 2, 0\n\
._1281:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1263:\n\
mov r1, #0xc2\n\
lsl r1, r1, #0x2\n\
@@ -6958,7 +6958,7 @@ void sub_80EE294()
._1287:\n\
.align 2, 0\n\
._1286:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
.word 0x600f800\n\
@@ -7059,7 +7059,7 @@ void sub_80EE3D8()
._1294:\n\
.align 2, 0\n\
._1293:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word ._1295\n\
._1295:\n\
.word ._1296\n\
@@ -7088,7 +7088,7 @@ void sub_80EE3D8()
._1312:\n\
.align 2, 0\n\
._1311:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1297:\n\
bl sub_80F1F10\n\
lsl r0, r0, #0x18\n\
@@ -7106,7 +7106,7 @@ void sub_80EE3D8()
._1317:\n\
.align 2, 0\n\
._1316:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1298:\n\
bl sub_80EEF34\n\
lsl r0, r0, #0x18\n\
@@ -7130,7 +7130,7 @@ void sub_80EE3D8()
._1322:\n\
.align 2, 0\n\
._1321:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1299:\n\
ldr r0, ._1326\n\
ldrb r1, [r0, #0x7]\n\
@@ -7154,7 +7154,7 @@ void sub_80EE3D8()
.align 2, 0\n\
._1326:\n\
.word gPaletteFade\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1300:\n\
bl sub_80F2620\n\
ldr r1, ._1329\n\
@@ -7165,7 +7165,7 @@ void sub_80EE3D8()
._1330:\n\
.align 2, 0\n\
._1329:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1301:\n\
mov r0, #0x2\n\
bl sub_80F0264\n\
@@ -7191,7 +7191,7 @@ void sub_80EE3D8()
._1335:\n\
.align 2, 0\n\
._1334:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1303:\n\
mov r0, #0x3\n\
bl sub_80F2C80\n\
@@ -7216,7 +7216,7 @@ void sub_80EE3D8()
._1339:\n\
.align 2, 0\n\
._1338:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1305:\n\
mov r0, #0x2\n\
bl sub_80F3008\n\
@@ -7228,7 +7228,7 @@ void sub_80EE3D8()
._1342:\n\
.align 2, 0\n\
._1341:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1306:\n\
bl sub_8055870\n\
cmp r0, #0\n\
@@ -7241,7 +7241,7 @@ void sub_80EE3D8()
._1346:\n\
.align 2, 0\n\
._1345:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1307:\n\
bl sub_80F6F10\n\
ldr r4, ._1348\n\
@@ -7270,7 +7270,7 @@ void sub_80EE3D8()
._1349:\n\
.align 2, 0\n\
._1348:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word sub_80EBD68+1\n\
._1308:\n\
mov r0, #0x5\n\
@@ -7295,7 +7295,7 @@ void sub_80EE3D8()
._1353:\n\
.align 2, 0\n\
._1352:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word gLinkOpen\n\
.word 0x6007de0\n\
.word 0x600f800\n\
@@ -7419,7 +7419,7 @@ void sub_80EE58C()
._1362:\n\
.align 2, 0\n\
._1361:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
._1358:\n\
cmp r0, #0x2\n\
beq ._1363 @cond_branch\n\
@@ -8045,7 +8045,7 @@ bool8 sub_80EEC10()
.align 2, 0\n\
._1563:\n\
.word gMain\n\
- .word +0x2006dad\n\
+ .word gSharedMem+0x6dad\n\
._1559:\n\
mov r0, #0x80\n\
and r0, r0, r1\n\
@@ -8077,7 +8077,7 @@ bool8 sub_80EEC10()
._1570:\n\
.align 2, 0\n\
._1569:\n\
- .word +0x2006dad\n\
+ .word gSharedMem+0x6dad\n\
._1565:\n\
ldr r0, ._1572\n\
ldrb r0, [r0]\n\
@@ -8166,7 +8166,7 @@ bool8 sub_80EEC90()
.align 2, 0\n\
._1577:\n\
.word gMain\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6dad\n\
.word 0x6dae\n\
._1574:\n\
@@ -8196,7 +8196,7 @@ bool8 sub_80EEC90()
._1583:\n\
.align 2, 0\n\
._1582:\n\
- .word +0x2000000\n\
+ .word gSharedMem\n\
.word 0x6dad\n\
._1579:\n\
ldr r0, ._1585\n\
diff --git a/sym_common.txt b/sym_common.txt
index 366036c9c..f079673f0 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -78,7 +78,7 @@ SYMBOL(gLinkCallback, 4)
SYMBOL(gSavedLinkPlayers, 112)
SYMBOL(gShouldAdvanceLinkState, 4)
SYMBOL(gLinkTestBlockChecksums, 8)
-. += 0x4;
+SYMBOL(gUnknown_Debug_30030E0, 4)
SYMBOL(gBlockRequestType, 4)
. += 0x8;
SYMBOL(gLastSendQueueCount, 4)
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 38df657f3..8e2d8a230 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -33,29 +33,41 @@ gUnknown_02023A14 = .; /* 2023A14 */
. += 0x4C;
#if DEBUG
+
gUnknown_02023A14_4C = .;
. += 0x4;
-gUnknown_02023A14_50 = .;
- . += 0x290;
-#endif
-gBattleBufferA = .; /* 2023A60 */
+gUnknown_02023A14_50 = .;
. += 0x2;
-gUnknown_02023A62 = .; /* 2023A62 */
- . += 0x1;
-
-gUnknown_02023A63 = .; /* 2023A63 */
- . += 0x1;
+gUnknown_Debug_2023A76 = .;
+ . += 0x4;
-gUnknown_02023A64 = .; /* 2023A64 */
- . += 0x7FC;
+gUnknown_Debug_2023A7A = .;
+ . += 0x42;
-gBattleBufferB = .; /* 2024260 */
+gUnknown_Debug_2023ABC = .;
. += 0x4;
-gUnknown_02024264 = .; /* 2024264 */
- . += 0x7FC;
+gUnknown_Debug_2023AC0 = .;
+ . += 0x42;
+
+gUnknown_Debug_2023B02 = .;
+ . += 0x30;
+
+gUnknown_Debug_2023B32 = .;
+ . += 0x30;
+
+gUnknown_Debug_2023B62 = .;
+ . += 0x1A2;
+
+#endif
+
+gBattleBufferA = .; /* 2023A60 */
+ . += 0x800;
+
+gBattleBufferB = .; /* 2024260 */
+ . += 0x800;
gActiveBank = .; /* 2024A60 */
. += 0x4;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 17:15:26 +0000