split more battle buffer files

1 files changed, 74 insertions, 74 deletions

diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index f394feb6a..911b7ad19 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -11,21 +11,21 @@ nullsub_26: @ 805F160
 	bx lr
 	thumb_func_end nullsub_26
 
-	thumb_func_start sub_805F164
-sub_805F164: @ 805F164
+	thumb_func_start SetBankFuncToOpponentBufferRunCommand
+SetBankFuncToOpponentBufferRunCommand: @ 805F164
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	lsls r0, 2
 	adds r0, r1
-	ldr r1, =bx_exec_buffer_A_ch0_tbl7
+	ldr r1, =OpponentBufferRunCommand
 	str r1, [r0]
 	bx lr
 	.pool
-	thumb_func_end sub_805F164
+	thumb_func_end SetBankFuncToOpponentBufferRunCommand
 
-	thumb_func_start bx_exec_buffer_A_ch0_tbl7
-bx_exec_buffer_A_ch0_tbl7: @ 805F180
+	thumb_func_start OpponentBufferRunCommand
+OpponentBufferRunCommand: @ 805F180
 	push {lr}
 	ldr r2, =gBattleExecBuffer
 	ldr r1, =gBitTable
@@ -44,7 +44,7 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180
 	ldrb r0, [r1]
 	cmp r0, 0x38
 	bhi _0805F1C8
-	ldr r0, =gUnknown_0831C6C8
+	ldr r0, =gOpponentBufferCommands
 	ldrb r1, [r1]
 	lsls r1, 2
 	adds r1, r0
@@ -53,11 +53,11 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180
 	b _0805F1CC
 	.pool
 _0805F1C8:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805F1CC:
 	pop {r0}
 	bx r0
-	thumb_func_end bx_exec_buffer_A_ch0_tbl7
+	thumb_func_end OpponentBufferRunCommand
 
 	thumb_func_start sub_805F1D0
 sub_805F1D0: @ 805F1D0
@@ -77,7 +77,7 @@ sub_805F1D0: @ 805F1D0
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _0805F1F4
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805F1F4:
 	pop {r0}
 	bx r0
@@ -102,7 +102,7 @@ sub_805F208: @ 805F208
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _0805F22C
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805F22C:
 	pop {r0}
 	bx r0
@@ -147,7 +147,7 @@ sub_805F240: @ 805F240
 	lsls r0, 2
 	adds r0, r5
 	bl DestroySprite
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805F292:
 	pop {r4-r6}
 	pop {r0}
@@ -183,7 +183,7 @@ sub_805F2A8: @ 805F2A8
 	adds r0, r2
 	movs r1, 0
 	strb r1, [r0, 0x9]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805F2E0:
 	pop {r4}
 	pop {r0}
@@ -1043,7 +1043,7 @@ _0805F9E0:
 	bl FreeSpriteTilesByTag
 	adds r0, r4, 0
 	bl FreeSpritePaletteByTag
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FA48:
 	pop {r4,r5}
 	pop {r0}
@@ -1083,7 +1083,7 @@ sub_805FA70: @ 805FA70
 	b _0805FABC
 	.pool
 _0805FAB8:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FABC:
 	pop {r4-r6}
 	pop {r0}
@@ -1112,7 +1112,7 @@ sub_805FAC4: @ 805FAC4
 	adds r0, r3, r0
 	ldrb r0, [r0]
 	bl sub_8072984
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FAF2:
 	pop {r0}
 	bx r0
@@ -1160,7 +1160,7 @@ sub_805FB08: @ 805FB08
 	adds r0, r1
 	ldrb r0, [r0]
 	bl sub_8072984
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FB62:
 	pop {r4-r6}
 	pop {r0}
@@ -1176,7 +1176,7 @@ bx_t7_button_a: @ 805FB7C
 	lsls r0, 16
 	cmp r0, 0
 	bne _0805FB8E
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FB8E:
 	pop {r0}
 	bx r0
@@ -1210,7 +1210,7 @@ bx_blink_t7: @ 805FB94
 	strb r0, [r2]
 	ldr r0, =gDoingBattleAnim
 	strb r3, [r0]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	b _0805FC0A
 	.pool
 _0805FBE0:
@@ -1333,7 +1333,7 @@ _0805FCCA:
 	movs r2, 0x80
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FCDA:
 	pop {r4}
 	pop {r0}
@@ -1538,7 +1538,7 @@ sub_805FEB8: @ 805FEB8
 	ands r0, r1
 	cmp r0, 0
 	bne _0805FEDA
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FEDA:
 	pop {r0}
 	bx r0
@@ -1562,15 +1562,15 @@ bx_803B0F4: @ 805FEE8
 	ands r0, r1
 	cmp r0, 0
 	bne _0805FF0A
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _0805FF0A:
 	pop {r0}
 	bx r0
 	.pool
 	thumb_func_end bx_803B0F4
 
-	thumb_func_start dp01_tbl7_exec_completed
-dp01_tbl7_exec_completed: @ 805FF18
+	thumb_func_start OpponentBufferExecCompleted
+OpponentBufferExecCompleted: @ 805FF18
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =gBattleBankFunc
@@ -1578,7 +1578,7 @@ dp01_tbl7_exec_completed: @ 805FF18
 	ldrb r0, [r4]
 	lsls r0, 2
 	adds r0, r1
-	ldr r1, =bx_exec_buffer_A_ch0_tbl7
+	ldr r1, =OpponentBufferRunCommand
 	str r1, [r0]
 	ldr r0, =gBattleTypeFlags
 	ldr r0, [r0]
@@ -1617,7 +1617,7 @@ _0805FF7E:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_tbl7_exec_completed
+	thumb_func_end OpponentBufferExecCompleted
 
 	thumb_func_start dp01t_00_7_getattr
 dp01t_00_7_getattr: @ 805FF90
@@ -1667,7 +1667,7 @@ _0805FFEA:
 	movs r0, 0x1
 	mov r2, sp
 	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
 	pop {r0}
@@ -2608,7 +2608,7 @@ _08060806:
 	movs r0, 0x1
 	adds r2, r4, 0
 	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	add sp, 0x58
 	pop {r4-r7}
 	pop {r0}
@@ -2653,7 +2653,7 @@ _0806087A:
 	cmp r5, 0x5
 	bls _0806086C
 _08060886:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -3692,7 +3692,7 @@ _080611E6:
 	cmp r3, r0
 	bcc _080611E6
 _08061208:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -4110,7 +4110,7 @@ _080615B4:
 	adds r0, r1
 	ldrb r0, [r0]
 	bl sub_8072984
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _080615F0:
 	pop {r4-r6}
 	pop {r0}
@@ -4818,7 +4818,7 @@ _08061C2C:
 	thumb_func_start sub_8061C48
 sub_8061C48: @ 8061C48
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061C48
@@ -4826,7 +4826,7 @@ sub_8061C48: @ 8061C48
 	thumb_func_start sub_8061C54
 sub_8061C54: @ 8061C54
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061C54
@@ -4834,7 +4834,7 @@ sub_8061C54: @ 8061C54
 	thumb_func_start sub_8061C60
 sub_8061C60: @ 8061C60
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061C60
@@ -4842,7 +4842,7 @@ sub_8061C60: @ 8061C60
 	thumb_func_start sub_8061C6C
 sub_8061C6C: @ 8061C6C
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061C6C
@@ -4958,7 +4958,7 @@ _08061C8A:
 	lsrs r3, r0, 24
 	cmp r3, 0
 	beq _08061D80
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	b _08061D9E
 	.pool
 _08061D80:
@@ -5157,7 +5157,7 @@ _08061EE8:
 	lsls r0, 2
 	adds r0, r2
 	strb r4, [r0, 0x4]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _08061F24:
 	pop {r3-r5}
 	mov r8, r3
@@ -5204,7 +5204,7 @@ sub_8061F34: @ 8061F34
 	thumb_func_start sub_8061F90
 sub_8061F90: @ 8061F90
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061F90
@@ -5213,7 +5213,7 @@ sub_8061F90: @ 8061F90
 sub_8061F9C: @ 8061F9C
 	push {lr}
 	bl sub_8063880
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061F9C
@@ -5221,7 +5221,7 @@ sub_8061F9C: @ 8061F9C
 	thumb_func_start sub_8061FAC
 sub_8061FAC: @ 8061FAC
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8061FAC
@@ -5245,7 +5245,7 @@ sub_8061FB8: @ 8061FB8
 _08061FD6:
 	bl dp01_build_cmdbuf_x21_a_bb
 _08061FDA:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	b _08062156
 	.pool
 _08061FE4:
@@ -5415,7 +5415,7 @@ _0806213C:
 	movs r1, 0xA
 	bl dp01_build_cmdbuf_x21_a_bb
 _08062152:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _08062156:
 	pop {r4-r6}
 	pop {r0}
@@ -5436,7 +5436,7 @@ sub_806215C: @ 806215C
 	ldrb r1, [r0]
 	movs r0, 0x1
 	bl dp01_build_cmdbuf_x23_aa_0
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -5551,7 +5551,7 @@ _0806225A:
 	movs r0, 0x1
 	movs r2, 0
 	bl dp01_build_cmdbuf_x22_a_three_bytes
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -5561,7 +5561,7 @@ _0806225A:
 	thumb_func_start sub_8062288
 sub_8062288: @ 8062288
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062288
@@ -5665,7 +5665,7 @@ _0806234E:
 	thumb_func_start sub_8062384
 sub_8062384: @ 8062384
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062384
@@ -5769,7 +5769,7 @@ _08062458:
 	thumb_func_start sub_8062470
 sub_8062470: @ 8062470
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062470
@@ -5777,7 +5777,7 @@ sub_8062470: @ 8062470
 	thumb_func_start sub_806247C
 sub_806247C: @ 806247C
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_806247C
@@ -5785,7 +5785,7 @@ sub_806247C: @ 806247C
 	thumb_func_start sub_8062488
 sub_8062488: @ 8062488
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062488
@@ -5793,7 +5793,7 @@ sub_8062488: @ 8062488
 	thumb_func_start sub_8062494
 sub_8062494: @ 8062494
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062494
@@ -5801,7 +5801,7 @@ sub_8062494: @ 8062494
 	thumb_func_start sub_80624A0
 sub_80624A0: @ 80624A0
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80624A0
@@ -5809,7 +5809,7 @@ sub_80624A0: @ 80624A0
 	thumb_func_start sub_80624AC
 sub_80624AC: @ 80624AC
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80624AC
@@ -5817,7 +5817,7 @@ sub_80624AC: @ 80624AC
 	thumb_func_start sub_80624B8
 sub_80624B8: @ 80624B8
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80624B8
@@ -5825,7 +5825,7 @@ sub_80624B8: @ 80624B8
 	thumb_func_start sub_80624C4
 sub_80624C4: @ 80624C4
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80624C4
@@ -5833,7 +5833,7 @@ sub_80624C4: @ 80624C4
 	thumb_func_start sub_80624D0
 sub_80624D0: @ 80624D0
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80624D0
@@ -5847,7 +5847,7 @@ sub_80624DC: @ 80624DC
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -5872,7 +5872,7 @@ sub_80624F8: @ 80624F8
 	ands r0, r2
 	orrs r0, r1
 	strb r0, [r3]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -5886,7 +5886,7 @@ sub_8062530: @ 8062530
 	movs r0, 0x7F
 	ands r0, r1
 	strb r0, [r2]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -5907,7 +5907,7 @@ sub_8062548: @ 8062548
 	ands r0, r2
 	orrs r0, r1
 	strb r0, [r3]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -5931,7 +5931,7 @@ dp01t_29_7_blink: @ 8062570
 	lsls r0, 29
 	cmp r0, 0
 	bge _080625A4
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	b _080625CE
 	.pool
 _080625A4:
@@ -5965,7 +5965,7 @@ _080625CE:
 	thumb_func_start sub_80625E0
 sub_80625E0: @ 80625E0
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80625E0
@@ -5996,7 +5996,7 @@ _08062600:
 	lsls r1, r3, 24
 	asrs r1, 24
 	bl PlaySE12WithPanning
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -6040,7 +6040,7 @@ _0806266C:
 	orrs r0, r1
 	bl PlayFanfare
 _08062680:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -6066,7 +6066,7 @@ sub_806268C: @ 806268C
 	movs r1, 0x19
 	movs r2, 0x5
 	bl PlayCry3
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -6088,7 +6088,7 @@ dp01t_2E_7_battle_intro: @ 80626C8
 	movs r1, 0x1
 	orrs r0, r1
 	strh r0, [r2]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -6344,7 +6344,7 @@ dp01t_30_7_0803D67C: @ 8062918
 	lsls r0, 24
 	cmp r0, 0
 	bne _08062948
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	b _08062A12
 	.pool
 _08062948:
@@ -6480,7 +6480,7 @@ bx_0803D790_t7: @ 8062A2C
 	adds r0, r2
 	movs r1, 0
 	strb r1, [r0, 0x5]
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 _08062A64:
 	pop {r4}
 	pop {r0}
@@ -6516,7 +6516,7 @@ sub_8062A74: @ 8062A74
 	ldr r1, =sub_8073C30
 	str r1, [r0]
 _08062AA6:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool
@@ -6525,7 +6525,7 @@ _08062AA6:
 	thumb_func_start sub_8062AC4
 sub_8062AC4: @ 8062AC4
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062AC4
@@ -6566,7 +6566,7 @@ sub_8062AD0: @ 8062AD0
 	ldrb r0, [r4]
 	bl sub_805E408
 _08062B16:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -6604,7 +6604,7 @@ dp01t_34_7_move_anim_start_t3: @ 8062B30
 	lsls r0, 24
 	cmp r0, 0
 	beq _08062B7C
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	b _08062B88
 	.pool
 _08062B7C:
@@ -6625,7 +6625,7 @@ _08062B88:
 	thumb_func_start sub_8062B98
 sub_8062B98: @ 8062B98
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062B98
@@ -6633,7 +6633,7 @@ sub_8062B98: @ 8062B98
 	thumb_func_start sub_8062BA4
 sub_8062BA4: @ 8062BA4
 	push {lr}
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8062BA4
@@ -6661,7 +6661,7 @@ sub_8062BB0: @ 8062BB0
 	ldr r0, [r2, 0x8]
 	bl SetMainCallback2
 _08062BDA:
-	bl dp01_tbl7_exec_completed
+	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
 	.pool