summaryrefslogtreecommitdiff
path: root/asm/battle_controller_opponent.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/battle_controller_opponent.s')
-rw-r--r--asm/battle_controller_opponent.s958
1 files changed, 479 insertions, 479 deletions
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index e73268b38..635aae83a 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -13,7 +13,7 @@ nullsub_17: @ 8035A78
thumb_func_start sub_8035A7C
sub_8035A7C: @ 8035A7C
ldr r1, _08035A8C @ =gUnknown_3004FE0
- ldr r0, _08035A90 @ =gUnknown_2023BC4
+ ldr r0, _08035A90 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -22,7 +22,7 @@ sub_8035A7C: @ 8035A7C
bx lr
.align 2, 0
_08035A8C: .4byte gUnknown_3004FE0
-_08035A90: .4byte gUnknown_2023BC4
+_08035A90: .4byte gActiveBattler
_08035A94: .4byte sub_8035A98
thumb_func_end sub_8035A7C
@@ -30,8 +30,8 @@ _08035A94: .4byte sub_8035A98
sub_8035A98: @ 8035A98
push {lr}
ldr r2, _08035ACC @ =gUnknown_2023BC8
- ldr r1, _08035AD0 @ =gUnknown_825E45C
- ldr r0, _08035AD4 @ =gUnknown_2023BC4
+ ldr r1, _08035AD0 @ =gBitTable
+ ldr r0, _08035AD4 @ =gActiveBattler
ldrb r3, [r0]
lsls r0, r3, 2
adds r0, r1
@@ -55,8 +55,8 @@ sub_8035A98: @ 8035A98
b _08035AE4
.align 2, 0
_08035ACC: .4byte gUnknown_2023BC8
-_08035AD0: .4byte gUnknown_825E45C
-_08035AD4: .4byte gUnknown_2023BC4
+_08035AD0: .4byte gBitTable
+_08035AD4: .4byte gActiveBattler
_08035AD8: .4byte gUnknown_2022BC4
_08035ADC: .4byte gUnknown_8250A34
_08035AE0:
@@ -71,7 +71,7 @@ sub_8035AE8: @ 8035AE8
push {lr}
ldr r2, _08035B10 @ =gSprites
ldr r1, _08035B14 @ =gUnknown_2023D44
- ldr r0, _08035B18 @ =gUnknown_2023BC4
+ ldr r0, _08035B18 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -91,7 +91,7 @@ _08035B0C:
.align 2, 0
_08035B10: .4byte gSprites
_08035B14: .4byte gUnknown_2023D44
-_08035B18: .4byte gUnknown_2023BC4
+_08035B18: .4byte gActiveBattler
_08035B1C: .4byte SpriteCallbackDummy
thumb_func_end sub_8035AE8
@@ -100,7 +100,7 @@ sub_8035B20: @ 8035B20
push {lr}
ldr r2, _08035B48 @ =gSprites
ldr r1, _08035B4C @ =gUnknown_2023D44
- ldr r0, _08035B50 @ =gUnknown_2023BC4
+ ldr r0, _08035B50 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -120,7 +120,7 @@ _08035B44:
.align 2, 0
_08035B48: .4byte gSprites
_08035B4C: .4byte gUnknown_2023D44
-_08035B50: .4byte gUnknown_2023BC4
+_08035B50: .4byte gActiveBattler
_08035B54: .4byte SpriteCallbackDummy
thumb_func_end sub_8035B20
@@ -129,7 +129,7 @@ sub_8035B58: @ 8035B58
push {r4-r6,lr}
ldr r4, _08035BD0 @ =gSprites
ldr r6, _08035BD4 @ =gUnknown_2023D44
- ldr r5, _08035BD8 @ =gUnknown_2023BC4
+ ldr r5, _08035BD8 @ =gActiveBattler
ldrb r0, [r5]
adds r0, r6
ldrb r1, [r0]
@@ -185,7 +185,7 @@ _08035BC8:
.align 2, 0
_08035BD0: .4byte gSprites
_08035BD4: .4byte gUnknown_2023D44
-_08035BD8: .4byte gUnknown_2023BC4
+_08035BD8: .4byte gActiveBattler
_08035BDC: .4byte SpriteCallbackDummy
_08035BE0: .4byte 0x000003ff
_08035BE4: .4byte 0xfffffc00
@@ -196,7 +196,7 @@ sub_8035BE8: @ 8035BE8
push {r4,lr}
ldr r4, _08035C28 @ =gUnknown_2024018
ldr r1, [r4]
- ldr r3, _08035C2C @ =gUnknown_2023BC4
+ ldr r3, _08035C2C @ =gActiveBattler
ldrb r0, [r3]
ldr r2, [r1, 0x4]
lsls r1, r0, 1
@@ -226,7 +226,7 @@ _08035C20:
bx r0
.align 2, 0
_08035C28: .4byte gUnknown_2024018
-_08035C2C: .4byte gUnknown_2023BC4
+_08035C2C: .4byte gActiveBattler
thumb_func_end sub_8035BE8
thumb_func_start sub_8035C30
@@ -241,7 +241,7 @@ sub_8035C30: @ 8035C30
lsls r0, 24
cmp r0, 0
beq _08035C88
- ldr r0, _08035C74 @ =gUnknown_2022B4C
+ ldr r0, _08035C74 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -250,7 +250,7 @@ sub_8035C30: @ 8035C30
_08035C54:
ldr r2, _08035C78 @ =gSprites
ldr r1, _08035C7C @ =gUnknown_3004FF0
- ldr r0, _08035C80 @ =gUnknown_2023BC4
+ ldr r0, _08035C80 @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -265,15 +265,15 @@ _08035C54:
bne _08035CBE
b _08035CBC
.align 2, 0
-_08035C74: .4byte gUnknown_2022B4C
+_08035C74: .4byte gBattleTypeFlags
_08035C78: .4byte gSprites
_08035C7C: .4byte gUnknown_3004FF0
-_08035C80: .4byte gUnknown_2023BC4
+_08035C80: .4byte gActiveBattler
_08035C84: .4byte SpriteCallbackDummy
_08035C88:
ldr r2, _08035D84 @ =gSprites
ldr r5, _08035D88 @ =gUnknown_3004FF0
- ldr r0, _08035D8C @ =gUnknown_2023BC4
+ ldr r0, _08035D8C @ =gActiveBattler
ldrb r3, [r0]
adds r0, r3, r5
ldrb r1, [r0]
@@ -313,7 +313,7 @@ _08035CD0:
ldr r0, _08035D94 @ =gUnknown_2024018
mov r12, r0
ldr r0, [r0]
- ldr r7, _08035D8C @ =gUnknown_2023BC4
+ ldr r7, _08035D8C @ =gActiveBattler
ldrb r2, [r7]
ldr r3, [r0, 0x4]
lsls r0, r2, 1
@@ -388,7 +388,7 @@ _08035CD0:
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
- ldr r0, _08035D9C @ =gUnknown_2022B4C
+ ldr r0, _08035D9C @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -400,11 +400,11 @@ _08035CD0:
.align 2, 0
_08035D84: .4byte gSprites
_08035D88: .4byte gUnknown_3004FF0
-_08035D8C: .4byte gUnknown_2023BC4
+_08035D8C: .4byte gActiveBattler
_08035D90: .4byte SpriteCallbackDummy
_08035D94: .4byte gUnknown_2024018
_08035D98: .4byte 0x000027f9
-_08035D9C: .4byte gUnknown_2022B4C
+_08035D9C: .4byte gBattleTypeFlags
_08035DA0: .4byte gMPlay_BGM
_08035DA4:
ldr r0, _08035DD8 @ =gMPlay_BGM
@@ -415,7 +415,7 @@ _08035DA4:
_08035DB0:
ldr r0, _08035DE0 @ =gUnknown_2024018
ldr r0, [r0]
- ldr r3, _08035DE4 @ =gUnknown_2023BC4
+ ldr r3, _08035DE4 @ =gActiveBattler
ldrb r1, [r3]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -438,7 +438,7 @@ _08035DD2:
_08035DD8: .4byte gMPlay_BGM
_08035DDC: .4byte 0x0000ffff
_08035DE0: .4byte gUnknown_2024018
-_08035DE4: .4byte gUnknown_2023BC4
+_08035DE4: .4byte gActiveBattler
_08035DE8: .4byte gUnknown_3004FE0
_08035DEC: .4byte sub_8035BE8
thumb_func_end sub_8035C30
@@ -451,7 +451,7 @@ sub_8035DF0: @ 8035DF0
push {r6,r7}
ldr r4, _08035FC0 @ =gUnknown_2024018
ldr r0, [r4]
- ldr r1, _08035FC4 @ =gUnknown_2023BC4
+ ldr r1, _08035FC4 @ =gActiveBattler
mov r9, r1
ldrb r2, [r1]
ldr r1, [r0, 0x4]
@@ -465,12 +465,12 @@ sub_8035DF0: @ 8035DF0
ands r0, r1
cmp r0, 0
bne _08035E2C
- ldr r0, _08035FC8 @ =gUnknown_2023BCE
+ ldr r0, _08035FC8 @ =gBattlerPartyIndexes
adds r0, r3, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _08035FCC @ =gUnknown_202402C
+ ldr r0, _08035FCC @ =gEnemyParty
adds r1, r0
adds r0, r2, 0
bl sub_80F1720
@@ -491,12 +491,12 @@ _08035E2C:
ands r0, r1
cmp r0, 0
bne _08035E60
- ldr r0, _08035FC8 @ =gUnknown_2023BCE
+ ldr r0, _08035FC8 @ =gBattlerPartyIndexes
adds r0, r3, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _08035FCC @ =gUnknown_202402C
+ ldr r0, _08035FCC @ =gEnemyParty
adds r1, r0
adds r0, r2, 0
bl sub_80F1720
@@ -534,7 +534,7 @@ _08035E96:
lsls r0, 24
cmp r0, 0
beq _08035F28
- ldr r0, _08035FD0 @ =gUnknown_2022B4C
+ ldr r0, _08035FD0 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -559,14 +559,14 @@ _08035E96:
eors r1, r0
adds r0, r1, r4
ldrb r0, [r0]
- ldr r2, _08035FC8 @ =gUnknown_2023BCE
+ ldr r2, _08035FC8 @ =gBattlerPartyIndexes
mov r8, r2
lsls r1, 1
add r1, r8
ldrh r1, [r1]
movs r6, 0x64
muls r1, r6
- ldr r5, _08035FCC @ =gUnknown_202402C
+ ldr r5, _08035FCC @ =gEnemyParty
adds r1, r5
movs r2, 0
bl UpdateHealthboxAttribute
@@ -598,7 +598,7 @@ _08035E96:
bl SetBankEnemyShadowSpriteCallback
_08035F28:
ldr r1, _08035FD4 @ =gUnknown_3004FFC
- ldr r5, _08035FC4 @ =gUnknown_2023BC4
+ ldr r5, _08035FC4 @ =gActiveBattler
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -612,7 +612,7 @@ _08035F28:
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
- ldr r2, _08035FC8 @ =gUnknown_2023BCE
+ ldr r2, _08035FC8 @ =gBattlerPartyIndexes
mov r9, r2
lsls r1, 1
add r1, r9
@@ -622,7 +622,7 @@ _08035F28:
mov r2, r8
muls r2, r1
adds r1, r2, 0
- ldr r6, _08035FCC @ =gUnknown_202402C
+ ldr r6, _08035FCC @ =gEnemyParty
adds r1, r6
movs r2, 0
bl UpdateHealthboxAttribute
@@ -670,10 +670,10 @@ _08035FB4:
bx r0
.align 2, 0
_08035FC0: .4byte gUnknown_2024018
-_08035FC4: .4byte gUnknown_2023BC4
-_08035FC8: .4byte gUnknown_2023BCE
-_08035FCC: .4byte gUnknown_202402C
-_08035FD0: .4byte gUnknown_2022B4C
+_08035FC4: .4byte gActiveBattler
+_08035FC8: .4byte gBattlerPartyIndexes
+_08035FCC: .4byte gEnemyParty
+_08035FD0: .4byte gBattleTypeFlags
_08035FD4: .4byte gUnknown_3004FFC
_08035FD8: .4byte gSprites
_08035FDC: .4byte gUnknown_3004FF0
@@ -686,7 +686,7 @@ sub_8035FE8: @ 8035FE8
push {r4-r7,lr}
ldr r2, _08036044 @ =gSprites
ldr r0, _08036048 @ =gUnknown_2023D44
- ldr r7, _0803604C @ =gUnknown_2023BC4
+ ldr r7, _0803604C @ =gActiveBattler
ldrb r3, [r7]
adds r0, r3, r0
ldrb r1, [r0]
@@ -717,12 +717,12 @@ sub_8035FE8: @ 8035FE8
ands r0, r5
cmp r0, 0
bne _0803605C
- ldr r0, _08036054 @ =gUnknown_2023BCE
+ ldr r0, _08036054 @ =gBattlerPartyIndexes
adds r0, r4, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _08036058 @ =gUnknown_202402C
+ ldr r0, _08036058 @ =gEnemyParty
adds r1, r0
adds r0, r3, 0
bl sub_80F1720
@@ -730,10 +730,10 @@ sub_8035FE8: @ 8035FE8
.align 2, 0
_08036044: .4byte gSprites
_08036048: .4byte gUnknown_2023D44
-_0803604C: .4byte gUnknown_2023BC4
+_0803604C: .4byte gActiveBattler
_08036050: .4byte gUnknown_2024018
-_08036054: .4byte gUnknown_2023BCE
-_08036058: .4byte gUnknown_202402C
+_08036054: .4byte gBattlerPartyIndexes
+_08036058: .4byte gEnemyParty
_0803605C:
ldrb r0, [r1, 0x1]
ands r2, r0
@@ -771,7 +771,7 @@ _0803609C: .4byte 0x000027f9
thumb_func_start sub_80360A0
sub_80360A0: @ 80360A0
push {r4-r6,lr}
- ldr r6, _080360E0 @ =gUnknown_2023BC4
+ ldr r6, _080360E0 @ =gActiveBattler
ldrb r0, [r6]
ldr r5, _080360E4 @ =gUnknown_3004FF0
adds r1, r0, r5
@@ -799,7 +799,7 @@ sub_80360A0: @ 80360A0
bl sub_8048440
b _08036124
.align 2, 0
-_080360E0: .4byte gUnknown_2023BC4
+_080360E0: .4byte gActiveBattler
_080360E4: .4byte gUnknown_3004FF0
_080360E8:
movs r0, 0x1
@@ -807,7 +807,7 @@ _080360E8:
lsls r0, 24
cmp r0, 0
bne _08036120
- ldr r0, _08036114 @ =gUnknown_2022B4C
+ ldr r0, _08036114 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x10
ands r0, r1
@@ -823,7 +823,7 @@ _080360E8:
str r0, [r1]
b _08036124
.align 2, 0
-_08036114: .4byte gUnknown_2022B4C
+_08036114: .4byte gBattleTypeFlags
_08036118: .4byte gUnknown_3004FE0
_0803611C: .4byte sub_80E8570
_08036120:
@@ -839,7 +839,7 @@ sub_803612C: @ 803612C
push {lr}
ldr r2, _08036160 @ =gSprites
ldr r0, _08036164 @ =gUnknown_2023D44
- ldr r1, _08036168 @ =gUnknown_2023BC4
+ ldr r1, _08036168 @ =gActiveBattler
ldrb r3, [r1]
adds r0, r3, r0
ldrb r1, [r0]
@@ -863,7 +863,7 @@ _0803615A:
.align 2, 0
_08036160: .4byte gSprites
_08036164: .4byte gUnknown_2023D44
-_08036168: .4byte gUnknown_2023BC4
+_08036168: .4byte gActiveBattler
_0803616C: .4byte gUnknown_3004FF0
thumb_func_end sub_803612C
@@ -872,7 +872,7 @@ sub_8036170: @ 8036170
push {r4-r6,lr}
ldr r0, _080361D0 @ =gUnknown_2024018
ldr r0, [r0]
- ldr r6, _080361D4 @ =gUnknown_2023BC4
+ ldr r6, _080361D4 @ =gActiveBattler
ldrb r2, [r6]
ldr r1, [r0, 0x4]
lsls r0, r2, 1
@@ -915,7 +915,7 @@ _080361CA:
bx r0
.align 2, 0
_080361D0: .4byte gUnknown_2024018
-_080361D4: .4byte gUnknown_2023BC4
+_080361D4: .4byte gActiveBattler
_080361D8: .4byte gUnknown_2023D44
_080361DC: .4byte gSprites
_080361E0: .4byte gUnknown_3004FF0
@@ -939,7 +939,7 @@ _080361F6:
sub_80361FC: @ 80361FC
push {r4,lr}
ldr r1, _08036238 @ =gUnknown_2023D44
- ldr r0, _0803623C @ =gUnknown_2023BC4
+ ldr r0, _0803623C @ =gActiveBattler
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -967,7 +967,7 @@ sub_80361FC: @ 80361FC
b _08036272
.align 2, 0
_08036238: .4byte gUnknown_2023D44
-_0803623C: .4byte gUnknown_2023BC4
+_0803623C: .4byte gActiveBattler
_08036240: .4byte gSprites
_08036244: .4byte gUnknown_2024005
_08036248:
@@ -1004,7 +1004,7 @@ sub_8036278: @ 8036278
push {r4,lr}
ldr r2, _080362CC @ =gSprites
ldr r0, _080362D0 @ =gUnknown_3004FF0
- ldr r4, _080362D4 @ =gUnknown_2023BC4
+ ldr r4, _080362D4 @ =gActiveBattler
ldrb r3, [r4]
adds r0, r3, r0
ldrb r1, [r0]
@@ -1046,7 +1046,7 @@ _080362C4:
.align 2, 0
_080362CC: .4byte gSprites
_080362D0: .4byte gUnknown_3004FF0
-_080362D4: .4byte gUnknown_2023BC4
+_080362D4: .4byte gActiveBattler
_080362D8: .4byte SpriteCallbackDummy
_080362DC: .4byte gUnknown_2024018
_080362E0: .4byte gUnknown_3004FE0
@@ -1058,7 +1058,7 @@ sub_80362E8: @ 80362E8
push {lr}
ldr r0, _08036324 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _08036328 @ =gUnknown_2023BC4
+ ldr r0, _08036328 @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -1085,7 +1085,7 @@ _08036320:
bx r0
.align 2, 0
_08036324: .4byte gUnknown_2024018
-_08036328: .4byte gUnknown_2023BC4
+_08036328: .4byte gActiveBattler
_0803632C: .4byte gMPlay_BGM
_08036330: .4byte 0x0000ffff
thumb_func_end sub_80362E8
@@ -1095,7 +1095,7 @@ sub_8036334: @ 8036334
push {r4,r5,lr}
ldr r3, _080363E0 @ =gUnknown_2024018
ldr r0, [r3]
- ldr r5, _080363E4 @ =gUnknown_2023BC4
+ ldr r5, _080363E4 @ =gActiveBattler
ldrb r1, [r5]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -1143,13 +1143,13 @@ sub_8036334: @ 8036334
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
- ldr r2, _080363F8 @ =gUnknown_2023BCE
+ ldr r2, _080363F8 @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, _080363FC @ =gUnknown_202402C
+ ldr r2, _080363FC @ =gEnemyParty
adds r1, r2
movs r2, 0
bl UpdateHealthboxAttribute
@@ -1173,13 +1173,13 @@ _080363D8:
bx r0
.align 2, 0
_080363E0: .4byte gUnknown_2024018
-_080363E4: .4byte gUnknown_2023BC4
+_080363E4: .4byte gActiveBattler
_080363E8: .4byte 0x000027f9
_080363EC: .4byte gUnknown_2023D44
_080363F0: .4byte gSprites
_080363F4: .4byte gUnknown_3004FF0
-_080363F8: .4byte gUnknown_2023BCE
-_080363FC: .4byte gUnknown_202402C
+_080363F8: .4byte gBattlerPartyIndexes
+_080363FC: .4byte gEnemyParty
_08036400: .4byte gUnknown_3004FE0
_08036404: .4byte sub_8036278
thumb_func_end sub_8036334
@@ -1189,7 +1189,7 @@ sub_8036408: @ 8036408
push {r4-r6,lr}
ldr r6, _080364AC @ =gUnknown_2024018
ldr r0, [r6]
- ldr r5, _080364B0 @ =gUnknown_2023BC4
+ ldr r5, _080364B0 @ =gActiveBattler
ldrb r2, [r5]
ldr r1, [r0, 0x4]
lsls r3, r2, 1
@@ -1201,12 +1201,12 @@ sub_8036408: @ 8036408
ands r0, r1
cmp r0, 0
bne _0803643A
- ldr r0, _080364B4 @ =gUnknown_2023BCE
+ ldr r0, _080364B4 @ =gBattlerPartyIndexes
adds r0, r3, r0
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
- ldr r0, _080364B8 @ =gUnknown_202402C
+ ldr r0, _080364B8 @ =gEnemyParty
adds r1, r0
adds r0, r2, 0
bl sub_80F1720
@@ -1240,13 +1240,13 @@ _0803643A:
adds r0, r3, r4
bl DestroySprite
ldrb r4, [r5]
- ldr r1, _080364B4 @ =gUnknown_2023BCE
+ ldr r1, _080364B4 @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _080364B8 @ =gUnknown_202402C
+ ldr r1, _080364B8 @ =gEnemyParty
adds r0, r1
movs r1, 0xB
bl GetMonData
@@ -1267,9 +1267,9 @@ _080364A4:
bx r0
.align 2, 0
_080364AC: .4byte gUnknown_2024018
-_080364B0: .4byte gUnknown_2023BC4
-_080364B4: .4byte gUnknown_2023BCE
-_080364B8: .4byte gUnknown_202402C
+_080364B0: .4byte gActiveBattler
+_080364B4: .4byte gBattlerPartyIndexes
+_080364B8: .4byte gEnemyParty
_080364BC: .4byte gSprites
_080364C0: .4byte gUnknown_3004FFC
_080364C4: .4byte SpriteCallbackDummy
@@ -1282,7 +1282,7 @@ sub_80364D0: @ 80364D0
push {lr}
ldr r0, _080364F8 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _080364FC @ =gUnknown_2023BC4
+ ldr r0, _080364FC @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -1300,7 +1300,7 @@ _080364F2:
bx r0
.align 2, 0
_080364F8: .4byte gUnknown_2024018
-_080364FC: .4byte gUnknown_2023BC4
+_080364FC: .4byte gActiveBattler
thumb_func_end sub_80364D0
thumb_func_start sub_8036500
@@ -1308,7 +1308,7 @@ sub_8036500: @ 8036500
push {lr}
ldr r0, _08036528 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _0803652C @ =gUnknown_2023BC4
+ ldr r0, _0803652C @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -1326,20 +1326,20 @@ _08036522:
bx r0
.align 2, 0
_08036528: .4byte gUnknown_2024018
-_0803652C: .4byte gUnknown_2023BC4
+_0803652C: .4byte gActiveBattler
thumb_func_end sub_8036500
thumb_func_start OpponentBufferExecCompleted
OpponentBufferExecCompleted: @ 8036530
ldr r1, _08036554 @ =gUnknown_3004FE0
- ldr r2, _08036558 @ =gUnknown_2023BC4
+ ldr r2, _08036558 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
ldr r1, _0803655C @ =sub_8035A98
str r1, [r0]
ldr r3, _08036560 @ =gUnknown_2023BC8
- ldr r1, _08036564 @ =gUnknown_825E45C
+ ldr r1, _08036564 @ =gBitTable
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -1350,10 +1350,10 @@ OpponentBufferExecCompleted: @ 8036530
bx lr
.align 2, 0
_08036554: .4byte gUnknown_3004FE0
-_08036558: .4byte gUnknown_2023BC4
+_08036558: .4byte gActiveBattler
_0803655C: .4byte sub_8035A98
_08036560: .4byte gUnknown_2023BC8
-_08036564: .4byte gUnknown_825E45C
+_08036564: .4byte gBitTable
thumb_func_end OpponentBufferExecCompleted
thumb_func_start OpponentHandleGetAttributes
@@ -1362,7 +1362,7 @@ OpponentHandleGetAttributes: @ 8036568
sub sp, 0x100
movs r6, 0
ldr r1, _08036594 @ =gUnknown_2022BC4
- ldr r0, _08036598 @ =gUnknown_2023BC4
+ ldr r0, _08036598 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x2
@@ -1370,7 +1370,7 @@ OpponentHandleGetAttributes: @ 8036568
ldrb r0, [r1]
cmp r0, 0
bne _080365A0
- ldr r0, _0803659C @ =gUnknown_2023BCE
+ ldr r0, _0803659C @ =gBattlerPartyIndexes
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
@@ -1380,8 +1380,8 @@ OpponentHandleGetAttributes: @ 8036568
b _080365C2
.align 2, 0
_08036594: .4byte gUnknown_2022BC4
-_08036598: .4byte gUnknown_2023BC4
-_0803659C: .4byte gUnknown_2023BCE
+_08036598: .4byte gActiveBattler
+_0803659C: .4byte gBattlerPartyIndexes
_080365A0:
ldrb r4, [r1]
movs r5, 0
@@ -1427,7 +1427,7 @@ sub_80365DC: @ 80365DC
lsrs r5, r0, 24
movs r6, 0
ldr r2, _08036610 @ =gUnknown_2022BC4
- ldr r3, _08036614 @ =gUnknown_2023BC4
+ ldr r3, _08036614 @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
adds r1, r2, 0x1
@@ -1444,7 +1444,7 @@ _08036606:
mov pc, r0
.align 2, 0
_08036610: .4byte gUnknown_2022BC4
-_08036614: .4byte gUnknown_2023BC4
+_08036614: .4byte gActiveBattler
_08036618: .4byte _0803661C
.align 2, 0
_0803661C:
@@ -1512,7 +1512,7 @@ _0803670C:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08036920 @ =gUnknown_202402C
+ ldr r0, _08036920 @ =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
@@ -1565,7 +1565,7 @@ _08036758:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08036920 @ =gUnknown_202402C
+ ldr r0, _08036920 @ =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
@@ -1749,28 +1749,28 @@ _08036910:
bls _08036910
b _08036D72
.align 2, 0
-_08036920: .4byte gUnknown_202402C
+_08036920: .4byte gEnemyParty
_08036924: .4byte 0xfffffc1f
_08036928: .4byte 0xfff07fff
_0803692C: .4byte 0xfffffe0f
_08036930:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803693C @ =gUnknown_202402C
+ ldr r1, _0803693C @ =gEnemyParty
adds r0, r1
movs r1, 0xB
b _08036CAA
.align 2, 0
-_0803693C: .4byte gUnknown_202402C
+_0803693C: .4byte gEnemyParty
_08036940:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803694C @ =gUnknown_202402C
+ ldr r1, _0803694C @ =gEnemyParty
adds r0, r1
movs r1, 0xC
b _08036CAA
.align 2, 0
-_0803694C: .4byte gUnknown_202402C
+_0803694C: .4byte gEnemyParty
_08036950:
movs r6, 0
add r2, sp, 0x58
@@ -1780,7 +1780,7 @@ _08036950:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, _080369B4 @ =gUnknown_202402C
+ ldr r0, _080369B4 @ =gEnemyParty
adds r4, r1, r0
mov r8, r9
_08036966:
@@ -1804,7 +1804,7 @@ _08036966:
ble _08036966
movs r0, 0x64
muls r0, r5
- ldr r1, _080369B4 @ =gUnknown_202402C
+ ldr r1, _080369B4 @ =gEnemyParty
adds r0, r1
movs r1, 0x15
bl GetMonData
@@ -1822,11 +1822,11 @@ _080369A4:
bls _080369A4
b _08036D72
.align 2, 0
-_080369B4: .4byte gUnknown_202402C
+_080369B4: .4byte gEnemyParty
_080369B8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080369D0 @ =gUnknown_202402C
+ ldr r1, _080369D0 @ =gEnemyParty
adds r0, r1
ldrb r1, [r3]
lsls r1, 9
@@ -1836,13 +1836,13 @@ _080369B8:
adds r1, 0x9
b _08036CAA
.align 2, 0
-_080369D0: .4byte gUnknown_202402C
+_080369D0: .4byte gEnemyParty
_080369D4:
movs r6, 0
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r2, _08036A0C @ =gUnknown_202402C
+ ldr r2, _08036A0C @ =gEnemyParty
mov r8, r2
_080369E0:
adds r1, r6, 0
@@ -1857,7 +1857,7 @@ _080369E0:
ble _080369E0
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A0C @ =gUnknown_202402C
+ ldr r1, _08036A0C @ =gEnemyParty
adds r0, r1
movs r1, 0x15
bl GetMonData
@@ -1866,11 +1866,11 @@ _080369E0:
adds r6, 0x1
b _08036D72
.align 2, 0
-_08036A0C: .4byte gUnknown_202402C
+_08036A0C: .4byte gEnemyParty
_08036A10:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A28 @ =gUnknown_202402C
+ ldr r1, _08036A28 @ =gEnemyParty
adds r0, r1
ldrb r1, [r3]
lsls r1, 9
@@ -1880,20 +1880,20 @@ _08036A10:
adds r1, 0x8
b _08036D6A
.align 2, 0
-_08036A28: .4byte gUnknown_202402C
+_08036A28: .4byte gEnemyParty
_08036A2C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A38 @ =gUnknown_202402C
+ ldr r1, _08036A38 @ =gEnemyParty
adds r0, r1
movs r1, 0x1
b _08036A46
.align 2, 0
-_08036A38: .4byte gUnknown_202402C
+_08036A38: .4byte gEnemyParty
_08036A3C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A68 @ =gUnknown_202402C
+ ldr r1, _08036A68 @ =gEnemyParty
adds r0, r1
movs r1, 0x19
_08036A46:
@@ -1913,120 +1913,120 @@ _08036A46:
movs r6, 0x3
b _08036D72
.align 2, 0
-_08036A68: .4byte gUnknown_202402C
+_08036A68: .4byte gEnemyParty
_08036A6C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A78 @ =gUnknown_202402C
+ ldr r1, _08036A78 @ =gEnemyParty
adds r0, r1
movs r1, 0x1A
b _08036D6A
.align 2, 0
-_08036A78: .4byte gUnknown_202402C
+_08036A78: .4byte gEnemyParty
_08036A7C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A88 @ =gUnknown_202402C
+ ldr r1, _08036A88 @ =gEnemyParty
adds r0, r1
movs r1, 0x1B
b _08036D6A
.align 2, 0
-_08036A88: .4byte gUnknown_202402C
+_08036A88: .4byte gEnemyParty
_08036A8C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036A98 @ =gUnknown_202402C
+ ldr r1, _08036A98 @ =gEnemyParty
adds r0, r1
movs r1, 0x1C
b _08036D6A
.align 2, 0
-_08036A98: .4byte gUnknown_202402C
+_08036A98: .4byte gEnemyParty
_08036A9C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036AA8 @ =gUnknown_202402C
+ ldr r1, _08036AA8 @ =gEnemyParty
adds r0, r1
movs r1, 0x1D
b _08036D6A
.align 2, 0
-_08036AA8: .4byte gUnknown_202402C
+_08036AA8: .4byte gEnemyParty
_08036AAC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036AB8 @ =gUnknown_202402C
+ ldr r1, _08036AB8 @ =gEnemyParty
adds r0, r1
movs r1, 0x1E
b _08036D6A
.align 2, 0
-_08036AB8: .4byte gUnknown_202402C
+_08036AB8: .4byte gEnemyParty
_08036ABC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036AC8 @ =gUnknown_202402C
+ ldr r1, _08036AC8 @ =gEnemyParty
adds r0, r1
movs r1, 0x1F
b _08036D6A
.align 2, 0
-_08036AC8: .4byte gUnknown_202402C
+_08036AC8: .4byte gEnemyParty
_08036ACC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036AD8 @ =gUnknown_202402C
+ ldr r1, _08036AD8 @ =gEnemyParty
adds r0, r1
movs r1, 0x20
b _08036D6A
.align 2, 0
-_08036AD8: .4byte gUnknown_202402C
+_08036AD8: .4byte gEnemyParty
_08036ADC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036AE8 @ =gUnknown_202402C
+ ldr r1, _08036AE8 @ =gEnemyParty
adds r0, r1
movs r1, 0x22
b _08036D6A
.align 2, 0
-_08036AE8: .4byte gUnknown_202402C
+_08036AE8: .4byte gEnemyParty
_08036AEC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036AF8 @ =gUnknown_202402C
+ ldr r1, _08036AF8 @ =gEnemyParty
adds r0, r1
movs r1, 0x23
b _08036D6A
.align 2, 0
-_08036AF8: .4byte gUnknown_202402C
+_08036AF8: .4byte gEnemyParty
_08036AFC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036B08 @ =gUnknown_202402C
+ ldr r1, _08036B08 @ =gEnemyParty
adds r0, r1
movs r1, 0x24
b _08036D6A
.align 2, 0
-_08036B08: .4byte gUnknown_202402C
+_08036B08: .4byte gEnemyParty
_08036B0C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036B18 @ =gUnknown_202402C
+ ldr r1, _08036B18 @ =gEnemyParty
adds r0, r1
movs r1, 0x25
b _08036D6A
.align 2, 0
-_08036B18: .4byte gUnknown_202402C
+_08036B18: .4byte gEnemyParty
_08036B1C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036B28 @ =gUnknown_202402C
+ ldr r1, _08036B28 @ =gEnemyParty
adds r0, r1
movs r1, 0x26
b _08036D6A
.align 2, 0
-_08036B28: .4byte gUnknown_202402C
+_08036B28: .4byte gEnemyParty
_08036B2C:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08036B78 @ =gUnknown_202402C
+ ldr r0, _08036B78 @ =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
@@ -2055,83 +2055,83 @@ _08036B2C:
movs r6, 0x6
b _08036D72
.align 2, 0
-_08036B78: .4byte gUnknown_202402C
+_08036B78: .4byte gEnemyParty
_08036B7C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036B88 @ =gUnknown_202402C
+ ldr r1, _08036B88 @ =gEnemyParty
adds r0, r1
movs r1, 0x27
b _08036D6A
.align 2, 0
-_08036B88: .4byte gUnknown_202402C
+_08036B88: .4byte gEnemyParty
_08036B8C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036B98 @ =gUnknown_202402C
+ ldr r1, _08036B98 @ =gEnemyParty
adds r0, r1
movs r1, 0x28
b _08036D6A
.align 2, 0
-_08036B98: .4byte gUnknown_202402C
+_08036B98: .4byte gEnemyParty
_08036B9C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036BA8 @ =gUnknown_202402C
+ ldr r1, _08036BA8 @ =gEnemyParty
adds r0, r1
movs r1, 0x29
b _08036D6A
.align 2, 0
-_08036BA8: .4byte gUnknown_202402C
+_08036BA8: .4byte gEnemyParty
_08036BAC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036BB8 @ =gUnknown_202402C
+ ldr r1, _08036BB8 @ =gEnemyParty
adds r0, r1
movs r1, 0x2A
b _08036D6A
.align 2, 0
-_08036BB8: .4byte gUnknown_202402C
+_08036BB8: .4byte gEnemyParty
_08036BBC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036BC8 @ =gUnknown_202402C
+ ldr r1, _08036BC8 @ =gEnemyParty
adds r0, r1
movs r1, 0x2B
b _08036D6A
.align 2, 0
-_08036BC8: .4byte gUnknown_202402C
+_08036BC8: .4byte gEnemyParty
_08036BCC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036BD8 @ =gUnknown_202402C
+ ldr r1, _08036BD8 @ =gEnemyParty
adds r0, r1
movs r1, 0x2C
b _08036D6A
.align 2, 0
-_08036BD8: .4byte gUnknown_202402C
+_08036BD8: .4byte gEnemyParty
_08036BDC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036BE8 @ =gUnknown_202402C
+ ldr r1, _08036BE8 @ =gEnemyParty
adds r0, r1
movs r1, 0
b _08036C06
.align 2, 0
-_08036BE8: .4byte gUnknown_202402C
+_08036BE8: .4byte gEnemyParty
_08036BEC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036BF8 @ =gUnknown_202402C
+ ldr r1, _08036BF8 @ =gEnemyParty
adds r0, r1
movs r1, 0x9
b _08036CAA
.align 2, 0
-_08036BF8: .4byte gUnknown_202402C
+_08036BF8: .4byte gEnemyParty
_08036BFC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C2C @ =gUnknown_202402C
+ ldr r1, _08036C2C @ =gEnemyParty
adds r0, r1
movs r1, 0x37
_08036C06:
@@ -2153,74 +2153,74 @@ _08036C06:
movs r6, 0x4
b _08036D72
.align 2, 0
-_08036C2C: .4byte gUnknown_202402C
+_08036C2C: .4byte gEnemyParty
_08036C30:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C3C @ =gUnknown_202402C
+ ldr r1, _08036C3C @ =gEnemyParty
adds r0, r1
movs r1, 0x38
b _08036D6A
.align 2, 0
-_08036C3C: .4byte gUnknown_202402C
+_08036C3C: .4byte gEnemyParty
_08036C40:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C4C @ =gUnknown_202402C
+ ldr r1, _08036C4C @ =gEnemyParty
adds r0, r1
movs r1, 0x39
b _08036CAA
.align 2, 0
-_08036C4C: .4byte gUnknown_202402C
+_08036C4C: .4byte gEnemyParty
_08036C50:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C5C @ =gUnknown_202402C
+ ldr r1, _08036C5C @ =gEnemyParty
adds r0, r1
movs r1, 0x3A
b _08036CAA
.align 2, 0
-_08036C5C: .4byte gUnknown_202402C
+_08036C5C: .4byte gEnemyParty
_08036C60:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C6C @ =gUnknown_202402C
+ ldr r1, _08036C6C @ =gEnemyParty
adds r0, r1
movs r1, 0x3B
b _08036CAA
.align 2, 0
-_08036C6C: .4byte gUnknown_202402C
+_08036C6C: .4byte gEnemyParty
_08036C70:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C7C @ =gUnknown_202402C
+ ldr r1, _08036C7C @ =gEnemyParty
adds r0, r1
movs r1, 0x3C
b _08036CAA
.align 2, 0
-_08036C7C: .4byte gUnknown_202402C
+_08036C7C: .4byte gEnemyParty
_08036C80:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C8C @ =gUnknown_202402C
+ ldr r1, _08036C8C @ =gEnemyParty
adds r0, r1
movs r1, 0x3D
b _08036CAA
.align 2, 0
-_08036C8C: .4byte gUnknown_202402C
+_08036C8C: .4byte gEnemyParty
_08036C90:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036C9C @ =gUnknown_202402C
+ ldr r1, _08036C9C @ =gEnemyParty
adds r0, r1
movs r1, 0x3E
b _08036CAA
.align 2, 0
-_08036C9C: .4byte gUnknown_202402C
+_08036C9C: .4byte gEnemyParty
_08036CA0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036CBC @ =gUnknown_202402C
+ ldr r1, _08036CBC @ =gEnemyParty
adds r0, r1
movs r1, 0x3F
_08036CAA:
@@ -2233,101 +2233,101 @@ _08036CAA:
movs r6, 0x2
b _08036D72
.align 2, 0
-_08036CBC: .4byte gUnknown_202402C
+_08036CBC: .4byte gEnemyParty
_08036CC0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036CCC @ =gUnknown_202402C
+ ldr r1, _08036CCC @ =gEnemyParty
adds r0, r1
movs r1, 0x16
b _08036D6A
.align 2, 0
-_08036CCC: .4byte gUnknown_202402C
+_08036CCC: .4byte gEnemyParty
_08036CD0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036CDC @ =gUnknown_202402C
+ ldr r1, _08036CDC @ =gEnemyParty
adds r0, r1
movs r1, 0x17
b _08036D6A
.align 2, 0
-_08036CDC: .4byte gUnknown_202402C
+_08036CDC: .4byte gEnemyParty
_08036CE0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036CEC @ =gUnknown_202402C
+ ldr r1, _08036CEC @ =gEnemyParty
adds r0, r1
movs r1, 0x18
b _08036D6A
.align 2, 0
-_08036CEC: .4byte gUnknown_202402C
+_08036CEC: .4byte gEnemyParty
_08036CF0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036CFC @ =gUnknown_202402C
+ ldr r1, _08036CFC @ =gEnemyParty
adds r0, r1
movs r1, 0x21
b _08036D6A
.align 2, 0
-_08036CFC: .4byte gUnknown_202402C
+_08036CFC: .4byte gEnemyParty
_08036D00:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D0C @ =gUnknown_202402C
+ ldr r1, _08036D0C @ =gEnemyParty
adds r0, r1
movs r1, 0x2F
b _08036D6A
.align 2, 0
-_08036D0C: .4byte gUnknown_202402C
+_08036D0C: .4byte gEnemyParty
_08036D10:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D1C @ =gUnknown_202402C
+ ldr r1, _08036D1C @ =gEnemyParty
adds r0, r1
movs r1, 0x30
b _08036D6A
.align 2, 0
-_08036D1C: .4byte gUnknown_202402C
+_08036D1C: .4byte gEnemyParty
_08036D20:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D2C @ =gUnknown_202402C
+ ldr r1, _08036D2C @ =gEnemyParty
adds r0, r1
movs r1, 0x32
b _08036D6A
.align 2, 0
-_08036D2C: .4byte gUnknown_202402C
+_08036D2C: .4byte gEnemyParty
_08036D30:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D3C @ =gUnknown_202402C
+ ldr r1, _08036D3C @ =gEnemyParty
adds r0, r1
movs r1, 0x33
b _08036D6A
.align 2, 0
-_08036D3C: .4byte gUnknown_202402C
+_08036D3C: .4byte gEnemyParty
_08036D40:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D4C @ =gUnknown_202402C
+ ldr r1, _08036D4C @ =gEnemyParty
adds r0, r1
movs r1, 0x34
b _08036D6A
.align 2, 0
-_08036D4C: .4byte gUnknown_202402C
+_08036D4C: .4byte gEnemyParty
_08036D50:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D5C @ =gUnknown_202402C
+ ldr r1, _08036D5C @ =gEnemyParty
adds r0, r1
movs r1, 0x35
b _08036D6A
.align 2, 0
-_08036D5C: .4byte gUnknown_202402C
+_08036D5C: .4byte gEnemyParty
_08036D60:
movs r0, 0x64
muls r0, r5
- ldr r1, _08036D84 @ =gUnknown_202402C
+ ldr r1, _08036D84 @ =gEnemyParty
adds r0, r1
movs r1, 0x36
_08036D6A:
@@ -2345,15 +2345,15 @@ _08036D72:
pop {r1}
bx r1
.align 2, 0
-_08036D84: .4byte gUnknown_202402C
+_08036D84: .4byte gEnemyParty
thumb_func_end sub_80365DC
thumb_func_start OpponentHandlecmd1
OpponentHandlecmd1: @ 8036D88
push {r4-r7,lr}
sub sp, 0x58
- ldr r2, _08036E00 @ =gUnknown_2023BCE
- ldr r5, _08036E04 @ =gUnknown_2023BC4
+ ldr r2, _08036E00 @ =gBattlerPartyIndexes
+ ldr r5, _08036E04 @ =gActiveBattler
ldrb r1, [r5]
lsls r0, r1, 1
adds r0, r2
@@ -2366,7 +2366,7 @@ OpponentHandlecmd1: @ 8036D88
adds r0, r3, 0x1
adds r0, r1, r0
ldrb r2, [r0]
- ldr r0, _08036E0C @ =gUnknown_202402C
+ ldr r0, _08036E0C @ =gEnemyParty
adds r0, r2, r0
adds r6, r4, r0
mov r0, sp
@@ -2410,17 +2410,17 @@ _08036DDE:
pop {r0}
bx r0
.align 2, 0
-_08036E00: .4byte gUnknown_2023BCE
-_08036E04: .4byte gUnknown_2023BC4
+_08036E00: .4byte gBattlerPartyIndexes
+_08036E04: .4byte gActiveBattler
_08036E08: .4byte gUnknown_2022BC4
-_08036E0C: .4byte gUnknown_202402C
+_08036E0C: .4byte gEnemyParty
thumb_func_end OpponentHandlecmd1
thumb_func_start OpponentHandleSetAttributes
OpponentHandleSetAttributes: @ 8036E10
push {r4,r5,lr}
ldr r1, _08036E34 @ =gUnknown_2022BC4
- ldr r0, _08036E38 @ =gUnknown_2023BC4
+ ldr r0, _08036E38 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x2
@@ -2428,7 +2428,7 @@ OpponentHandleSetAttributes: @ 8036E10
ldrb r0, [r1]
cmp r0, 0
bne _08036E40
- ldr r0, _08036E3C @ =gUnknown_2023BCE
+ ldr r0, _08036E3C @ =gBattlerPartyIndexes
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
@@ -2436,8 +2436,8 @@ OpponentHandleSetAttributes: @ 8036E10
b _08036E5E
.align 2, 0
_08036E34: .4byte gUnknown_2022BC4
-_08036E38: .4byte gUnknown_2023BC4
-_08036E3C: .4byte gUnknown_2023BCE
+_08036E38: .4byte gActiveBattler
+_08036E3C: .4byte gBattlerPartyIndexes
_08036E40:
ldrb r4, [r1]
movs r5, 0
@@ -2472,7 +2472,7 @@ sub_8036E68: @ 8036E68
sub sp, 0x38
lsls r0, 24
lsrs r5, r0, 24
- ldr r3, _08036EA0 @ =gUnknown_2023BC4
+ ldr r3, _08036EA0 @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
ldr r2, _08036EA4 @ =gUnknown_2022BC7
@@ -2493,7 +2493,7 @@ _08036E96:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_08036EA0: .4byte gUnknown_2023BC4
+_08036EA0: .4byte gActiveBattler
_08036EA4: .4byte gUnknown_2022BC7
_08036EA8: .4byte _08036EAC
.align 2, 0
@@ -2562,7 +2562,7 @@ _08036F9C:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08037130 @ =gUnknown_202402C
+ ldr r0, _08037130 @ =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
@@ -2629,7 +2629,7 @@ _08037002:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08037130 @ =gUnknown_202402C
+ ldr r0, _08037130 @ =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
@@ -2739,11 +2739,11 @@ _08037002:
bl sub_804037C
b _08037774
.align 2, 0
-_08037130: .4byte gUnknown_202402C
+_08037130: .4byte gEnemyParty
_08037134:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803714C @ =gUnknown_202402C
+ ldr r1, _0803714C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2752,11 +2752,11 @@ _08037134:
bl sub_804037C
b _08037774
.align 2, 0
-_0803714C: .4byte gUnknown_202402C
+_0803714C: .4byte gEnemyParty
_08037150:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037168 @ =gUnknown_202402C
+ ldr r1, _08037168 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2765,7 +2765,7 @@ _08037150:
bl sub_804037C
b _08037774
.align 2, 0
-_08037168: .4byte gUnknown_202402C
+_08037168: .4byte gEnemyParty
_0803716C:
movs r0, 0
mov r8, r0
@@ -2775,7 +2775,7 @@ _0803716C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
- ldr r0, _080371BC @ =gUnknown_202402C
+ ldr r0, _080371BC @ =gEnemyParty
adds r7, r1, r0
adds r6, r4, 0
adds r6, 0x8
@@ -2799,18 +2799,18 @@ _08037184:
ble _08037184
movs r0, 0x64
muls r0, r5
- ldr r1, _080371BC @ =gUnknown_202402C
+ ldr r1, _080371BC @ =gEnemyParty
adds r0, r1
movs r1, 0x15
mov r2, r9
bl sub_804037C
b _08037774
.align 2, 0
-_080371BC: .4byte gUnknown_202402C
+_080371BC: .4byte gEnemyParty
_080371C0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080371D8 @ =gUnknown_202402C
+ ldr r1, _080371D8 @ =gEnemyParty
adds r0, r1
ldr r3, _080371DC @ =gUnknown_2022BC4
ldrb r2, [r6]
@@ -2821,13 +2821,13 @@ _080371C0:
adds r1, 0x9
b _0803725E
.align 2, 0
-_080371D8: .4byte gUnknown_202402C
+_080371D8: .4byte gEnemyParty
_080371DC: .4byte gUnknown_2022BC4
_080371E0:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08037244 @ =gUnknown_202402C
+ ldr r0, _08037244 @ =gEnemyParty
adds r4, r0
ldrb r2, [r6]
lsls r2, 9
@@ -2870,11 +2870,11 @@ _080371E0:
bl sub_804037C
b _08037774
.align 2, 0
-_08037244: .4byte gUnknown_202402C
+_08037244: .4byte gEnemyParty
_08037248:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037268 @ =gUnknown_202402C
+ ldr r1, _08037268 @ =gEnemyParty
adds r0, r1
ldr r3, _0803726C @ =gUnknown_2022BC4
ldrb r2, [r6]
@@ -2889,12 +2889,12 @@ _0803725E:
bl sub_804037C
b _08037774
.align 2, 0
-_08037268: .4byte gUnknown_202402C
+_08037268: .4byte gEnemyParty
_0803726C: .4byte gUnknown_2022BC4
_08037270:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037288 @ =gUnknown_202402C
+ ldr r1, _08037288 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2903,11 +2903,11 @@ _08037270:
bl sub_804037C
b _08037774
.align 2, 0
-_08037288: .4byte gUnknown_202402C
+_08037288: .4byte gEnemyParty
_0803728C:
movs r0, 0x64
muls r0, r5
- ldr r1, _080372A4 @ =gUnknown_202402C
+ ldr r1, _080372A4 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2916,11 +2916,11 @@ _0803728C:
bl sub_804037C
b _08037774
.align 2, 0
-_080372A4: .4byte gUnknown_202402C
+_080372A4: .4byte gEnemyParty
_080372A8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080372C0 @ =gUnknown_202402C
+ ldr r1, _080372C0 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2929,11 +2929,11 @@ _080372A8:
bl sub_804037C
b _08037774
.align 2, 0
-_080372C0: .4byte gUnknown_202402C
+_080372C0: .4byte gEnemyParty
_080372C4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080372DC @ =gUnknown_202402C
+ ldr r1, _080372DC @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2942,11 +2942,11 @@ _080372C4:
bl sub_804037C
b _08037774
.align 2, 0
-_080372DC: .4byte gUnknown_202402C
+_080372DC: .4byte gEnemyParty
_080372E0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080372F8 @ =gUnknown_202402C
+ ldr r1, _080372F8 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2955,11 +2955,11 @@ _080372E0:
bl sub_804037C
b _08037774
.align 2, 0
-_080372F8: .4byte gUnknown_202402C
+_080372F8: .4byte gEnemyParty
_080372FC:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037314 @ =gUnknown_202402C
+ ldr r1, _08037314 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2968,11 +2968,11 @@ _080372FC:
bl sub_804037C
b _08037774
.align 2, 0
-_08037314: .4byte gUnknown_202402C
+_08037314: .4byte gEnemyParty
_08037318:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037330 @ =gUnknown_202402C
+ ldr r1, _08037330 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2981,11 +2981,11 @@ _08037318:
bl sub_804037C
b _08037774
.align 2, 0
-_08037330: .4byte gUnknown_202402C
+_08037330: .4byte gEnemyParty
_08037334:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803734C @ =gUnknown_202402C
+ ldr r1, _0803734C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -2994,11 +2994,11 @@ _08037334:
bl sub_804037C
b _08037774
.align 2, 0
-_0803734C: .4byte gUnknown_202402C
+_0803734C: .4byte gEnemyParty
_08037350:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037368 @ =gUnknown_202402C
+ ldr r1, _08037368 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3007,11 +3007,11 @@ _08037350:
bl sub_804037C
b _08037774
.align 2, 0
-_08037368: .4byte gUnknown_202402C
+_08037368: .4byte gEnemyParty
_0803736C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037384 @ =gUnknown_202402C
+ ldr r1, _08037384 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3020,11 +3020,11 @@ _0803736C:
bl sub_804037C
b _08037774
.align 2, 0
-_08037384: .4byte gUnknown_202402C
+_08037384: .4byte gEnemyParty
_08037388:
movs r0, 0x64
muls r0, r5
- ldr r1, _080373A0 @ =gUnknown_202402C
+ ldr r1, _080373A0 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3033,11 +3033,11 @@ _08037388:
bl sub_804037C
b _08037774
.align 2, 0
-_080373A0: .4byte gUnknown_202402C
+_080373A0: .4byte gEnemyParty
_080373A4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080373BC @ =gUnknown_202402C
+ ldr r1, _080373BC @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3046,11 +3046,11 @@ _080373A4:
bl sub_804037C
b _08037774
.align 2, 0
-_080373BC: .4byte gUnknown_202402C
+_080373BC: .4byte gEnemyParty
_080373C0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080373D8 @ =gUnknown_202402C
+ ldr r1, _080373D8 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3059,11 +3059,11 @@ _080373C0:
bl sub_804037C
b _08037774
.align 2, 0
-_080373D8: .4byte gUnknown_202402C
+_080373D8: .4byte gEnemyParty
_080373DC:
movs r0, 0x64
muls r0, r5
- ldr r1, _080373F4 @ =gUnknown_202402C
+ ldr r1, _080373F4 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3072,12 +3072,12 @@ _080373DC:
bl sub_804037C
b _08037774
.align 2, 0
-_080373F4: .4byte gUnknown_202402C
+_080373F4: .4byte gEnemyParty
_080373F8:
movs r0, 0x64
adds r4, r5, 0
muls r4, r0
- ldr r0, _08037468 @ =gUnknown_202402C
+ ldr r0, _08037468 @ =gEnemyParty
adds r4, r0
ldrb r2, [r6]
lsls r2, 9
@@ -3126,11 +3126,11 @@ _080373F8:
adds r0, r4, 0
b _08037506
.align 2, 0
-_08037468: .4byte gUnknown_202402C
+_08037468: .4byte gEnemyParty
_0803746C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037484 @ =gUnknown_202402C
+ ldr r1, _08037484 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3139,11 +3139,11 @@ _0803746C:
bl sub_804037C
b _08037774
.align 2, 0
-_08037484: .4byte gUnknown_202402C
+_08037484: .4byte gEnemyParty
_08037488:
movs r0, 0x64
muls r0, r5
- ldr r1, _080374A0 @ =gUnknown_202402C
+ ldr r1, _080374A0 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3152,11 +3152,11 @@ _08037488:
bl sub_804037C
b _08037774
.align 2, 0
-_080374A0: .4byte gUnknown_202402C
+_080374A0: .4byte gEnemyParty
_080374A4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080374BC @ =gUnknown_202402C
+ ldr r1, _080374BC @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3165,11 +3165,11 @@ _080374A4:
bl sub_804037C
b _08037774
.align 2, 0
-_080374BC: .4byte gUnknown_202402C
+_080374BC: .4byte gEnemyParty
_080374C0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080374D8 @ =gUnknown_202402C
+ ldr r1, _080374D8 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3178,11 +3178,11 @@ _080374C0:
bl sub_804037C
b _08037774
.align 2, 0
-_080374D8: .4byte gUnknown_202402C
+_080374D8: .4byte gEnemyParty
_080374DC:
movs r0, 0x64
muls r0, r5
- ldr r1, _080374F4 @ =gUnknown_202402C
+ ldr r1, _080374F4 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3191,11 +3191,11 @@ _080374DC:
bl sub_804037C
b _08037774
.align 2, 0
-_080374F4: .4byte gUnknown_202402C
+_080374F4: .4byte gEnemyParty
_080374F8:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037510 @ =gUnknown_202402C
+ ldr r1, _08037510 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3205,11 +3205,11 @@ _08037506:
bl sub_804037C
b _08037774
.align 2, 0
-_08037510: .4byte gUnknown_202402C
+_08037510: .4byte gEnemyParty
_08037514:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803752C @ =gUnknown_202402C
+ ldr r1, _0803752C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3218,11 +3218,11 @@ _08037514:
bl sub_804037C
b _08037774
.align 2, 0
-_0803752C: .4byte gUnknown_202402C
+_0803752C: .4byte gEnemyParty
_08037530:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037548 @ =gUnknown_202402C
+ ldr r1, _08037548 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3231,11 +3231,11 @@ _08037530:
bl sub_804037C
b _08037774
.align 2, 0
-_08037548: .4byte gUnknown_202402C
+_08037548: .4byte gEnemyParty
_0803754C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037564 @ =gUnknown_202402C
+ ldr r1, _08037564 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3244,11 +3244,11 @@ _0803754C:
bl sub_804037C
b _08037774
.align 2, 0
-_08037564: .4byte gUnknown_202402C
+_08037564: .4byte gEnemyParty
_08037568:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037580 @ =gUnknown_202402C
+ ldr r1, _08037580 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3257,11 +3257,11 @@ _08037568:
bl sub_804037C
b _08037774
.align 2, 0
-_08037580: .4byte gUnknown_202402C
+_08037580: .4byte gEnemyParty
_08037584:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803759C @ =gUnknown_202402C
+ ldr r1, _0803759C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3270,11 +3270,11 @@ _08037584:
bl sub_804037C
b _08037774
.align 2, 0
-_0803759C: .4byte gUnknown_202402C
+_0803759C: .4byte gEnemyParty
_080375A0:
movs r0, 0x64
muls r0, r5
- ldr r1, _080375B8 @ =gUnknown_202402C
+ ldr r1, _080375B8 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3283,11 +3283,11 @@ _080375A0:
bl sub_804037C
b _08037774
.align 2, 0
-_080375B8: .4byte gUnknown_202402C
+_080375B8: .4byte gEnemyParty
_080375BC:
movs r0, 0x64
muls r0, r5
- ldr r1, _080375D4 @ =gUnknown_202402C
+ ldr r1, _080375D4 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3296,11 +3296,11 @@ _080375BC:
bl sub_804037C
b _08037774
.align 2, 0
-_080375D4: .4byte gUnknown_202402C
+_080375D4: .4byte gEnemyParty
_080375D8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080375F0 @ =gUnknown_202402C
+ ldr r1, _080375F0 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3309,11 +3309,11 @@ _080375D8:
bl sub_804037C
b _08037774
.align 2, 0
-_080375F0: .4byte gUnknown_202402C
+_080375F0: .4byte gEnemyParty
_080375F4:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803760C @ =gUnknown_202402C
+ ldr r1, _0803760C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3322,11 +3322,11 @@ _080375F4:
bl sub_804037C
b _08037774
.align 2, 0
-_0803760C: .4byte gUnknown_202402C
+_0803760C: .4byte gEnemyParty
_08037610:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037628 @ =gUnknown_202402C
+ ldr r1, _08037628 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3335,11 +3335,11 @@ _08037610:
bl sub_804037C
b _08037774
.align 2, 0
-_08037628: .4byte gUnknown_202402C
+_08037628: .4byte gEnemyParty
_0803762C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037644 @ =gUnknown_202402C
+ ldr r1, _08037644 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3348,11 +3348,11 @@ _0803762C:
bl sub_804037C
b _08037774
.align 2, 0
-_08037644: .4byte gUnknown_202402C
+_08037644: .4byte gEnemyParty
_08037648:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037660 @ =gUnknown_202402C
+ ldr r1, _08037660 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3361,11 +3361,11 @@ _08037648:
bl sub_804037C
b _08037774
.align 2, 0
-_08037660: .4byte gUnknown_202402C
+_08037660: .4byte gEnemyParty
_08037664:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803767C @ =gUnknown_202402C
+ ldr r1, _0803767C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3374,11 +3374,11 @@ _08037664:
bl sub_804037C
b _08037774
.align 2, 0
-_0803767C: .4byte gUnknown_202402C
+_0803767C: .4byte gEnemyParty
_08037680:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037698 @ =gUnknown_202402C
+ ldr r1, _08037698 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3387,11 +3387,11 @@ _08037680:
bl sub_804037C
b _08037774
.align 2, 0
-_08037698: .4byte gUnknown_202402C
+_08037698: .4byte gEnemyParty
_0803769C:
movs r0, 0x64
muls r0, r5
- ldr r1, _080376B4 @ =gUnknown_202402C
+ ldr r1, _080376B4 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3400,11 +3400,11 @@ _0803769C:
bl sub_804037C
b _08037774
.align 2, 0
-_080376B4: .4byte gUnknown_202402C
+_080376B4: .4byte gEnemyParty
_080376B8:
movs r0, 0x64
muls r0, r5
- ldr r1, _080376D0 @ =gUnknown_202402C
+ ldr r1, _080376D0 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3413,11 +3413,11 @@ _080376B8:
bl sub_804037C
b _08037774
.align 2, 0
-_080376D0: .4byte gUnknown_202402C
+_080376D0: .4byte gEnemyParty
_080376D4:
movs r0, 0x64
muls r0, r5
- ldr r1, _080376EC @ =gUnknown_202402C
+ ldr r1, _080376EC @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3426,11 +3426,11 @@ _080376D4:
bl sub_804037C
b _08037774
.align 2, 0
-_080376EC: .4byte gUnknown_202402C
+_080376EC: .4byte gEnemyParty
_080376F0:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037708 @ =gUnknown_202402C
+ ldr r1, _08037708 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3439,11 +3439,11 @@ _080376F0:
bl sub_804037C
b _08037774
.align 2, 0
-_08037708: .4byte gUnknown_202402C
+_08037708: .4byte gEnemyParty
_0803770C:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037724 @ =gUnknown_202402C
+ ldr r1, _08037724 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3452,11 +3452,11 @@ _0803770C:
bl sub_804037C
b _08037774
.align 2, 0
-_08037724: .4byte gUnknown_202402C
+_08037724: .4byte gEnemyParty
_08037728:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037740 @ =gUnknown_202402C
+ ldr r1, _08037740 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3465,11 +3465,11 @@ _08037728:
bl sub_804037C
b _08037774
.align 2, 0
-_08037740: .4byte gUnknown_202402C
+_08037740: .4byte gEnemyParty
_08037744:
movs r0, 0x64
muls r0, r5
- ldr r1, _0803775C @ =gUnknown_202402C
+ ldr r1, _0803775C @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3478,11 +3478,11 @@ _08037744:
bl sub_804037C
b _08037774
.align 2, 0
-_0803775C: .4byte gUnknown_202402C
+_0803775C: .4byte gEnemyParty
_08037760:
movs r0, 0x64
muls r0, r5
- ldr r1, _08037784 @ =gUnknown_202402C
+ ldr r1, _08037784 @ =gEnemyParty
adds r0, r1
ldrb r2, [r6]
lsls r2, 9
@@ -3499,14 +3499,14 @@ _08037774:
pop {r0}
bx r0
.align 2, 0
-_08037784: .4byte gUnknown_202402C
+_08037784: .4byte gEnemyParty
thumb_func_end sub_8036E68
thumb_func_start OpponentHandlecmd3
OpponentHandlecmd3: @ 8037788
push {r4-r7,lr}
- ldr r1, _080377EC @ =gUnknown_2023BCE
- ldr r7, _080377F0 @ =gUnknown_2023BC4
+ ldr r1, _080377EC @ =gBattlerPartyIndexes
+ ldr r7, _080377F0 @ =gActiveBattler
ldrb r2, [r7]
lsls r0, r2, 1
adds r0, r1
@@ -3519,7 +3519,7 @@ OpponentHandlecmd3: @ 8037788
adds r0, r4, 0x1
adds r0, r2, r0
ldrb r0, [r0]
- ldr r1, _080377F8 @ =gUnknown_202402C
+ ldr r1, _080377F8 @ =gEnemyParty
adds r0, r1
adds r5, r3, r0
movs r3, 0
@@ -3555,10 +3555,10 @@ _080377E0:
pop {r0}
bx r0
.align 2, 0
-_080377EC: .4byte gUnknown_2023BCE
-_080377F0: .4byte gUnknown_2023BC4
+_080377EC: .4byte gBattlerPartyIndexes
+_080377F0: .4byte gActiveBattler
_080377F4: .4byte gUnknown_2022BC4
-_080377F8: .4byte gUnknown_202402C
+_080377F8: .4byte gEnemyParty
thumb_func_end OpponentHandlecmd3
thumb_func_start sub_80377FC
@@ -3566,22 +3566,22 @@ sub_80377FC: @ 80377FC
push {r4-r7,lr}
mov r7, r8
push {r7}
- ldr r7, _0803787C @ =gUnknown_2023BCE
- ldr r4, _08037880 @ =gUnknown_2023BC4
+ ldr r7, _0803787C @ =gBattlerPartyIndexes
+ ldr r4, _08037880 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 1
adds r0, r7
ldrh r0, [r0]
movs r5, 0x64
muls r0, r5
- ldr r6, _08037884 @ =gUnknown_202402C
+ ldr r6, _08037884 @ =gEnemyParty
adds r0, r6
movs r1, 0xB
bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
- ldr r0, _08037888 @ =gUnknown_2022B4C
+ ldr r0, _08037888 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 8
@@ -3624,10 +3624,10 @@ sub_80377FC: @ 80377FC
strb r1, [r0, 0x1]
b _080378AA
.align 2, 0
-_0803787C: .4byte gUnknown_2023BCE
-_08037880: .4byte gUnknown_2023BC4
-_08037884: .4byte gUnknown_202402C
-_08037888: .4byte gUnknown_2022B4C
+_0803787C: .4byte gBattlerPartyIndexes
+_08037880: .4byte gActiveBattler
+_08037884: .4byte gEnemyParty
+_08037888: .4byte gBattleTypeFlags
_0803788C: .4byte gUnknown_2024018
_08037890:
ldrb r1, [r4]
@@ -3642,7 +3642,7 @@ _08037890:
lsls r0, 24
lsrs r5, r0, 24
_080378AA:
- ldr r7, _0803799C @ =gUnknown_2023BC4
+ ldr r7, _0803799C @ =gActiveBattler
ldrb r0, [r7]
bl GetBankIdentity
adds r1, r0, 0
@@ -3721,7 +3721,7 @@ _080378AA:
adds r2, r1
ldrb r1, [r2]
bl StartSpriteAnim
- ldr r0, _080379B4 @ =gUnknown_2022B4C
+ ldr r0, _080379B4 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 8
@@ -3729,13 +3729,13 @@ _080378AA:
cmp r0, 0
bne _08037986
ldrb r4, [r7]
- ldr r1, _080379B8 @ =gUnknown_2023BCE
+ ldr r1, _080379B8 @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _080379BC @ =gUnknown_202402C
+ ldr r1, _080379BC @ =gEnemyParty
adds r0, r1
movs r1, 0xB
bl GetMonData
@@ -3757,15 +3757,15 @@ _08037986:
pop {r0}
bx r0
.align 2, 0
-_0803799C: .4byte gUnknown_2023BC4
+_0803799C: .4byte gActiveBattler
_080379A0: .4byte gUnknown_20244DC
_080379A4: .4byte gUnknown_2023D44
_080379A8: .4byte gSprites
_080379AC: .4byte 0x0000ff10
_080379B0: .4byte gUnknown_2024024
-_080379B4: .4byte gUnknown_2022B4C
-_080379B8: .4byte gUnknown_2023BCE
-_080379BC: .4byte gUnknown_202402C
+_080379B4: .4byte gBattleTypeFlags
+_080379B8: .4byte gBattlerPartyIndexes
+_080379BC: .4byte gEnemyParty
_080379C0: .4byte gUnknown_3004FE0
_080379C4: .4byte sub_8035FE8
thumb_func_end sub_80377FC
@@ -3773,15 +3773,15 @@ _080379C4: .4byte sub_8035FE8
thumb_func_start OpponentHandleSwitchInAnim
OpponentHandleSwitchInAnim: @ 80379C8
push {r4,lr}
- ldr r4, _08037A10 @ =gUnknown_2023BC4
+ ldr r4, _08037A10 @ =gActiveBattler
ldrb r0, [r4]
- ldr r1, _08037A14 @ =gUnknown_2023FE8
+ ldr r1, _08037A14 @ =gBattleStruct
ldr r1, [r1]
adds r0, r1
adds r0, 0x5C
movs r1, 0x6
strb r1, [r0]
- ldr r1, _08037A18 @ =gUnknown_2023BCE
+ ldr r1, _08037A18 @ =gBattlerPartyIndexes
ldrb r0, [r4]
lsls r2, r0, 1
adds r2, r1
@@ -3807,9 +3807,9 @@ OpponentHandleSwitchInAnim: @ 80379C8
pop {r0}
bx r0
.align 2, 0
-_08037A10: .4byte gUnknown_2023BC4
-_08037A14: .4byte gUnknown_2023FE8
-_08037A18: .4byte gUnknown_2023BCE
+_08037A10: .4byte gActiveBattler
+_08037A14: .4byte gBattleStruct
+_08037A18: .4byte gBattlerPartyIndexes
_08037A1C: .4byte gUnknown_2022BC4
_08037A20: .4byte gUnknown_3004FE0
_08037A24: .4byte sub_8036408
@@ -3829,7 +3829,7 @@ sub_8037A28: @ 8037A28
lsrs r1, 24
adds r0, r6, 0
bl ClearTemporarySpeciesSpriteData
- ldr r0, _08037B84 @ =gUnknown_2023BCE
+ ldr r0, _08037B84 @ =gBattlerPartyIndexes
lsls r4, r6, 1
adds r4, r0
ldr r0, _08037B88 @ =gUnknown_2022BC4
@@ -3844,7 +3844,7 @@ sub_8037A28: @ 8037A28
mov r1, r9
muls r1, r0
adds r0, r1, 0
- ldr r5, _08037B8C @ =gUnknown_202402C
+ ldr r5, _08037B8C @ =gEnemyParty
adds r0, r5
movs r1, 0xB
bl GetMonData
@@ -3979,9 +3979,9 @@ sub_8037A28: @ 8037A28
pop {r0}
bx r0
.align 2, 0
-_08037B84: .4byte gUnknown_2023BCE
+_08037B84: .4byte gBattlerPartyIndexes
_08037B88: .4byte gUnknown_2022BC4
-_08037B8C: .4byte gUnknown_202402C
+_08037B8C: .4byte gEnemyParty
_08037B90: .4byte sub_8033E3C
_08037B94: .4byte gUnknown_3004FFC
_08037B98: .4byte gUnknown_20244DC
@@ -3995,7 +3995,7 @@ _08037BA8: .4byte SpriteCallbackDummy
sub_8037BAC: @ 8037BAC
push {r4-r6,lr}
ldr r1, _08037BE0 @ =gUnknown_2022BC4
- ldr r6, _08037BE4 @ =gUnknown_2023BC4
+ ldr r6, _08037BE4 @ =gActiveBattler
ldrb r2, [r6]
lsls r0, r2, 9
adds r1, 0x1
@@ -4020,7 +4020,7 @@ sub_8037BAC: @ 8037BAC
b _08037C30
.align 2, 0
_08037BE0: .4byte gUnknown_2022BC4
-_08037BE4: .4byte gUnknown_2023BC4
+_08037BE4: .4byte gActiveBattler
_08037BE8: .4byte gUnknown_2024018
_08037BEC: .4byte gUnknown_3004FE0
_08037BF0: .4byte sub_8037C44
@@ -4065,7 +4065,7 @@ sub_8037C44: @ 8037C44
push {r4-r6,lr}
ldr r6, _08037C64 @ =gUnknown_2024018
ldr r4, [r6]
- ldr r5, _08037C68 @ =gUnknown_2023BC4
+ ldr r5, _08037C68 @ =gActiveBattler
ldrb r2, [r5]
ldr r1, [r4, 0x4]
lsls r0, r2, 1
@@ -4080,7 +4080,7 @@ sub_8037C44: @ 8037C44
b _08037CC2
.align 2, 0
_08037C64: .4byte gUnknown_2024018
-_08037C68: .4byte gUnknown_2023BC4
+_08037C68: .4byte gActiveBattler
_08037C6C:
ldr r1, [r4]
lsls r0, r2, 2
@@ -4140,7 +4140,7 @@ sub_8037CD0: @ 8037CD0
mov r6, r9
mov r5, r8
push {r5,r6}
- ldr r3, _08037CEC @ =gUnknown_20386AE
+ ldr r3, _08037CEC @ =gTrainerBattleOpponent_A
ldrh r1, [r3]
movs r0, 0x80
lsls r0, 3
@@ -4149,9 +4149,9 @@ sub_8037CD0: @ 8037CD0
bl GetSecretBaseTrainerPicIndex
b _08037D26
.align 2, 0
-_08037CEC: .4byte gUnknown_20386AE
+_08037CEC: .4byte gTrainerBattleOpponent_A
_08037CF0:
- ldr r0, _08037D04 @ =gUnknown_2022B4C
+ ldr r0, _08037D04 @ =gBattleTypeFlags
ldr r1, [r0]
movs r0, 0x80
lsls r0, 1
@@ -4161,7 +4161,7 @@ _08037CF0:
bl sub_80E6078
b _08037D26
.align 2, 0
-_08037D04: .4byte gUnknown_2022B4C
+_08037D04: .4byte gBattleTypeFlags
_08037D08:
movs r0, 0x80
lsls r0, 12
@@ -4182,7 +4182,7 @@ _08037D26:
lsrs r0, 24
b _08037D3A
_08037D2C:
- ldr r2, _08037E6C @ =gUnknown_823EAC8
+ ldr r2, _08037E6C @ =gTrainers
ldrh r1, [r3]
lsls r0, r1, 2
adds r0, r1
@@ -4191,7 +4191,7 @@ _08037D2C:
ldrb r0, [r0, 0x3]
_08037D3A:
mov r9, r0
- ldr r0, _08037E70 @ =gUnknown_2023BC4
+ ldr r0, _08037E70 @ =gActiveBattler
mov r8, r0
ldrb r1, [r0]
mov r0, r9
@@ -4337,8 +4337,8 @@ _08037D3A:
pop {r0}
bx r0
.align 2, 0
-_08037E6C: .4byte gUnknown_823EAC8
-_08037E70: .4byte gUnknown_2023BC4
+_08037E6C: .4byte gTrainers
+_08037E70: .4byte gActiveBattler
_08037E74: .4byte gUnknown_20244DC
_08037E78: .4byte gUnknown_823932C
_08037E7C: .4byte gUnknown_2023D44
@@ -4359,7 +4359,7 @@ sub_8037EA4: @ 8037EA4
mov r6, r9
mov r5, r8
push {r5,r6}
- ldr r3, _08037EC0 @ =gUnknown_20386AE
+ ldr r3, _08037EC0 @ =gTrainerBattleOpponent_A
ldrh r1, [r3]
movs r0, 0x80
lsls r0, 3
@@ -4368,9 +4368,9 @@ sub_8037EA4: @ 8037EA4
bl GetSecretBaseTrainerPicIndex
b _08037EFA
.align 2, 0
-_08037EC0: .4byte gUnknown_20386AE
+_08037EC0: .4byte gTrainerBattleOpponent_A
_08037EC4:
- ldr r0, _08037ED8 @ =gUnknown_2022B4C
+ ldr r0, _08037ED8 @ =gBattleTypeFlags
ldr r1, [r0]
movs r0, 0x80
lsls r0, 1
@@ -4380,7 +4380,7 @@ _08037EC4:
bl sub_80E6078
b _08037EFA
.align 2, 0
-_08037ED8: .4byte gUnknown_2022B4C
+_08037ED8: .4byte gBattleTypeFlags
_08037EDC:
movs r0, 0x80
lsls r0, 12
@@ -4401,7 +4401,7 @@ _08037EFA:
lsrs r0, 24
b _08037F0E
_08037F00:
- ldr r2, _08038040 @ =gUnknown_823EAC8
+ ldr r2, _08038040 @ =gTrainers
ldrh r1, [r3]
lsls r0, r1, 2
adds r0, r1
@@ -4410,7 +4410,7 @@ _08037F00:
ldrb r0, [r0, 0x3]
_08037F0E:
mov r9, r0
- ldr r0, _08038044 @ =gUnknown_2023BC4
+ ldr r0, _08038044 @ =gActiveBattler
mov r8, r0
ldrb r1, [r0]
mov r0, r9
@@ -4557,8 +4557,8 @@ _08037F0E:
pop {r0}
bx r0
.align 2, 0
-_08038040: .4byte gUnknown_823EAC8
-_08038044: .4byte gUnknown_2023BC4
+_08038040: .4byte gTrainers
+_08038044: .4byte gActiveBattler
_08038048: .4byte gUnknown_20244DC
_0803804C: .4byte gUnknown_823932C
_08038050: .4byte gUnknown_2023D44
@@ -4577,7 +4577,7 @@ _08038074: .4byte sub_8035B20
sub_8038078: @ 8038078
push {r4-r6,lr}
ldr r6, _08038108 @ =gUnknown_2023D44
- ldr r4, _0803810C @ =gUnknown_2023BC4
+ ldr r4, _0803810C @ =gActiveBattler
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -4646,7 +4646,7 @@ sub_8038078: @ 8038078
bx r0
.align 2, 0
_08038108: .4byte gUnknown_2023D44
-_0803810C: .4byte gUnknown_2023BC4
+_0803810C: .4byte gActiveBattler
_08038110: .4byte gSprites
_08038114: .4byte sub_8075590
_08038118: .4byte SpriteCallbackDummy
@@ -4659,7 +4659,7 @@ sub_8038124: @ 8038124
push {r4-r6,lr}
ldr r6, _08038170 @ =gUnknown_2024018
ldr r4, [r6]
- ldr r5, _08038174 @ =gUnknown_2023BC4
+ ldr r5, _08038174 @ =gActiveBattler
ldrb r2, [r5]
ldr r0, [r4, 0x4]
lsls r1, r2, 1
@@ -4695,7 +4695,7 @@ _08038158:
b _080381B4
.align 2, 0
_08038170: .4byte gUnknown_2024018
-_08038174: .4byte gUnknown_2023BC4
+_08038174: .4byte gActiveBattler
_08038178:
ldrb r1, [r3]
movs r0, 0x40
@@ -4773,7 +4773,7 @@ sub_80381F4: @ 80381F4
thumb_func_start sub_8038200
sub_8038200: @ 8038200
push {r4-r6,lr}
- ldr r6, _080382E4 @ =gUnknown_2023BC4
+ ldr r6, _080382E4 @ =gActiveBattler
ldrb r0, [r6]
bl mplay_80342A4
lsls r0, 24
@@ -4884,7 +4884,7 @@ _08038212:
bl OpponentBufferExecCompleted
b _08038326
.align 2, 0
-_080382E4: .4byte gUnknown_2023BC4
+_080382E4: .4byte gActiveBattler
_080382E8: .4byte gUnknown_2022BC4
_080382EC: .4byte gUnknown_2037F16
_080382F0: .4byte gUnknown_2037EEC
@@ -4927,7 +4927,7 @@ sub_8038338: @ 8038338
mov r5, r8
push {r5-r7}
ldr r2, _08038384 @ =gUnknown_2022BC4
- ldr r6, _08038388 @ =gUnknown_2023BC4
+ ldr r6, _08038388 @ =gActiveBattler
ldrb r3, [r6]
lsls r1, r3, 9
adds r0, r2, 0x1
@@ -4961,7 +4961,7 @@ sub_8038338: @ 8038338
b _080384AC
.align 2, 0
_08038384: .4byte gUnknown_2022BC4
-_08038388: .4byte gUnknown_2023BC4
+_08038388: .4byte gActiveBattler
_0803838C: .4byte gUnknown_2024018
_08038390:
cmp r2, 0x2
@@ -5057,7 +5057,7 @@ _080383FA:
_08038448:
ldr r0, _08038468 @ =gUnknown_2024018
ldr r2, [r0]
- ldr r0, _0803846C @ =gUnknown_2023BC4
+ ldr r0, _0803846C @ =gActiveBattler
ldrb r1, [r0]
ldr r2, [r2, 0x4]
lsls r0, r1, 1
@@ -5071,7 +5071,7 @@ _08038448:
_08038460: .4byte gUnknown_2037EDC
_08038464: .4byte gUnknown_2037EE1
_08038468: .4byte gUnknown_2024018
-_0803846C: .4byte gUnknown_2023BC4
+_0803846C: .4byte gActiveBattler
_08038470:
ldrb r1, [r0]
movs r0, 0x40
@@ -5118,7 +5118,7 @@ sub_80384BC: @ 80384BC
strh r1, [r0]
ldr r0, _080384F4 @ =gUnknown_2022976
strh r1, [r0]
- ldr r0, _080384F8 @ =gUnknown_2023BC4
+ ldr r0, _080384F8 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
ldr r1, _080384FC @ =gUnknown_2022BC6
@@ -5137,7 +5137,7 @@ sub_80384BC: @ 80384BC
.align 2, 0
_080384F0: .4byte gUnknown_2022974
_080384F4: .4byte gUnknown_2022976
-_080384F8: .4byte gUnknown_2023BC4
+_080384F8: .4byte gActiveBattler
_080384FC: .4byte gUnknown_2022BC6
_08038500: .4byte gUnknown_202298C
_08038504:
@@ -5145,7 +5145,7 @@ _08038504:
movs r1, 0
bl sub_80D87BC
_0803850C:
- ldr r0, _08038538 @ =gUnknown_2022B4C
+ ldr r0, _08038538 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x10
ands r0, r1
@@ -5158,7 +5158,7 @@ _0803850C:
cmp r1, r0
bne _08038568
ldr r1, _08038540 @ =gUnknown_3004FE0
- ldr r0, _08038544 @ =gUnknown_2023BC4
+ ldr r0, _08038544 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -5166,14 +5166,14 @@ _0803850C:
b _08038574
.align 2, 0
_08038534: .4byte gUnknown_202298C
-_08038538: .4byte gUnknown_2022B4C
+_08038538: .4byte gBattleTypeFlags
_0803853C: .4byte 0x0000017f
_08038540: .4byte gUnknown_3004FE0
-_08038544: .4byte gUnknown_2023BC4
+_08038544: .4byte gActiveBattler
_08038548: .4byte sub_80E85C0
_0803854C:
ldr r1, _0803855C @ =gUnknown_3004FE0
- ldr r0, _08038560 @ =gUnknown_2023BC4
+ ldr r0, _08038560 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -5181,11 +5181,11 @@ _0803854C:
b _08038574
.align 2, 0
_0803855C: .4byte gUnknown_3004FE0
-_08038560: .4byte gUnknown_2023BC4
+_08038560: .4byte gActiveBattler
_08038564: .4byte sub_80E8598
_08038568:
ldr r1, _0803857C @ =gUnknown_3004FE0
- ldr r0, _08038580 @ =gUnknown_2023BC4
+ ldr r0, _08038580 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -5197,7 +5197,7 @@ _08038574:
bx r0
.align 2, 0
_0803857C: .4byte gUnknown_3004FE0
-_08038580: .4byte gUnknown_2023BC4
+_08038580: .4byte gActiveBattler
_08038584: .4byte sub_80361E4
thumb_func_end sub_80384BC
@@ -5229,20 +5229,20 @@ sub_80385A4: @ 80385A4
thumb_func_start sub_80385B0
sub_80385B0: @ 80385B0
push {r4-r6,lr}
- ldr r6, _080385E4 @ =gUnknown_2023BC4
+ ldr r6, _080385E4 @ =gActiveBattler
ldrb r0, [r6]
lsls r0, 9
ldr r1, _080385E8 @ =gUnknown_2022BC8
adds r5, r0, r1
- ldr r0, _080385EC @ =gUnknown_2022B4C
+ ldr r0, _080385EC @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x93
lsls r1, 3
ands r0, r1
cmp r0, 0
beq _08038680
- bl sub_80C6DA0
- bl sub_80C6F44
+ bl BattleAI_SetupAIData
+ bl BattleAI_GetAIActionToUse
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x4
@@ -5253,9 +5253,9 @@ sub_80385B0: @ 80385B0
movs r1, 0x4
b _080385F4
.align 2, 0
-_080385E4: .4byte gUnknown_2023BC4
+_080385E4: .4byte gActiveBattler
_080385E8: .4byte gUnknown_2022BC8
-_080385EC: .4byte gUnknown_2022B4C
+_080385EC: .4byte gBattleTypeFlags
_080385F0:
movs r0, 0x1
movs r1, 0x3
@@ -5264,7 +5264,7 @@ _080385F4:
bl EmitTwoReturnValues
b _08038668
_080385FC:
- ldr r3, _08038670 @ =gUnknown_8250C04
+ ldr r3, _08038670 @ =gBattleMoves
lsls r0, r4, 1
adds r2, r5, r0
ldrh r1, [r2]
@@ -5277,7 +5277,7 @@ _080385FC:
ands r0, r1
cmp r0, 0
beq _0803861C
- ldr r1, _08038674 @ =gUnknown_2023D6C
+ ldr r1, _08038674 @ =gBattlerTarget
ldrb r0, [r6]
strb r0, [r1]
_0803861C:
@@ -5293,11 +5293,11 @@ _0803861C:
beq _08038656
movs r0, 0
bl GetBankByIdentity
- ldr r5, _08038674 @ =gUnknown_2023D6C
+ ldr r5, _08038674 @ =gBattlerTarget
strb r0, [r5]
- ldr r0, _08038678 @ =gUnknown_2023D70
+ ldr r0, _08038678 @ =gAbsentBattlerFlags
ldrb r1, [r0]
- ldr r2, _0803867C @ =gUnknown_825E45C
+ ldr r2, _0803867C @ =gBitTable
ldrb r0, [r5]
lsls r0, 2
adds r0, r2
@@ -5309,7 +5309,7 @@ _0803861C:
bl GetBankByIdentity
strb r0, [r5]
_08038656:
- ldr r0, _08038674 @ =gUnknown_2023D6C
+ ldr r0, _08038674 @ =gBattlerTarget
ldrb r0, [r0]
lsls r0, 8
orrs r4, r0
@@ -5321,10 +5321,10 @@ _08038668:
bl OpponentBufferExecCompleted
b _08038712
.align 2, 0
-_08038670: .4byte gUnknown_8250C04
-_08038674: .4byte gUnknown_2023D6C
-_08038678: .4byte gUnknown_2023D70
-_0803867C: .4byte gUnknown_825E45C
+_08038670: .4byte gBattleMoves
+_08038674: .4byte gBattlerTarget
+_08038678: .4byte gAbsentBattlerFlags
+_0803867C: .4byte gBitTable
_08038680:
movs r6, 0x3
_08038682:
@@ -5336,7 +5336,7 @@ _08038682:
ldrh r2, [r0]
cmp r2, 0
beq _08038682
- ldr r1, _080386BC @ =gUnknown_8250C04
+ ldr r1, _080386BC @ =gBattleMoves
lsls r0, r2, 1
adds r0, r2
lsls r0, 2
@@ -5346,7 +5346,7 @@ _08038682:
ands r0, r1
cmp r0, 0
beq _080386C4
- ldr r0, _080386C0 @ =gUnknown_2023BC4
+ ldr r0, _080386C0 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 8
orrs r4, r0
@@ -5356,10 +5356,10 @@ _08038682:
bl EmitTwoReturnValues
b _0803870E
.align 2, 0
-_080386BC: .4byte gUnknown_8250C04
-_080386C0: .4byte gUnknown_2023BC4
+_080386BC: .4byte gBattleMoves
+_080386C0: .4byte gActiveBattler
_080386C4:
- ldr r0, _080386F4 @ =gUnknown_2022B4C
+ ldr r0, _080386F4 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
@@ -5381,7 +5381,7 @@ _080386C4:
bl EmitTwoReturnValues
b _0803870E
.align 2, 0
-_080386F4: .4byte gUnknown_2022B4C
+_080386F4: .4byte gBattleTypeFlags
_080386F8:
movs r0, 0
bl GetBankByIdentity
@@ -5403,10 +5403,10 @@ _08038712:
thumb_func_start sub_8038718
sub_8038718: @ 8038718
push {lr}
- ldr r0, _0803873C @ =gUnknown_2023BC4
+ ldr r0, _0803873C @ =gActiveBattler
ldrb r0, [r0]
lsrs r0, 1
- ldr r1, _08038740 @ =gUnknown_2023FE8
+ ldr r1, _08038740 @ =gBattleStruct
ldr r1, [r1]
lsls r0, 1
adds r0, r1
@@ -5418,19 +5418,19 @@ sub_8038718: @ 8038718
pop {r0}
bx r0
.align 2, 0
-_0803873C: .4byte gUnknown_2023BC4
-_08038740: .4byte gUnknown_2023FE8
+_0803873C: .4byte gActiveBattler
+_08038740: .4byte gBattleStruct
thumb_func_end sub_8038718
thumb_func_start sub_8038744
sub_8038744: @ 8038744
push {r4-r6,lr}
- ldr r6, _08038788 @ =gUnknown_2023BC4
+ ldr r6, _08038788 @ =gActiveBattler
ldrb r0, [r6]
bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
- ldr r5, _0803878C @ =gUnknown_2023FE8
+ ldr r5, _0803878C @ =gBattleStruct
ldr r1, [r5]
adds r0, r1
adds r0, 0x92
@@ -5442,7 +5442,7 @@ sub_8038744: @ 8038744
lsrs r4, r0, 24
cmp r4, 0x6
bne _0803880A
- ldr r0, _08038790 @ =gUnknown_2022B4C
+ ldr r0, _08038790 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
@@ -5455,9 +5455,9 @@ sub_8038744: @ 8038744
adds r6, r5, 0
b _080387A8
.align 2, 0
-_08038788: .4byte gUnknown_2023BC4
-_0803878C: .4byte gUnknown_2023FE8
-_08038790: .4byte gUnknown_2022B4C
+_08038788: .4byte gActiveBattler
+_0803878C: .4byte gBattleStruct
+_08038790: .4byte gBattleTypeFlags
_08038794:
movs r0, 0x1
bl GetBankByIdentity
@@ -5477,13 +5477,13 @@ _080387AE:
bgt _0803880A
movs r0, 0x64
muls r0, r4
- ldr r1, _080387DC @ =gUnknown_202402C
+ ldr r1, _080387DC @ =gEnemyParty
adds r0, r1
movs r1, 0x39
bl GetMonData
cmp r0, 0
beq _080387AC
- ldr r1, _080387E0 @ =gUnknown_2023BCE
+ ldr r1, _080387E0 @ =gBattlerPartyIndexes
lsls r0, r6, 1
adds r0, r1
ldrh r0, [r0]
@@ -5496,8 +5496,8 @@ _080387AE:
beq _080387AC
b _0803880A
.align 2, 0
-_080387DC: .4byte gUnknown_202402C
-_080387E0: .4byte gUnknown_2023BCE
+_080387DC: .4byte gEnemyParty
+_080387E0: .4byte gBattlerPartyIndexes
_080387E4:
ldrb r0, [r6]
bl GetBankIdentity
@@ -5517,9 +5517,9 @@ _080387E4:
movs r1, 0x6
strb r1, [r0]
_0803880A:
- ldr r0, _08038830 @ =gUnknown_2023BC4
+ ldr r0, _08038830 @ =gActiveBattler
ldrb r0, [r0]
- ldr r1, _08038834 @ =gUnknown_2023FE8
+ ldr r1, _08038834 @ =gBattleStruct
ldr r1, [r1]
adds r0, r1
adds r0, 0x5C
@@ -5534,8 +5534,8 @@ _0803880A:
pop {r0}
bx r0
.align 2, 0
-_08038830: .4byte gUnknown_2023BC4
-_08038834: .4byte gUnknown_2023FE8
+_08038830: .4byte gActiveBattler
+_08038834: .4byte gBattleStruct
thumb_func_end sub_8038744
thumb_func_start sub_8038838
@@ -5556,7 +5556,7 @@ sub_8038844: @ 8038844
movs r0, 0
bl LoadBattleBarGfx
ldr r3, _080388BC @ =gUnknown_2022BC4
- ldr r0, _080388C0 @ =gUnknown_2023BC4
+ ldr r0, _080388C0 @ =gActiveBattler
mov r9, r0
ldrb r4, [r0]
lsls r2, r4, 9
@@ -5573,13 +5573,13 @@ sub_8038844: @ 8038844
ldr r0, _080388C4 @ =0x00007fff
cmp r7, r0
beq _080388D4
- ldr r6, _080388C8 @ =gUnknown_2023BCE
+ ldr r6, _080388C8 @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r6
ldrh r0, [r0]
movs r5, 0x64
muls r0, r5
- ldr r4, _080388CC @ =gUnknown_202402C
+ ldr r4, _080388CC @ =gEnemyParty
adds r0, r4
movs r1, 0x3A
bl GetMonData
@@ -5605,19 +5605,19 @@ sub_8038844: @ 8038844
b _080388FE
.align 2, 0
_080388BC: .4byte gUnknown_2022BC4
-_080388C0: .4byte gUnknown_2023BC4
+_080388C0: .4byte gActiveBattler
_080388C4: .4byte 0x00007fff
-_080388C8: .4byte gUnknown_2023BCE
-_080388CC: .4byte gUnknown_202402C
+_080388C8: .4byte gBattlerPartyIndexes
+_080388CC: .4byte gEnemyParty
_080388D0: .4byte gUnknown_3004FF0
_080388D4:
- ldr r1, _0803891C @ =gUnknown_2023BCE
+ ldr r1, _0803891C @ =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _08038920 @ =gUnknown_202402C
+ ldr r1, _08038920 @ =gEnemyParty
adds r0, r1
movs r1, 0x3A
bl GetMonData
@@ -5632,7 +5632,7 @@ _080388D4:
bl SetBattleBarStruct
_080388FE:
ldr r1, _08038928 @ =gUnknown_3004FE0
- ldr r0, _0803892C @ =gUnknown_2023BC4
+ ldr r0, _0803892C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -5646,11 +5646,11 @@ _080388FE:
pop {r0}
bx r0
.align 2, 0
-_0803891C: .4byte gUnknown_2023BCE
-_08038920: .4byte gUnknown_202402C
+_0803891C: .4byte gBattlerPartyIndexes
+_08038920: .4byte gEnemyParty
_08038924: .4byte gUnknown_3004FF0
_08038928: .4byte gUnknown_3004FE0
-_0803892C: .4byte gUnknown_2023BC4
+_0803892C: .4byte gActiveBattler
_08038930: .4byte sub_80360A0
thumb_func_end sub_8038844
@@ -5665,7 +5665,7 @@ sub_8038934: @ 8038934
thumb_func_start sub_8038940
sub_8038940: @ 8038940
push {r4,lr}
- ldr r4, _0803899C @ =gUnknown_2023BC4
+ ldr r4, _0803899C @ =gActiveBattler
ldrb r0, [r4]
bl mplay_80342A4
lsls r0, 24
@@ -5675,13 +5675,13 @@ sub_8038940: @ 8038940
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
- ldr r2, _080389A4 @ =gUnknown_2023BCE
+ ldr r2, _080389A4 @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
- ldr r2, _080389A8 @ =gUnknown_202402C
+ ldr r2, _080389A8 @ =gEnemyParty
adds r1, r2
movs r2, 0x9
bl UpdateHealthboxAttribute
@@ -5709,10 +5709,10 @@ _08038994:
pop {r0}
bx r0
.align 2, 0
-_0803899C: .4byte gUnknown_2023BC4
+_0803899C: .4byte gActiveBattler
_080389A0: .4byte gUnknown_3004FF0
-_080389A4: .4byte gUnknown_2023BCE
-_080389A8: .4byte gUnknown_202402C
+_080389A4: .4byte gBattlerPartyIndexes
+_080389A8: .4byte gEnemyParty
_080389AC: .4byte gUnknown_2024018
_080389B0: .4byte gUnknown_3004FE0
_080389B4: .4byte sub_80364D0
@@ -5721,7 +5721,7 @@ _080389B4: .4byte sub_80364D0
thumb_func_start sub_80389B8
sub_80389B8: @ 80389B8
push {r4,r5,lr}
- ldr r5, _08038A10 @ =gUnknown_2023BC4
+ ldr r5, _08038A10 @ =gActiveBattler
ldrb r0, [r5]
bl mplay_80342A4
lsls r0, 24
@@ -5763,7 +5763,7 @@ _08038A08:
pop {r0}
bx r0
.align 2, 0
-_08038A10: .4byte gUnknown_2023BC4
+_08038A10: .4byte gActiveBattler
_08038A14: .4byte gUnknown_2022BC4
_08038A18: .4byte gUnknown_3004FE0
_08038A1C: .4byte sub_80364D0
@@ -5862,7 +5862,7 @@ OpponentHandlecmd38: @ 8038AA8
push {lr}
ldr r3, _08038AD4 @ =gUnknown_2022870
ldr r1, _08038AD8 @ =gUnknown_2022BC4
- ldr r0, _08038ADC @ =gUnknown_2023BC4
+ ldr r0, _08038ADC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -5882,7 +5882,7 @@ OpponentHandlecmd38: @ 8038AA8
.align 2, 0
_08038AD4: .4byte gUnknown_2022870
_08038AD8: .4byte gUnknown_2022BC4
-_08038ADC: .4byte gUnknown_2023BC4
+_08038ADC: .4byte gActiveBattler
thumb_func_end OpponentHandlecmd38
thumb_func_start OpponentHandlecmd39
@@ -5927,7 +5927,7 @@ OpponentHandleHitAnimation: @ 8038B20
push {r4,lr}
ldr r3, _08038B48 @ =gSprites
ldr r2, _08038B4C @ =gUnknown_2023D44
- ldr r4, _08038B50 @ =gUnknown_2023BC4
+ ldr r4, _08038B50 @ =gActiveBattler
ldrb r0, [r4]
adds r0, r2
ldrb r1, [r0]
@@ -5945,7 +5945,7 @@ OpponentHandleHitAnimation: @ 8038B20
.align 2, 0
_08038B48: .4byte gSprites
_08038B4C: .4byte gUnknown_2023D44
-_08038B50: .4byte gUnknown_2023BC4
+_08038B50: .4byte gActiveBattler
_08038B54:
ldr r1, _08038B84 @ =gUnknown_2024005
movs r0, 0x1
@@ -5988,7 +5988,7 @@ sub_8038B90: @ 8038B90
thumb_func_start OpponentHandleEffectivenessSound
OpponentHandleEffectivenessSound: @ 8038B9C
push {r4,lr}
- ldr r4, _08038BD8 @ =gUnknown_2023BC4
+ ldr r4, _08038BD8 @ =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -6016,7 +6016,7 @@ _08038BB0:
pop {r0}
bx r0
.align 2, 0
-_08038BD8: .4byte gUnknown_2023BC4
+_08038BD8: .4byte gActiveBattler
_08038BDC: .4byte gUnknown_2022BC4
thumb_func_end OpponentHandleEffectivenessSound
@@ -6024,7 +6024,7 @@ _08038BDC: .4byte gUnknown_2022BC4
OpponentHandlecmd44: @ 8038BE0
push {lr}
ldr r2, _08038C08 @ =gUnknown_2022BC4
- ldr r0, _08038C0C @ =gUnknown_2023BC4
+ ldr r0, _08038C0C @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
adds r0, r2, 0x1
@@ -6041,21 +6041,21 @@ OpponentHandlecmd44: @ 8038BE0
bx r0
.align 2, 0
_08038C08: .4byte gUnknown_2022BC4
-_08038C0C: .4byte gUnknown_2023BC4
+_08038C0C: .4byte gActiveBattler
thumb_func_end OpponentHandlecmd44
thumb_func_start OpponentHandleFaintingCry
OpponentHandleFaintingCry: @ 8038C10
push {lr}
- ldr r1, _08038C40 @ =gUnknown_2023BCE
- ldr r0, _08038C44 @ =gUnknown_2023BC4
+ ldr r1, _08038C40 @ =gBattlerPartyIndexes
+ ldr r0, _08038C44 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
- ldr r1, _08038C48 @ =gUnknown_202402C
+ ldr r1, _08038C48 @ =gEnemyParty
adds r0, r1
movs r1, 0xB
bl GetMonData
@@ -6068,16 +6068,16 @@ OpponentHandleFaintingCry: @ 8038C10
pop {r0}
bx r0
.align 2, 0
-_08038C40: .4byte gUnknown_2023BCE
-_08038C44: .4byte gUnknown_2023BC4
-_08038C48: .4byte gUnknown_202402C
+_08038C40: .4byte gBattlerPartyIndexes
+_08038C44: .4byte gActiveBattler
+_08038C48: .4byte gEnemyParty
thumb_func_end OpponentHandleFaintingCry
thumb_func_start OpponentHandleIntroSlide
OpponentHandleIntroSlide: @ 8038C4C
push {lr}
ldr r1, _08038C74 @ =gUnknown_2022BC4
- ldr r0, _08038C78 @ =gUnknown_2023BC4
+ ldr r0, _08038C78 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -6094,7 +6094,7 @@ OpponentHandleIntroSlide: @ 8038C4C
bx r0
.align 2, 0
_08038C74: .4byte gUnknown_2022BC4
-_08038C78: .4byte gUnknown_2023BC4
+_08038C78: .4byte gActiveBattler
_08038C7C: .4byte gUnknown_2023F4C
thumb_func_end OpponentHandleIntroSlide
@@ -6102,7 +6102,7 @@ _08038C7C: .4byte gUnknown_2023F4C
sub_8038C80: @ 8038C80
push {r4-r6,lr}
ldr r5, _08038D60 @ =gUnknown_2023D44
- ldr r6, _08038D64 @ =gUnknown_2023BC4
+ ldr r6, _08038D64 @ =gActiveBattler
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -6212,7 +6212,7 @@ _08038D42:
bx r0
.align 2, 0
_08038D60: .4byte gUnknown_2023D44
-_08038D64: .4byte gUnknown_2023BC4
+_08038D64: .4byte gActiveBattler
_08038D68: .4byte gSprites
_08038D6C: .4byte sub_8075590
_08038D70: .4byte sub_8038D90
@@ -6260,7 +6260,7 @@ sub_8038DC4: @ 8038DC4
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r7, _08038E1C @ =gUnknown_2023BC4
+ ldr r7, _08038E1C @ =gActiveBattler
ldrb r0, [r7]
mov r9, r0
ldr r1, _08038E20 @ =gUnknown_3005090
@@ -6275,7 +6275,7 @@ sub_8038DC4: @ 8038DC4
lsls r0, 24
cmp r0, 0
beq _08038DFE
- ldr r0, _08038E24 @ =gUnknown_2022B4C
+ ldr r0, _08038E24 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x40
ands r0, r1
@@ -6287,7 +6287,7 @@ _08038DFE:
lsls r2, r1, 9
adds r0, 0x1
adds r2, r0
- ldr r0, _08038E2C @ =gUnknown_2023BCE
+ ldr r0, _08038E2C @ =gBattlerPartyIndexes
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
@@ -6297,18 +6297,18 @@ _08038DFE:
bl sub_8037A28
b _08038E70
.align 2, 0
-_08038E1C: .4byte gUnknown_2023BC4
+_08038E1C: .4byte gActiveBattler
_08038E20: .4byte gUnknown_3005090
-_08038E24: .4byte gUnknown_2022B4C
+_08038E24: .4byte gBattleTypeFlags
_08038E28: .4byte gUnknown_2022BC4
-_08038E2C: .4byte gUnknown_2023BCE
+_08038E2C: .4byte gBattlerPartyIndexes
_08038E30:
ldr r4, _08038E94 @ =gUnknown_2022BC4
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
adds r1, r4
- ldr r6, _08038E98 @ =gUnknown_2023BCE
+ ldr r6, _08038E98 @ =gBattlerPartyIndexes
lsls r0, 1
adds r0, r6
ldrh r0, [r0]
@@ -6335,7 +6335,7 @@ _08038E30:
strb r0, [r7]
_08038E70:
ldr r1, _08038E9C @ =gUnknown_3004FE0
- ldr r2, _08038EA0 @ =gUnknown_2023BC4
+ ldr r2, _08038EA0 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -6353,9 +6353,9 @@ _08038E70:
bx r0
.align 2, 0
_08038E94: .4byte gUnknown_2022BC4
-_08038E98: .4byte gUnknown_2023BCE
+_08038E98: .4byte gBattlerPartyIndexes
_08038E9C: .4byte gUnknown_3004FE0
-_08038EA0: .4byte gUnknown_2023BC4
+_08038EA0: .4byte gActiveBattler
_08038EA4: .4byte sub_8035DF0
thumb_func_end sub_8038DC4
@@ -6363,7 +6363,7 @@ _08038EA4: .4byte sub_8035DF0
sub_8038EA8: @ 8038EA8
push {r4-r7,lr}
ldr r1, _08038ED0 @ =gUnknown_2022BC4
- ldr r0, _08038ED4 @ =gUnknown_2023BC4
+ ldr r0, _08038ED4 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x1
@@ -6380,11 +6380,11 @@ sub_8038EA8: @ 8038EA8
b _08038FA2
.align 2, 0
_08038ED0: .4byte gUnknown_2022BC4
-_08038ED4: .4byte gUnknown_2023BC4
+_08038ED4: .4byte gActiveBattler
_08038ED8:
ldr r4, _08038F30 @ =gUnknown_2024018
ldr r0, [r4]
- ldr r3, _08038F34 @ =gUnknown_2023BC4
+ ldr r3, _08038F34 @ =gActiveBattler
ldrb r1, [r3]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -6427,7 +6427,7 @@ _08038ED8:
b _08038FA2
.align 2, 0
_08038F30: .4byte gUnknown_2024018
-_08038F34: .4byte gUnknown_2023BC4
+_08038F34: .4byte gActiveBattler
_08038F38: .4byte gUnknown_2022BC4
_08038F3C:
movs r0, 0x3F
@@ -6499,7 +6499,7 @@ sub_8038FBC: @ 8038FBC
push {r4,lr}
ldr r4, _08038FFC @ =gUnknown_2024018
ldr r0, [r4]
- ldr r3, _08039000 @ =gUnknown_2023BC4
+ ldr r3, _08039000 @ =gActiveBattler
ldrb r1, [r3]
ldr r2, [r0, 0x4]
lsls r0, r1, 1
@@ -6529,7 +6529,7 @@ _08038FF4:
bx r0
.align 2, 0
_08038FFC: .4byte gUnknown_2024018
-_08039000: .4byte gUnknown_2023BC4
+_08039000: .4byte gActiveBattler
thumb_func_end sub_8038FBC
thumb_func_start sub_8039004
@@ -6537,7 +6537,7 @@ sub_8039004: @ 8039004
push {lr}
ldr r0, _08039040 @ =gUnknown_2024018
ldr r1, [r0]
- ldr r0, _08039044 @ =gUnknown_2023BC4
+ ldr r0, _08039044 @ =gActiveBattler
ldrb r3, [r0]
ldr r1, [r1, 0x4]
lsls r0, r3, 1
@@ -6565,7 +6565,7 @@ _08039036:
bx r0
.align 2, 0
_08039040: .4byte gUnknown_2024018
-_08039044: .4byte gUnknown_2023BC4
+_08039044: .4byte gActiveBattler
_08039048: .4byte gUnknown_3005090
_0803904C: .4byte gUnknown_2024000
_08039050: .4byte sub_80491B0
@@ -6582,7 +6582,7 @@ sub_8039054: @ 8039054
thumb_func_start sub_8039060
sub_8039060: @ 8039060
push {r4,lr}
- ldr r4, _080390B0 @ =gUnknown_2023BC4
+ ldr r4, _080390B0 @ =gActiveBattler
ldrb r0, [r4]
bl sub_8075224
lsls r0, 24
@@ -6620,7 +6620,7 @@ _080390A6:
pop {r0}
bx r0
.align 2, 0
-_080390B0: .4byte gUnknown_2023BC4
+_080390B0: .4byte gActiveBattler
_080390B4: .4byte gSprites
_080390B8: .4byte gUnknown_2023D44
_080390BC: .4byte gUnknown_2022BC4
@@ -6630,7 +6630,7 @@ _080390BC: .4byte gUnknown_2022BC4
sub_80390C0: @ 80390C0
push {r4-r6,lr}
sub sp, 0x4
- ldr r6, _08039104 @ =gUnknown_2023BC4
+ ldr r6, _08039104 @ =gActiveBattler
ldrb r0, [r6]
bl mplay_80342A4
lsls r0, 24
@@ -6660,7 +6660,7 @@ sub_80390C0: @ 80390C0
bl OpponentBufferExecCompleted
b _08039118
.align 2, 0
-_08039104: .4byte gUnknown_2023BC4
+_08039104: .4byte gActiveBattler
_08039108: .4byte gUnknown_2022BC4
_0803910C:
ldr r0, _08039120 @ =gUnknown_3004FE0
@@ -6698,7 +6698,7 @@ sub_8039134: @ 8039134
thumb_func_start OpponentHandleCmd55
OpponentHandleCmd55: @ 8039140
push {lr}
- ldr r0, _08039174 @ =gUnknown_2022B4C
+ ldr r0, _08039174 @ =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x6
ands r0, r1
@@ -6722,7 +6722,7 @@ _0803916A:
pop {r0}
bx r0
.align 2, 0
-_08039174: .4byte gUnknown_2022B4C
+_08039174: .4byte gBattleTypeFlags
_08039178: .4byte gMain
_0803917C: .4byte 0x00000439
_08039180: .4byte gUnknown_3004F80