summaryrefslogtreecommitdiff
path: root/asm/battle_2.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/battle_2.s')
-rw-r--r--asm/battle_2.s734
1 files changed, 367 insertions, 367 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 910b37d65..365ef0691 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -21,14 +21,14 @@ sub_800FD9C: @ 800FD9C
bl HandleLinkBattleSetup
ldr r0, _0800FDD0 @ =sub_80109C8
bl SetMainCallback2
- ldr r1, _0800FDD4 @ =gUnknown_2023E82
+ ldr r1, _0800FDD4 @ =gBattleCommunication
movs r0, 0
strb r0, [r1]
b _0800FE1C
.align 2, 0
_0800FDCC: .4byte gBattleTypeFlags
_0800FDD0: .4byte sub_80109C8
-_0800FDD4: .4byte gUnknown_2023E82
+_0800FDD4: .4byte gBattleCommunication
_0800FDD8:
bl sub_800FE24
ldr r1, [r4]
@@ -237,7 +237,7 @@ _0800FFAE:
cmp r4, r5
ble _0800FFAE
movs r1, 0
- ldr r0, _0800FFE8 @ =gUnknown_2023E82
+ ldr r0, _0800FFE8 @ =gBattleCommunication
strb r1, [r0]
add sp, 0x4
pop {r4,r5}
@@ -251,7 +251,7 @@ _0800FFD8: .4byte gTrainerBattleOpponent_A
_0800FFDC: .4byte gMain
_0800FFE0: .4byte 0x00000439
_0800FFE4: .4byte gPlayerParty
-_0800FFE8: .4byte gUnknown_2023E82
+_0800FFE8: .4byte gBattleCommunication
thumb_func_end sub_800FE24
thumb_func_start sub_800FFEC
@@ -952,7 +952,7 @@ sub_8010508: @ 8010508
movs r0, 0x1
adds r5, r4, 0
eors r5, r0
- ldr r0, _08010544 @ =gUnknown_2023E82
+ ldr r0, _08010544 @ =gBattleCommunication
ldrb r0, [r0]
cmp r0, 0x10
bls _08010536
@@ -965,7 +965,7 @@ _08010536:
mov pc, r0
.align 2, 0
_08010540: .4byte gBattleStruct
-_08010544: .4byte gUnknown_2023E82
+_08010544: .4byte gBattleCommunication
_08010548: .4byte _0801054C
.align 2, 0
_0801054C:
@@ -1000,7 +1000,7 @@ _08010590:
movs r0, 0x3
bl ShowBg
bl sub_80357C8
- ldr r1, _080105CC @ =gUnknown_2023E82
+ ldr r1, _080105CC @ =gBattleCommunication
movs r0, 0x1
strb r0, [r1]
_080105BC:
@@ -1013,7 +1013,7 @@ _080105C6:
bl sub_80FCEA8
b _080108B8
.align 2, 0
-_080105CC: .4byte gUnknown_2023E82
+_080105CC: .4byte gBattleCommunication
_080105D0: .4byte gWirelessCommType
_080105D4:
ldr r2, _08010640 @ =gBattleTypeFlags
@@ -1053,7 +1053,7 @@ _080105EC:
adds r1, r5
movs r2, 0x20
bl SendBlock
- ldr r0, _08010650 @ =gUnknown_2023E82
+ ldr r0, _08010650 @ =gBattleCommunication
strb r6, [r0]
_0801062A:
ldr r0, _08010654 @ =gWirelessCommType
@@ -1071,19 +1071,19 @@ _08010640: .4byte gBattleTypeFlags
_08010644: .4byte gReceivedRemoteLinkPlayers
_08010648: .4byte gBattleStruct
_0801064C: .4byte 0x00000185
-_08010650: .4byte gUnknown_2023E82
+_08010650: .4byte gBattleCommunication
_08010654: .4byte gWirelessCommType
_08010658:
movs r0, 0x4
orrs r1, r0
str r1, [r2]
- ldr r1, _0801066C @ =gUnknown_2023E82
+ ldr r1, _0801066C @ =gBattleCommunication
movs r0, 0xF
strb r0, [r1]
bl sub_801017C
b _080108B8
.align 2, 0
-_0801066C: .4byte gUnknown_2023E82
+_0801066C: .4byte gBattleCommunication
_08010670:
bl GetBlockReceivedStatus
movs r1, 0x3
@@ -1133,14 +1133,14 @@ _0801067E:
ldrh r0, [r1]
strh r0, [r2, 0x10]
bl SetDeoxysStats
- ldr r1, _080106F0 @ =gUnknown_2023E82
+ ldr r1, _080106F0 @ =gBattleCommunication
b _080108B2
.align 2, 0
_080106E0: .4byte sub_800F6FC
_080106E4: .4byte gTasks
_080106E8: .4byte gBattleStruct
_080106EC: .4byte gBlockRecvBuffer
-_080106F0: .4byte gUnknown_2023E82
+_080106F0: .4byte gBattleCommunication
_080106F4:
bl IsLinkTaskFinished
lsls r0, 24
@@ -1154,11 +1154,11 @@ _08010700:
ldr r1, _08010714 @ =gPlayerParty
movs r2, 0xC8
bl SendBlock
- ldr r1, _08010718 @ =gUnknown_2023E82
+ ldr r1, _08010718 @ =gBattleCommunication
b _080108B2
.align 2, 0
_08010714: .4byte gPlayerParty
-_08010718: .4byte gUnknown_2023E82
+_08010718: .4byte gBattleCommunication
_0801071C:
bl GetBlockReceivedStatus
movs r1, 0x3
@@ -1174,12 +1174,12 @@ _0801072A:
adds r1, r2
movs r2, 0xC8
bl memcpy
- ldr r1, _08010748 @ =gUnknown_2023E82
+ ldr r1, _08010748 @ =gBattleCommunication
b _080108B2
.align 2, 0
_08010740: .4byte gEnemyParty
_08010744: .4byte gBlockRecvBuffer
-_08010748: .4byte gUnknown_2023E82
+_08010748: .4byte gBattleCommunication
_0801074C:
bl IsLinkTaskFinished
lsls r0, 24
@@ -1193,11 +1193,11 @@ _08010758:
ldr r1, _0801076C @ =gUnknown_202434C
movs r2, 0xC8
bl SendBlock
- ldr r1, _08010770 @ =gUnknown_2023E82
+ ldr r1, _08010770 @ =gBattleCommunication
b _080108B2
.align 2, 0
_0801076C: .4byte gUnknown_202434C
-_08010770: .4byte gUnknown_2023E82
+_08010770: .4byte gBattleCommunication
_08010774:
bl GetBlockReceivedStatus
movs r1, 0x3
@@ -1213,12 +1213,12 @@ _08010782:
adds r1, r2
movs r2, 0xC8
bl memcpy
- ldr r1, _080107A0 @ =gUnknown_2023E82
+ ldr r1, _080107A0 @ =gBattleCommunication
b _080108B2
.align 2, 0
_08010798: .4byte gUnknown_20240F4
_0801079C: .4byte gBlockRecvBuffer
-_080107A0: .4byte gUnknown_2023E82
+_080107A0: .4byte gBattleCommunication
_080107A4:
bl IsLinkTaskFinished
lsls r0, 24
@@ -1232,11 +1232,11 @@ _080107B0:
ldr r1, _080107C4 @ =gUnknown_2024414
movs r2, 0xC8
bl SendBlock
- ldr r1, _080107C8 @ =gUnknown_2023E82
+ ldr r1, _080107C8 @ =gBattleCommunication
b _080108B2
.align 2, 0
_080107C4: .4byte gUnknown_2024414
-_080107C8: .4byte gUnknown_2023E82
+_080107C8: .4byte gBattleCommunication
_080107CC:
bl GetBlockReceivedStatus
movs r1, 0x3
@@ -1268,17 +1268,17 @@ _080107CC:
adds r0, r4, 0
adds r0, 0x64
bl sub_8011D0C
- ldr r1, _08010830 @ =gUnknown_2023E82
+ ldr r1, _08010830 @ =gBattleCommunication
b _080108B2
.align 2, 0
_08010820: .4byte gUnknown_20241BC
_08010824: .4byte gBlockRecvBuffer
_08010828: .4byte 0xfffffe70
_0801082C: .4byte 0xfffffed4
-_08010830: .4byte gUnknown_2023E82
+_08010830: .4byte gBattleCommunication
_08010834:
bl sub_800D30C
- ldr r0, _08010848 @ =gUnknown_2023E82
+ ldr r0, _08010848 @ =gBattleCommunication
ldrb r1, [r0]
adds r1, 0x1
movs r2, 0
@@ -1287,7 +1287,7 @@ _08010834:
strb r2, [r0, 0x2]
b _080108B8
.align 2, 0
-_08010848: .4byte gUnknown_2023E82
+_08010848: .4byte gBattleCommunication
_0801084C:
ldr r0, _08010880 @ =gUnknown_2023E83
adds r1, r0, 0x1
@@ -1321,14 +1321,14 @@ _0801088C: .4byte sub_80123E4
_08010890: .4byte BattleMainCB2
_08010894: .4byte gBattleTypeFlags
_08010898:
- ldr r0, _080108C0 @ =gUnknown_2023E82
+ ldr r0, _080108C0 @ =gBattleCommunication
ldrb r1, [r0]
adds r1, 0x1
strb r1, [r0]
movs r1, 0x1
strb r1, [r0, 0x1]
_080108A4:
- ldr r1, _080108C0 @ =gUnknown_2023E82
+ ldr r1, _080108C0 @ =gBattleCommunication
ldrb r0, [r1, 0x1]
subs r0, 0x1
strb r0, [r1, 0x1]
@@ -1344,7 +1344,7 @@ _080108B8:
pop {r0}
bx r0
.align 2, 0
-_080108C0: .4byte gUnknown_2023E82
+_080108C0: .4byte gBattleCommunication
thumb_func_end sub_8010508
thumb_func_start sub_80108C4
@@ -1494,7 +1494,7 @@ sub_80109C8: @ 80109C8
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
- ldr r5, _08010A10 @ =gUnknown_2023E82
+ ldr r5, _08010A10 @ =gBattleCommunication
ldrb r0, [r5]
cmp r0, 0x1
beq _08010A5C
@@ -1505,7 +1505,7 @@ sub_80109C8: @ 80109C8
b _08010B82
.align 2, 0
_08010A0C: .4byte gBattleStruct
-_08010A10: .4byte gUnknown_2023E82
+_08010A10: .4byte gBattleCommunication
_08010A14:
cmp r0, 0x2
beq _08010AFC
@@ -1596,7 +1596,7 @@ _08010ABA:
adds r4, 0x1
cmp r4, 0x3
ble _08010A78
- ldr r1, _08010AEC @ =gUnknown_2023E82
+ ldr r1, _08010AEC @ =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -1615,7 +1615,7 @@ _08010ABA:
.align 2, 0
_08010AE4: .4byte gBlockRecvBuffer
_08010AE8: .4byte gUnknown_2022B58
-_08010AEC: .4byte gUnknown_2023E82
+_08010AEC: .4byte gBattleCommunication
_08010AF0: .4byte gMain
_08010AF4: .4byte gBattleTypeFlags
_08010AF8: .4byte sub_80109C8
@@ -1709,7 +1709,7 @@ sub_8010BA0: @ 8010BA0
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
- ldr r0, _08010BDC @ =gUnknown_2023E82
+ ldr r0, _08010BDC @ =gBattleCommunication
ldrb r0, [r0]
cmp r0, 0xC
bls _08010BCC
@@ -1722,7 +1722,7 @@ _08010BCC:
mov pc, r0
.align 2, 0
_08010BD8: .4byte gBattleStruct
-_08010BDC: .4byte gUnknown_2023E82
+_08010BDC: .4byte gBattleCommunication
_08010BE0: .4byte _08010BE4
.align 2, 0
_08010BE4:
@@ -1753,7 +1753,7 @@ _08010C18:
movs r0, 0x3
bl ShowBg
bl sub_80357C8
- ldr r1, _08010C54 @ =gUnknown_2023E82
+ ldr r1, _08010C54 @ =gBattleCommunication
movs r0, 0x1
strb r0, [r1]
_08010C44:
@@ -1766,7 +1766,7 @@ _08010C4E:
bl sub_80FCEA8
b _080110F0
.align 2, 0
-_08010C54: .4byte gUnknown_2023E82
+_08010C54: .4byte gBattleCommunication
_08010C58: .4byte gWirelessCommType
_08010C5C:
ldr r0, _08010CC0 @ =gReceivedRemoteLinkPlayers
@@ -1800,7 +1800,7 @@ _08010C66:
adds r1, r5
movs r2, 0x20
bl SendBlock
- ldr r1, _08010CCC @ =gUnknown_2023E82
+ ldr r1, _08010CCC @ =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -1819,7 +1819,7 @@ _08010CB4:
_08010CC0: .4byte gReceivedRemoteLinkPlayers
_08010CC4: .4byte gBattleStruct
_08010CC8: .4byte 0x00000185
-_08010CCC: .4byte gUnknown_2023E82
+_08010CCC: .4byte gBattleCommunication
_08010CD0: .4byte gWirelessCommType
_08010CD4:
bl GetBlockReceivedStatus
@@ -1926,7 +1926,7 @@ _08010D9C:
bge _08010D3A
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
- ldr r1, _08010DD8 @ =gUnknown_2023E82
+ ldr r1, _08010DD8 @ =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -1943,10 +1943,10 @@ _08010DC2:
ldr r1, _08010DDC @ =gDecompressionBuffer
movs r2, 0xC8
bl SendBlock
- ldr r1, _08010DD8 @ =gUnknown_2023E82
+ ldr r1, _08010DD8 @ =gBattleCommunication
b _080110EA
.align 2, 0
-_08010DD8: .4byte gUnknown_2023E82
+_08010DD8: .4byte gBattleCommunication
_08010DDC: .4byte gDecompressionBuffer
_08010DE0:
bl GetBlockReceivedStatus
@@ -2078,11 +2078,11 @@ _08010EBE:
adds r6, 0x1
cmp r6, 0x3
ble _08010E00
- ldr r1, _08010ED4 @ =gUnknown_2023E82
+ ldr r1, _08010ED4 @ =gBattleCommunication
b _080110EA
.align 2, 0
_08010ED0: .4byte gUnknown_2024158
-_08010ED4: .4byte gUnknown_2023E82
+_08010ED4: .4byte gBattleCommunication
_08010ED8:
bl IsLinkTaskFinished
lsls r0, 24
@@ -2096,11 +2096,11 @@ _08010EE4:
ldr r1, _08010EF8 @ =gDecompressionBuffer + 0x0C8
movs r2, 0x64
bl SendBlock
- ldr r1, _08010EFC @ =gUnknown_2023E82
+ ldr r1, _08010EFC @ =gBattleCommunication
b _080110EA
.align 2, 0
_08010EF8: .4byte gDecompressionBuffer + 0x0C8
-_08010EFC: .4byte gUnknown_2023E82
+_08010EFC: .4byte gBattleCommunication
_08010F00:
bl GetBlockReceivedStatus
movs r1, 0xF
@@ -2273,16 +2273,16 @@ _08010FDE:
lsls r2, 1
adds r0, r4, r2
bl sub_8011D0C
- ldr r1, _08011068 @ =gUnknown_2023E82
+ ldr r1, _08011068 @ =gBattleCommunication
b _080110EA
.align 2, 0
_0801105C: .4byte gUnknown_2024220
_08011060: .4byte gPlayerParty
_08011064: .4byte gEnemyParty
-_08011068: .4byte gUnknown_2023E82
+_08011068: .4byte gBattleCommunication
_0801106C:
bl sub_800D30C
- ldr r0, _08011080 @ =gUnknown_2023E82
+ ldr r0, _08011080 @ =gBattleCommunication
ldrb r1, [r0]
adds r1, 0x1
movs r2, 0
@@ -2291,7 +2291,7 @@ _0801106C:
strb r2, [r0, 0x2]
b _080110F0
.align 2, 0
-_08011080: .4byte gUnknown_2023E82
+_08011080: .4byte gBattleCommunication
_08011084:
ldr r0, _080110B8 @ =gUnknown_2023E83
adds r1, r0, 0x1
@@ -2325,14 +2325,14 @@ _080110C4: .4byte sub_80123E4
_080110C8: .4byte BattleMainCB2
_080110CC: .4byte gBattleTypeFlags
_080110D0:
- ldr r0, _080110FC @ =gUnknown_2023E82
+ ldr r0, _080110FC @ =gBattleCommunication
ldrb r1, [r0]
adds r1, 0x1
strb r1, [r0]
movs r1, 0x1
strb r1, [r0, 0x1]
_080110DC:
- ldr r1, _080110FC @ =gUnknown_2023E82
+ ldr r1, _080110FC @ =gBattleCommunication
ldrb r0, [r1, 0x1]
subs r0, 0x1
strb r0, [r1, 0x1]
@@ -2350,7 +2350,7 @@ _080110F0:
pop {r0}
bx r0
.align 2, 0
-_080110FC: .4byte gUnknown_2023E82
+_080110FC: .4byte gBattleCommunication
thumb_func_end sub_8010BA0
thumb_func_start BattleMainCB2
@@ -3634,7 +3634,7 @@ _08011A9C:
bl sub_801184C
ldr r0, _08011B8C @ =sub_8011B94
bl SetMainCallback2
- ldr r0, _08011B90 @ =gUnknown_2023E82
+ ldr r0, _08011B90 @ =gBattleCommunication
strb r4, [r0]
add sp, 0x4
pop {r4}
@@ -3661,7 +3661,7 @@ _08011B80: .4byte sub_80116F4
_08011B84: .4byte sub_800F6FC
_08011B88: .4byte gTasks
_08011B8C: .4byte sub_8011B94
-_08011B90: .4byte gUnknown_2023E82
+_08011B90: .4byte gBattleCommunication
thumb_func_end sub_8011A1C
thumb_func_start sub_8011B94
@@ -3680,7 +3680,7 @@ sub_8011B94: @ 8011B94
sub_8011BB0: @ 8011BB0
push {r4,lr}
sub sp, 0x4
- ldr r4, _08011BC8 @ =gUnknown_2023E82
+ ldr r4, _08011BC8 @ =gBattleCommunication
ldrb r0, [r4]
cmp r0, 0x1
beq _08011BEA
@@ -3690,7 +3690,7 @@ sub_8011BB0: @ 8011BB0
beq _08011BD2
b _08011C34
.align 2, 0
-_08011BC8: .4byte gUnknown_2023E82
+_08011BC8: .4byte gBattleCommunication
_08011BCC:
cmp r0, 0x2
beq _08011C10
@@ -4776,7 +4776,7 @@ nullsub_12: @ 80123BC
BeginBattleIntro: @ 80123C0
push {lr}
bl sub_8012434
- ldr r1, _080123D8 @ =gUnknown_2023E82
+ ldr r1, _080123D8 @ =gBattleCommunication
movs r0, 0
strb r0, [r1, 0x1]
ldr r1, _080123DC @ =gBattleMainFunc
@@ -4785,7 +4785,7 @@ BeginBattleIntro: @ 80123C0
pop {r0}
bx r0
.align 2, 0
-_080123D8: .4byte gUnknown_2023E82
+_080123D8: .4byte gBattleCommunication
_080123DC: .4byte gBattleMainFunc
_080123E0: .4byte BattleIntroGetMonsData
thumb_func_end BeginBattleIntro
@@ -4904,7 +4904,7 @@ _0801246C:
ble _08012464
movs r5, 0
ldr r3, _080126F8 @ =gSideTimers
- ldr r4, _080126FC @ =gSideAffecting
+ ldr r4, _080126FC @ =gSideStatuses
movs r2, 0x1
_080124C6:
strh r5, [r4]
@@ -4927,7 +4927,7 @@ _080124CA:
strb r1, [r0]
ldr r2, _08012708 @ =gBattleWeather
strh r1, [r2]
- ldr r1, _0801270C @ =gUnknown_2023F20
+ ldr r1, _0801270C @ =gWishFutureKnock
movs r2, 0
movs r3, 0
_080124F2:
@@ -4937,7 +4937,7 @@ _080124F2:
cmp r2, 0x2B
bls _080124F2
movs r0, 0
- ldr r1, _08012710 @ =gUnknown_2023DD0
+ ldr r1, _08012710 @ =gHitMarker
str r0, [r1]
ldr r2, _08012714 @ =gBattleTypeFlags
ldr r0, [r2]
@@ -4953,7 +4953,7 @@ _080124F2:
cmp r0, 0
beq _08012522
movs r0, 0x80
- ldr r2, _08012710 @ =gUnknown_2023DD0
+ ldr r2, _08012710 @ =gHitMarker
str r0, [r2]
_08012522:
ldr r1, _0801271C @ =gSaveBlock2Ptr
@@ -4982,7 +4982,7 @@ _08012522:
ldr r0, [r0, 0xC]
adds r0, 0x20
strb r2, [r0]
- ldr r1, _08012734 @ =gUnknown_2023E82
+ ldr r1, _08012734 @ =gBattleCommunication
movs r2, 0
adds r0, r1, 0x7
_0801255C:
@@ -5183,12 +5183,12 @@ _080126EC: .4byte gUnknown_2023DD4
_080126F0: .4byte gUnknown_2023DC0
_080126F4: .4byte gBattleResources
_080126F8: .4byte gSideTimers
-_080126FC: .4byte gSideAffecting
+_080126FC: .4byte gSideStatuses
_08012700: .4byte gBattlerAttacker
_08012704: .4byte gBattlerTarget
_08012708: .4byte gBattleWeather
-_0801270C: .4byte gUnknown_2023F20
-_08012710: .4byte gUnknown_2023DD0
+_0801270C: .4byte gWishFutureKnock
+_08012710: .4byte gHitMarker
_08012714: .4byte gBattleTypeFlags
_08012718: .4byte 0x00010002
_0801271C: .4byte gSaveBlock2Ptr
@@ -5197,7 +5197,7 @@ _08012724: .4byte gUnknown_2023D72
_08012728: .4byte gBattleOutcome
_0801272C: .4byte gBattleControllerExecFlags
_08012730: .4byte gUnknown_2023E7E
-_08012734: .4byte gUnknown_2023E82
+_08012734: .4byte gBattleCommunication
_08012738: .4byte gUnknown_2023E7C
_0801273C: .4byte gBattleMoveDamage
_08012740: .4byte gIntroSlideFlags
@@ -5266,7 +5266,7 @@ _080127B0:
ldrb r7, [r7]
cmp r5, r7
bge _08012824
- ldr r0, _080128E0 @ =gUnknown_2023C34
+ ldr r0, _080128E0 @ =gChosenMoveByBattler
mov r8, r0
ldr r3, _080128C4 @ =gDisableStructs
ldr r4, _080128D4 @ =gStatuses3
@@ -5403,7 +5403,7 @@ _080128D0: .4byte gCurrentMove
_080128D4: .4byte gStatuses3
_080128D8: .4byte gBattleMons
_080128DC: .4byte gBattlersCount
-_080128E0: .4byte gUnknown_2023C34
+_080128E0: .4byte gChosenMoveByBattler
_080128E4: .4byte 0xfbffffff
_080128E8: .4byte 0x15100007
_080128EC: .4byte 0x0003043f
@@ -5431,7 +5431,7 @@ _0801290C:
ldrb r6, [r6]
cmp r5, r6
bge _0801296C
- ldr r0, _08012B8C @ =gUnknown_2023C34
+ ldr r0, _08012B8C @ =gChosenMoveByBattler
mov r8, r0
ldr r6, _08012B90 @ =gBitTable
ldr r4, _08012B94 @ =gActiveBattler
@@ -5749,7 +5749,7 @@ _08012B7C: .4byte gBattleMons
_08012B80: .4byte gBattleStruct
_08012B84: .4byte gActionSelectionCursor
_08012B88: .4byte gBattlersCount
-_08012B8C: .4byte gUnknown_2023C34
+_08012B8C: .4byte gChosenMoveByBattler
_08012B90: .4byte gBitTable
_08012B94: .4byte gActiveBattler
_08012B98: .4byte 0xffff1fff
@@ -5780,7 +5780,7 @@ sub_8012BC8: @ 8012BC8
mov r8, r0
ldr r1, _08012F68 @ =gMoveSelectionCursor
mov r9, r1
- ldr r2, _08012F6C @ =gUnknown_2023E8C
+ ldr r2, _08012F6C @ =gProtectStructs
mov r12, r2
adds r5, r7, 0
movs r4, 0x58
@@ -6241,7 +6241,7 @@ _08012F5C: .4byte gActiveBattler
_08012F60: .4byte gStatuses3
_08012F64: .4byte gActionSelectionCursor
_08012F68: .4byte gMoveSelectionCursor
-_08012F6C: .4byte gUnknown_2023E8C
+_08012F6C: .4byte gProtectStructs
_08012F70: .4byte gBattleMons
_08012F74: .4byte gBattlersCount
_08012F78: .4byte gBitTable
@@ -6262,7 +6262,7 @@ _08012FA8: .4byte gBaseStats
thumb_func_start BattleIntroGetMonsData
BattleIntroGetMonsData: @ 8012FAC
push {r4,r5,lr}
- ldr r5, _08012FBC @ =gUnknown_2023E82
+ ldr r5, _08012FBC @ =gBattleCommunication
ldrb r0, [r5]
cmp r0, 0
beq _08012FC0
@@ -6270,7 +6270,7 @@ BattleIntroGetMonsData: @ 8012FAC
beq _08012FE4
b _0801301A
.align 2, 0
-_08012FBC: .4byte gUnknown_2023E82
+_08012FBC: .4byte gBattleCommunication
_08012FC0:
ldr r4, _08012FE0 @ =gActiveBattler
ldrb r0, [r5, 0x1]
@@ -6280,7 +6280,7 @@ _08012FC0:
movs r2, 0
bl BtlController_EmitGetMonData
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -6334,11 +6334,11 @@ BattleIntroPrepareBackgroundSlide: @ 8013020
movs r0, 0
bl BtlController_EmitIntroSlide
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
ldr r1, _08013064 @ =gBattleMainFunc
ldr r0, _08013068 @ =sub_8013070
str r0, [r1]
- ldr r0, _0801306C @ =gUnknown_2023E82
+ ldr r0, _0801306C @ =gBattleCommunication
strb r5, [r0]
strb r5, [r0, 0x1]
_08013050:
@@ -6351,7 +6351,7 @@ _0801305C: .4byte gActiveBattler
_08013060: .4byte gUnknown_2022B50
_08013064: .4byte gBattleMainFunc
_08013068: .4byte sub_8013070
-_0801306C: .4byte gUnknown_2023E82
+_0801306C: .4byte gBattleCommunication
thumb_func_end BattleIntroPrepareBackgroundSlide
thumb_func_start sub_8013070
@@ -6528,7 +6528,7 @@ _080131B6:
movs r0, 0
bl BtlController_EmitDrawTrainerPic
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_080131D0:
ldr r5, _08013244 @ =gBattleTypeFlags
ldr r0, [r5]
@@ -6545,7 +6545,7 @@ _080131D0:
movs r0, 0
bl BtlController_EmitDrawTrainerPic
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_080131F6:
ldrb r0, [r4]
bl GetBattlerSide
@@ -6634,7 +6634,7 @@ _080132B4:
bl BtlController_EmitLoadMonSprite
mov r1, r9
ldrb r0, [r1]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_080132C2:
ldr r0, _08013328 @ =gBattleTypeFlags
ldr r0, [r0]
@@ -6659,7 +6659,7 @@ _080132EC:
movs r0, 0
bl BtlController_EmitDrawTrainerPic
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_080132F8:
mov r2, r9
ldrb r0, [r2]
@@ -6770,7 +6770,7 @@ _080133B6:
movs r2, 0x80
bl BtlController_EmitDrawPartyStatusSummary
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
movs r7, 0
mov r6, r8
mov r5, sp
@@ -6825,7 +6825,7 @@ _0801342E:
movs r2, 0x80
bl BtlController_EmitDrawPartyStatusSummary
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
ldr r1, _08013460 @ =gBattleMainFunc
ldr r0, _08013464 @ =BattleIntroPrintTrainerWantsToBattle
b _080134C6
@@ -7009,7 +7009,7 @@ _080135B4:
movs r0, 0
bl BtlController_EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_080135CE:
ldr r0, _08013620 @ =gBattleTypeFlags
ldr r0, [r0]
@@ -7026,7 +7026,7 @@ _080135CE:
movs r0, 0
bl BtlController_EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_080135F4:
ldrb r0, [r4]
adds r0, 0x1
@@ -7203,7 +7203,7 @@ _08013740:
movs r0, 0
bl BtlController_EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_08013758:
ldr r0, _080137C0 @ =gBattleTypeFlags
ldr r0, [r0]
@@ -7220,7 +7220,7 @@ _08013758:
movs r0, 0
bl BtlController_EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_0801377E:
ldrb r0, [r4]
adds r0, 0x1
@@ -7289,7 +7289,7 @@ _080137EA:
movs r2, 0
bl BtlController_EmitSwitchInAnim
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
_0801380C:
ldrb r0, [r4]
adds r0, 0x1
@@ -7356,7 +7356,7 @@ _08013874:
ldrb r0, [r1]
cmp r5, r0
bge _0801389A
- ldr r2, _080138AC @ =gUnknown_2023BDE
+ ldr r2, _080138AC @ =gBattlerByTurnOrder
_0801388E:
adds r0, r5, r2
strb r5, [r0]
@@ -7371,14 +7371,14 @@ _0801389A:
_080138A0: .4byte gBattleControllerExecFlags
_080138A4: .4byte gBattleStruct
_080138A8: .4byte gBattlersCount
-_080138AC: .4byte gUnknown_2023BDE
+_080138AC: .4byte gBattlerByTurnOrder
_080138B0:
adds r4, r5, 0x1
mov r8, r4
ldrb r1, [r1]
cmp r8, r1
bge _080138EE
- ldr r6, _08013924 @ =gUnknown_2023BDE
+ ldr r6, _08013924 @ =gBattlerByTurnOrder
ldr r3, _08013928 @ =gBattlersCount
lsls r7, r5, 24
_080138C0:
@@ -7434,7 +7434,7 @@ _080138FA:
strb r1, [r0]
b _08013ADA
.align 2, 0
-_08013924: .4byte gUnknown_2023BDE
+_08013924: .4byte gBattlerByTurnOrder
_08013928: .4byte gBattlersCount
_0801392C: .4byte gBattleStruct
_08013930:
@@ -7446,7 +7446,7 @@ _08013930:
ldrb r1, [r1]
cmp r0, r1
bcs _0801398A
- ldr r5, _08013AF0 @ =gUnknown_2023BDE
+ ldr r5, _08013AF0 @ =gBattlerByTurnOrder
adds r4, r2, 0
_08013944:
ldr r0, [r4]
@@ -7519,7 +7519,7 @@ _080139BA:
ldrb r1, [r3]
cmp r0, r1
bcs _08013A14
- ldr r5, _08013AF0 @ =gUnknown_2023BDE
+ ldr r5, _08013AF0 @ =gBattlerByTurnOrder
adds r4, r2, 0
_080139D0:
ldr r0, [r4]
@@ -7530,7 +7530,7 @@ _080139D0:
movs r0, 0
movs r2, 0
str r3, [sp, 0x4]
- bl sub_801BC68
+ bl ItemBattleEffects
lsls r0, 24
ldr r3, [sp, 0x4]
cmp r0, 0
@@ -7602,7 +7602,7 @@ _08013A32:
ldr r0, _08013B04 @ =sub_8014040
str r0, [r1]
bl ResetSentPokesToOpponentValue
- ldr r1, _08013B08 @ =gUnknown_2023E82
+ ldr r1, _08013B08 @ =gBattleCommunication
movs r2, 0
adds r0, r1, 0x7
_08013A74:
@@ -7669,13 +7669,13 @@ _08013ADA:
.align 2, 0
_08013AE8: .4byte gBattleStruct
_08013AEC: .4byte gBattlersCount
-_08013AF0: .4byte gUnknown_2023BDE
+_08013AF0: .4byte gBattlerByTurnOrder
_08013AF4: .4byte gUnknown_2023D7C
_08013AF8: .4byte gUnknown_2023DC4
_08013AFC: .4byte gAbsentBattlerFlags
_08013B00: .4byte gBattleMainFunc
_08013B04: .4byte sub_8014040
-_08013B08: .4byte gUnknown_2023E82
+_08013B08: .4byte gBattleCommunication
_08013B0C: .4byte gBattleScripting
_08013B10: .4byte gMoveResultFlags
_08013B14: .4byte gBattleMons
@@ -7690,10 +7690,10 @@ sub_8013B1C: @ 8013B1C
cmp r0, 0
bne _08013BAC
ldr r1, _08013BB8 @ =gBattleMainFunc
- ldr r0, _08013BBC @ =sub_8013BD4
+ ldr r0, _08013BBC @ =BattleTurnPassed
str r0, [r1]
ldr r3, _08013BC0 @ =gBattlersCount
- ldr r1, _08013BC4 @ =gUnknown_2023E82
+ ldr r1, _08013BC4 @ =gBattleCommunication
movs r2, 0
adds r0, r1, 0x7
_08013B34:
@@ -7766,16 +7766,16 @@ _08013BAC:
.align 2, 0
_08013BB4: .4byte gBattleControllerExecFlags
_08013BB8: .4byte gBattleMainFunc
-_08013BBC: .4byte sub_8013BD4
+_08013BBC: .4byte BattleTurnPassed
_08013BC0: .4byte gBattlersCount
-_08013BC4: .4byte gUnknown_2023E82
+_08013BC4: .4byte gBattleCommunication
_08013BC8: .4byte gBattleMons
_08013BCC: .4byte gBattleStruct
_08013BD0: .4byte gMoveResultFlags
thumb_func_end sub_8013B1C
- thumb_func_start sub_8013BD4
-sub_8013BD4: @ 8013BD4
+ thumb_func_start BattleTurnPassed
+BattleTurnPassed: @ 8013BD4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7787,13 +7787,13 @@ sub_8013BD4: @ 8013BD4
ldrb r0, [r0]
cmp r0, 0
bne _08013C04
- bl UpdateTurnCounters
+ bl DoFieldEndTurnEffects
lsls r0, 24
cmp r0, 0
beq _08013BF8
b _08013D20
_08013BF8:
- bl TurnBasedEffects
+ bl DoBattlerEndTurnEffects
lsls r0, 24
cmp r0, 0
beq _08013C04
@@ -7810,14 +7810,14 @@ _08013C12:
ldr r0, [r0]
adds r0, 0x4D
strb r1, [r0]
- bl sub_8018C98
+ bl HandleWishPerishSongOnTurnEnd
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _08013D20
movs r0, 0
bl TurnValuesCleanUp
- ldr r2, _08013C80 @ =gUnknown_2023DD0
+ ldr r2, _08013C80 @ =gHitMarker
ldr r0, [r2]
ldr r1, _08013C84 @ =0xfffffdff
ands r0, r1
@@ -7836,7 +7836,7 @@ _08013C12:
str r4, [r0]
ldr r0, _08013C9C @ =gMoveResultFlags
strb r4, [r0]
- ldr r1, _08013CA0 @ =gUnknown_2023E82
+ ldr r1, _08013CA0 @ =gBattleCommunication
movs r2, 0
adds r0, r1, 0x4
_08013C58:
@@ -7858,7 +7858,7 @@ _08013C58:
.align 2, 0
_08013C78: .4byte gBattleOutcome
_08013C7C: .4byte gBattleStruct
-_08013C80: .4byte gUnknown_2023DD0
+_08013C80: .4byte gHitMarker
_08013C84: .4byte 0xfffffdff
_08013C88: .4byte 0xfff7ffff
_08013C8C: .4byte 0xffbfffff
@@ -7866,7 +7866,7 @@ _08013C90: .4byte 0xffefffff
_08013C94: .4byte gBattleScripting
_08013C98: .4byte gBattleMoveDamage
_08013C9C: .4byte gMoveResultFlags
-_08013CA0: .4byte gUnknown_2023E82
+_08013CA0: .4byte gBattleCommunication
_08013CA4: .4byte gUnknown_2023BE3
_08013CA8: .4byte gBattleMainFunc
_08013CAC: .4byte RunTurnActionsFunctions
@@ -7948,7 +7948,7 @@ _08013D44: .4byte sub_8014040
_08013D48: .4byte gUnknown_2023D7C
_08013D4C: .4byte gUnknown_2023DC4
_08013D50: .4byte gUnknown_2023E80
- thumb_func_end sub_8013BD4
+ thumb_func_end BattleTurnPassed
thumb_func_start IsRunningFromBattleImpossible
IsRunningFromBattleImpossible: @ 8013D54
@@ -8120,7 +8120,7 @@ _08013E8A:
adds r0, 0x20
ldrb r0, [r0]
strb r0, [r2]
- ldr r1, _08013EC0 @ =gUnknown_2023E82
+ ldr r1, _08013EC0 @ =gBattleCommunication
movs r0, 0x2
b _08013F5C
.align 2, 0
@@ -8131,7 +8131,7 @@ _08013EB0: .4byte gBattleMons
_08013EB4: .4byte gBattlersCount
_08013EB8: .4byte gBattleScripting
_08013EBC: .4byte gLastUsedAbility
-_08013EC0: .4byte gUnknown_2023E82
+_08013EC0: .4byte gBattleCommunication
_08013EC4:
ldr r1, _08013EF8 @ =gBattleMons
ldr r0, _08013EFC @ =gActiveBattler
@@ -8155,7 +8155,7 @@ _08013EC4:
cmp r0, 0
beq _08013F0C
_08013EEE:
- ldr r1, _08013F08 @ =gUnknown_2023E82
+ ldr r1, _08013F08 @ =gBattleCommunication
movs r0, 0
strb r0, [r1, 0x5]
movs r0, 0x1
@@ -8165,7 +8165,7 @@ _08013EF8: .4byte gBattleMons
_08013EFC: .4byte gActiveBattler
_08013F00: .4byte 0x0400e000
_08013F04: .4byte gStatuses3
-_08013F08: .4byte gUnknown_2023E82
+_08013F08: .4byte gBattleCommunication
_08013F0C:
ldr r0, _08013F1C @ =gBattleTypeFlags
ldr r0, [r0]
@@ -8184,28 +8184,28 @@ _08013F20:
ldr r1, _08013F34 @ =gLastUsedAbility
ldrb r0, [r2]
strb r0, [r1]
- ldr r1, _08013F38 @ =gUnknown_2023E82
+ ldr r1, _08013F38 @ =gBattleCommunication
movs r0, 0x2
b _08013F5C
.align 2, 0
_08013F30: .4byte gBattleScripting
_08013F34: .4byte gLastUsedAbility
-_08013F38: .4byte gUnknown_2023E82
+_08013F38: .4byte gBattleCommunication
_08013F3C:
ldr r0, _08013F4C @ =gBattleScripting
strb r5, [r0, 0x17]
ldr r1, _08013F50 @ =gLastUsedAbility
ldrb r0, [r2]
strb r0, [r1]
- ldr r1, _08013F54 @ =gUnknown_2023E82
+ ldr r1, _08013F54 @ =gBattleCommunication
movs r0, 0x2
b _08013F5C
.align 2, 0
_08013F4C: .4byte gBattleScripting
_08013F50: .4byte gLastUsedAbility
-_08013F54: .4byte gUnknown_2023E82
+_08013F54: .4byte gBattleCommunication
_08013F58:
- ldr r1, _08013F68 @ =gUnknown_2023E82
+ ldr r1, _08013F68 @ =gBattleCommunication
movs r0, 0x1
_08013F5C:
strb r0, [r1, 0x5]
@@ -8215,7 +8215,7 @@ _08013F5E:
pop {r1}
bx r1
.align 2, 0
-_08013F68: .4byte gUnknown_2023E82
+_08013F68: .4byte gBattleCommunication
thumb_func_end IsRunningFromBattleImpossible
thumb_func_start sub_8013F6C
@@ -8335,7 +8335,7 @@ sub_8014040: @ 8014040
mov r5, r8
push {r5-r7}
sub sp, 0x1C
- ldr r0, _0801408C @ =gUnknown_2023E82
+ ldr r0, _0801408C @ =gBattleCommunication
movs r1, 0
strb r1, [r0, 0x4]
ldr r0, _08014090 @ =gActiveBattler
@@ -8352,7 +8352,7 @@ _08014064:
bl GetBattlerPosition
lsls r0, 24
lsrs r5, r0, 24
- ldr r1, _0801408C @ =gUnknown_2023E82
+ ldr r1, _0801408C @ =gBattleCommunication
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -8366,7 +8366,7 @@ _08014080:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_0801408C: .4byte gUnknown_2023E82
+_0801408C: .4byte gBattleCommunication
_08014090: .4byte gActiveBattler
_08014094: .4byte gBattlersCount
_08014098: .4byte _0801409C
@@ -8413,7 +8413,7 @@ _080140B8:
ands r1, r0
cmp r1, 0
bne _08014114
- ldr r4, _08014160 @ =gUnknown_2023E82
+ ldr r4, _08014160 @ =gBattleCommunication
adds r0, r5, 0
bl GetBattlerAtPosition
lsls r0, 24
@@ -8447,7 +8447,7 @@ _08014114:
ands r0, r1
cmp r0, 0
bne _08014168
- ldr r0, _08014160 @ =gUnknown_2023E82
+ ldr r0, _08014160 @ =gBattleCommunication
ldrb r1, [r4]
adds r1, r0
movs r0, 0x4
@@ -8458,17 +8458,17 @@ _08014150: .4byte gActiveBattler
_08014154: .4byte gBattleStruct
_08014158: .4byte gBattleTypeFlags
_0801415C: .4byte gBitTable
-_08014160: .4byte gUnknown_2023E82
+_08014160: .4byte gBattleCommunication
_08014164: .4byte gUnknown_2023D7C
_08014168:
- ldr r0, _08014178 @ =gUnknown_2023E82
+ ldr r0, _08014178 @ =gBattleCommunication
ldrb r1, [r4]
adds r1, r0
movs r0, 0x3
strb r0, [r1]
bl _08014C4E
.align 2, 0
-_08014178: .4byte gUnknown_2023E82
+_08014178: .4byte gBattleCommunication
_0801417C:
ldr r1, _080141B0 @ =gBattleMons
movs r0, 0x58
@@ -8490,7 +8490,7 @@ _0801419C:
ldr r0, _080141B4 @ =gUnknown_2023D7C
adds r0, r2, r0
strb r3, [r0]
- ldr r1, _080141B8 @ =gUnknown_2023E82
+ ldr r1, _080141B8 @ =gBattleCommunication
ldrb r0, [r4]
adds r0, r1
movs r1, 0x3
@@ -8499,7 +8499,7 @@ _0801419C:
.align 2, 0
_080141B0: .4byte gBattleMons
_080141B4: .4byte gUnknown_2023D7C
-_080141B8: .4byte gUnknown_2023E82
+_080141B8: .4byte gBattleCommunication
_080141BC:
ldr r0, _080141D4 @ =gUnknown_2023D7C
ldrb r1, [r0]
@@ -8582,11 +8582,11 @@ _0801424C:
.4byte _080146AC
.4byte _08014670
_08014280:
- bl sub_8017998
+ bl AreAllMovesUnusable
lsls r0, 24
cmp r0, 0
beq _080142D8
- ldr r0, _080142C8 @ =gUnknown_2023E82
+ ldr r0, _080142C8 @ =gBattleCommunication
ldr r3, _080142CC @ =gActiveBattler
ldrb r1, [r3]
adds r1, r0
@@ -8616,7 +8616,7 @@ _08014280:
strb r0, [r2, 0xC]
bl _08014C78
.align 2, 0
-_080142C8: .4byte gUnknown_2023E82
+_080142C8: .4byte gBattleCommunication
_080142CC: .4byte gActiveBattler
_080142D0: .4byte gBattleStruct
_080142D4: .4byte gBattleBufferB
@@ -8646,7 +8646,7 @@ _080142D8:
adds r0, r3
ldrb r0, [r0, 0xC]
strb r0, [r1]
- ldr r1, _08014328 @ =gUnknown_2023E82
+ ldr r1, _08014328 @ =gBattleCommunication
ldrb r0, [r5]
adds r0, r1
movs r1, 0x3
@@ -8657,7 +8657,7 @@ _08014318: .4byte gDisableStructs
_0801431C: .4byte gActiveBattler
_08014320: .4byte gUnknown_2023DC4
_08014324: .4byte gBattleStruct
-_08014328: .4byte gUnknown_2023E82
+_08014328: .4byte gBattleCommunication
_0801432C:
add r2, sp, 0x4
ldr r3, _080143CC @ =gBattleMons
@@ -8748,14 +8748,14 @@ _080143D4:
ands r0, r1
cmp r0, 0
beq _08014428
- ldr r1, _08014418 @ =gUnknown_2023D80
+ ldr r1, _08014418 @ =gSelectionBattleScripts
mov r3, r8
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
ldr r1, _0801441C @ =gUnknown_81D96A4
str r1, [r0]
- ldr r0, _08014420 @ =gUnknown_2023E82
+ ldr r0, _08014420 @ =gBattleCommunication
ldrb r1, [r3]
adds r1, r0
movs r3, 0
@@ -8774,9 +8774,9 @@ _080143D4:
.align 2, 0
_08014410: .4byte gBattleTypeFlags
_08014414: .4byte 0x00000902
-_08014418: .4byte gUnknown_2023D80
+_08014418: .4byte gSelectionBattleScripts
_0801441C: .4byte gUnknown_81D96A4
-_08014420: .4byte gUnknown_2023E82
+_08014420: .4byte gBattleCommunication
_08014424: .4byte gBattleStruct
_08014428:
ldr r2, _08014448 @ =gBattleStruct
@@ -8790,7 +8790,7 @@ _08014428:
movs r0, 0
bl BtlController_EmitChooseItem
ldrb r0, [r4]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
b _080146AC
.align 2, 0
_08014448: .4byte gBattleStruct
@@ -9011,7 +9011,7 @@ _080145F0:
_0801460E:
ldr r0, _0801461C @ =gActiveBattler
ldrb r0, [r0]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
b _080146AC
.align 2, 0
_08014618: .4byte gBattleStruct
@@ -9021,14 +9021,14 @@ _08014620:
lsls r0, 24
cmp r0, 0
beq _080146AC
- ldr r1, _0801465C @ =gUnknown_2023D80
+ ldr r1, _0801465C @ =gSelectionBattleScripts
ldr r3, _08014660 @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
ldr r1, _08014664 @ =gUnknown_81D8949
str r1, [r0]
- ldr r0, _08014668 @ =gUnknown_2023E82
+ ldr r0, _08014668 @ =gBattleCommunication
ldrb r1, [r3]
adds r1, r0
movs r4, 0
@@ -9047,13 +9047,13 @@ _08014620:
strb r4, [r0]
b _08014C78
.align 2, 0
-_0801465C: .4byte gUnknown_2023D80
+_0801465C: .4byte gSelectionBattleScripts
_08014660: .4byte gActiveBattler
_08014664: .4byte gUnknown_81D8949
-_08014668: .4byte gUnknown_2023E82
+_08014668: .4byte gBattleCommunication
_0801466C: .4byte gBattleStruct
_08014670:
- ldr r4, _080146A8 @ =gUnknown_2023E82
+ ldr r4, _080146A8 @ =gBattleCommunication
mov r2, r8
ldrb r1, [r2]
adds r1, r4
@@ -9075,10 +9075,10 @@ _08014670:
bl BtlController_EmitEndBounceEffect
mov r3, r8
ldrb r0, [r3]
- bl MarkBufferBankForExecution
+ bl MarkBattlerForControllerExec
b _08014C78
.align 2, 0
-_080146A8: .4byte gUnknown_2023E82
+_080146A8: .4byte gBattleCommunication
_080146AC:
ldr r0, _080146D8 @ =gBattleTypeFlags
ldr r0, [r0]
@@ -9097,7 +9097,7 @@ _080146AC:
bne _080146EC
ldr r0, _080146E4 @ =gUnknown_81D8924
bl BattleScriptExecute
- ldr r1, _080146E8 @ =gUnknown_2023E82
+ ldr r1, _080146E8 @ =gBattleCommunication
ldrb r0, [r4]
adds r0, r1
b _08014926
@@ -9106,7 +9106,7 @@ _080146D8: .4byte gBattleTypeFlags
_080146DC: .4byte gBattleBufferB
_080146E0: .4byte gActiveBattler
_080146E4: .4byte gUnknown_81D8924
-_080146E8: .4byte gUnknown_2023E82
+_080146E8: .4byte gBattleCommunication
_080146EC:
bl IsRunningFromBattleImpossible
lsls r0, 24
@@ -9121,12 +9121,12 @@ _080146EC:
ldrb r0, [r1]
cmp r0, 0x3
bne _08014750
- ldr r1, _08014740 @ =gUnknown_2023D80
+ ldr r1, _08014740 @ =gSelectionBattleScripts
lsls r0, r2, 2
adds r0, r1
ldr r1, _08014744 @ =gUnknown_81D8943
str r1, [r0]
- ldr r0, _08014748 @ =gUnknown_2023E82
+ ldr r0, _08014748 @ =gBattleCommunication
ldrb r1, [r4]
adds r1, r0
movs r3, 0
@@ -9148,18 +9148,18 @@ _0801472C:
.align 2, 0
_08014738: .4byte gBattleBufferB
_0801473C: .4byte gActiveBattler
-_08014740: .4byte gUnknown_2023D80
+_08014740: .4byte gSelectionBattleScripts
_08014744: .4byte gUnknown_81D8943
-_08014748: .4byte gUnknown_2023E82
+_08014748: .4byte gBattleCommunication
_0801474C: .4byte gBattleStruct
_08014750:
- ldr r2, _0801475C @ =gUnknown_2023E82
+ ldr r2, _0801475C @ =gBattleCommunication
ldr r0, _08014760 @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_0801475C: .4byte gUnknown_2023E82
+_0801475C: .4byte gBattleCommunication
_08014760: .4byte gActiveBattler
_08014764:
ldr r4, _080147A8 @ =gBattleControllerExecFlags
@@ -9251,18 +9251,18 @@ _08014808:
ldr r0, _08014830 @ =0x0000ffff
cmp r2, r0
bne _08014838
- ldr r0, _08014834 @ =gUnknown_2023E82
+ ldr r0, _08014834 @ =gBattleCommunication
adds r0, r4, r0
b _08014926
.align 2, 0
_08014830: .4byte 0x0000ffff
-_08014834: .4byte gUnknown_2023E82
+_08014834: .4byte gBattleCommunication
_08014838:
- bl sub_8017594
+ bl TrySetCantSelectMoveBattleScript
lsls r0, 24
cmp r0, 0
beq _0801487C
- ldr r0, _08014874 @ =gUnknown_2023E82
+ ldr r0, _08014874 @ =gBattleCommunication
ldrb r1, [r5]
adds r1, r0
movs r3, 0
@@ -9287,7 +9287,7 @@ _08014838:
strb r0, [r1]
b _08014C78
.align 2, 0
-_08014874: .4byte gUnknown_2023E82
+_08014874: .4byte gBattleCommunication
_08014878: .4byte gBattleStruct
_0801487C:
mov r2, r8
@@ -9324,14 +9324,14 @@ _0801487C:
add r0, r9
ldrb r0, [r0]
strb r0, [r4, 0xC]
- ldr r0, _080148D4 @ =gUnknown_2023E82
+ ldr r0, _080148D4 @ =gBattleCommunication
ldrb r1, [r3]
b _08014B30
.align 2, 0
_080148C8: .4byte gBattleStruct
_080148CC: .4byte gUnknown_2023DC4
_080148D0: .4byte gBattleMons
-_080148D4: .4byte gUnknown_2023E82
+_080148D4: .4byte gBattleCommunication
_080148D8:
ldr r2, _08014900 @ =gBattleBufferB
ldr r5, _08014904 @ =gActiveBattler
@@ -9351,14 +9351,14 @@ _080148D8:
_080148F6:
ldr r0, _08014908 @ =gLastUsedItem
strh r3, [r0]
- ldr r0, _0801490C @ =gUnknown_2023E82
+ ldr r0, _0801490C @ =gBattleCommunication
ldrb r1, [r5]
b _08014B30
.align 2, 0
_08014900: .4byte gBattleBufferB
_08014904: .4byte gActiveBattler
_08014908: .4byte gLastUsedItem
-_0801490C: .4byte gUnknown_2023E82
+_0801490C: .4byte gBattleCommunication
_08014910:
ldr r6, _0801492C @ =gBattleBufferB
ldr r7, _08014930 @ =gActiveBattler
@@ -9369,7 +9369,7 @@ _08014910:
ldrb r1, [r0]
cmp r1, 0x6
bne _08014938
- ldr r0, _08014934 @ =gUnknown_2023E82
+ ldr r0, _08014934 @ =gBattleCommunication
adds r0, r2, r0
_08014926:
movs r1, 0
@@ -9378,7 +9378,7 @@ _08014926:
.align 2, 0
_0801492C: .4byte gBattleBufferB
_08014930: .4byte gActiveBattler
-_08014934: .4byte gUnknown_2023E82
+_08014934: .4byte gBattleCommunication
_08014938:
ldr r0, _080149FC @ =gBattleStruct
mov r12, r0
@@ -9476,80 +9476,80 @@ _08014938:
ldrb r0, [r0]
strb r0, [r1]
_080149F6:
- ldr r0, _08014A04 @ =gUnknown_2023E82
+ ldr r0, _08014A04 @ =gBattleCommunication
ldrb r1, [r7]
b _08014B30
.align 2, 0
_080149FC: .4byte gBattleStruct
_08014A00: .4byte gBattleTypeFlags
-_08014A04: .4byte gUnknown_2023E82
+_08014A04: .4byte gBattleCommunication
_08014A08:
- ldr r2, _08014A20 @ =gUnknown_2023DD0
+ ldr r2, _08014A20 @ =gHitMarker
ldr r0, [r2]
movs r1, 0x80
lsls r1, 8
orrs r0, r1
str r0, [r2]
- ldr r2, _08014A24 @ =gUnknown_2023E82
+ ldr r2, _08014A24 @ =gBattleCommunication
ldr r0, _08014A28 @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_08014A20: .4byte gUnknown_2023DD0
-_08014A24: .4byte gUnknown_2023E82
+_08014A20: .4byte gHitMarker
+_08014A24: .4byte gBattleCommunication
_08014A28: .4byte gActiveBattler
_08014A2C:
- ldr r2, _08014A38 @ =gUnknown_2023E82
+ ldr r2, _08014A38 @ =gBattleCommunication
ldr r0, _08014A3C @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_08014A38: .4byte gUnknown_2023E82
+_08014A38: .4byte gBattleCommunication
_08014A3C: .4byte gActiveBattler
_08014A40:
- ldr r2, _08014A4C @ =gUnknown_2023E82
+ ldr r2, _08014A4C @ =gBattleCommunication
ldr r0, _08014A50 @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_08014A4C: .4byte gUnknown_2023E82
+_08014A4C: .4byte gBattleCommunication
_08014A50: .4byte gActiveBattler
_08014A54:
- ldr r2, _08014A60 @ =gUnknown_2023E82
+ ldr r2, _08014A60 @ =gBattleCommunication
ldr r0, _08014A64 @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_08014A60: .4byte gUnknown_2023E82
+_08014A60: .4byte gBattleCommunication
_08014A64: .4byte gActiveBattler
_08014A68:
- ldr r2, _08014A80 @ =gUnknown_2023DD0
+ ldr r2, _08014A80 @ =gHitMarker
ldr r0, [r2]
movs r1, 0x80
lsls r1, 8
orrs r0, r1
str r0, [r2]
- ldr r2, _08014A84 @ =gUnknown_2023E82
+ ldr r2, _08014A84 @ =gBattleCommunication
ldr r0, _08014A88 @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_08014A80: .4byte gUnknown_2023DD0
-_08014A84: .4byte gUnknown_2023E82
+_08014A80: .4byte gHitMarker
+_08014A84: .4byte gBattleCommunication
_08014A88: .4byte gActiveBattler
_08014A8C:
- ldr r2, _08014A98 @ =gUnknown_2023E82
+ ldr r2, _08014A98 @ =gBattleCommunication
ldr r0, _08014A9C @ =gActiveBattler
ldrb r1, [r0]
adds r1, r2
b _08014B32
.align 2, 0
-_08014A98: .4byte gUnknown_2023E82
+_08014A98: .4byte gBattleCommunication
_08014A9C: .4byte gActiveBattler
_08014AA0:
ldr r3, _08014B08 @ =gBattleControllerExecFlags
@@ -9618,8 +9618,8 @@ _08014B24:
ldr r4, _08014B3C @ =gActiveBattler
_08014B26:
ldrb r0, [r4]
- bl MarkBufferBankForExecution
- ldr r0, _08014B40 @ =gUnknown_2023E82
+ bl MarkBattlerForControllerExec
+ ldr r0, _08014B40 @ =gBattleCommunication
ldrb r1, [r4]
_08014B30:
adds r1, r0
@@ -9630,7 +9630,7 @@ _08014B32:
b _08014C4E
.align 2, 0
_08014B3C: .4byte gActiveBattler
-_08014B40: .4byte gUnknown_2023E82
+_08014B40: .4byte gBattleCommunication
_08014B44:
ldr r3, _08014B78 @ =gBattleControllerExecFlags
ldr r1, _08014B7C @ =gBitTable
@@ -9652,7 +9652,7 @@ _08014B44:
ands r0, r1
cmp r0, 0
bne _08014C4E
- ldr r1, _08014B84 @ =gUnknown_2023E82
+ ldr r1, _08014B84 @ =gBattleCommunication
ldrb r0, [r1, 0x4]
adds r0, 0x1
strb r0, [r1, 0x4]
@@ -9661,7 +9661,7 @@ _08014B44:
_08014B78: .4byte gBattleControllerExecFlags
_08014B7C: .4byte gBitTable
_08014B80: .4byte gActiveBattler
-_08014B84: .4byte gUnknown_2023E82
+_08014B84: .4byte gBattleCommunication
_08014B88:
ldr r5, _08014BA8 @ =gActiveBattler
ldrb r2, [r5]
@@ -9673,7 +9673,7 @@ _08014B88:
ldrb r0, [r0]
cmp r0, 0
beq _08014BB4
- ldr r0, _08014BB0 @ =gUnknown_2023E82
+ ldr r0, _08014BB0 @ =gBattleCommunication
adds r0, r2, r0
adds r1, 0x84
ldrb r1, [r1]
@@ -9682,12 +9682,12 @@ _08014B88:
.align 2, 0
_08014BA8: .4byte gActiveBattler
_08014BAC: .4byte gBattleStruct
-_08014BB0: .4byte gUnknown_2023E82
+_08014BB0: .4byte gBattleCommunication
_08014BB4:
ldr r0, _08014C08 @ =gBattlerAttacker
strb r2, [r0]
- ldr r7, _08014C0C @ =gUnknown_2023D74
- ldr r6, _08014C10 @ =gUnknown_2023D80
+ ldr r7, _08014C0C @ =gBattlescriptCurrInstr
+ ldr r6, _08014C10 @ =gSelectionBattleScripts
ldrb r0, [r5]
lsls r0, 2
adds r0, r6
@@ -9727,8 +9727,8 @@ _08014BFA:
b _08014C4E
.align 2, 0
_08014C08: .4byte gBattlerAttacker
-_08014C0C: .4byte gUnknown_2023D74
-_08014C10: .4byte gUnknown_2023D80
+_08014C0C: .4byte gBattlescriptCurrInstr
+_08014C10: .4byte gSelectionBattleScripts
_08014C14: .4byte gBattleControllerExecFlags
_08014C18: .4byte gBitTable
_08014C1C: .4byte gUnknown_825011C
@@ -9754,7 +9754,7 @@ _08014C20:
cmp r3, 0
bne _08014C4E
_08014C48:
- ldr r0, _08014C94 @ =gUnknown_2023E82
+ ldr r0, _08014C94 @ =gBattleCommunication
adds r0, r4, r0
strb r3, [r0]
_08014C4E:
@@ -9771,7 +9771,7 @@ _08014C4E:
bcs _08014C68
bl _08014064
_08014C68:
- ldr r0, _08014C94 @ =gUnknown_2023E82
+ ldr r0, _08014C94 @ =gBattleCommunication
ldrb r0, [r0, 0x4]
ldrb r2, [r2]
cmp r0, r2
@@ -9792,7 +9792,7 @@ _08014C78:
_08014C88: .4byte gBattleControllerExecFlags
_08014C8C: .4byte gBitTable
_08014C90: .4byte gActiveBattler
-_08014C94: .4byte gUnknown_2023E82
+_08014C94: .4byte gBattleCommunication
_08014C98: .4byte gBattlersCount
_08014C9C: .4byte gBattleMainFunc
_08014CA0: .4byte sub_80150A8
@@ -9812,7 +9812,7 @@ SwapTurnOrder: @ 8014CA4
ldrb r3, [r2]
strb r3, [r4]
strb r5, [r2]
- ldr r2, _08014CD4 @ =gUnknown_2023BDE
+ ldr r2, _08014CD4 @ =gBattlerByTurnOrder
adds r0, r2
ldrb r5, [r0]
adds r1, r2
@@ -9824,7 +9824,7 @@ SwapTurnOrder: @ 8014CA4
bx r0
.align 2, 0
_08014CD0: .4byte gUnknown_2023BDA
-_08014CD4: .4byte gUnknown_2023BDE
+_08014CD4: .4byte gBattlerByTurnOrder
thumb_func_end SwapTurnOrder
thumb_func_start GetWhoStrikesFirst
@@ -10163,7 +10163,7 @@ _08014F78:
adds r2, r0, 0
cmp r1, 0
bne _08014FC8
- ldr r0, _08014F9C @ =gUnknown_2023E8C
+ ldr r0, _08014F9C @ =gProtectStructs
lsls r1, r3, 4
adds r1, r0
ldrb r0, [r1]
@@ -10174,7 +10174,7 @@ _08014F78:
b _08014FCA
.align 2, 0
_08014F98: .4byte gUnknown_2023D7C
-_08014F9C: .4byte gUnknown_2023E8C
+_08014F9C: .4byte gProtectStructs
_08014FA0:
ldr r0, _08014FC0 @ =gBattleStruct
ldr r0, [r0]
@@ -10203,7 +10203,7 @@ _08014FCA:
ldrb r0, [r0]
cmp r0, 0
bne _08015014
- ldr r0, _08014FE8 @ =gUnknown_2023E8C
+ ldr r0, _08014FE8 @ =gProtectStructs
lsls r1, 4
adds r1, r0
ldrb r0, [r1]
@@ -10213,7 +10213,7 @@ _08014FCA:
movs r2, 0xA5
b _08015016
.align 2, 0
-_08014FE8: .4byte gUnknown_2023E8C
+_08014FE8: .4byte gProtectStructs
_08014FEC:
ldr r0, _0801500C @ =gBattleStruct
ldr r0, [r0]
@@ -10342,7 +10342,7 @@ _080150D0:
ldr r7, _08015108 @ =gUnknown_2023BDA
ldr r6, _0801510C @ =gUnknown_2023D7C
mov r2, r8
- ldr r5, _08015110 @ =gUnknown_2023BDE
+ ldr r5, _08015110 @ =gBattlerByTurnOrder
_080150D8:
adds r1, r3, r7
ldrb r0, [r2]
@@ -10368,7 +10368,7 @@ _08015100: .4byte gActiveBattler
_08015104: .4byte gBattlersCount
_08015108: .4byte gUnknown_2023BDA
_0801510C: .4byte gUnknown_2023D7C
-_08015110: .4byte gUnknown_2023BDE
+_08015110: .4byte gBattlerByTurnOrder
_08015114:
movs r0, 0x2
ands r1, r0
@@ -10428,7 +10428,7 @@ _08015174:
adds r0, r1
ldrb r0, [r0]
strb r0, [r6]
- ldr r2, _080151E4 @ =gUnknown_2023BDE
+ ldr r2, _080151E4 @ =gBattlerByTurnOrder
ldrb r0, [r3]
strb r0, [r2]
movs r3, 0x1
@@ -10476,7 +10476,7 @@ _080151CC:
_080151D8: .4byte gUnknown_2023D7C
_080151DC: .4byte gActiveBattler
_080151E0: .4byte gUnknown_2023BDA
-_080151E4: .4byte gUnknown_2023BDE
+_080151E4: .4byte gBattlerByTurnOrder
_080151E8: .4byte gBattleMainFunc
_080151EC: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts
_080151F0: .4byte gBattleStruct
@@ -10492,7 +10492,7 @@ _080151F8:
ldr r6, _0801528C @ =gUnknown_2023D7C
mov r2, r8
ldr r5, _08015290 @ =gUnknown_2023BDA
- ldr r4, _08015294 @ =gUnknown_2023BDE
+ ldr r4, _08015294 @ =gBattlerByTurnOrder
_0801520E:
ldrb r0, [r2]
adds r0, r6
@@ -10529,7 +10529,7 @@ _0801523E:
beq _08015282
ldr r6, _0801528C @ =gUnknown_2023D7C
ldr r5, _08015290 @ =gUnknown_2023BDA
- ldr r4, _08015294 @ =gUnknown_2023BDE
+ ldr r4, _08015294 @ =gBattlerByTurnOrder
_08015252:
ldrb r0, [r2]
adds r0, r6
@@ -10563,7 +10563,7 @@ _08015282:
_08015288: .4byte gBattlersCount
_0801528C: .4byte gUnknown_2023D7C
_08015290: .4byte gUnknown_2023BDA
-_08015294: .4byte gUnknown_2023BDE
+_08015294: .4byte gBattlerByTurnOrder
_08015298:
adds r4, r5, 0x1
adds r7, r4, 0
@@ -10574,7 +10574,7 @@ _08015298:
lsls r2, r5, 24
mov r8, r2
_080152A8:
- ldr r0, _0801531C @ =gUnknown_2023BDE
+ ldr r0, _0801531C @ =gBattlerByTurnOrder
adds r1, r5, r0
ldrb r3, [r1]
adds r0, r4, r0
@@ -10635,7 +10635,7 @@ _08015304:
bx r0
.align 2, 0
_08015318: .4byte gUnknown_2023BDA
-_0801531C: .4byte gUnknown_2023BDE
+_0801531C: .4byte gBattlerByTurnOrder
_08015320: .4byte gBattlersCount
_08015324: .4byte gBattleMainFunc
_08015328: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts
@@ -10660,9 +10660,9 @@ TurnValuesCleanUp: @ 8015330
adds r5, r1, 0
cmp r2, 0
beq _08015428
- ldr r7, _08015390 @ =gUnknown_2023E8C
+ ldr r7, _08015390 @ =gProtectStructs
adds r6, r5, 0
- ldr r0, _08015394 @ =gUnknown_2023C34
+ ldr r0, _08015394 @ =gChosenMoveByBattler
mov r12, r0
ldr r1, _08015398 @ =gDisableStructs
mov r8, r1
@@ -10691,8 +10691,8 @@ _0801535E:
.align 2, 0
_08015388: .4byte gActiveBattler
_0801538C: .4byte gBattlersCount
-_08015390: .4byte gUnknown_2023E8C
-_08015394: .4byte gUnknown_2023C34
+_08015390: .4byte gProtectStructs
+_08015394: .4byte gChosenMoveByBattler
_08015398: .4byte gDisableStructs
_0801539C:
ldrb r0, [r6]
@@ -10801,7 +10801,7 @@ SpecialStatusesClear: @ 8015450
beq _0801548E
adds r3, r2, 0
movs r4, 0
- ldr r5, _0801549C @ =gUnknown_2023ECC
+ ldr r5, _0801549C @ =gSpecialStatuses
_08015468:
ldrb r1, [r3]
lsls r0, r1, 2
@@ -10830,13 +10830,13 @@ _0801548E:
.align 2, 0
_08015494: .4byte gActiveBattler
_08015498: .4byte gBattlersCount
-_0801549C: .4byte gUnknown_2023ECC
+_0801549C: .4byte gSpecialStatuses
thumb_func_end SpecialStatusesClear
thumb_func_start CheckFocusPunch_ClearVarsBeforeTurnStarts
CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 80154A0
push {r4-r7,lr}
- ldr r0, _08015528 @ =gUnknown_2023DD0
+ ldr r0, _08015528 @ =gHitMarker
ldr r0, [r0]
movs r1, 0x80
lsls r1, 8
@@ -10893,7 +10893,7 @@ _080154CC:
lsls r0, 31
cmp r0, 0
bne _08015550
- ldr r0, _08015548 @ =gUnknown_2023E8C
+ ldr r0, _08015548 @ =gProtectStructs
lsls r1, r3, 4
adds r1, r0
ldrb r0, [r1]
@@ -10904,7 +10904,7 @@ _080154CC:
bl BattleScriptExecute
b _08015598
.align 2, 0
-_08015528: .4byte gUnknown_2023DD0
+_08015528: .4byte gHitMarker
_0801552C: .4byte gBattleStruct
_08015530: .4byte gBattlersCount
_08015534: .4byte gActiveBattler
@@ -10912,7 +10912,7 @@ _08015538: .4byte gBattlerAttacker
_0801553C: .4byte gUnknown_2023DC4
_08015540: .4byte gBattleMons
_08015544: .4byte gDisableStructs
-_08015548: .4byte gUnknown_2023E8C
+_08015548: .4byte gProtectStructs
_0801554C: .4byte gUnknown_81D9015
_08015550:
mov r2, r12
@@ -10941,7 +10941,7 @@ _0801555E:
ldr r1, _080155B4 @ =gBattleMainFunc
ldr r0, _080155B8 @ =RunTurnActionsFunctions
str r0, [r1]
- ldr r0, _080155BC @ =gUnknown_2023E82
+ ldr r0, _080155BC @ =gBattleCommunication
strb r2, [r0, 0x3]
strb r2, [r0, 0x4]
ldr r0, _080155C0 @ =gBattleScripting
@@ -10963,7 +10963,7 @@ _080155AC: .4byte gDynamicBasePower
_080155B0: .4byte gBattleStruct
_080155B4: .4byte gBattleMainFunc
_080155B8: .4byte RunTurnActionsFunctions
-_080155BC: .4byte gUnknown_2023E82
+_080155BC: .4byte gBattleCommunication
_080155C0: .4byte gBattleScripting
_080155C4: .4byte gBattleResources
thumb_func_end CheckFocusPunch_ClearVarsBeforeTurnStarts
@@ -10996,7 +10996,7 @@ _080155D8:
ldrb r0, [r0]
cmp r1, r0
bcc _08015644
- ldr r2, _08015634 @ =gUnknown_2023DD0
+ ldr r2, _08015634 @ =gHitMarker
ldr r0, [r2]
ldr r1, _08015638 @ =0xffefffff
ands r0, r1
@@ -11018,7 +11018,7 @@ _08015624: .4byte gBattleStruct
_08015628: .4byte gUnknown_2023BE2
_0801562C: .4byte gUnknown_8250038
_08015630: .4byte gBattlersCount
-_08015634: .4byte gUnknown_2023DD0
+_08015634: .4byte gHitMarker
_08015638: .4byte 0xffefffff
_0801563C: .4byte gBattleMainFunc
_08015640: .4byte gUnknown_8250070
@@ -11028,7 +11028,7 @@ _08015644:
ldrb r0, [r0]
cmp r0, r1
beq _0801565C
- ldr r2, _08015664 @ =gUnknown_2023DD0
+ ldr r2, _08015664 @ =gHitMarker
ldr r0, [r2]
ldr r1, _08015668 @ =0xfffffdff
ands r0, r1
@@ -11040,7 +11040,7 @@ _0801565C:
pop {r0}
bx r0
.align 2, 0
-_08015664: .4byte gUnknown_2023DD0
+_08015664: .4byte gHitMarker
_08015668: .4byte 0xfffffdff
_0801566C: .4byte 0xfff7ffff
thumb_func_end RunTurnActionsFunctions
@@ -11065,7 +11065,7 @@ sub_8015670: @ 8015670
bl GetBattlerAtPosition
ldr r1, _080156B8 @ =gBattlerAttacker
strb r0, [r1]
- ldr r1, _080156BC @ =gUnknown_2023D74
+ ldr r1, _080156BC @ =gBattlescriptCurrInstr
ldr r0, _080156C0 @ =gUnknown_81D88CC
str r0, [r1]
ldrb r1, [r4]
@@ -11079,7 +11079,7 @@ _080156AC: .4byte gBattleTypeFlags
_080156B0: .4byte gBattleTextBuff1
_080156B4: .4byte gBattleOutcome
_080156B8: .4byte gBattlerAttacker
-_080156BC: .4byte gUnknown_2023D74
+_080156BC: .4byte gBattlescriptCurrInstr
_080156C0: .4byte gUnknown_81D88CC
_080156C4:
ldr r0, _080156E0 @ =0x00080900
@@ -11090,12 +11090,12 @@ _080156C4:
movs r0, 0x9B
lsls r0, 1
bl PlayBGM
- ldr r1, _080156E4 @ =gUnknown_2023D74
+ ldr r1, _080156E4 @ =gBattlescriptCurrInstr
ldr r0, _080156E8 @ =gUnknown_81D88D7
b _0801576C
.align 2, 0
_080156E0: .4byte 0x00080900
-_080156E4: .4byte gUnknown_2023D74
+_080156E4: .4byte gBattlescriptCurrInstr
_080156E8: .4byte gUnknown_81D88D7
_080156EC:
movs r0, 0xA
@@ -11103,7 +11103,7 @@ _080156EC:
cmp r1, 0x8
bne _08015768
bl BattleStopLowHpSound
- ldr r1, _08015720 @ =gUnknown_2023D74
+ ldr r1, _08015720 @ =gBattlescriptCurrInstr
ldr r0, _08015724 @ =gUnknown_81D87EF
str r0, [r1]
ldr r2, _08015728 @ =gTrainers
@@ -11123,7 +11123,7 @@ _080156EC:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_08015720: .4byte gUnknown_2023D74
+_08015720: .4byte gBattlescriptCurrInstr
_08015724: .4byte gUnknown_81D87EF
_08015728: .4byte gTrainers
_0801572C: .4byte gTrainerBattleOpponent_A
@@ -11149,7 +11149,7 @@ _0801575E:
bl PlayBGM
b _0801576E
_08015768:
- ldr r1, _0801577C @ =gUnknown_2023D74
+ ldr r1, _0801577C @ =gBattlescriptCurrInstr
ldr r0, _08015780 @ =gUnknown_81D8803
_0801576C:
str r0, [r1]
@@ -11161,7 +11161,7 @@ _0801576E:
pop {r0}
bx r0
.align 2, 0
-_0801577C: .4byte gUnknown_2023D74
+_0801577C: .4byte gBattlescriptCurrInstr
_08015780: .4byte gUnknown_81D8803
_08015784: .4byte gBattleMainFunc
_08015788: .4byte sub_8015910
@@ -11188,7 +11188,7 @@ sub_801578C: @ 801578C
bl GetBattlerAtPosition
ldr r1, _080157D4 @ =gBattlerAttacker
strb r0, [r1]
- ldr r1, _080157D8 @ =gUnknown_2023D74
+ ldr r1, _080157D8 @ =gBattlescriptCurrInstr
ldr r0, _080157DC @ =gUnknown_81D88CC
str r0, [r1]
ldrb r1, [r4]
@@ -11202,7 +11202,7 @@ _080157C8: .4byte gBattleTypeFlags
_080157CC: .4byte gBattleTextBuff1
_080157D0: .4byte gBattleOutcome
_080157D4: .4byte gBattlerAttacker
-_080157D8: .4byte gUnknown_2023D74
+_080157D8: .4byte gBattlescriptCurrInstr
_080157DC: .4byte gUnknown_81D88CC
_080157E0:
movs r0, 0x8
@@ -11219,14 +11219,14 @@ _080157E0:
ands r1, r0
cmp r1, 0
beq _0801580C
- ldr r1, _08015808 @ =gUnknown_2023E82
+ ldr r1, _08015808 @ =gBattleCommunication
movs r0, 0x1
strb r0, [r1, 0x5]
b _08015810
.align 2, 0
-_08015808: .4byte gUnknown_2023E82
+_08015808: .4byte gBattleCommunication
_0801580C:
- ldr r0, _0801581C @ =gUnknown_2023E82
+ ldr r0, _0801581C @ =gBattleCommunication
strb r4, [r0, 0x5]
_08015810:
movs r0, 0x1
@@ -11235,14 +11235,14 @@ _08015810:
strb r0, [r1]
b _0801582A
.align 2, 0
-_0801581C: .4byte gUnknown_2023E82
+_0801581C: .4byte gBattleCommunication
_08015820: .4byte gBattlerAttacker
_08015824:
- ldr r1, _0801583C @ =gUnknown_2023E82
+ ldr r1, _0801583C @ =gBattleCommunication
movs r0, 0
strb r0, [r1, 0x5]
_0801582A:
- ldr r1, _08015840 @ =gUnknown_2023D74
+ ldr r1, _08015840 @ =gBattlescriptCurrInstr
ldr r0, _08015844 @ =gUnknown_81D8806
str r0, [r1]
_08015830:
@@ -11253,8 +11253,8 @@ _08015830:
pop {r0}
bx r0
.align 2, 0
-_0801583C: .4byte gUnknown_2023E82
-_08015840: .4byte gUnknown_2023D74
+_0801583C: .4byte gBattleCommunication
+_08015840: .4byte gBattlescriptCurrInstr
_08015844: .4byte gUnknown_81D8806
_08015848: .4byte gBattleMainFunc
_0801584C: .4byte sub_8015910
@@ -11266,7 +11266,7 @@ sub_8015850: @ 8015850
ldr r1, _08015878 @ =gUnknown_2023BE3
movs r0, 0
strb r0, [r1]
- ldr r1, _0801587C @ =gUnknown_2023E8C
+ ldr r1, _0801587C @ =gProtectStructs
ldr r0, _08015880 @ =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 4
@@ -11278,24 +11278,24 @@ sub_8015850: @ 8015850
beq _0801588C
cmp r0, 0x2
beq _0801589C
- ldr r1, _08015884 @ =gUnknown_2023D74
+ ldr r1, _08015884 @ =gBattlescriptCurrInstr
ldr r0, _08015888 @ =gUnknown_81D8916
b _080158A0
.align 2, 0
_08015878: .4byte gUnknown_2023BE3
-_0801587C: .4byte gUnknown_2023E8C
+_0801587C: .4byte gProtectStructs
_08015880: .4byte gBattlerAttacker
-_08015884: .4byte gUnknown_2023D74
+_08015884: .4byte gBattlescriptCurrInstr
_08015888: .4byte gUnknown_81D8916
_0801588C:
- ldr r1, _08015894 @ =gUnknown_2023D74
+ ldr r1, _08015894 @ =gBattlescriptCurrInstr
ldr r0, _08015898 @ =gUnknown_81D8901
b _080158A0
.align 2, 0
-_08015894: .4byte gUnknown_2023D74
+_08015894: .4byte gBattlescriptCurrInstr
_08015898: .4byte gUnknown_81D8901
_0801589C:
- ldr r1, _080158AC @ =gUnknown_2023D74
+ ldr r1, _080158AC @ =gBattlescriptCurrInstr
ldr r0, _080158B0 @ =gUnknown_81D890F
_080158A0:
str r0, [r1]
@@ -11305,7 +11305,7 @@ _080158A0:
pop {r0}
bx r0
.align 2, 0
-_080158AC: .4byte gUnknown_2023D74
+_080158AC: .4byte gBattlescriptCurrInstr
_080158B0: .4byte gUnknown_81D890F
_080158B4: .4byte gBattleMainFunc
_080158B8: .4byte sub_8015910
@@ -11332,7 +11332,7 @@ sub_80158BC: @ 80158BC
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r1, _08015900 @ =gUnknown_2023D74
+ ldr r1, _08015900 @ =gBattlescriptCurrInstr
ldr r0, _08015904 @ =gUnknown_81D891D
str r0, [r1]
ldr r1, _08015908 @ =gBattleMainFunc
@@ -11344,7 +11344,7 @@ _080158F0: .4byte gUnknown_2023BE3
_080158F4: .4byte gBattleTextBuff1
_080158F8: .4byte gBattlerAttacker
_080158FC: .4byte gBattlerPartyIndexes
-_08015900: .4byte gUnknown_2023D74
+_08015900: .4byte gBattlescriptCurrInstr
_08015904: .4byte gUnknown_81D891D
_08015908: .4byte gBattleMainFunc
_0801590C: .4byte sub_8015910
@@ -11465,7 +11465,7 @@ _08015A04:
cmp r0, 0
bne _08015A1E
ldr r1, _08015A28 @ =gUnknown_825011C
- ldr r0, _08015A2C @ =gUnknown_2023D74
+ ldr r0, _08015A2C @ =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
lsls r0, 2
@@ -11479,7 +11479,7 @@ _08015A1E:
.align 2, 0
_08015A24: .4byte gBattleControllerExecFlags
_08015A28: .4byte gUnknown_825011C
-_08015A2C: .4byte gUnknown_2023D74
+_08015A2C: .4byte gBattlescriptCurrInstr
thumb_func_end sub_8015910
thumb_func_start sub_8015A30
@@ -11747,7 +11747,7 @@ _08015C48:
cmp r0, 0
bne _08015C62
ldr r1, _08015C6C @ =gUnknown_825011C
- ldr r0, _08015C70 @ =gUnknown_2023D74
+ ldr r0, _08015C70 @ =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
lsls r0, 2
@@ -11760,7 +11760,7 @@ _08015C62:
.align 2, 0
_08015C68: .4byte gBattleControllerExecFlags
_08015C6C: .4byte gUnknown_825011C
-_08015C70: .4byte gUnknown_2023D74
+_08015C70: .4byte gBattlescriptCurrInstr
thumb_func_end RunBattleScriptCommands_PopCallbacksStack
thumb_func_start sub_8015C74
@@ -11771,7 +11771,7 @@ sub_8015C74: @ 8015C74
cmp r0, 0
bne _08015C90
ldr r1, _08015C98 @ =gUnknown_825011C
- ldr r0, _08015C9C @ =gUnknown_2023D74
+ ldr r0, _08015C9C @ =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
lsls r0, 2
@@ -11784,7 +11784,7 @@ _08015C90:
.align 2, 0
_08015C94: .4byte gBattleControllerExecFlags
_08015C98: .4byte gUnknown_825011C
-_08015C9C: .4byte gUnknown_2023D74
+_08015C9C: .4byte gBattlescriptCurrInstr
thumb_func_end sub_8015C74
thumb_func_start sub_8015CA0
@@ -11798,7 +11798,7 @@ sub_8015CA0: @ 8015CA0
movs r0, 0x4
str r0, [sp]
ldr r6, _08015CE0 @ =gBattlerAttacker
- ldr r1, _08015CE4 @ =gUnknown_2023BDE
+ ldr r1, _08015CE4 @ =gBattlerByTurnOrder
ldr r0, _08015CE8 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -11822,7 +11822,7 @@ sub_8015CA0: @ 8015CA0
b _0801634C
.align 2, 0
_08015CE0: .4byte gBattlerAttacker
-_08015CE4: .4byte gUnknown_2023BDE
+_08015CE4: .4byte gBattlerByTurnOrder
_08015CE8: .4byte gUnknown_2023BE2
_08015CEC: .4byte gBattleStruct
_08015CF0: .4byte gBitTable
@@ -11841,7 +11841,7 @@ _08015CF8:
strb r2, [r0]
ldr r0, _08015D78 @ =gUnknown_2023D72
strb r2, [r0]
- ldr r0, _08015D7C @ =gUnknown_2023E82
+ ldr r0, _08015D7C @ =gBattleCommunication
strb r2, [r0, 0x6]
ldr r2, _08015D80 @ =gUnknown_2023D48
ldr r3, _08015D84 @ =gUnknown_2023D49
@@ -11854,7 +11854,7 @@ _08015CF8:
ldrb r0, [r0]
strb r0, [r3]
strb r0, [r2]
- ldr r1, _08015D8C @ =gUnknown_2023E8C
+ ldr r1, _08015D8C @ =gProtectStructs
ldrb r4, [r6]
lsls r0, r4, 4
adds r3, r0, r1
@@ -11872,7 +11872,7 @@ _08015CF8:
movs r0, 0xA5
strh r0, [r1]
strh r0, [r2]
- ldr r2, _08015D98 @ =gUnknown_2023DD0
+ ldr r2, _08015D98 @ =gHitMarker
ldr r0, [r2]
movs r1, 0x80
lsls r1, 4
@@ -11890,14 +11890,14 @@ _08015D6C: .4byte gCritMultiplier
_08015D70: .4byte gBattleScripting
_08015D74: .4byte gMoveResultFlags
_08015D78: .4byte gUnknown_2023D72
-_08015D7C: .4byte gUnknown_2023E82
+_08015D7C: .4byte gBattleCommunication
_08015D80: .4byte gUnknown_2023D48
_08015D84: .4byte gUnknown_2023D49
_08015D88: .4byte gBattleStruct
-_08015D8C: .4byte gUnknown_2023E8C
+_08015D8C: .4byte gProtectStructs
_08015D90: .4byte gCurrentMove
_08015D94: .4byte gChosenMove
-_08015D98: .4byte gUnknown_2023DD0
+_08015D98: .4byte gHitMarker
_08015D9C:
ldr r0, _08015DD4 @ =gBattleMons
movs r1, 0x58
@@ -12390,7 +12390,7 @@ _0801618C:
b _08016310
_080161AA:
ldr r4, _080161E4 @ =gActiveBattler
- ldr r0, _080161E8 @ =gUnknown_2023BDE
+ ldr r0, _080161E8 @ =gBattlerByTurnOrder
ldr r3, [sp]
adds r0, r3, r0
ldrb r0, [r0]
@@ -12403,7 +12403,7 @@ _080161AA:
adds r1, 0x20
ldrb r1, [r1]
bl sub_80C71D0
- ldr r2, _080161F0 @ =gUnknown_2023ECC
+ ldr r2, _080161F0 @ =gSpecialStatuses
ldrb r1, [r4]
lsls r0, r1, 2
adds r0, r1
@@ -12419,9 +12419,9 @@ _080161AA:
b _0801632C
.align 2, 0
_080161E4: .4byte gActiveBattler
-_080161E8: .4byte gUnknown_2023BDE
+_080161E8: .4byte gBattlerByTurnOrder
_080161EC: .4byte gBattleMons
-_080161F0: .4byte gUnknown_2023ECC
+_080161F0: .4byte gSpecialStatuses
_080161F4: .4byte gBattlerTarget
_080161F8:
ldr r0, [r7]
@@ -12566,7 +12566,7 @@ _0801631A:
bl GetBattlerAtPosition
strb r0, [r5]
_0801632C:
- ldr r4, _08016360 @ =gUnknown_2023D74
+ ldr r4, _08016360 @ =gBattlescriptCurrInstr
ldr r3, _08016364 @ =gUnknown_81D65A8
ldr r2, _08016368 @ =gBattleMoves
ldr r0, _0801636C @ =gCurrentMove
@@ -12593,7 +12593,7 @@ _0801634C:
pop {r0}
bx r0
.align 2, 0
-_08016360: .4byte gUnknown_2023D74
+_08016360: .4byte gBattlescriptCurrInstr
_08016364: .4byte gUnknown_81D65A8
_08016368: .4byte gBattleMoves
_0801636C: .4byte gCurrentMove
@@ -12604,7 +12604,7 @@ _08016370: .4byte gUnknown_2023BE3
sub_8016374: @ 8016374
push {r4,lr}
ldr r3, _080163E0 @ =gBattlerAttacker
- ldr r1, _080163E4 @ =gUnknown_2023BDE
+ ldr r1, _080163E4 @ =gBattlerByTurnOrder
ldr r0, _080163E8 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -12641,7 +12641,7 @@ sub_8016374: @ 8016374
strb r0, [r2, 0x4]
ldr r0, _08016404 @ =gBattleScripting
strb r4, [r0, 0x17]
- ldr r1, _08016408 @ =gUnknown_2023D74
+ ldr r1, _08016408 @ =gBattlescriptCurrInstr
ldr r0, _0801640C @ =gUnknown_81D894D
str r0, [r1]
ldr r1, _08016410 @ =gUnknown_2023BE3
@@ -12659,7 +12659,7 @@ _080163DA:
bx r0
.align 2, 0
_080163E0: .4byte gBattlerAttacker
-_080163E4: .4byte gUnknown_2023BDE
+_080163E4: .4byte gBattlerByTurnOrder
_080163E8: .4byte gUnknown_2023BE2
_080163EC: .4byte gBattle_BG0_X
_080163F0: .4byte gBattle_BG0_Y
@@ -12668,7 +12668,7 @@ _080163F8: .4byte gMoveSelectionCursor
_080163FC: .4byte gBattleTextBuff1
_08016400: .4byte gBattleStruct
_08016404: .4byte gBattleScripting
-_08016408: .4byte gUnknown_2023D74
+_08016408: .4byte gBattlescriptCurrInstr
_0801640C: .4byte gUnknown_81D894D
_08016410: .4byte gUnknown_2023BE3
_08016414: .4byte gBattleResults
@@ -12683,7 +12683,7 @@ sub_8016418: @ 8016418
push {r5-r7}
ldr r4, _08016474 @ =gBattlerAttacker
ldr r2, _08016478 @ =gBattlerTarget
- ldr r1, _0801647C @ =gUnknown_2023BDE
+ ldr r1, _0801647C @ =gBattlerByTurnOrder
ldr r0, _08016480 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -12713,7 +12713,7 @@ sub_8016418: @ 8016418
adds r1, r3, 0
cmp r1, 0xC
bhi _0801649C
- ldr r2, _08016494 @ =gUnknown_2023D74
+ ldr r2, _08016494 @ =gBattlescriptCurrInstr
ldr r1, _08016498 @ =gUnknown_81D99B0
ldrh r0, [r5]
lsls r0, 2
@@ -12724,13 +12724,13 @@ sub_8016418: @ 8016418
.align 2, 0
_08016474: .4byte gBattlerAttacker
_08016478: .4byte gBattlerTarget
-_0801647C: .4byte gUnknown_2023BDE
+_0801647C: .4byte gBattlerByTurnOrder
_08016480: .4byte gUnknown_2023BE2
_08016484: .4byte gBattle_BG0_X
_08016488: .4byte gBattle_BG0_Y
_0801648C: .4byte gLastUsedItem
_08016490: .4byte gBattleBufferB
-_08016494: .4byte gUnknown_2023D74
+_08016494: .4byte gBattlescriptCurrInstr
_08016498: .4byte gUnknown_81D99B0
_0801649C:
adds r0, r3, 0
@@ -12739,7 +12739,7 @@ _0801649C:
lsrs r0, 16
cmp r0, 0x1
bhi _080164C4
- ldr r0, _080164B8 @ =gUnknown_2023D74
+ ldr r0, _080164B8 @ =gBattlescriptCurrInstr
ldr r1, _080164BC @ =gUnknown_81D99FC
ldr r1, [r1]
str r1, [r0]
@@ -12747,7 +12747,7 @@ _0801649C:
mov r10, r1
b _0801671E
.align 2, 0
-_080164B8: .4byte gUnknown_2023D74
+_080164B8: .4byte gBattlescriptCurrInstr
_080164BC: .4byte gUnknown_81D99FC
_080164C0: .4byte gUnknown_2023BE3
_080164C4:
@@ -12755,7 +12755,7 @@ _080164C4:
lsls r0, 1
cmp r1, r0
bne _080164E8
- ldr r0, _080164DC @ =gUnknown_2023D74
+ ldr r0, _080164DC @ =gBattlescriptCurrInstr
ldr r1, _080164E0 @ =gUnknown_81D99FC
ldr r1, [r1, 0x4]
str r1, [r0]
@@ -12763,7 +12763,7 @@ _080164C4:
mov r10, r2
b _0801671E
.align 2, 0
-_080164DC: .4byte gUnknown_2023D74
+_080164DC: .4byte gBattlescriptCurrInstr
_080164E0: .4byte gUnknown_81D99FC
_080164E4: .4byte gUnknown_2023BE3
_080164E8:
@@ -12772,7 +12772,7 @@ _080164E8:
lsls r0, 24
cmp r0, 0
bne _08016510
- ldr r0, _08016504 @ =gUnknown_2023D74
+ ldr r0, _08016504 @ =gBattlescriptCurrInstr
ldr r1, _08016508 @ =gUnknown_81D99E4
ldr r1, [r1]
str r1, [r0]
@@ -12781,7 +12781,7 @@ _080164FC:
mov r10, r0
b _0801671E
.align 2, 0
-_08016504: .4byte gUnknown_2023D74
+_08016504: .4byte gBattlescriptCurrInstr
_08016508: .4byte gUnknown_81D99E4
_0801650C: .4byte gUnknown_2023BE3
_08016510:
@@ -12797,7 +12797,7 @@ _08016510:
ldrb r0, [r0]
subs r0, 0x1
mov r8, r4
- ldr r1, _08016550 @ =gUnknown_2023D74
+ ldr r1, _08016550 @ =gBattlescriptCurrInstr
mov r9, r1
ldr r6, _08016554 @ =gUnknown_81D99E4
mov r12, r3
@@ -12816,7 +12816,7 @@ _0801653C:
.align 2, 0
_08016548: .4byte gBattleScripting
_0801654C: .4byte gBattleStruct
-_08016550: .4byte gUnknown_2023D74
+_08016550: .4byte gBattlescriptCurrInstr
_08016554: .4byte gUnknown_81D99E4
_08016558: .4byte gUnknown_2023BE3
_0801655C: .4byte _08016560
@@ -12828,7 +12828,7 @@ _08016560:
.4byte _08016608
.4byte _080166D8
_08016574:
- ldr r5, _080165AC @ =gUnknown_2023E82
+ ldr r5, _080165AC @ =gBattleCommunication
movs r0, 0
strb r0, [r5, 0x5]
ldr r2, _080165B0 @ =gBattlerAttacker
@@ -12845,7 +12845,7 @@ _08016574:
beq _080165C0
movs r0, 0x3E
ands r0, r1
- ldr r1, _080165B4 @ =gUnknown_2023D74
+ ldr r1, _080165B4 @ =gBattlescriptCurrInstr
mov r9, r1
ldr r6, _080165B8 @ =gUnknown_81D99E4
ldr r2, _080165BC @ =gUnknown_2023BE3
@@ -12858,13 +12858,13 @@ _080165A6:
strb r0, [r5, 0x5]
b _08016706
.align 2, 0
-_080165AC: .4byte gUnknown_2023E82
+_080165AC: .4byte gBattleCommunication
_080165B0: .4byte gBattlerAttacker
-_080165B4: .4byte gUnknown_2023D74
+_080165B4: .4byte gBattlescriptCurrInstr
_080165B8: .4byte gUnknown_81D99E4
_080165BC: .4byte gUnknown_2023BE3
_080165C0:
- ldr r0, _080165FC @ =gUnknown_2023D74
+ ldr r0, _080165FC @ =gBattlescriptCurrInstr
mov r9, r0
ldr r6, _08016600 @ =gUnknown_81D99E4
ldr r1, _08016604 @ =gUnknown_2023BE3
@@ -12896,11 +12896,11 @@ _080165D0:
beq _080165D0
b _08016706
.align 2, 0
-_080165FC: .4byte gUnknown_2023D74
+_080165FC: .4byte gBattlescriptCurrInstr
_08016600: .4byte gUnknown_81D99E4
_08016604: .4byte gUnknown_2023BE3
_08016608:
- ldr r3, _0801663C @ =gUnknown_2023E82
+ ldr r3, _0801663C @ =gBattleCommunication
movs r0, 0x4
strb r0, [r3, 0x5]
ldr r2, _08016640 @ =gBattlerAttacker
@@ -12920,16 +12920,16 @@ _08016608:
beq _08016650
movs r0, 0x5
strb r0, [r3, 0x5]
- ldr r2, _08016644 @ =gUnknown_2023D74
+ ldr r2, _08016644 @ =gBattlescriptCurrInstr
mov r9, r2
ldr r6, _08016648 @ =gUnknown_81D99E4
ldr r0, _0801664C @ =gUnknown_2023BE3
mov r10, r0
b _08016706
.align 2, 0
-_0801663C: .4byte gUnknown_2023E82
+_0801663C: .4byte gBattleCommunication
_08016640: .4byte gBattlerAttacker
-_08016644: .4byte gUnknown_2023D74
+_08016644: .4byte gBattlescriptCurrInstr
_08016648: .4byte gUnknown_81D99E4
_0801664C: .4byte gUnknown_2023BE3
_08016650:
@@ -12952,7 +12952,7 @@ _08016650:
strb r0, [r1, 0x4]
ldrb r0, [r6]
ands r2, r0
- ldr r1, _080166CC @ =gUnknown_2023D74
+ ldr r1, _080166CC @ =gBattlescriptCurrInstr
mov r9, r1
ldr r6, _080166D0 @ =gUnknown_81D99E4
ldr r0, _080166D4 @ =gUnknown_2023BE3
@@ -12995,7 +12995,7 @@ _080166B4:
.align 2, 0
_080166C4: .4byte gBattleTextBuff1
_080166C8: .4byte gBattleTextBuff2
-_080166CC: .4byte gUnknown_2023D74
+_080166CC: .4byte gBattlescriptCurrInstr
_080166D0: .4byte gUnknown_81D99E4
_080166D4: .4byte gUnknown_2023BE3
_080166D8:
@@ -13005,20 +13005,20 @@ _080166D8:
ands r1, r0
cmp r1, 0
beq _080166F4
- ldr r1, _080166F0 @ =gUnknown_2023E82
+ ldr r1, _080166F0 @ =gBattleCommunication
movs r0, 0x2
strb r0, [r1, 0x5]
b _080166F8
.align 2, 0
_080166EC: .4byte gBattleTypeFlags
-_080166F0: .4byte gUnknown_2023E82
+_080166F0: .4byte gBattleCommunication
_080166F4:
- ldr r0, _08016734 @ =gUnknown_2023E82
+ ldr r0, _08016734 @ =gBattleCommunication
strb r1, [r0, 0x5]
_080166F8:
ldr r0, _08016738 @ =gBattlerAttacker
mov r8, r0
- ldr r1, _0801673C @ =gUnknown_2023D74
+ ldr r1, _0801673C @ =gBattlescriptCurrInstr
mov r9, r1
ldr r6, _08016740 @ =gUnknown_81D99E4
ldr r2, _08016744 @ =gUnknown_2023BE3
@@ -13048,9 +13048,9 @@ _0801671E:
pop {r0}
bx r0
.align 2, 0
-_08016734: .4byte gUnknown_2023E82
+_08016734: .4byte gBattleCommunication
_08016738: .4byte gBattlerAttacker
-_0801673C: .4byte gUnknown_2023D74
+_0801673C: .4byte gBattlescriptCurrInstr
_08016740: .4byte gUnknown_81D99E4
_08016744: .4byte gUnknown_2023BE3
thumb_func_end sub_8016418
@@ -13095,7 +13095,7 @@ _0801677E:
adds r0, r1
ldrh r0, [r0, 0x2E]
strh r0, [r2]
- ldr r0, _080167B8 @ =gUnknown_2023E8C
+ ldr r0, _080167B8 @ =gProtectStructs
lsls r2, r4, 4
adds r2, r0
ldrb r1, [r2, 0x1]
@@ -13110,7 +13110,7 @@ _0801677E:
_080167AC: .4byte gPotentialItemEffectBattler
_080167B0: .4byte gLastUsedItem
_080167B4: .4byte gBattleMons
-_080167B8: .4byte gUnknown_2023E8C
+_080167B8: .4byte gProtectStructs
_080167BC:
ldr r7, _080167EC @ =gBattleMons
movs r2, 0x58
@@ -13124,7 +13124,7 @@ _080167BC:
bne _080167F8
ldr r0, _080167F0 @ =gLastUsedAbility
strb r1, [r0]
- ldr r0, _080167F4 @ =gUnknown_2023E8C
+ ldr r0, _080167F4 @ =gProtectStructs
lsls r2, r4, 4
adds r2, r0
ldrb r1, [r2, 0x1]
@@ -13138,7 +13138,7 @@ _080167BC:
.align 2, 0
_080167EC: .4byte gBattleMons
_080167F0: .4byte gLastUsedAbility
-_080167F4: .4byte gUnknown_2023E8C
+_080167F4: .4byte gProtectStructs
_080167F8:
ldr r0, _08016820 @ =gBattleTypeFlags
ldr r3, [r0]
@@ -13231,7 +13231,7 @@ _080168A0: .4byte gBattleOutcome
sub_80168A4: @ 80168A4
push {r4-r6,lr}
ldr r4, _080168F4 @ =gBattlerAttacker
- ldr r1, _080168F8 @ =gUnknown_2023BDE
+ ldr r1, _080168F8 @ =gBattlerByTurnOrder
ldr r5, _080168FC @ =gUnknown_2023BE2
ldrb r0, [r5]
adds r0, r1
@@ -13271,7 +13271,7 @@ _080168D8:
b _08016922
.align 2, 0
_080168F4: .4byte gBattlerAttacker
-_080168F8: .4byte gUnknown_2023BDE
+_080168F8: .4byte gBattlerByTurnOrder
_080168FC: .4byte gUnknown_2023BE2
_08016900: .4byte gBattleTypeFlags
_08016904: .4byte gBattlersCount
@@ -13322,18 +13322,18 @@ _0801694C:
bne _080169D8
ldrb r0, [r4]
bl ClearFuryCutterDestinyBondGrudge
- ldr r1, _0801697C @ =gUnknown_2023E82
+ ldr r1, _0801697C @ =gBattleCommunication
movs r0, 0x3
strb r0, [r1, 0x5]
- ldr r1, _08016980 @ =gUnknown_2023D74
+ ldr r1, _08016980 @ =gBattlescriptCurrInstr
ldr r0, _08016984 @ =gUnknown_81D893A
str r0, [r1]
ldr r1, _08016988 @ =gUnknown_2023BE3
movs r0, 0xA
b _080169D6
.align 2, 0
-_0801697C: .4byte gUnknown_2023E82
-_08016980: .4byte gUnknown_2023D74
+_0801697C: .4byte gBattleCommunication
+_08016980: .4byte gBattlescriptCurrInstr
_08016984: .4byte gUnknown_81D893A
_08016988: .4byte gUnknown_2023BE3
_0801698C:
@@ -13348,10 +13348,10 @@ _0801698C:
ands r0, r1
cmp r0, 0
beq _080169CC
- ldr r1, _080169BC @ =gUnknown_2023E82
+ ldr r1, _080169BC @ =gBattleCommunication
movs r0, 0x4
strb r0, [r1, 0x5]
- ldr r1, _080169C0 @ =gUnknown_2023D74
+ ldr r1, _080169C0 @ =gBattlescriptCurrInstr
ldr r0, _080169C4 @ =gUnknown_81D893A
str r0, [r1]
ldr r1, _080169C8 @ =gUnknown_2023BE3
@@ -13360,8 +13360,8 @@ _0801698C:
.align 2, 0
_080169B4: .4byte gBattleMons
_080169B8: .4byte 0x0400e000
-_080169BC: .4byte gUnknown_2023E82
-_080169C0: .4byte gUnknown_2023D74
+_080169BC: .4byte gBattleCommunication
+_080169C0: .4byte gBattlescriptCurrInstr
_080169C4: .4byte gUnknown_81D893A
_080169C8: .4byte gUnknown_2023BE3
_080169CC:
@@ -13385,7 +13385,7 @@ _080169E4: .4byte gBattleOutcome
sub_80169E8: @ 80169E8
push {r4,r5,lr}
ldr r2, _08016A44 @ =gBattlerAttacker
- ldr r1, _08016A48 @ =gUnknown_2023BDE
+ ldr r1, _08016A48 @ =gBattlerByTurnOrder
ldr r0, _08016A4C @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -13429,7 +13429,7 @@ sub_80169E8: @ 80169E8
b _08016A98
.align 2, 0
_08016A44: .4byte gBattlerAttacker
-_08016A48: .4byte gUnknown_2023BDE
+_08016A48: .4byte gBattlerByTurnOrder
_08016A4C: .4byte gUnknown_2023BE2
_08016A50: .4byte gBattle_BG0_X
_08016A54: .4byte gBattle_BG0_Y
@@ -13438,12 +13438,12 @@ _08016A5C: .4byte gEnemyParty
_08016A60: .4byte gBaseStats
_08016A64: .4byte 0x000004fb
_08016A68:
- ldr r1, _08016A70 @ =gUnknown_2023E82
+ ldr r1, _08016A70 @ =gBattleCommunication
movs r0, 0x1
strb r0, [r1, 0x5]
b _08016A9C
.align 2, 0
-_08016A70: .4byte gUnknown_2023E82
+_08016A70: .4byte gBattleCommunication
_08016A74:
adds r1, 0x7A
ldrb r0, [r1]
@@ -13456,17 +13456,17 @@ _08016A74:
ldrb r0, [r0]
cmp r0, 0
beq _08016A98
- ldr r1, _08016A94 @ =gUnknown_2023E82
+ ldr r1, _08016A94 @ =gBattleCommunication
movs r0, 0x2
strb r0, [r1, 0x5]
b _08016A9C
.align 2, 0
-_08016A94: .4byte gUnknown_2023E82
+_08016A94: .4byte gBattleCommunication
_08016A98:
- ldr r0, _08016AB0 @ =gUnknown_2023E82
+ ldr r0, _08016AB0 @ =gBattleCommunication
strb r5, [r0, 0x5]
_08016A9C:
- ldr r1, _08016AB4 @ =gUnknown_2023D74
+ ldr r1, _08016AB4 @ =gBattlescriptCurrInstr
ldr r0, _08016AB8 @ =gUnknown_81D9A04
ldr r0, [r0]
str r0, [r1]
@@ -13477,8 +13477,8 @@ _08016A9C:
pop {r0}
bx r0
.align 2, 0
-_08016AB0: .4byte gUnknown_2023E82
-_08016AB4: .4byte gUnknown_2023D74
+_08016AB0: .4byte gBattleCommunication
+_08016AB4: .4byte gBattlescriptCurrInstr
_08016AB8: .4byte gUnknown_81D9A04
_08016ABC: .4byte gUnknown_2023BE3
thumb_func_end sub_80169E8
@@ -13486,7 +13486,7 @@ _08016ABC: .4byte gUnknown_2023BE3
thumb_func_start sub_8016AC0
sub_8016AC0: @ 8016AC0
ldr r2, _08016AF8 @ =gBattlerAttacker
- ldr r1, _08016AFC @ =gUnknown_2023BDE
+ ldr r1, _08016AFC @ =gBattlerByTurnOrder
ldr r0, _08016B00 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -13504,7 +13504,7 @@ sub_8016AC0: @ 8016AC0
ldr r1, _08016B10 @ =gLastUsedItem
movs r0, 0x5
strh r0, [r1]
- ldr r1, _08016B14 @ =gUnknown_2023D74
+ ldr r1, _08016B14 @ =gBattlescriptCurrInstr
ldr r0, _08016B18 @ =gUnknown_81D99B0
ldr r0, [r0, 0x14]
str r0, [r1]
@@ -13514,13 +13514,13 @@ sub_8016AC0: @ 8016AC0
bx lr
.align 2, 0
_08016AF8: .4byte gBattlerAttacker
-_08016AFC: .4byte gUnknown_2023BDE
+_08016AFC: .4byte gBattlerByTurnOrder
_08016B00: .4byte gUnknown_2023BE2
_08016B04: .4byte gBattle_BG0_X
_08016B08: .4byte gBattle_BG0_Y
_08016B0C: .4byte gNumSafariBalls
_08016B10: .4byte gLastUsedItem
-_08016B14: .4byte gUnknown_2023D74
+_08016B14: .4byte gBattlescriptCurrInstr
_08016B18: .4byte gUnknown_81D99B0
_08016B1C: .4byte gUnknown_2023BE3
thumb_func_end sub_8016AC0
@@ -13529,7 +13529,7 @@ _08016B1C: .4byte gUnknown_2023BE3
sub_8016B20: @ 8016B20
push {r4-r7,lr}
ldr r2, _08016B9C @ =gBattlerAttacker
- ldr r1, _08016BA0 @ =gUnknown_2023BDE
+ ldr r1, _08016BA0 @ =gBattlerByTurnOrder
ldr r0, _08016BA4 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -13578,7 +13578,7 @@ _08016B66:
movs r0, 0x3
strb r0, [r1]
_08016B86:
- ldr r1, _08016BB4 @ =gUnknown_2023D74
+ ldr r1, _08016BB4 @ =gBattlescriptCurrInstr
ldr r0, _08016BB8 @ =gUnknown_81D9A04
ldr r0, [r0, 0x8]
str r0, [r1]
@@ -13590,12 +13590,12 @@ _08016B86:
bx r0
.align 2, 0
_08016B9C: .4byte gBattlerAttacker
-_08016BA0: .4byte gUnknown_2023BDE
+_08016BA0: .4byte gBattlerByTurnOrder
_08016BA4: .4byte gUnknown_2023BE2
_08016BA8: .4byte gBattle_BG0_X
_08016BAC: .4byte gBattle_BG0_Y
_08016BB0: .4byte gBattleStruct
-_08016BB4: .4byte gUnknown_2023D74
+_08016BB4: .4byte gBattlescriptCurrInstr
_08016BB8: .4byte gUnknown_81D9A04
_08016BBC: .4byte gUnknown_2023BE3
thumb_func_end sub_8016B20
@@ -13604,7 +13604,7 @@ _08016BBC: .4byte gUnknown_2023BE3
sub_8016BC0: @ 8016BC0
push {r4-r7,lr}
ldr r2, _08016C3C @ =gBattlerAttacker
- ldr r1, _08016C40 @ =gUnknown_2023BDE
+ ldr r1, _08016C40 @ =gBattlerByTurnOrder
ldr r0, _08016C44 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -13653,7 +13653,7 @@ _08016C06:
movs r0, 0x14
strb r0, [r1]
_08016C26:
- ldr r1, _08016C54 @ =gUnknown_2023D74
+ ldr r1, _08016C54 @ =gBattlescriptCurrInstr
ldr r0, _08016C58 @ =gUnknown_81D9A04
ldr r0, [r0, 0x4]
str r0, [r1]
@@ -13665,12 +13665,12 @@ _08016C26:
bx r0
.align 2, 0
_08016C3C: .4byte gBattlerAttacker
-_08016C40: .4byte gUnknown_2023BDE
+_08016C40: .4byte gBattlerByTurnOrder
_08016C44: .4byte gUnknown_2023BE2
_08016C48: .4byte gBattle_BG0_X
_08016C4C: .4byte gBattle_BG0_Y
_08016C50: .4byte gBattleStruct
-_08016C54: .4byte gUnknown_2023D74
+_08016C54: .4byte gBattlescriptCurrInstr
_08016C58: .4byte gUnknown_81D9A04
_08016C5C: .4byte gUnknown_2023BE3
thumb_func_end sub_8016BC0
@@ -13679,7 +13679,7 @@ _08016C5C: .4byte gUnknown_2023BE3
HandleAction_SafriZoneRun: @ 8016C60
push {r4,lr}
ldr r2, _08016C88 @ =gBattlerAttacker
- ldr r1, _08016C8C @ =gUnknown_2023BDE
+ ldr r1, _08016C8C @ =gBattlerByTurnOrder
ldr r4, _08016C90 @ =gUnknown_2023BE2
ldrb r0, [r4]
adds r0, r1
@@ -13698,7 +13698,7 @@ HandleAction_SafriZoneRun: @ 8016C60
bx r0
.align 2, 0
_08016C88: .4byte gBattlerAttacker
-_08016C8C: .4byte gUnknown_2023BDE
+_08016C8C: .4byte gBattlerByTurnOrder
_08016C90: .4byte gUnknown_2023BE2
_08016C94: .4byte gBattlersCount
_08016C98: .4byte gBattleOutcome
@@ -13707,7 +13707,7 @@ _08016C98: .4byte gBattleOutcome
thumb_func_start HandleAction_Action9
HandleAction_Action9: @ 8016C9C
ldr r3, _08016CE8 @ =gBattlerAttacker
- ldr r1, _08016CEC @ =gUnknown_2023BDE
+ ldr r1, _08016CEC @ =gBattlerByTurnOrder
ldr r0, _08016CF0 @ =gUnknown_2023BE2
ldrb r0, [r0]
adds r0, r1
@@ -13732,7 +13732,7 @@ HandleAction_Action9: @ 8016C9C
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r1, _08016D04 @ =gUnknown_2023D74
+ ldr r1, _08016D04 @ =gBattlescriptCurrInstr
ldr r0, _08016D08 @ =gUnknown_81D9A04
ldr r0, [r0, 0xC]
str r0, [r1]
@@ -13745,13 +13745,13 @@ HandleAction_Action9: @ 8016C9C
bx lr
.align 2, 0
_08016CE8: .4byte gBattlerAttacker
-_08016CEC: .4byte gUnknown_2023BDE
+_08016CEC: .4byte gBattlerByTurnOrder
_08016CF0: .4byte gUnknown_2023BE2
_08016CF4: .4byte gBattle_BG0_X
_08016CF8: .4byte gBattle_BG0_Y
_08016CFC: .4byte gBattleTextBuff1
_08016D00: .4byte gBattlerPartyIndexes
-_08016D04: .4byte gUnknown_2023D74
+_08016D04: .4byte gBattlescriptCurrInstr
_08016D08: .4byte gUnknown_81D9A04
_08016D0C: .4byte gUnknown_2023BE3
_08016D10: .4byte gUnknown_2023BDA
@@ -13792,7 +13792,7 @@ HandleAction_NothingIsFainted: @ 8016D3C
adds r0, r2
ldrb r0, [r0]
strb r0, [r3]
- ldr r2, _08016D68 @ =gUnknown_2023DD0
+ ldr r2, _08016D68 @ =gHitMarker
ldr r0, [r2]
ldr r1, _08016D6C @ =0xf1e892af
ands r0, r1
@@ -13802,7 +13802,7 @@ HandleAction_NothingIsFainted: @ 8016D3C
_08016D5C: .4byte gUnknown_2023BE2
_08016D60: .4byte gUnknown_2023BE3
_08016D64: .4byte gUnknown_2023BDA
-_08016D68: .4byte gUnknown_2023DD0
+_08016D68: .4byte gHitMarker
_08016D6C: .4byte 0xf1e892af
thumb_func_end HandleAction_NothingIsFainted
@@ -13820,7 +13820,7 @@ HandleAction_ActionFinished: @ 8016D70
ldrb r0, [r0]
strb r0, [r3]
bl SpecialStatusesClear
- ldr r2, _08016DF0 @ =gUnknown_2023DD0
+ ldr r2, _08016DF0 @ =gHitMarker
ldr r0, [r2]
ldr r1, _08016DF4 @ =0xf1e892af
ands r0, r1
@@ -13853,7 +13853,7 @@ HandleAction_ActionFinished: @ 8016D70
ldr r0, _08016E18 @ =gDynamicBasePower
strh r4, [r0]
strb r1, [r5, 0x14]
- ldr r0, _08016E1C @ =gUnknown_2023E82
+ ldr r0, _08016E1C @ =gBattleCommunication
strb r1, [r0, 0x3]
strb r1, [r0, 0x4]
strb r1, [r5, 0x16]
@@ -13869,7 +13869,7 @@ HandleAction_ActionFinished: @ 8016D70
_08016DE4: .4byte gUnknown_2023BE2
_08016DE8: .4byte gUnknown_2023BE3
_08016DEC: .4byte gUnknown_2023BDA
-_08016DF0: .4byte gUnknown_2023DD0
+_08016DF0: .4byte gHitMarker
_08016DF4: .4byte 0xf1e892af
_08016DF8: .4byte gCurrentMove
_08016DFC: .4byte gBattleMoveDamage
@@ -13880,7 +13880,7 @@ _08016E0C: .4byte gBattlerAttacker
_08016E10: .4byte gUnknown_2023DA8
_08016E14: .4byte gBattleStruct
_08016E18: .4byte gDynamicBasePower
-_08016E1C: .4byte gUnknown_2023E82
+_08016E1C: .4byte gBattleCommunication
_08016E20: .4byte gBattleResources
thumb_func_end HandleAction_ActionFinished
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 04:36:09 +0000