summaryrefslogtreecommitdiff
path: root/asm/battle_8.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/battle_8.s')
-rw-r--r--asm/battle_8.s786
1 files changed, 393 insertions, 393 deletions
diff --git a/asm/battle_8.s b/asm/battle_8.s
index 0e4925dfb..366c503f2 100644
--- a/asm/battle_8.s
+++ b/asm/battle_8.s
@@ -6,13 +6,13 @@
.text
- thumb_func_start dp01t_00_7_getattr
-dp01t_00_7_getattr: @ 8033524
+ thumb_func_start OpponentHandleGetAttributes
+OpponentHandleGetAttributes: @ 8033524
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
- ldr r1, _08033550 @ =gUnknown_02023A60
- ldr r0, _08033554 @ =gUnknown_02024A60
+ ldr r1, _08033550 @ =gBattleBufferA
+ ldr r0, _08033554 @ =gActiveBank
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x2
@@ -20,7 +20,7 @@ dp01t_00_7_getattr: @ 8033524
ldrb r0, [r1]
cmp r0, 0
bne _0803355C
- ldr r0, _08033558 @ =gUnknown_02024A6A
+ ldr r0, _08033558 @ =gBattlePartyID
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
@@ -29,9 +29,9 @@ dp01t_00_7_getattr: @ 8033524
adds r6, r0, 0
b _0803357E
.align 2, 0
-_08033550: .4byte gUnknown_02023A60
-_08033554: .4byte gUnknown_02024A60
-_08033558: .4byte gUnknown_02024A6A
+_08033550: .4byte gBattleBufferA
+_08033554: .4byte gActiveBank
+_08033558: .4byte gBattlePartyID
_0803355C:
ldrb r4, [r1]
movs r5, 0
@@ -57,12 +57,12 @@ _0803357E:
movs r0, 0x1
mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
add sp, 0x100
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end dp01t_00_7_getattr
+ thumb_func_end OpponentHandleGetAttributes
thumb_func_start sub_8033598
sub_8033598: @ 8033598
@@ -76,8 +76,8 @@ sub_8033598: @ 8033598
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
- ldr r2, _080335CC @ =gUnknown_02023A60
- ldr r3, _080335D0 @ =gUnknown_02024A60
+ ldr r2, _080335CC @ =gBattleBufferA
+ ldr r3, _080335D0 @ =gActiveBank
ldrb r0, [r3]
lsls r0, 9
adds r1, r2, 0x1
@@ -93,8 +93,8 @@ _080335C2:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080335CC: .4byte gUnknown_02023A60
-_080335D0: .4byte gUnknown_02024A60
+_080335CC: .4byte gBattleBufferA
+_080335D0: .4byte gActiveBank
_080335D4: .4byte _080335D8
.align 2, 0
_080335D8:
@@ -1002,8 +1002,8 @@ _08033D40: .4byte gEnemyParty
dp01t_01_2_read_pokmon_data_slice: @ 8033D44
push {r4-r7,lr}
sub sp, 0x58
- ldr r2, _08033DBC @ =gUnknown_02024A6A
- ldr r5, _08033DC0 @ =gUnknown_02024A60
+ ldr r2, _08033DBC @ =gBattlePartyID
+ ldr r5, _08033DC0 @ =gActiveBank
ldrb r1, [r5]
lsls r0, r1, 1
adds r0, r2
@@ -1011,7 +1011,7 @@ dp01t_01_2_read_pokmon_data_slice: @ 8033D44
movs r0, 0x64
adds r4, r2, 0
muls r4, r0
- ldr r3, _08033DC4 @ =gUnknown_02023A60
+ ldr r3, _08033DC4 @ =gBattleBufferA
lsls r1, 9
adds r0, r3, 0x1
adds r0, r1, r0
@@ -1054,23 +1054,23 @@ _08033D9A:
movs r0, 0x1
adds r2, r4, 0
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
add sp, 0x58
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
-_08033DBC: .4byte gUnknown_02024A6A
-_08033DC0: .4byte gUnknown_02024A60
-_08033DC4: .4byte gUnknown_02023A60
+_08033DBC: .4byte gBattlePartyID
+_08033DC0: .4byte gActiveBank
+_08033DC4: .4byte gBattleBufferA
_08033DC8: .4byte gEnemyParty
thumb_func_end dp01t_01_2_read_pokmon_data_slice
- thumb_func_start dp01t_02_7_setattr
-dp01t_02_7_setattr: @ 8033DCC
+ thumb_func_start OpponentHandleSetAttributes
+OpponentHandleSetAttributes: @ 8033DCC
push {r4,r5,lr}
- ldr r1, _08033DF0 @ =gUnknown_02023A60
- ldr r0, _08033DF4 @ =gUnknown_02024A60
+ ldr r1, _08033DF0 @ =gBattleBufferA
+ ldr r0, _08033DF4 @ =gActiveBank
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x2
@@ -1078,16 +1078,16 @@ dp01t_02_7_setattr: @ 8033DCC
ldrb r0, [r1]
cmp r0, 0
bne _08033DFC
- ldr r0, _08033DF8 @ =gUnknown_02024A6A
+ ldr r0, _08033DF8 @ =gBattlePartyID
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
bl sub_8033E24
b _08033E1A
.align 2, 0
-_08033DF0: .4byte gUnknown_02023A60
-_08033DF4: .4byte gUnknown_02024A60
-_08033DF8: .4byte gUnknown_02024A6A
+_08033DF0: .4byte gBattleBufferA
+_08033DF4: .4byte gActiveBank
+_08033DF8: .4byte gBattlePartyID
_08033DFC:
ldrb r4, [r1]
movs r5, 0
@@ -1106,11 +1106,11 @@ _08033E0E:
cmp r5, 0x5
bls _08033E00
_08033E1A:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end dp01t_02_7_setattr
+ thumb_func_end OpponentHandleSetAttributes
thumb_func_start sub_8033E24
sub_8033E24: @ 8033E24
@@ -1122,7 +1122,7 @@ sub_8033E24: @ 8033E24
sub sp, 0x38
lsls r0, 24
lsrs r5, r0, 24
- ldr r3, _08033E5C @ =gUnknown_02024A60
+ ldr r3, _08033E5C @ =gActiveBank
ldrb r0, [r3]
lsls r0, 9
ldr r2, _08033E60 @ =gUnknown_02023A63
@@ -1143,7 +1143,7 @@ _08033E52:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_08033E5C: .4byte gUnknown_02024A60
+_08033E5C: .4byte gActiveBank
_08033E60: .4byte gUnknown_02023A63
_08033E64: .4byte _08033E68
.align 2, 0
@@ -1462,7 +1462,7 @@ _0803417C:
muls r0, r5
ldr r1, _08034194 @ =gEnemyParty
adds r0, r1
- ldr r3, _08034198 @ =gUnknown_02023A60
+ ldr r3, _08034198 @ =gBattleBufferA
ldrb r2, [r6]
lsls r2, 9
adds r1, r3, 0x1
@@ -1472,7 +1472,7 @@ _0803417C:
b _0803421A
.align 2, 0
_08034194: .4byte gEnemyParty
-_08034198: .4byte gUnknown_02023A60
+_08034198: .4byte gBattleBufferA
_0803419C:
movs r0, 0x64
adds r4, r5, 0
@@ -1526,7 +1526,7 @@ _08034204:
muls r0, r5
ldr r1, _08034224 @ =gEnemyParty
adds r0, r1
- ldr r3, _08034228 @ =gUnknown_02023A60
+ ldr r3, _08034228 @ =gBattleBufferA
ldrb r2, [r6]
lsls r2, 9
adds r1, r3, 0x1
@@ -1540,7 +1540,7 @@ _0803421A:
b _08034730
.align 2, 0
_08034224: .4byte gEnemyParty
-_08034228: .4byte gUnknown_02023A60
+_08034228: .4byte gBattleBufferA
_0803422C:
movs r0, 0x64
muls r0, r5
@@ -2155,8 +2155,8 @@ _08034740: .4byte gEnemyParty
thumb_func_start sub_8034744
sub_8034744: @ 8034744
push {r4-r7,lr}
- ldr r1, _080347A8 @ =gUnknown_02024A6A
- ldr r7, _080347AC @ =gUnknown_02024A60
+ ldr r1, _080347A8 @ =gBattlePartyID
+ ldr r7, _080347AC @ =gActiveBank
ldrb r2, [r7]
lsls r0, r2, 1
adds r0, r1
@@ -2164,7 +2164,7 @@ sub_8034744: @ 8034744
movs r0, 0x64
adds r3, r1, 0
muls r3, r0
- ldr r4, _080347B0 @ =gUnknown_02023A60
+ ldr r4, _080347B0 @ =gBattleBufferA
lsls r2, 9
adds r0, r4, 0x1
adds r0, r2, r0
@@ -2200,28 +2200,28 @@ _0803477A:
cmp r3, r0
bcc _0803477A
_0803479C:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
-_080347A8: .4byte gUnknown_02024A6A
-_080347AC: .4byte gUnknown_02024A60
-_080347B0: .4byte gUnknown_02023A60
+_080347A8: .4byte gBattlePartyID
+_080347AC: .4byte gActiveBank
+_080347B0: .4byte gBattleBufferA
_080347B4: .4byte gEnemyParty
thumb_func_end sub_8034744
- thumb_func_start sub_80347B8
-sub_80347B8: @ 80347B8
+ thumb_func_start OpponentHandleLoadPokeSprite
+OpponentHandleLoadPokeSprite: @ 80347B8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
- ldr r6, _080348E8 @ =gUnknown_02024A60
+ ldr r6, _080348E8 @ =gActiveBank
ldrb r0, [r6]
lsls r0, 1
- ldr r1, _080348EC @ =gUnknown_02024A6A
+ ldr r1, _080348EC @ =gBattlePartyID
adds r0, r1
ldrh r0, [r0]
movs r7, 0x64
@@ -2237,14 +2237,14 @@ sub_80347B8: @ 80347B8
mov r8, r0
ldrb r1, [r6]
lsls r0, r1, 1
- ldr r2, _080348EC @ =gUnknown_02024A6A
+ ldr r2, _080348EC @ =gBattlePartyID
adds r0, r2
ldrh r0, [r0]
muls r0, r7
add r0, r10
bl sub_8031794
ldrb r0, [r6]
- bl battle_get_per_side_status
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2272,7 +2272,7 @@ sub_80347B8: @ 80347B8
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
- ldr r4, _080348F8 @ =gUnknown_02024BE0
+ ldr r4, _080348F8 @ =gObjectBankIDs
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
@@ -2329,7 +2329,7 @@ sub_80347B8: @ 80347B8
bl StartSpriteAnim
ldrb r4, [r6]
lsls r0, r4, 1
- ldr r2, _080348EC @ =gUnknown_02024A6A
+ ldr r2, _080348EC @ =gBattlePartyID
adds r0, r2
ldrh r0, [r0]
muls r0, r7
@@ -2341,7 +2341,7 @@ sub_80347B8: @ 80347B8
lsrs r1, 16
adds r0, r4, 0
bl sub_8032984
- ldr r1, _08034908 @ =gUnknown_03004330
+ ldr r1, _08034908 @ =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -2355,27 +2355,27 @@ sub_80347B8: @ 80347B8
pop {r0}
bx r0
.align 2, 0
-_080348E8: .4byte gUnknown_02024A60
-_080348EC: .4byte gUnknown_02024A6A
+_080348E8: .4byte gActiveBank
+_080348EC: .4byte gBattlePartyID
_080348F0: .4byte gEnemyParty
_080348F4: .4byte gUnknown_02024E8C
-_080348F8: .4byte gUnknown_02024BE0
+_080348F8: .4byte gObjectBankIDs
_080348FC: .4byte gSprites
_08034900: .4byte 0x0000ff10
_08034904: .4byte gBattleMonForms
-_08034908: .4byte gUnknown_03004330
+_08034908: .4byte gBattleBankFunc
_0803490C: .4byte sub_8033018
- thumb_func_end sub_80347B8
+ thumb_func_end OpponentHandleLoadPokeSprite
- thumb_func_start sub_8034910
-sub_8034910: @ 8034910
+ thumb_func_start OpponentHandleSendOutPoke
+OpponentHandleSendOutPoke: @ 8034910
push {r4,lr}
- ldr r1, _08034948 @ =gUnknown_02024A6A
- ldr r4, _0803494C @ =gUnknown_02024A60
+ ldr r1, _08034948 @ =gBattlePartyID
+ ldr r4, _0803494C @ =gActiveBank
ldrb r0, [r4]
lsls r2, r0, 1
adds r2, r1
- ldr r3, _08034950 @ =gUnknown_02023A60
+ ldr r3, _08034950 @ =gBattleBufferA
lsls r0, 9
adds r1, r3, 0x1
adds r0, r1
@@ -2387,7 +2387,7 @@ sub_8034910: @ 8034910
adds r1, r3
ldrb r1, [r1]
bl sub_803495C
- ldr r1, _08034954 @ =gUnknown_03004330
+ ldr r1, _08034954 @ =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -2397,12 +2397,12 @@ sub_8034910: @ 8034910
pop {r0}
bx r0
.align 2, 0
-_08034948: .4byte gUnknown_02024A6A
-_0803494C: .4byte gUnknown_02024A60
-_08034950: .4byte gUnknown_02023A60
-_08034954: .4byte gUnknown_03004330
+_08034948: .4byte gBattlePartyID
+_0803494C: .4byte gActiveBank
+_08034950: .4byte gBattleBufferA
+_08034954: .4byte gBattleBankFunc
_08034958: .4byte sub_80333D4
- thumb_func_end sub_8034910
+ thumb_func_end OpponentHandleSendOutPoke
thumb_func_start sub_803495C
sub_803495C: @ 803495C
@@ -2418,10 +2418,10 @@ sub_803495C: @ 803495C
lsrs r1, 24
adds r0, r6, 0
bl sub_8032AA8
- ldr r0, _08034AB8 @ =gUnknown_02024A6A
+ ldr r0, _08034AB8 @ =gBattlePartyID
lsls r4, r6, 1
adds r4, r0
- ldr r0, _08034ABC @ =gUnknown_02023A60
+ ldr r0, _08034ABC @ =gBattleBufferA
lsls r1, r6, 9
adds r0, 0x1
adds r1, r0
@@ -2456,7 +2456,7 @@ sub_803495C: @ 803495C
adds r1, r6, 0
bl sub_8031794
adds r0, r6, 0
- bl battle_get_per_side_status
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2484,7 +2484,7 @@ sub_803495C: @ 803495C
adds r1, r5, 0
adds r2, r4, 0
bl CreateSprite
- ldr r4, _08034AD0 @ =gUnknown_02024BE0
+ ldr r4, _08034AD0 @ =gObjectBankIDs
adds r4, r6, r4
strb r0, [r4]
ldr r5, _08034AD4 @ =gSprites
@@ -2568,23 +2568,23 @@ sub_803495C: @ 803495C
pop {r0}
bx r0
.align 2, 0
-_08034AB8: .4byte gUnknown_02024A6A
-_08034ABC: .4byte gUnknown_02023A60
+_08034AB8: .4byte gBattlePartyID
+_08034ABC: .4byte gBattleBufferA
_08034AC0: .4byte gEnemyParty
_08034AC4: .4byte sub_80312F0
_08034AC8: .4byte gUnknown_0300434C
_08034ACC: .4byte gUnknown_02024E8C
-_08034AD0: .4byte gUnknown_02024BE0
+_08034AD0: .4byte gObjectBankIDs
_08034AD4: .4byte gSprites
_08034AD8: .4byte gBattleMonForms
_08034ADC: .4byte SpriteCallbackDummy
thumb_func_end sub_803495C
- thumb_func_start sub_8034AE0
-sub_8034AE0: @ 8034AE0
+ thumb_func_start OpponentHandleReturnPokeToBall
+OpponentHandleReturnPokeToBall: @ 8034AE0
push {r4-r6,lr}
- ldr r1, _08034B10 @ =gUnknown_02023A60
- ldr r6, _08034B14 @ =gUnknown_02024A60
+ ldr r1, _08034B10 @ =gBattleBufferA
+ ldr r6, _08034B14 @ =gActiveBank
ldrb r2, [r6]
lsls r0, r2, 9
adds r1, 0x1
@@ -2598,7 +2598,7 @@ sub_8034AE0: @ 8034AE0
ldr r1, _08034B18 @ =0x02017810
adds r0, r1
strb r3, [r0, 0x4]
- ldr r1, _08034B1C @ =gUnknown_03004330
+ ldr r1, _08034B1C @ =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -2606,13 +2606,13 @@ sub_8034AE0: @ 8034AE0
str r1, [r0]
b _08034B60
.align 2, 0
-_08034B10: .4byte gUnknown_02023A60
-_08034B14: .4byte gUnknown_02024A60
+_08034B10: .4byte gBattleBufferA
+_08034B14: .4byte gActiveBank
_08034B18: .4byte 0x02017810
-_08034B1C: .4byte gUnknown_03004330
+_08034B1C: .4byte gBattleBankFunc
_08034B20: .4byte sub_8034B74
_08034B24:
- ldr r5, _08034B68 @ =gUnknown_02024BE0
+ ldr r5, _08034B68 @ =gObjectBankIDs
adds r0, r2, r5
ldrb r1, [r0]
lsls r0, r1, 4
@@ -2631,26 +2631,26 @@ _08034B24:
bl DestroySprite
ldrb r0, [r6]
bl sub_8032A08
- ldr r1, _08034B70 @ =gUnknown_03004340
+ ldr r1, _08034B70 @ =gHealthboxIDs
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
bl sub_8043DB0
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
_08034B60:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_08034B68: .4byte gUnknown_02024BE0
+_08034B68: .4byte gObjectBankIDs
_08034B6C: .4byte gSprites
-_08034B70: .4byte gUnknown_03004340
- thumb_func_end sub_8034AE0
+_08034B70: .4byte gHealthboxIDs
+ thumb_func_end OpponentHandleReturnPokeToBall
thumb_func_start sub_8034B74
sub_8034B74: @ 8034B74
push {r4,r5,lr}
- ldr r5, _08034B90 @ =gUnknown_02024A60
+ ldr r5, _08034B90 @ =gActiveBank
ldrb r2, [r5]
lsls r0, r2, 1
adds r0, r2
@@ -2664,7 +2664,7 @@ sub_8034B74: @ 8034B74
beq _08034BC4
b _08034BEC
.align 2, 0
-_08034B90: .4byte gUnknown_02024A60
+_08034B90: .4byte gActiveBank
_08034B94: .4byte 0x02017810
_08034B98:
lsls r0, r2, 2
@@ -2703,7 +2703,7 @@ _08034BC4:
adds r1, r2, 0
movs r3, 0x2
bl move_anim_start_t4
- ldr r1, _08034BF4 @ =gUnknown_03004330
+ ldr r1, _08034BF4 @ =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -2714,12 +2714,12 @@ _08034BEC:
pop {r0}
bx r0
.align 2, 0
-_08034BF4: .4byte gUnknown_03004330
+_08034BF4: .4byte gBattleBankFunc
_08034BF8: .4byte sub_8033160
thumb_func_end sub_8034B74
- thumb_func_start sub_8034BFC
-sub_8034BFC: @ 8034BFC
+ thumb_func_start OpponentHandleTrainerThrow
+OpponentHandleTrainerThrow: @ 8034BFC
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -2767,14 +2767,14 @@ _08034C48:
ldrb r0, [r0, 0x3]
_08034C56:
mov r9, r0
- ldr r0, _08034D8C @ =gUnknown_02024A60
+ ldr r0, _08034D8C @ =gActiveBank
mov r8, r0
ldrb r1, [r0]
mov r0, r9
bl sub_8031A6C
mov r1, r8
ldrb r0, [r1]
- bl battle_get_per_side_status
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2803,7 +2803,7 @@ _08034C56:
movs r1, 0xB0
adds r2, r4, 0
bl CreateSprite
- ldr r5, _08034D98 @ =gUnknown_02024BE0
+ ldr r5, _08034D98 @ =gObjectBankIDs
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -2899,7 +2899,7 @@ _08034C56:
adds r0, r4
ldr r1, _08034DB4 @ =sub_80313A0
str r1, [r0]
- ldr r1, _08034DB8 @ =gUnknown_03004330
+ ldr r1, _08034DB8 @ =gBattleBankFunc
mov r2, r8
ldrb r0, [r2]
lsls r0, 2
@@ -2914,10 +2914,10 @@ _08034C56:
bx r0
.align 2, 0
_08034D88: .4byte gTrainers
-_08034D8C: .4byte gUnknown_02024A60
+_08034D8C: .4byte gActiveBank
_08034D90: .4byte gUnknown_02024E8C
_08034D94: .4byte gTrainerFrontPicCoords
-_08034D98: .4byte gUnknown_02024BE0
+_08034D98: .4byte gObjectBankIDs
_08034D9C: .4byte gSprites
_08034DA0: .4byte 0x0000ff10
_08034DA4: .4byte gTrainerFrontPicPaletteTable
@@ -2925,12 +2925,12 @@ _08034DA8: .4byte gTrainerFrontPicTable
_08034DAC: .4byte 0x000003ff
_08034DB0: .4byte 0xfffffc00
_08034DB4: .4byte sub_80313A0
-_08034DB8: .4byte gUnknown_03004330
+_08034DB8: .4byte gBattleBankFunc
_08034DBC: .4byte sub_8032B4C
- thumb_func_end sub_8034BFC
+ thumb_func_end OpponentHandleTrainerThrow
- thumb_func_start sub_8034DC0
-sub_8034DC0: @ 8034DC0
+ thumb_func_start OpponentHandleTrainerSlide
+OpponentHandleTrainerSlide: @ 8034DC0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -2978,14 +2978,14 @@ _08034E0C:
ldrb r0, [r0, 0x3]
_08034E1A:
mov r9, r0
- ldr r0, _08034F50 @ =gUnknown_02024A60
+ ldr r0, _08034F50 @ =gActiveBank
mov r8, r0
ldrb r1, [r0]
mov r0, r9
bl sub_8031A6C
mov r1, r8
ldrb r0, [r1]
- bl battle_get_per_side_status
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3007,7 +3007,7 @@ _08034E1A:
movs r1, 0xB0
movs r3, 0x1E
bl CreateSprite
- ldr r5, _08034F5C @ =gUnknown_02024BE0
+ ldr r5, _08034F5C @ =gObjectBankIDs
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -3112,7 +3112,7 @@ _08034E1A:
adds r0, r4
ldr r1, _08034F78 @ =sub_80313A0
str r1, [r0]
- ldr r1, _08034F7C @ =gUnknown_03004330
+ ldr r1, _08034F7C @ =gBattleBankFunc
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
@@ -3126,10 +3126,10 @@ _08034E1A:
bx r0
.align 2, 0
_08034F4C: .4byte gTrainers
-_08034F50: .4byte gUnknown_02024A60
+_08034F50: .4byte gActiveBank
_08034F54: .4byte gUnknown_02024E8C
_08034F58: .4byte gTrainerFrontPicCoords
-_08034F5C: .4byte gUnknown_02024BE0
+_08034F5C: .4byte gObjectBankIDs
_08034F60: .4byte gSprites
_08034F64: .4byte 0x0000fffe
_08034F68: .4byte gTrainerFrontPicPaletteTable
@@ -3137,15 +3137,15 @@ _08034F6C: .4byte gTrainerFrontPicTable
_08034F70: .4byte 0x000003ff
_08034F74: .4byte 0xfffffc00
_08034F78: .4byte sub_80313A0
-_08034F7C: .4byte gUnknown_03004330
+_08034F7C: .4byte gBattleBankFunc
_08034F80: .4byte sub_8032B84
- thumb_func_end sub_8034DC0
+ thumb_func_end OpponentHandleTrainerSlide
- thumb_func_start sub_8034F84
-sub_8034F84: @ 8034F84
+ thumb_func_start OpponentHandleTrainerSlideBack
+OpponentHandleTrainerSlideBack: @ 8034F84
push {r4-r6,lr}
- ldr r6, _08035014 @ =gUnknown_02024BE0
- ldr r4, _08035018 @ =gUnknown_02024A60
+ ldr r6, _08035014 @ =gObjectBankIDs
+ ldr r4, _08035018 @ =gActiveBank
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -3203,7 +3203,7 @@ sub_8034F84: @ 8034F84
adds r0, r5
ldr r1, _08035024 @ =SpriteCallbackDummy
bl oamt_set_x3A_32
- ldr r1, _08035028 @ =gUnknown_03004330
+ ldr r1, _08035028 @ =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -3213,19 +3213,19 @@ sub_8034F84: @ 8034F84
pop {r0}
bx r0
.align 2, 0
-_08035014: .4byte gUnknown_02024BE0
-_08035018: .4byte gUnknown_02024A60
+_08035014: .4byte gObjectBankIDs
+_08035018: .4byte gActiveBank
_0803501C: .4byte gSprites
_08035020: .4byte sub_8078B34
_08035024: .4byte SpriteCallbackDummy
-_08035028: .4byte gUnknown_03004330
+_08035028: .4byte gBattleBankFunc
_0803502C: .4byte sub_8032BBC
- thumb_func_end sub_8034F84
+ thumb_func_end OpponentHandleTrainerSlideBack
thumb_func_start sub_8035030
sub_8035030: @ 8035030
push {r4,r5,lr}
- ldr r5, _08035074 @ =gUnknown_02024A60
+ ldr r5, _08035074 @ =gActiveBank
ldrb r2, [r5]
lsls r0, r2, 1
adds r0, r2
@@ -3259,7 +3259,7 @@ _08035062:
strb r0, [r1, 0x4]
b _080350B8
.align 2, 0
-_08035074: .4byte gUnknown_02024A60
+_08035074: .4byte gActiveBank
_08035078: .4byte 0x02017810
_0803507C:
ldrb r1, [r3]
@@ -3274,7 +3274,7 @@ _0803507C:
movs r1, 0x3F
bl PlaySE12WithPanning
ldr r2, _080350C0 @ =gSprites
- ldr r1, _080350C4 @ =gUnknown_02024BE0
+ ldr r1, _080350C4 @ =gObjectBankIDs
ldrb r0, [r5]
adds r0, r1
ldrb r1, [r0]
@@ -3285,7 +3285,7 @@ _0803507C:
adds r0, r2
ldr r1, _080350C8 @ =sub_8010384
str r1, [r0]
- ldr r1, _080350CC @ =gUnknown_03004330
+ ldr r1, _080350CC @ =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -3297,16 +3297,16 @@ _080350B8:
bx r0
.align 2, 0
_080350C0: .4byte gSprites
-_080350C4: .4byte gUnknown_02024BE0
+_080350C4: .4byte gObjectBankIDs
_080350C8: .4byte sub_8010384
-_080350CC: .4byte gUnknown_03004330
+_080350CC: .4byte gBattleBankFunc
_080350D0: .4byte sub_803311C
thumb_func_end sub_8035030
thumb_func_start sub_80350D4
sub_80350D4: @ 80350D4
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80350D4
@@ -3314,31 +3314,31 @@ sub_80350D4: @ 80350D4
thumb_func_start sub_80350E0
sub_80350E0: @ 80350E0
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80350E0
- thumb_func_start sub_80350EC
-sub_80350EC: @ 80350EC
+ thumb_func_start OpponentHandleBallThrow
+OpponentHandleBallThrow: @ 80350EC
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_80350EC
+ thumb_func_end OpponentHandleBallThrow
- thumb_func_start sub_80350F8
-sub_80350F8: @ 80350F8
+ thumb_func_start OpponentHandlePause
+OpponentHandlePause: @ 80350F8
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_80350F8
+ thumb_func_end OpponentHandlePause
- thumb_func_start sub_8035104
-sub_8035104: @ 8035104
+ thumb_func_start OpponentHandleMoveAnimation
+OpponentHandleMoveAnimation: @ 8035104
push {r4-r6,lr}
- ldr r6, _080351E8 @ =gUnknown_02024A60
+ ldr r6, _080351E8 @ =gActiveBank
ldrb r0, [r6]
bl mplay_80342A4
lsls r0, 24
@@ -3346,7 +3346,7 @@ sub_8035104: @ 8035104
beq _08035116
b _08035226
_08035116:
- ldr r0, _080351EC @ =gUnknown_02023A60
+ ldr r0, _080351EC @ =gBattleBufferA
mov r12, r0
ldrb r2, [r6]
lsls r2, 9
@@ -3365,7 +3365,7 @@ _08035116:
adds r2, r1
ldrb r1, [r2]
strb r1, [r5]
- ldr r4, _080351F4 @ =gUnknown_0202F7BC
+ ldr r4, _080351F4 @ =gMovePowerMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -3379,7 +3379,7 @@ _08035116:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
- ldr r4, _080351F8 @ =gUnknown_0202F7B8
+ ldr r4, _080351F8 @ =gMoveDmgMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -3405,7 +3405,7 @@ _08035116:
lsls r1, 24
orrs r3, r1
str r3, [r4]
- ldr r3, _080351FC @ =gUnknown_0202F7BE
+ ldr r3, _080351FC @ =gHappinessMoveAnim
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -3413,7 +3413,7 @@ _08035116:
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
- ldr r4, _08035200 @ =gUnknown_0202F7C0
+ ldr r4, _08035200 @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -3427,14 +3427,14 @@ _08035116:
lsls r1, 8
orrs r3, r1
strh r3, [r4]
- ldr r3, _08035204 @ =gUnknown_0202F7B4
+ ldr r3, _08035204 @ =gDisableStructMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
adds r1, 0x10
adds r2, r1
str r2, [r3]
- ldr r3, _08035208 @ =gUnknown_02024E70
+ ldr r3, _08035208 @ =gPID_perBank
ldrb r1, [r6]
lsls r1, 2
adds r1, r3
@@ -3446,18 +3446,18 @@ _08035116:
lsrs r2, r0, 24
cmp r2, 0
beq _0803520C
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
b _08035226
.align 2, 0
-_080351E8: .4byte gUnknown_02024A60
-_080351EC: .4byte gUnknown_02023A60
+_080351E8: .4byte gActiveBank
+_080351EC: .4byte gBattleBufferA
_080351F0: .4byte gUnknown_0202F7C4
-_080351F4: .4byte gUnknown_0202F7BC
-_080351F8: .4byte gUnknown_0202F7B8
-_080351FC: .4byte gUnknown_0202F7BE
-_08035200: .4byte gUnknown_0202F7C0
-_08035204: .4byte gUnknown_0202F7B4
-_08035208: .4byte gUnknown_02024E70
+_080351F4: .4byte gMovePowerMoveAnim
+_080351F8: .4byte gMoveDmgMoveAnim
+_080351FC: .4byte gHappinessMoveAnim
+_08035200: .4byte gWeatherMoveAnim
+_08035204: .4byte gDisableStructMoveAnim
+_08035208: .4byte gPID_perBank
_0803520C:
ldrb r1, [r6]
lsls r0, r1, 1
@@ -3466,7 +3466,7 @@ _0803520C:
ldr r1, _0803522C @ =0x02017810
adds r0, r1
strb r2, [r0, 0x4]
- ldr r1, _08035230 @ =gUnknown_03004330
+ ldr r1, _08035230 @ =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -3478,9 +3478,9 @@ _08035226:
bx r0
.align 2, 0
_0803522C: .4byte 0x02017810
-_08035230: .4byte gUnknown_03004330
+_08035230: .4byte gBattleBankFunc
_08035234: .4byte sub_8035238
- thumb_func_end sub_8035104
+ thumb_func_end OpponentHandleMoveAnimation
thumb_func_start sub_8035238
sub_8035238: @ 8035238
@@ -3488,8 +3488,8 @@ sub_8035238: @ 8035238
mov r7, r9
mov r6, r8
push {r6,r7}
- ldr r2, _0803527C @ =gUnknown_02023A60
- ldr r5, _08035280 @ =gUnknown_02024A60
+ ldr r2, _0803527C @ =gBattleBufferA
+ ldr r5, _08035280 @ =gActiveBank
ldrb r3, [r5]
lsls r1, r3, 9
adds r0, r2, 0x1
@@ -3519,8 +3519,8 @@ sub_8035238: @ 8035238
beq _08035292
b _08035390
.align 2, 0
-_0803527C: .4byte gUnknown_02023A60
-_08035280: .4byte gUnknown_02024A60
+_0803527C: .4byte gBattleBufferA
+_08035280: .4byte gActiveBank
_08035284: .4byte 0x02017810
_08035288:
cmp r2, 0x2
@@ -3608,7 +3608,7 @@ _080352EC:
ands r1, r2
strb r1, [r0]
_08035334:
- ldr r0, _08035350 @ =gUnknown_02024A60
+ ldr r0, _08035350 @ =gActiveBank
ldrb r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -3621,7 +3621,7 @@ _08035334:
.align 2, 0
_08035348: .4byte gAnimScriptCallback
_0803534C: .4byte gAnimScriptActive
-_08035350: .4byte gUnknown_02024A60
+_08035350: .4byte gActiveBank
_08035354: .4byte 0x02017810
_08035358:
ldrb r1, [r0]
@@ -3648,7 +3648,7 @@ _08035358:
lsls r0, 2
adds r0, r6
strb r4, [r0, 0x4]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
_08035390:
pop {r3,r4}
mov r8, r3
@@ -3658,8 +3658,8 @@ _08035390:
bx r0
thumb_func_end sub_8035238
- thumb_func_start sub_803539C
-sub_803539C: @ 803539C
+ thumb_func_start OpponentHandlePrintString
+OpponentHandlePrintString: @ 803539C
push {r4,lr}
sub sp, 0x4
ldr r0, _080353E0 @ =gUnknown_030042A4
@@ -3667,21 +3667,21 @@ sub_803539C: @ 803539C
strh r1, [r0]
ldr r0, _080353E4 @ =gUnknown_030042A0
strh r1, [r0]
- ldr r4, _080353E8 @ =gUnknown_02024A60
+ ldr r4, _080353E8 @ =gActiveBank
ldrb r0, [r4]
lsls r0, 9
ldr r1, _080353EC @ =gUnknown_02023A62
adds r0, r1
ldrh r0, [r0]
- bl sub_8120AA8
+ bl BufferStringBattle
ldr r0, _080353F0 @ =gUnknown_03004210
- ldr r1, _080353F4 @ =gUnknown_020238CC
+ ldr r1, _080353F4 @ =gDisplayedStringBattle
movs r2, 0xF
str r2, [sp]
movs r2, 0x90
movs r3, 0x2
bl sub_8002EB0
- ldr r1, _080353F8 @ =gUnknown_03004330
+ ldr r1, _080353F8 @ =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -3694,27 +3694,27 @@ sub_803539C: @ 803539C
.align 2, 0
_080353E0: .4byte gUnknown_030042A4
_080353E4: .4byte gUnknown_030042A0
-_080353E8: .4byte gUnknown_02024A60
+_080353E8: .4byte gActiveBank
_080353EC: .4byte gUnknown_02023A62
_080353F0: .4byte gUnknown_03004210
-_080353F4: .4byte gUnknown_020238CC
-_080353F8: .4byte gUnknown_03004330
+_080353F4: .4byte gDisplayedStringBattle
+_080353F8: .4byte gBattleBankFunc
_080353FC: .4byte sub_80331D0
- thumb_func_end sub_803539C
+ thumb_func_end OpponentHandlePrintString
- thumb_func_start sub_8035400
-sub_8035400: @ 8035400
+ thumb_func_start OpponentHandlePrintStringPlayerOnly
+OpponentHandlePrintStringPlayerOnly: @ 8035400
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_8035400
+ thumb_func_end OpponentHandlePrintStringPlayerOnly
thumb_func_start sub_803540C
sub_803540C: @ 803540C
push {lr}
bl sub_8036B0C
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803540C
@@ -3722,7 +3722,7 @@ sub_803540C: @ 803540C
thumb_func_start sub_803541C
sub_803541C: @ 803541C
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803541C
@@ -3730,7 +3730,7 @@ sub_803541C: @ 803541C
thumb_func_start sub_8035428
sub_8035428: @ 8035428
push {r4-r6,lr}
- ldr r6, _0803545C @ =gUnknown_02024A60
+ ldr r6, _0803545C @ =gActiveBank
ldrb r0, [r6]
lsls r0, 9
ldr r1, _08035460 @ =gUnknown_02023A64
@@ -3754,7 +3754,7 @@ sub_8035428: @ 8035428
movs r1, 0x4
b _0803546C
.align 2, 0
-_0803545C: .4byte gUnknown_02024A60
+_0803545C: .4byte gActiveBank
_08035460: .4byte gUnknown_02023A64
_08035464: .4byte gBattleTypeFlags
_08035468:
@@ -3778,7 +3778,7 @@ _08035474:
ands r0, r1
cmp r0, 0
beq _08035494
- ldr r1, _080354EC @ =gEnemyMonIndex
+ ldr r1, _080354EC @ =gBankTarget
ldrb r0, [r6]
strb r0, [r1]
_08035494:
@@ -3793,10 +3793,10 @@ _08035494:
cmp r0, 0
beq _080354CE
movs r0, 0
- bl battle_get_side_with_given_state
- ldr r5, _080354EC @ =gEnemyMonIndex
+ bl GetBankByPlayerAI
+ ldr r5, _080354EC @ =gBankTarget
strb r0, [r5]
- ldr r0, _080354F0 @ =gUnknown_02024C0C
+ ldr r0, _080354F0 @ =gAbsentBankFlags
ldrb r1, [r0]
ldr r2, _080354F4 @ =gBitTable
ldrb r0, [r5]
@@ -3807,10 +3807,10 @@ _08035494:
cmp r1, 0
beq _080354CE
movs r0, 0x2
- bl battle_get_side_with_given_state
+ bl GetBankByPlayerAI
strb r0, [r5]
_080354CE:
- ldr r0, _080354EC @ =gEnemyMonIndex
+ ldr r0, _080354EC @ =gBankTarget
ldrb r0, [r0]
lsls r0, 8
orrs r4, r0
@@ -3819,12 +3819,12 @@ _080354CE:
adds r2, r4, 0
bl dp01_build_cmdbuf_x21_a_bb
_080354E0:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
b _0803558A
.align 2, 0
_080354E8: .4byte gBattleMoves
-_080354EC: .4byte gEnemyMonIndex
-_080354F0: .4byte gUnknown_02024C0C
+_080354EC: .4byte gBankTarget
+_080354F0: .4byte gAbsentBankFlags
_080354F4: .4byte gBitTable
_080354F8:
movs r6, 0x3
@@ -3847,7 +3847,7 @@ _080354FA:
ands r0, r1
cmp r0, 0
beq _0803553C
- ldr r0, _08035538 @ =gUnknown_02024A60
+ ldr r0, _08035538 @ =gActiveBank
ldrb r0, [r0]
lsls r0, 8
orrs r4, r0
@@ -3858,7 +3858,7 @@ _080354FA:
b _08035586
.align 2, 0
_08035534: .4byte gBattleMoves
-_08035538: .4byte gUnknown_02024A60
+_08035538: .4byte gActiveBank
_0803553C:
ldr r0, _0803556C @ =gBattleTypeFlags
ldrh r1, [r0]
@@ -3872,7 +3872,7 @@ _0803553C:
lsls r1, 24
lsrs r1, 24
adds r0, r1, 0
- bl battle_get_side_with_given_state
+ bl GetBankByPlayerAI
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@@ -3885,7 +3885,7 @@ _0803553C:
_0803556C: .4byte gBattleTypeFlags
_08035570:
movs r0, 0
- bl battle_get_side_with_given_state
+ bl GetBankByPlayerAI
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@@ -3894,7 +3894,7 @@ _08035570:
movs r1, 0xA
bl dp01_build_cmdbuf_x21_a_bb
_08035586:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
_0803558A:
pop {r4-r6}
pop {r0}
@@ -3905,7 +3905,7 @@ _0803558A:
sub_8035590: @ 8035590
push {lr}
ldr r1, _080355B4 @ =0x02000000
- ldr r0, _080355B8 @ =gUnknown_02024A60
+ ldr r0, _080355B8 @ =gActiveBank
ldrb r0, [r0]
lsrs r0, 1
lsls r0, 1
@@ -3915,12 +3915,12 @@ sub_8035590: @ 8035590
ldrb r1, [r0]
movs r0, 0x1
bl dp01_build_cmdbuf_x23_aa_0
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_080355B4: .4byte 0x02000000
-_080355B8: .4byte gUnknown_02024A60
+_080355B8: .4byte gActiveBank
_080355BC: .4byte 0x000160d4
thumb_func_end sub_8035590
@@ -3928,9 +3928,9 @@ _080355BC: .4byte 0x000160d4
sub_80355C0: @ 80355C0
push {r4-r6,lr}
ldr r6, _08035604 @ =0x02000000
- ldr r5, _08035608 @ =gUnknown_02024A60
+ ldr r5, _08035608 @ =gActiveBank
ldrb r0, [r5]
- bl battle_get_per_side_status
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _0803560C @ =0x000160c8
@@ -3951,23 +3951,23 @@ sub_80355C0: @ 80355C0
cmp r0, 0
bne _08035614
movs r0, 0x1
- bl battle_get_side_with_given_state
+ bl GetBankByPlayerAI
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
b _08035628
.align 2, 0
_08035604: .4byte 0x02000000
-_08035608: .4byte gUnknown_02024A60
+_08035608: .4byte gActiveBank
_0803560C: .4byte 0x000160c8
_08035610: .4byte gBattleTypeFlags
_08035614:
movs r0, 0x1
- bl battle_get_side_with_given_state
+ bl GetBankByPlayerAI
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x3
- bl battle_get_side_with_given_state
+ bl GetBankByPlayerAI
lsls r0, 24
lsrs r5, r0, 24
_08035628:
@@ -3986,7 +3986,7 @@ _0803562E:
bl GetMonData
cmp r0, 0
beq _0803562C
- ldr r1, _08035660 @ =gUnknown_02024A6A
+ ldr r1, _08035660 @ =gBattlePartyID
lsls r0, r6, 1
adds r0, r1
ldrh r0, [r0]
@@ -4000,10 +4000,10 @@ _0803562E:
b _0803568A
.align 2, 0
_0803565C: .4byte gEnemyParty
-_08035660: .4byte gUnknown_02024A6A
+_08035660: .4byte gBattlePartyID
_08035664:
ldrb r0, [r5]
- bl battle_get_per_side_status
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r2, _080356B0 @ =0x000160c8
@@ -4011,7 +4011,7 @@ _08035664:
adds r0, r6
ldrb r4, [r0]
ldrb r0, [r5]
- bl battle_get_per_side_status
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _080356B0 @ =0x000160c8
@@ -4021,7 +4021,7 @@ _08035664:
strb r1, [r0]
_0803568A:
ldr r1, _080356B4 @ =0x02000000
- ldr r0, _080356B8 @ =gUnknown_02024A60
+ ldr r0, _080356B8 @ =gActiveBank
ldrb r0, [r0]
ldr r2, _080356BC @ =0x00016068
adds r0, r2
@@ -4032,27 +4032,27 @@ _0803568A:
movs r0, 0x1
movs r2, 0
bl dp01_build_cmdbuf_x22_a_three_bytes
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080356B0: .4byte 0x000160c8
_080356B4: .4byte 0x02000000
-_080356B8: .4byte gUnknown_02024A60
+_080356B8: .4byte gActiveBank
_080356BC: .4byte 0x00016068
thumb_func_end sub_80355C0
thumb_func_start sub_80356C0
sub_80356C0: @ 80356C0
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80356C0
- thumb_func_start sub_80356CC
-sub_80356CC: @ 80356CC
+ thumb_func_start OpponentHandleHealthBarUpdate
+OpponentHandleHealthBarUpdate: @ 80356CC
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -4060,8 +4060,8 @@ sub_80356CC: @ 80356CC
sub sp, 0x4
movs r0, 0
bl load_gfxc_health_bar
- ldr r3, _08035744 @ =gUnknown_02023A60
- ldr r0, _08035748 @ =gUnknown_02024A60
+ ldr r3, _08035744 @ =gBattleBufferA
+ ldr r0, _08035748 @ =gActiveBank
mov r9, r0
ldrb r4, [r0]
lsls r2, r4, 9
@@ -4078,7 +4078,7 @@ sub_80356CC: @ 80356CC
ldr r0, _0803574C @ =0x00007fff
cmp r7, r0
beq _0803575C
- ldr r6, _08035750 @ =gUnknown_02024A6A
+ ldr r6, _08035750 @ =gBattlePartyID
lsls r0, r4, 1
adds r0, r6
ldrh r0, [r0]
@@ -4101,7 +4101,7 @@ sub_80356CC: @ 80356CC
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
- ldr r1, _08035758 @ =gUnknown_03004340
+ ldr r1, _08035758 @ =gHealthboxIDs
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -4109,14 +4109,14 @@ sub_80356CC: @ 80356CC
bl sub_8043D84
b _08035786
.align 2, 0
-_08035744: .4byte gUnknown_02023A60
-_08035748: .4byte gUnknown_02024A60
+_08035744: .4byte gBattleBufferA
+_08035748: .4byte gActiveBank
_0803574C: .4byte 0x00007fff
-_08035750: .4byte gUnknown_02024A6A
+_08035750: .4byte gBattlePartyID
_08035754: .4byte gEnemyParty
-_08035758: .4byte gUnknown_03004340
+_08035758: .4byte gHealthboxIDs
_0803575C:
- ldr r1, _080357A4 @ =gUnknown_02024A6A
+ ldr r1, _080357A4 @ =gBattlePartyID
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -4129,15 +4129,15 @@ _0803575C:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
- ldr r1, _080357AC @ =gUnknown_03004340
+ ldr r1, _080357AC @ =gHealthboxIDs
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
movs r3, 0
bl sub_8043D84
_08035786:
- ldr r1, _080357B0 @ =gUnknown_03004330
- ldr r0, _080357B4 @ =gUnknown_02024A60
+ ldr r1, _080357B0 @ =gBattleBankFunc
+ ldr r0, _080357B4 @ =gActiveBank
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
@@ -4151,36 +4151,36 @@ _08035786:
pop {r0}
bx r0
.align 2, 0
-_080357A4: .4byte gUnknown_02024A6A
+_080357A4: .4byte gBattlePartyID
_080357A8: .4byte gEnemyParty
-_080357AC: .4byte gUnknown_03004340
-_080357B0: .4byte gUnknown_03004330
-_080357B4: .4byte gUnknown_02024A60
+_080357AC: .4byte gHealthboxIDs
+_080357B0: .4byte gBattleBankFunc
+_080357B4: .4byte gActiveBank
_080357B8: .4byte sub_80330C8
- thumb_func_end sub_80356CC
+ thumb_func_end OpponentHandleHealthBarUpdate
- thumb_func_start sub_80357BC
-sub_80357BC: @ 80357BC
+ thumb_func_start OpponentHandleExpBarUpdate
+OpponentHandleExpBarUpdate: @ 80357BC
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_80357BC
+ thumb_func_end OpponentHandleExpBarUpdate
- thumb_func_start sub_80357C8
-sub_80357C8: @ 80357C8
+ thumb_func_start OpponentHandleStatusIconUpdate
+OpponentHandleStatusIconUpdate: @ 80357C8
push {r4,lr}
- ldr r4, _08035820 @ =gUnknown_02024A60
+ ldr r4, _08035820 @ =gActiveBank
ldrb r0, [r4]
bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08035818
- ldr r0, _08035824 @ =gUnknown_03004340
+ ldr r0, _08035824 @ =gHealthboxIDs
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
- ldr r2, _08035828 @ =gUnknown_02024A6A
+ ldr r2, _08035828 @ =gBattlePartyID
lsls r1, 1
adds r1, r2
ldrh r2, [r1]
@@ -4201,7 +4201,7 @@ sub_80357C8: @ 80357C8
negs r0, r0
ands r0, r2
strb r0, [r1]
- ldr r1, _08035834 @ =gUnknown_03004330
+ ldr r1, _08035834 @ =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -4212,25 +4212,25 @@ _08035818:
pop {r0}
bx r0
.align 2, 0
-_08035820: .4byte gUnknown_02024A60
-_08035824: .4byte gUnknown_03004340
-_08035828: .4byte gUnknown_02024A6A
+_08035820: .4byte gActiveBank
+_08035824: .4byte gHealthboxIDs
+_08035828: .4byte gBattlePartyID
_0803582C: .4byte gEnemyParty
_08035830: .4byte 0x02017810
-_08035834: .4byte gUnknown_03004330
+_08035834: .4byte gBattleBankFunc
_08035838: .4byte sub_8033494
- thumb_func_end sub_80357C8
+ thumb_func_end OpponentHandleStatusIconUpdate
- thumb_func_start sub_803583C
-sub_803583C: @ 803583C
+ thumb_func_start OpponentHandleStatusAnimation
+OpponentHandleStatusAnimation: @ 803583C
push {r4,r5,lr}
- ldr r5, _08035894 @ =gUnknown_02024A60
+ ldr r5, _08035894 @ =gActiveBank
ldrb r0, [r5]
bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _0803588C
- ldr r4, _08035898 @ =gUnknown_02023A60
+ ldr r4, _08035898 @ =gBattleBufferA
ldrb r3, [r5]
lsls r3, 9
adds r0, r4, 0x1
@@ -4255,7 +4255,7 @@ sub_803583C: @ 803583C
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
- ldr r1, _0803589C @ =gUnknown_03004330
+ ldr r1, _0803589C @ =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4266,40 +4266,40 @@ _0803588C:
pop {r0}
bx r0
.align 2, 0
-_08035894: .4byte gUnknown_02024A60
-_08035898: .4byte gUnknown_02023A60
-_0803589C: .4byte gUnknown_03004330
+_08035894: .4byte gActiveBank
+_08035898: .4byte gBattleBufferA
+_0803589C: .4byte gBattleBankFunc
_080358A0: .4byte sub_8033494
- thumb_func_end sub_803583C
+ thumb_func_end OpponentHandleStatusAnimation
- thumb_func_start sub_80358A4
-sub_80358A4: @ 80358A4
+ thumb_func_start OpponentHandleStatusXor
+OpponentHandleStatusXor: @ 80358A4
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_80358A4
+ thumb_func_end OpponentHandleStatusXor
thumb_func_start sub_80358B0
sub_80358B0: @ 80358B0
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80358B0
- thumb_func_start sub_80358BC
-sub_80358BC: @ 80358BC
+ thumb_func_start OpponentHandleDMATransfer
+OpponentHandleDMATransfer: @ 80358BC
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_80358BC
+ thumb_func_end OpponentHandleDMATransfer
thumb_func_start sub_80358C8
sub_80358C8: @ 80358C8
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80358C8
@@ -4307,7 +4307,7 @@ sub_80358C8: @ 80358C8
thumb_func_start sub_80358D4
sub_80358D4: @ 80358D4
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80358D4
@@ -4315,7 +4315,7 @@ sub_80358D4: @ 80358D4
thumb_func_start sub_80358E0
sub_80358E0: @ 80358E0
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80358E0
@@ -4323,7 +4323,7 @@ sub_80358E0: @ 80358E0
thumb_func_start sub_80358EC
sub_80358EC: @ 80358EC
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80358EC
@@ -4331,7 +4331,7 @@ sub_80358EC: @ 80358EC
thumb_func_start sub_80358F8
sub_80358F8: @ 80358F8
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80358F8
@@ -4339,7 +4339,7 @@ sub_80358F8: @ 80358F8
thumb_func_start sub_8035904
sub_8035904: @ 8035904
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8035904
@@ -4353,7 +4353,7 @@ sub_8035910: @ 8035910
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -4364,8 +4364,8 @@ _08035928: .4byte gUnknown_020238C8
sub_803592C: @ 803592C
push {lr}
ldr r3, _08035958 @ =gUnknown_020238C8
- ldr r1, _0803595C @ =gUnknown_02023A60
- ldr r0, _08035960 @ =gUnknown_02024A60
+ ldr r1, _0803595C @ =gBattleBufferA
+ ldr r0, _08035960 @ =gActiveBank
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -4379,13 +4379,13 @@ sub_803592C: @ 803592C
ands r0, r2
orrs r0, r1
strb r0, [r3]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_08035958: .4byte gUnknown_020238C8
-_0803595C: .4byte gUnknown_02023A60
-_08035960: .4byte gUnknown_02024A60
+_0803595C: .4byte gBattleBufferA
+_08035960: .4byte gActiveBank
thumb_func_end sub_803592C
thumb_func_start sub_8035964
@@ -4396,7 +4396,7 @@ sub_8035964: @ 8035964
movs r0, 0x7F
ands r0, r1
strb r0, [r2]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -4418,19 +4418,19 @@ sub_803597C: @ 803597C
ands r0, r2
orrs r0, r1
strb r0, [r3]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_080359A0: .4byte gUnknown_020238C8
thumb_func_end sub_803597C
- thumb_func_start dp01t_29_7_blink
-dp01t_29_7_blink: @ 80359A4
+ thumb_func_start OpponentHandleHitAnimation
+OpponentHandleHitAnimation: @ 80359A4
push {r4,lr}
ldr r3, _080359CC @ =gSprites
- ldr r2, _080359D0 @ =gUnknown_02024BE0
- ldr r4, _080359D4 @ =gUnknown_02024A60
+ ldr r2, _080359D0 @ =gObjectBankIDs
+ ldr r4, _080359D4 @ =gActiveBank
ldrb r0, [r4]
adds r0, r2
ldrb r1, [r0]
@@ -4443,14 +4443,14 @@ dp01t_29_7_blink: @ 80359A4
lsls r0, 29
cmp r0, 0
bge _080359D8
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
b _08035A02
.align 2, 0
_080359CC: .4byte gSprites
-_080359D0: .4byte gUnknown_02024BE0
-_080359D4: .4byte gUnknown_02024A60
+_080359D0: .4byte gObjectBankIDs
+_080359D4: .4byte gActiveBank
_080359D8:
- ldr r1, _08035A08 @ =gUnknown_02024E6D
+ ldr r1, _08035A08 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldrb r0, [r4]
@@ -4464,7 +4464,7 @@ _080359D8:
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_8047858
- ldr r1, _08035A0C @ =gUnknown_03004330
+ ldr r1, _08035A0C @ =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -4475,32 +4475,32 @@ _08035A02:
pop {r0}
bx r0
.align 2, 0
-_08035A08: .4byte gUnknown_02024E6D
-_08035A0C: .4byte gUnknown_03004330
+_08035A08: .4byte gDoingBattleAnim
+_08035A0C: .4byte gBattleBankFunc
_08035A10: .4byte bx_blink_t7
- thumb_func_end dp01t_29_7_blink
+ thumb_func_end OpponentHandleHitAnimation
thumb_func_start sub_8035A14
sub_8035A14: @ 8035A14
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8035A14
- thumb_func_start sub_8035A20
-sub_8035A20: @ 8035A20
+ thumb_func_start OpponentHandleEffectivenessSound
+OpponentHandleEffectivenessSound: @ 8035A20
push {r4,lr}
- ldr r4, _08035A5C @ =gUnknown_02024A60
+ ldr r4, _08035A5C @ =gActiveBank
ldrb r0, [r4]
- bl battle_side_get_owner
+ bl GetBankSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
bne _08035A34
movs r3, 0xC0
_08035A34:
- ldr r2, _08035A60 @ =gUnknown_02023A60
+ ldr r2, _08035A60 @ =gBattleBufferA
ldrb r1, [r4]
lsls r1, 9
adds r0, r2, 0x1
@@ -4514,20 +4514,20 @@ _08035A34:
lsls r1, r3, 24
asrs r1, 24
bl PlaySE12WithPanning
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08035A5C: .4byte gUnknown_02024A60
-_08035A60: .4byte gUnknown_02023A60
- thumb_func_end sub_8035A20
+_08035A5C: .4byte gActiveBank
+_08035A60: .4byte gBattleBufferA
+ thumb_func_end OpponentHandleEffectivenessSound
thumb_func_start sub_8035A64
sub_8035A64: @ 8035A64
push {lr}
- ldr r2, _08035A8C @ =gUnknown_02023A60
- ldr r0, _08035A90 @ =gUnknown_02024A60
+ ldr r2, _08035A8C @ =gBattleBufferA
+ ldr r0, _08035A90 @ =gActiveBank
ldrb r1, [r0]
lsls r1, 9
adds r0, r2, 0x1
@@ -4539,19 +4539,19 @@ sub_8035A64: @ 8035A64
lsls r1, 8
orrs r0, r1
bl PlayFanfare
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
-_08035A8C: .4byte gUnknown_02023A60
-_08035A90: .4byte gUnknown_02024A60
+_08035A8C: .4byte gBattleBufferA
+_08035A90: .4byte gActiveBank
thumb_func_end sub_8035A64
- thumb_func_start sub_8035A94
-sub_8035A94: @ 8035A94
+ thumb_func_start OpponentHandleFaintingCry
+OpponentHandleFaintingCry: @ 8035A94
push {lr}
- ldr r1, _08035AC4 @ =gUnknown_02024A6A
- ldr r0, _08035AC8 @ =gUnknown_02024A60
+ ldr r1, _08035AC4 @ =gBattlePartyID
+ ldr r0, _08035AC8 @ =gActiveBank
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4567,20 +4567,20 @@ sub_8035A94: @ 8035A94
movs r1, 0x19
movs r2, 0x5
bl PlayCry3
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
-_08035AC4: .4byte gUnknown_02024A6A
-_08035AC8: .4byte gUnknown_02024A60
+_08035AC4: .4byte gBattlePartyID
+_08035AC8: .4byte gActiveBank
_08035ACC: .4byte gEnemyParty
- thumb_func_end sub_8035A94
+ thumb_func_end OpponentHandleFaintingCry
thumb_func_start dp01t_2E_7_battle_intro
dp01t_2E_7_battle_intro: @ 8035AD0
push {lr}
- ldr r1, _08035AF8 @ =gUnknown_02023A60
- ldr r0, _08035AFC @ =gUnknown_02024A60
+ ldr r1, _08035AF8 @ =gBattleBufferA
+ ldr r0, _08035AFC @ =gActiveBank
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
@@ -4592,20 +4592,20 @@ dp01t_2E_7_battle_intro: @ 8035AD0
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
-_08035AF8: .4byte gUnknown_02023A60
-_08035AFC: .4byte gUnknown_02024A60
+_08035AF8: .4byte gBattleBufferA
+_08035AFC: .4byte gActiveBank
_08035B00: .4byte gUnknown_02024DE8
thumb_func_end dp01t_2E_7_battle_intro
thumb_func_start sub_8035B04
sub_8035B04: @ 8035B04
push {r4-r6,lr}
- ldr r5, _08035BE0 @ =gUnknown_02024BE0
- ldr r6, _08035BE4 @ =gUnknown_02024A60
+ ldr r5, _08035BE0 @ =gObjectBankIDs
+ ldr r6, _08035BE4 @ =gActiveBank
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -4701,7 +4701,7 @@ _08035BC2:
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
- ldr r1, _08035C08 @ =gUnknown_03004330
+ ldr r1, _08035C08 @ =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -4711,8 +4711,8 @@ _08035BC2:
pop {r0}
bx r0
.align 2, 0
-_08035BE0: .4byte gUnknown_02024BE0
-_08035BE4: .4byte gUnknown_02024A60
+_08035BE0: .4byte gObjectBankIDs
+_08035BE4: .4byte gActiveBank
_08035BE8: .4byte gSprites
_08035BEC: .4byte sub_8078B34
_08035BF0: .4byte sub_8035C10
@@ -4721,7 +4721,7 @@ _08035BF8: .4byte gTasks
_08035BFC: .4byte 0x02017810
_08035C00: .4byte gUnknown_02024E68
_08035C04: .4byte sub_8044CA0
-_08035C08: .4byte gUnknown_03004330
+_08035C08: .4byte gBattleBankFunc
_08035C0C: .4byte nullsub_45
thumb_func_end sub_8035B04
@@ -4760,7 +4760,7 @@ sub_8035C44: @ 8035C44
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r7, _08035C9C @ =gUnknown_02024A60
+ ldr r7, _08035C9C @ =gActiveBank
ldrb r0, [r7]
mov r9, r0
ldr r1, _08035CA0 @ =gTasks
@@ -4782,12 +4782,12 @@ sub_8035C44: @ 8035C44
cmp r0, 0
beq _08035CB0
_08035C7E:
- ldr r0, _08035CA8 @ =gUnknown_02023A60
+ ldr r0, _08035CA8 @ =gBattleBufferA
ldrb r1, [r7]
lsls r2, r1, 9
adds r0, 0x1
adds r2, r0
- ldr r0, _08035CAC @ =gUnknown_02024A6A
+ ldr r0, _08035CAC @ =gBattlePartyID
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
@@ -4797,18 +4797,18 @@ _08035C7E:
bl sub_803495C
b _08035CF0
.align 2, 0
-_08035C9C: .4byte gUnknown_02024A60
+_08035C9C: .4byte gActiveBank
_08035CA0: .4byte gTasks
_08035CA4: .4byte gBattleTypeFlags
-_08035CA8: .4byte gUnknown_02023A60
-_08035CAC: .4byte gUnknown_02024A6A
+_08035CA8: .4byte gBattleBufferA
+_08035CAC: .4byte gBattlePartyID
_08035CB0:
- ldr r4, _08035D14 @ =gUnknown_02023A60
+ ldr r4, _08035D14 @ =gBattleBufferA
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
adds r1, r4
- ldr r6, _08035D18 @ =gUnknown_02024A6A
+ ldr r6, _08035D18 @ =gBattlePartyID
lsls r0, 1
adds r0, r6
ldrh r0, [r0]
@@ -4834,8 +4834,8 @@ _08035CB0:
eors r0, r5
strb r0, [r7]
_08035CF0:
- ldr r1, _08035D1C @ =gUnknown_03004330
- ldr r2, _08035D20 @ =gUnknown_02024A60
+ ldr r1, _08035D1C @ =gBattleBankFunc
+ ldr r2, _08035D20 @ =gActiveBank
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -4852,18 +4852,18 @@ _08035CF0:
pop {r0}
bx r0
.align 2, 0
-_08035D14: .4byte gUnknown_02023A60
-_08035D18: .4byte gUnknown_02024A6A
-_08035D1C: .4byte gUnknown_03004330
-_08035D20: .4byte gUnknown_02024A60
+_08035D14: .4byte gBattleBufferA
+_08035D18: .4byte gBattlePartyID
+_08035D1C: .4byte gBattleBankFunc
+_08035D20: .4byte gActiveBank
_08035D24: .4byte sub_8032E2C
thumb_func_end sub_8035C44
thumb_func_start dp01t_30_7_0803D67C
dp01t_30_7_0803D67C: @ 8035D28
push {r4-r6,lr}
- ldr r1, _08035D50 @ =gUnknown_02023A60
- ldr r0, _08035D54 @ =gUnknown_02024A60
+ ldr r1, _08035D50 @ =gBattleBufferA
+ ldr r0, _08035D54 @ =gActiveBank
ldrb r2, [r0]
lsls r0, r2, 9
adds r1, 0x1
@@ -4872,17 +4872,17 @@ dp01t_30_7_0803D67C: @ 8035D28
cmp r0, 0
beq _08035D58
adds r0, r2, 0
- bl battle_side_get_owner
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08035D58
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
b _08035E12
.align 2, 0
-_08035D50: .4byte gUnknown_02023A60
-_08035D54: .4byte gUnknown_02024A60
+_08035D50: .4byte gBattleBufferA
+_08035D54: .4byte gActiveBank
_08035D58:
- ldr r3, _08035DA8 @ =gUnknown_02024A60
+ ldr r3, _08035DA8 @ =gActiveBank
ldrb r1, [r3]
lsls r0, r1, 1
adds r0, r1
@@ -4893,7 +4893,7 @@ _08035D58:
movs r2, 0x1
orrs r1, r2
strb r1, [r0]
- ldr r1, _08035DB0 @ =gUnknown_02023A60
+ ldr r1, _08035DB0 @ =gBattleBufferA
ldrb r2, [r3]
lsls r0, r2, 9
adds r1, 0x2
@@ -4922,9 +4922,9 @@ _08035D58:
strb r1, [r3, 0x1]
b _08035E12
.align 2, 0
-_08035DA8: .4byte gUnknown_02024A60
+_08035DA8: .4byte gActiveBank
_08035DAC: .4byte 0x02017810
-_08035DB0: .4byte gUnknown_02023A60
+_08035DB0: .4byte gBattleBufferA
_08035DB4:
movs r0, 0x3F
negs r0, r0
@@ -4968,7 +4968,7 @@ _08035DBC:
movs r1, 0x5D
strb r1, [r0, 0x5]
_08035E06:
- ldr r0, _08035E24 @ =gUnknown_03004330
+ ldr r0, _08035E24 @ =gBattleBankFunc
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -4982,14 +4982,14 @@ _08035E12:
_08035E18: .4byte gUnknown_02023A64
_08035E1C: .4byte gUnknown_02024E68
_08035E20: .4byte 0x02017810
-_08035E24: .4byte gUnknown_03004330
+_08035E24: .4byte gBattleBankFunc
_08035E28: .4byte sub_8035E2C
thumb_func_end dp01t_30_7_0803D67C
thumb_func_start sub_8035E2C
sub_8035E2C: @ 8035E2C
push {r4,lr}
- ldr r4, _08035E64 @ =gUnknown_02024A60
+ ldr r4, _08035E64 @ =gActiveBank
ldrb r1, [r4]
lsls r0, r1, 1
adds r0, r1
@@ -5010,20 +5010,20 @@ sub_8035E2C: @ 8035E2C
adds r1, r3
movs r0, 0
strb r0, [r1, 0x5]
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
_08035E5C:
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08035E64: .4byte gUnknown_02024A60
+_08035E64: .4byte gActiveBank
_08035E68: .4byte 0x02017810
thumb_func_end sub_8035E2C
thumb_func_start sub_8035E6C
sub_8035E6C: @ 8035E6C
push {lr}
- ldr r0, _08035EA4 @ =gUnknown_02024A60
+ ldr r0, _08035EA4 @ =gActiveBank
ldrb r3, [r0]
lsls r0, r3, 1
adds r0, r3
@@ -5046,11 +5046,11 @@ sub_8035E6C: @ 8035E6C
ldr r1, _08035EB4 @ =sub_8044CA0
str r1, [r0]
_08035E9A:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
-_08035EA4: .4byte gUnknown_02024A60
+_08035EA4: .4byte gActiveBank
_08035EA8: .4byte 0x02017810
_08035EAC: .4byte gTasks
_08035EB0: .4byte gUnknown_02024E68
@@ -5060,22 +5060,22 @@ _08035EB4: .4byte sub_8044CA0
thumb_func_start sub_8035EB8
sub_8035EB8: @ 8035EB8
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8035EB8
- thumb_func_start sub_8035EC4
-sub_8035EC4: @ 8035EC4
+ thumb_func_start OpponentHandleSpriteInvisibility
+OpponentHandleSpriteInvisibility: @ 8035EC4
push {r4,lr}
- ldr r4, _08035F14 @ =gUnknown_02024A60
+ ldr r4, _08035F14 @ =gActiveBank
ldrb r0, [r4]
bl sub_8078874
lsls r0, 24
cmp r0, 0
beq _08035F0A
ldr r3, _08035F18 @ =gSprites
- ldr r0, _08035F1C @ =gUnknown_02024BE0
+ ldr r0, _08035F1C @ =gObjectBankIDs
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5083,7 +5083,7 @@ sub_8035EC4: @ 8035EC4
adds r2, r0
lsls r2, 2
adds r2, r3
- ldr r0, _08035F20 @ =gUnknown_02023A60
+ ldr r0, _08035F20 @ =gBattleBufferA
lsls r1, 9
adds r0, 0x1
adds r1, r0
@@ -5101,28 +5101,28 @@ sub_8035EC4: @ 8035EC4
ldrb r0, [r4]
bl sub_8031F88
_08035F0A:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08035F14: .4byte gUnknown_02024A60
+_08035F14: .4byte gActiveBank
_08035F18: .4byte gSprites
-_08035F1C: .4byte gUnknown_02024BE0
-_08035F20: .4byte gUnknown_02023A60
- thumb_func_end sub_8035EC4
+_08035F1C: .4byte gObjectBankIDs
+_08035F20: .4byte gBattleBufferA
+ thumb_func_end OpponentHandleSpriteInvisibility
- thumb_func_start dp01t_34_7_move_anim_start_t3
-dp01t_34_7_move_anim_start_t3: @ 8035F24
+ thumb_func_start OpponentHandleBattleAnimation
+OpponentHandleBattleAnimation: @ 8035F24
push {r4-r6,lr}
sub sp, 0x4
- ldr r6, _08035F68 @ =gUnknown_02024A60
+ ldr r6, _08035F68 @ =gActiveBank
ldrb r0, [r6]
bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08035F7C
- ldr r5, _08035F6C @ =gUnknown_02023A60
+ ldr r5, _08035F6C @ =gBattleBufferA
ldrb r2, [r6]
lsls r1, r2, 9
adds r0, r5, 0x1
@@ -5143,13 +5143,13 @@ dp01t_34_7_move_anim_start_t3: @ 8035F24
lsls r0, 24
cmp r0, 0
beq _08035F70
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
b _08035F7C
.align 2, 0
-_08035F68: .4byte gUnknown_02024A60
-_08035F6C: .4byte gUnknown_02023A60
+_08035F68: .4byte gActiveBank
+_08035F6C: .4byte gBattleBufferA
_08035F70:
- ldr r0, _08035F84 @ =gUnknown_03004330
+ ldr r0, _08035F84 @ =gBattleBankFunc
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -5161,25 +5161,25 @@ _08035F7C:
pop {r0}
bx r0
.align 2, 0
-_08035F84: .4byte gUnknown_03004330
+_08035F84: .4byte gBattleBankFunc
_08035F88: .4byte sub_80334C0
- thumb_func_end dp01t_34_7_move_anim_start_t3
+ thumb_func_end OpponentHandleBattleAnimation
- thumb_func_start sub_8035F8C
-sub_8035F8C: @ 8035F8C
+ thumb_func_start OpponentHandleLinkStandbyMsg
+OpponentHandleLinkStandbyMsg: @ 8035F8C
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_8035F8C
+ thumb_func_end OpponentHandleLinkStandbyMsg
- thumb_func_start sub_8035F98
-sub_8035F98: @ 8035F98
+ thumb_func_start OpponentHandleResetActionMoveSelection
+OpponentHandleResetActionMoveSelection: @ 8035F98
push {lr}
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
- thumb_func_end sub_8035F98
+ thumb_func_end OpponentHandleResetActionMoveSelection
thumb_func_start sub_8035FA4
sub_8035FA4: @ 8035FA4
@@ -5198,20 +5198,20 @@ sub_8035FA4: @ 8035FA4
negs r0, r0
ands r0, r1
strb r0, [r3]
- ldr r0, _08035FE4 @ =gUnknown_030042D0
+ ldr r0, _08035FE4 @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
bl SetMainCallback2
_08035FCE:
- bl sub_80334EC
+ bl OpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_08035FD8: .4byte gBattleTypeFlags
_08035FDC: .4byte gMain
_08035FE0: .4byte 0x0000043d
-_08035FE4: .4byte gUnknown_030042D0
+_08035FE4: .4byte gPreBattleCallback1
thumb_func_end sub_8035FA4
thumb_func_start nullsub_46
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-14 16:20:15 +0000