summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-23 16:55:48 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-23 16:55:48 -0600
commite03633d6bc1e1cd155bc258edbb7783020b4bdb7 (patch)
treef1ab5691955ee2f1b1dbebde1aa78b9a1efaabf0 /src/battle
parent960bc2dd01bfc5bada0cbd96318440c81cfc235d (diff)
fix more false offsets
Diffstat (limited to 'src/battle')
-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
7 files changed, 135 insertions, 135 deletions
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\
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:36:10 +0000