finish decompiling battle_8

3 files changed, 417 insertions, 1337 deletions

diff --git a/asm/battle_8.s b/asm/battle_8.s
deleted file mode 100644
index 8e5c6be01..000000000
--- a/asm/battle_8.s
+++ /dev/null
@@ -1,1327 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8035590
-sub_8035590: @ 8035590
-	push {lr}
-	ldr r1, _080355B4 @ =0x02000000
-	ldr r0, _080355B8 @ =gActiveBank
-	ldrb r0, [r0]
-	lsrs r0, 1
-	lsls r0, 1
-	ldr r2, _080355BC @ =0x000160d4
-	adds r0, r2
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x1
-	bl dp01_build_cmdbuf_x23_aa_0
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080355B4: .4byte 0x02000000
-_080355B8: .4byte gActiveBank
-_080355BC: .4byte 0x000160d4
-	thumb_func_end sub_8035590
-
-	thumb_func_start sub_80355C0
-sub_80355C0: @ 80355C0
-	push {r4-r6,lr}
-	ldr r6, _08035604 @ =0x02000000
-	ldr r5, _08035608 @ =gActiveBank
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 25
-	ldr r1, _0803560C @ =0x000160c8
-	adds r0, r1
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r0, 0x6
-	bne _08035664
-	bl sub_8036CD4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x6
-	bne _0803568A
-	ldr r0, _08035610 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08035614
-	movs r0, 0x1
-	bl GetBankByPlayerAI
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r6, r5, 0
-	b _08035628
-	.align 2, 0
-_08035604: .4byte 0x02000000
-_08035608: .4byte gActiveBank
-_0803560C: .4byte 0x000160c8
-_08035610: .4byte gBattleTypeFlags
-_08035614:
-	movs r0, 0x1
-	bl GetBankByPlayerAI
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r0, 0x3
-	bl GetBankByPlayerAI
-	lsls r0, 24
-	lsrs r5, r0, 24
-_08035628:
-	movs r4, 0
-	b _0803562E
-_0803562C:
-	adds r4, 0x1
-_0803562E:
-	cmp r4, 0x5
-	bgt _0803568A
-	movs r0, 0x64
-	muls r0, r4
-	ldr r1, _0803565C @ =gEnemyParty
-	adds r0, r1
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	beq _0803562C
-	ldr r1, _08035660 @ =gBattlePartyID
-	lsls r0, r6, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r4, r0
-	beq _0803562C
-	lsls r0, r5, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r4, r0
-	beq _0803562C
-	b _0803568A
-	.align 2, 0
-_0803565C: .4byte gEnemyParty
-_08035660: .4byte gBattlePartyID
-_08035664:
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 25
-	ldr r2, _080356B0 @ =0x000160c8
-	adds r0, r2
-	adds r0, r6
-	ldrb r4, [r0]
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 25
-	ldr r1, _080356B0 @ =0x000160c8
-	adds r0, r1
-	adds r0, r6
-	movs r1, 0x6
-	strb r1, [r0]
-_0803568A:
-	ldr r1, _080356B4 @ =0x02000000
-	ldr r0, _080356B8 @ =gActiveBank
-	ldrb r0, [r0]
-	ldr r2, _080356BC @ =0x00016068
-	adds r0, r2
-	adds r0, r1
-	strb r4, [r0]
-	lsls r1, r4, 24
-	lsrs r1, 24
-	movs r0, 0x1
-	movs r2, 0
-	bl dp01_build_cmdbuf_x22_a_three_bytes
-	bl OpponentBufferExecCompleted
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080356B0: .4byte 0x000160c8
-_080356B4: .4byte 0x02000000
-_080356B8: .4byte gActiveBank
-_080356BC: .4byte 0x00016068
-	thumb_func_end sub_80355C0
-
-	thumb_func_start sub_80356C0
-sub_80356C0: @ 80356C0
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80356C0
-
-	thumb_func_start OpponentHandleHealthBarUpdate
-OpponentHandleHealthBarUpdate: @ 80356CC
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x4
-	movs r0, 0
-	bl load_gfxc_health_bar
-	ldr r3, _08035744 @ =gBattleBufferA
-	ldr r0, _08035748 @ =gActiveBank
-	mov r9, r0
-	ldrb r4, [r0]
-	lsls r2, r4, 9
-	adds r0, r3, 0x3
-	adds r0, r2, r0
-	ldrb r1, [r0]
-	lsls r1, 8
-	adds r3, 0x2
-	adds r2, r3
-	ldrb r0, [r2]
-	orrs r0, r1
-	lsls r0, 16
-	asrs r7, r0, 16
-	ldr r0, _0803574C @ =0x00007fff
-	cmp r7, r0
-	beq _0803575C
-	ldr r6, _08035750 @ =gBattlePartyID
-	lsls r0, r4, 1
-	adds r0, r6
-	ldrh r0, [r0]
-	movs r5, 0x64
-	muls r0, r5
-	ldr r4, _08035754 @ =gEnemyParty
-	adds r0, r4
-	movs r1, 0x3A
-	bl GetMonData
-	mov r8, r0
-	mov r1, r9
-	ldrb r0, [r1]
-	lsls r0, 1
-	adds r0, r6
-	ldrh r0, [r0]
-	muls r0, r5
-	adds r0, r4
-	movs r1, 0x39
-	bl GetMonData
-	adds r3, r0, 0
-	mov r1, r9
-	ldrb r0, [r1]
-	ldr r1, _08035758 @ =gHealthboxIDs
-	adds r1, r0, r1
-	ldrb r1, [r1]
-	str r7, [sp]
-	mov r2, r8
-	bl sub_8043D84
-	b _08035786
-	.align 2, 0
-_08035744: .4byte gBattleBufferA
-_08035748: .4byte gActiveBank
-_0803574C: .4byte 0x00007fff
-_08035750: .4byte gBattlePartyID
-_08035754: .4byte gEnemyParty
-_08035758: .4byte gHealthboxIDs
-_0803575C:
-	ldr r1, _080357A4 @ =gBattlePartyID
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080357A8 @ =gEnemyParty
-	adds r0, r1
-	movs r1, 0x3A
-	bl GetMonData
-	adds r2, r0, 0
-	mov r1, r9
-	ldrb r0, [r1]
-	ldr r1, _080357AC @ =gHealthboxIDs
-	adds r1, r0, r1
-	ldrb r1, [r1]
-	str r7, [sp]
-	movs r3, 0
-	bl sub_8043D84
-_08035786:
-	ldr r1, _080357B0 @ =gBattleBankFunc
-	ldr r0, _080357B4 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _080357B8 @ =sub_80330C8
-	str r1, [r0]
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080357A4: .4byte gBattlePartyID
-_080357A8: .4byte gEnemyParty
-_080357AC: .4byte gHealthboxIDs
-_080357B0: .4byte gBattleBankFunc
-_080357B4: .4byte gActiveBank
-_080357B8: .4byte sub_80330C8
-	thumb_func_end OpponentHandleHealthBarUpdate
-
-	thumb_func_start OpponentHandleExpBarUpdate
-OpponentHandleExpBarUpdate: @ 80357BC
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end OpponentHandleExpBarUpdate
-
-	thumb_func_start OpponentHandleStatusIconUpdate
-OpponentHandleStatusIconUpdate: @ 80357C8
-	push {r4,lr}
-	ldr r4, _08035820 @ =gActiveBank
-	ldrb r0, [r4]
-	bl mplay_80342A4
-	lsls r0, 24
-	cmp r0, 0
-	bne _08035818
-	ldr r0, _08035824 @ =gHealthboxIDs
-	ldrb r1, [r4]
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r2, _08035828 @ =gBattlePartyID
-	lsls r1, 1
-	adds r1, r2
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _0803582C @ =gEnemyParty
-	adds r1, r2
-	movs r2, 0x9
-	bl sub_8045A5C
-	ldrb r0, [r4]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08035830 @ =0x02017810
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	ldr r1, _08035834 @ =gBattleBankFunc
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08035838 @ =sub_8033494
-	str r1, [r0]
-_08035818:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035820: .4byte gActiveBank
-_08035824: .4byte gHealthboxIDs
-_08035828: .4byte gBattlePartyID
-_0803582C: .4byte gEnemyParty
-_08035830: .4byte 0x02017810
-_08035834: .4byte gBattleBankFunc
-_08035838: .4byte sub_8033494
-	thumb_func_end OpponentHandleStatusIconUpdate
-
-	thumb_func_start OpponentHandleStatusAnimation
-OpponentHandleStatusAnimation: @ 803583C
-	push {r4,r5,lr}
-	ldr r5, _08035894 @ =gActiveBank
-	ldrb r0, [r5]
-	bl mplay_80342A4
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803588C
-	ldr r4, _08035898 @ =gBattleBufferA
-	ldrb r3, [r5]
-	lsls r3, 9
-	adds r0, r4, 0x1
-	adds r0, r3, r0
-	ldrb r0, [r0]
-	adds r1, r4, 0x2
-	adds r1, r3, r1
-	ldrb r1, [r1]
-	adds r2, r4, 0x3
-	adds r2, r3, r2
-	ldrb r2, [r2]
-	lsls r2, 8
-	orrs r1, r2
-	adds r2, r4, 0x4
-	adds r2, r3, r2
-	ldrb r2, [r2]
-	lsls r2, 16
-	orrs r1, r2
-	adds r4, 0x5
-	adds r3, r4
-	ldrb r2, [r3]
-	lsls r2, 24
-	orrs r1, r2
-	bl move_anim_start_t2_for_situation
-	ldr r1, _0803589C @ =gBattleBankFunc
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _080358A0 @ =sub_8033494
-	str r1, [r0]
-_0803588C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035894: .4byte gActiveBank
-_08035898: .4byte gBattleBufferA
-_0803589C: .4byte gBattleBankFunc
-_080358A0: .4byte sub_8033494
-	thumb_func_end OpponentHandleStatusAnimation
-
-	thumb_func_start OpponentHandleStatusXor
-OpponentHandleStatusXor: @ 80358A4
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end OpponentHandleStatusXor
-
-	thumb_func_start sub_80358B0
-sub_80358B0: @ 80358B0
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80358B0
-
-	thumb_func_start OpponentHandleDMATransfer
-OpponentHandleDMATransfer: @ 80358BC
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end OpponentHandleDMATransfer
-
-	thumb_func_start sub_80358C8
-sub_80358C8: @ 80358C8
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80358C8
-
-	thumb_func_start sub_80358D4
-sub_80358D4: @ 80358D4
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80358D4
-
-	thumb_func_start sub_80358E0
-sub_80358E0: @ 80358E0
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80358E0
-
-	thumb_func_start sub_80358EC
-sub_80358EC: @ 80358EC
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80358EC
-
-	thumb_func_start sub_80358F8
-sub_80358F8: @ 80358F8
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80358F8
-
-	thumb_func_start sub_8035904
-sub_8035904: @ 8035904
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035904
-
-	thumb_func_start sub_8035910
-sub_8035910: @ 8035910
-	push {lr}
-	ldr r2, _08035928 @ =gUnknown_020238C8
-	ldrb r1, [r2]
-	movs r0, 0x80
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035928: .4byte gUnknown_020238C8
-	thumb_func_end sub_8035910
-
-	thumb_func_start sub_803592C
-sub_803592C: @ 803592C
-	push {lr}
-	ldr r3, _08035958 @ =gUnknown_020238C8
-	ldr r1, _0803595C @ =gBattleBufferA
-	ldr r0, _08035960 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	movs r1, 0x7F
-	ands r1, r0
-	ldrb r2, [r3]
-	movs r0, 0x80
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035958: .4byte gUnknown_020238C8
-_0803595C: .4byte gBattleBufferA
-_08035960: .4byte gActiveBank
-	thumb_func_end sub_803592C
-
-	thumb_func_start sub_8035964
-sub_8035964: @ 8035964
-	push {lr}
-	ldr r2, _08035978 @ =gUnknown_020238C8
-	ldrb r1, [r2]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r2]
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035978: .4byte gUnknown_020238C8
-	thumb_func_end sub_8035964
-
-	thumb_func_start sub_803597C
-sub_803597C: @ 803597C
-	push {lr}
-	ldr r3, _080359A0 @ =gUnknown_020238C8
-	ldr r1, [r3]
-	lsls r1, 24
-	lsrs r1, 31
-	movs r0, 0x1
-	eors r1, r0
-	lsls r1, 7
-	ldrb r2, [r3]
-	movs r0, 0x7F
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080359A0: .4byte gUnknown_020238C8
-	thumb_func_end sub_803597C
-
-	thumb_func_start OpponentHandleHitAnimation
-OpponentHandleHitAnimation: @ 80359A4
-	push {r4,lr}
-	ldr r3, _080359CC @ =gSprites
-	ldr r2, _080359D0 @ =gObjectBankIDs
-	ldr r4, _080359D4 @ =gActiveBank
-	ldrb r0, [r4]
-	adds r0, r2
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r0, [r0]
-	lsls r0, 29
-	cmp r0, 0
-	bge _080359D8
-	bl OpponentBufferExecCompleted
-	b _08035A02
-	.align 2, 0
-_080359CC: .4byte gSprites
-_080359D0: .4byte gObjectBankIDs
-_080359D4: .4byte gActiveBank
-_080359D8:
-	ldr r1, _08035A08 @ =gDoingBattleAnim
-	movs r0, 0x1
-	strb r0, [r1]
-	ldrb r0, [r4]
-	adds r0, r2
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	movs r1, 0
-	strh r1, [r0, 0x30]
-	ldrb r0, [r4]
-	bl sub_8047858
-	ldr r1, _08035A0C @ =gBattleBankFunc
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08035A10 @ =bx_blink_t7
-	str r1, [r0]
-_08035A02:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035A08: .4byte gDoingBattleAnim
-_08035A0C: .4byte gBattleBankFunc
-_08035A10: .4byte bx_blink_t7
-	thumb_func_end OpponentHandleHitAnimation
-
-	thumb_func_start sub_8035A14
-sub_8035A14: @ 8035A14
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035A14
-
-	thumb_func_start OpponentHandleEffectivenessSound
-OpponentHandleEffectivenessSound: @ 8035A20
-	push {r4,lr}
-	ldr r4, _08035A5C @ =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	movs r3, 0x3F
-	cmp r0, 0
-	bne _08035A34
-	movs r3, 0xC0
-_08035A34:
-	ldr r2, _08035A60 @ =gBattleBufferA
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r1, [r1]
-	lsls r1, 8
-	orrs r0, r1
-	lsls r1, r3, 24
-	asrs r1, 24
-	bl PlaySE12WithPanning
-	bl OpponentBufferExecCompleted
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035A5C: .4byte gActiveBank
-_08035A60: .4byte gBattleBufferA
-	thumb_func_end OpponentHandleEffectivenessSound
-
-	thumb_func_start sub_8035A64
-sub_8035A64: @ 8035A64
-	push {lr}
-	ldr r2, _08035A8C @ =gBattleBufferA
-	ldr r0, _08035A90 @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r1, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r1, [r1]
-	lsls r1, 8
-	orrs r0, r1
-	bl PlayFanfare
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035A8C: .4byte gBattleBufferA
-_08035A90: .4byte gActiveBank
-	thumb_func_end sub_8035A64
-
-	thumb_func_start OpponentHandleFaintingCry
-OpponentHandleFaintingCry: @ 8035A94
-	push {lr}
-	ldr r1, _08035AC4 @ =gBattlePartyID
-	ldr r0, _08035AC8 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08035ACC @ =gEnemyParty
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x19
-	movs r2, 0x5
-	bl PlayCry3
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035AC4: .4byte gBattlePartyID
-_08035AC8: .4byte gActiveBank
-_08035ACC: .4byte gEnemyParty
-	thumb_func_end OpponentHandleFaintingCry
-
-	thumb_func_start dp01t_2E_7_battle_intro
-dp01t_2E_7_battle_intro: @ 8035AD0
-	push {lr}
-	ldr r1, _08035AF8 @ =gBattleBufferA
-	ldr r0, _08035AFC @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_80E43C0
-	ldr r2, _08035B00 @ =gUnknown_02024DE8
-	ldrh r0, [r2]
-	movs r1, 0x1
-	orrs r0, r1
-	strh r0, [r2]
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_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 @ =gObjectBankIDs
-	ldr r6, _08035BE4 @ =gActiveBank
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _08035BE8 @ =gSprites
-	adds r0, r4
-	bl oamt_add_pos2_onto_pos1
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x23
-	strh r1, [r0, 0x2E]
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x8C
-	lsls r1, 1
-	strh r1, [r0, 0x32]
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r1, [r0, 0x22]
-	strh r1, [r0, 0x36]
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r4, 0
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, _08035BEC @ =sub_8078B34
-	str r1, [r0]
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _08035BF0 @ =sub_8035C10
-	bl oamt_set_x3A_32
-	ldr r0, _08035BF4 @ =sub_8035C44
-	movs r1, 0x5
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r4, _08035BF8 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r4
-	ldrb r0, [r6]
-	strh r0, [r1, 0x8]
-	ldrb r3, [r6]
-	lsls r0, r3, 1
-	adds r0, r3
-	lsls r0, 2
-	ldr r2, _08035BFC @ =0x02017810
-	adds r0, r2
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08035BC2
-	ldr r0, _08035C00 @ =gUnknown_02024E68
-	adds r0, r3, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r4
-	ldr r1, _08035C04 @ =sub_8044CA0
-	str r1, [r0]
-_08035BC2:
-	adds r2, 0x30
-	ldrb r0, [r2, 0x9]
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2, 0x9]
-	ldr r1, _08035C08 @ =gBattleBankFunc
-	ldrb r0, [r6]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08035C0C @ =nullsub_45
-	str r1, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035BE0: .4byte gObjectBankIDs
-_08035BE4: .4byte gActiveBank
-_08035BE8: .4byte gSprites
-_08035BEC: .4byte sub_8078B34
-_08035BF0: .4byte sub_8035C10
-_08035BF4: .4byte sub_8035C44
-_08035BF8: .4byte gTasks
-_08035BFC: .4byte 0x02017810
-_08035C00: .4byte gUnknown_02024E68
-_08035C04: .4byte sub_8044CA0
-_08035C08: .4byte gBattleBankFunc
-_08035C0C: .4byte nullsub_45
-	thumb_func_end sub_8035B04
-
-	thumb_func_start sub_8035C10
-sub_8035C10: @ 8035C10
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x6]
-	bl sub_8031B74
-	ldrh r0, [r4, 0x38]
-	ldr r1, _08035C3C @ =0x000003ff
-	ands r1, r0
-	ldrh r2, [r4, 0x4]
-	ldr r0, _08035C40 @ =0xfffffc00
-	ands r0, r2
-	orrs r0, r1
-	strh r0, [r4, 0x4]
-	adds r0, r4, 0
-	bl FreeSpriteOamMatrix
-	adds r0, r4, 0
-	bl DestroySprite
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035C3C: .4byte 0x000003ff
-_08035C40: .4byte 0xfffffc00
-	thumb_func_end sub_8035C10
-
-	thumb_func_start sub_8035C44
-sub_8035C44: @ 8035C44
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r7, _08035C9C @ =gActiveBank
-	ldrb r0, [r7]
-	mov r9, r0
-	ldr r1, _08035CA0 @ =gTasks
-	mov r2, r8
-	lsls r0, r2, 2
-	add r0, r8
-	lsls r0, 3
-	adds r0, r1
-	ldrh r0, [r0, 0x8]
-	strb r0, [r7]
-	bl IsDoubleBattle
-	lsls r0, 24
-	cmp r0, 0
-	beq _08035C7E
-	ldr r0, _08035CA4 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08035CB0
-_08035C7E:
-	ldr r0, _08035CA8 @ =gBattleBufferA
-	ldrb r1, [r7]
-	lsls r2, r1, 9
-	adds r0, 0x1
-	adds r2, r0
-	ldr r0, _08035CAC @ =gBattlePartyID
-	lsls r1, 1
-	adds r1, r0
-	ldrh r0, [r1]
-	strb r0, [r2]
-	ldrb r0, [r7]
-	movs r1, 0
-	bl sub_803495C
-	b _08035CF0
-	.align 2, 0
-_08035C9C: .4byte gActiveBank
-_08035CA0: .4byte gTasks
-_08035CA4: .4byte gBattleTypeFlags
-_08035CA8: .4byte gBattleBufferA
-_08035CAC: .4byte gBattlePartyID
-_08035CB0:
-	ldr r4, _08035D14 @ =gBattleBufferA
-	ldrb r0, [r7]
-	lsls r1, r0, 9
-	adds r4, 0x1
-	adds r1, r4
-	ldr r6, _08035D18 @ =gBattlePartyID
-	lsls r0, 1
-	adds r0, r6
-	ldrh r0, [r0]
-	strb r0, [r1]
-	ldrb r0, [r7]
-	movs r1, 0
-	bl sub_803495C
-	ldrb r0, [r7]
-	movs r5, 0x2
-	eors r0, r5
-	strb r0, [r7]
-	ldrb r0, [r7]
-	lsls r1, r0, 9
-	adds r1, r4
-	lsls r0, 1
-	adds r0, r6
-	ldrh r0, [r0]
-	strb r0, [r1]
-	ldrb r0, [r7]
-	movs r1, 0
-	bl sub_803495C
-	ldrb r0, [r7]
-	eors r0, r5
-	strb r0, [r7]
-_08035CF0:
-	ldr r1, _08035D1C @ =gBattleBankFunc
-	ldr r2, _08035D20 @ =gActiveBank
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08035D24 @ =sub_8032E2C
-	str r1, [r0]
-	mov r0, r9
-	strb r0, [r2]
-	mov r0, r8
-	bl DestroyTask
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_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 @ =gBattleBufferA
-	ldr r0, _08035D54 @ =gActiveBank
-	ldrb r2, [r0]
-	lsls r0, r2, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08035D58
-	adds r0, r2, 0
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _08035D58
-	bl OpponentBufferExecCompleted
-	b _08035E12
-	.align 2, 0
-_08035D50: .4byte gBattleBufferA
-_08035D54: .4byte gActiveBank
-_08035D58:
-	ldr r3, _08035DA8 @ =gActiveBank
-	ldrb r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _08035DAC @ =0x02017810
-	adds r0, r4
-	ldrb r1, [r0]
-	movs r2, 0x1
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r1, _08035DB0 @ =gBattleBufferA
-	ldrb r2, [r3]
-	lsls r0, r2, 9
-	adds r1, 0x2
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r6, r3, 0
-	cmp r0, 0
-	beq _08035DBC
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r3, r0, r4
-	ldrb r2, [r3, 0x1]
-	lsls r1, r2, 26
-	lsrs r0, r1, 27
-	cmp r0, 0x1
-	bhi _08035DB4
-	adds r0, 0x1
-	movs r1, 0x1F
-	ands r0, r1
-	lsls r0, 1
-	movs r1, 0x3F
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r3, 0x1]
-	b _08035E12
-	.align 2, 0
-_08035DA8: .4byte gActiveBank
-_08035DAC: .4byte 0x02017810
-_08035DB0: .4byte gBattleBufferA
-_08035DB4:
-	movs r0, 0x3F
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r3, 0x1]
-_08035DBC:
-	adds r5, r6, 0
-	ldrb r0, [r5]
-	lsls r3, r0, 9
-	ldr r4, _08035E18 @ =gUnknown_02023A64
-	adds r1, r3, r4
-	subs r2, r4, 0x3
-	adds r2, r3, r2
-	ldrb r2, [r2]
-	subs r4, 0x2
-	adds r3, r4
-	ldrb r3, [r3]
-	bl sub_8044804
-	ldr r2, _08035E1C @ =gUnknown_02024E68
-	ldrb r1, [r5]
-	adds r1, r2
-	movs r2, 0
-	strb r0, [r1]
-	ldrb r1, [r5]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r3, _08035E20 @ =0x02017810
-	adds r0, r3
-	strb r2, [r0, 0x5]
-	ldrb r1, [r5]
-	lsls r0, r1, 9
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08035E06
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	movs r1, 0x5D
-	strb r1, [r0, 0x5]
-_08035E06:
-	ldr r0, _08035E24 @ =gBattleBankFunc
-	ldrb r1, [r6]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, _08035E28 @ =sub_8035E2C
-	str r0, [r1]
-_08035E12:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035E18: .4byte gUnknown_02023A64
-_08035E1C: .4byte gUnknown_02024E68
-_08035E20: .4byte 0x02017810
-_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 @ =gActiveBank
-	ldrb r1, [r4]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r3, _08035E68 @ =0x02017810
-	adds r0, r3
-	ldrb r1, [r0, 0x5]
-	adds r2, r1, 0x1
-	strb r2, [r0, 0x5]
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r1, 0x5C
-	bls _08035E5C
-	ldrb r0, [r4]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	movs r0, 0
-	strb r0, [r1, 0x5]
-	bl OpponentBufferExecCompleted
-_08035E5C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035E64: .4byte gActiveBank
-_08035E68: .4byte 0x02017810
-	thumb_func_end sub_8035E2C
-
-	thumb_func_start sub_8035E6C
-sub_8035E6C: @ 8035E6C
-	push {lr}
-	ldr r0, _08035EA4 @ =gActiveBank
-	ldrb r3, [r0]
-	lsls r0, r3, 1
-	adds r0, r3
-	lsls r0, 2
-	ldr r1, _08035EA8 @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08035E9A
-	ldr r2, _08035EAC @ =gTasks
-	ldr r0, _08035EB0 @ =gUnknown_02024E68
-	adds r0, r3, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	ldr r1, _08035EB4 @ =sub_8044CA0
-	str r1, [r0]
-_08035E9A:
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035EA4: .4byte gActiveBank
-_08035EA8: .4byte 0x02017810
-_08035EAC: .4byte gTasks
-_08035EB0: .4byte gUnknown_02024E68
-_08035EB4: .4byte sub_8044CA0
-	thumb_func_end sub_8035E6C
-
-	thumb_func_start sub_8035EB8
-sub_8035EB8: @ 8035EB8
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035EB8
-
-	thumb_func_start OpponentHandleSpriteInvisibility
-OpponentHandleSpriteInvisibility: @ 8035EC4
-	push {r4,lr}
-	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 @ =gObjectBankIDs
-	ldrb r1, [r4]
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r3
-	ldr r0, _08035F20 @ =gBattleBufferA
-	lsls r1, 9
-	adds r0, 0x1
-	adds r1, r0
-	adds r2, 0x3E
-	movs r0, 0x1
-	ldrb r1, [r1]
-	ands r1, r0
-	lsls r1, 2
-	ldrb r3, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2]
-	ldrb r0, [r4]
-	bl sub_8031F88
-_08035F0A:
-	bl OpponentBufferExecCompleted
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035F14: .4byte gActiveBank
-_08035F18: .4byte gSprites
-_08035F1C: .4byte gObjectBankIDs
-_08035F20: .4byte gBattleBufferA
-	thumb_func_end OpponentHandleSpriteInvisibility
-
-	thumb_func_start OpponentHandleBattleAnimation
-OpponentHandleBattleAnimation: @ 8035F24
-	push {r4-r6,lr}
-	sub sp, 0x4
-	ldr r6, _08035F68 @ =gActiveBank
-	ldrb r0, [r6]
-	bl mplay_80342A4
-	lsls r0, 24
-	cmp r0, 0
-	bne _08035F7C
-	ldr r5, _08035F6C @ =gBattleBufferA
-	ldrb r2, [r6]
-	lsls r1, r2, 9
-	adds r0, r5, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r0, r5, 0x2
-	adds r0, r1, r0
-	ldrb r4, [r0]
-	adds r5, 0x3
-	adds r1, r5
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r4, r0
-	str r4, [sp]
-	adds r0, r2, 0
-	adds r1, r2, 0
-	bl move_anim_start_t3
-	lsls r0, 24
-	cmp r0, 0
-	beq _08035F70
-	bl OpponentBufferExecCompleted
-	b _08035F7C
-	.align 2, 0
-_08035F68: .4byte gActiveBank
-_08035F6C: .4byte gBattleBufferA
-_08035F70:
-	ldr r0, _08035F84 @ =gBattleBankFunc
-	ldrb r1, [r6]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, _08035F88 @ =sub_80334C0
-	str r0, [r1]
-_08035F7C:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035F84: .4byte gBattleBankFunc
-_08035F88: .4byte sub_80334C0
-	thumb_func_end OpponentHandleBattleAnimation
-
-	thumb_func_start OpponentHandleLinkStandbyMsg
-OpponentHandleLinkStandbyMsg: @ 8035F8C
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end OpponentHandleLinkStandbyMsg
-
-	thumb_func_start OpponentHandleResetActionMoveSelection
-OpponentHandleResetActionMoveSelection: @ 8035F98
-	push {lr}
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end OpponentHandleResetActionMoveSelection
-
-	thumb_func_start sub_8035FA4
-sub_8035FA4: @ 8035FA4
-	push {lr}
-	ldr r0, _08035FD8 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x6
-	ands r0, r1
-	cmp r0, 0x2
-	bne _08035FCE
-	ldr r2, _08035FDC @ =gMain
-	ldr r0, _08035FE0 @ =0x0000043d
-	adds r3, r2, r0
-	ldrb r1, [r3]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3]
-	ldr r0, _08035FE4 @ =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r2]
-	ldr r0, [r2, 0x8]
-	bl SetMainCallback2
-_08035FCE:
-	bl OpponentBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08035FD8: .4byte gBattleTypeFlags
-_08035FDC: .4byte gMain
-_08035FE0: .4byte 0x0000043d
-_08035FE4: .4byte gPreBattleCallback1
-	thumb_func_end sub_8035FA4
-
-	thumb_func_start nullsub_46
-nullsub_46: @ 8035FE8
-	bx lr
-	thumb_func_end nullsub_46
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index f3674d442..80e2db3c9 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,7 +59,6 @@ SECTIONS {
         src/battle_6.o(.text);
         src/battle_7.o(.text);
         src/battle_8.o(.text);
-        asm/battle_8.o(.text);
         asm/battle_9.o(.text);
         src/battle_10.o(.text);
         src/pokemon_1.o(.text);
diff --git a/src/battle_8.c b/src/battle_8.c
index 3e499a289..75f10c4b1 100644
--- a/src/battle_8.c
+++ b/src/battle_8.c
@@ -1,14 +1,18 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_ai.h"
+#include "battle_interface.h"
 #include "data2.h"
 #include "graphics.h"
+#include "main.h"
 #include "pokemon.h"
 #include "rng.h"
 #include "rom3.h"
 #include "songs.h"
 #include "sound.h"
+#include "sprite.h"
 #include "string_util.h"
+#include "task.h"
 #include "text.h"
 #include "util.h"
 
@@ -45,6 +49,10 @@ extern u16 gUnknown_030042A4;
 extern u8 gDisplayedStringBattle[];
 extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
+extern bool8 gDoingBattleAnim;
+extern u16 gUnknown_02024DE8;
+extern u8 gUnknown_02024E68[];
+extern MainCallback gPreBattleCallback1;
 
 extern u8 sub_8077ABC();
 extern u8 sub_8077F68();
@@ -81,13 +89,34 @@ extern void BufferStringBattle();
 extern void sub_80331D0(void);
 extern void sub_8036B0C(void);
 extern u8 GetBankByPlayerAI(u8);
+extern u8 sub_8036CD4(void);
+extern void sub_80330C8(void);
+extern void sub_8043D84();
+extern void sub_8045A5C();
+void sub_8033494(void);
+extern void move_anim_start_t2_for_situation();
+extern void bx_blink_t7(void);
+extern void sub_8047858();
+extern u8 GetBankSide(u8);
+extern void sub_80E43C0();
+extern void sub_8044CA0(u8);
+extern void nullsub_45(void);
+extern void sub_8031B74();
+extern bool8 IsDoubleBattle(void);
+extern void sub_8032E2C(void);
+extern u8 sub_8078874();
+extern u8 move_anim_start_t3();
+extern void sub_80334C0(void);
+extern void OpponentBufferExecCompleted(void);
 
 u32 sub_8033598(u8, u8 *);
 void sub_8033E24(u8);
 void sub_803495C(u8, u8);
 void sub_8034B74(void);
 void sub_8035238(void);
-void OpponentBufferExecCompleted(void);
+void sub_8035C10(struct Sprite *);
+void sub_8035C44(u8);
+void sub_8035E2C(void);
 
 void OpponentHandleGetAttributes(void)
 {
@@ -704,7 +733,7 @@ void OpponentHandleLoadPokeSprite(void)
 void OpponentHandleSendOutPoke(void)
 {
     gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    
+
     sub_803495C(gActiveBank, gBattleBufferA[gActiveBank][2]);
     gBattleBankFunc[gActiveBank] = sub_80333D4;
 }
@@ -783,7 +812,7 @@ void OpponentHandleTrainerThrow(void)
         trainerPicIndex = sub_8135FBC();
     else
         trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic;
-    
+
     sub_8031A6C(trainerPicIndex, gActiveBank);
     GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
@@ -813,7 +842,7 @@ void OpponentHandleTrainerSlide(void)
         trainerPicIndex = sub_8135FBC();
     else
         trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic;
-    
+
     sub_8031A6C(trainerPicIndex, gActiveBank);
     GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
@@ -995,7 +1024,7 @@ void sub_8035428(void)
     u16 r4;
     // Needed to match closer
     struct {u16 moves[4];} *r5 = (void *)&gBattleBufferA[gActiveBank][4];
-    
+
     if (gBattleTypeFlags & 0x498)
     {
         BattleAI_SetupAIData();
@@ -1026,14 +1055,14 @@ void sub_8035428(void)
     else
     {
         u16 r2;
-        
+
         do
         {
             // Can't for the life of me get this to match.
             r4 = Random() % 4;
             r2 = r5->moves[r4];
         } while (r2 == 0);
-        
+
         if (gBattleMoves[r2].target & 0x12)
         {
             r4 |= gActiveBank << 8;
@@ -1042,13 +1071,13 @@ void sub_8035428(void)
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
             u16 r2 = GetBankByPlayerAI(Random() & 2) << 8;
-            
+
             dp01_build_cmdbuf_x21_a_bb(1, 10, r4 | r2);
         }
         else
         {
             u16 r2 = GetBankByPlayerAI(0) << 8;
-            
+
             dp01_build_cmdbuf_x21_a_bb(1, 10, r4 | r2);
         }
         OpponentBufferExecCompleted();
@@ -1232,3 +1261,382 @@ _0803558A:\n\
     .syntax divided\n");
 }
 #endif
+
+void sub_8035590(void)
+{
+    // What is this?
+    dp01_build_cmdbuf_x23_aa_0(1, ewram[0x160D4 + gActiveBank / 2 * 2]);
+    OpponentBufferExecCompleted();
+}
+
+void sub_80355C0(void)
+{
+    s32 r4;
+
+    if (ewram[0x160C8 + GetBankIdentity(gActiveBank) / 2] == 6)
+    {
+        u8 r6;
+        u8 r5;
+
+        r4 = sub_8036CD4();
+        if (r4 == 6)
+        {
+            if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
+            {
+                r5 = GetBankByPlayerAI(1);
+                r6 = r5;
+            }
+            else
+            {
+                r6 = GetBankByPlayerAI(1);
+                r5 = GetBankByPlayerAI(3);
+            }
+            for (r4 = 0; r4 < 6; r4++)
+            {
+                if (GetMonData(&gEnemyParty[r4], MON_DATA_HP) != 0
+                 && r4 != gBattlePartyID[r6]
+                 && r4 != gBattlePartyID[r5])
+                    break;
+            }
+        }
+    }
+    else
+    {
+        r4 = ewram[0x160C8 + GetBankIdentity(gActiveBank) / 2];
+        ewram[0x160C8 + GetBankIdentity(gActiveBank) / 2] = 6;
+    }
+    ewram[0x16068 + gActiveBank] = r4;
+    dp01_build_cmdbuf_x22_a_three_bytes(1, r4, 0);
+    OpponentBufferExecCompleted();
+}
+
+void sub_80356C0(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleHealthBarUpdate(void)
+{
+    s16 r7;
+
+    load_gfxc_health_bar(0);
+    r7 = (gBattleBufferA[gActiveBank][3] << 8) | gBattleBufferA[gActiveBank][2];
+    if (r7 != 0x7FFF)
+    {
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 hp = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+
+        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, hp, r7);
+    }
+    else
+    {
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+
+        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7);
+    }
+    gBattleBankFunc[gActiveBank] = sub_80330C8;
+}
+
+void OpponentHandleExpBarUpdate(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleStatusIconUpdate(void)
+{
+    if (mplay_80342A4(gActiveBank) == 0)
+    {
+        sub_8045A5C(gHealthboxIDs[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], 9);
+        ewram17810[gActiveBank].unk0_4 = 0;
+        gBattleBankFunc[gActiveBank] = sub_8033494;
+    }
+}
+
+void OpponentHandleStatusAnimation(void)
+{
+    if (mplay_80342A4(gActiveBank) == 0)
+    {
+        move_anim_start_t2_for_situation(
+          gBattleBufferA[gActiveBank][1],
+          gBattleBufferA[gActiveBank][2]
+          | (gBattleBufferA[gActiveBank][3] << 8)
+          | (gBattleBufferA[gActiveBank][4] << 16)
+          | (gBattleBufferA[gActiveBank][5] << 24));
+        gBattleBankFunc[gActiveBank] = sub_8033494;
+    }
+}
+
+void OpponentHandleStatusXor(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_80358B0(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleDMATransfer(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_80358C8(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_80358D4(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_80358E0(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_80358EC(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_80358F8(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035904(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035910(void)
+{
+    gUnknown_020238C8.unk0_0 = 0;
+    OpponentBufferExecCompleted();
+}
+
+void sub_803592C(void)
+{
+    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBank][1];
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035964(void)
+{
+    gUnknown_020238C8.unk0_7 = 0;
+    OpponentBufferExecCompleted();
+}
+
+void sub_803597C(void)
+{
+    gUnknown_020238C8.unk0_7 ^= 1;
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleHitAnimation(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
+    {
+        OpponentBufferExecCompleted();
+    }
+    else
+    {
+        gDoingBattleAnim = TRUE;
+        gSprites[gObjectBankIDs[gActiveBank]].data1 = 0;
+        sub_8047858(gActiveBank);
+        gBattleBankFunc[gActiveBank] = bx_blink_t7;
+    }
+}
+
+void sub_8035A14(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleEffectivenessSound(void)
+{
+    s8 pan;
+
+    if (GetBankSide(gActiveBank) == 0)
+        pan = -64;
+    else
+        pan = 63;
+    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035A64(void)
+{
+    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleFaintingCry(void)
+{
+    PlayCry3(
+      GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES),
+      25, 5);
+    OpponentBufferExecCompleted();
+}
+
+void dp01t_2E_7_battle_intro(void)
+{
+    sub_80E43C0(gBattleBufferA[gActiveBank][1]);
+    gUnknown_02024DE8 |= 1;
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035B04(void)
+{
+    u8 taskId;
+
+    oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]);
+    gSprites[gObjectBankIDs[gActiveBank]].data0 = 35;
+    gSprites[gObjectBankIDs[gActiveBank]].data2 = 280;
+    gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y;
+    gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34;
+    oamt_set_x3A_32(&gSprites[gObjectBankIDs[gActiveBank]], sub_8035C10);
+    taskId = CreateTask(sub_8035C44, 5);
+    gTasks[taskId].data[0] = gActiveBank;
+    if (ewram17810[gActiveBank].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    ewram17840.unk9_0 = 1;
+    gBattleBankFunc[gActiveBank] = nullsub_45;
+}
+
+void sub_8035C10(struct Sprite *sprite)
+{
+    sub_8031B74(sprite->oam.affineParam);
+    sprite->oam.tileNum = sprite->data5;
+    FreeSpriteOamMatrix(sprite);
+    DestroySprite(sprite);
+}
+
+void sub_8035C44(u8 taskId)
+{
+    u8 r9;
+
+    r9 = gActiveBank;
+    gActiveBank = gTasks[taskId].data[0];
+    if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
+    {
+        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
+        sub_803495C(gActiveBank, 0);
+    }
+    else
+    {
+        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
+        sub_803495C(gActiveBank, 0);
+        gActiveBank ^= 2;
+        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
+        sub_803495C(gActiveBank, 0);
+        gActiveBank ^= 2;
+    }
+    gBattleBankFunc[gActiveBank] = sub_8032E2C;
+    gActiveBank = r9;
+    DestroyTask(taskId);
+}
+
+void dp01t_30_7_0803D67C(void)
+{
+    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0)
+    {
+        OpponentBufferExecCompleted();
+        return;
+    }
+
+    ewram17810[gActiveBank].unk0_0 = 1;
+    if (gBattleBufferA[gActiveBank][2] != 0)
+    {
+        if (ewram17810[gActiveBank].unk1_1 < 2)
+        {
+            ewram17810[gActiveBank].unk1_1++;
+            return;
+        }
+        else
+        {
+            ewram17810[gActiveBank].unk1_1 = 0;
+        }
+    }
+    gUnknown_02024E68[gActiveBank] = sub_8044804(
+      gActiveBank,
+      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4],
+      gBattleBufferA[gActiveBank][1],
+      gBattleBufferA[gActiveBank][2]);
+    ewram17810[gActiveBank].unk5 = 0;
+    if (gBattleBufferA[gActiveBank][2] != 0)
+        ewram17810[gActiveBank].unk5 = 0x5D;
+    gBattleBankFunc[gActiveBank] = sub_8035E2C;
+}
+
+void sub_8035E2C(void)
+{
+    if (ewram17810[gActiveBank].unk5++ >= 93)
+    {
+        ewram17810[gActiveBank].unk5 = 0;
+        OpponentBufferExecCompleted();
+    }
+}
+
+void sub_8035E6C(void)
+{
+    if (ewram17810[gActiveBank].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035EB8(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleSpriteInvisibility(void)
+{
+    if (sub_8078874(gActiveBank) != 0)
+    {
+        gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
+        sub_8031F88(gActiveBank);
+    }
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleBattleAnimation(void)
+{
+    if (mplay_80342A4(gActiveBank) == 0)
+    {
+        u8 r3 = gBattleBufferA[gActiveBank][1];
+        u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+
+        if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+            OpponentBufferExecCompleted();
+        else
+            gBattleBankFunc[gActiveBank] = sub_80334C0;
+    }
+}
+
+void OpponentHandleLinkStandbyMsg(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void OpponentHandleResetActionMoveSelection(void)
+{
+    OpponentBufferExecCompleted();
+}
+
+void sub_8035FA4(void)
+{
+    if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
+    {
+        gMain.inBattle = FALSE;
+        gMain.callback1 = gPreBattleCallback1;
+        SetMainCallback2(gMain.savedCallback);
+    }
+    OpponentBufferExecCompleted();
+}
+
+void nullsub_46(void)
+{
+}