summaryrefslogtreecommitdiff
path: root/asm/battle_controller_player.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/battle_controller_player.s')
-rw-r--r--asm/battle_controller_player.s930
1 files changed, 465 insertions, 465 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index e3db6d88e..4db2fedb2 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -10,31 +10,31 @@ nullsub_13: @ 802E310
bx lr
thumb_func_end nullsub_13
- thumb_func_start SetBankFuncToPlayerBufferRunCommand
-SetBankFuncToPlayerBufferRunCommand: @ 802E314
- ldr r1, _0802E32C @ =gUnknown_3004FE0
+ thumb_func_start SetControllerToPlayer
+SetControllerToPlayer: @ 802E314
+ ldr r1, _0802E32C @ =gBattlerControllerFuncs
ldr r0, _0802E330 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
ldr r1, _0802E334 @ =PlayerBufferRunCommand
str r1, [r0]
- ldr r1, _0802E338 @ =gUnknown_2024005
+ ldr r1, _0802E338 @ =gDoingBattleAnim
movs r0, 0
strb r0, [r1]
bx lr
.align 2, 0
-_0802E32C: .4byte gUnknown_3004FE0
+_0802E32C: .4byte gBattlerControllerFuncs
_0802E330: .4byte gActiveBattler
_0802E334: .4byte PlayerBufferRunCommand
-_0802E338: .4byte gUnknown_2024005
- thumb_func_end SetBankFuncToPlayerBufferRunCommand
+_0802E338: .4byte gDoingBattleAnim
+ thumb_func_end SetControllerToPlayer
thumb_func_start PlayerBufferExecCompleted
PlayerBufferExecCompleted: @ 802E33C
push {r4,lr}
sub sp, 0x4
- ldr r1, _0802E37C @ =gUnknown_3004FE0
+ ldr r1, _0802E37C @ =gBattlerControllerFuncs
ldr r4, _0802E380 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 2
@@ -54,7 +54,7 @@ PlayerBufferExecCompleted: @ 802E33C
movs r1, 0x4
mov r2, sp
bl PrepareBufferDataTransferLink
- ldr r1, _0802E38C @ =gUnknown_2022BC4
+ ldr r1, _0802E38C @ =gBattleBufferA
ldrb r0, [r4]
lsls r0, 9
adds r0, r1
@@ -62,13 +62,13 @@ PlayerBufferExecCompleted: @ 802E33C
strb r1, [r0]
b _0802E3A2
.align 2, 0
-_0802E37C: .4byte gUnknown_3004FE0
+_0802E37C: .4byte gBattlerControllerFuncs
_0802E380: .4byte gActiveBattler
_0802E384: .4byte PlayerBufferRunCommand
_0802E388: .4byte gBattleTypeFlags
-_0802E38C: .4byte gUnknown_2022BC4
+_0802E38C: .4byte gBattleBufferA
_0802E390:
- ldr r2, _0802E3AC @ =gUnknown_2023BC8
+ ldr r2, _0802E3AC @ =gBattleControllerExecFlags
ldr r1, _0802E3B0 @ =gBitTable
ldrb r0, [r4]
lsls r0, 2
@@ -83,14 +83,14 @@ _0802E3A2:
pop {r0}
bx r0
.align 2, 0
-_0802E3AC: .4byte gUnknown_2023BC8
+_0802E3AC: .4byte gBattleControllerExecFlags
_0802E3B0: .4byte gBitTable
thumb_func_end PlayerBufferExecCompleted
thumb_func_start PlayerBufferRunCommand
PlayerBufferRunCommand: @ 802E3B4
push {lr}
- ldr r2, _0802E3E8 @ =gUnknown_2023BC8
+ ldr r2, _0802E3E8 @ =gBattleControllerExecFlags
ldr r1, _0802E3EC @ =gBitTable
ldr r0, _0802E3F0 @ =gActiveBattler
ldrb r3, [r0]
@@ -101,7 +101,7 @@ PlayerBufferRunCommand: @ 802E3B4
ands r1, r0
cmp r1, 0
beq _0802E400
- ldr r0, _0802E3F4 @ =gUnknown_2022BC4
+ ldr r0, _0802E3F4 @ =gBattleBufferA
lsls r1, r3, 9
adds r1, r0
ldrb r0, [r1]
@@ -115,10 +115,10 @@ PlayerBufferRunCommand: @ 802E3B4
bl _call_via_r0
b _0802E400
.align 2, 0
-_0802E3E8: .4byte gUnknown_2023BC8
+_0802E3E8: .4byte gBattleControllerExecFlags
_0802E3EC: .4byte gBitTable
_0802E3F0: .4byte gActiveBattler
-_0802E3F4: .4byte gUnknown_2022BC4
+_0802E3F4: .4byte gBattleBufferA
_0802E3F8: .4byte gUnknown_825089C
_0802E3FC:
bl PlayerBufferExecCompleted
@@ -159,7 +159,7 @@ sub_802E438: @ 802E438
push {r4-r7,lr}
mov r7, r8
push {r7}
- ldr r7, _0802E498 @ =gUnknown_2022BC4
+ ldr r7, _0802E498 @ =gBattleBufferA
ldr r4, _0802E49C @ =gActiveBattler
ldrb r0, [r4]
lsls r2, r0, 9
@@ -189,7 +189,7 @@ sub_802E438: @ 802E438
beq _0802E4D0
movs r0, 0x5
bl PlaySE
- ldr r1, _0802E4A4 @ =gUnknown_2023FF8
+ ldr r1, _0802E4A4 @ =gActionSelectionCursor
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -201,10 +201,10 @@ sub_802E438: @ 802E438
beq _0802E4B2
b _0802E616
.align 2, 0
-_0802E498: .4byte gUnknown_2022BC4
+_0802E498: .4byte gBattleBufferA
_0802E49C: .4byte gActiveBattler
_0802E4A0: .4byte gMain
-_0802E4A4: .4byte gUnknown_2023FF8
+_0802E4A4: .4byte gActionSelectionCursor
_0802E4A8:
cmp r0, 0x2
beq _0802E4BE
@@ -227,14 +227,14 @@ _0802E4C4:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
b _0802E616
_0802E4D0:
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _0802E508
- ldr r5, _0802E504 @ =gUnknown_2023FF8
+ ldr r5, _0802E504 @ =gActionSelectionCursor
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -256,13 +256,13 @@ _0802E4EA:
movs r2, 0x1
b _0802E590
.align 2, 0
-_0802E504: .4byte gUnknown_2023FF8
+_0802E504: .4byte gActionSelectionCursor
_0802E508:
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _0802E540
- ldr r5, _0802E53C @ =gUnknown_2023FF8
+ ldr r5, _0802E53C @ =gActionSelectionCursor
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -284,14 +284,14 @@ _0802E522:
movs r2, 0x1
b _0802E590
.align 2, 0
-_0802E53C: .4byte gUnknown_2023FF8
+_0802E53C: .4byte gActionSelectionCursor
_0802E540:
movs r0, 0x40
mov r8, r0
ands r0, r1
cmp r0, 0
beq _0802E560
- ldr r5, _0802E55C @ =gUnknown_2023FF8
+ ldr r5, _0802E55C @ =gActionSelectionCursor
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -301,13 +301,13 @@ _0802E540:
beq _0802E634
b _0802E578
.align 2, 0
-_0802E55C: .4byte gUnknown_2023FF8
+_0802E55C: .4byte gActionSelectionCursor
_0802E560:
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq _0802E5A8
- ldr r5, _0802E5A4 @ =gUnknown_2023FF8
+ ldr r5, _0802E5A4 @ =gActionSelectionCursor
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -336,7 +336,7 @@ _0802E590:
bl ActionSelectionCreateCursorAt
b _0802E634
.align 2, 0
-_0802E5A4: .4byte gUnknown_2023FF8
+_0802E5A4: .4byte gActionSelectionCursor
_0802E5A8:
movs r0, 0x2
ands r0, r1
@@ -389,7 +389,7 @@ _0802E606:
movs r1, 0xC
_0802E610:
movs r2, 0
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
_0802E616:
bl PlayerBufferExecCompleted
b _0802E634
@@ -421,7 +421,7 @@ sub_802E640: @ 802E640
ldrb r0, [r4]
movs r1, 0
bl dp11b_obj_free
- ldr r1, _0802E66C @ =gUnknown_3004FE0
+ ldr r1, _0802E66C @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -432,7 +432,7 @@ sub_802E640: @ 802E640
bx r0
.align 2, 0
_0802E668: .4byte gActiveBattler
-_0802E66C: .4byte gUnknown_3004FE0
+_0802E66C: .4byte gBattlerControllerFuncs
_0802E670: .4byte sub_802E674
thumb_func_end sub_802E640
@@ -492,7 +492,7 @@ _0802E6B6:
adds r0, r2
ldr r1, _0802E720 @ =sub_8012098
str r1, [r0]
- ldr r1, _0802E724 @ =gUnknown_2023FFC
+ ldr r1, _0802E724 @ =gMoveSelectionCursor
ldr r0, _0802E728 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -502,7 +502,7 @@ _0802E6B6:
orrs r2, r0
movs r0, 0x1
movs r1, 0xA
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
ldrb r0, [r4]
movs r1, 0x1
bl dp11b_obj_free
@@ -516,7 +516,7 @@ _0802E714: .4byte gMain
_0802E718: .4byte gSprites
_0802E71C: .4byte gBattlerSpriteIds
_0802E720: .4byte sub_8012098
-_0802E724: .4byte gUnknown_2023FFC
+_0802E724: .4byte gMoveSelectionCursor
_0802E728: .4byte gActiveBattler
_0802E72C:
movs r0, 0x2
@@ -538,7 +538,7 @@ _0802E72C:
adds r0, r2
ldr r1, _0802E790 @ =sub_8012098
str r1, [r0]
- ldr r1, _0802E794 @ =gUnknown_3004FE0
+ ldr r1, _0802E794 @ =gBattlerControllerFuncs
ldr r4, _0802E798 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 2
@@ -564,7 +564,7 @@ _0802E784: .4byte gSprites
_0802E788: .4byte gBattlerSpriteIds
_0802E78C: .4byte gUnknown_3004FF4
_0802E790: .4byte sub_8012098
-_0802E794: .4byte gUnknown_3004FE0
+_0802E794: .4byte gBattlerControllerFuncs
_0802E798: .4byte gActiveBattler
_0802E79C: .4byte sub_802EA10
_0802E7A0:
@@ -665,7 +665,7 @@ _0802E846:
muls r0, r1
ldr r1, _0802E8AC @ =gPlayerParty
adds r0, r1
- ldr r1, _0802E8B0 @ =gUnknown_2023FFC
+ ldr r1, _0802E8B0 @ =gMoveSelectionCursor
adds r2, r1
ldrb r1, [r2]
adds r1, 0xD
@@ -703,7 +703,7 @@ _0802E89C:
_0802E8A4: .4byte gActiveBattler
_0802E8A8: .4byte gBattlerPartyIndexes
_0802E8AC: .4byte gPlayerParty
-_0802E8B0: .4byte gUnknown_2023FFC
+_0802E8B0: .4byte gMoveSelectionCursor
_0802E8B4: .4byte gBattleMoves
_0802E8B8: .4byte gAbsentBattlerFlags
_0802E8BC: .4byte gBitTable
@@ -806,7 +806,7 @@ _0802E96A:
muls r0, r1
ldr r1, _0802E9EC @ =gPlayerParty
adds r0, r1
- ldr r1, _0802E9F0 @ =gUnknown_2023FFC
+ ldr r1, _0802E9F0 @ =gMoveSelectionCursor
adds r2, r1
ldrb r1, [r2]
adds r1, 0xD
@@ -861,7 +861,7 @@ _0802E9DC:
_0802E9E4: .4byte gActiveBattler
_0802E9E8: .4byte gBattlerPartyIndexes
_0802E9EC: .4byte gPlayerParty
-_0802E9F0: .4byte gUnknown_2023FFC
+_0802E9F0: .4byte gMoveSelectionCursor
_0802E9F4: .4byte gBattleMoves
_0802E9F8: .4byte gAbsentBattlerFlags
_0802E9FC: .4byte gBitTable
@@ -896,7 +896,7 @@ sub_802EA10: @ 802EA10
_0802EA3A:
movs r0, 0x5
bl PlaySE
- ldr r1, _0802EA78 @ =gUnknown_2023FFC
+ ldr r1, _0802EA78 @ =gMoveSelectionCursor
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -922,7 +922,7 @@ _0802EA3A:
_0802EA6C: .4byte gActiveBattler
_0802EA70: .4byte gUnknown_2022BC8
_0802EA74: .4byte gMain
-_0802EA78: .4byte gUnknown_2023FFC
+_0802EA78: .4byte gMoveSelectionCursor
_0802EA7C:
ldr r2, _0802EA9C @ =gBattleMoves
ldrh r1, [r1]
@@ -958,7 +958,7 @@ _0802EAA8:
ldr r1, _0802EAF0 @ =gUnknown_3004FF4
strb r0, [r1]
_0802EAC2:
- ldr r3, _0802EAF4 @ =gUnknown_2022BC4
+ ldr r3, _0802EAF4 @ =gBattleBufferA
ldr r5, _0802EAEC @ =gActiveBattler
ldrb r2, [r5]
lsls r1, r2, 9
@@ -982,7 +982,7 @@ _0802EAC2:
.align 2, 0
_0802EAEC: .4byte gActiveBattler
_0802EAF0: .4byte gUnknown_3004FF4
-_0802EAF4: .4byte gUnknown_2022BC4
+_0802EAF4: .4byte gBattleBufferA
_0802EAF8:
movs r0, 0x7D
ands r0, r4
@@ -991,7 +991,7 @@ _0802EAF8:
movs r0, 0x1
add r8, r0
_0802EB04:
- ldr r0, _0802EB78 @ =gUnknown_2023FFC
+ ldr r0, _0802EB78 @ =gMoveSelectionCursor
adds r0, r2, r0
adds r1, r7, 0
adds r1, 0x8
@@ -1030,7 +1030,7 @@ _0802EB3A:
mov r0, r8
cmp r0, 0
bne _0802EB88
- ldr r1, _0802EB78 @ =gUnknown_2023FFC
+ ldr r1, _0802EB78 @ =gMoveSelectionCursor
ldr r0, _0802EB84 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -1041,16 +1041,16 @@ _0802EB3A:
orrs r2, r0
movs r0, 0x1
movs r1, 0xA
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
bl PlayerBufferExecCompleted
b _0802EDBA
.align 2, 0
-_0802EB78: .4byte gUnknown_2023FFC
+_0802EB78: .4byte gMoveSelectionCursor
_0802EB7C: .4byte gUnknown_3004FF4
_0802EB80: .4byte 0x00007fff
_0802EB84: .4byte gActiveBattler
_0802EB88:
- ldr r1, _0802EBA4 @ =gUnknown_3004FE0
+ ldr r1, _0802EBA4 @ =gBattlerControllerFuncs
ldr r2, _0802EBA8 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -1065,7 +1065,7 @@ _0802EB88:
ldrb r0, [r2]
b _0802EBE4
.align 2, 0
-_0802EBA4: .4byte gUnknown_3004FE0
+_0802EBA4: .4byte gBattlerControllerFuncs
_0802EBA8: .4byte gActiveBattler
_0802EBAC: .4byte sub_802E674
_0802EBB0: .4byte gUnknown_3004FF4
@@ -1123,7 +1123,7 @@ _0802EC10:
ldr r2, _0802EC34 @ =0x0000ffff
movs r0, 0x1
movs r1, 0xA
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
bl PlayerBufferExecCompleted
bl ResetPaletteFadeControl
b _0802ED2C
@@ -1134,7 +1134,7 @@ _0802EC38:
ands r0, r1
cmp r0, 0
beq _0802EC68
- ldr r4, _0802EC64 @ =gUnknown_2023FFC
+ ldr r4, _0802EC64 @ =gMoveSelectionCursor
ldrb r0, [r6]
adds r2, r0, r4
ldrb r1, [r2]
@@ -1153,13 +1153,13 @@ _0802EC52:
eors r0, r2
b _0802ED10
.align 2, 0
-_0802EC64: .4byte gUnknown_2023FFC
+_0802EC64: .4byte gMoveSelectionCursor
_0802EC68:
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _0802ECAC
- ldr r4, _0802ECA4 @ =gUnknown_2023FFC
+ ldr r4, _0802ECA4 @ =gMoveSelectionCursor
ldrb r0, [r6]
adds r3, r0, r4
ldrb r2, [r3]
@@ -1186,14 +1186,14 @@ _0802EC92:
eors r0, r7
b _0802ED10
.align 2, 0
-_0802ECA4: .4byte gUnknown_2023FFC
+_0802ECA4: .4byte gMoveSelectionCursor
_0802ECA8: .4byte gUnknown_3004FF8
_0802ECAC:
movs r0, 0x40
ands r0, r1
cmp r0, 0
beq _0802ECDC
- ldr r4, _0802ECD8 @ =gUnknown_2023FFC
+ ldr r4, _0802ECD8 @ =gMoveSelectionCursor
ldrb r0, [r6]
adds r2, r0, r4
ldrb r1, [r2]
@@ -1212,13 +1212,13 @@ _0802ECC6:
eors r0, r2
b _0802ED10
.align 2, 0
-_0802ECD8: .4byte gUnknown_2023FFC
+_0802ECD8: .4byte gMoveSelectionCursor
_0802ECDC:
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq _0802ED4C
- ldr r4, _0802ED40 @ =gUnknown_2023FFC
+ ldr r4, _0802ED40 @ =gMoveSelectionCursor
ldrb r0, [r6]
adds r3, r0, r4
ldrb r2, [r3]
@@ -1261,7 +1261,7 @@ _0802ED2C:
bl BeginNormalPaletteFade
b _0802EDBA
.align 2, 0
-_0802ED40: .4byte gUnknown_2023FFC
+_0802ED40: .4byte gMoveSelectionCursor
_0802ED44: .4byte gUnknown_3004FF8
_0802ED48: .4byte 0x00007fff
_0802ED4C:
@@ -1278,7 +1278,7 @@ _0802ED4C:
ands r5, r7
cmp r5, 0
bne _0802EDBA
- ldr r4, _0802ED8C @ =gUnknown_2023FFC
+ ldr r4, _0802ED8C @ =gMoveSelectionCursor
ldrb r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -1295,7 +1295,7 @@ _0802ED4C:
.align 2, 0
_0802ED84: .4byte gUnknown_3004FF8
_0802ED88: .4byte gBattleTypeFlags
-_0802ED8C: .4byte gUnknown_2023FFC
+_0802ED8C: .4byte gMoveSelectionCursor
_0802ED90: .4byte gUnknown_3004FF4
_0802ED94:
ldr r1, _0802EDC8 @ =gUnknown_3004FF4
@@ -1308,8 +1308,8 @@ _0802ED9C:
bl MoveSelectionCreateCursorAt
ldr r0, _0802EDCC @ =gUnknown_83FE7A0
movs r1, 0xB
- bl sub_80D87BC
- ldr r1, _0802EDD0 @ =gUnknown_3004FE0
+ bl BattlePutTextOnWindow
+ ldr r1, _0802EDD0 @ =gBattlerControllerFuncs
ldr r0, _0802EDD4 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -1327,7 +1327,7 @@ _0802EDBA:
.align 2, 0
_0802EDC8: .4byte gUnknown_3004FF4
_0802EDCC: .4byte gUnknown_83FE7A0
-_0802EDD0: .4byte gUnknown_3004FE0
+_0802EDD0: .4byte gBattlerControllerFuncs
_0802EDD4: .4byte gActiveBattler
_0802EDD8: .4byte sub_802EF58
thumb_func_end sub_802EA10
@@ -1369,7 +1369,7 @@ _0802EE18:
ands r0, r1
cmp r0, 0
beq _0802EE58
- ldr r5, _0802EF4C @ =gUnknown_2023FFC
+ ldr r5, _0802EF4C @ =gMoveSelectionCursor
ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r2, r0, r5
@@ -1400,7 +1400,7 @@ _0802EE58:
ands r0, r1
cmp r0, 0
beq _0802EEA6
- ldr r5, _0802EF4C @ =gUnknown_2023FFC
+ ldr r5, _0802EF4C @ =gMoveSelectionCursor
ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r3, r0, r5
@@ -1437,7 +1437,7 @@ _0802EEA6:
ands r0, r1
cmp r0, 0
beq _0802EEE8
- ldr r5, _0802EF4C @ =gUnknown_2023FFC
+ ldr r5, _0802EF4C @ =gMoveSelectionCursor
ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r2, r0, r5
@@ -1468,7 +1468,7 @@ _0802EEE8:
ands r0, r1
cmp r0, 0
beq _0802EF36
- ldr r5, _0802EF4C @ =gUnknown_2023FFC
+ ldr r5, _0802EF4C @ =gMoveSelectionCursor
ldr r4, _0802EF50 @ =gActiveBattler
ldrb r0, [r4]
adds r3, r0, r5
@@ -1507,7 +1507,7 @@ _0802EF36:
_0802EF40: .4byte gMain
_0802EF44: .4byte gBattle_BG0_X
_0802EF48: .4byte gBattle_BG0_Y
-_0802EF4C: .4byte gUnknown_2023FFC
+_0802EF4C: .4byte gMoveSelectionCursor
_0802EF50: .4byte gActiveBattler
_0802EF54: .4byte gUnknown_3004FF8
thumb_func_end sub_802EDDC
@@ -1530,7 +1530,7 @@ sub_802EF58: @ 802EF58
_0802EF72:
movs r0, 0x5
bl PlaySE
- ldr r0, _0802F2E8 @ =gUnknown_2023FFC
+ ldr r0, _0802F2E8 @ =gMoveSelectionCursor
mov r10, r0
ldr r1, _0802F2EC @ =gActiveBattler
mov r8, r1
@@ -1667,7 +1667,7 @@ _0802F06E:
adds r6, 0x1
cmp r6, 0x3
ble _0802F06E
- ldr r1, _0802F2E8 @ =gUnknown_2023FFC
+ ldr r1, _0802F2E8 @ =gMoveSelectionCursor
ldrb r0, [r7]
adds r0, r1
ldrb r0, [r0]
@@ -1831,7 +1831,7 @@ _0802F1B2:
adds r6, 0x1
cmp r6, 0x3
ble _0802F1B2
- ldr r4, _0802F2E8 @ =gUnknown_2023FFC
+ ldr r4, _0802F2E8 @ =gMoveSelectionCursor
ldr r3, _0802F2EC @ =gActiveBattler
ldrb r0, [r3]
adds r0, r4
@@ -1964,7 +1964,7 @@ _0802F2C8:
ands r0, r1
cmp r0, 0
beq _0802F318
- ldr r1, _0802F310 @ =gUnknown_3004FE0
+ ldr r1, _0802F310 @ =gBattlerControllerFuncs
ldr r2, _0802F2EC @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -1973,7 +1973,7 @@ _0802F2C8:
b _0802F324
.align 2, 0
_0802F2E4: .4byte gMain
-_0802F2E8: .4byte gUnknown_2023FFC
+_0802F2E8: .4byte gMoveSelectionCursor
_0802F2EC: .4byte gActiveBattler
_0802F2F0: .4byte gUnknown_3004FF4
_0802F2F4: .4byte gUnknown_2022BC8
@@ -1983,10 +1983,10 @@ _0802F300: .4byte gBattleMons
_0802F304: .4byte gBattlerPartyIndexes
_0802F308: .4byte gPlayerParty
_0802F30C: .4byte gBattleTypeFlags
-_0802F310: .4byte gUnknown_3004FE0
+_0802F310: .4byte gBattlerControllerFuncs
_0802F314: .4byte sub_80E7988
_0802F318:
- ldr r1, _0802F390 @ =gUnknown_3004FE0
+ ldr r1, _0802F390 @ =gBattlerControllerFuncs
ldr r2, _0802F394 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -1995,7 +1995,7 @@ _0802F318:
_0802F324:
str r1, [r0]
adds r7, r2, 0
- ldr r2, _0802F39C @ =gUnknown_2023FFC
+ ldr r2, _0802F39C @ =gMoveSelectionCursor
ldrb r0, [r7]
adds r0, r2
ldr r1, _0802F3A0 @ =gUnknown_3004FF4
@@ -2021,7 +2021,7 @@ _0802F34C:
ldr r0, _0802F3A0 @ =gUnknown_3004FF4
ldrb r0, [r0]
bl MoveSelectionDestroyCursorAt
- ldr r1, _0802F39C @ =gUnknown_2023FFC
+ ldr r1, _0802F39C @ =gMoveSelectionCursor
ldr r4, _0802F394 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r1
@@ -2034,23 +2034,23 @@ _0802F34C:
ands r0, r1
cmp r0, 0
beq _0802F3B0
- ldr r0, _0802F390 @ =gUnknown_3004FE0
+ ldr r0, _0802F390 @ =gBattlerControllerFuncs
ldrb r1, [r4]
lsls r1, 2
adds r1, r0
ldr r0, _0802F3AC @ =sub_80E7988
b _0802F3BA
.align 2, 0
-_0802F390: .4byte gUnknown_3004FE0
+_0802F390: .4byte gBattlerControllerFuncs
_0802F394: .4byte gActiveBattler
_0802F398: .4byte sub_802EA10
-_0802F39C: .4byte gUnknown_2023FFC
+_0802F39C: .4byte gMoveSelectionCursor
_0802F3A0: .4byte gUnknown_3004FF4
_0802F3A4: .4byte gMain
_0802F3A8: .4byte gBattleTypeFlags
_0802F3AC: .4byte sub_80E7988
_0802F3B0:
- ldr r0, _0802F3F8 @ =gUnknown_3004FE0
+ ldr r0, _0802F3F8 @ =gBattlerControllerFuncs
ldrb r1, [r4]
lsls r1, 2
adds r1, r0
@@ -2073,7 +2073,7 @@ _0802F3C8:
ands r0, r2
cmp r0, 0
beq _0802F454
- ldr r0, _0802F408 @ =gUnknown_2023FFC
+ ldr r0, _0802F408 @ =gMoveSelectionCursor
ldr r1, _0802F40C @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
@@ -2085,11 +2085,11 @@ _0802F3C8:
bl MoveSelectionCreateCursorAt
b _0802F416
.align 2, 0
-_0802F3F8: .4byte gUnknown_3004FE0
+_0802F3F8: .4byte gBattlerControllerFuncs
_0802F3FC: .4byte sub_802EA10
_0802F400: .4byte gMain
_0802F404: .4byte gUnknown_3004FF4
-_0802F408: .4byte gUnknown_2023FFC
+_0802F408: .4byte gMoveSelectionCursor
_0802F40C: .4byte gActiveBattler
_0802F410:
ldrb r0, [r3]
@@ -2102,7 +2102,7 @@ _0802F416:
strb r0, [r4]
movs r0, 0x5
bl PlaySE
- ldr r1, _0802F444 @ =gUnknown_2023FFC
+ ldr r1, _0802F444 @ =gMoveSelectionCursor
ldr r0, _0802F448 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2116,7 +2116,7 @@ _0802F416:
b _0802F454
.align 2, 0
_0802F440: .4byte gUnknown_3004FF4
-_0802F444: .4byte gUnknown_2023FFC
+_0802F444: .4byte gMoveSelectionCursor
_0802F448: .4byte gActiveBattler
_0802F44C:
ldrb r0, [r4]
@@ -2141,7 +2141,7 @@ _0802F454:
ldrb r1, [r1]
cmp r0, r1
bcs _0802F4E8
- ldr r0, _0802F49C @ =gUnknown_2023FFC
+ ldr r0, _0802F49C @ =gMoveSelectionCursor
ldr r1, _0802F4A0 @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
@@ -2156,7 +2156,7 @@ _0802F454:
_0802F490: .4byte gMain
_0802F494: .4byte gUnknown_3004FF4
_0802F498: .4byte gUnknown_3004FF8
-_0802F49C: .4byte gUnknown_2023FFC
+_0802F49C: .4byte gMoveSelectionCursor
_0802F4A0: .4byte gActiveBattler
_0802F4A4:
ldrb r0, [r3]
@@ -2169,7 +2169,7 @@ _0802F4AA:
strb r0, [r4]
movs r0, 0x5
bl PlaySE
- ldr r1, _0802F4D8 @ =gUnknown_2023FFC
+ ldr r1, _0802F4D8 @ =gMoveSelectionCursor
ldr r0, _0802F4DC @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2183,7 +2183,7 @@ _0802F4AA:
b _0802F4E8
.align 2, 0
_0802F4D4: .4byte gUnknown_3004FF4
-_0802F4D8: .4byte gUnknown_2023FFC
+_0802F4D8: .4byte gMoveSelectionCursor
_0802F4DC: .4byte gActiveBattler
_0802F4E0:
ldrb r0, [r4]
@@ -2202,7 +2202,7 @@ _0802F4E8:
ands r0, r2
cmp r0, 0
beq _0802F56C
- ldr r0, _0802F520 @ =gUnknown_2023FFC
+ ldr r0, _0802F520 @ =gMoveSelectionCursor
ldr r1, _0802F524 @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
@@ -2216,7 +2216,7 @@ _0802F4E8:
.align 2, 0
_0802F518: .4byte gMain
_0802F51C: .4byte gUnknown_3004FF4
-_0802F520: .4byte gUnknown_2023FFC
+_0802F520: .4byte gMoveSelectionCursor
_0802F524: .4byte gActiveBattler
_0802F528:
ldrb r0, [r3]
@@ -2229,7 +2229,7 @@ _0802F52E:
strb r0, [r4]
movs r0, 0x5
bl PlaySE
- ldr r1, _0802F55C @ =gUnknown_2023FFC
+ ldr r1, _0802F55C @ =gMoveSelectionCursor
ldr r0, _0802F560 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2243,7 +2243,7 @@ _0802F52E:
b _0802F56C
.align 2, 0
_0802F558: .4byte gUnknown_3004FF4
-_0802F55C: .4byte gUnknown_2023FFC
+_0802F55C: .4byte gMoveSelectionCursor
_0802F560: .4byte gActiveBattler
_0802F564:
ldrb r0, [r4]
@@ -2268,7 +2268,7 @@ _0802F56C:
ldrb r1, [r1]
cmp r0, r1
bcs _0802F600
- ldr r0, _0802F5B4 @ =gUnknown_2023FFC
+ ldr r0, _0802F5B4 @ =gMoveSelectionCursor
ldr r1, _0802F5B8 @ =gActiveBattler
ldrb r1, [r1]
adds r1, r0
@@ -2283,7 +2283,7 @@ _0802F56C:
_0802F5A8: .4byte gMain
_0802F5AC: .4byte gUnknown_3004FF4
_0802F5B0: .4byte gUnknown_3004FF8
-_0802F5B4: .4byte gUnknown_2023FFC
+_0802F5B4: .4byte gMoveSelectionCursor
_0802F5B8: .4byte gActiveBattler
_0802F5BC:
ldrb r0, [r3]
@@ -2296,7 +2296,7 @@ _0802F5C2:
strb r0, [r4]
movs r0, 0x5
bl PlaySE
- ldr r1, _0802F5F0 @ =gUnknown_2023FFC
+ ldr r1, _0802F5F0 @ =gMoveSelectionCursor
ldr r0, _0802F5F4 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2310,7 +2310,7 @@ _0802F5C2:
b _0802F600
.align 2, 0
_0802F5EC: .4byte gUnknown_3004FF4
-_0802F5F0: .4byte gUnknown_2023FFC
+_0802F5F0: .4byte gMoveSelectionCursor
_0802F5F4: .4byte gActiveBattler
_0802F5F8:
ldrb r0, [r4]
@@ -2348,7 +2348,7 @@ sub_802F610: @ 802F610
negs r0, r0
ands r0, r1
strb r0, [r2]
- ldr r0, _0802F65C @ =gUnknown_3004F80
+ ldr r0, _0802F65C @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r3]
ldr r0, _0802F660 @ =sub_8011A1C
@@ -2360,10 +2360,10 @@ _0802F64C: .4byte gWirelessCommType
_0802F650: .4byte gReceivedRemoteLinkPlayers
_0802F654: .4byte gMain
_0802F658: .4byte 0x00000439
-_0802F65C: .4byte gUnknown_3004F80
+_0802F65C: .4byte gPreBattleCallback1
_0802F660: .4byte sub_8011A1C
_0802F664:
- bl sub_800A4BC
+ bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802F694
@@ -2377,7 +2377,7 @@ _0802F664:
negs r0, r0
ands r0, r1
strb r0, [r2]
- ldr r0, _0802F6A0 @ =gUnknown_3004F80
+ ldr r0, _0802F6A0 @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r3]
ldr r0, _0802F6A4 @ =sub_8011A1C
@@ -2389,7 +2389,7 @@ _0802F694:
.align 2, 0
_0802F698: .4byte gMain
_0802F69C: .4byte 0x00000439
-_0802F6A0: .4byte gUnknown_3004F80
+_0802F6A0: .4byte gPreBattleCallback1
_0802F6A4: .4byte sub_8011A1C
thumb_func_end sub_802F610
@@ -2421,7 +2421,7 @@ _0802F6D8: .4byte gWirelessCommType
_0802F6DC:
bl sub_800AB9C
_0802F6E0:
- ldr r1, _0802F6F0 @ =gUnknown_3004FE0
+ ldr r1, _0802F6F0 @ =gBattlerControllerFuncs
ldr r0, _0802F6F4 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -2430,7 +2430,7 @@ _0802F6E0:
str r1, [r0]
b _0802F71E
.align 2, 0
-_0802F6F0: .4byte gUnknown_3004FE0
+_0802F6F0: .4byte gBattlerControllerFuncs
_0802F6F4: .4byte gActiveBattler
_0802F6F8: .4byte sub_802F610
_0802F6FC:
@@ -2444,7 +2444,7 @@ _0802F6FC:
negs r0, r0
ands r0, r1
strb r0, [r3]
- ldr r0, _0802F72C @ =gUnknown_3004F80
+ ldr r0, _0802F72C @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
@@ -2455,7 +2455,7 @@ _0802F71E:
.align 2, 0
_0802F724: .4byte gMain
_0802F728: .4byte 0x00000439
-_0802F72C: .4byte gUnknown_3004F80
+_0802F72C: .4byte gPreBattleCallback1
thumb_func_end sub_802F6A8
thumb_func_start sub_802F730
@@ -2571,7 +2571,7 @@ _0802F80C: .4byte gSaveBlock2Ptr
thumb_func_start sub_802F810
sub_802F810: @ 802F810
push {r4,lr}
- ldr r4, _0802F850 @ =gUnknown_2024018
+ ldr r4, _0802F850 @ =gBattleSpritesDataPtr
ldr r1, [r4]
ldr r3, _0802F854 @ =gActiveBattler
ldrb r0, [r3]
@@ -2602,7 +2602,7 @@ _0802F848:
pop {r0}
bx r0
.align 2, 0
-_0802F850: .4byte gUnknown_2024018
+_0802F850: .4byte gBattleSpritesDataPtr
_0802F854: .4byte gActiveBattler
thumb_func_end sub_802F810
@@ -2610,11 +2610,11 @@ _0802F854: .4byte gActiveBattler
sub_802F858: @ 802F858
push {r4-r7,lr}
movs r6, 0
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802F87C
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802F8B0
@@ -2626,7 +2626,7 @@ sub_802F858: @ 802F858
beq _0802F8B0
_0802F87C:
ldr r2, _0802F8A0 @ =gSprites
- ldr r1, _0802F8A4 @ =gUnknown_3004FF0
+ ldr r1, _0802F8A4 @ =gHealthboxSpriteIds
ldr r0, _0802F8A8 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -2644,12 +2644,12 @@ _0802F87C:
.align 2, 0
_0802F89C: .4byte gBattleTypeFlags
_0802F8A0: .4byte gSprites
-_0802F8A4: .4byte gUnknown_3004FF0
+_0802F8A4: .4byte gHealthboxSpriteIds
_0802F8A8: .4byte gActiveBattler
_0802F8AC: .4byte SpriteCallbackDummy
_0802F8B0:
ldr r2, _0802F9B0 @ =gSprites
- ldr r5, _0802F9B4 @ =gUnknown_3004FF0
+ ldr r5, _0802F9B4 @ =gHealthboxSpriteIds
ldr r0, _0802F9B8 @ =gActiveBattler
ldrb r3, [r0]
adds r0, r3, r5
@@ -2687,7 +2687,7 @@ _0802F8F2:
bne _0802F8F8
b _0802FA32
_0802F8F8:
- ldr r0, _0802F9C0 @ =gUnknown_2024018
+ ldr r0, _0802F9C0 @ =gBattleSpritesDataPtr
mov r12, r0
ldr r0, [r0]
ldr r7, _0802F9B8 @ =gActiveBattler
@@ -2780,10 +2780,10 @@ _0802F934:
b _0802F9DC
.align 2, 0
_0802F9B0: .4byte gSprites
-_0802F9B4: .4byte gUnknown_3004FF0
+_0802F9B4: .4byte gHealthboxSpriteIds
_0802F9B8: .4byte gActiveBattler
_0802F9BC: .4byte SpriteCallbackDummy
-_0802F9C0: .4byte gUnknown_2024018
+_0802F9C0: .4byte gBattleSpritesDataPtr
_0802F9C4: .4byte 0x000027f9
_0802F9C8: .4byte gBattleTypeFlags
_0802F9CC: .4byte gMPlayInfo_BGM
@@ -2805,7 +2805,7 @@ _0802F9DC:
ldr r5, _0802FA48 @ =gPlayerParty
adds r0, r5
bl HandleLowHpMusicChange
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802FA12
@@ -2819,7 +2819,7 @@ _0802F9DC:
adds r0, r5
bl HandleLowHpMusicChange
_0802FA12:
- ldr r0, _0802FA4C @ =gUnknown_2024018
+ ldr r0, _0802FA4C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r1, [r4]
ldr r2, [r0, 0x4]
@@ -2829,7 +2829,7 @@ _0802FA12:
adds r0, r2
movs r1, 0x3
strb r1, [r0, 0x9]
- ldr r1, _0802FA50 @ =gUnknown_3004FE0
+ ldr r1, _0802FA50 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -2845,8 +2845,8 @@ _0802FA3C: .4byte 0x0000ffff
_0802FA40: .4byte gBattlerPartyIndexes
_0802FA44: .4byte gActiveBattler
_0802FA48: .4byte gPlayerParty
-_0802FA4C: .4byte gUnknown_2024018
-_0802FA50: .4byte gUnknown_3004FE0
+_0802FA4C: .4byte gBattleSpritesDataPtr
+_0802FA50: .4byte gBattlerControllerFuncs
_0802FA54: .4byte sub_802F810
thumb_func_end sub_802F858
@@ -2856,7 +2856,7 @@ sub_802FA58: @ 802FA58
mov r7, r9
mov r6, r8
push {r6,r7}
- ldr r0, _0802FBCC @ =gUnknown_2024018
+ ldr r0, _0802FBCC @ =gBattleSpritesDataPtr
mov r9, r0
ldr r0, [r0]
ldr r1, _0802FBD0 @ =gActiveBattler
@@ -2930,7 +2930,7 @@ _0802FABC:
adds r0, r2, 0
bl sub_80F1720
_0802FAF0:
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802FB5C
@@ -2952,7 +2952,7 @@ _0802FAF0:
ldr r1, _0802FBE4 @ =gSprites
adds r0, r1
bl DestroySprite
- ldr r4, _0802FBE8 @ =gUnknown_3004FF0
+ ldr r4, _0802FBE8 @ =gHealthboxSpriteIds
mov r1, r8
ldrb r0, [r1]
adds r1, r7, 0
@@ -2991,7 +2991,7 @@ _0802FB5C:
ldr r1, _0802FBE4 @ =gSprites
adds r0, r1
bl DestroySprite
- ldr r5, _0802FBE8 @ =gUnknown_3004FF0
+ ldr r5, _0802FBE8 @ =gHealthboxSpriteIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@@ -3011,7 +3011,7 @@ _0802FB5C:
adds r0, r5
ldrb r0, [r0]
bl SetHealthboxSpriteVisible
- ldr r0, _0802FBCC @ =gUnknown_2024018
+ ldr r0, _0802FBCC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r2, [r0, 0x8]
ldrb r1, [r2, 0x9]
@@ -3019,7 +3019,7 @@ _0802FB5C:
negs r0, r0
ands r0, r1
strb r0, [r2, 0x9]
- ldr r1, _0802FBEC @ =gUnknown_3004FE0
+ ldr r1, _0802FBEC @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -3033,15 +3033,15 @@ _0802FBBE:
pop {r0}
bx r0
.align 2, 0
-_0802FBCC: .4byte gUnknown_2024018
+_0802FBCC: .4byte gBattleSpritesDataPtr
_0802FBD0: .4byte gActiveBattler
_0802FBD4: .4byte gBattlerPartyIndexes
_0802FBD8: .4byte gPlayerParty
_0802FBDC: .4byte gBattleTypeFlags
_0802FBE0: .4byte gUnknown_3004FFC
_0802FBE4: .4byte gSprites
-_0802FBE8: .4byte gUnknown_3004FF0
-_0802FBEC: .4byte gUnknown_3004FE0
+_0802FBE8: .4byte gHealthboxSpriteIds
+_0802FBEC: .4byte gBattlerControllerFuncs
_0802FBF0: .4byte sub_802F858
thumb_func_end sub_802FA58
@@ -3049,7 +3049,7 @@ _0802FBF0: .4byte sub_802F858
sub_802FBF4: @ 802FBF4
push {r4-r6,lr}
ldr r2, _0802FC8C @ =gSprites
- ldr r0, _0802FC90 @ =gUnknown_3004FF0
+ ldr r0, _0802FC90 @ =gHealthboxSpriteIds
ldr r6, _0802FC94 @ =gActiveBattler
ldrb r3, [r6]
adds r0, r3, r0
@@ -3063,7 +3063,7 @@ sub_802FBF4: @ 802FBF4
ldr r0, _0802FC98 @ =SpriteCallbackDummy
cmp r1, r0
bne _0802FC84
- ldr r5, _0802FC9C @ =gUnknown_2024018
+ ldr r5, _0802FC9C @ =gBattleSpritesDataPtr
ldr r0, [r5]
ldr r1, [r0, 0x4]
lsls r0, r3, 1
@@ -3111,7 +3111,7 @@ sub_802FBF4: @ 802FBF4
movs r3, 0x6
bl InitAndLaunchSpecialAnimation
_0802FC78:
- ldr r0, _0802FCA4 @ =gUnknown_3004FE0
+ ldr r0, _0802FCA4 @ =gBattlerControllerFuncs
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -3123,19 +3123,19 @@ _0802FC84:
bx r0
.align 2, 0
_0802FC8C: .4byte gSprites
-_0802FC90: .4byte gUnknown_3004FF0
+_0802FC90: .4byte gHealthboxSpriteIds
_0802FC94: .4byte gActiveBattler
_0802FC98: .4byte SpriteCallbackDummy
-_0802FC9C: .4byte gUnknown_2024018
+_0802FC9C: .4byte gBattleSpritesDataPtr
_0802FCA0: .4byte 0x000027f9
-_0802FCA4: .4byte gUnknown_3004FE0
+_0802FCA4: .4byte gBattlerControllerFuncs
_0802FCA8: .4byte sub_802FCAC
thumb_func_end sub_802FBF4
thumb_func_start sub_802FCAC
sub_802FCAC: @ 802FCAC
push {r4,lr}
- ldr r0, _0802FD00 @ =gUnknown_2024018
+ ldr r0, _0802FD00 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r4, _0802FD04 @ =gActiveBattler
ldrb r1, [r4]
@@ -3174,7 +3174,7 @@ _0802FCFA:
pop {r0}
bx r0
.align 2, 0
-_0802FD00: .4byte gUnknown_2024018
+_0802FD00: .4byte gBattleSpritesDataPtr
_0802FD04: .4byte gActiveBattler
_0802FD08: .4byte gMPlayInfo_BGM
_0802FD0C: .4byte 0x0000ffff
@@ -3185,7 +3185,7 @@ _0802FD14: .4byte gPlayerParty
thumb_func_start sub_802FD18
sub_802FD18: @ 802FD18
push {r4-r6,lr}
- ldr r6, _0802FDCC @ =gUnknown_2024018
+ ldr r6, _0802FDCC @ =gBattleSpritesDataPtr
ldr r0, [r6]
ldr r5, _0802FDD0 @ =gActiveBattler
ldrb r2, [r5]
@@ -3237,7 +3237,7 @@ _0802FD4A:
bne _0802FDC4
adds r0, r3, r4
bl DestroySprite
- ldr r4, _0802FDE8 @ =gUnknown_3004FF0
+ ldr r4, _0802FDE8 @ =gHealthboxSpriteIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -3259,7 +3259,7 @@ _0802FD4A:
bl SetHealthboxSpriteVisible
ldrb r0, [r5]
bl CopyBattleSpriteInvisibility
- ldr r1, _0802FDEC @ =gUnknown_3004FE0
+ ldr r1, _0802FDEC @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -3270,15 +3270,15 @@ _0802FDC4:
pop {r0}
bx r0
.align 2, 0
-_0802FDCC: .4byte gUnknown_2024018
+_0802FDCC: .4byte gBattleSpritesDataPtr
_0802FDD0: .4byte gActiveBattler
_0802FDD4: .4byte gBattlerPartyIndexes
_0802FDD8: .4byte gPlayerParty
_0802FDDC: .4byte gSprites
_0802FDE0: .4byte gUnknown_3004FFC
_0802FDE4: .4byte SpriteCallbackDummy
-_0802FDE8: .4byte gUnknown_3004FF0
-_0802FDEC: .4byte gUnknown_3004FE0
+_0802FDE8: .4byte gHealthboxSpriteIds
+_0802FDEC: .4byte gBattlerControllerFuncs
_0802FDF0: .4byte sub_802FBF4
thumb_func_end sub_802FD18
@@ -3312,12 +3312,12 @@ CompleteOnHealthbarDone: @ 802FE24
push {r4-r6,lr}
ldr r5, _0802FE64 @ =gActiveBattler
ldrb r0, [r5]
- ldr r6, _0802FE68 @ =gUnknown_3004FF0
+ ldr r6, _0802FE68 @ =gHealthboxSpriteIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
movs r3, 0
- bl sub_8049FD8
+ bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3335,11 +3335,11 @@ CompleteOnHealthbarDone: @ 802FE24
adds r0, r6
ldrb r0, [r0]
movs r2, 0
- bl sub_8048440
+ bl UpdateHpTextInHealthbox
b _0802FE86
.align 2, 0
_0802FE64: .4byte gActiveBattler
-_0802FE68: .4byte gUnknown_3004FF0
+_0802FE68: .4byte gHealthboxSpriteIds
_0802FE6C:
ldr r2, _0802FE8C @ =gBattlerPartyIndexes
ldrb r1, [r5]
@@ -3399,7 +3399,7 @@ sub_802FEAC: @ 802FEAC
str r7, [sp, 0x8]
ldrh r2, [r1, 0xA]
str r2, [sp, 0xC]
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3474,9 +3474,9 @@ _0802FEF2:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
strb r5, [r4]
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3524,7 +3524,7 @@ _0802FFE0:
adds r0, r6, 0
movs r1, 0x19
bl SetMonData
- ldr r1, _08030000 @ =gUnknown_3004FE0
+ ldr r1, _08030000 @ =gBattlerControllerFuncs
ldr r3, [sp, 0x8]
lsls r0, r3, 2
adds r0, r1
@@ -3534,7 +3534,7 @@ _0802FFE0:
bl DestroyTask
b _0803000E
.align 2, 0
-_08030000: .4byte gUnknown_3004FE0
+_08030000: .4byte gBattlerControllerFuncs
_08030004: .4byte sub_802FE94
_08030008:
ldr r0, _08030020 @ =sub_8030024
@@ -3623,7 +3623,7 @@ sub_8030024: @ 8030024
adds r4, r6
ldr r2, [r4]
subs r2, r1
- ldr r0, _080300EC @ =gUnknown_3004FF0
+ ldr r0, _080300EC @ =gHealthboxSpriteIds
add r0, r10
ldrb r1, [r0]
mov r0, r9
@@ -3649,7 +3649,7 @@ _080300DC: .4byte gTasks
_080300E0: .4byte gPlayerParty
_080300E4: .4byte gExperienceTables
_080300E8: .4byte gBaseStats
-_080300EC: .4byte gUnknown_3004FF0
+_080300EC: .4byte gHealthboxSpriteIds
_080300F0: .4byte sub_80300F4
thumb_func_end sub_8030024
@@ -3685,13 +3685,13 @@ _08030124:
ldrh r2, [r6, 0xA]
mov r10, r2
ldrb r7, [r6, 0xC]
- ldr r5, _080301EC @ =gUnknown_3004FF0
+ ldr r5, _080301EC @ =gHealthboxSpriteIds
adds r5, r7, r5
ldrb r1, [r5]
adds r0, r7, 0
movs r2, 0x1
movs r3, 0
- bl sub_8049FD8
+ bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3766,13 +3766,13 @@ _08030124:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
strb r5, [r4]
ldr r0, _08030200 @ =sub_8030238
str r0, [r6]
b _08030220
.align 2, 0
-_080301EC: .4byte gUnknown_3004FF0
+_080301EC: .4byte gHealthboxSpriteIds
_080301F0: .4byte gPlayerParty
_080301F4: .4byte gExperienceTables
_080301F8: .4byte gBaseStats
@@ -3784,7 +3784,7 @@ _08030204:
adds r0, r5, 0
movs r1, 0x19
bl SetMonData
- ldr r1, _08030230 @ =gUnknown_3004FE0
+ ldr r1, _08030230 @ =gBattlerControllerFuncs
lsls r0, r7, 2
adds r0, r1
ldr r1, _08030234 @ =sub_802FE94
@@ -3801,7 +3801,7 @@ _08030220:
pop {r0}
bx r0
.align 2, 0
-_08030230: .4byte gUnknown_3004FE0
+_08030230: .4byte gBattlerControllerFuncs
_08030234: .4byte sub_802FE94
thumb_func_end sub_80300F4
@@ -3817,7 +3817,7 @@ sub_8030238: @ 8030238
adds r0, r1
ldrb r4, [r0, 0xC]
ldrb r6, [r0, 0x8]
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3865,7 +3865,7 @@ sub_8030298: @ 8030298
lsls r0, 3
adds r2, r0, r1
ldrb r5, [r2, 0xC]
- ldr r0, _08030308 @ =gUnknown_2024018
+ ldr r0, _08030308 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0x4]
lsls r0, r5, 1
@@ -3886,7 +3886,7 @@ sub_8030298: @ 8030298
adds r0, r7, 0
movs r1, 0x38
bl GetMonData
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3900,7 +3900,7 @@ sub_8030298: @ 8030298
ldrh r0, [r0]
cmp r4, r0
bne _08030318
- ldr r0, _08030314 @ =gUnknown_3004FF0
+ ldr r0, _08030314 @ =gHealthboxSpriteIds
adds r0, r2, r0
ldrb r0, [r0]
adds r1, r7, 0
@@ -3909,12 +3909,12 @@ sub_8030298: @ 8030298
b _0803032C
.align 2, 0
_08030304: .4byte gTasks
-_08030308: .4byte gUnknown_2024018
+_08030308: .4byte gBattleSpritesDataPtr
_0803030C: .4byte gPlayerParty
_08030310: .4byte gBattlerPartyIndexes
-_08030314: .4byte gUnknown_3004FF0
+_08030314: .4byte gHealthboxSpriteIds
_08030318:
- ldr r0, _08030340 @ =gUnknown_3004FF0
+ ldr r0, _08030340 @ =gHealthboxSpriteIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x64
@@ -3936,7 +3936,7 @@ _0803033A:
pop {r0}
bx r0
.align 2, 0
-_08030340: .4byte gUnknown_3004FF0
+_08030340: .4byte gHealthboxSpriteIds
_08030344: .4byte gPlayerParty
_08030348: .4byte gTasks
_0803034C: .4byte sub_8030350
@@ -3956,7 +3956,7 @@ sub_8030350: @ 8030350
ldrsh r6, [r4, r0]
lsls r0, r6, 24
lsrs r0, 24
- bl sub_8072DF0
+ bl IsBattlerSpriteVisible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3970,7 +3970,7 @@ sub_8030350: @ 8030350
_08030380: .4byte gTasks
_08030384: .4byte sub_80303A8
_08030388:
- ldr r0, _080303A0 @ =gUnknown_3004FE0
+ ldr r0, _080303A0 @ =gBattlerControllerFuncs
lsls r1, r6, 2
adds r1, r0
ldr r0, _080303A4 @ =sub_802FE94
@@ -3982,7 +3982,7 @@ _08030398:
pop {r0}
bx r0
.align 2, 0
-_080303A0: .4byte gUnknown_3004FE0
+_080303A0: .4byte gBattlerControllerFuncs
_080303A4: .4byte sub_802FE94
thumb_func_end sub_8030350
@@ -4154,7 +4154,7 @@ _08030500:
_08030508:
ldrh r0, [r5, 0x1A]
strh r0, [r1]
- ldr r0, _08030530 @ =gUnknown_3004FE0
+ ldr r0, _08030530 @ =gBattlerControllerFuncs
lsls r1, r7, 2
adds r1, r0
ldr r0, _08030534 @ =sub_802FE94
@@ -4171,7 +4171,7 @@ _0803051C:
.align 2, 0
_08030528: .4byte gBattle_BG2_X
_0803052C: .4byte gBattle_BG2_Y
-_08030530: .4byte gUnknown_3004FE0
+_08030530: .4byte gBattlerControllerFuncs
_08030534: .4byte sub_802FE94
thumb_func_end sub_80303A8
@@ -4207,7 +4207,7 @@ sub_8030538: @ 8030538
lsls r0, 2
adds r0, r6
bl DestroySprite
- ldr r1, _0803059C @ =gUnknown_3004FF0
+ ldr r1, _0803059C @ =gHealthboxSpriteIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -4221,13 +4221,13 @@ _08030588:
_08030590: .4byte gSprites
_08030594: .4byte gBattlerSpriteIds
_08030598: .4byte gActiveBattler
-_0803059C: .4byte gUnknown_3004FF0
+_0803059C: .4byte gHealthboxSpriteIds
thumb_func_end sub_8030538
thumb_func_start sub_80305A0
sub_80305A0: @ 80305A0
push {r4-r6,lr}
- ldr r0, _080305FC @ =gUnknown_2024018
+ ldr r0, _080305FC @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r6, _08030600 @ =gActiveBattler
ldrb r2, [r6]
@@ -4258,7 +4258,7 @@ sub_80305A0: @ 80305A0
lsls r0, 2
adds r0, r4
bl DestroySprite
- ldr r1, _0803060C @ =gUnknown_3004FF0
+ ldr r1, _0803060C @ =gHealthboxSpriteIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4269,11 +4269,11 @@ _080305F4:
pop {r0}
bx r0
.align 2, 0
-_080305FC: .4byte gUnknown_2024018
+_080305FC: .4byte gBattleSpritesDataPtr
_08030600: .4byte gActiveBattler
_08030604: .4byte gBattlerSpriteIds
_08030608: .4byte gSprites
-_0803060C: .4byte gUnknown_3004FF0
+_0803060C: .4byte gHealthboxSpriteIds
thumb_func_end sub_80305A0
thumb_func_start sub_8030610
@@ -4299,7 +4299,7 @@ sub_8030628: @ 8030628
ands r0, r1
cmp r0, 0
bne _08030666
- ldr r1, _08030670 @ =gUnknown_3004FE0
+ ldr r1, _08030670 @ =gBattlerControllerFuncs
ldr r2, _08030674 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -4326,7 +4326,7 @@ _08030666:
bx r0
.align 2, 0
_0803066C: .4byte gPaletteFade
-_08030670: .4byte gUnknown_3004FE0
+_08030670: .4byte gBattlerControllerFuncs
_08030674: .4byte gActiveBattler
_08030678: .4byte sub_8030684
_0803067C: .4byte gTasks
@@ -4338,7 +4338,7 @@ sub_8030684: @ 8030684
push {lr}
ldr r0, _080306B4 @ =gMain
ldr r1, [r0, 0x4]
- ldr r0, _080306B8 @ =sub_8011100
+ ldr r0, _080306B8 @ =BattleMainCB2
cmp r1, r0
bne _080306F4
ldr r0, _080306BC @ =gPaletteFade
@@ -4355,11 +4355,11 @@ sub_8030684: @ 8030684
ldrb r1, [r0]
ldr r2, _080306C8 @ =gUnknown_203B0DC
movs r0, 0x1
- bl EmitChosenMonReturnValue
+ bl BtlController_EmitChosenMonReturnValue
b _080306D6
.align 2, 0
_080306B4: .4byte gMain
-_080306B8: .4byte sub_8011100
+_080306B8: .4byte BattleMainCB2
_080306BC: .4byte gPaletteFade
_080306C0: .4byte gUnknown_203B0C0
_080306C4: .4byte gUnknown_203B0C1
@@ -4368,9 +4368,9 @@ _080306CC:
movs r0, 0x1
movs r1, 0x6
movs r2, 0
- bl EmitChosenMonReturnValue
+ bl BtlController_EmitChosenMonReturnValue
_080306D6:
- ldr r1, _080306F8 @ =gUnknown_2022BC4
+ ldr r1, _080306F8 @ =gBattleBufferA
ldr r0, _080306FC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -4388,7 +4388,7 @@ _080306F4:
pop {r0}
bx r0
.align 2, 0
-_080306F8: .4byte gUnknown_2022BC4
+_080306F8: .4byte gBattleBufferA
_080306FC: .4byte gActiveBattler
thumb_func_end sub_8030684
@@ -4401,7 +4401,7 @@ sub_8030700: @ 8030700
ands r0, r1
cmp r0, 0
bne _08030728
- ldr r1, _08030730 @ =gUnknown_3004FE0
+ ldr r1, _08030730 @ =gBattlerControllerFuncs
ldr r0, _08030734 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -4416,7 +4416,7 @@ _08030728:
bx r0
.align 2, 0
_0803072C: .4byte gPaletteFade
-_08030730: .4byte gUnknown_3004FE0
+_08030730: .4byte gBattlerControllerFuncs
_08030734: .4byte gActiveBattler
_08030738: .4byte CompleteWhenChoseItem
thumb_func_end sub_8030700
@@ -4426,7 +4426,7 @@ CompleteWhenChoseItem: @ 803073C
push {lr}
ldr r0, _08030768 @ =gMain
ldr r1, [r0, 0x4]
- ldr r0, _0803076C @ =sub_8011100
+ ldr r0, _0803076C @ =BattleMainCB2
cmp r1, r0
bne _08030762
ldr r0, _08030770 @ =gPaletteFade
@@ -4438,14 +4438,14 @@ CompleteWhenChoseItem: @ 803073C
ldr r0, _08030774 @ =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0x1
- bl EmitOneReturnValue
+ bl BtlController_EmitOneReturnValue
bl PlayerBufferExecCompleted
_08030762:
pop {r0}
bx r0
.align 2, 0
_08030768: .4byte gMain
-_0803076C: .4byte sub_8011100
+_0803076C: .4byte BattleMainCB2
_08030770: .4byte gPaletteFade
_08030774: .4byte gSpecialVar_ItemId
thumb_func_end CompleteWhenChoseItem
@@ -4453,11 +4453,11 @@ _08030774: .4byte gSpecialVar_ItemId
thumb_func_start CompleteOnSpecialAnimDone
CompleteOnSpecialAnimDone: @ 8030778
push {lr}
- ldr r0, _080307A8 @ =gUnknown_2024005
+ ldr r0, _080307A8 @ =gDoingBattleAnim
ldrb r0, [r0]
cmp r0, 0
beq _0803079E
- ldr r0, _080307AC @ =gUnknown_2024018
+ ldr r0, _080307AC @ =gBattleSpritesDataPtr
ldr r2, [r0]
ldr r0, _080307B0 @ =gActiveBattler
ldrb r1, [r0]
@@ -4477,8 +4477,8 @@ _080307A2:
pop {r0}
bx r0
.align 2, 0
-_080307A8: .4byte gUnknown_2024005
-_080307AC: .4byte gUnknown_2024018
+_080307A8: .4byte gDoingBattleAnim
+_080307AC: .4byte gBattleSpritesDataPtr
_080307B0: .4byte gActiveBattler
thumb_func_end CompleteOnSpecialAnimDone
@@ -4508,7 +4508,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
subs r0, 0x5
ands r0, r1
strb r0, [r2]
- ldr r0, _080307FC @ =gUnknown_2024005
+ ldr r0, _080307FC @ =gDoingBattleAnim
strb r3, [r0]
bl PlayerBufferExecCompleted
b _0803082A
@@ -4516,7 +4516,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
_080307F0: .4byte gBattlerSpriteIds
_080307F4: .4byte gActiveBattler
_080307F8: .4byte gSprites
-_080307FC: .4byte gUnknown_2024005
+_080307FC: .4byte gDoingBattleAnim
_08030800:
ldrh r0, [r4, 0x30]
movs r1, 0x3
@@ -4578,7 +4578,7 @@ _08030848:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
ldrh r0, [r4]
cmp r0, 0
beq _08030880
@@ -4611,7 +4611,7 @@ MoveSelectionDisplayPpString: @ 80308A8
bl StringCopy
adds r0, r4, 0
movs r1, 0x7
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
pop {r4}
pop {r0}
bx r0
@@ -4623,7 +4623,7 @@ _080308C8: .4byte gUnknown_83FE766
thumb_func_start MoveSelectionDisplayPpNumber
MoveSelectionDisplayPpNumber: @ 80308CC
push {r4-r7,lr}
- ldr r5, _08030930 @ =gUnknown_2022BC4
+ ldr r5, _08030930 @ =gBattleBufferA
ldr r7, _08030934 @ =gActiveBattler
ldrb r0, [r7]
lsls r0, 9
@@ -4638,7 +4638,7 @@ MoveSelectionDisplayPpNumber: @ 80308CC
adds r0, r5, 0x4
adds r4, r0
ldr r6, _08030938 @ =gDisplayedStringBattle
- ldr r5, _0803093C @ =gUnknown_2023FFC
+ ldr r5, _0803093C @ =gMoveSelectionCursor
adds r1, r5
adds r0, r4, 0
adds r0, 0x8
@@ -4663,16 +4663,16 @@ MoveSelectionDisplayPpNumber: @ 80308CC
bl ConvertIntToDecimalStringN
adds r0, r6, 0
movs r1, 0x9
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
_08030928:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
-_08030930: .4byte gUnknown_2022BC4
+_08030930: .4byte gBattleBufferA
_08030934: .4byte gActiveBattler
_08030938: .4byte gDisplayedStringBattle
-_0803093C: .4byte gUnknown_2023FFC
+_0803093C: .4byte gMoveSelectionCursor
thumb_func_end MoveSelectionDisplayPpNumber
thumb_func_start MoveSelectionDisplayMoveType
@@ -4702,7 +4702,7 @@ MoveSelectionDisplayMoveType: @ 8030940
bl StringCopy
adds r3, r0, 0
ldr r2, _080309C0 @ =gBattleMoves
- ldr r1, _080309C4 @ =gUnknown_2023FFC
+ ldr r1, _080309C4 @ =gMoveSelectionCursor
ldrb r0, [r5]
adds r0, r1
ldrb r0, [r0]
@@ -4722,7 +4722,7 @@ MoveSelectionDisplayMoveType: @ 8030940
bl StringCopy
adds r0, r6, 0
movs r1, 0x8
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
pop {r4-r6}
pop {r0}
bx r0
@@ -4733,7 +4733,7 @@ _080309B4: .4byte gDisplayedStringBattle
_080309B8: .4byte gUnknown_83FE76A
_080309BC: .4byte gUnknown_83FE770
_080309C0: .4byte gBattleMoves
-_080309C4: .4byte gUnknown_2023FFC
+_080309C4: .4byte gMoveSelectionCursor
_080309C8: .4byte gUnknown_824F1A0
thumb_func_end MoveSelectionDisplayMoveType
@@ -4884,29 +4884,29 @@ ActionSelectionDestroyCursorAt: @ 8030A98
thumb_func_start sub_8030ADC
sub_8030ADC: @ 8030ADC
push {lr}
- ldr r0, _08030AE8 @ =sub_8077764
+ ldr r0, _08030AE8 @ =ReshowBattleScreenAfterMenu
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
-_08030AE8: .4byte sub_8077764
+_08030AE8: .4byte ReshowBattleScreenAfterMenu
thumb_func_end sub_8030ADC
thumb_func_start sub_8030AEC
sub_8030AEC: @ 8030AEC
push {lr}
- ldr r0, _08030AF8 @ =sub_8077764
+ ldr r0, _08030AF8 @ =ReshowBattleScreenAfterMenu
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
-_08030AF8: .4byte sub_8077764
+_08030AF8: .4byte ReshowBattleScreenAfterMenu
thumb_func_end sub_8030AEC
thumb_func_start CompleteOnFinishedStatusAnimation
CompleteOnFinishedStatusAnimation: @ 8030AFC
push {lr}
- ldr r0, _08030B24 @ =gUnknown_2024018
+ ldr r0, _08030B24 @ =gBattleSpritesDataPtr
ldr r2, [r0]
ldr r0, _08030B28 @ =gActiveBattler
ldrb r1, [r0]
@@ -4925,14 +4925,14 @@ _08030B1E:
pop {r0}
bx r0
.align 2, 0
-_08030B24: .4byte gUnknown_2024018
+_08030B24: .4byte gBattleSpritesDataPtr
_08030B28: .4byte gActiveBattler
thumb_func_end CompleteOnFinishedStatusAnimation
thumb_func_start CompleteOnFinishedBattleAnimation
CompleteOnFinishedBattleAnimation: @ 8030B2C
push {lr}
- ldr r0, _08030B54 @ =gUnknown_2024018
+ ldr r0, _08030B54 @ =gBattleSpritesDataPtr
ldr r2, [r0]
ldr r0, _08030B58 @ =gActiveBattler
ldrb r1, [r0]
@@ -4951,7 +4951,7 @@ _08030B4E:
pop {r0}
bx r0
.align 2, 0
-_08030B54: .4byte gUnknown_2024018
+_08030B54: .4byte gBattleSpritesDataPtr
_08030B58: .4byte gActiveBattler
thumb_func_end CompleteOnFinishedBattleAnimation
@@ -4971,7 +4971,7 @@ PrintLinkStandbyMsg: @ 8030B5C
strh r1, [r0]
ldr r0, _08030B8C @ =gUnknown_83FE714
movs r1, 0
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
_08030B7C:
pop {r0}
bx r0
@@ -4987,7 +4987,7 @@ PlayerHandleGetMonData: @ 8030B90
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
- ldr r1, _08030BBC @ =gUnknown_2022BC4
+ ldr r1, _08030BBC @ =gBattleBufferA
ldr r0, _08030BC0 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -5005,7 +5005,7 @@ PlayerHandleGetMonData: @ 8030B90
adds r6, r0, 0
b _08030BEA
.align 2, 0
-_08030BBC: .4byte gUnknown_2022BC4
+_08030BBC: .4byte gBattleBufferA
_08030BC0: .4byte gActiveBattler
_08030BC4: .4byte gBattlerPartyIndexes
_08030BC8:
@@ -5032,7 +5032,7 @@ _08030BEA:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl EmitDataTransfer
+ bl BtlController_EmitDataTransfer
bl PlayerBufferExecCompleted
add sp, 0x100
pop {r4-r6}
@@ -5052,7 +5052,7 @@ CopyPlayerMonData: @ 8030C04
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
- ldr r2, _08030C38 @ =gUnknown_2022BC4
+ ldr r2, _08030C38 @ =gBattleBufferA
ldr r3, _08030C3C @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
@@ -5069,7 +5069,7 @@ _08030C2E:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_08030C38: .4byte gUnknown_2022BC4
+_08030C38: .4byte gBattleBufferA
_08030C3C: .4byte gActiveBattler
_08030C40: .4byte _08030C44
.align 2, 0
@@ -5987,7 +5987,7 @@ PlayerHandleGetRawMonData: @ 80313B0
movs r0, 0x64
adds r4, r2, 0
muls r4, r0
- ldr r3, _08031430 @ =gUnknown_2022BC4
+ ldr r3, _08031430 @ =gBattleBufferA
lsls r1, 9
adds r0, r3, 0x1
adds r0, r1, r0
@@ -6029,7 +6029,7 @@ _08031406:
ldrb r1, [r0]
movs r0, 0x1
adds r2, r4, 0
- bl EmitDataTransfer
+ bl BtlController_EmitDataTransfer
bl PlayerBufferExecCompleted
add sp, 0x58
pop {r4-r7}
@@ -6038,14 +6038,14 @@ _08031406:
.align 2, 0
_08031428: .4byte gBattlerPartyIndexes
_0803142C: .4byte gActiveBattler
-_08031430: .4byte gUnknown_2022BC4
+_08031430: .4byte gBattleBufferA
_08031434: .4byte gPlayerParty
thumb_func_end PlayerHandleGetRawMonData
thumb_func_start PlayerHandleSetMonData
PlayerHandleSetMonData: @ 8031438
push {r4,r5,lr}
- ldr r1, _0803145C @ =gUnknown_2022BC4
+ ldr r1, _0803145C @ =gBattleBufferA
ldr r0, _08031460 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -6061,7 +6061,7 @@ PlayerHandleSetMonData: @ 8031438
bl SetPlayerMonData
b _08031486
.align 2, 0
-_0803145C: .4byte gUnknown_2022BC4
+_0803145C: .4byte gBattleBufferA
_08031460: .4byte gActiveBattler
_08031464: .4byte gBattlerPartyIndexes
_08031468:
@@ -6442,7 +6442,7 @@ _080317F4:
muls r0, r5
ldr r1, _08031810 @ =gPlayerParty
adds r0, r1
- ldr r3, _08031814 @ =gUnknown_2022BC4
+ ldr r3, _08031814 @ =gBattleBufferA
ldr r1, _08031818 @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
@@ -6453,7 +6453,7 @@ _080317F4:
b _08031898
.align 2, 0
_08031810: .4byte gPlayerParty
-_08031814: .4byte gUnknown_2022BC4
+_08031814: .4byte gBattleBufferA
_08031818: .4byte gActiveBattler
_0803181C:
movs r0, 0x64
@@ -6505,7 +6505,7 @@ _08031880:
muls r0, r5
ldr r1, _080318A4 @ =gPlayerParty
adds r0, r1
- ldr r3, _080318A8 @ =gUnknown_2022BC4
+ ldr r3, _080318A8 @ =gBattleBufferA
ldr r1, _080318AC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
@@ -6520,7 +6520,7 @@ _08031898:
b _08031E56
.align 2, 0
_080318A4: .4byte gPlayerParty
-_080318A8: .4byte gUnknown_2022BC4
+_080318A8: .4byte gBattleBufferA
_080318AC: .4byte gActiveBattler
_080318B0:
movs r0, 0x64
@@ -7237,7 +7237,7 @@ PlayerHandleSetRawMonData: @ 8031E8C
movs r0, 0x64
adds r3, r1, 0
muls r3, r0
- ldr r4, _08031EF8 @ =gUnknown_2022BC4
+ ldr r4, _08031EF8 @ =gBattleBufferA
lsls r2, 9
adds r0, r4, 0x1
adds r0, r2, r0
@@ -7280,7 +7280,7 @@ _08031EE4:
.align 2, 0
_08031EF0: .4byte gBattlerPartyIndexes
_08031EF4: .4byte gActiveBattler
-_08031EF8: .4byte gUnknown_2022BC4
+_08031EF8: .4byte gBattleBufferA
_08031EFC: .4byte gPlayerParty
thumb_func_end PlayerHandleSetRawMonData
@@ -7297,7 +7297,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
muls r0, r2
ldr r2, _08031F54 @ =gPlayerParty
adds r0, r2
- bl sub_8034498
+ bl BattleLoadPlayerMonSpriteGfx
ldr r2, _08031F58 @ =gSprites
ldr r0, _08031F5C @ =gBattlerSpriteIds
ldrb r3, [r4]
@@ -7313,7 +7313,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
ands r0, r2
orrs r0, r3
strb r0, [r1, 0x5]
- ldr r1, _08031F60 @ =gUnknown_3004FE0
+ ldr r1, _08031F60 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -7328,7 +7328,7 @@ _08031F50: .4byte gActiveBattler
_08031F54: .4byte gPlayerParty
_08031F58: .4byte gSprites
_08031F5C: .4byte gBattlerSpriteIds
-_08031F60: .4byte gUnknown_3004FE0
+_08031F60: .4byte gBattlerControllerFuncs
_08031F64: .4byte CompleteOnBankSpritePosX_0
thumb_func_end PlayerHandleLoadMonSprite
@@ -7337,7 +7337,7 @@ PlayerHandleSwitchInAnim: @ 8031F68
push {r4-r6,lr}
ldr r5, _08031FD4 @ =gActiveBattler
ldrb r0, [r5]
- ldr r4, _08031FD8 @ =gUnknown_2022BC4
+ ldr r4, _08031FD8 @ =gBattleBufferA
lsls r1, r0, 9
adds r6, r4, 0x2
adds r1, r6
@@ -7361,12 +7361,12 @@ PlayerHandleSwitchInAnim: @ 8031F68
muls r0, r2
ldr r2, _08031FE0 @ =gPlayerParty
adds r0, r2
- bl sub_8034498
- ldr r1, _08031FE4 @ =gUnknown_2023FF8
+ bl BattleLoadPlayerMonSpriteGfx
+ ldr r1, _08031FE4 @ =gActionSelectionCursor
ldrb r0, [r5]
adds r0, r1
strb r4, [r0]
- ldr r1, _08031FE8 @ =gUnknown_2023FFC
+ ldr r1, _08031FE8 @ =gMoveSelectionCursor
ldrb r0, [r5]
adds r0, r1
strb r4, [r0]
@@ -7375,7 +7375,7 @@ PlayerHandleSwitchInAnim: @ 8031F68
adds r1, r6
ldrb r1, [r1]
bl sub_8031FF4
- ldr r1, _08031FEC @ =gUnknown_3004FE0
+ ldr r1, _08031FEC @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -7386,12 +7386,12 @@ PlayerHandleSwitchInAnim: @ 8031F68
bx r0
.align 2, 0
_08031FD4: .4byte gActiveBattler
-_08031FD8: .4byte gUnknown_2022BC4
+_08031FD8: .4byte gBattleBufferA
_08031FDC: .4byte gBattlerPartyIndexes
_08031FE0: .4byte gPlayerParty
-_08031FE4: .4byte gUnknown_2023FF8
-_08031FE8: .4byte gUnknown_2023FFC
-_08031FEC: .4byte gUnknown_3004FE0
+_08031FE4: .4byte gActionSelectionCursor
+_08031FE8: .4byte gMoveSelectionCursor
+_08031FEC: .4byte gBattlerControllerFuncs
_08031FF0: .4byte sub_802FD18
thumb_func_end PlayerHandleSwitchInAnim
@@ -7412,7 +7412,7 @@ sub_8031FF4: @ 8031FF4
ldr r0, _08032138 @ =gBattlerPartyIndexes
lsls r2, r6, 1
adds r2, r0
- ldr r0, _0803213C @ =gUnknown_2022BC4
+ ldr r0, _0803213C @ =gBattleBufferA
lsls r1, r6, 9
adds r0, 0x1
adds r1, r0
@@ -7447,17 +7447,17 @@ sub_8031FF4: @ 8031FF4
mov r10, r0
adds r0, r6, 0
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r6, 0
- bl GetBankSpriteDefault_Y
+ bl GetBattlerSpriteDefault_Y
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
- bl sub_807685C
+ bl GetBattlerSpriteSubpriority
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -7550,7 +7550,7 @@ sub_8031FF4: @ 8031FF4
bx r0
.align 2, 0
_08032138: .4byte gBattlerPartyIndexes
-_0803213C: .4byte gUnknown_2022BC4
+_0803213C: .4byte gBattleBufferA
_08032140: .4byte gPlayerParty
_08032144: .4byte sub_8033E3C
_08032148: .4byte gUnknown_3004FFC
@@ -7564,7 +7564,7 @@ _0803215C: .4byte SpriteCallbackDummy
thumb_func_start PlayerHandleReturnPokeToBall
PlayerHandleReturnPokeToBall: @ 8032160
push {r4-r6,lr}
- ldr r1, _08032194 @ =gUnknown_2022BC4
+ ldr r1, _08032194 @ =gBattleBufferA
ldr r6, _08032198 @ =gActiveBattler
ldrb r2, [r6]
lsls r0, r2, 9
@@ -7573,7 +7573,7 @@ PlayerHandleReturnPokeToBall: @ 8032160
ldrb r3, [r0]
cmp r3, 0
bne _080321A8
- ldr r0, _0803219C @ =gUnknown_2024018
+ ldr r0, _0803219C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0x4]
lsls r0, r2, 1
@@ -7581,7 +7581,7 @@ PlayerHandleReturnPokeToBall: @ 8032160
lsls r0, 2
adds r0, r1
strb r3, [r0, 0x4]
- ldr r1, _080321A0 @ =gUnknown_3004FE0
+ ldr r1, _080321A0 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -7589,10 +7589,10 @@ PlayerHandleReturnPokeToBall: @ 8032160
str r1, [r0]
b _080321DE
.align 2, 0
-_08032194: .4byte gUnknown_2022BC4
+_08032194: .4byte gBattleBufferA
_08032198: .4byte gActiveBattler
-_0803219C: .4byte gUnknown_2024018
-_080321A0: .4byte gUnknown_3004FE0
+_0803219C: .4byte gBattleSpritesDataPtr
+_080321A0: .4byte gBattlerControllerFuncs
_080321A4: .4byte sub_80321F0
_080321A8:
ldr r5, _080321E4 @ =gBattlerSpriteIds
@@ -7612,7 +7612,7 @@ _080321A8:
lsls r0, 2
adds r0, r4
bl DestroySprite
- ldr r1, _080321EC @ =gUnknown_3004FF0
+ ldr r1, _080321EC @ =gHealthboxSpriteIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -7625,13 +7625,13 @@ _080321DE:
.align 2, 0
_080321E4: .4byte gBattlerSpriteIds
_080321E8: .4byte gSprites
-_080321EC: .4byte gUnknown_3004FF0
+_080321EC: .4byte gHealthboxSpriteIds
thumb_func_end PlayerHandleReturnPokeToBall
thumb_func_start sub_80321F0
sub_80321F0: @ 80321F0
push {r4-r6,lr}
- ldr r6, _08032210 @ =gUnknown_2024018
+ ldr r6, _08032210 @ =gBattleSpritesDataPtr
ldr r4, [r6]
ldr r5, _08032214 @ =gActiveBattler
ldrb r2, [r5]
@@ -7647,7 +7647,7 @@ sub_80321F0: @ 80321F0
beq _08032246
b _0803226E
.align 2, 0
-_08032210: .4byte gUnknown_2024018
+_08032210: .4byte gBattleSpritesDataPtr
_08032214: .4byte gActiveBattler
_08032218:
ldr r1, [r4]
@@ -7687,7 +7687,7 @@ _08032246:
adds r1, r2, 0
movs r3, 0x1
bl InitAndLaunchSpecialAnimation
- ldr r1, _08032274 @ =gUnknown_3004FE0
+ ldr r1, _08032274 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -7698,7 +7698,7 @@ _0803226E:
pop {r0}
bx r0
.align 2, 0
-_08032274: .4byte gUnknown_3004FE0
+_08032274: .4byte gBattlerControllerFuncs
_08032278: .4byte sub_80305A0
thumb_func_end sub_80321F0
@@ -7803,7 +7803,7 @@ _08032342:
ldr r5, _08032404 @ =gActiveBattler
ldrb r1, [r5]
adds r0, r4, 0
- bl sub_8034750
+ bl DecompressTrainerBackPalette
ldrb r0, [r5]
bl GetBattlerPosition
adds r1, r0, 0
@@ -7813,7 +7813,7 @@ _08032342:
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r6, _08032408 @ =gMultiuseSpriteTemplate
mov r8, r7
- ldr r0, _0803240C @ =gUnknown_8239F8C
+ ldr r0, _0803240C @ =gTrainerBackPicCoords
lsls r4, 2
adds r4, r0
ldrb r0, [r4]
@@ -7825,7 +7825,7 @@ _08032342:
adds r4, r0
asrs r4, 16
ldrb r0, [r5]
- bl sub_807685C
+ bl GetBattlerSpriteSubpriority
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -7879,7 +7879,7 @@ _08032342:
adds r0, r4
ldr r1, _0803241C @ =sub_8033EEC
str r1, [r0]
- ldr r1, _08032420 @ =gUnknown_3004FE0
+ ldr r1, _08032420 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -7894,12 +7894,12 @@ _08032342:
_08032400: .4byte gSaveBlock2Ptr
_08032404: .4byte gActiveBattler
_08032408: .4byte gMultiuseSpriteTemplate
-_0803240C: .4byte gUnknown_8239F8C
+_0803240C: .4byte gTrainerBackPicCoords
_08032410: .4byte gBattlerSpriteIds
_08032414: .4byte gSprites
_08032418: .4byte 0x0000fffe
_0803241C: .4byte sub_8033EEC
-_08032420: .4byte gUnknown_3004FE0
+_08032420: .4byte gBattlerControllerFuncs
_08032424: .4byte sub_802F730
thumb_func_end sub_803227C
@@ -7980,7 +7980,7 @@ _080324BE:
ldr r5, _0803256C @ =gActiveBattler
ldrb r1, [r5]
adds r0, r4, 0
- bl sub_8034750
+ bl DecompressTrainerBackPalette
ldrb r0, [r5]
bl GetBattlerPosition
adds r1, r0, 0
@@ -7989,7 +7989,7 @@ _080324BE:
adds r0, r4, 0
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r0, _08032570 @ =gMultiuseSpriteTemplate
- ldr r1, _08032574 @ =gUnknown_8239F8C
+ ldr r1, _08032574 @ =gTrainerBackPicCoords
lsls r4, 2
adds r4, r1
ldrb r1, [r4]
@@ -8049,7 +8049,7 @@ _080324BE:
adds r0, r4
ldr r1, _08032584 @ =sub_8033EEC
str r1, [r0]
- ldr r1, _08032588 @ =gUnknown_3004FE0
+ ldr r1, _08032588 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -8062,12 +8062,12 @@ _080324BE:
_08032568: .4byte gSaveBlock2Ptr
_0803256C: .4byte gActiveBattler
_08032570: .4byte gMultiuseSpriteTemplate
-_08032574: .4byte gUnknown_8239F8C
+_08032574: .4byte gTrainerBackPicCoords
_08032578: .4byte gBattlerSpriteIds
_0803257C: .4byte gSprites
_08032580: .4byte 0x0000ffa0
_08032584: .4byte sub_8033EEC
-_08032588: .4byte gUnknown_3004FE0
+_08032588: .4byte gBattlerControllerFuncs
_0803258C: .4byte sub_802F768
thumb_func_end sub_8032428
@@ -8084,7 +8084,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
lsls r0, 2
ldr r4, _08032638 @ =gSprites
adds r0, r4
- bl oamt_add_pos2_onto_pos1
+ bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -8121,7 +8121,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, _08032640 @ =sub_8075590
+ ldr r1, _08032640 @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r0, [r6]
adds r0, r5
@@ -8141,7 +8141,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
adds r0, r4
movs r1, 0x1
bl StartSpriteAnim
- ldr r1, _08032648 @ =gUnknown_3004FE0
+ ldr r1, _08032648 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -8155,16 +8155,16 @@ _08032630: .4byte gBattlerSpriteIds
_08032634: .4byte gActiveBattler
_08032638: .4byte gSprites
_0803263C: .4byte 0x0000ffd8
-_08032640: .4byte sub_8075590
+_08032640: .4byte StartAnimLinearTranslation
_08032644: .4byte SpriteCallbackDummy
-_08032648: .4byte gUnknown_3004FE0
+_08032648: .4byte gBattlerControllerFuncs
_0803264C: .4byte sub_802F7A0
thumb_func_end PlayerHandleTrainerSlideBack
thumb_func_start sub_8032650
sub_8032650: @ 8032650
push {r4-r6,lr}
- ldr r6, _0803269C @ =gUnknown_2024018
+ ldr r6, _0803269C @ =gBattleSpritesDataPtr
ldr r4, [r6]
ldr r5, _080326A0 @ =gActiveBattler
ldrb r2, [r5]
@@ -8201,7 +8201,7 @@ _08032684:
strb r1, [r0, 0x4]
b _0803271A
.align 2, 0
-_0803269C: .4byte gUnknown_2024018
+_0803269C: .4byte gBattleSpritesDataPtr
_080326A0: .4byte gActiveBattler
_080326A4:
ldrb r1, [r3]
@@ -8255,7 +8255,7 @@ _080326A4:
adds r0, r2
ldr r1, _08032730 @ =sub_8012110
str r1, [r0]
- ldr r1, _08032734 @ =gUnknown_3004FE0
+ ldr r1, _08032734 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -8271,7 +8271,7 @@ _08032724: .4byte gPlayerParty
_08032728: .4byte gSprites
_0803272C: .4byte gBattlerSpriteIds
_08032730: .4byte sub_8012110
-_08032734: .4byte gUnknown_3004FE0
+_08032734: .4byte gBattlerControllerFuncs
_08032738: .4byte sub_8030538
thumb_func_end sub_8032650
@@ -8296,12 +8296,12 @@ PlayerHandlePaletteFade: @ 803273C
thumb_func_start sub_803275C
sub_803275C: @ 803275C
push {r4,r5,lr}
- ldr r0, _0803279C @ =gUnknown_2024018
+ ldr r0, _0803279C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r1, [r0, 0x8]
movs r0, 0x4
strb r0, [r1, 0x8]
- ldr r1, _080327A0 @ =gUnknown_2024005
+ ldr r1, _080327A0 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldr r5, _080327A4 @ =gActiveBattler
@@ -8315,7 +8315,7 @@ sub_803275C: @ 803275C
adds r1, r4, 0
movs r3, 0x3
bl InitAndLaunchSpecialAnimation
- ldr r1, _080327A8 @ =gUnknown_3004FE0
+ ldr r1, _080327A8 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -8325,28 +8325,28 @@ sub_803275C: @ 803275C
pop {r0}
bx r0
.align 2, 0
-_0803279C: .4byte gUnknown_2024018
-_080327A0: .4byte gUnknown_2024005
+_0803279C: .4byte gBattleSpritesDataPtr
+_080327A0: .4byte gDoingBattleAnim
_080327A4: .4byte gActiveBattler
-_080327A8: .4byte gUnknown_3004FE0
+_080327A8: .4byte gBattlerControllerFuncs
_080327AC: .4byte CompleteOnSpecialAnimDone
thumb_func_end sub_803275C
thumb_func_start PlayerHandleBallThrowAnim
PlayerHandleBallThrowAnim: @ 80327B0
push {r4,r5,lr}
- ldr r1, _080327F8 @ =gUnknown_2022BC4
+ ldr r1, _080327F8 @ =gBattleBufferA
ldr r5, _080327FC @ =gActiveBattler
ldrb r0, [r5]
lsls r0, 9
adds r1, 0x1
adds r0, r1
ldrb r1, [r0]
- ldr r0, _08032800 @ =gUnknown_2024018
+ ldr r0, _08032800 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x8]
strb r1, [r0, 0x8]
- ldr r1, _08032804 @ =gUnknown_2024005
+ ldr r1, _08032804 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldrb r4, [r5]
@@ -8359,7 +8359,7 @@ PlayerHandleBallThrowAnim: @ 80327B0
adds r1, r4, 0
movs r3, 0x3
bl InitAndLaunchSpecialAnimation
- ldr r1, _08032808 @ =gUnknown_3004FE0
+ ldr r1, _08032808 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -8369,18 +8369,18 @@ PlayerHandleBallThrowAnim: @ 80327B0
pop {r0}
bx r0
.align 2, 0
-_080327F8: .4byte gUnknown_2022BC4
+_080327F8: .4byte gBattleBufferA
_080327FC: .4byte gActiveBattler
-_08032800: .4byte gUnknown_2024018
-_08032804: .4byte gUnknown_2024005
-_08032808: .4byte gUnknown_3004FE0
+_08032800: .4byte gBattleSpritesDataPtr
+_08032804: .4byte gDoingBattleAnim
+_08032808: .4byte gBattlerControllerFuncs
_0803280C: .4byte CompleteOnSpecialAnimDone
thumb_func_end PlayerHandleBallThrowAnim
thumb_func_start PlayerHandlePause
PlayerHandlePause: @ 8032810
push {lr}
- ldr r1, _08032838 @ =gUnknown_2022BC4
+ ldr r1, _08032838 @ =gBattleBufferA
ldr r0, _0803283C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -8400,7 +8400,7 @@ _0803282E:
pop {r0}
bx r0
.align 2, 0
-_08032838: .4byte gUnknown_2022BC4
+_08032838: .4byte gBattleBufferA
_0803283C: .4byte gActiveBattler
thumb_func_end PlayerHandlePause
@@ -8415,7 +8415,7 @@ PlayerHandleMoveAnimation: @ 8032840
beq _08032852
b _08032966
_08032852:
- ldr r0, _08032928 @ =gUnknown_2022BC4
+ ldr r0, _08032928 @ =gBattleBufferA
mov r12, r0
ldrb r2, [r6]
lsls r2, 9
@@ -8434,7 +8434,7 @@ _08032852:
adds r2, r1
ldrb r1, [r2]
strb r1, [r5]
- ldr r4, _08032930 @ =gUnknown_2037EEC
+ ldr r4, _08032930 @ =gAnimMovePower
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -8448,7 +8448,7 @@ _08032852:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
- ldr r4, _08032934 @ =gUnknown_2037EE8
+ ldr r4, _08032934 @ =gAnimMoveDmg
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -8474,7 +8474,7 @@ _08032852:
lsls r1, 24
orrs r3, r1
str r3, [r4]
- ldr r3, _08032938 @ =gUnknown_2037EFE
+ ldr r3, _08032938 @ =gAnimFriendship
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -8482,7 +8482,7 @@ _08032852:
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
- ldr r4, _0803293C @ =gUnknown_2037F00
+ ldr r4, _0803293C @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -8503,7 +8503,7 @@ _08032852:
adds r1, 0x10
adds r2, r1
str r2, [r3]
- ldr r3, _08032944 @ =gUnknown_2024008
+ ldr r3, _08032944 @ =gTransformedPersonalities
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
@@ -8519,16 +8519,16 @@ _08032852:
b _08032966
.align 2, 0
_08032924: .4byte gActiveBattler
-_08032928: .4byte gUnknown_2022BC4
+_08032928: .4byte gBattleBufferA
_0803292C: .4byte gAnimMoveTurn
-_08032930: .4byte gUnknown_2037EEC
-_08032934: .4byte gUnknown_2037EE8
-_08032938: .4byte gUnknown_2037EFE
-_0803293C: .4byte gUnknown_2037F00
+_08032930: .4byte gAnimMovePower
+_08032934: .4byte gAnimMoveDmg
+_08032938: .4byte gAnimFriendship
+_0803293C: .4byte gWeatherMoveAnim
_08032940: .4byte gAnimDisableStructPtr
-_08032944: .4byte gUnknown_2024008
+_08032944: .4byte gTransformedPersonalities
_08032948:
- ldr r0, _0803296C @ =gUnknown_2024018
+ ldr r0, _0803296C @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -8537,7 +8537,7 @@ _08032948:
lsls r0, 2
adds r0, r2
strb r3, [r0, 0x4]
- ldr r1, _08032970 @ =gUnknown_3004FE0
+ ldr r1, _08032970 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -8548,8 +8548,8 @@ _08032966:
pop {r0}
bx r0
.align 2, 0
-_0803296C: .4byte gUnknown_2024018
-_08032970: .4byte gUnknown_3004FE0
+_0803296C: .4byte gBattleSpritesDataPtr
+_08032970: .4byte gBattlerControllerFuncs
_08032974: .4byte sub_8032978
thumb_func_end PlayerHandleMoveAnimation
@@ -8560,7 +8560,7 @@ sub_8032978: @ 8032978
mov r6, r9
mov r5, r8
push {r5-r7}
- ldr r2, _080329C4 @ =gUnknown_2022BC4
+ ldr r2, _080329C4 @ =gBattleBufferA
ldr r6, _080329C8 @ =gActiveBattler
ldrb r3, [r6]
lsls r1, r3, 9
@@ -8578,7 +8578,7 @@ sub_8032978: @ 8032978
adds r1, r2
ldrb r1, [r1]
mov r8, r1
- ldr r7, _080329CC @ =gUnknown_2024018
+ ldr r7, _080329CC @ =gBattleSpritesDataPtr
ldr r5, [r7]
ldr r1, [r5, 0x4]
lsls r0, r3, 1
@@ -8594,9 +8594,9 @@ sub_8032978: @ 8032978
beq _080329DA
b _08032AEC
.align 2, 0
-_080329C4: .4byte gUnknown_2022BC4
+_080329C4: .4byte gBattleBufferA
_080329C8: .4byte gActiveBattler
-_080329CC: .4byte gUnknown_2024018
+_080329CC: .4byte gBattleSpritesDataPtr
_080329D0:
cmp r2, 0x2
beq _08032A3A
@@ -8652,10 +8652,10 @@ _08032A10:
strb r1, [r0, 0x4]
b _08032AEC
_08032A3A:
- ldr r0, _08032AA0 @ =gUnknown_2037EDC
+ ldr r0, _08032AA0 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _08032AA4 @ =gUnknown_2037EE1
+ ldr r0, _08032AA4 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _08032AEC
@@ -8689,7 +8689,7 @@ _08032A3A:
ands r0, r2
strb r0, [r1]
_08032A88:
- ldr r0, _08032AA8 @ =gUnknown_2024018
+ ldr r0, _08032AA8 @ =gBattleSpritesDataPtr
ldr r2, [r0]
ldr r0, _08032AAC @ =gActiveBattler
ldrb r1, [r0]
@@ -8702,9 +8702,9 @@ _08032A88:
strb r1, [r0, 0x4]
b _08032AEC
.align 2, 0
-_08032AA0: .4byte gUnknown_2037EDC
-_08032AA4: .4byte gUnknown_2037EE1
-_08032AA8: .4byte gUnknown_2024018
+_08032AA0: .4byte gAnimScriptCallback
+_08032AA4: .4byte gAnimScriptActive
+_08032AA8: .4byte gBattleSpritesDataPtr
_08032AAC: .4byte gActiveBattler
_08032AB0:
ldrb r1, [r0]
@@ -8758,7 +8758,7 @@ sub_8032AFC: @ 8032AFC
ldr r0, _08032B3C @ =gUnknown_2022BC6
adds r4, r0
ldrh r0, [r4]
- bl sub_80D7274
+ bl BufferStringBattle
ldrh r0, [r4]
bl sub_80D89B0
lsls r0, 24
@@ -8766,7 +8766,7 @@ sub_8032AFC: @ 8032AFC
beq _08032B44
ldr r0, _08032B40 @ =gDisplayedStringBattle
movs r1, 0x40
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
b _08032B4C
.align 2, 0
_08032B30: .4byte gBattle_BG0_X
@@ -8777,9 +8777,9 @@ _08032B40: .4byte gDisplayedStringBattle
_08032B44:
ldr r0, _08032B60 @ =gDisplayedStringBattle
movs r1, 0
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
_08032B4C:
- ldr r1, _08032B64 @ =gUnknown_3004FE0
+ ldr r1, _08032B64 @ =gBattlerControllerFuncs
ldr r0, _08032B68 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -8791,7 +8791,7 @@ _08032B4C:
bx r0
.align 2, 0
_08032B60: .4byte gDisplayedStringBattle
-_08032B64: .4byte gUnknown_3004FE0
+_08032B64: .4byte gBattlerControllerFuncs
_08032B68: .4byte gActiveBattler
_08032B6C: .4byte sub_8030610
thumb_func_end sub_8032AFC
@@ -8829,7 +8829,7 @@ sub_8032B94: @ 8032B94
ldr r1, _08032BC4 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
- ldr r1, _08032BC8 @ =gUnknown_3004FE0
+ ldr r1, _08032BC8 @ =gBattlerControllerFuncs
ldr r0, _08032BCC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -8842,7 +8842,7 @@ _08032BBA:
.align 2, 0
_08032BC0: .4byte gBattle_BG0_X
_08032BC4: .4byte gBattle_BG0_Y
-_08032BC8: .4byte gUnknown_3004FE0
+_08032BC8: .4byte gBattlerControllerFuncs
_08032BCC: .4byte gActiveBattler
_08032BD0: .4byte sub_802E438
thumb_func_end sub_8032B94
@@ -8850,7 +8850,7 @@ _08032BD0: .4byte sub_802E438
thumb_func_start sub_8032BD4
sub_8032BD4: @ 8032BD4
push {r4,lr}
- ldr r1, _08032C28 @ =gUnknown_3004FE0
+ ldr r1, _08032C28 @ =gBattlerControllerFuncs
ldr r0, _08032C2C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -8859,10 +8859,10 @@ sub_8032BD4: @ 8032BD4
str r1, [r0]
ldr r0, _08032C34 @ =gUnknown_83FDA4C
movs r1, 0
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
ldr r0, _08032C38 @ =gUnknown_83FE725
movs r1, 0x2
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
movs r4, 0
_08032BF6:
lsls r0, r4, 24
@@ -8871,7 +8871,7 @@ _08032BF6:
adds r4, 0x1
cmp r4, 0x3
ble _08032BF6
- ldr r1, _08032C3C @ =gUnknown_2023FF8
+ ldr r1, _08032C3C @ =gActionSelectionCursor
ldr r0, _08032C2C @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -8882,17 +8882,17 @@ _08032BF6:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _08032C44 @ =gDisplayedStringBattle
movs r1, 0x1
- bl sub_80D87BC
+ bl BattlePutTextOnWindow
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08032C28: .4byte gUnknown_3004FE0
+_08032C28: .4byte gBattlerControllerFuncs
_08032C2C: .4byte gActiveBattler
_08032C30: .4byte sub_8032B94
_08032C34: .4byte gUnknown_83FDA4C
_08032C38: .4byte gUnknown_83FE725
-_08032C3C: .4byte gUnknown_2023FF8
+_08032C3C: .4byte gActionSelectionCursor
_08032C40: .4byte gUnknown_83FE6D5
_08032C44: .4byte gDisplayedStringBattle
thumb_func_end sub_8032BD4
@@ -8917,7 +8917,7 @@ sub_8032C4C: @ 8032C4C
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _08032C84 @ =gUnknown_3004FE0
+ ldr r1, _08032C84 @ =gBattlerControllerFuncs
ldr r0, _08032C88 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -8930,7 +8930,7 @@ _08032C76:
.align 2, 0
_08032C7C: .4byte gBattle_BG0_X
_08032C80: .4byte gBattle_BG0_Y
-_08032C84: .4byte gUnknown_3004FE0
+_08032C84: .4byte gBattlerControllerFuncs
_08032C88: .4byte gActiveBattler
_08032C8C: .4byte sub_802EA10
thumb_func_end sub_8032C4C
@@ -8939,7 +8939,7 @@ _08032C8C: .4byte sub_802EA10
sub_8032C90: @ 8032C90
push {lr}
bl sub_8032CB4
- ldr r1, _08032CA8 @ =gUnknown_3004FE0
+ ldr r1, _08032CA8 @ =gBattlerControllerFuncs
ldr r0, _08032CAC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -8949,7 +8949,7 @@ sub_8032C90: @ 8032C90
pop {r0}
bx r0
.align 2, 0
-_08032CA8: .4byte gUnknown_3004FE0
+_08032CA8: .4byte gBattlerControllerFuncs
_08032CAC: .4byte gActiveBattler
_08032CB0: .4byte sub_8032C4C
thumb_func_end sub_8032C90
@@ -8961,7 +8961,7 @@ sub_8032CB4: @ 8032CB4
ldr r1, _08032CE0 @ =gUnknown_3004FF4
movs r0, 0xFF
strb r0, [r1]
- ldr r1, _08032CE4 @ =gUnknown_2023FFC
+ ldr r1, _08032CE4 @ =gMoveSelectionCursor
ldr r0, _08032CE8 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
@@ -8975,7 +8975,7 @@ sub_8032CB4: @ 8032CB4
bx r0
.align 2, 0
_08032CE0: .4byte gUnknown_3004FF4
-_08032CE4: .4byte gUnknown_2023FFC
+_08032CE4: .4byte gMoveSelectionCursor
_08032CE8: .4byte gActiveBattler
thumb_func_end sub_8032CB4
@@ -8990,7 +8990,7 @@ sub_8032CEC: @ 8032CEC
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
- ldr r1, _08032D38 @ =gUnknown_3004FE0
+ ldr r1, _08032D38 @ =gBattlerControllerFuncs
ldr r2, _08032D3C @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -9002,7 +9002,7 @@ sub_8032CEC: @ 8032CEC
strb r0, [r1]
movs r3, 0
ldr r5, _08032D48 @ =gUnknown_203B0DC
- ldr r4, _08032D4C @ =gUnknown_2022BC4
+ ldr r4, _08032D4C @ =gBattleBufferA
_08032D1A:
adds r0, r3, r5
ldrb r1, [r2]
@@ -9020,12 +9020,12 @@ _08032D1A:
pop {r0}
bx r0
.align 2, 0
-_08032D38: .4byte gUnknown_3004FE0
+_08032D38: .4byte gBattlerControllerFuncs
_08032D3C: .4byte gActiveBattler
_08032D40: .4byte sub_8030700
_08032D44: .4byte gBattlerInMenuId
_08032D48: .4byte gUnknown_203B0DC
-_08032D4C: .4byte gUnknown_2022BC4
+_08032D4C: .4byte gBattleBufferA
thumb_func_end sub_8032CEC
thumb_func_start sub_8032D50
@@ -9048,7 +9048,7 @@ sub_8032D50: @ 8032D50
adds r1, r0
lsls r1, 3
adds r1, r5
- ldr r5, _08032E10 @ =gUnknown_2022BC4
+ ldr r5, _08032E10 @ =gBattleBufferA
lsls r2, 9
adds r6, r5, 0x1
adds r2, r6
@@ -9102,7 +9102,7 @@ _08032DBC:
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
- ldr r1, _08032E1C @ =gUnknown_3004FE0
+ ldr r1, _08032E1C @ =gBattlerControllerFuncs
ldr r2, _08032E08 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -9121,10 +9121,10 @@ _08032E00: .4byte TaskDummy
_08032E04: .4byte gUnknown_3004FFC
_08032E08: .4byte gActiveBattler
_08032E0C: .4byte gTasks
-_08032E10: .4byte gUnknown_2022BC4
+_08032E10: .4byte gBattleBufferA
_08032E14: .4byte gBattleStruct
_08032E18: .4byte gUnknown_203B0DC
-_08032E1C: .4byte gUnknown_3004FE0
+_08032E1C: .4byte gBattlerControllerFuncs
_08032E20: .4byte sub_8030628
_08032E24: .4byte gBattlerInMenuId
thumb_func_end sub_8032D50
@@ -9157,7 +9157,7 @@ sub_8032E4C: @ 8032E4C
sub sp, 0x4
movs r0, 0
bl LoadBattleBarGfx
- ldr r3, _08032EC4 @ =gUnknown_2022BC4
+ ldr r3, _08032EC4 @ =gBattleBufferA
ldr r0, _08032EC8 @ =gActiveBattler
mov r9, r0
ldrb r4, [r0]
@@ -9198,7 +9198,7 @@ sub_8032E4C: @ 8032E4C
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
- ldr r1, _08032ED8 @ =gUnknown_3004FF0
+ ldr r1, _08032ED8 @ =gHealthboxSpriteIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -9206,12 +9206,12 @@ sub_8032E4C: @ 8032E4C
bl SetBattleBarStruct
b _08032F16
.align 2, 0
-_08032EC4: .4byte gUnknown_2022BC4
+_08032EC4: .4byte gBattleBufferA
_08032EC8: .4byte gActiveBattler
_08032ECC: .4byte 0x00007fff
_08032ED0: .4byte gBattlerPartyIndexes
_08032ED4: .4byte gPlayerParty
-_08032ED8: .4byte gUnknown_3004FF0
+_08032ED8: .4byte gHealthboxSpriteIds
_08032EDC:
ldr r1, _08032F34 @ =gBattlerPartyIndexes
lsls r0, r4, 1
@@ -9226,7 +9226,7 @@ _08032EDC:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
- ldr r4, _08032F3C @ =gUnknown_3004FF0
+ ldr r4, _08032F3C @ =gHealthboxSpriteIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]
@@ -9238,9 +9238,9 @@ _08032EDC:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
- bl sub_8048440
+ bl UpdateHpTextInHealthbox
_08032F16:
- ldr r1, _08032F40 @ =gUnknown_3004FE0
+ ldr r1, _08032F40 @ =gBattlerControllerFuncs
ldr r0, _08032F44 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -9257,8 +9257,8 @@ _08032F16:
.align 2, 0
_08032F34: .4byte gBattlerPartyIndexes
_08032F38: .4byte gPlayerParty
-_08032F3C: .4byte gUnknown_3004FF0
-_08032F40: .4byte gUnknown_3004FE0
+_08032F3C: .4byte gHealthboxSpriteIds
+_08032F40: .4byte gBattlerControllerFuncs
_08032F44: .4byte gActiveBattler
_08032F48: .4byte CompleteOnHealthbarDone
thumb_func_end sub_8032E4C
@@ -9266,7 +9266,7 @@ _08032F48: .4byte CompleteOnHealthbarDone
thumb_func_start PlayerHandleExpUpdate
PlayerHandleExpUpdate: @ 8032F4C
push {r4-r7,lr}
- ldr r5, _08032F78 @ =gUnknown_2022BC4
+ ldr r5, _08032F78 @ =gBattleBufferA
ldr r6, _08032F7C @ =gActiveBattler
ldrb r0, [r6]
lsls r0, 9
@@ -9286,7 +9286,7 @@ PlayerHandleExpUpdate: @ 8032F4C
bl PlayerBufferExecCompleted
b _08032FD0
.align 2, 0
-_08032F78: .4byte gUnknown_2022BC4
+_08032F78: .4byte gBattleBufferA
_08032F7C: .4byte gActiveBattler
_08032F80: .4byte gPlayerParty
_08032F84:
@@ -9319,7 +9319,7 @@ _08032F84:
strh r4, [r1, 0xA]
ldrb r0, [r6]
strh r0, [r1, 0xC]
- ldr r1, _08032FE0 @ =gUnknown_3004FE0
+ ldr r1, _08032FE0 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -9332,7 +9332,7 @@ _08032FD0:
.align 2, 0
_08032FD8: .4byte sub_802FEAC
_08032FDC: .4byte gTasks
-_08032FE0: .4byte gUnknown_3004FE0
+_08032FE0: .4byte gBattlerControllerFuncs
_08032FE4: .4byte nullsub_13
thumb_func_end PlayerHandleExpUpdate
@@ -9345,7 +9345,7 @@ sub_8032FE8: @ 8032FE8
lsls r0, 24
cmp r0, 0
bne _0803303C
- ldr r0, _08033048 @ =gUnknown_3004FF0
+ ldr r0, _08033048 @ =gHealthboxSpriteIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -9360,7 +9360,7 @@ sub_8032FE8: @ 8032FE8
movs r2, 0x9
bl UpdateHealthboxAttribute
ldrb r2, [r4]
- ldr r0, _08033054 @ =gUnknown_2024018
+ ldr r0, _08033054 @ =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r0, [r0, 0x4]
lsls r1, r2, 1
@@ -9372,7 +9372,7 @@ sub_8032FE8: @ 8032FE8
negs r0, r0
ands r0, r2
strb r0, [r1]
- ldr r1, _08033058 @ =gUnknown_3004FE0
+ ldr r1, _08033058 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -9384,11 +9384,11 @@ _0803303C:
bx r0
.align 2, 0
_08033044: .4byte gActiveBattler
-_08033048: .4byte gUnknown_3004FF0
+_08033048: .4byte gHealthboxSpriteIds
_0803304C: .4byte gBattlerPartyIndexes
_08033050: .4byte gPlayerParty
-_08033054: .4byte gUnknown_2024018
-_08033058: .4byte gUnknown_3004FE0
+_08033054: .4byte gBattleSpritesDataPtr
+_08033058: .4byte gBattlerControllerFuncs
_0803305C: .4byte CompleteOnFinishedStatusAnimation
thumb_func_end sub_8032FE8
@@ -9401,7 +9401,7 @@ sub_8033060: @ 8033060
lsls r0, 24
cmp r0, 0
bne _080330B0
- ldr r4, _080330BC @ =gUnknown_2022BC4
+ ldr r4, _080330BC @ =gBattleBufferA
ldrb r3, [r5]
lsls r3, 9
adds r0, r4, 0x1
@@ -9426,7 +9426,7 @@ sub_8033060: @ 8033060
lsls r2, 24
orrs r1, r2
bl InitAndLaunchChosenStatusAnimation
- ldr r1, _080330C0 @ =gUnknown_3004FE0
+ ldr r1, _080330C0 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -9438,8 +9438,8 @@ _080330B0:
bx r0
.align 2, 0
_080330B8: .4byte gActiveBattler
-_080330BC: .4byte gUnknown_2022BC4
-_080330C0: .4byte gUnknown_3004FE0
+_080330BC: .4byte gBattleBufferA
+_080330C0: .4byte gBattlerControllerFuncs
_080330C4: .4byte CompleteOnFinishedStatusAnimation
thumb_func_end sub_8033060
@@ -9462,7 +9462,7 @@ PlayerHandleStatusXor: @ 80330C8
adds r0, r5
movs r1, 0x37
bl GetMonData
- ldr r2, _08033130 @ =gUnknown_2022BC4
+ ldr r2, _08033130 @ =gBattleBufferA
ldrb r1, [r4]
lsls r1, 9
adds r2, 0x1
@@ -9491,7 +9491,7 @@ PlayerHandleStatusXor: @ 80330C8
_08033124: .4byte gBattlerPartyIndexes
_08033128: .4byte gActiveBattler
_0803312C: .4byte gPlayerParty
-_08033130: .4byte gUnknown_2022BC4
+_08033130: .4byte gBattleBufferA
thumb_func_end PlayerHandleStatusXor
thumb_func_start sub_8033134
@@ -9505,7 +9505,7 @@ sub_8033134: @ 8033134
thumb_func_start PlayerHandleDMA3Transfer
PlayerHandleDMA3Transfer: @ 8033140
push {r4,r5,lr}
- ldr r3, _080331A4 @ =gUnknown_2022BC4
+ ldr r3, _080331A4 @ =gBattleBufferA
ldr r0, _080331A8 @ =gActiveBattler
ldrb r2, [r0]
lsls r2, 9
@@ -9554,7 +9554,7 @@ PlayerHandleDMA3Transfer: @ 8033140
ldr r0, [r0, 0x8]
b _080331DC
.align 2, 0
-_080331A4: .4byte gUnknown_2022BC4
+_080331A4: .4byte gBattleBufferA
_080331A8: .4byte gActiveBattler
_080331AC: .4byte 0x040000d4
_080331B0:
@@ -9594,7 +9594,7 @@ _080331F0: .4byte 0xfffff000
thumb_func_start PlayerHandlePlayBGM
PlayerHandlePlayBGM: @ 80331F4
push {lr}
- ldr r2, _0803321C @ =gUnknown_2022BC4
+ ldr r2, _0803321C @ =gBattleBufferA
ldr r0, _08033220 @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
@@ -9611,7 +9611,7 @@ PlayerHandlePlayBGM: @ 80331F4
pop {r0}
bx r0
.align 2, 0
-_0803321C: .4byte gUnknown_2022BC4
+_0803321C: .4byte gBattleBufferA
_08033220: .4byte gActiveBattler
thumb_func_end PlayerHandlePlayBGM
@@ -9629,7 +9629,7 @@ PlayerHandleTwoReturnValues: @ 8033230
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl EmitTwoReturnValues
+ bl BtlController_EmitTwoReturnValues
bl PlayerBufferExecCompleted
pop {r0}
bx r0
@@ -9641,7 +9641,7 @@ PlayerHandleChosenMonReturnValue: @ 8033244
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl EmitChosenMonReturnValue
+ bl BtlController_EmitChosenMonReturnValue
bl PlayerBufferExecCompleted
pop {r0}
bx r0
@@ -9652,7 +9652,7 @@ PlayerHandleOneReturnValue: @ 8033258
push {lr}
movs r0, 0x1
movs r1, 0
- bl EmitOneReturnValue
+ bl BtlController_EmitOneReturnValue
bl PlayerBufferExecCompleted
pop {r0}
bx r0
@@ -9663,7 +9663,7 @@ PlayerHandleOneReturnValue_Duplicate: @ 803326C
push {lr}
movs r0, 0x1
movs r1, 0
- bl EmitOneReturnValue_Duplicate
+ bl BtlController_EmitOneReturnValue_Duplicate
bl PlayerBufferExecCompleted
pop {r0}
bx r0
@@ -9689,7 +9689,7 @@ _08033298: .4byte gUnknown_2022870
PlayerHandleCmd38: @ 803329C
push {lr}
ldr r3, _080332C8 @ =gUnknown_2022870
- ldr r1, _080332CC @ =gUnknown_2022BC4
+ ldr r1, _080332CC @ =gBattleBufferA
ldr r0, _080332D0 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -9709,7 +9709,7 @@ PlayerHandleCmd38: @ 803329C
bx r0
.align 2, 0
_080332C8: .4byte gUnknown_2022870
-_080332CC: .4byte gUnknown_2022BC4
+_080332CC: .4byte gBattleBufferA
_080332D0: .4byte gActiveBattler
thumb_func_end PlayerHandleCmd38
@@ -9775,7 +9775,7 @@ _0803333C: .4byte gSprites
_08033340: .4byte gBattlerSpriteIds
_08033344: .4byte gActiveBattler
_08033348:
- ldr r1, _08033378 @ =gUnknown_2024005
+ ldr r1, _08033378 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldrb r0, [r4]
@@ -9789,7 +9789,7 @@ _08033348:
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl DoHitAnimHealthboxEffect
- ldr r1, _0803337C @ =gUnknown_3004FE0
+ ldr r1, _0803337C @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -9800,8 +9800,8 @@ _08033372:
pop {r0}
bx r0
.align 2, 0
-_08033378: .4byte gUnknown_2024005
-_0803337C: .4byte gUnknown_3004FE0
+_08033378: .4byte gDoingBattleAnim
+_0803337C: .4byte gBattlerControllerFuncs
_08033380: .4byte DoHitAnimBlinkSpriteEffect
thumb_func_end PlayerHandleHitAnimation
@@ -9825,7 +9825,7 @@ PlayerHandlePlaySE: @ 8033390
bne _080333A4
movs r3, 0xC0
_080333A4:
- ldr r2, _080333D0 @ =gUnknown_2022BC4
+ ldr r2, _080333D0 @ =gBattleBufferA
ldrb r1, [r4]
lsls r1, 9
adds r0, r2, 0x1
@@ -9845,13 +9845,13 @@ _080333A4:
bx r0
.align 2, 0
_080333CC: .4byte gActiveBattler
-_080333D0: .4byte gUnknown_2022BC4
+_080333D0: .4byte gBattleBufferA
thumb_func_end PlayerHandlePlaySE
thumb_func_start PlayerHandlecmd44
PlayerHandlecmd44: @ 80333D4
push {lr}
- ldr r2, _080333FC @ =gUnknown_2022BC4
+ ldr r2, _080333FC @ =gBattleBufferA
ldr r0, _08033400 @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
@@ -9868,7 +9868,7 @@ PlayerHandlecmd44: @ 80333D4
pop {r0}
bx r0
.align 2, 0
-_080333FC: .4byte gUnknown_2022BC4
+_080333FC: .4byte gBattleBufferA
_08033400: .4byte gActiveBattler
thumb_func_end PlayerHandlecmd44
@@ -9905,15 +9905,15 @@ _08033440: .4byte gPlayerParty
thumb_func_start PlayerHandleIntroSlide
PlayerHandleIntroSlide: @ 8033444
push {lr}
- ldr r1, _0803346C @ =gUnknown_2022BC4
+ ldr r1, _0803346C @ =gBattleBufferA
ldr r0, _08033470 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
- bl sub_80BC3A0
- ldr r2, _08033474 @ =gUnknown_2023F4C
+ bl HandleIntroSlide
+ ldr r2, _08033474 @ =gIntroSlideFlags
ldrh r0, [r2]
movs r1, 0x1
orrs r0, r1
@@ -9922,9 +9922,9 @@ PlayerHandleIntroSlide: @ 8033444
pop {r0}
bx r0
.align 2, 0
-_0803346C: .4byte gUnknown_2022BC4
+_0803346C: .4byte gBattleBufferA
_08033470: .4byte gActiveBattler
-_08033474: .4byte gUnknown_2023F4C
+_08033474: .4byte gIntroSlideFlags
thumb_func_end PlayerHandleIntroSlide
thumb_func_start PlayerHandleIntroTrainerBallThrow
@@ -9940,7 +9940,7 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478
lsls r0, 2
ldr r5, _080335C0 @ =gSprites
adds r0, r5
- bl oamt_add_pos2_onto_pos1
+ bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -10046,7 +10046,7 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478
adds r1, r4
ldrb r0, [r7]
strh r0, [r1, 0x8]
- ldr r3, _080335E4 @ =gUnknown_2024018
+ ldr r3, _080335E4 @ =gBattleSpritesDataPtr
ldr r0, [r3]
ldrb r2, [r7]
ldr r1, [r0, 0x4]
@@ -10059,14 +10059,14 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478
ands r0, r1
cmp r0, 0
beq _0803359A
- ldr r0, _080335E8 @ =gUnknown_2024000
+ ldr r0, _080335E8 @ =gBattlerStatusSummaryTaskId
adds r0, r2, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
- ldr r1, _080335EC @ =sub_80491B0
+ ldr r1, _080335EC @ =Task_HidePartyStatusSummary
str r1, [r0]
_0803359A:
ldr r0, [r3]
@@ -10075,7 +10075,7 @@ _0803359A:
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
- ldr r1, _080335F0 @ =gUnknown_3004FE0
+ ldr r1, _080335F0 @ =gBattlerControllerFuncs
ldrb r0, [r7]
lsls r0, 2
adds r0, r1
@@ -10096,10 +10096,10 @@ _080335D4: .4byte gUnknown_8239FD4
_080335D8: .4byte gSaveBlock2Ptr
_080335DC: .4byte task05_08033660
_080335E0: .4byte gTasks
-_080335E4: .4byte gUnknown_2024018
-_080335E8: .4byte gUnknown_2024000
-_080335EC: .4byte sub_80491B0
-_080335F0: .4byte gUnknown_3004FE0
+_080335E4: .4byte gBattleSpritesDataPtr
+_080335E8: .4byte gBattlerStatusSummaryTaskId
+_080335EC: .4byte Task_HidePartyStatusSummary
+_080335F0: .4byte gBattlerControllerFuncs
_080335F4: .4byte nullsub_13
thumb_func_end PlayerHandleIntroTrainerBallThrow
@@ -10128,7 +10128,7 @@ sub_80335F8: @ 80335F8
ldr r1, _08033654 @ =gPlayerParty
adds r0, r1
adds r1, r4, 0
- bl sub_8034498
+ bl BattleLoadPlayerMonSpriteGfx
ldr r0, _08033658 @ =gBattlerSpriteIds
adds r4, r0
ldrb r1, [r4]
@@ -10179,7 +10179,7 @@ _0803368C:
mov r9, r0
ldrh r0, [r1, 0x8]
strb r0, [r7]
- bl sub_8075290
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080336AC
@@ -10190,7 +10190,7 @@ _0803368C:
cmp r0, 0
beq _080336DC
_080336AC:
- ldr r0, _080336D4 @ =gUnknown_2022BC4
+ ldr r0, _080336D4 @ =gBattleBufferA
ldrb r1, [r7]
lsls r2, r1, 9
adds r0, 0x1
@@ -10207,10 +10207,10 @@ _080336AC:
.align 2, 0
_080336CC: .4byte gActiveBattler
_080336D0: .4byte gBattleTypeFlags
-_080336D4: .4byte gUnknown_2022BC4
+_080336D4: .4byte gBattleBufferA
_080336D8: .4byte gBattlerPartyIndexes
_080336DC:
- ldr r4, _08033754 @ =gUnknown_2022BC4
+ ldr r4, _08033754 @ =gBattleBufferA
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
@@ -10242,7 +10242,7 @@ _080336DC:
muls r0, r2
ldr r2, _0803375C @ =gPlayerParty
adds r0, r2
- bl sub_8034498
+ bl BattleLoadPlayerMonSpriteGfx
ldrb r0, [r7]
movs r1, 0
bl sub_8031FF4
@@ -10250,7 +10250,7 @@ _080336DC:
eors r0, r6
strb r0, [r7]
_08033730:
- ldr r1, _08033760 @ =gUnknown_3004FE0
+ ldr r1, _08033760 @ =gBattlerControllerFuncs
ldr r2, _08033764 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -10269,10 +10269,10 @@ _08033748:
pop {r0}
bx r0
.align 2, 0
-_08033754: .4byte gUnknown_2022BC4
+_08033754: .4byte gBattleBufferA
_08033758: .4byte gBattlerPartyIndexes
_0803375C: .4byte gPlayerParty
-_08033760: .4byte gUnknown_3004FE0
+_08033760: .4byte gBattlerControllerFuncs
_08033764: .4byte gActiveBattler
_08033768: .4byte sub_802FA58
thumb_func_end task05_08033660
@@ -10280,7 +10280,7 @@ _08033768: .4byte sub_802FA58
thumb_func_start PlayerHandleDrawPartyStatusSummary
PlayerHandleDrawPartyStatusSummary: @ 803376C
push {r4-r6,lr}
- ldr r1, _08033794 @ =gUnknown_2022BC4
+ ldr r1, _08033794 @ =gBattleBufferA
ldr r0, _08033798 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -10297,10 +10297,10 @@ PlayerHandleDrawPartyStatusSummary: @ 803376C
bl PlayerBufferExecCompleted
b _08033810
.align 2, 0
-_08033794: .4byte gUnknown_2022BC4
+_08033794: .4byte gBattleBufferA
_08033798: .4byte gActiveBattler
_0803379C:
- ldr r6, _08033818 @ =gUnknown_2024018
+ ldr r6, _08033818 @ =gBattleSpritesDataPtr
ldr r0, [r6]
ldr r5, _0803381C @ =gActiveBattler
ldrb r1, [r5]
@@ -10323,8 +10323,8 @@ _0803379C:
subs r4, 0x2
adds r3, r4
ldrb r3, [r3]
- bl sub_8048D14
- ldr r2, _08033824 @ =gUnknown_2024000
+ bl CreatePartyStatusSummarySprites
+ ldr r2, _08033824 @ =gBattlerStatusSummaryTaskId
ldrb r1, [r5]
adds r1, r2
movs r3, 0
@@ -10352,7 +10352,7 @@ _0803379C:
movs r1, 0x5D
strb r1, [r0, 0x5]
_08033804:
- ldr r0, _08033828 @ =gUnknown_3004FE0
+ ldr r0, _08033828 @ =gBattlerControllerFuncs
ldrb r1, [r5]
lsls r1, 2
adds r1, r0
@@ -10363,18 +10363,18 @@ _08033810:
pop {r0}
bx r0
.align 2, 0
-_08033818: .4byte gUnknown_2024018
+_08033818: .4byte gBattleSpritesDataPtr
_0803381C: .4byte gActiveBattler
_08033820: .4byte gUnknown_2022BC8
-_08033824: .4byte gUnknown_2024000
-_08033828: .4byte gUnknown_3004FE0
+_08033824: .4byte gBattlerStatusSummaryTaskId
+_08033828: .4byte gBattlerControllerFuncs
_0803382C: .4byte sub_8033830
thumb_func_end PlayerHandleDrawPartyStatusSummary
thumb_func_start sub_8033830
sub_8033830: @ 8033830
push {r4,lr}
- ldr r4, _08033870 @ =gUnknown_2024018
+ ldr r4, _08033870 @ =gBattleSpritesDataPtr
ldr r0, [r4]
ldr r3, _08033874 @ =gActiveBattler
ldrb r1, [r3]
@@ -10405,14 +10405,14 @@ _08033868:
pop {r0}
bx r0
.align 2, 0
-_08033870: .4byte gUnknown_2024018
+_08033870: .4byte gBattleSpritesDataPtr
_08033874: .4byte gActiveBattler
thumb_func_end sub_8033830
thumb_func_start PlayerHandleCmd49
PlayerHandleCmd49: @ 8033878
push {lr}
- ldr r0, _080338B4 @ =gUnknown_2024018
+ ldr r0, _080338B4 @ =gBattleSpritesDataPtr
ldr r1, [r0]
ldr r0, _080338B8 @ =gActiveBattler
ldrb r3, [r0]
@@ -10427,25 +10427,25 @@ PlayerHandleCmd49: @ 8033878
cmp r0, 0
beq _080338AA
ldr r2, _080338BC @ =gTasks
- ldr r0, _080338C0 @ =gUnknown_2024000
+ ldr r0, _080338C0 @ =gBattlerStatusSummaryTaskId
adds r0, r3, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
- ldr r1, _080338C4 @ =sub_80491B0
+ ldr r1, _080338C4 @ =Task_HidePartyStatusSummary
str r1, [r0]
_080338AA:
bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
-_080338B4: .4byte gUnknown_2024018
+_080338B4: .4byte gBattleSpritesDataPtr
_080338B8: .4byte gActiveBattler
_080338BC: .4byte gTasks
-_080338C0: .4byte gUnknown_2024000
-_080338C4: .4byte sub_80491B0
+_080338C0: .4byte gBattlerStatusSummaryTaskId
+_080338C4: .4byte Task_HidePartyStatusSummary
thumb_func_end PlayerHandleCmd49
thumb_func_start sub_80338C8
@@ -10471,7 +10471,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
push {r4,lr}
ldr r4, _0803393C @ =gActiveBattler
ldrb r0, [r4]
- bl sub_8075224
+ bl IsBattlerSpritePresent
lsls r0, 24
cmp r0, 0
beq _08033932
@@ -10484,7 +10484,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
adds r2, r0
lsls r2, 2
adds r2, r3
- ldr r0, _08033948 @ =gUnknown_2022BC4
+ ldr r0, _08033948 @ =gBattleBufferA
lsls r1, 9
adds r0, 0x1
adds r1, r0
@@ -10510,7 +10510,7 @@ _08033932:
_0803393C: .4byte gActiveBattler
_08033940: .4byte gSprites
_08033944: .4byte gBattlerSpriteIds
-_08033948: .4byte gUnknown_2022BC4
+_08033948: .4byte gBattleBufferA
thumb_func_end PlayerHandleSpriteInvisibility
thumb_func_start PlayerHandleBattleAnimation
@@ -10523,7 +10523,7 @@ PlayerHandleBattleAnimation: @ 803394C
lsls r0, 24
cmp r0, 0
bne _080339A4
- ldr r5, _08033994 @ =gUnknown_2022BC4
+ ldr r5, _08033994 @ =gBattleBufferA
ldrb r2, [r6]
lsls r1, r2, 9
adds r0, r5, 0x1
@@ -10548,9 +10548,9 @@ PlayerHandleBattleAnimation: @ 803394C
b _080339A4
.align 2, 0
_08033990: .4byte gActiveBattler
-_08033994: .4byte gUnknown_2022BC4
+_08033994: .4byte gBattleBufferA
_08033998:
- ldr r0, _080339AC @ =gUnknown_3004FE0
+ ldr r0, _080339AC @ =gBattlerControllerFuncs
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -10562,14 +10562,14 @@ _080339A4:
pop {r0}
bx r0
.align 2, 0
-_080339AC: .4byte gUnknown_3004FE0
+_080339AC: .4byte gBattlerControllerFuncs
_080339B0: .4byte CompleteOnFinishedBattleAnimation
thumb_func_end PlayerHandleBattleAnimation
thumb_func_start PlayerHandleLinkStandbyMsg
PlayerHandleLinkStandbyMsg: @ 80339B4
push {r4,lr}
- ldr r1, _080339D4 @ =gUnknown_2022BC4
+ ldr r1, _080339D4 @ =gBattleBufferA
ldr r0, _080339D8 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -10584,7 +10584,7 @@ PlayerHandleLinkStandbyMsg: @ 80339B4
beq _080339E2
b _08033A04
.align 2, 0
-_080339D4: .4byte gUnknown_2022BC4
+_080339D4: .4byte gBattleBufferA
_080339D8: .4byte gActiveBattler
_080339DC:
cmp r0, 0x2
@@ -10615,7 +10615,7 @@ _08033A04:
thumb_func_start PlayerHandleResetActionMoveSelection
PlayerHandleResetActionMoveSelection: @ 8033A10
push {r4,lr}
- ldr r1, _08033A30 @ =gUnknown_2022BC4
+ ldr r1, _08033A30 @ =gBattleBufferA
ldr r4, _08033A34 @ =gActiveBattler
ldrb r3, [r4]
lsls r0, r3, 9
@@ -10630,31 +10630,31 @@ PlayerHandleResetActionMoveSelection: @ 8033A10
beq _08033A3E
b _08033A68
.align 2, 0
-_08033A30: .4byte gUnknown_2022BC4
+_08033A30: .4byte gBattleBufferA
_08033A34: .4byte gActiveBattler
_08033A38:
cmp r2, 0x2
beq _08033A60
b _08033A68
_08033A3E:
- ldr r0, _08033A50 @ =gUnknown_2023FF8
+ ldr r0, _08033A50 @ =gActionSelectionCursor
adds r0, r3, r0
strb r2, [r0]
- ldr r1, _08033A54 @ =gUnknown_2023FFC
+ ldr r1, _08033A54 @ =gMoveSelectionCursor
ldrb r0, [r4]
adds r0, r1
strb r2, [r0]
b _08033A68
.align 2, 0
-_08033A50: .4byte gUnknown_2023FF8
-_08033A54: .4byte gUnknown_2023FFC
+_08033A50: .4byte gActionSelectionCursor
+_08033A54: .4byte gMoveSelectionCursor
_08033A58:
- ldr r0, _08033A5C @ =gUnknown_2023FF8
+ ldr r0, _08033A5C @ =gActionSelectionCursor
b _08033A62
.align 2, 0
-_08033A5C: .4byte gUnknown_2023FF8
+_08033A5C: .4byte gActionSelectionCursor
_08033A60:
- ldr r0, _08033A74 @ =gUnknown_2023FFC
+ ldr r0, _08033A74 @ =gMoveSelectionCursor
_08033A62:
adds r0, r3, r0
movs r1, 0
@@ -10665,14 +10665,14 @@ _08033A68:
pop {r0}
bx r0
.align 2, 0
-_08033A74: .4byte gUnknown_2023FFC
+_08033A74: .4byte gMoveSelectionCursor
thumb_func_end PlayerHandleResetActionMoveSelection
thumb_func_start PlayerHandlecmd55
PlayerHandlecmd55: @ 8033A78
push {r4,lr}
ldr r2, _08033AB0 @ =gBattleOutcome
- ldr r1, _08033AB4 @ =gUnknown_2022BC4
+ ldr r1, _08033AB4 @ =gBattleBufferA
ldr r4, _08033AB8 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 9
@@ -10685,7 +10685,7 @@ PlayerHandlecmd55: @ 8033A78
movs r0, 0x3
bl BeginFastPaletteFade
bl PlayerBufferExecCompleted
- ldr r1, _08033ABC @ =gUnknown_3004FE0
+ ldr r1, _08033ABC @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -10696,9 +10696,9 @@ PlayerHandlecmd55: @ 8033A78
bx r0
.align 2, 0
_08033AB0: .4byte gBattleOutcome
-_08033AB4: .4byte gUnknown_2022BC4
+_08033AB4: .4byte gBattleBufferA
_08033AB8: .4byte gActiveBattler
-_08033ABC: .4byte gUnknown_3004FE0
+_08033ABC: .4byte gBattlerControllerFuncs
_08033AC0: .4byte sub_802F6A8
thumb_func_end PlayerHandlecmd55
@@ -10726,7 +10726,7 @@ _08033ADE:
lsls r2, r1, 9
ldr r0, _08033B1C @ =gUnknown_2022BC8
adds r2, r0
- ldr r0, _08033B20 @ =gUnknown_2023FFC
+ ldr r0, _08033B20 @ =gMoveSelectionCursor
adds r1, r0
ldrb r0, [r1]
lsls r0, 1
@@ -10751,7 +10751,7 @@ _08033ADE:
_08033B14: .4byte gBattleTypeFlags
_08033B18: .4byte gActiveBattler
_08033B1C: .4byte gUnknown_2022BC8
-_08033B20: .4byte gUnknown_2023FFC
+_08033B20: .4byte gMoveSelectionCursor
_08033B24:
ldr r1, _08033B40 @ =gBattleMoves
lsls r0, r4, 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 21:40:00 +0000