summaryrefslogtreecommitdiff
path: root/asm/battle_controller_player.s
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-10-04 17:55:20 -0500
committerGitHub <noreply@github.com>2018-10-04 17:55:20 -0500
commitf044c8215b9d44f19ad90a43e9e0f4263a828254 (patch)
treee2fa5828e97a76d109276ed1d144e14cbce88f56 /asm/battle_controller_player.s
parent4880b33ff2cff769a7c9bc73c9d792b40c10fbf7 (diff)
parent621cfbebee08dfd856a4e5a6164b9f27bcdbbadd (diff)
Merge pull request #9 from ProjectRevoTPP/battle_ai
decompile battle_ai_script_commands.c
Diffstat (limited to 'asm/battle_controller_player.s')
-rw-r--r--asm/battle_controller_player.s1516
1 files changed, 758 insertions, 758 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 3c7d225f2..d1ef9e612 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -13,7 +13,7 @@ nullsub_13: @ 802E310
thumb_func_start SetBankFuncToPlayerBufferRunCommand
SetBankFuncToPlayerBufferRunCommand: @ 802E314
ldr r1, _0802E32C @ =gUnknown_3004FE0
- ldr r0, _0802E330 @ =gUnknown_2023BC4
+ ldr r0, _0802E330 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -25,7 +25,7 @@ SetBankFuncToPlayerBufferRunCommand: @ 802E314
bx lr
.align 2, 0
_0802E32C: .4byte gUnknown_3004FE0
-_0802E330: .4byte gUnknown_2023BC4
+_0802E330: .4byte gActiveBattler
_0802E334: .4byte PlayerBufferRunCommand
_0802E338: .4byte gUnknown_2024005
thumb_func_end SetBankFuncToPlayerBufferRunCommand
@@ -35,13 +35,13 @@ PlayerBufferExecCompleted: @ 802E33C
push {r4,lr}
sub sp, 0x4
ldr r1, _0802E37C @ =gUnknown_3004FE0
- ldr r4, _0802E380 @ =gUnknown_2023BC4
+ ldr r4, _0802E380 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
ldr r1, _0802E384 @ =PlayerBufferRunCommand
str r1, [r0]
- ldr r0, _0802E388 @ =gUnknown_2022B4C
+ ldr r0, _0802E388 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x2
ands r0, r1
@@ -63,13 +63,13 @@ PlayerBufferExecCompleted: @ 802E33C
b _0802E3A2
.align 2, 0
_0802E37C: .4byte gUnknown_3004FE0
-_0802E380: .4byte gUnknown_2023BC4
+_0802E380: .4byte gActiveBattler
_0802E384: .4byte PlayerBufferRunCommand
-_0802E388: .4byte gUnknown_2022B4C
+_0802E388: .4byte gBattleTypeFlags
_0802E38C: .4byte gUnknown_2022BC4
_0802E390:
ldr r2, _0802E3AC @ =gUnknown_2023BC8
- ldr r1, _0802E3B0 @ =gUnknown_825E45C
+ ldr r1, _0802E3B0 @ =gBitTable
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -84,15 +84,15 @@ _0802E3A2:
bx r0
.align 2, 0
_0802E3AC: .4byte gUnknown_2023BC8
-_0802E3B0: .4byte gUnknown_825E45C
+_0802E3B0: .4byte gBitTable
thumb_func_end PlayerBufferExecCompleted
thumb_func_start PlayerBufferRunCommand
PlayerBufferRunCommand: @ 802E3B4
push {lr}
ldr r2, _0802E3E8 @ =gUnknown_2023BC8
- ldr r1, _0802E3EC @ =gUnknown_825E45C
- ldr r0, _0802E3F0 @ =gUnknown_2023BC4
+ ldr r1, _0802E3EC @ =gBitTable
+ ldr r0, _0802E3F0 @ =gActiveBattler
ldrb r3, [r0]
lsls r0, r3, 2
adds r0, r1
@@ -116,8 +116,8 @@ PlayerBufferRunCommand: @ 802E3B4
b _0802E400
.align 2, 0
_0802E3E8: .4byte gUnknown_2023BC8
-_0802E3EC: .4byte gUnknown_825E45C
-_0802E3F0: .4byte gUnknown_2023BC4
+_0802E3EC: .4byte gBitTable
+_0802E3F0: .4byte gActiveBattler
_0802E3F4: .4byte gUnknown_2022BC4
_0802E3F8: .4byte gUnknown_825089C
_0802E3FC:
@@ -132,7 +132,7 @@ CompleteOnBankSpritePosX_0: @ 802E404
push {lr}
ldr r2, _0802E42C @ =gSprites
ldr r1, _0802E430 @ =gUnknown_2023D44
- ldr r0, _0802E434 @ =gUnknown_2023BC4
+ ldr r0, _0802E434 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -151,7 +151,7 @@ _0802E426:
.align 2, 0
_0802E42C: .4byte gSprites
_0802E430: .4byte gUnknown_2023D44
-_0802E434: .4byte gUnknown_2023BC4
+_0802E434: .4byte gActiveBattler
thumb_func_end CompleteOnBankSpritePosX_0
thumb_func_start sub_802E438
@@ -160,7 +160,7 @@ sub_802E438: @ 802E438
mov r7, r8
push {r7}
ldr r7, _0802E498 @ =gUnknown_2022BC4
- ldr r4, _0802E49C @ =gUnknown_2023BC4
+ ldr r4, _0802E49C @ =gActiveBattler
ldrb r0, [r4]
lsls r2, r0, 9
adds r1, r7, 0x2
@@ -202,7 +202,7 @@ sub_802E438: @ 802E438
b _0802E616
.align 2, 0
_0802E498: .4byte gUnknown_2022BC4
-_0802E49C: .4byte gUnknown_2023BC4
+_0802E49C: .4byte gActiveBattler
_0802E4A0: .4byte gMain
_0802E4A4: .4byte gUnknown_2023FF8
_0802E4A8:
@@ -342,7 +342,7 @@ _0802E5A8:
ands r0, r1
cmp r0, 0
beq _0802E628
- ldr r6, _0802E61C @ =gUnknown_2022B4C
+ ldr r6, _0802E61C @ =gBattleTypeFlags
ldr r0, [r6]
ands r0, r2
cmp r0, 0
@@ -355,9 +355,9 @@ _0802E5A8:
bne _0802E634
movs r0, 0
bl GetBankByIdentity
- ldr r1, _0802E620 @ =gUnknown_2023D70
+ ldr r1, _0802E620 @ =gAbsentBattlerFlags
ldrb r1, [r1]
- ldr r2, _0802E624 @ =gUnknown_825E45C
+ ldr r2, _0802E624 @ =gBitTable
lsls r0, 24
lsrs r0, 22
adds r0, r2
@@ -394,9 +394,9 @@ _0802E616:
bl PlayerBufferExecCompleted
b _0802E634
.align 2, 0
-_0802E61C: .4byte gUnknown_2022B4C
-_0802E620: .4byte gUnknown_2023D70
-_0802E624: .4byte gUnknown_825E45C
+_0802E61C: .4byte gBattleTypeFlags
+_0802E620: .4byte gAbsentBattlerFlags
+_0802E624: .4byte gBitTable
_0802E628:
movs r0, 0x8
ands r0, r1
@@ -414,7 +414,7 @@ _0802E634:
thumb_func_start sub_802E640
sub_802E640: @ 802E640
push {r4,lr}
- ldr r4, _0802E668 @ =gUnknown_2023BC4
+ ldr r4, _0802E668 @ =gActiveBattler
ldrb r0, [r4]
movs r1, 0x1
bl dp11b_obj_free
@@ -431,7 +431,7 @@ sub_802E640: @ 802E640
pop {r0}
bx r0
.align 2, 0
-_0802E668: .4byte gUnknown_2023BC4
+_0802E668: .4byte gActiveBattler
_0802E66C: .4byte gUnknown_3004FE0
_0802E670: .4byte sub_802E674
thumb_func_end sub_802E640
@@ -493,7 +493,7 @@ _0802E6B6:
ldr r1, _0802E720 @ =sub_8012098
str r1, [r0]
ldr r1, _0802E724 @ =gUnknown_2023FFC
- ldr r0, _0802E728 @ =gUnknown_2023BC4
+ ldr r0, _0802E728 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -517,7 +517,7 @@ _0802E718: .4byte gSprites
_0802E71C: .4byte gUnknown_2023D44
_0802E720: .4byte sub_8012098
_0802E724: .4byte gUnknown_2023FFC
-_0802E728: .4byte gUnknown_2023BC4
+_0802E728: .4byte gActiveBattler
_0802E72C:
movs r0, 0x2
ands r0, r1
@@ -539,7 +539,7 @@ _0802E72C:
ldr r1, _0802E790 @ =sub_8012098
str r1, [r0]
ldr r1, _0802E794 @ =gUnknown_3004FE0
- ldr r4, _0802E798 @ =gUnknown_2023BC4
+ ldr r4, _0802E798 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -565,7 +565,7 @@ _0802E788: .4byte gUnknown_2023D44
_0802E78C: .4byte gUnknown_3004FF4
_0802E790: .4byte sub_8012098
_0802E794: .4byte gUnknown_3004FE0
-_0802E798: .4byte gUnknown_2023BC4
+_0802E798: .4byte gActiveBattler
_0802E79C: .4byte sub_802EA10
_0802E7A0:
movs r0, 0x60
@@ -651,26 +651,26 @@ _0802E83C:
beq _0802E882
b _0802E884
_0802E846:
- ldr r2, _0802E8A4 @ =gUnknown_2023BC4
+ ldr r2, _0802E8A4 @ =gActiveBattler
ldrb r0, [r2]
ldrb r1, [r5]
cmp r0, r1
bne _0802E882
- ldr r1, _0802E8A8 @ =gUnknown_2023BCE
+ ldr r1, _0802E8A8 @ =gBattlerPartyIndexes
ldrb r2, [r2]
lsls r0, r2, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _0802E8AC @ =gUnknown_2024284
+ ldr r1, _0802E8AC @ =gPlayerParty
adds r0, r1
ldr r1, _0802E8B0 @ =gUnknown_2023FFC
adds r2, r1
ldrb r1, [r2]
adds r1, 0xD
bl GetMonData
- ldr r2, _0802E8B4 @ =gUnknown_8250C04
+ ldr r2, _0802E8B4 @ =gBattleMoves
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -683,9 +683,9 @@ _0802E846:
_0802E882:
adds r4, 0x1
_0802E884:
- ldr r0, _0802E8B8 @ =gUnknown_2023D70
+ ldr r0, _0802E8B8 @ =gAbsentBattlerFlags
ldrb r1, [r0]
- ldr r2, _0802E8BC @ =gUnknown_825E45C
+ ldr r2, _0802E8BC @ =gBitTable
ldrb r0, [r5]
lsls r0, 2
adds r0, r2
@@ -700,13 +700,13 @@ _0802E89C:
beq _0802E7CC
b _0802E9C4
.align 2, 0
-_0802E8A4: .4byte gUnknown_2023BC4
-_0802E8A8: .4byte gUnknown_2023BCE
-_0802E8AC: .4byte gUnknown_2024284
+_0802E8A4: .4byte gActiveBattler
+_0802E8A8: .4byte gBattlerPartyIndexes
+_0802E8AC: .4byte gPlayerParty
_0802E8B0: .4byte gUnknown_2023FFC
-_0802E8B4: .4byte gUnknown_8250C04
-_0802E8B8: .4byte gUnknown_2023D70
-_0802E8BC: .4byte gUnknown_825E45C
+_0802E8B4: .4byte gBattleMoves
+_0802E8B8: .4byte gAbsentBattlerFlags
+_0802E8BC: .4byte gBitTable
_0802E8C0: .4byte gUnknown_3004FF4
_0802E8C4:
movs r0, 0x90
@@ -792,26 +792,26 @@ _0802E960:
beq _0802E9A6
b _0802E9A8
_0802E96A:
- ldr r2, _0802E9E4 @ =gUnknown_2023BC4
+ ldr r2, _0802E9E4 @ =gActiveBattler
ldrb r0, [r2]
ldrb r1, [r5]
cmp r0, r1
bne _0802E9A6
- ldr r1, _0802E9E8 @ =gUnknown_2023BCE
+ ldr r1, _0802E9E8 @ =gBattlerPartyIndexes
ldrb r2, [r2]
lsls r0, r2, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _0802E9EC @ =gUnknown_2024284
+ ldr r1, _0802E9EC @ =gPlayerParty
adds r0, r1
ldr r1, _0802E9F0 @ =gUnknown_2023FFC
adds r2, r1
ldrb r1, [r2]
adds r1, 0xD
bl GetMonData
- ldr r2, _0802E9F4 @ =gUnknown_8250C04
+ ldr r2, _0802E9F4 @ =gBattleMoves
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -824,9 +824,9 @@ _0802E96A:
_0802E9A6:
adds r4, 0x1
_0802E9A8:
- ldr r0, _0802E9F8 @ =gUnknown_2023D70
+ ldr r0, _0802E9F8 @ =gAbsentBattlerFlags
ldrb r1, [r0]
- ldr r2, _0802E9FC @ =gUnknown_825E45C
+ ldr r2, _0802E9FC @ =gBitTable
ldrb r0, [r5]
lsls r0, 2
adds r0, r2
@@ -858,13 +858,13 @@ _0802E9DC:
pop {r0}
bx r0
.align 2, 0
-_0802E9E4: .4byte gUnknown_2023BC4
-_0802E9E8: .4byte gUnknown_2023BCE
-_0802E9EC: .4byte gUnknown_2024284
+_0802E9E4: .4byte gActiveBattler
+_0802E9E8: .4byte gBattlerPartyIndexes
+_0802E9EC: .4byte gPlayerParty
_0802E9F0: .4byte gUnknown_2023FFC
-_0802E9F4: .4byte gUnknown_8250C04
-_0802E9F8: .4byte gUnknown_2023D70
-_0802E9FC: .4byte gUnknown_825E45C
+_0802E9F4: .4byte gBattleMoves
+_0802E9F8: .4byte gAbsentBattlerFlags
+_0802E9FC: .4byte gBitTable
_0802EA00: .4byte gUnknown_3004FF4
_0802EA04: .4byte gSprites
_0802EA08: .4byte gUnknown_2023D44
@@ -879,7 +879,7 @@ sub_802EA10: @ 802EA10
sub sp, 0x4
movs r0, 0
mov r8, r0
- ldr r6, _0802EA6C @ =gUnknown_2023BC4
+ ldr r6, _0802EA6C @ =gActiveBattler
ldrb r0, [r6]
lsls r0, 9
ldr r1, _0802EA70 @ =gUnknown_2022BC8
@@ -919,12 +919,12 @@ _0802EA3A:
ands r4, r0
b _0802EA8A
.align 2, 0
-_0802EA6C: .4byte gUnknown_2023BC4
+_0802EA6C: .4byte gActiveBattler
_0802EA70: .4byte gUnknown_2022BC8
_0802EA74: .4byte gMain
_0802EA78: .4byte gUnknown_2023FFC
_0802EA7C:
- ldr r2, _0802EA9C @ =gUnknown_8250C04
+ ldr r2, _0802EA9C @ =gBattleMoves
ldrh r1, [r1]
lsls r0, r1, 1
adds r0, r1
@@ -937,16 +937,16 @@ _0802EA8A:
cmp r0, 0
beq _0802EAA8
ldr r0, _0802EAA0 @ =gUnknown_3004FF4
- ldr r1, _0802EAA4 @ =gUnknown_2023BC4
+ ldr r1, _0802EAA4 @ =gActiveBattler
ldrb r1, [r1]
strb r1, [r0]
b _0802EAC2
.align 2, 0
-_0802EA9C: .4byte gUnknown_8250C04
+_0802EA9C: .4byte gBattleMoves
_0802EAA0: .4byte gUnknown_3004FF4
-_0802EAA4: .4byte gUnknown_2023BC4
+_0802EAA4: .4byte gActiveBattler
_0802EAA8:
- ldr r0, _0802EAEC @ =gUnknown_2023BC4
+ ldr r0, _0802EAEC @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
adds r1, r0, 0
@@ -959,7 +959,7 @@ _0802EAA8:
strb r0, [r1]
_0802EAC2:
ldr r3, _0802EAF4 @ =gUnknown_2022BC4
- ldr r5, _0802EAEC @ =gUnknown_2023BC4
+ ldr r5, _0802EAEC @ =gActiveBattler
ldrb r2, [r5]
lsls r1, r2, 9
adds r0, r3, 0x1
@@ -980,7 +980,7 @@ _0802EAC2:
add r8, r0
b _0802EB3A
.align 2, 0
-_0802EAEC: .4byte gUnknown_2023BC4
+_0802EAEC: .4byte gActiveBattler
_0802EAF0: .4byte gUnknown_3004FF4
_0802EAF4: .4byte gUnknown_2022BC4
_0802EAF8:
@@ -1031,7 +1031,7 @@ _0802EB3A:
cmp r0, 0
bne _0802EB88
ldr r1, _0802EB78 @ =gUnknown_2023FFC
- ldr r0, _0802EB84 @ =gUnknown_2023BC4
+ ldr r0, _0802EB84 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -1048,10 +1048,10 @@ _0802EB3A:
_0802EB78: .4byte gUnknown_2023FFC
_0802EB7C: .4byte gUnknown_3004FF4
_0802EB80: .4byte 0x00007fff
-_0802EB84: .4byte gUnknown_2023BC4
+_0802EB84: .4byte gActiveBattler
_0802EB88:
ldr r1, _0802EBA4 @ =gUnknown_3004FE0
- ldr r2, _0802EBA8 @ =gUnknown_2023BC4
+ ldr r2, _0802EBA8 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -1066,15 +1066,15 @@ _0802EB88:
b _0802EBE4
.align 2, 0
_0802EBA4: .4byte gUnknown_3004FE0
-_0802EBA8: .4byte gUnknown_2023BC4
+_0802EBA8: .4byte gActiveBattler
_0802EBAC: .4byte sub_802E674
_0802EBB0: .4byte gUnknown_3004FF4
_0802EBB4:
movs r0, 0x1
bl GetBankByIdentity
- ldr r1, _0802EBD4 @ =gUnknown_2023D70
+ ldr r1, _0802EBD4 @ =gAbsentBattlerFlags
ldrb r1, [r1]
- ldr r2, _0802EBD8 @ =gUnknown_825E45C
+ ldr r2, _0802EBD8 @ =gBitTable
lsls r0, 24
lsrs r0, 22
adds r0, r2
@@ -1085,8 +1085,8 @@ _0802EBB4:
movs r0, 0x3
b _0802EBDE
.align 2, 0
-_0802EBD4: .4byte gUnknown_2023D70
-_0802EBD8: .4byte gUnknown_825E45C
+_0802EBD4: .4byte gAbsentBattlerFlags
+_0802EBD8: .4byte gBitTable
_0802EBDC:
movs r0, 0x1
_0802EBDE:
@@ -1273,7 +1273,7 @@ _0802ED4C:
ldrb r0, [r0]
cmp r0, 0x1
bls _0802EDBA
- ldr r0, _0802ED88 @ =gUnknown_2022B4C
+ ldr r0, _0802ED88 @ =gBattleTypeFlags
ldr r5, [r0]
ands r5, r7
cmp r5, 0
@@ -1294,7 +1294,7 @@ _0802ED4C:
b _0802ED9C
.align 2, 0
_0802ED84: .4byte gUnknown_3004FF8
-_0802ED88: .4byte gUnknown_2022B4C
+_0802ED88: .4byte gBattleTypeFlags
_0802ED8C: .4byte gUnknown_2023FFC
_0802ED90: .4byte gUnknown_3004FF4
_0802ED94:
@@ -1310,7 +1310,7 @@ _0802ED9C:
movs r1, 0xB
bl sub_80D87BC
ldr r1, _0802EDD0 @ =gUnknown_3004FE0
- ldr r0, _0802EDD4 @ =gUnknown_2023BC4
+ ldr r0, _0802EDD4 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -1328,7 +1328,7 @@ _0802EDBA:
_0802EDC8: .4byte gUnknown_3004FF4
_0802EDCC: .4byte gUnknown_83FE7A0
_0802EDD0: .4byte gUnknown_3004FE0
-_0802EDD4: .4byte gUnknown_2023BC4
+_0802EDD4: .4byte gActiveBattler
_0802EDD8: .4byte sub_802EF58
thumb_func_end sub_802EA10
@@ -1370,7 +1370,7 @@ _0802EE18:
cmp r0, 0
beq _0802EE58
ldr r5, _0802EF4C @ =gUnknown_2023FFC
- ldr r4, _0802EF50 @ =gUnknown_2023BC4
+ ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r2, r0, r5
ldrb r1, [r2]
@@ -1401,7 +1401,7 @@ _0802EE58:
cmp r0, 0
beq _0802EEA6
ldr r5, _0802EF4C @ =gUnknown_2023FFC
- ldr r4, _0802EF50 @ =gUnknown_2023BC4
+ ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r3, r0, r5
ldrb r2, [r3]
@@ -1438,7 +1438,7 @@ _0802EEA6:
cmp r0, 0
beq _0802EEE8
ldr r5, _0802EF4C @ =gUnknown_2023FFC
- ldr r4, _0802EF50 @ =gUnknown_2023BC4
+ ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r2, r0, r5
ldrb r1, [r2]
@@ -1469,7 +1469,7 @@ _0802EEE8:
cmp r0, 0
beq _0802EF36
ldr r5, _0802EF4C @ =gUnknown_2023FFC
- ldr r4, _0802EF50 @ =gUnknown_2023BC4
+ ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r3, r0, r5
ldrb r2, [r3]
@@ -1508,7 +1508,7 @@ _0802EF40: .4byte gMain
_0802EF44: .4byte gUnknown_2022974
_0802EF48: .4byte gUnknown_2022976
_0802EF4C: .4byte gUnknown_2023FFC
-_0802EF50: .4byte gUnknown_2023BC4
+_0802EF50: .4byte gActiveBattler
_0802EF54: .4byte gUnknown_3004FF8
thumb_func_end sub_802EDDC
@@ -1532,7 +1532,7 @@ _0802EF72:
bl PlaySE
ldr r0, _0802F2E8 @ =gUnknown_2023FFC
mov r10, r0
- ldr r1, _0802F2EC @ =gUnknown_2023BC4
+ ldr r1, _0802F2EC @ =gActiveBattler
mov r8, r1
ldrb r1, [r1]
adds r2, r1, r0
@@ -1595,12 +1595,12 @@ _0802EF90:
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
- ldr r2, _0802F2F8 @ =gUnknown_2023E0C
+ ldr r2, _0802F2F8 @ =gDisableStructs
adds r6, r0, r2
ldrb r4, [r6, 0x18]
lsls r3, r4, 24
lsrs r2, r3, 28
- ldr r0, _0802F2FC @ =gUnknown_825E45C
+ ldr r0, _0802F2FC @ =gBitTable
mov r12, r0
add r1, r10
ldrb r0, [r1]
@@ -1623,7 +1623,7 @@ _0802EF90:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
- ldr r3, _0802F2F8 @ =gUnknown_2023E0C
+ ldr r3, _0802F2F8 @ =gDisableStructs
adds r1, r3
ldrb r4, [r1, 0x18]
lsrs r3, r4, 4
@@ -1643,7 +1643,7 @@ _0802F04A:
mov r5, sp
adds r5, 0x18
str r5, [sp, 0x1C]
- ldr r2, _0802F300 @ =gUnknown_2023BE4
+ ldr r2, _0802F300 @ =gBattleMons
mov r0, r8
ldrb r1, [r0]
movs r0, 0x58
@@ -1745,7 +1745,7 @@ _0802F0F8:
adds r6, 0x1
cmp r6, 0x3
ble _0802F0F8
- ldr r2, _0802F2EC @ =gUnknown_2023BC4
+ ldr r2, _0802F2EC @ =gActiveBattler
ldrb r1, [r2]
movs r0, 0x58
muls r0, r1
@@ -1766,11 +1766,11 @@ _0802F13A:
str r1, [sp, 0x20]
add r3, sp, 0xC
mov r10, r3
- ldr r5, _0802F304 @ =gUnknown_2023BCE
+ ldr r5, _0802F304 @ =gBattlerPartyIndexes
mov r9, r5
mov r8, r2
movs r7, 0x64
- ldr r5, _0802F308 @ =gUnknown_2024284
+ ldr r5, _0802F308 @ =gPlayerParty
adds r4, r1, 0
_0802F152:
mov r1, r8
@@ -1801,15 +1801,15 @@ _0802F152:
adds r6, 0x1
cmp r6, 0x3
ble _0802F152
- ldr r1, _0802F304 @ =gUnknown_2023BCE
- ldr r0, _0802F2EC @ =gUnknown_2023BC4
+ ldr r1, _0802F304 @ =gBattlerPartyIndexes
+ ldr r0, _0802F2EC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _0802F308 @ =gUnknown_2024284
+ ldr r1, _0802F308 @ =gPlayerParty
adds r0, r1
movs r1, 0x15
bl GetMonData
@@ -1832,7 +1832,7 @@ _0802F1B2:
cmp r6, 0x3
ble _0802F1B2
ldr r4, _0802F2E8 @ =gUnknown_2023FFC
- ldr r3, _0802F2EC @ =gUnknown_2023BC4
+ ldr r3, _0802F2EC @ =gActiveBattler
ldrb r0, [r3]
adds r0, r4
ldrb r1, [r0]
@@ -1902,13 +1902,13 @@ _0802F23E:
cmp r6, 0x3
ble _0802F23E
movs r6, 0
- ldr r5, _0802F304 @ =gUnknown_2023BCE
+ ldr r5, _0802F304 @ =gBattlerPartyIndexes
mov r10, r5
- ldr r0, _0802F2EC @ =gUnknown_2023BC4
+ ldr r0, _0802F2EC @ =gActiveBattler
mov r9, r0
movs r1, 0x64
mov r8, r1
- ldr r7, _0802F308 @ =gUnknown_2024284
+ ldr r7, _0802F308 @ =gPlayerParty
ldr r5, [sp, 0x20]
adds r5, 0x8
ldr r4, [sp, 0x20]
@@ -1944,28 +1944,28 @@ _0802F26A:
adds r6, 0x1
cmp r6, 0x3
ble _0802F26A
- ldr r1, _0802F304 @ =gUnknown_2023BCE
- ldr r0, _0802F2EC @ =gUnknown_2023BC4
+ ldr r1, _0802F304 @ =gBattlerPartyIndexes
+ ldr r0, _0802F2EC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _0802F308 @ =gUnknown_2024284
+ ldr r1, _0802F308 @ =gPlayerParty
adds r0, r1
movs r1, 0x15
ldr r2, [sp, 0x1C]
bl sub_804037C
_0802F2C8:
- ldr r0, _0802F30C @ =gUnknown_2022B4C
+ ldr r0, _0802F30C @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x10
ands r0, r1
cmp r0, 0
beq _0802F318
ldr r1, _0802F310 @ =gUnknown_3004FE0
- ldr r2, _0802F2EC @ =gUnknown_2023BC4
+ ldr r2, _0802F2EC @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -1974,20 +1974,20 @@ _0802F2C8:
.align 2, 0
_0802F2E4: .4byte gMain
_0802F2E8: .4byte gUnknown_2023FFC
-_0802F2EC: .4byte gUnknown_2023BC4
+_0802F2EC: .4byte gActiveBattler
_0802F2F0: .4byte gUnknown_3004FF4
_0802F2F4: .4byte gUnknown_2022BC8
-_0802F2F8: .4byte gUnknown_2023E0C
-_0802F2FC: .4byte gUnknown_825E45C
-_0802F300: .4byte gUnknown_2023BE4
-_0802F304: .4byte gUnknown_2023BCE
-_0802F308: .4byte gUnknown_2024284
-_0802F30C: .4byte gUnknown_2022B4C
+_0802F2F8: .4byte gDisableStructs
+_0802F2FC: .4byte gBitTable
+_0802F300: .4byte gBattleMons
+_0802F304: .4byte gBattlerPartyIndexes
+_0802F308: .4byte gPlayerParty
+_0802F30C: .4byte gBattleTypeFlags
_0802F310: .4byte gUnknown_3004FE0
_0802F314: .4byte sub_80E7988
_0802F318:
ldr r1, _0802F390 @ =gUnknown_3004FE0
- ldr r2, _0802F394 @ =gUnknown_2023BC4
+ ldr r2, _0802F394 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -2022,13 +2022,13 @@ _0802F34C:
ldrb r0, [r0]
bl MoveSelectionDestroyCursorAt
ldr r1, _0802F39C @ =gUnknown_2023FFC
- ldr r4, _0802F394 @ =gUnknown_2023BC4
+ ldr r4, _0802F394 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
movs r1, 0
bl MoveSelectionCreateCursorAt
- ldr r0, _0802F3A8 @ =gUnknown_2022B4C
+ ldr r0, _0802F3A8 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x10
ands r0, r1
@@ -2042,12 +2042,12 @@ _0802F34C:
b _0802F3BA
.align 2, 0
_0802F390: .4byte gUnknown_3004FE0
-_0802F394: .4byte gUnknown_2023BC4
+_0802F394: .4byte gActiveBattler
_0802F398: .4byte sub_802EA10
_0802F39C: .4byte gUnknown_2023FFC
_0802F3A0: .4byte gUnknown_3004FF4
_0802F3A4: .4byte gMain
-_0802F3A8: .4byte gUnknown_2022B4C
+_0802F3A8: .4byte gBattleTypeFlags
_0802F3AC: .4byte sub_80E7988
_0802F3B0:
ldr r0, _0802F3F8 @ =gUnknown_3004FE0
@@ -2074,7 +2074,7 @@ _0802F3C8:
cmp r0, 0
beq _0802F454
ldr r0, _0802F408 @ =gUnknown_2023FFC
- ldr r1, _0802F40C @ =gUnknown_2023BC4
+ ldr r1, _0802F40C @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
ldrb r5, [r1]
@@ -2090,7 +2090,7 @@ _0802F3FC: .4byte sub_802EA10
_0802F400: .4byte gMain
_0802F404: .4byte gUnknown_3004FF4
_0802F408: .4byte gUnknown_2023FFC
-_0802F40C: .4byte gUnknown_2023BC4
+_0802F40C: .4byte gActiveBattler
_0802F410:
ldrb r0, [r3]
bl MoveSelectionDestroyCursorAt
@@ -2103,7 +2103,7 @@ _0802F416:
movs r0, 0x5
bl PlaySE
ldr r1, _0802F444 @ =gUnknown_2023FFC
- ldr r0, _0802F448 @ =gUnknown_2023BC4
+ ldr r0, _0802F448 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r4]
@@ -2117,7 +2117,7 @@ _0802F416:
.align 2, 0
_0802F440: .4byte gUnknown_3004FF4
_0802F444: .4byte gUnknown_2023FFC
-_0802F448: .4byte gUnknown_2023BC4
+_0802F448: .4byte gActiveBattler
_0802F44C:
ldrb r0, [r4]
movs r1, 0x1B
@@ -2142,7 +2142,7 @@ _0802F454:
cmp r0, r1
bcs _0802F4E8
ldr r0, _0802F49C @ =gUnknown_2023FFC
- ldr r1, _0802F4A0 @ =gUnknown_2023BC4
+ ldr r1, _0802F4A0 @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
ldrb r0, [r1]
@@ -2157,7 +2157,7 @@ _0802F490: .4byte gMain
_0802F494: .4byte gUnknown_3004FF4
_0802F498: .4byte gUnknown_3004FF8
_0802F49C: .4byte gUnknown_2023FFC
-_0802F4A0: .4byte gUnknown_2023BC4
+_0802F4A0: .4byte gActiveBattler
_0802F4A4:
ldrb r0, [r3]
bl MoveSelectionDestroyCursorAt
@@ -2170,7 +2170,7 @@ _0802F4AA:
movs r0, 0x5
bl PlaySE
ldr r1, _0802F4D8 @ =gUnknown_2023FFC
- ldr r0, _0802F4DC @ =gUnknown_2023BC4
+ ldr r0, _0802F4DC @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r4]
@@ -2184,7 +2184,7 @@ _0802F4AA:
.align 2, 0
_0802F4D4: .4byte gUnknown_3004FF4
_0802F4D8: .4byte gUnknown_2023FFC
-_0802F4DC: .4byte gUnknown_2023BC4
+_0802F4DC: .4byte gActiveBattler
_0802F4E0:
ldrb r0, [r4]
movs r1, 0x1B
@@ -2203,7 +2203,7 @@ _0802F4E8:
cmp r0, 0
beq _0802F56C
ldr r0, _0802F520 @ =gUnknown_2023FFC
- ldr r1, _0802F524 @ =gUnknown_2023BC4
+ ldr r1, _0802F524 @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
ldrb r5, [r1]
@@ -2217,7 +2217,7 @@ _0802F4E8:
_0802F518: .4byte gMain
_0802F51C: .4byte gUnknown_3004FF4
_0802F520: .4byte gUnknown_2023FFC
-_0802F524: .4byte gUnknown_2023BC4
+_0802F524: .4byte gActiveBattler
_0802F528:
ldrb r0, [r3]
bl MoveSelectionDestroyCursorAt
@@ -2230,7 +2230,7 @@ _0802F52E:
movs r0, 0x5
bl PlaySE
ldr r1, _0802F55C @ =gUnknown_2023FFC
- ldr r0, _0802F560 @ =gUnknown_2023BC4
+ ldr r0, _0802F560 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r4]
@@ -2244,7 +2244,7 @@ _0802F52E:
.align 2, 0
_0802F558: .4byte gUnknown_3004FF4
_0802F55C: .4byte gUnknown_2023FFC
-_0802F560: .4byte gUnknown_2023BC4
+_0802F560: .4byte gActiveBattler
_0802F564:
ldrb r0, [r4]
movs r1, 0x1B
@@ -2269,7 +2269,7 @@ _0802F56C:
cmp r0, r1
bcs _0802F600
ldr r0, _0802F5B4 @ =gUnknown_2023FFC
- ldr r1, _0802F5B8 @ =gUnknown_2023BC4
+ ldr r1, _0802F5B8 @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
ldrb r0, [r1]
@@ -2284,7 +2284,7 @@ _0802F5A8: .4byte gMain
_0802F5AC: .4byte gUnknown_3004FF4
_0802F5B0: .4byte gUnknown_3004FF8
_0802F5B4: .4byte gUnknown_2023FFC
-_0802F5B8: .4byte gUnknown_2023BC4
+_0802F5B8: .4byte gActiveBattler
_0802F5BC:
ldrb r0, [r3]
bl MoveSelectionDestroyCursorAt
@@ -2297,7 +2297,7 @@ _0802F5C2:
movs r0, 0x5
bl PlaySE
ldr r1, _0802F5F0 @ =gUnknown_2023FFC
- ldr r0, _0802F5F4 @ =gUnknown_2023BC4
+ ldr r0, _0802F5F4 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r4]
@@ -2311,7 +2311,7 @@ _0802F5C2:
.align 2, 0
_0802F5EC: .4byte gUnknown_3004FF4
_0802F5F0: .4byte gUnknown_2023FFC
-_0802F5F4: .4byte gUnknown_2023BC4
+_0802F5F4: .4byte gActiveBattler
_0802F5F8:
ldrb r0, [r4]
movs r1, 0x1B
@@ -2402,7 +2402,7 @@ sub_802F6A8: @ 802F6A8
ands r0, r1
cmp r0, 0
bne _0802F71E
- ldr r0, _0802F6D4 @ =gUnknown_2022B4C
+ ldr r0, _0802F6D4 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x2
ands r0, r1
@@ -2416,13 +2416,13 @@ sub_802F6A8: @ 802F6A8
b _0802F6E0
.align 2, 0
_0802F6D0: .4byte gUnknown_2037AB8
-_0802F6D4: .4byte gUnknown_2022B4C
+_0802F6D4: .4byte gBattleTypeFlags
_0802F6D8: .4byte gUnknown_3003F3C
_0802F6DC:
bl sub_800AB9C
_0802F6E0:
ldr r1, _0802F6F0 @ =gUnknown_3004FE0
- ldr r0, _0802F6F4 @ =gUnknown_2023BC4
+ ldr r0, _0802F6F4 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -2431,7 +2431,7 @@ _0802F6E0:
b _0802F71E
.align 2, 0
_0802F6F0: .4byte gUnknown_3004FE0
-_0802F6F4: .4byte gUnknown_2023BC4
+_0802F6F4: .4byte gActiveBattler
_0802F6F8: .4byte sub_802F610
_0802F6FC:
movs r0, 0x53
@@ -2463,7 +2463,7 @@ sub_802F730: @ 802F730
push {lr}
ldr r2, _0802F758 @ =gSprites
ldr r1, _0802F75C @ =gUnknown_2023D44
- ldr r0, _0802F760 @ =gUnknown_2023BC4
+ ldr r0, _0802F760 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -2483,7 +2483,7 @@ _0802F754:
.align 2, 0
_0802F758: .4byte gSprites
_0802F75C: .4byte gUnknown_2023D44
-_0802F760: .4byte gUnknown_2023BC4
+_0802F760: .4byte gActiveBattler
_0802F764: .4byte SpriteCallbackDummy
thumb_func_end sub_802F730
@@ -2492,7 +2492,7 @@ sub_802F768: @ 802F768
push {lr}
ldr r2, _0802F790 @ =gSprites
ldr r1, _0802F794 @ =gUnknown_2023D44
- ldr r0, _0802F798 @ =gUnknown_2023BC4
+ ldr r0, _0802F798 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -2512,7 +2512,7 @@ _0802F78C:
.align 2, 0
_0802F790: .4byte gSprites
_0802F794: .4byte gUnknown_2023D44
-_0802F798: .4byte gUnknown_2023BC4
+_0802F798: .4byte gActiveBattler
_0802F79C: .4byte SpriteCallbackDummy
thumb_func_end sub_802F768
@@ -2521,7 +2521,7 @@ sub_802F7A0: @ 802F7A0
push {r4-r6,lr}
ldr r6, _0802F7FC @ =gSprites
ldr r5, _0802F800 @ =gUnknown_2023D44
- ldr r4, _0802F804 @ =gUnknown_2023BC4
+ ldr r4, _0802F804 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2563,7 +2563,7 @@ _0802F7F4:
.align 2, 0
_0802F7FC: .4byte gSprites
_0802F800: .4byte gUnknown_2023D44
-_0802F804: .4byte gUnknown_2023BC4
+_0802F804: .4byte gActiveBattler
_0802F808: .4byte SpriteCallbackDummy
_0802F80C: .4byte gSaveBlock2Ptr
thumb_func_end sub_802F7A0
@@ -2573,7 +2573,7 @@ sub_802F810: @ 802F810
push {r4,lr}
ldr r4, _0802F850 @ =gUnknown_2024018
ldr r1, [r4]
- ldr r3, _0802F854 @ =gUnknown_2023BC4
+ ldr r3, _0802F854 @ =gActiveBattler
ldrb r0, [r3]
ldr r2, [r1, 0x4]
lsls r1, r0, 1
@@ -2603,7 +2603,7 @@ _0802F848:
bx r0
.align 2, 0
_0802F850: .4byte gUnknown_2024018
-_0802F854: .4byte gUnknown_2023BC4
+_0802F854: .4byte gActiveBattler
thumb_func_end sub_802F810
thumb_func_start sub_802F858
@@ -2618,7 +2618,7 @@ sub_802F858: @ 802F858
lsls r0, 24
cmp r0, 0
beq _0802F8B0
- ldr r0, _0802F89C @ =gUnknown_2022B4C
+ ldr r0, _0802F89C @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -2627,7 +2627,7 @@ sub_802F858: @ 802F858
_0802F87C:
ldr r2, _0802F8A0 @ =gSprites
ldr r1, _0802F8A4 @ =gUnknown_3004FF0
- ldr r0, _0802F8A8 @ =gUnknown_2023BC4
+ ldr r0, _0802F8A8 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -2642,15 +2642,15 @@ _0802F87C:
bne _0802F8E6
b _0802F8E4
.align 2, 0
-_0802F89C: .4byte gUnknown_2022B4C
+_0802F89C: .4byte gBattleTypeFlags
_0802F8A0: .4byte gSprites
_0802F8A4: .4byte gUnknown_3004FF0
-_0802F8A8: .4byte gUnknown_2023BC4
+_0802F8A8: .4byte gActiveBattler
_0802F8AC: .4byte SpriteCallbackDummy
_0802F8B0:
ldr r2, _0802F9B0 @ =gSprites
ldr r5, _0802F9B4 @ =gUnknown_3004FF0
- ldr r0, _0802F9B8 @ =gUnknown_2023BC4
+ ldr r0, _0802F9B8 @ =gActiveBattler
ldrb r3, [r0]
adds r0, r3, r5
ldrb r1, [r0]
@@ -2690,7 +2690,7 @@ _0802F8F8:
ldr r0, _0802F9C0 @ =gUnknown_2024018
mov r12, r0
ldr r0, [r0]
- ldr r7, _0802F9B8 @ =gUnknown_2023BC4
+ ldr r7, _0802F9B8 @ =gActiveBattler
ldrb r2, [r7]
ldr r3, [r0, 0x4]
lsls r0, r2, 1
@@ -2769,7 +2769,7 @@ _0802F934:
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
- ldr r0, _0802F9C8 @ =gUnknown_2022B4C
+ ldr r0, _0802F9C8 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -2781,11 +2781,11 @@ _0802F934:
.align 2, 0
_0802F9B0: .4byte gSprites
_0802F9B4: .4byte gUnknown_3004FF0
-_0802F9B8: .4byte gUnknown_2023BC4
+_0802F9B8: .4byte gActiveBattler
_0802F9BC: .4byte SpriteCallbackDummy
_0802F9C0: .4byte gUnknown_2024018
_0802F9C4: .4byte 0x000027f9
-_0802F9C8: .4byte gUnknown_2022B4C
+_0802F9C8: .4byte gBattleTypeFlags
_0802F9CC: .4byte gMPlay_BGM
_0802F9D0:
ldr r0, _0802FA38 @ =gMPlay_BGM
@@ -2794,15 +2794,15 @@ _0802F9D0:
lsls r2, 1
bl m4aMPlayVolumeControl
_0802F9DC:
- ldr r7, _0802FA40 @ =gUnknown_2023BCE
- ldr r4, _0802FA44 @ =gUnknown_2023BC4
+ ldr r7, _0802FA40 @ =gBattlerPartyIndexes
+ ldr r4, _0802FA44 @ =gActiveBattler
ldrb r1, [r4]
lsls r0, r1, 1
adds r0, r7
ldrh r0, [r0]
movs r6, 0x64
muls r0, r6
- ldr r5, _0802FA48 @ =gUnknown_2024284
+ ldr r5, _0802FA48 @ =gPlayerParty
adds r0, r5
bl HandleLowHpMusicChange
bl sub_8075290
@@ -2842,9 +2842,9 @@ _0802FA32:
.align 2, 0
_0802FA38: .4byte gMPlay_BGM
_0802FA3C: .4byte 0x0000ffff
-_0802FA40: .4byte gUnknown_2023BCE
-_0802FA44: .4byte gUnknown_2023BC4
-_0802FA48: .4byte gUnknown_2024284
+_0802FA40: .4byte gBattlerPartyIndexes
+_0802FA44: .4byte gActiveBattler
+_0802FA48: .4byte gPlayerParty
_0802FA4C: .4byte gUnknown_2024018
_0802FA50: .4byte gUnknown_3004FE0
_0802FA54: .4byte sub_802F810
@@ -2859,7 +2859,7 @@ sub_802FA58: @ 802FA58
ldr r0, _0802FBCC @ =gUnknown_2024018
mov r9, r0
ldr r0, [r0]
- ldr r1, _0802FBD0 @ =gUnknown_2023BC4
+ ldr r1, _0802FBD0 @ =gActiveBattler
mov r8, r1
ldrb r2, [r1]
ldr r3, [r0, 0x4]
@@ -2894,12 +2894,12 @@ _0802FA9E:
ands r0, r4
cmp r0, 0
bne _0802FABC
- ldr r0, _0802FBD4 @ =gUnknown_2023BCE
+ ldr r0, _0802FBD4 @ =gBattlerPartyIndexes
adds r0, r5, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _0802FBD8 @ =gUnknown_2024284
+ ldr r0, _0802FBD8 @ =gPlayerParty
adds r1, r0
adds r0, r2, 0
bl sub_80F1720
@@ -2920,12 +2920,12 @@ _0802FABC:
ands r0, r1
cmp r0, 0
bne _0802FAF0
- ldr r0, _0802FBD4 @ =gUnknown_2023BCE
+ ldr r0, _0802FBD4 @ =gBattlerPartyIndexes
adds r0, r3, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _0802FBD8 @ =gUnknown_2024284
+ ldr r0, _0802FBD8 @ =gPlayerParty
adds r1, r0
adds r0, r2, 0
bl sub_80F1720
@@ -2934,7 +2934,7 @@ _0802FAF0:
lsls r0, 24
cmp r0, 0
beq _0802FB5C
- ldr r0, _0802FBDC @ =gUnknown_2022B4C
+ ldr r0, _0802FBDC @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -2959,13 +2959,13 @@ _0802FAF0:
eors r1, r0
adds r0, r1, r4
ldrb r0, [r0]
- ldr r2, _0802FBD4 @ =gUnknown_2023BCE
+ ldr r2, _0802FBD4 @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, _0802FBD8 @ =gUnknown_2024284
+ ldr r2, _0802FBD8 @ =gPlayerParty
adds r1, r2
movs r2, 0
bl UpdateHealthboxAttribute
@@ -2981,7 +2981,7 @@ _0802FAF0:
bl SetHealthboxSpriteVisible
_0802FB5C:
ldr r1, _0802FBE0 @ =gUnknown_3004FFC
- ldr r4, _0802FBD0 @ =gUnknown_2023BC4
+ ldr r4, _0802FBD0 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -2995,13 +2995,13 @@ _0802FB5C:
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
- ldr r2, _0802FBD4 @ =gUnknown_2023BCE
+ ldr r2, _0802FBD4 @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, _0802FBD8 @ =gUnknown_2024284
+ ldr r2, _0802FBD8 @ =gPlayerParty
adds r1, r2
movs r2, 0
bl UpdateHealthboxAttribute
@@ -3034,10 +3034,10 @@ _0802FBBE:
bx r0
.align 2, 0
_0802FBCC: .4byte gUnknown_2024018
-_0802FBD0: .4byte gUnknown_2023BC4
-_0802FBD4: .4byte gUnknown_2023BCE
-_0802FBD8: .4byte gUnknown_2024284
-_0802FBDC: .4byte gUnknown_2022B4C
+_0802FBD0: .4byte gActiveBattler
+_0802FBD4: .4byte gBattlerPartyIndexes
+_0802FBD8: .4byte gPlayerParty
+_0802FBDC: .4byte gBattleTypeFlags
_0802FBE0: .4byte gUnknown_3004FFC
_0802FBE4: .4byte gSprites
_0802FBE8: .4byte gUnknown_3004FF0
@@ -3050,7 +3050,7 @@ sub_802FBF4: @ 802FBF4
push {r4-r6,lr}
ldr r2, _0802FC8C @ =gSprites
ldr r0, _0802FC90 @ =gUnknown_3004FF0
- ldr r6, _0802FC94 @ =gUnknown_2023BC4
+ ldr r6, _0802FC94 @ =gActiveBattler
ldrb r3, [r6]
adds r0, r3, r0
ldrb r1, [r0]
@@ -3124,7 +3124,7 @@ _0802FC84:
.align 2, 0
_0802FC8C: .4byte gSprites
_0802FC90: .4byte gUnknown_3004FF0
-_0802FC94: .4byte gUnknown_2023BC4
+_0802FC94: .4byte gActiveBattler
_0802FC98: .4byte SpriteCallbackDummy
_0802FC9C: .4byte gUnknown_2024018
_0802FCA0: .4byte 0x000027f9
@@ -3137,7 +3137,7 @@ sub_802FCAC: @ 802FCAC
push {r4,lr}
ldr r0, _0802FD00 @ =gUnknown_2024018
ldr r0, [r0]
- ldr r4, _0802FD04 @ =gUnknown_2023BC4
+ ldr r4, _0802FD04 @ =gActiveBattler
ldrb r1, [r4]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -3158,14 +3158,14 @@ sub_802FCAC: @ 802FCAC
movs r2, 0x80
lsls r2, 1
bl m4aMPlayVolumeControl
- ldr r2, _0802FD10 @ =gUnknown_2023BCE
+ ldr r2, _0802FD10 @ =gBattlerPartyIndexes
ldrb r1, [r4]
lsls r0, r1, 1
adds r0, r2
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _0802FD14 @ =gUnknown_2024284
+ ldr r2, _0802FD14 @ =gPlayerParty
adds r0, r2
bl HandleLowHpMusicChange
bl PlayerBufferExecCompleted
@@ -3175,11 +3175,11 @@ _0802FCFA:
bx r0
.align 2, 0
_0802FD00: .4byte gUnknown_2024018
-_0802FD04: .4byte gUnknown_2023BC4
+_0802FD04: .4byte gActiveBattler
_0802FD08: .4byte gMPlay_BGM
_0802FD0C: .4byte 0x0000ffff
-_0802FD10: .4byte gUnknown_2023BCE
-_0802FD14: .4byte gUnknown_2024284
+_0802FD10: .4byte gBattlerPartyIndexes
+_0802FD14: .4byte gPlayerParty
thumb_func_end sub_802FCAC
thumb_func_start sub_802FD18
@@ -3187,7 +3187,7 @@ sub_802FD18: @ 802FD18
push {r4-r6,lr}
ldr r6, _0802FDCC @ =gUnknown_2024018
ldr r0, [r6]
- ldr r5, _0802FDD0 @ =gUnknown_2023BC4
+ ldr r5, _0802FDD0 @ =gActiveBattler
ldrb r2, [r5]
ldr r1, [r0, 0x4]
lsls r3, r2, 1
@@ -3199,12 +3199,12 @@ sub_802FD18: @ 802FD18
ands r0, r1
cmp r0, 0
bne _0802FD4A
- ldr r0, _0802FDD4 @ =gUnknown_2023BCE
+ ldr r0, _0802FDD4 @ =gBattlerPartyIndexes
adds r0, r3, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _0802FDD8 @ =gUnknown_2024284
+ ldr r0, _0802FDD8 @ =gPlayerParty
adds r1, r0
adds r0, r2, 0
bl sub_80F1720
@@ -3241,13 +3241,13 @@ _0802FD4A:
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
- ldr r2, _0802FDD4 @ =gUnknown_2023BCE
+ ldr r2, _0802FDD4 @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, _0802FDD8 @ =gUnknown_2024284
+ ldr r2, _0802FDD8 @ =gPlayerParty
adds r1, r2
movs r2, 0
bl UpdateHealthboxAttribute
@@ -3271,9 +3271,9 @@ _0802FDC4:
bx r0
.align 2, 0
_0802FDCC: .4byte gUnknown_2024018
-_0802FDD0: .4byte gUnknown_2023BC4
-_0802FDD4: .4byte gUnknown_2023BCE
-_0802FDD8: .4byte gUnknown_2024284
+_0802FDD0: .4byte gActiveBattler
+_0802FDD4: .4byte gBattlerPartyIndexes
+_0802FDD8: .4byte gPlayerParty
_0802FDDC: .4byte gSprites
_0802FDE0: .4byte gUnknown_3004FFC
_0802FDE4: .4byte SpriteCallbackDummy
@@ -3310,7 +3310,7 @@ _0802FE20: .4byte 0x0000ffff
thumb_func_start CompleteOnHealthbarDone
CompleteOnHealthbarDone: @ 802FE24
push {r4-r6,lr}
- ldr r5, _0802FE64 @ =gUnknown_2023BC4
+ ldr r5, _0802FE64 @ =gActiveBattler
ldrb r0, [r5]
ldr r6, _0802FE68 @ =gUnknown_3004FF0
adds r1, r0, r6
@@ -3338,17 +3338,17 @@ CompleteOnHealthbarDone: @ 802FE24
bl sub_8048440
b _0802FE86
.align 2, 0
-_0802FE64: .4byte gUnknown_2023BC4
+_0802FE64: .4byte gActiveBattler
_0802FE68: .4byte gUnknown_3004FF0
_0802FE6C:
- ldr r2, _0802FE8C @ =gUnknown_2023BCE
+ ldr r2, _0802FE8C @ =gBattlerPartyIndexes
ldrb r1, [r5]
lsls r0, r1, 1
adds r0, r2
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _0802FE90 @ =gUnknown_2024284
+ ldr r2, _0802FE90 @ =gPlayerParty
adds r0, r2
bl HandleLowHpMusicChange
bl PlayerBufferExecCompleted
@@ -3357,8 +3357,8 @@ _0802FE86:
pop {r0}
bx r0
.align 2, 0
-_0802FE8C: .4byte gUnknown_2023BCE
-_0802FE90: .4byte gUnknown_2024284
+_0802FE8C: .4byte gBattlerPartyIndexes
+_0802FE90: .4byte gPlayerParty
thumb_func_end CompleteOnHealthbarDone
thumb_func_start sub_802FE94
@@ -3404,7 +3404,7 @@ sub_802FEAC: @ 802FEAC
lsrs r0, 24
cmp r0, 0x1
beq _0802FEF2
- ldr r1, _0802FFB0 @ =gUnknown_2023BCE
+ ldr r1, _0802FFB0 @ =gBattlerPartyIndexes
lsls r0, r7, 1
adds r0, r1
ldrh r0, [r0]
@@ -3415,7 +3415,7 @@ _0802FEF2:
movs r0, 0x64
mov r1, r10
muls r1, r0
- ldr r0, _0802FFB4 @ =gUnknown_2024284
+ ldr r0, _0802FFB4 @ =gPlayerParty
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
@@ -3436,7 +3436,7 @@ _0802FEF2:
ldr r3, _0802FFB8 @ =gUnknown_8253AE4
adds r4, 0x1
lsls r4, 2
- ldr r2, _0802FFBC @ =gUnknown_8254784
+ ldr r2, _0802FFBC @ =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -3467,7 +3467,7 @@ _0802FEF2:
subs r2, r0
ldr r0, [sp, 0xC]
subs r2, r0, r2
- ldr r4, _0802FFC0 @ =gUnknown_2023BC4
+ ldr r4, _0802FFC0 @ =gActiveBattler
ldrb r5, [r4]
strb r7, [r4]
lsls r2, 16
@@ -3481,7 +3481,7 @@ _0802FEF2:
lsrs r0, 24
cmp r0, 0x1
bne _0802FFC8
- ldr r2, _0802FFB0 @ =gUnknown_2023BCE
+ ldr r2, _0802FFB0 @ =gBattlerPartyIndexes
lsls r0, r7, 1
adds r0, r2
mov r1, r10
@@ -3500,11 +3500,11 @@ _0802FFA6:
b _0803000A
.align 2, 0
_0802FFAC: .4byte gUnknown_3005090
-_0802FFB0: .4byte gUnknown_2023BCE
-_0802FFB4: .4byte gUnknown_2024284
+_0802FFB0: .4byte gBattlerPartyIndexes
+_0802FFB4: .4byte gPlayerParty
_0802FFB8: .4byte gUnknown_8253AE4
-_0802FFBC: .4byte gUnknown_8254784
-_0802FFC0: .4byte gUnknown_2023BC4
+_0802FFBC: .4byte gBaseStats
+_0802FFC0: .4byte gActiveBattler
_0802FFC4: .4byte sub_8030238
_0802FFC8:
ldr r0, _0802FFD8 @ =gUnknown_3005090
@@ -3584,7 +3584,7 @@ sub_8030024: @ 8030024
movs r0, 0x64
adds r6, r1, 0
muls r6, r0
- ldr r0, _080300E0 @ =gUnknown_2024284
+ ldr r0, _080300E0 @ =gPlayerParty
adds r6, r0
adds r0, r6, 0
movs r1, 0x38
@@ -3604,7 +3604,7 @@ sub_8030024: @ 8030024
adds r3, r0, 0
ldr r6, _080300E4 @ =gUnknown_8253AE4
lsls r1, r4, 2
- ldr r2, _080300E8 @ =gUnknown_8254784
+ ldr r2, _080300E8 @ =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -3646,9 +3646,9 @@ sub_8030024: @ 8030024
bx r0
.align 2, 0
_080300DC: .4byte gUnknown_3005090
-_080300E0: .4byte gUnknown_2024284
+_080300E0: .4byte gPlayerParty
_080300E4: .4byte gUnknown_8253AE4
-_080300E8: .4byte gUnknown_8254784
+_080300E8: .4byte gBaseStats
_080300EC: .4byte gUnknown_3004FF0
_080300F0: .4byte sub_80300F4
thumb_func_end sub_8030024
@@ -3708,7 +3708,7 @@ _08030124:
movs r0, 0x64
mov r1, r9
muls r1, r0
- ldr r0, _080301F0 @ =gUnknown_2024284
+ ldr r0, _080301F0 @ =gPlayerParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x38
@@ -3728,7 +3728,7 @@ _08030124:
ldr r3, _080301F4 @ =gUnknown_8253AE4
adds r4, 0x1
lsls r4, 2
- ldr r2, _080301F8 @ =gUnknown_8254784
+ ldr r2, _080301F8 @ =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3759,7 +3759,7 @@ _08030124:
ldrh r0, [r0]
subs r2, r0
subs r2, r4, r2
- ldr r4, _080301FC @ =gUnknown_2023BC4
+ ldr r4, _080301FC @ =gActiveBattler
ldrb r5, [r4]
strb r7, [r4]
lsls r2, 16
@@ -3773,10 +3773,10 @@ _08030124:
b _08030220
.align 2, 0
_080301EC: .4byte gUnknown_3004FF0
-_080301F0: .4byte gUnknown_2024284
+_080301F0: .4byte gPlayerParty
_080301F4: .4byte gUnknown_8253AE4
-_080301F8: .4byte gUnknown_8254784
-_080301FC: .4byte gUnknown_2023BC4
+_080301F8: .4byte gBaseStats
+_080301FC: .4byte gActiveBattler
_08030200: .4byte sub_8030238
_08030204:
str r0, [sp, 0x4]
@@ -3822,7 +3822,7 @@ sub_8030238: @ 8030238
lsrs r0, 24
cmp r0, 0x1
bne _0803026C
- ldr r1, _08030290 @ =gUnknown_2023BCE
+ ldr r1, _08030290 @ =gBattlerPartyIndexes
movs r0, 0x2
adds r2, r4, 0
eors r2, r0
@@ -3850,7 +3850,7 @@ _0803026C:
bx r0
.align 2, 0
_0803028C: .4byte gUnknown_3005090
-_08030290: .4byte gUnknown_2023BCE
+_08030290: .4byte gBattlerPartyIndexes
_08030294: .4byte sub_8030298
thumb_func_end sub_8030238
@@ -3881,7 +3881,7 @@ sub_8030298: @ 8030298
movs r0, 0x64
adds r1, r4, 0
muls r1, r0
- ldr r0, _0803030C @ =gUnknown_2024284
+ ldr r0, _0803030C @ =gPlayerParty
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x38
@@ -3891,7 +3891,7 @@ sub_8030298: @ 8030298
lsrs r0, 24
cmp r0, 0x1
bne _08030318
- ldr r1, _08030310 @ =gUnknown_2023BCE
+ ldr r1, _08030310 @ =gBattlerPartyIndexes
movs r0, 0x2
adds r2, r5, 0
eors r2, r0
@@ -3910,8 +3910,8 @@ sub_8030298: @ 8030298
.align 2, 0
_08030304: .4byte gUnknown_3005090
_08030308: .4byte gUnknown_2024018
-_0803030C: .4byte gUnknown_2024284
-_08030310: .4byte gUnknown_2023BCE
+_0803030C: .4byte gPlayerParty
+_08030310: .4byte gBattlerPartyIndexes
_08030314: .4byte gUnknown_3004FF0
_08030318:
ldr r0, _08030340 @ =gUnknown_3004FF0
@@ -3919,7 +3919,7 @@ _08030318:
ldrb r0, [r0]
movs r1, 0x64
muls r1, r4
- ldr r2, _08030344 @ =gUnknown_2024284
+ ldr r2, _08030344 @ =gPlayerParty
adds r1, r2
movs r2, 0
bl UpdateHealthboxAttribute
@@ -3937,7 +3937,7 @@ _0803033A:
bx r0
.align 2, 0
_08030340: .4byte gUnknown_3004FF0
-_08030344: .4byte gUnknown_2024284
+_08030344: .4byte gPlayerParty
_08030348: .4byte gUnknown_3005090
_0803034C: .4byte sub_8030350
thumb_func_end sub_8030298
@@ -4180,7 +4180,7 @@ sub_8030538: @ 8030538
push {r4-r6,lr}
ldr r6, _08030590 @ =gSprites
ldr r5, _08030594 @ =gUnknown_2023D44
- ldr r4, _08030598 @ =gUnknown_2023BC4
+ ldr r4, _08030598 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -4220,7 +4220,7 @@ _08030588:
.align 2, 0
_08030590: .4byte gSprites
_08030594: .4byte gUnknown_2023D44
-_08030598: .4byte gUnknown_2023BC4
+_08030598: .4byte gActiveBattler
_0803059C: .4byte gUnknown_3004FF0
thumb_func_end sub_8030538
@@ -4229,7 +4229,7 @@ sub_80305A0: @ 80305A0
push {r4-r6,lr}
ldr r0, _080305FC @ =gUnknown_2024018
ldr r0, [r0]
- ldr r6, _08030600 @ =gUnknown_2023BC4
+ ldr r6, _08030600 @ =gActiveBattler
ldrb r2, [r6]
ldr r1, [r0, 0x4]
lsls r0, r2, 1
@@ -4270,7 +4270,7 @@ _080305F4:
bx r0
.align 2, 0
_080305FC: .4byte gUnknown_2024018
-_08030600: .4byte gUnknown_2023BC4
+_08030600: .4byte gActiveBattler
_08030604: .4byte gUnknown_2023D44
_08030608: .4byte gSprites
_0803060C: .4byte gUnknown_3004FF0
@@ -4300,7 +4300,7 @@ sub_8030628: @ 8030628
cmp r0, 0
bne _08030666
ldr r1, _08030670 @ =gUnknown_3004FE0
- ldr r2, _08030674 @ =gUnknown_2023BC4
+ ldr r2, _08030674 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -4327,7 +4327,7 @@ _08030666:
.align 2, 0
_0803066C: .4byte gUnknown_2037AB8
_08030670: .4byte gUnknown_3004FE0
-_08030674: .4byte gUnknown_2023BC4
+_08030674: .4byte gActiveBattler
_08030678: .4byte sub_8030684
_0803067C: .4byte gUnknown_3005090
_08030680: .4byte gUnknown_3004FFC
@@ -4371,7 +4371,7 @@ _080306CC:
bl EmitChosenMonReturnValue
_080306D6:
ldr r1, _080306F8 @ =gUnknown_2022BC4
- ldr r0, _080306FC @ =gUnknown_2023BC4
+ ldr r0, _080306FC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -4389,7 +4389,7 @@ _080306F4:
bx r0
.align 2, 0
_080306F8: .4byte gUnknown_2022BC4
-_080306FC: .4byte gUnknown_2023BC4
+_080306FC: .4byte gActiveBattler
thumb_func_end sub_8030684
thumb_func_start sub_8030700
@@ -4402,7 +4402,7 @@ sub_8030700: @ 8030700
cmp r0, 0
bne _08030728
ldr r1, _08030730 @ =gUnknown_3004FE0
- ldr r0, _08030734 @ =gUnknown_2023BC4
+ ldr r0, _08030734 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -4417,7 +4417,7 @@ _08030728:
.align 2, 0
_0803072C: .4byte gUnknown_2037AB8
_08030730: .4byte gUnknown_3004FE0
-_08030734: .4byte gUnknown_2023BC4
+_08030734: .4byte gActiveBattler
_08030738: .4byte CompleteWhenChoseItem
thumb_func_end sub_8030700
@@ -4459,7 +4459,7 @@ CompleteOnSpecialAnimDone: @ 8030778
beq _0803079E
ldr r0, _080307AC @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _080307B0 @ =gUnknown_2023BC4
+ ldr r0, _080307B0 @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -4479,14 +4479,14 @@ _080307A2:
.align 2, 0
_080307A8: .4byte gUnknown_2024005
_080307AC: .4byte gUnknown_2024018
-_080307B0: .4byte gUnknown_2023BC4
+_080307B0: .4byte gActiveBattler
thumb_func_end CompleteOnSpecialAnimDone
thumb_func_start DoHitAnimBlinkSpriteEffect
DoHitAnimBlinkSpriteEffect: @ 80307B4
push {r4,lr}
ldr r1, _080307F0 @ =gUnknown_2023D44
- ldr r0, _080307F4 @ =gUnknown_2023BC4
+ ldr r0, _080307F4 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -4514,7 +4514,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
b _0803082A
.align 2, 0
_080307F0: .4byte gUnknown_2023D44
-_080307F4: .4byte gUnknown_2023BC4
+_080307F4: .4byte gActiveBattler
_080307F8: .4byte gSprites
_080307FC: .4byte gUnknown_2024005
_08030800:
@@ -4549,7 +4549,7 @@ _0803082A:
thumb_func_start sub_8030830
sub_8030830: @ 8030830
push {r4-r7,lr}
- ldr r0, _08030890 @ =gUnknown_2023BC4
+ ldr r0, _08030890 @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
ldr r3, _08030894 @ =gUnknown_2022BC8
@@ -4594,7 +4594,7 @@ _08030880:
pop {r0}
bx r0
.align 2, 0
-_08030890: .4byte gUnknown_2023BC4
+_08030890: .4byte gActiveBattler
_08030894: .4byte gUnknown_2022BC8
_08030898: .4byte gUnknown_3004FF8
_0803089C: .4byte gUnknown_202298C
@@ -4624,7 +4624,7 @@ _080308C8: .4byte gUnknown_83FE766
MoveSelectionDisplayPpNumber: @ 80308CC
push {r4-r7,lr}
ldr r5, _08030930 @ =gUnknown_2022BC4
- ldr r7, _08030934 @ =gUnknown_2023BC4
+ ldr r7, _08030934 @ =gActiveBattler
ldrb r0, [r7]
lsls r0, 9
adds r1, r5, 0x2
@@ -4670,7 +4670,7 @@ _08030928:
bx r0
.align 2, 0
_08030930: .4byte gUnknown_2022BC4
-_08030934: .4byte gUnknown_2023BC4
+_08030934: .4byte gActiveBattler
_08030938: .4byte gUnknown_202298C
_0803093C: .4byte gUnknown_2023FFC
thumb_func_end MoveSelectionDisplayPpNumber
@@ -4678,7 +4678,7 @@ _0803093C: .4byte gUnknown_2023FFC
thumb_func_start MoveSelectionDisplayMoveType
MoveSelectionDisplayMoveType: @ 8030940
push {r4-r6,lr}
- ldr r5, _080309AC @ =gUnknown_2023BC4
+ ldr r5, _080309AC @ =gActiveBattler
ldrb r4, [r5]
lsls r4, 9
ldr r0, _080309B0 @ =gUnknown_2022BC8
@@ -4701,7 +4701,7 @@ MoveSelectionDisplayMoveType: @ 8030940
adds r0, r3, 0
bl StringCopy
adds r3, r0, 0
- ldr r2, _080309C0 @ =gUnknown_8250C04
+ ldr r2, _080309C0 @ =gBattleMoves
ldr r1, _080309C4 @ =gUnknown_2023FFC
ldrb r0, [r5]
adds r0, r1
@@ -4727,12 +4727,12 @@ MoveSelectionDisplayMoveType: @ 8030940
pop {r0}
bx r0
.align 2, 0
-_080309AC: .4byte gUnknown_2023BC4
+_080309AC: .4byte gActiveBattler
_080309B0: .4byte gUnknown_2022BC8
_080309B4: .4byte gUnknown_202298C
_080309B8: .4byte gUnknown_83FE76A
_080309BC: .4byte gUnknown_83FE770
-_080309C0: .4byte gUnknown_8250C04
+_080309C0: .4byte gBattleMoves
_080309C4: .4byte gUnknown_2023FFC
_080309C8: .4byte gUnknown_824F1A0
thumb_func_end MoveSelectionDisplayMoveType
@@ -4908,7 +4908,7 @@ CompleteOnFinishedStatusAnimation: @ 8030AFC
push {lr}
ldr r0, _08030B24 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _08030B28 @ =gUnknown_2023BC4
+ ldr r0, _08030B28 @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -4926,7 +4926,7 @@ _08030B1E:
bx r0
.align 2, 0
_08030B24: .4byte gUnknown_2024018
-_08030B28: .4byte gUnknown_2023BC4
+_08030B28: .4byte gActiveBattler
thumb_func_end CompleteOnFinishedStatusAnimation
thumb_func_start CompleteOnFinishedBattleAnimation
@@ -4934,7 +4934,7 @@ CompleteOnFinishedBattleAnimation: @ 8030B2C
push {lr}
ldr r0, _08030B54 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _08030B58 @ =gUnknown_2023BC4
+ ldr r0, _08030B58 @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -4952,13 +4952,13 @@ _08030B4E:
bx r0
.align 2, 0
_08030B54: .4byte gUnknown_2024018
-_08030B58: .4byte gUnknown_2023BC4
+_08030B58: .4byte gActiveBattler
thumb_func_end CompleteOnFinishedBattleAnimation
thumb_func_start PrintLinkStandbyMsg
PrintLinkStandbyMsg: @ 8030B5C
push {lr}
- ldr r0, _08030B80 @ =gUnknown_2022B4C
+ ldr r0, _08030B80 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x2
ands r0, r1
@@ -4976,7 +4976,7 @@ _08030B7C:
pop {r0}
bx r0
.align 2, 0
-_08030B80: .4byte gUnknown_2022B4C
+_08030B80: .4byte gBattleTypeFlags
_08030B84: .4byte gUnknown_2022974
_08030B88: .4byte gUnknown_2022976
_08030B8C: .4byte gUnknown_83FE714
@@ -4988,7 +4988,7 @@ PlayerHandleGetMonData: @ 8030B90
sub sp, 0x100
movs r6, 0
ldr r1, _08030BBC @ =gUnknown_2022BC4
- ldr r0, _08030BC0 @ =gUnknown_2023BC4
+ ldr r0, _08030BC0 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x2
@@ -4996,7 +4996,7 @@ PlayerHandleGetMonData: @ 8030B90
ldrb r0, [r1]
cmp r0, 0
bne _08030BC8
- ldr r0, _08030BC4 @ =gUnknown_2023BCE
+ ldr r0, _08030BC4 @ =gBattlerPartyIndexes
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
@@ -5006,8 +5006,8 @@ PlayerHandleGetMonData: @ 8030B90
b _08030BEA
.align 2, 0
_08030BBC: .4byte gUnknown_2022BC4
-_08030BC0: .4byte gUnknown_2023BC4
-_08030BC4: .4byte gUnknown_2023BCE
+_08030BC0: .4byte gActiveBattler
+_08030BC4: .4byte gBattlerPartyIndexes
_08030BC8:
ldrb r4, [r1]
movs r5, 0
@@ -5053,7 +5053,7 @@ CopyPlayerMonData: @ 8030C04
lsrs r5, r0, 24
movs r6, 0
ldr r2, _08030C38 @ =gUnknown_2022BC4
- ldr r3, _08030C3C @ =gUnknown_2023BC4
+ ldr r3, _08030C3C @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
adds r1, r2, 0x1
@@ -5070,7 +5070,7 @@ _08030C2E:
mov pc, r0
.align 2, 0
_08030C38: .4byte gUnknown_2022BC4
-_08030C3C: .4byte gUnknown_2023BC4
+_08030C3C: .4byte gActiveBattler
_08030C40: .4byte _08030C44
.align 2, 0
_08030C44:
@@ -5138,7 +5138,7 @@ _08030D34:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08030F48 @ =gUnknown_2024284
+ ldr r0, _08030F48 @ =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
@@ -5191,7 +5191,7 @@ _08030D80:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08030F48 @ =gUnknown_2024284
+ ldr r0, _08030F48 @ =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
@@ -5375,28 +5375,28 @@ _08030F38:
bls _08030F38
b _0803139A
.align 2, 0
-_08030F48: .4byte gUnknown_2024284
+_08030F48: .4byte gPlayerParty
_08030F4C: .4byte 0xfffffc1f
_08030F50: .4byte 0xfff07fff
_08030F54: .4byte 0xfffffe0f
_08030F58:
movs r0, 0x64
muls r0, r5
- ldr r1, _08030F64 @ =gUnknown_2024284
+ ldr r1, _08030F64 @ =gPlayerParty
adds r0, r1
movs r1, 0xB
b _080312D2
.align 2, 0
-_08030F64: .4byte gUnknown_2024284
+_08030F64: .4byte gPlayerParty
_08030F68:
movs r0, 0x64
muls r0, r5
- ldr r1, _08030F74 @ =gUnknown_2024284
+ ldr r1, _08030F74 @ =gPlayerParty
adds r0, r1
movs r1, 0xC
b _080312D2
.align 2, 0
-_08030F74: .4byte gUnknown_2024284
+_08030F74: .4byte gPlayerParty
_08030F78:
movs r6, 0
add r2, sp, 0x58
@@ -5406,7 +5406,7 @@ _08030F78:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, _08030FDC @ =gUnknown_2024284
+ ldr r0, _08030FDC @ =gPlayerParty
adds r4, r1, r0
mov r8, r9
_08030F8E:
@@ -5430,7 +5430,7 @@ _08030F8E:
ble _08030F8E
movs r0, 0x64
muls r0, r5
- ldr r1, _08030FDC @ =gUnknown_2024284
+ ldr r1, _08030FDC @ =gPlayerParty
adds r0, r1
movs r1, 0x15
bl GetMonData
@@ -5448,11 +5448,11 @@ _08030FCC:
bls _08030FCC
b _0803139A
.align 2, 0
-_08030FDC: .4byte gUnknown_2024284
+_08030FDC: .4byte gPlayerParty
_08030FE0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08030FF8 @ =gUnknown_2024284
+ ldr r1, _08030FF8 @ =gPlayerParty
adds r0, r1
ldrb r1, [r3]
lsls r1, 9
@@ -5462,13 +5462,13 @@ _08030FE0:
adds r1, 0x9
b _080312D2
.align 2, 0
-_08030FF8: .4byte gUnknown_2024284
+_08030FF8: .4byte gPlayerParty
_08030FFC:
movs r6, 0
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r2, _08031034 @ =gUnknown_2024284
+ ldr r2, _08031034 @ =gPlayerParty
mov r8, r2
_08031008:
adds r1, r6, 0
@@ -5483,7 +5483,7 @@ _08031008:
ble _08031008
movs r0, 0x64
muls r0, r5
- ldr r1, _08031034 @ =gUnknown_2024284
+ ldr r1, _08031034 @ =gPlayerParty
adds r0, r1
movs r1, 0x15
bl GetMonData
@@ -5492,11 +5492,11 @@ _08031008:
adds r6, 0x1
b _0803139A
.align 2, 0
-_08031034: .4byte gUnknown_2024284
+_08031034: .4byte gPlayerParty
_08031038:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031050 @ =gUnknown_2024284
+ ldr r1, _08031050 @ =gPlayerParty
adds r0, r1
ldrb r1, [r3]
lsls r1, 9
@@ -5506,20 +5506,20 @@ _08031038:
adds r1, 0x8
b _08031392
.align 2, 0
-_08031050: .4byte gUnknown_2024284
+_08031050: .4byte gPlayerParty
_08031054:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031060 @ =gUnknown_2024284
+ ldr r1, _08031060 @ =gPlayerParty
adds r0, r1
movs r1, 0x1
b _0803106E
.align 2, 0
-_08031060: .4byte gUnknown_2024284
+_08031060: .4byte gPlayerParty
_08031064:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031090 @ =gUnknown_2024284
+ ldr r1, _08031090 @ =gPlayerParty
adds r0, r1
movs r1, 0x19
_0803106E:
@@ -5539,120 +5539,120 @@ _0803106E:
movs r6, 0x3
b _0803139A
.align 2, 0
-_08031090: .4byte gUnknown_2024284
+_08031090: .4byte gPlayerParty
_08031094:
movs r0, 0x64
muls r0, r5
- ldr r1, _080310A0 @ =gUnknown_2024284
+ ldr r1, _080310A0 @ =gPlayerParty
adds r0, r1
movs r1, 0x1A
b _08031392
.align 2, 0
-_080310A0: .4byte gUnknown_2024284
+_080310A0: .4byte gPlayerParty
_080310A4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080310B0 @ =gUnknown_2024284
+ ldr r1, _080310B0 @ =gPlayerParty
adds r0, r1
movs r1, 0x1B
b _08031392
.align 2, 0
-_080310B0: .4byte gUnknown_2024284
+_080310B0: .4byte gPlayerParty
_080310B4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080310C0 @ =gUnknown_2024284
+ ldr r1, _080310C0 @ =gPlayerParty
adds r0, r1
movs r1, 0x1C
b _08031392
.align 2, 0
-_080310C0: .4byte gUnknown_2024284
+_080310C0: .4byte gPlayerParty
_080310C4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080310D0 @ =gUnknown_2024284
+ ldr r1, _080310D0 @ =gPlayerParty
adds r0, r1
movs r1, 0x1D
b _08031392
.align 2, 0
-_080310D0: .4byte gUnknown_2024284
+_080310D0: .4byte gPlayerParty
_080310D4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080310E0 @ =gUnknown_2024284
+ ldr r1, _080310E0 @ =gPlayerParty
adds r0, r1
movs r1, 0x1E
b _08031392
.align 2, 0
-_080310E0: .4byte gUnknown_2024284
+_080310E0: .4byte gPlayerParty
_080310E4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080310F0 @ =gUnknown_2024284
+ ldr r1, _080310F0 @ =gPlayerParty
adds r0, r1
movs r1, 0x1F
b _08031392
.align 2, 0
-_080310F0: .4byte gUnknown_2024284
+_080310F0: .4byte gPlayerParty
_080310F4:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031100 @ =gUnknown_2024284
+ ldr r1, _08031100 @ =gPlayerParty
adds r0, r1
movs r1, 0x20
b _08031392
.align 2, 0
-_08031100: .4byte gUnknown_2024284
+_08031100: .4byte gPlayerParty
_08031104:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031110 @ =gUnknown_2024284
+ ldr r1, _08031110 @ =gPlayerParty
adds r0, r1
movs r1, 0x22
b _08031392
.align 2, 0
-_08031110: .4byte gUnknown_2024284
+_08031110: .4byte gPlayerParty
_08031114:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031120 @ =gUnknown_2024284
+ ldr r1, _08031120 @ =gPlayerParty
adds r0, r1
movs r1, 0x23
b _08031392
.align 2, 0
-_08031120: .4byte gUnknown_2024284
+_08031120: .4byte gPlayerParty
_08031124:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031130 @ =gUnknown_2024284
+ ldr r1, _08031130 @ =gPlayerParty
adds r0, r1
movs r1, 0x24
b _08031392
.align 2, 0
-_08031130: .4byte gUnknown_2024284
+_08031130: .4byte gPlayerParty
_08031134:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031140 @ =gUnknown_2024284
+ ldr r1, _08031140 @ =gPlayerParty
adds r0, r1
movs r1, 0x25
b _08031392
.align 2, 0
-_08031140: .4byte gUnknown_2024284
+_08031140: .4byte gPlayerParty
_08031144:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031150 @ =gUnknown_2024284
+ ldr r1, _08031150 @ =gPlayerParty
adds r0, r1
movs r1, 0x26
b _08031392
.align 2, 0
-_08031150: .4byte gUnknown_2024284
+_08031150: .4byte gPlayerParty
_08031154:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _080311A0 @ =gUnknown_2024284
+ ldr r0, _080311A0 @ =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
@@ -5681,83 +5681,83 @@ _08031154:
movs r6, 0x6
b _0803139A
.align 2, 0
-_080311A0: .4byte gUnknown_2024284
+_080311A0: .4byte gPlayerParty
_080311A4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080311B0 @ =gUnknown_2024284
+ ldr r1, _080311B0 @ =gPlayerParty
adds r0, r1
movs r1, 0x27
b _08031392
.align 2, 0
-_080311B0: .4byte gUnknown_2024284
+_080311B0: .4byte gPlayerParty
_080311B4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080311C0 @ =gUnknown_2024284
+ ldr r1, _080311C0 @ =gPlayerParty
adds r0, r1
movs r1, 0x28
b _08031392
.align 2, 0
-_080311C0: .4byte gUnknown_2024284
+_080311C0: .4byte gPlayerParty
_080311C4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080311D0 @ =gUnknown_2024284
+ ldr r1, _080311D0 @ =gPlayerParty
adds r0, r1
movs r1, 0x29
b _08031392
.align 2, 0
-_080311D0: .4byte gUnknown_2024284
+_080311D0: .4byte gPlayerParty
_080311D4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080311E0 @ =gUnknown_2024284
+ ldr r1, _080311E0 @ =gPlayerParty
adds r0, r1
movs r1, 0x2A
b _08031392
.align 2, 0
-_080311E0: .4byte gUnknown_2024284
+_080311E0: .4byte gPlayerParty
_080311E4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080311F0 @ =gUnknown_2024284
+ ldr r1, _080311F0 @ =gPlayerParty
adds r0, r1
movs r1, 0x2B
b _08031392
.align 2, 0
-_080311F0: .4byte gUnknown_2024284
+_080311F0: .4byte gPlayerParty
_080311F4:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031200 @ =gUnknown_2024284
+ ldr r1, _08031200 @ =gPlayerParty
adds r0, r1
movs r1, 0x2C
b _08031392
.align 2, 0
-_08031200: .4byte gUnknown_2024284
+_08031200: .4byte gPlayerParty
_08031204:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031210 @ =gUnknown_2024284
+ ldr r1, _08031210 @ =gPlayerParty
adds r0, r1
movs r1, 0
b _0803122E
.align 2, 0
-_08031210: .4byte gUnknown_2024284
+_08031210: .4byte gPlayerParty
_08031214:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031220 @ =gUnknown_2024284
+ ldr r1, _08031220 @ =gPlayerParty
adds r0, r1
movs r1, 0x9
b _080312D2
.align 2, 0
-_08031220: .4byte gUnknown_2024284
+_08031220: .4byte gPlayerParty
_08031224:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031254 @ =gUnknown_2024284
+ ldr r1, _08031254 @ =gPlayerParty
adds r0, r1
movs r1, 0x37
_0803122E:
@@ -5779,74 +5779,74 @@ _0803122E:
movs r6, 0x4
b _0803139A
.align 2, 0
-_08031254: .4byte gUnknown_2024284
+_08031254: .4byte gPlayerParty
_08031258:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031264 @ =gUnknown_2024284
+ ldr r1, _08031264 @ =gPlayerParty
adds r0, r1
movs r1, 0x38
b _08031392
.align 2, 0
-_08031264: .4byte gUnknown_2024284
+_08031264: .4byte gPlayerParty
_08031268:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031274 @ =gUnknown_2024284
+ ldr r1, _08031274 @ =gPlayerParty
adds r0, r1
movs r1, 0x39
b _080312D2
.align 2, 0
-_08031274: .4byte gUnknown_2024284
+_08031274: .4byte gPlayerParty
_08031278:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031284 @ =gUnknown_2024284
+ ldr r1, _08031284 @ =gPlayerParty
adds r0, r1
movs r1, 0x3A
b _080312D2
.align 2, 0
-_08031284: .4byte gUnknown_2024284
+_08031284: .4byte gPlayerParty
_08031288:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031294 @ =gUnknown_2024284
+ ldr r1, _08031294 @ =gPlayerParty
adds r0, r1
movs r1, 0x3B
b _080312D2
.align 2, 0
-_08031294: .4byte gUnknown_2024284
+_08031294: .4byte gPlayerParty
_08031298:
movs r0, 0x64
muls r0, r5
- ldr r1, _080312A4 @ =gUnknown_2024284
+ ldr r1, _080312A4 @ =gPlayerParty
adds r0, r1
movs r1, 0x3C
b _080312D2
.align 2, 0
-_080312A4: .4byte gUnknown_2024284
+_080312A4: .4byte gPlayerParty
_080312A8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080312B4 @ =gUnknown_2024284
+ ldr r1, _080312B4 @ =gPlayerParty
adds r0, r1
movs r1, 0x3D
b _080312D2
.align 2, 0
-_080312B4: .4byte gUnknown_2024284
+_080312B4: .4byte gPlayerParty
_080312B8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080312C4 @ =gUnknown_2024284
+ ldr r1, _080312C4 @ =gPlayerParty
adds r0, r1
movs r1, 0x3E
b _080312D2
.align 2, 0
-_080312C4: .4byte gUnknown_2024284
+_080312C4: .4byte gPlayerParty
_080312C8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080312E4 @ =gUnknown_2024284
+ ldr r1, _080312E4 @ =gPlayerParty
adds r0, r1
movs r1, 0x3F
_080312D2:
@@ -5859,101 +5859,101 @@ _080312D2:
movs r6, 0x2
b _0803139A
.align 2, 0
-_080312E4: .4byte gUnknown_2024284
+_080312E4: .4byte gPlayerParty
_080312E8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080312F4 @ =gUnknown_2024284
+ ldr r1, _080312F4 @ =gPlayerParty
adds r0, r1
movs r1, 0x16
b _08031392
.align 2, 0
-_080312F4: .4byte gUnknown_2024284
+_080312F4: .4byte gPlayerParty
_080312F8:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031304 @ =gUnknown_2024284
+ ldr r1, _08031304 @ =gPlayerParty
adds r0, r1
movs r1, 0x17
b _08031392
.align 2, 0
-_08031304: .4byte gUnknown_2024284
+_08031304: .4byte gPlayerParty
_08031308:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031314 @ =gUnknown_2024284
+ ldr r1, _08031314 @ =gPlayerParty
adds r0, r1
movs r1, 0x18
b _08031392
.align 2, 0
-_08031314: .4byte gUnknown_2024284
+_08031314: .4byte gPlayerParty
_08031318:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031324 @ =gUnknown_2024284
+ ldr r1, _08031324 @ =gPlayerParty
adds r0, r1
movs r1, 0x21
b _08031392
.align 2, 0
-_08031324: .4byte gUnknown_2024284
+_08031324: .4byte gPlayerParty
_08031328:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031334 @ =gUnknown_2024284
+ ldr r1, _08031334 @ =gPlayerParty
adds r0, r1
movs r1, 0x2F
b _08031392
.align 2, 0
-_08031334: .4byte gUnknown_2024284
+_08031334: .4byte gPlayerParty
_08031338:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031344 @ =gUnknown_2024284
+ ldr r1, _08031344 @ =gPlayerParty
adds r0, r1
movs r1, 0x30
b _08031392
.align 2, 0
-_08031344: .4byte gUnknown_2024284
+_08031344: .4byte gPlayerParty
_08031348:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031354 @ =gUnknown_2024284
+ ldr r1, _08031354 @ =gPlayerParty
adds r0, r1
movs r1, 0x32
b _08031392
.align 2, 0
-_08031354: .4byte gUnknown_2024284
+_08031354: .4byte gPlayerParty
_08031358:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031364 @ =gUnknown_2024284
+ ldr r1, _08031364 @ =gPlayerParty
adds r0, r1
movs r1, 0x33
b _08031392
.align 2, 0
-_08031364: .4byte gUnknown_2024284
+_08031364: .4byte gPlayerParty
_08031368:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031374 @ =gUnknown_2024284
+ ldr r1, _08031374 @ =gPlayerParty
adds r0, r1
movs r1, 0x34
b _08031392
.align 2, 0
-_08031374: .4byte gUnknown_2024284
+_08031374: .4byte gPlayerParty
_08031378:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031384 @ =gUnknown_2024284
+ ldr r1, _08031384 @ =gPlayerParty
adds r0, r1
movs r1, 0x35
b _08031392
.align 2, 0
-_08031384: .4byte gUnknown_2024284
+_08031384: .4byte gPlayerParty
_08031388:
movs r0, 0x64
muls r0, r5
- ldr r1, _080313AC @ =gUnknown_2024284
+ ldr r1, _080313AC @ =gPlayerParty
adds r0, r1
movs r1, 0x36
_08031392:
@@ -5971,15 +5971,15 @@ _0803139A:
pop {r1}
bx r1
.align 2, 0
-_080313AC: .4byte gUnknown_2024284
+_080313AC: .4byte gPlayerParty
thumb_func_end CopyPlayerMonData
thumb_func_start PlayerHandleGetRawMonData
PlayerHandleGetRawMonData: @ 80313B0
push {r4-r7,lr}
sub sp, 0x58
- ldr r2, _08031428 @ =gUnknown_2023BCE
- ldr r5, _0803142C @ =gUnknown_2023BC4
+ ldr r2, _08031428 @ =gBattlerPartyIndexes
+ ldr r5, _0803142C @ =gActiveBattler
ldrb r1, [r5]
lsls r0, r1, 1
adds r0, r2
@@ -5992,7 +5992,7 @@ PlayerHandleGetRawMonData: @ 80313B0
adds r0, r3, 0x1
adds r0, r1, r0
ldrb r2, [r0]
- ldr r0, _08031434 @ =gUnknown_2024284
+ ldr r0, _08031434 @ =gPlayerParty
adds r0, r2, r0
adds r6, r4, r0
mov r0, sp
@@ -6036,17 +6036,17 @@ _08031406:
pop {r0}
bx r0
.align 2, 0
-_08031428: .4byte gUnknown_2023BCE
-_0803142C: .4byte gUnknown_2023BC4
+_08031428: .4byte gBattlerPartyIndexes
+_0803142C: .4byte gActiveBattler
_08031430: .4byte gUnknown_2022BC4
-_08031434: .4byte gUnknown_2024284
+_08031434: .4byte gPlayerParty
thumb_func_end PlayerHandleGetRawMonData
thumb_func_start PlayerHandleSetMonData
PlayerHandleSetMonData: @ 8031438
push {r4,r5,lr}
ldr r1, _0803145C @ =gUnknown_2022BC4
- ldr r0, _08031460 @ =gUnknown_2023BC4
+ ldr r0, _08031460 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x2
@@ -6054,7 +6054,7 @@ PlayerHandleSetMonData: @ 8031438
ldrb r0, [r1]
cmp r0, 0
bne _08031468
- ldr r0, _08031464 @ =gUnknown_2023BCE
+ ldr r0, _08031464 @ =gBattlerPartyIndexes
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
@@ -6062,8 +6062,8 @@ PlayerHandleSetMonData: @ 8031438
b _08031486
.align 2, 0
_0803145C: .4byte gUnknown_2022BC4
-_08031460: .4byte gUnknown_2023BC4
-_08031464: .4byte gUnknown_2023BCE
+_08031460: .4byte gActiveBattler
+_08031464: .4byte gBattlerPartyIndexes
_08031468:
ldrb r4, [r1]
movs r5, 0
@@ -6098,7 +6098,7 @@ SetPlayerMonData: @ 8031490
sub sp, 0x34
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080314C8 @ =gUnknown_2023BC4
+ ldr r0, _080314C8 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
ldr r2, _080314CC @ =gUnknown_2022BC7
@@ -6118,7 +6118,7 @@ _080314BC:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080314C8: .4byte gUnknown_2023BC4
+_080314C8: .4byte gActiveBattler
_080314CC: .4byte gUnknown_2022BC7
_080314D0: .4byte _080314D4
.align 2, 0
@@ -6187,7 +6187,7 @@ _080315C4:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08031758 @ =gUnknown_2024284
+ ldr r0, _08031758 @ =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
@@ -6254,7 +6254,7 @@ _0803162A:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08031758 @ =gUnknown_2024284
+ ldr r0, _08031758 @ =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
@@ -6364,13 +6364,13 @@ _0803162A:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031758: .4byte gUnknown_2024284
+_08031758: .4byte gPlayerParty
_0803175C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031774 @ =gUnknown_2024284
+ ldr r1, _08031774 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031778 @ =gUnknown_2023BC4
+ ldr r1, _08031778 @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6378,14 +6378,14 @@ _0803175C:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031774: .4byte gUnknown_2024284
-_08031778: .4byte gUnknown_2023BC4
+_08031774: .4byte gPlayerParty
+_08031778: .4byte gActiveBattler
_0803177C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031794 @ =gUnknown_2024284
+ ldr r1, _08031794 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031798 @ =gUnknown_2023BC4
+ ldr r1, _08031798 @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6393,8 +6393,8 @@ _0803177C:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031794: .4byte gUnknown_2024284
-_08031798: .4byte gUnknown_2023BC4
+_08031794: .4byte gPlayerParty
+_08031798: .4byte gActiveBattler
_0803179C:
movs r0, 0
mov r8, r0
@@ -6404,7 +6404,7 @@ _0803179C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, _080317F0 @ =gUnknown_2024284
+ ldr r0, _080317F0 @ =gPlayerParty
adds r7, r1, r0
adds r6, r3, 0
adds r6, 0x8
@@ -6429,21 +6429,21 @@ _080317B6:
ble _080317B6
movs r0, 0x64
muls r0, r5
- ldr r1, _080317F0 @ =gUnknown_2024284
+ ldr r1, _080317F0 @ =gPlayerParty
adds r0, r1
movs r1, 0x15
mov r2, r9
bl sub_804037C
b _08031E56
.align 2, 0
-_080317F0: .4byte gUnknown_2024284
+_080317F0: .4byte gPlayerParty
_080317F4:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031810 @ =gUnknown_2024284
+ ldr r1, _08031810 @ =gPlayerParty
adds r0, r1
ldr r3, _08031814 @ =gUnknown_2022BC4
- ldr r1, _08031818 @ =gUnknown_2023BC4
+ ldr r1, _08031818 @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r1, r3, 0x1
@@ -6452,16 +6452,16 @@ _080317F4:
adds r1, 0x9
b _08031898
.align 2, 0
-_08031810: .4byte gUnknown_2024284
+_08031810: .4byte gPlayerParty
_08031814: .4byte gUnknown_2022BC4
-_08031818: .4byte gUnknown_2023BC4
+_08031818: .4byte gActiveBattler
_0803181C:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08031878 @ =gUnknown_2024284
+ ldr r0, _08031878 @ =gPlayerParty
adds r4, r0
- ldr r5, _0803187C @ =gUnknown_2023BC4
+ ldr r5, _0803187C @ =gActiveBattler
ldrb r2, [r5]
lsls r2, 9
adds r2, r7
@@ -6498,15 +6498,15 @@ _0803181C:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031878: .4byte gUnknown_2024284
-_0803187C: .4byte gUnknown_2023BC4
+_08031878: .4byte gPlayerParty
+_0803187C: .4byte gActiveBattler
_08031880:
movs r0, 0x64
muls r0, r5
- ldr r1, _080318A4 @ =gUnknown_2024284
+ ldr r1, _080318A4 @ =gPlayerParty
adds r0, r1
ldr r3, _080318A8 @ =gUnknown_2022BC4
- ldr r1, _080318AC @ =gUnknown_2023BC4
+ ldr r1, _080318AC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r1, r3, 0x1
@@ -6519,15 +6519,15 @@ _08031898:
bl sub_804037C
b _08031E56
.align 2, 0
-_080318A4: .4byte gUnknown_2024284
+_080318A4: .4byte gPlayerParty
_080318A8: .4byte gUnknown_2022BC4
-_080318AC: .4byte gUnknown_2023BC4
+_080318AC: .4byte gActiveBattler
_080318B0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080318C8 @ =gUnknown_2024284
+ ldr r1, _080318C8 @ =gPlayerParty
adds r0, r1
- ldr r1, _080318CC @ =gUnknown_2023BC4
+ ldr r1, _080318CC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6535,14 +6535,14 @@ _080318B0:
bl sub_804037C
b _08031E56
.align 2, 0
-_080318C8: .4byte gUnknown_2024284
-_080318CC: .4byte gUnknown_2023BC4
+_080318C8: .4byte gPlayerParty
+_080318CC: .4byte gActiveBattler
_080318D0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080318E8 @ =gUnknown_2024284
+ ldr r1, _080318E8 @ =gPlayerParty
adds r0, r1
- ldr r1, _080318EC @ =gUnknown_2023BC4
+ ldr r1, _080318EC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6550,14 +6550,14 @@ _080318D0:
bl sub_804037C
b _08031E56
.align 2, 0
-_080318E8: .4byte gUnknown_2024284
-_080318EC: .4byte gUnknown_2023BC4
+_080318E8: .4byte gPlayerParty
+_080318EC: .4byte gActiveBattler
_080318F0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031908 @ =gUnknown_2024284
+ ldr r1, _08031908 @ =gPlayerParty
adds r0, r1
- ldr r1, _0803190C @ =gUnknown_2023BC4
+ ldr r1, _0803190C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6565,14 +6565,14 @@ _080318F0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031908: .4byte gUnknown_2024284
-_0803190C: .4byte gUnknown_2023BC4
+_08031908: .4byte gPlayerParty
+_0803190C: .4byte gActiveBattler
_08031910:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031928 @ =gUnknown_2024284
+ ldr r1, _08031928 @ =gPlayerParty
adds r0, r1
- ldr r1, _0803192C @ =gUnknown_2023BC4
+ ldr r1, _0803192C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6580,14 +6580,14 @@ _08031910:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031928: .4byte gUnknown_2024284
-_0803192C: .4byte gUnknown_2023BC4
+_08031928: .4byte gPlayerParty
+_0803192C: .4byte gActiveBattler
_08031930:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031948 @ =gUnknown_2024284
+ ldr r1, _08031948 @ =gPlayerParty
adds r0, r1
- ldr r1, _0803194C @ =gUnknown_2023BC4
+ ldr r1, _0803194C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6595,14 +6595,14 @@ _08031930:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031948: .4byte gUnknown_2024284
-_0803194C: .4byte gUnknown_2023BC4
+_08031948: .4byte gPlayerParty
+_0803194C: .4byte gActiveBattler
_08031950:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031968 @ =gUnknown_2024284
+ ldr r1, _08031968 @ =gPlayerParty
adds r0, r1
- ldr r1, _0803196C @ =gUnknown_2023BC4
+ ldr r1, _0803196C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6610,14 +6610,14 @@ _08031950:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031968: .4byte gUnknown_2024284
-_0803196C: .4byte gUnknown_2023BC4
+_08031968: .4byte gPlayerParty
+_0803196C: .4byte gActiveBattler
_08031970:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031988 @ =gUnknown_2024284
+ ldr r1, _08031988 @ =gPlayerParty
adds r0, r1
- ldr r1, _0803198C @ =gUnknown_2023BC4
+ ldr r1, _0803198C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6625,14 +6625,14 @@ _08031970:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031988: .4byte gUnknown_2024284
-_0803198C: .4byte gUnknown_2023BC4
+_08031988: .4byte gPlayerParty
+_0803198C: .4byte gActiveBattler
_08031990:
movs r0, 0x64
muls r0, r5
- ldr r1, _080319A8 @ =gUnknown_2024284
+ ldr r1, _080319A8 @ =gPlayerParty
adds r0, r1
- ldr r1, _080319AC @ =gUnknown_2023BC4
+ ldr r1, _080319AC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6640,14 +6640,14 @@ _08031990:
bl sub_804037C
b _08031E56
.align 2, 0
-_080319A8: .4byte gUnknown_2024284
-_080319AC: .4byte gUnknown_2023BC4
+_080319A8: .4byte gPlayerParty
+_080319AC: .4byte gActiveBattler
_080319B0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080319C8 @ =gUnknown_2024284
+ ldr r1, _080319C8 @ =gPlayerParty
adds r0, r1
- ldr r1, _080319CC @ =gUnknown_2023BC4
+ ldr r1, _080319CC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6655,14 +6655,14 @@ _080319B0:
bl sub_804037C
b _08031E56
.align 2, 0
-_080319C8: .4byte gUnknown_2024284
-_080319CC: .4byte gUnknown_2023BC4
+_080319C8: .4byte gPlayerParty
+_080319CC: .4byte gActiveBattler
_080319D0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080319E8 @ =gUnknown_2024284
+ ldr r1, _080319E8 @ =gPlayerParty
adds r0, r1
- ldr r1, _080319EC @ =gUnknown_2023BC4
+ ldr r1, _080319EC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6670,14 +6670,14 @@ _080319D0:
bl sub_804037C
b _08031E56
.align 2, 0
-_080319E8: .4byte gUnknown_2024284
-_080319EC: .4byte gUnknown_2023BC4
+_080319E8: .4byte gPlayerParty
+_080319EC: .4byte gActiveBattler
_080319F0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031A08 @ =gUnknown_2024284
+ ldr r1, _08031A08 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031A0C @ =gUnknown_2023BC4
+ ldr r1, _08031A0C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6685,14 +6685,14 @@ _080319F0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031A08: .4byte gUnknown_2024284
-_08031A0C: .4byte gUnknown_2023BC4
+_08031A08: .4byte gPlayerParty
+_08031A0C: .4byte gActiveBattler
_08031A10:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031A28 @ =gUnknown_2024284
+ ldr r1, _08031A28 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031A2C @ =gUnknown_2023BC4
+ ldr r1, _08031A2C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6700,14 +6700,14 @@ _08031A10:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031A28: .4byte gUnknown_2024284
-_08031A2C: .4byte gUnknown_2023BC4
+_08031A28: .4byte gPlayerParty
+_08031A2C: .4byte gActiveBattler
_08031A30:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031A48 @ =gUnknown_2024284
+ ldr r1, _08031A48 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031A4C @ =gUnknown_2023BC4
+ ldr r1, _08031A4C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6715,14 +6715,14 @@ _08031A30:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031A48: .4byte gUnknown_2024284
-_08031A4C: .4byte gUnknown_2023BC4
+_08031A48: .4byte gPlayerParty
+_08031A4C: .4byte gActiveBattler
_08031A50:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031A68 @ =gUnknown_2024284
+ ldr r1, _08031A68 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031A6C @ =gUnknown_2023BC4
+ ldr r1, _08031A6C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6730,15 +6730,15 @@ _08031A50:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031A68: .4byte gUnknown_2024284
-_08031A6C: .4byte gUnknown_2023BC4
+_08031A68: .4byte gPlayerParty
+_08031A6C: .4byte gActiveBattler
_08031A70:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08031AD8 @ =gUnknown_2024284
+ ldr r0, _08031AD8 @ =gPlayerParty
adds r4, r0
- ldr r5, _08031ADC @ =gUnknown_2023BC4
+ ldr r5, _08031ADC @ =gActiveBattler
ldrb r2, [r5]
lsls r2, 9
adds r2, r7
@@ -6780,14 +6780,14 @@ _08031A70:
adds r0, r4, 0
b _08031B90
.align 2, 0
-_08031AD8: .4byte gUnknown_2024284
-_08031ADC: .4byte gUnknown_2023BC4
+_08031AD8: .4byte gPlayerParty
+_08031ADC: .4byte gActiveBattler
_08031AE0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031AF8 @ =gUnknown_2024284
+ ldr r1, _08031AF8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031AFC @ =gUnknown_2023BC4
+ ldr r1, _08031AFC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6795,14 +6795,14 @@ _08031AE0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031AF8: .4byte gUnknown_2024284
-_08031AFC: .4byte gUnknown_2023BC4
+_08031AF8: .4byte gPlayerParty
+_08031AFC: .4byte gActiveBattler
_08031B00:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031B18 @ =gUnknown_2024284
+ ldr r1, _08031B18 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031B1C @ =gUnknown_2023BC4
+ ldr r1, _08031B1C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6810,14 +6810,14 @@ _08031B00:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031B18: .4byte gUnknown_2024284
-_08031B1C: .4byte gUnknown_2023BC4
+_08031B18: .4byte gPlayerParty
+_08031B1C: .4byte gActiveBattler
_08031B20:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031B38 @ =gUnknown_2024284
+ ldr r1, _08031B38 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031B3C @ =gUnknown_2023BC4
+ ldr r1, _08031B3C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6825,14 +6825,14 @@ _08031B20:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031B38: .4byte gUnknown_2024284
-_08031B3C: .4byte gUnknown_2023BC4
+_08031B38: .4byte gPlayerParty
+_08031B3C: .4byte gActiveBattler
_08031B40:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031B58 @ =gUnknown_2024284
+ ldr r1, _08031B58 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031B5C @ =gUnknown_2023BC4
+ ldr r1, _08031B5C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6840,14 +6840,14 @@ _08031B40:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031B58: .4byte gUnknown_2024284
-_08031B5C: .4byte gUnknown_2023BC4
+_08031B58: .4byte gPlayerParty
+_08031B5C: .4byte gActiveBattler
_08031B60:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031B78 @ =gUnknown_2024284
+ ldr r1, _08031B78 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031B7C @ =gUnknown_2023BC4
+ ldr r1, _08031B7C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6855,14 +6855,14 @@ _08031B60:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031B78: .4byte gUnknown_2024284
-_08031B7C: .4byte gUnknown_2023BC4
+_08031B78: .4byte gPlayerParty
+_08031B7C: .4byte gActiveBattler
_08031B80:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031B98 @ =gUnknown_2024284
+ ldr r1, _08031B98 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031B9C @ =gUnknown_2023BC4
+ ldr r1, _08031B9C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6871,14 +6871,14 @@ _08031B90:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031B98: .4byte gUnknown_2024284
-_08031B9C: .4byte gUnknown_2023BC4
+_08031B98: .4byte gPlayerParty
+_08031B9C: .4byte gActiveBattler
_08031BA0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031BB8 @ =gUnknown_2024284
+ ldr r1, _08031BB8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031BBC @ =gUnknown_2023BC4
+ ldr r1, _08031BBC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6886,14 +6886,14 @@ _08031BA0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031BB8: .4byte gUnknown_2024284
-_08031BBC: .4byte gUnknown_2023BC4
+_08031BB8: .4byte gPlayerParty
+_08031BBC: .4byte gActiveBattler
_08031BC0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031BD8 @ =gUnknown_2024284
+ ldr r1, _08031BD8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031BDC @ =gUnknown_2023BC4
+ ldr r1, _08031BDC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6901,14 +6901,14 @@ _08031BC0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031BD8: .4byte gUnknown_2024284
-_08031BDC: .4byte gUnknown_2023BC4
+_08031BD8: .4byte gPlayerParty
+_08031BDC: .4byte gActiveBattler
_08031BE0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031BF8 @ =gUnknown_2024284
+ ldr r1, _08031BF8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031BFC @ =gUnknown_2023BC4
+ ldr r1, _08031BFC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6916,14 +6916,14 @@ _08031BE0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031BF8: .4byte gUnknown_2024284
-_08031BFC: .4byte gUnknown_2023BC4
+_08031BF8: .4byte gPlayerParty
+_08031BFC: .4byte gActiveBattler
_08031C00:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031C18 @ =gUnknown_2024284
+ ldr r1, _08031C18 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031C1C @ =gUnknown_2023BC4
+ ldr r1, _08031C1C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6931,14 +6931,14 @@ _08031C00:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031C18: .4byte gUnknown_2024284
-_08031C1C: .4byte gUnknown_2023BC4
+_08031C18: .4byte gPlayerParty
+_08031C1C: .4byte gActiveBattler
_08031C20:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031C38 @ =gUnknown_2024284
+ ldr r1, _08031C38 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031C3C @ =gUnknown_2023BC4
+ ldr r1, _08031C3C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6946,14 +6946,14 @@ _08031C20:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031C38: .4byte gUnknown_2024284
-_08031C3C: .4byte gUnknown_2023BC4
+_08031C38: .4byte gPlayerParty
+_08031C3C: .4byte gActiveBattler
_08031C40:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031C58 @ =gUnknown_2024284
+ ldr r1, _08031C58 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031C5C @ =gUnknown_2023BC4
+ ldr r1, _08031C5C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6961,14 +6961,14 @@ _08031C40:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031C58: .4byte gUnknown_2024284
-_08031C5C: .4byte gUnknown_2023BC4
+_08031C58: .4byte gPlayerParty
+_08031C5C: .4byte gActiveBattler
_08031C60:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031C78 @ =gUnknown_2024284
+ ldr r1, _08031C78 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031C7C @ =gUnknown_2023BC4
+ ldr r1, _08031C7C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6976,14 +6976,14 @@ _08031C60:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031C78: .4byte gUnknown_2024284
-_08031C7C: .4byte gUnknown_2023BC4
+_08031C78: .4byte gPlayerParty
+_08031C7C: .4byte gActiveBattler
_08031C80:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031C98 @ =gUnknown_2024284
+ ldr r1, _08031C98 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031C9C @ =gUnknown_2023BC4
+ ldr r1, _08031C9C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -6991,14 +6991,14 @@ _08031C80:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031C98: .4byte gUnknown_2024284
-_08031C9C: .4byte gUnknown_2023BC4
+_08031C98: .4byte gPlayerParty
+_08031C9C: .4byte gActiveBattler
_08031CA0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031CB8 @ =gUnknown_2024284
+ ldr r1, _08031CB8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031CBC @ =gUnknown_2023BC4
+ ldr r1, _08031CBC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7006,14 +7006,14 @@ _08031CA0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031CB8: .4byte gUnknown_2024284
-_08031CBC: .4byte gUnknown_2023BC4
+_08031CB8: .4byte gPlayerParty
+_08031CBC: .4byte gActiveBattler
_08031CC0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031CD8 @ =gUnknown_2024284
+ ldr r1, _08031CD8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031CDC @ =gUnknown_2023BC4
+ ldr r1, _08031CDC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7021,14 +7021,14 @@ _08031CC0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031CD8: .4byte gUnknown_2024284
-_08031CDC: .4byte gUnknown_2023BC4
+_08031CD8: .4byte gPlayerParty
+_08031CDC: .4byte gActiveBattler
_08031CE0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031CF8 @ =gUnknown_2024284
+ ldr r1, _08031CF8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031CFC @ =gUnknown_2023BC4
+ ldr r1, _08031CFC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7036,14 +7036,14 @@ _08031CE0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031CF8: .4byte gUnknown_2024284
-_08031CFC: .4byte gUnknown_2023BC4
+_08031CF8: .4byte gPlayerParty
+_08031CFC: .4byte gActiveBattler
_08031D00:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031D18 @ =gUnknown_2024284
+ ldr r1, _08031D18 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031D1C @ =gUnknown_2023BC4
+ ldr r1, _08031D1C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7051,14 +7051,14 @@ _08031D00:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031D18: .4byte gUnknown_2024284
-_08031D1C: .4byte gUnknown_2023BC4
+_08031D18: .4byte gPlayerParty
+_08031D1C: .4byte gActiveBattler
_08031D20:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031D38 @ =gUnknown_2024284
+ ldr r1, _08031D38 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031D3C @ =gUnknown_2023BC4
+ ldr r1, _08031D3C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7066,14 +7066,14 @@ _08031D20:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031D38: .4byte gUnknown_2024284
-_08031D3C: .4byte gUnknown_2023BC4
+_08031D38: .4byte gPlayerParty
+_08031D3C: .4byte gActiveBattler
_08031D40:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031D58 @ =gUnknown_2024284
+ ldr r1, _08031D58 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031D5C @ =gUnknown_2023BC4
+ ldr r1, _08031D5C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7081,14 +7081,14 @@ _08031D40:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031D58: .4byte gUnknown_2024284
-_08031D5C: .4byte gUnknown_2023BC4
+_08031D58: .4byte gPlayerParty
+_08031D5C: .4byte gActiveBattler
_08031D60:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031D78 @ =gUnknown_2024284
+ ldr r1, _08031D78 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031D7C @ =gUnknown_2023BC4
+ ldr r1, _08031D7C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7096,14 +7096,14 @@ _08031D60:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031D78: .4byte gUnknown_2024284
-_08031D7C: .4byte gUnknown_2023BC4
+_08031D78: .4byte gPlayerParty
+_08031D7C: .4byte gActiveBattler
_08031D80:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031D98 @ =gUnknown_2024284
+ ldr r1, _08031D98 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031D9C @ =gUnknown_2023BC4
+ ldr r1, _08031D9C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7111,14 +7111,14 @@ _08031D80:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031D98: .4byte gUnknown_2024284
-_08031D9C: .4byte gUnknown_2023BC4
+_08031D98: .4byte gPlayerParty
+_08031D9C: .4byte gActiveBattler
_08031DA0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031DB8 @ =gUnknown_2024284
+ ldr r1, _08031DB8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031DBC @ =gUnknown_2023BC4
+ ldr r1, _08031DBC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7126,14 +7126,14 @@ _08031DA0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031DB8: .4byte gUnknown_2024284
-_08031DBC: .4byte gUnknown_2023BC4
+_08031DB8: .4byte gPlayerParty
+_08031DBC: .4byte gActiveBattler
_08031DC0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031DD8 @ =gUnknown_2024284
+ ldr r1, _08031DD8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031DDC @ =gUnknown_2023BC4
+ ldr r1, _08031DDC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7141,14 +7141,14 @@ _08031DC0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031DD8: .4byte gUnknown_2024284
-_08031DDC: .4byte gUnknown_2023BC4
+_08031DD8: .4byte gPlayerParty
+_08031DDC: .4byte gActiveBattler
_08031DE0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031DF8 @ =gUnknown_2024284
+ ldr r1, _08031DF8 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031DFC @ =gUnknown_2023BC4
+ ldr r1, _08031DFC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7156,14 +7156,14 @@ _08031DE0:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031DF8: .4byte gUnknown_2024284
-_08031DFC: .4byte gUnknown_2023BC4
+_08031DF8: .4byte gPlayerParty
+_08031DFC: .4byte gActiveBattler
_08031E00:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031E18 @ =gUnknown_2024284
+ ldr r1, _08031E18 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031E1C @ =gUnknown_2023BC4
+ ldr r1, _08031E1C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7171,14 +7171,14 @@ _08031E00:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031E18: .4byte gUnknown_2024284
-_08031E1C: .4byte gUnknown_2023BC4
+_08031E18: .4byte gPlayerParty
+_08031E1C: .4byte gActiveBattler
_08031E20:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031E38 @ =gUnknown_2024284
+ ldr r1, _08031E38 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031E3C @ =gUnknown_2023BC4
+ ldr r1, _08031E3C @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
@@ -7186,29 +7186,29 @@ _08031E20:
bl sub_804037C
b _08031E56
.align 2, 0
-_08031E38: .4byte gUnknown_2024284
-_08031E3C: .4byte gUnknown_2023BC4
+_08031E38: .4byte gPlayerParty
+_08031E3C: .4byte gActiveBattler
_08031E40:
movs r0, 0x64
muls r0, r5
- ldr r1, _08031E80 @ =gUnknown_2024284
+ ldr r1, _08031E80 @ =gPlayerParty
adds r0, r1
- ldr r1, _08031E84 @ =gUnknown_2023BC4
+ ldr r1, _08031E84 @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
adds r2, r7
movs r1, 0x36
bl sub_804037C
_08031E56:
- ldr r2, _08031E88 @ =gUnknown_2023BCE
- ldr r0, _08031E84 @ =gUnknown_2023BC4
+ ldr r2, _08031E88 @ =gBattlerPartyIndexes
+ ldr r0, _08031E84 @ =gActiveBattler
ldrb r1, [r0]
lsls r0, r1, 1
adds r0, r2
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _08031E80 @ =gUnknown_2024284
+ ldr r2, _08031E80 @ =gPlayerParty
adds r0, r2
bl HandleLowHpMusicChange
add sp, 0x34
@@ -7220,16 +7220,16 @@ _08031E56:
pop {r0}
bx r0
.align 2, 0
-_08031E80: .4byte gUnknown_2024284
-_08031E84: .4byte gUnknown_2023BC4
-_08031E88: .4byte gUnknown_2023BCE
+_08031E80: .4byte gPlayerParty
+_08031E84: .4byte gActiveBattler
+_08031E88: .4byte gBattlerPartyIndexes
thumb_func_end SetPlayerMonData
thumb_func_start PlayerHandleSetRawMonData
PlayerHandleSetRawMonData: @ 8031E8C
push {r4-r7,lr}
- ldr r1, _08031EF0 @ =gUnknown_2023BCE
- ldr r7, _08031EF4 @ =gUnknown_2023BC4
+ ldr r1, _08031EF0 @ =gBattlerPartyIndexes
+ ldr r7, _08031EF4 @ =gActiveBattler
ldrb r2, [r7]
lsls r0, r2, 1
adds r0, r1
@@ -7242,7 +7242,7 @@ PlayerHandleSetRawMonData: @ 8031E8C
adds r0, r4, 0x1
adds r0, r2, r0
ldrb r0, [r0]
- ldr r1, _08031EFC @ =gUnknown_2024284
+ ldr r1, _08031EFC @ =gPlayerParty
adds r0, r1
adds r5, r3, r0
movs r3, 0
@@ -7278,24 +7278,24 @@ _08031EE4:
pop {r0}
bx r0
.align 2, 0
-_08031EF0: .4byte gUnknown_2023BCE
-_08031EF4: .4byte gUnknown_2023BC4
+_08031EF0: .4byte gBattlerPartyIndexes
+_08031EF4: .4byte gActiveBattler
_08031EF8: .4byte gUnknown_2022BC4
-_08031EFC: .4byte gUnknown_2024284
+_08031EFC: .4byte gPlayerParty
thumb_func_end PlayerHandleSetRawMonData
thumb_func_start PlayerHandleLoadMonSprite
PlayerHandleLoadMonSprite: @ 8031F00
push {r4,lr}
- ldr r2, _08031F4C @ =gUnknown_2023BCE
- ldr r4, _08031F50 @ =gUnknown_2023BC4
+ ldr r2, _08031F4C @ =gBattlerPartyIndexes
+ ldr r4, _08031F50 @ =gActiveBattler
ldrb r1, [r4]
lsls r0, r1, 1
adds r0, r2
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _08031F54 @ =gUnknown_2024284
+ ldr r2, _08031F54 @ =gPlayerParty
adds r0, r2
bl sub_8034498
ldr r2, _08031F58 @ =gSprites
@@ -7323,9 +7323,9 @@ PlayerHandleLoadMonSprite: @ 8031F00
pop {r0}
bx r0
.align 2, 0
-_08031F4C: .4byte gUnknown_2023BCE
-_08031F50: .4byte gUnknown_2023BC4
-_08031F54: .4byte gUnknown_2024284
+_08031F4C: .4byte gBattlerPartyIndexes
+_08031F50: .4byte gActiveBattler
+_08031F54: .4byte gPlayerParty
_08031F58: .4byte gSprites
_08031F5C: .4byte gUnknown_2023D44
_08031F60: .4byte gUnknown_3004FE0
@@ -7335,7 +7335,7 @@ _08031F64: .4byte CompleteOnBankSpritePosX_0
thumb_func_start PlayerHandleSwitchInAnim
PlayerHandleSwitchInAnim: @ 8031F68
push {r4-r6,lr}
- ldr r5, _08031FD4 @ =gUnknown_2023BC4
+ ldr r5, _08031FD4 @ =gActiveBattler
ldrb r0, [r5]
ldr r4, _08031FD8 @ =gUnknown_2022BC4
lsls r1, r0, 9
@@ -7343,7 +7343,7 @@ PlayerHandleSwitchInAnim: @ 8031F68
adds r1, r6
ldrb r1, [r1]
bl ClearTemporarySpeciesSpriteData
- ldr r2, _08031FDC @ =gUnknown_2023BCE
+ ldr r2, _08031FDC @ =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r1, r0, 1
adds r1, r2
@@ -7359,7 +7359,7 @@ PlayerHandleSwitchInAnim: @ 8031F68
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _08031FE0 @ =gUnknown_2024284
+ ldr r2, _08031FE0 @ =gPlayerParty
adds r0, r2
bl sub_8034498
ldr r1, _08031FE4 @ =gUnknown_2023FF8
@@ -7385,10 +7385,10 @@ PlayerHandleSwitchInAnim: @ 8031F68
pop {r0}
bx r0
.align 2, 0
-_08031FD4: .4byte gUnknown_2023BC4
+_08031FD4: .4byte gActiveBattler
_08031FD8: .4byte gUnknown_2022BC4
-_08031FDC: .4byte gUnknown_2023BCE
-_08031FE0: .4byte gUnknown_2024284
+_08031FDC: .4byte gBattlerPartyIndexes
+_08031FE0: .4byte gPlayerParty
_08031FE4: .4byte gUnknown_2023FF8
_08031FE8: .4byte gUnknown_2023FFC
_08031FEC: .4byte gUnknown_3004FE0
@@ -7409,7 +7409,7 @@ sub_8031FF4: @ 8031FF4
lsrs r1, 24
adds r0, r6, 0
bl ClearTemporarySpeciesSpriteData
- ldr r0, _08032138 @ =gUnknown_2023BCE
+ ldr r0, _08032138 @ =gBattlerPartyIndexes
lsls r2, r6, 1
adds r2, r0
ldr r0, _0803213C @ =gUnknown_2022BC4
@@ -7421,7 +7421,7 @@ sub_8031FF4: @ 8031FF4
ldrh r1, [r2]
movs r0, 0x64
muls r0, r1
- ldr r1, _08032140 @ =gUnknown_2024284
+ ldr r1, _08032140 @ =gPlayerParty
adds r0, r1
movs r1, 0xB
bl GetMonData
@@ -7549,9 +7549,9 @@ sub_8031FF4: @ 8031FF4
pop {r0}
bx r0
.align 2, 0
-_08032138: .4byte gUnknown_2023BCE
+_08032138: .4byte gBattlerPartyIndexes
_0803213C: .4byte gUnknown_2022BC4
-_08032140: .4byte gUnknown_2024284
+_08032140: .4byte gPlayerParty
_08032144: .4byte sub_8033E3C
_08032148: .4byte gUnknown_3004FFC
_0803214C: .4byte gUnknown_20244DC
@@ -7565,7 +7565,7 @@ _0803215C: .4byte SpriteCallbackDummy
PlayerHandleReturnPokeToBall: @ 8032160
push {r4-r6,lr}
ldr r1, _08032194 @ =gUnknown_2022BC4
- ldr r6, _08032198 @ =gUnknown_2023BC4
+ ldr r6, _08032198 @ =gActiveBattler
ldrb r2, [r6]
lsls r0, r2, 9
adds r1, 0x1
@@ -7590,7 +7590,7 @@ PlayerHandleReturnPokeToBall: @ 8032160
b _080321DE
.align 2, 0
_08032194: .4byte gUnknown_2022BC4
-_08032198: .4byte gUnknown_2023BC4
+_08032198: .4byte gActiveBattler
_0803219C: .4byte gUnknown_2024018
_080321A0: .4byte gUnknown_3004FE0
_080321A4: .4byte sub_80321F0
@@ -7633,7 +7633,7 @@ sub_80321F0: @ 80321F0
push {r4-r6,lr}
ldr r6, _08032210 @ =gUnknown_2024018
ldr r4, [r6]
- ldr r5, _08032214 @ =gUnknown_2023BC4
+ ldr r5, _08032214 @ =gActiveBattler
ldrb r2, [r5]
ldr r1, [r4, 0x4]
lsls r0, r2, 1
@@ -7648,7 +7648,7 @@ sub_80321F0: @ 80321F0
b _0803226E
.align 2, 0
_08032210: .4byte gUnknown_2024018
-_08032214: .4byte gUnknown_2023BC4
+_08032214: .4byte gActiveBattler
_08032218:
ldr r1, [r4]
lsls r0, r2, 2
@@ -7707,13 +7707,13 @@ sub_803227C: @ 803227C
push {r4-r7,lr}
mov r7, r8
push {r7}
- ldr r0, _080322A4 @ =gUnknown_2022B4C
+ ldr r0, _080322A4 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
cmp r0, 0
beq _080322AC
- ldr r0, _080322A8 @ =gUnknown_2023BC4
+ ldr r0, _080322A8 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
movs r1, 0x2
@@ -7724,12 +7724,12 @@ sub_803227C: @ 803227C
movs r7, 0x5A
b _080322AE
.align 2, 0
-_080322A4: .4byte gUnknown_2022B4C
-_080322A8: .4byte gUnknown_2023BC4
+_080322A4: .4byte gBattleTypeFlags
+_080322A8: .4byte gActiveBattler
_080322AC:
movs r7, 0x50
_080322AE:
- ldr r0, _08032320 @ =gUnknown_2022B4C
+ ldr r0, _08032320 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x2
ands r0, r1
@@ -7783,7 +7783,7 @@ _08032306:
adds r4, r0, 0x2
b _08032342
.align 2, 0
-_08032320: .4byte gUnknown_2022B4C
+_08032320: .4byte gBattleTypeFlags
_08032324: .4byte gUnknown_202273C
_08032328:
bl GetMultiplayerId
@@ -7800,7 +7800,7 @@ _0803233C:
ldr r0, [r0]
ldrb r4, [r0, 0x8]
_08032342:
- ldr r5, _08032404 @ =gUnknown_2023BC4
+ ldr r5, _08032404 @ =gActiveBattler
ldrb r1, [r5]
adds r0, r4, 0
bl sub_8034750
@@ -7892,7 +7892,7 @@ _08032342:
bx r0
.align 2, 0
_08032400: .4byte gSaveBlock2Ptr
-_08032404: .4byte gUnknown_2023BC4
+_08032404: .4byte gActiveBattler
_08032408: .4byte gUnknown_20244DC
_0803240C: .4byte gUnknown_8239F8C
_08032410: .4byte gUnknown_2023D44
@@ -7906,7 +7906,7 @@ _08032424: .4byte sub_802F730
thumb_func_start sub_8032428
sub_8032428: @ 8032428
push {r4-r6,lr}
- ldr r0, _0803249C @ =gUnknown_2022B4C
+ ldr r0, _0803249C @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x2
ands r0, r1
@@ -7960,7 +7960,7 @@ _08032482:
adds r4, r0, 0x2
b _080324BE
.align 2, 0
-_0803249C: .4byte gUnknown_2022B4C
+_0803249C: .4byte gBattleTypeFlags
_080324A0: .4byte gUnknown_202273C
_080324A4:
bl GetMultiplayerId
@@ -7977,7 +7977,7 @@ _080324B8:
ldr r0, [r0]
ldrb r4, [r0, 0x8]
_080324BE:
- ldr r5, _0803256C @ =gUnknown_2023BC4
+ ldr r5, _0803256C @ =gActiveBattler
ldrb r1, [r5]
adds r0, r4, 0
bl sub_8034750
@@ -8060,7 +8060,7 @@ _080324BE:
bx r0
.align 2, 0
_08032568: .4byte gSaveBlock2Ptr
-_0803256C: .4byte gUnknown_2023BC4
+_0803256C: .4byte gActiveBattler
_08032570: .4byte gUnknown_20244DC
_08032574: .4byte gUnknown_8239F8C
_08032578: .4byte gUnknown_2023D44
@@ -8075,7 +8075,7 @@ _0803258C: .4byte sub_802F768
PlayerHandleTrainerSlideBack: @ 8032590
push {r4-r6,lr}
ldr r5, _08032630 @ =gUnknown_2023D44
- ldr r6, _08032634 @ =gUnknown_2023BC4
+ ldr r6, _08032634 @ =gActiveBattler
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -8152,7 +8152,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
bx r0
.align 2, 0
_08032630: .4byte gUnknown_2023D44
-_08032634: .4byte gUnknown_2023BC4
+_08032634: .4byte gActiveBattler
_08032638: .4byte gSprites
_0803263C: .4byte 0x0000ffd8
_08032640: .4byte sub_8075590
@@ -8166,7 +8166,7 @@ sub_8032650: @ 8032650
push {r4-r6,lr}
ldr r6, _0803269C @ =gUnknown_2024018
ldr r4, [r6]
- ldr r5, _080326A0 @ =gUnknown_2023BC4
+ ldr r5, _080326A0 @ =gActiveBattler
ldrb r2, [r5]
ldr r0, [r4, 0x4]
lsls r1, r2, 1
@@ -8202,7 +8202,7 @@ _08032684:
b _0803271A
.align 2, 0
_0803269C: .4byte gUnknown_2024018
-_080326A0: .4byte gUnknown_2023BC4
+_080326A0: .4byte gActiveBattler
_080326A4:
ldrb r1, [r3]
movs r0, 0x40
@@ -8212,14 +8212,14 @@ _080326A4:
cmp r4, 0
bne _0803271A
strb r4, [r3, 0x4]
- ldr r2, _08032720 @ =gUnknown_2023BCE
+ ldr r2, _08032720 @ =gBattlerPartyIndexes
ldrb r1, [r5]
lsls r0, r1, 1
adds r0, r2
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _08032724 @ =gUnknown_2024284
+ ldr r2, _08032724 @ =gPlayerParty
adds r0, r2
bl HandleLowHpMusicChange
movs r1, 0x40
@@ -8266,8 +8266,8 @@ _0803271A:
pop {r0}
bx r0
.align 2, 0
-_08032720: .4byte gUnknown_2023BCE
-_08032724: .4byte gUnknown_2024284
+_08032720: .4byte gBattlerPartyIndexes
+_08032724: .4byte gPlayerParty
_08032728: .4byte gSprites
_0803272C: .4byte gUnknown_2023D44
_08032730: .4byte sub_8012110
@@ -8304,7 +8304,7 @@ sub_803275C: @ 803275C
ldr r1, _080327A0 @ =gUnknown_2024005
movs r0, 0x1
strb r0, [r1]
- ldr r5, _080327A4 @ =gUnknown_2023BC4
+ ldr r5, _080327A4 @ =gActiveBattler
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByIdentity
@@ -8327,7 +8327,7 @@ sub_803275C: @ 803275C
.align 2, 0
_0803279C: .4byte gUnknown_2024018
_080327A0: .4byte gUnknown_2024005
-_080327A4: .4byte gUnknown_2023BC4
+_080327A4: .4byte gActiveBattler
_080327A8: .4byte gUnknown_3004FE0
_080327AC: .4byte CompleteOnSpecialAnimDone
thumb_func_end sub_803275C
@@ -8336,7 +8336,7 @@ _080327AC: .4byte CompleteOnSpecialAnimDone
PlayerHandleBallThrowAnim: @ 80327B0
push {r4,r5,lr}
ldr r1, _080327F8 @ =gUnknown_2022BC4
- ldr r5, _080327FC @ =gUnknown_2023BC4
+ ldr r5, _080327FC @ =gActiveBattler
ldrb r0, [r5]
lsls r0, 9
adds r1, 0x1
@@ -8370,7 +8370,7 @@ PlayerHandleBallThrowAnim: @ 80327B0
bx r0
.align 2, 0
_080327F8: .4byte gUnknown_2022BC4
-_080327FC: .4byte gUnknown_2023BC4
+_080327FC: .4byte gActiveBattler
_08032800: .4byte gUnknown_2024018
_08032804: .4byte gUnknown_2024005
_08032808: .4byte gUnknown_3004FE0
@@ -8381,7 +8381,7 @@ _0803280C: .4byte CompleteOnSpecialAnimDone
PlayerHandlePause: @ 8032810
push {lr}
ldr r1, _08032838 @ =gUnknown_2022BC4
- ldr r0, _0803283C @ =gUnknown_2023BC4
+ ldr r0, _0803283C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -8401,13 +8401,13 @@ _0803282E:
bx r0
.align 2, 0
_08032838: .4byte gUnknown_2022BC4
-_0803283C: .4byte gUnknown_2023BC4
+_0803283C: .4byte gActiveBattler
thumb_func_end PlayerHandlePause
thumb_func_start PlayerHandleMoveAnimation
PlayerHandleMoveAnimation: @ 8032840
push {r4-r6,lr}
- ldr r6, _08032924 @ =gUnknown_2023BC4
+ ldr r6, _08032924 @ =gActiveBattler
ldrb r0, [r6]
bl mplay_80342A4
lsls r0, 24
@@ -8518,7 +8518,7 @@ _08032852:
bl PlayerBufferExecCompleted
b _08032966
.align 2, 0
-_08032924: .4byte gUnknown_2023BC4
+_08032924: .4byte gActiveBattler
_08032928: .4byte gUnknown_2022BC4
_0803292C: .4byte gUnknown_2037F16
_08032930: .4byte gUnknown_2037EEC
@@ -8561,7 +8561,7 @@ sub_8032978: @ 8032978
mov r5, r8
push {r5-r7}
ldr r2, _080329C4 @ =gUnknown_2022BC4
- ldr r6, _080329C8 @ =gUnknown_2023BC4
+ ldr r6, _080329C8 @ =gActiveBattler
ldrb r3, [r6]
lsls r1, r3, 9
adds r0, r2, 0x1
@@ -8595,7 +8595,7 @@ sub_8032978: @ 8032978
b _08032AEC
.align 2, 0
_080329C4: .4byte gUnknown_2022BC4
-_080329C8: .4byte gUnknown_2023BC4
+_080329C8: .4byte gActiveBattler
_080329CC: .4byte gUnknown_2024018
_080329D0:
cmp r2, 0x2
@@ -8691,7 +8691,7 @@ _08032A3A:
_08032A88:
ldr r0, _08032AA8 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _08032AAC @ =gUnknown_2023BC4
+ ldr r0, _08032AAC @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -8705,7 +8705,7 @@ _08032A88:
_08032AA0: .4byte gUnknown_2037EDC
_08032AA4: .4byte gUnknown_2037EE1
_08032AA8: .4byte gUnknown_2024018
-_08032AAC: .4byte gUnknown_2023BC4
+_08032AAC: .4byte gActiveBattler
_08032AB0:
ldrb r1, [r0]
movs r0, 0x40
@@ -8752,7 +8752,7 @@ sub_8032AFC: @ 8032AFC
strh r1, [r0]
ldr r0, _08032B34 @ =gUnknown_2022976
strh r1, [r0]
- ldr r0, _08032B38 @ =gUnknown_2023BC4
+ ldr r0, _08032B38 @ =gActiveBattler
ldrb r4, [r0]
lsls r4, 9
ldr r0, _08032B3C @ =gUnknown_2022BC6
@@ -8771,7 +8771,7 @@ sub_8032AFC: @ 8032AFC
.align 2, 0
_08032B30: .4byte gUnknown_2022974
_08032B34: .4byte gUnknown_2022976
-_08032B38: .4byte gUnknown_2023BC4
+_08032B38: .4byte gActiveBattler
_08032B3C: .4byte gUnknown_2022BC6
_08032B40: .4byte gUnknown_202298C
_08032B44:
@@ -8780,7 +8780,7 @@ _08032B44:
bl sub_80D87BC
_08032B4C:
ldr r1, _08032B64 @ =gUnknown_3004FE0
- ldr r0, _08032B68 @ =gUnknown_2023BC4
+ ldr r0, _08032B68 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -8792,14 +8792,14 @@ _08032B4C:
.align 2, 0
_08032B60: .4byte gUnknown_202298C
_08032B64: .4byte gUnknown_3004FE0
-_08032B68: .4byte gUnknown_2023BC4
+_08032B68: .4byte gActiveBattler
_08032B6C: .4byte sub_8030610
thumb_func_end sub_8032AFC
thumb_func_start sub_8032B70
sub_8032B70: @ 8032B70
push {lr}
- ldr r0, _08032B88 @ =gUnknown_2023BC4
+ ldr r0, _08032B88 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -8808,7 +8808,7 @@ sub_8032B70: @ 8032B70
bl sub_8032AFC
b _08032B90
.align 2, 0
-_08032B88: .4byte gUnknown_2023BC4
+_08032B88: .4byte gActiveBattler
_08032B8C:
bl PlayerBufferExecCompleted
_08032B90:
@@ -8830,7 +8830,7 @@ sub_8032B94: @ 8032B94
movs r0, 0xA0
strh r0, [r1]
ldr r1, _08032BC8 @ =gUnknown_3004FE0
- ldr r0, _08032BCC @ =gUnknown_2023BC4
+ ldr r0, _08032BCC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -8843,7 +8843,7 @@ _08032BBA:
_08032BC0: .4byte gUnknown_2022974
_08032BC4: .4byte gUnknown_2022976
_08032BC8: .4byte gUnknown_3004FE0
-_08032BCC: .4byte gUnknown_2023BC4
+_08032BCC: .4byte gActiveBattler
_08032BD0: .4byte sub_802E438
thumb_func_end sub_8032B94
@@ -8851,7 +8851,7 @@ _08032BD0: .4byte sub_802E438
sub_8032BD4: @ 8032BD4
push {r4,lr}
ldr r1, _08032C28 @ =gUnknown_3004FE0
- ldr r0, _08032C2C @ =gUnknown_2023BC4
+ ldr r0, _08032C2C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -8872,7 +8872,7 @@ _08032BF6:
cmp r4, 0x3
ble _08032BF6
ldr r1, _08032C3C @ =gUnknown_2023FF8
- ldr r0, _08032C2C @ =gUnknown_2023BC4
+ ldr r0, _08032C2C @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -8888,7 +8888,7 @@ _08032BF6:
bx r0
.align 2, 0
_08032C28: .4byte gUnknown_3004FE0
-_08032C2C: .4byte gUnknown_2023BC4
+_08032C2C: .4byte gActiveBattler
_08032C30: .4byte sub_8032B94
_08032C34: .4byte gUnknown_83FDA4C
_08032C38: .4byte gUnknown_83FE725
@@ -8918,7 +8918,7 @@ sub_8032C4C: @ 8032C4C
adds r0, r2, 0
strh r0, [r1]
ldr r1, _08032C84 @ =gUnknown_3004FE0
- ldr r0, _08032C88 @ =gUnknown_2023BC4
+ ldr r0, _08032C88 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -8931,7 +8931,7 @@ _08032C76:
_08032C7C: .4byte gUnknown_2022974
_08032C80: .4byte gUnknown_2022976
_08032C84: .4byte gUnknown_3004FE0
-_08032C88: .4byte gUnknown_2023BC4
+_08032C88: .4byte gActiveBattler
_08032C8C: .4byte sub_802EA10
thumb_func_end sub_8032C4C
@@ -8940,7 +8940,7 @@ sub_8032C90: @ 8032C90
push {lr}
bl sub_8032CB4
ldr r1, _08032CA8 @ =gUnknown_3004FE0
- ldr r0, _08032CAC @ =gUnknown_2023BC4
+ ldr r0, _08032CAC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -8950,7 +8950,7 @@ sub_8032C90: @ 8032C90
bx r0
.align 2, 0
_08032CA8: .4byte gUnknown_3004FE0
-_08032CAC: .4byte gUnknown_2023BC4
+_08032CAC: .4byte gActiveBattler
_08032CB0: .4byte sub_8032C4C
thumb_func_end sub_8032C90
@@ -8962,7 +8962,7 @@ sub_8032CB4: @ 8032CB4
movs r0, 0xFF
strb r0, [r1]
ldr r1, _08032CE4 @ =gUnknown_2023FFC
- ldr r0, _08032CE8 @ =gUnknown_2023BC4
+ ldr r0, _08032CE8 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -8976,7 +8976,7 @@ sub_8032CB4: @ 8032CB4
.align 2, 0
_08032CE0: .4byte gUnknown_3004FF4
_08032CE4: .4byte gUnknown_2023FFC
-_08032CE8: .4byte gUnknown_2023BC4
+_08032CE8: .4byte gActiveBattler
thumb_func_end sub_8032CB4
thumb_func_start sub_8032CEC
@@ -8991,7 +8991,7 @@ sub_8032CEC: @ 8032CEC
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r1, _08032D38 @ =gUnknown_3004FE0
- ldr r2, _08032D3C @ =gUnknown_2023BC4
+ ldr r2, _08032D3C @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -9021,7 +9021,7 @@ _08032D1A:
bx r0
.align 2, 0
_08032D38: .4byte gUnknown_3004FE0
-_08032D3C: .4byte gUnknown_2023BC4
+_08032D3C: .4byte gActiveBattler
_08032D40: .4byte sub_8030700
_08032D44: .4byte gUnknown_2024004
_08032D48: .4byte gUnknown_203B0DC
@@ -9036,7 +9036,7 @@ sub_8032D50: @ 8032D50
movs r1, 0xFF
bl CreateTask
ldr r3, _08032E04 @ =gUnknown_3004FFC
- ldr r4, _08032E08 @ =gUnknown_2023BC4
+ ldr r4, _08032E08 @ =gActiveBattler
ldrb r1, [r4]
adds r1, r3
strb r0, [r1]
@@ -9056,7 +9056,7 @@ sub_8032D50: @ 8032D50
movs r0, 0xF
ands r0, r2
strh r0, [r1, 0x8]
- ldr r3, _08032E14 @ =gUnknown_2023FE8
+ ldr r3, _08032E14 @ =gBattleStruct
ldr r1, [r3]
adds r1, 0x49
ldrb r0, [r4]
@@ -9103,7 +9103,7 @@ _08032DBC:
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r1, _08032E1C @ =gUnknown_3004FE0
- ldr r2, _08032E08 @ =gUnknown_2023BC4
+ ldr r2, _08032E08 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -9119,10 +9119,10 @@ _08032DBC:
.align 2, 0
_08032E00: .4byte nullsub_43
_08032E04: .4byte gUnknown_3004FFC
-_08032E08: .4byte gUnknown_2023BC4
+_08032E08: .4byte gActiveBattler
_08032E0C: .4byte gUnknown_3005090
_08032E10: .4byte gUnknown_2022BC4
-_08032E14: .4byte gUnknown_2023FE8
+_08032E14: .4byte gBattleStruct
_08032E18: .4byte gUnknown_203B0DC
_08032E1C: .4byte gUnknown_3004FE0
_08032E20: .4byte sub_8030628
@@ -9158,7 +9158,7 @@ sub_8032E4C: @ 8032E4C
movs r0, 0
bl LoadBattleBarGfx
ldr r3, _08032EC4 @ =gUnknown_2022BC4
- ldr r0, _08032EC8 @ =gUnknown_2023BC4
+ ldr r0, _08032EC8 @ =gActiveBattler
mov r9, r0
ldrb r4, [r0]
lsls r2, r4, 9
@@ -9175,13 +9175,13 @@ sub_8032E4C: @ 8032E4C
ldr r0, _08032ECC @ =0x00007fff
cmp r7, r0
beq _08032EDC
- ldr r6, _08032ED0 @ =gUnknown_2023BCE
+ ldr r6, _08032ED0 @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r6
ldrh r0, [r0]
movs r5, 0x64
muls r0, r5
- ldr r4, _08032ED4 @ =gUnknown_2024284
+ ldr r4, _08032ED4 @ =gPlayerParty
adds r0, r4
movs r1, 0x3A
bl GetMonData
@@ -9207,19 +9207,19 @@ sub_8032E4C: @ 8032E4C
b _08032F16
.align 2, 0
_08032EC4: .4byte gUnknown_2022BC4
-_08032EC8: .4byte gUnknown_2023BC4
+_08032EC8: .4byte gActiveBattler
_08032ECC: .4byte 0x00007fff
-_08032ED0: .4byte gUnknown_2023BCE
-_08032ED4: .4byte gUnknown_2024284
+_08032ED0: .4byte gBattlerPartyIndexes
+_08032ED4: .4byte gPlayerParty
_08032ED8: .4byte gUnknown_3004FF0
_08032EDC:
- ldr r1, _08032F34 @ =gUnknown_2023BCE
+ ldr r1, _08032F34 @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _08032F38 @ =gUnknown_2024284
+ ldr r1, _08032F38 @ =gPlayerParty
adds r0, r1
movs r1, 0x3A
bl GetMonData
@@ -9241,7 +9241,7 @@ _08032EDC:
bl sub_8048440
_08032F16:
ldr r1, _08032F40 @ =gUnknown_3004FE0
- ldr r0, _08032F44 @ =gUnknown_2023BC4
+ ldr r0, _08032F44 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -9255,11 +9255,11 @@ _08032F16:
pop {r0}
bx r0
.align 2, 0
-_08032F34: .4byte gUnknown_2023BCE
-_08032F38: .4byte gUnknown_2024284
+_08032F34: .4byte gBattlerPartyIndexes
+_08032F38: .4byte gPlayerParty
_08032F3C: .4byte gUnknown_3004FF0
_08032F40: .4byte gUnknown_3004FE0
-_08032F44: .4byte gUnknown_2023BC4
+_08032F44: .4byte gActiveBattler
_08032F48: .4byte CompleteOnHealthbarDone
thumb_func_end sub_8032E4C
@@ -9267,7 +9267,7 @@ _08032F48: .4byte CompleteOnHealthbarDone
PlayerHandleExpUpdate: @ 8032F4C
push {r4-r7,lr}
ldr r5, _08032F78 @ =gUnknown_2022BC4
- ldr r6, _08032F7C @ =gUnknown_2023BC4
+ ldr r6, _08032F7C @ =gActiveBattler
ldrb r0, [r6]
lsls r0, 9
adds r1, r5, 0x1
@@ -9276,7 +9276,7 @@ PlayerHandleExpUpdate: @ 8032F4C
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
- ldr r0, _08032F80 @ =gUnknown_2024284
+ ldr r0, _08032F80 @ =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
@@ -9287,8 +9287,8 @@ PlayerHandleExpUpdate: @ 8032F4C
b _08032FD0
.align 2, 0
_08032F78: .4byte gUnknown_2022BC4
-_08032F7C: .4byte gUnknown_2023BC4
-_08032F80: .4byte gUnknown_2024284
+_08032F7C: .4byte gActiveBattler
+_08032F80: .4byte gPlayerParty
_08032F84:
movs r0, 0x1
bl LoadBattleBarGfx
@@ -9339,7 +9339,7 @@ _08032FE4: .4byte nullsub_13
thumb_func_start sub_8032FE8
sub_8032FE8: @ 8032FE8
push {r4,lr}
- ldr r4, _08033044 @ =gUnknown_2023BC4
+ ldr r4, _08033044 @ =gActiveBattler
ldrb r0, [r4]
bl mplay_80342A4
lsls r0, 24
@@ -9349,13 +9349,13 @@ sub_8032FE8: @ 8032FE8
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
- ldr r2, _0803304C @ =gUnknown_2023BCE
+ ldr r2, _0803304C @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, _08033050 @ =gUnknown_2024284
+ ldr r2, _08033050 @ =gPlayerParty
adds r1, r2
movs r2, 0x9
bl UpdateHealthboxAttribute
@@ -9383,10 +9383,10 @@ _0803303C:
pop {r0}
bx r0
.align 2, 0
-_08033044: .4byte gUnknown_2023BC4
+_08033044: .4byte gActiveBattler
_08033048: .4byte gUnknown_3004FF0
-_0803304C: .4byte gUnknown_2023BCE
-_08033050: .4byte gUnknown_2024284
+_0803304C: .4byte gBattlerPartyIndexes
+_08033050: .4byte gPlayerParty
_08033054: .4byte gUnknown_2024018
_08033058: .4byte gUnknown_3004FE0
_0803305C: .4byte CompleteOnFinishedStatusAnimation
@@ -9395,7 +9395,7 @@ _0803305C: .4byte CompleteOnFinishedStatusAnimation
thumb_func_start sub_8033060
sub_8033060: @ 8033060
push {r4,r5,lr}
- ldr r5, _080330B8 @ =gUnknown_2023BC4
+ ldr r5, _080330B8 @ =gActiveBattler
ldrb r0, [r5]
bl mplay_80342A4
lsls r0, 24
@@ -9437,7 +9437,7 @@ _080330B0:
pop {r0}
bx r0
.align 2, 0
-_080330B8: .4byte gUnknown_2023BC4
+_080330B8: .4byte gActiveBattler
_080330BC: .4byte gUnknown_2022BC4
_080330C0: .4byte gUnknown_3004FE0
_080330C4: .4byte CompleteOnFinishedStatusAnimation
@@ -9449,16 +9449,16 @@ PlayerHandleStatusXor: @ 80330C8
mov r6, r8
push {r6}
sub sp, 0x4
- ldr r0, _08033124 @ =gUnknown_2023BCE
+ ldr r0, _08033124 @ =gBattlerPartyIndexes
mov r8, r0
- ldr r4, _08033128 @ =gUnknown_2023BC4
+ ldr r4, _08033128 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 1
add r0, r8
ldrh r0, [r0]
movs r6, 0x64
muls r0, r6
- ldr r5, _0803312C @ =gUnknown_2024284
+ ldr r5, _0803312C @ =gPlayerParty
adds r0, r5
movs r1, 0x37
bl GetMonData
@@ -9488,9 +9488,9 @@ PlayerHandleStatusXor: @ 80330C8
pop {r0}
bx r0
.align 2, 0
-_08033124: .4byte gUnknown_2023BCE
-_08033128: .4byte gUnknown_2023BC4
-_0803312C: .4byte gUnknown_2024284
+_08033124: .4byte gBattlerPartyIndexes
+_08033128: .4byte gActiveBattler
+_0803312C: .4byte gPlayerParty
_08033130: .4byte gUnknown_2022BC4
thumb_func_end PlayerHandleStatusXor
@@ -9506,7 +9506,7 @@ sub_8033134: @ 8033134
PlayerHandleDMA3Transfer: @ 8033140
push {r4,r5,lr}
ldr r3, _080331A4 @ =gUnknown_2022BC4
- ldr r0, _080331A8 @ =gUnknown_2023BC4
+ ldr r0, _080331A8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
adds r0, r3, 0x1
@@ -9555,7 +9555,7 @@ PlayerHandleDMA3Transfer: @ 8033140
b _080331DC
.align 2, 0
_080331A4: .4byte gUnknown_2022BC4
-_080331A8: .4byte gUnknown_2023BC4
+_080331A8: .4byte gActiveBattler
_080331AC: .4byte 0x040000d4
_080331B0:
ldr r3, _080331E8 @ =0x040000d4
@@ -9595,7 +9595,7 @@ _080331F0: .4byte 0xfffff000
PlayerHandlePlayBGM: @ 80331F4
push {lr}
ldr r2, _0803321C @ =gUnknown_2022BC4
- ldr r0, _08033220 @ =gUnknown_2023BC4
+ ldr r0, _08033220 @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
adds r0, r2, 0x1
@@ -9612,7 +9612,7 @@ PlayerHandlePlayBGM: @ 80331F4
bx r0
.align 2, 0
_0803321C: .4byte gUnknown_2022BC4
-_08033220: .4byte gUnknown_2023BC4
+_08033220: .4byte gActiveBattler
thumb_func_end PlayerHandlePlayBGM
thumb_func_start sub_8033224
@@ -9690,7 +9690,7 @@ PlayerHandleCmd38: @ 803329C
push {lr}
ldr r3, _080332C8 @ =gUnknown_2022870
ldr r1, _080332CC @ =gUnknown_2022BC4
- ldr r0, _080332D0 @ =gUnknown_2023BC4
+ ldr r0, _080332D0 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -9710,7 +9710,7 @@ PlayerHandleCmd38: @ 803329C
.align 2, 0
_080332C8: .4byte gUnknown_2022870
_080332CC: .4byte gUnknown_2022BC4
-_080332D0: .4byte gUnknown_2023BC4
+_080332D0: .4byte gActiveBattler
thumb_func_end PlayerHandleCmd38
thumb_func_start PlayerHandleCmd39
@@ -9755,7 +9755,7 @@ PlayerHandleHitAnimation: @ 8033314
push {r4,lr}
ldr r3, _0803333C @ =gSprites
ldr r2, _08033340 @ =gUnknown_2023D44
- ldr r4, _08033344 @ =gUnknown_2023BC4
+ ldr r4, _08033344 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
ldrb r1, [r0]
@@ -9773,7 +9773,7 @@ PlayerHandleHitAnimation: @ 8033314
.align 2, 0
_0803333C: .4byte gSprites
_08033340: .4byte gUnknown_2023D44
-_08033344: .4byte gUnknown_2023BC4
+_08033344: .4byte gActiveBattler
_08033348:
ldr r1, _08033378 @ =gUnknown_2024005
movs r0, 0x1
@@ -9816,7 +9816,7 @@ sub_8033384: @ 8033384
thumb_func_start PlayerHandlePlaySE
PlayerHandlePlaySE: @ 8033390
push {r4,lr}
- ldr r4, _080333CC @ =gUnknown_2023BC4
+ ldr r4, _080333CC @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -9844,7 +9844,7 @@ _080333A4:
pop {r0}
bx r0
.align 2, 0
-_080333CC: .4byte gUnknown_2023BC4
+_080333CC: .4byte gActiveBattler
_080333D0: .4byte gUnknown_2022BC4
thumb_func_end PlayerHandlePlaySE
@@ -9852,7 +9852,7 @@ _080333D0: .4byte gUnknown_2022BC4
PlayerHandlecmd44: @ 80333D4
push {lr}
ldr r2, _080333FC @ =gUnknown_2022BC4
- ldr r0, _08033400 @ =gUnknown_2023BC4
+ ldr r0, _08033400 @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
adds r0, r2, 0x1
@@ -9869,21 +9869,21 @@ PlayerHandlecmd44: @ 80333D4
bx r0
.align 2, 0
_080333FC: .4byte gUnknown_2022BC4
-_08033400: .4byte gUnknown_2023BC4
+_08033400: .4byte gActiveBattler
thumb_func_end PlayerHandlecmd44
thumb_func_start PlayerHandleFaintingCry
PlayerHandleFaintingCry: @ 8033404
push {lr}
- ldr r1, _08033438 @ =gUnknown_2023BCE
- ldr r0, _0803343C @ =gUnknown_2023BC4
+ ldr r1, _08033438 @ =gBattlerPartyIndexes
+ ldr r0, _0803343C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _08033440 @ =gUnknown_2024284
+ ldr r1, _08033440 @ =gPlayerParty
adds r0, r1
movs r1, 0xB
bl GetMonData
@@ -9897,16 +9897,16 @@ PlayerHandleFaintingCry: @ 8033404
pop {r0}
bx r0
.align 2, 0
-_08033438: .4byte gUnknown_2023BCE
-_0803343C: .4byte gUnknown_2023BC4
-_08033440: .4byte gUnknown_2024284
+_08033438: .4byte gBattlerPartyIndexes
+_0803343C: .4byte gActiveBattler
+_08033440: .4byte gPlayerParty
thumb_func_end PlayerHandleFaintingCry
thumb_func_start PlayerHandleIntroSlide
PlayerHandleIntroSlide: @ 8033444
push {lr}
ldr r1, _0803346C @ =gUnknown_2022BC4
- ldr r0, _08033470 @ =gUnknown_2023BC4
+ ldr r0, _08033470 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -9923,7 +9923,7 @@ PlayerHandleIntroSlide: @ 8033444
bx r0
.align 2, 0
_0803346C: .4byte gUnknown_2022BC4
-_08033470: .4byte gUnknown_2023BC4
+_08033470: .4byte gActiveBattler
_08033474: .4byte gUnknown_2023F4C
thumb_func_end PlayerHandleIntroSlide
@@ -9931,7 +9931,7 @@ _08033474: .4byte gUnknown_2023F4C
PlayerHandleIntroTrainerBallThrow: @ 8033478
push {r4-r7,lr}
ldr r6, _080335B8 @ =gUnknown_2023D44
- ldr r7, _080335BC @ =gUnknown_2023BC4
+ ldr r7, _080335BC @ =gActiveBattler
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -10086,7 +10086,7 @@ _0803359A:
bx r0
.align 2, 0
_080335B8: .4byte gUnknown_2023D44
-_080335BC: .4byte gUnknown_2023BC4
+_080335BC: .4byte gActiveBattler
_080335C0: .4byte gSprites
_080335C4: .4byte 0x0000ffd8
_080335C8: .4byte sub_80755B8
@@ -10119,13 +10119,13 @@ sub_80335F8: @ 80335F8
bl FreeSpritePaletteByTag
adds r0, r5, 0
bl DestroySprite
- ldr r1, _08033650 @ =gUnknown_2023BCE
+ ldr r1, _08033650 @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _08033654 @ =gUnknown_2024284
+ ldr r1, _08033654 @ =gPlayerParty
adds r0, r1
adds r1, r4, 0
bl sub_8034498
@@ -10143,8 +10143,8 @@ sub_80335F8: @ 80335F8
pop {r0}
bx r0
.align 2, 0
-_08033650: .4byte gUnknown_2023BCE
-_08033654: .4byte gUnknown_2024284
+_08033650: .4byte gBattlerPartyIndexes
+_08033654: .4byte gPlayerParty
_08033658: .4byte gUnknown_2023D44
_0803365C: .4byte gSprites
thumb_func_end sub_80335F8
@@ -10174,7 +10174,7 @@ task05_08033660: @ 8033660
.align 2, 0
_08033688: .4byte gUnknown_3005090
_0803368C:
- ldr r7, _080336CC @ =gUnknown_2023BC4
+ ldr r7, _080336CC @ =gActiveBattler
ldrb r0, [r7]
mov r9, r0
ldrh r0, [r1, 0x8]
@@ -10183,7 +10183,7 @@ _0803368C:
lsls r0, 24
cmp r0, 0
beq _080336AC
- ldr r0, _080336D0 @ =gUnknown_2022B4C
+ ldr r0, _080336D0 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -10195,7 +10195,7 @@ _080336AC:
lsls r2, r1, 9
adds r0, 0x1
adds r2, r0
- ldr r0, _080336D8 @ =gUnknown_2023BCE
+ ldr r0, _080336D8 @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
@@ -10205,17 +10205,17 @@ _080336AC:
bl sub_8031FF4
b _08033730
.align 2, 0
-_080336CC: .4byte gUnknown_2023BC4
-_080336D0: .4byte gUnknown_2022B4C
+_080336CC: .4byte gActiveBattler
+_080336D0: .4byte gBattleTypeFlags
_080336D4: .4byte gUnknown_2022BC4
-_080336D8: .4byte gUnknown_2023BCE
+_080336D8: .4byte gBattlerPartyIndexes
_080336DC:
ldr r4, _08033754 @ =gUnknown_2022BC4
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
adds r1, r4
- ldr r5, _08033758 @ =gUnknown_2023BCE
+ ldr r5, _08033758 @ =gBattlerPartyIndexes
lsls r0, 1
adds r0, r5
ldrh r0, [r0]
@@ -10240,7 +10240,7 @@ _080336DC:
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
- ldr r2, _0803375C @ =gUnknown_2024284
+ ldr r2, _0803375C @ =gPlayerParty
adds r0, r2
bl sub_8034498
ldrb r0, [r7]
@@ -10251,7 +10251,7 @@ _080336DC:
strb r0, [r7]
_08033730:
ldr r1, _08033760 @ =gUnknown_3004FE0
- ldr r2, _08033764 @ =gUnknown_2023BC4
+ ldr r2, _08033764 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -10270,10 +10270,10 @@ _08033748:
bx r0
.align 2, 0
_08033754: .4byte gUnknown_2022BC4
-_08033758: .4byte gUnknown_2023BCE
-_0803375C: .4byte gUnknown_2024284
+_08033758: .4byte gBattlerPartyIndexes
+_0803375C: .4byte gPlayerParty
_08033760: .4byte gUnknown_3004FE0
-_08033764: .4byte gUnknown_2023BC4
+_08033764: .4byte gActiveBattler
_08033768: .4byte sub_802FA58
thumb_func_end task05_08033660
@@ -10281,7 +10281,7 @@ _08033768: .4byte sub_802FA58
PlayerHandleDrawPartyStatusSummary: @ 803376C
push {r4-r6,lr}
ldr r1, _08033794 @ =gUnknown_2022BC4
- ldr r0, _08033798 @ =gUnknown_2023BC4
+ ldr r0, _08033798 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x1
@@ -10298,11 +10298,11 @@ PlayerHandleDrawPartyStatusSummary: @ 803376C
b _08033810
.align 2, 0
_08033794: .4byte gUnknown_2022BC4
-_08033798: .4byte gUnknown_2023BC4
+_08033798: .4byte gActiveBattler
_0803379C:
ldr r6, _08033818 @ =gUnknown_2024018
ldr r0, [r6]
- ldr r5, _0803381C @ =gUnknown_2023BC4
+ ldr r5, _0803381C @ =gActiveBattler
ldrb r1, [r5]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -10364,7 +10364,7 @@ _08033810:
bx r0
.align 2, 0
_08033818: .4byte gUnknown_2024018
-_0803381C: .4byte gUnknown_2023BC4
+_0803381C: .4byte gActiveBattler
_08033820: .4byte gUnknown_2022BC8
_08033824: .4byte gUnknown_2024000
_08033828: .4byte gUnknown_3004FE0
@@ -10376,7 +10376,7 @@ sub_8033830: @ 8033830
push {r4,lr}
ldr r4, _08033870 @ =gUnknown_2024018
ldr r0, [r4]
- ldr r3, _08033874 @ =gUnknown_2023BC4
+ ldr r3, _08033874 @ =gActiveBattler
ldrb r1, [r3]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -10406,7 +10406,7 @@ _08033868:
bx r0
.align 2, 0
_08033870: .4byte gUnknown_2024018
-_08033874: .4byte gUnknown_2023BC4
+_08033874: .4byte gActiveBattler
thumb_func_end sub_8033830
thumb_func_start PlayerHandleCmd49
@@ -10414,7 +10414,7 @@ PlayerHandleCmd49: @ 8033878
push {lr}
ldr r0, _080338B4 @ =gUnknown_2024018
ldr r1, [r0]
- ldr r0, _080338B8 @ =gUnknown_2023BC4
+ ldr r0, _080338B8 @ =gActiveBattler
ldrb r3, [r0]
ldr r1, [r1, 0x4]
lsls r0, r3, 1
@@ -10442,7 +10442,7 @@ _080338AA:
bx r0
.align 2, 0
_080338B4: .4byte gUnknown_2024018
-_080338B8: .4byte gUnknown_2023BC4
+_080338B8: .4byte gActiveBattler
_080338BC: .4byte gUnknown_3005090
_080338C0: .4byte gUnknown_2024000
_080338C4: .4byte sub_80491B0
@@ -10451,7 +10451,7 @@ _080338C4: .4byte sub_80491B0
thumb_func_start sub_80338C8
sub_80338C8: @ 80338C8
push {r4,lr}
- ldr r4, _080338E8 @ =gUnknown_2023BC4
+ ldr r4, _080338E8 @ =gActiveBattler
ldrb r0, [r4]
movs r1, 0x1
bl dp11b_obj_free
@@ -10463,13 +10463,13 @@ sub_80338C8: @ 80338C8
pop {r0}
bx r0
.align 2, 0
-_080338E8: .4byte gUnknown_2023BC4
+_080338E8: .4byte gActiveBattler
thumb_func_end sub_80338C8
thumb_func_start PlayerHandleSpriteInvisibility
PlayerHandleSpriteInvisibility: @ 80338EC
push {r4,lr}
- ldr r4, _0803393C @ =gUnknown_2023BC4
+ ldr r4, _0803393C @ =gActiveBattler
ldrb r0, [r4]
bl sub_8075224
lsls r0, 24
@@ -10507,7 +10507,7 @@ _08033932:
pop {r0}
bx r0
.align 2, 0
-_0803393C: .4byte gUnknown_2023BC4
+_0803393C: .4byte gActiveBattler
_08033940: .4byte gSprites
_08033944: .4byte gUnknown_2023D44
_08033948: .4byte gUnknown_2022BC4
@@ -10517,7 +10517,7 @@ _08033948: .4byte gUnknown_2022BC4
PlayerHandleBattleAnimation: @ 803394C
push {r4-r6,lr}
sub sp, 0x4
- ldr r6, _08033990 @ =gUnknown_2023BC4
+ ldr r6, _08033990 @ =gActiveBattler
ldrb r0, [r6]
bl mplay_80342A4
lsls r0, 24
@@ -10547,7 +10547,7 @@ PlayerHandleBattleAnimation: @ 803394C
bl PlayerBufferExecCompleted
b _080339A4
.align 2, 0
-_08033990: .4byte gUnknown_2023BC4
+_08033990: .4byte gActiveBattler
_08033994: .4byte gUnknown_2022BC4
_08033998:
ldr r0, _080339AC @ =gUnknown_3004FE0
@@ -10570,7 +10570,7 @@ _080339B0: .4byte CompleteOnFinishedBattleAnimation
PlayerHandleLinkStandbyMsg: @ 80339B4
push {r4,lr}
ldr r1, _080339D4 @ =gUnknown_2022BC4
- ldr r0, _080339D8 @ =gUnknown_2023BC4
+ ldr r0, _080339D8 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -10585,7 +10585,7 @@ PlayerHandleLinkStandbyMsg: @ 80339B4
b _08033A04
.align 2, 0
_080339D4: .4byte gUnknown_2022BC4
-_080339D8: .4byte gUnknown_2023BC4
+_080339D8: .4byte gActiveBattler
_080339DC:
cmp r0, 0x2
beq _08033A00
@@ -10593,7 +10593,7 @@ _080339DC:
_080339E2:
bl PrintLinkStandbyMsg
_080339E6:
- ldr r4, _080339FC @ =gUnknown_2023BC4
+ ldr r4, _080339FC @ =gActiveBattler
ldrb r0, [r4]
movs r1, 0x1
bl dp11b_obj_free
@@ -10602,7 +10602,7 @@ _080339E6:
bl dp11b_obj_free
b _08033A04
.align 2, 0
-_080339FC: .4byte gUnknown_2023BC4
+_080339FC: .4byte gActiveBattler
_08033A00:
bl PrintLinkStandbyMsg
_08033A04:
@@ -10616,7 +10616,7 @@ _08033A04:
PlayerHandleResetActionMoveSelection: @ 8033A10
push {r4,lr}
ldr r1, _08033A30 @ =gUnknown_2022BC4
- ldr r4, _08033A34 @ =gUnknown_2023BC4
+ ldr r4, _08033A34 @ =gActiveBattler
ldrb r3, [r4]
lsls r0, r3, 9
adds r1, 0x1
@@ -10631,7 +10631,7 @@ PlayerHandleResetActionMoveSelection: @ 8033A10
b _08033A68
.align 2, 0
_08033A30: .4byte gUnknown_2022BC4
-_08033A34: .4byte gUnknown_2023BC4
+_08033A34: .4byte gActiveBattler
_08033A38:
cmp r2, 0x2
beq _08033A60
@@ -10673,7 +10673,7 @@ PlayerHandlecmd55: @ 8033A78
push {r4,lr}
ldr r2, _08033AB0 @ =gUnknown_2023E8A
ldr r1, _08033AB4 @ =gUnknown_2022BC4
- ldr r4, _08033AB8 @ =gUnknown_2023BC4
+ ldr r4, _08033AB8 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 9
adds r1, 0x1
@@ -10697,7 +10697,7 @@ PlayerHandlecmd55: @ 8033A78
.align 2, 0
_08033AB0: .4byte gUnknown_2023E8A
_08033AB4: .4byte gUnknown_2022BC4
-_08033AB8: .4byte gUnknown_2023BC4
+_08033AB8: .4byte gActiveBattler
_08033ABC: .4byte gUnknown_3004FE0
_08033AC0: .4byte sub_802F6A8
thumb_func_end PlayerHandlecmd55
@@ -10713,7 +10713,7 @@ sub_8033AC8: @ 8033AC8
sub sp, 0x4
movs r5, 0
movs r6, 0
- ldr r0, _08033B14 @ =gUnknown_2022B4C
+ ldr r0, _08033B14 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
@@ -10721,7 +10721,7 @@ sub_8033AC8: @ 8033AC8
bne _08033ADE
b _08033DA2
_08033ADE:
- ldr r3, _08033B18 @ =gUnknown_2023BC4
+ ldr r3, _08033B18 @ =gActiveBattler
ldrb r1, [r3]
lsls r2, r1, 9
ldr r0, _08033B1C @ =gUnknown_2022BC8
@@ -10748,12 +10748,12 @@ _08033ADE:
ands r1, r0
b _08033B30
.align 2, 0
-_08033B14: .4byte gUnknown_2022B4C
-_08033B18: .4byte gUnknown_2023BC4
+_08033B14: .4byte gBattleTypeFlags
+_08033B18: .4byte gActiveBattler
_08033B1C: .4byte gUnknown_2022BC8
_08033B20: .4byte gUnknown_2023FFC
_08033B24:
- ldr r1, _08033B40 @ =gUnknown_8250C04
+ ldr r1, _08033B40 @ =gBattleMoves
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
@@ -10770,7 +10770,7 @@ _08033B36:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_08033B40: .4byte gUnknown_8250C04
+_08033B40: .4byte gBattleMoves
_08033B44: .4byte _08033B48
.align 2, 0
_08033B48:
@@ -10850,7 +10850,7 @@ _08033C54:
adds r4, r0, 0
movs r0, 0x3
bl GetBankByIdentity
- ldr r1, _08033C7C @ =gUnknown_825E45C
+ ldr r1, _08033C7C @ =gBitTable
lsls r4, 24
lsrs r4, 22
adds r4, r1
@@ -10863,7 +10863,7 @@ _08033C54:
lsls r5, r1, 16
b _08033D90
.align 2, 0
-_08033C7C: .4byte gUnknown_825E45C
+_08033C7C: .4byte gBitTable
_08033C80:
cmp r4, 0xDB
beq _08033CEA
@@ -10931,7 +10931,7 @@ _08033CEA:
adds r4, r0, 0
movs r0, 0x2
bl GetBankByIdentity
- ldr r1, _08033D10 @ =gUnknown_825E45C
+ ldr r1, _08033D10 @ =gBitTable
lsls r4, 24
lsrs r4, 22
adds r4, r1
@@ -10944,7 +10944,7 @@ _08033CEA:
lsls r5, r1, 16
b _08033D90
.align 2, 0
-_08033D10: .4byte gUnknown_825E45C
+_08033D10: .4byte gBitTable
_08033D14:
ldrb r0, [r3]
bl GetBankIdentity
@@ -10953,16 +10953,16 @@ _08033D14:
lsls r0, 24
lsrs r0, 24
bl GetBankByIdentity
- ldr r1, _08033D34 @ =gUnknown_825E45C
+ ldr r1, _08033D34 @ =gBitTable
lsls r0, 24
lsrs r0, 22
adds r0, r1
ldr r0, [r0]
b _08033D42
.align 2, 0
-_08033D34: .4byte gUnknown_825E45C
+_08033D34: .4byte gBitTable
_08033D38:
- ldr r0, _08033D48 @ =gUnknown_825E45C
+ ldr r0, _08033D48 @ =gBitTable
ldrb r1, [r3]
lsls r1, 2
adds r1, r0
@@ -10971,12 +10971,12 @@ _08033D42:
lsls r5, r0, 16
b _08033D90
.align 2, 0
-_08033D48: .4byte gUnknown_825E45C
+_08033D48: .4byte gBitTable
_08033D4C:
movs r0, 0x1
bl GetBankByIdentity
adds r5, r0, 0
- ldr r0, _08033DAC @ =gUnknown_2023BC4
+ ldr r0, _08033DAC @ =gActiveBattler
ldrb r0, [r0]
bl GetBankIdentity
movs r1, 0x2
@@ -10987,7 +10987,7 @@ _08033D4C:
adds r4, r0, 0
movs r0, 0x3
bl GetBankByIdentity
- ldr r3, _08033DB0 @ =gUnknown_825E45C
+ ldr r3, _08033DB0 @ =gBitTable
lsls r5, 24
lsrs r5, 22
adds r5, r3
@@ -11019,8 +11019,8 @@ _08033DA2:
pop {r0}
bx r0
.align 2, 0
-_08033DAC: .4byte gUnknown_2023BC4
-_08033DB0: .4byte gUnknown_825E45C
+_08033DAC: .4byte gActiveBattler
+_08033DB0: .4byte gBitTable
_08033DB4: .4byte 0x00007fff
thumb_func_end sub_8033AC8
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 15:56:30 +0000