Merge pull request #143 from yenatch/battle-anim

Decompile battle_anim_80A7E7C

5 files changed, 3704 insertions, 5514 deletions

diff --git a/asm/battle_anim_80A7E7C.s b/asm/battle_anim_80A7E7C.s
deleted file mode 100644
index 362acec8b..000000000
--- a/asm/battle_anim_80A7E7C.s
+++ /dev/null
@@ -1,2589 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80A7E7C
-sub_80A7E7C: @ 80A7E7C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r4, _080A7E9C @ =gUnknown_03004B00
-	ldrb r0, [r4]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xFF
-	bne _080A7EA0
-	adds r0, r5, 0
-	bl move_anim_task_del
-	b _080A7EDC
-	.align 2, 0
-_080A7E9C: .4byte gUnknown_03004B00
-_080A7EA0:
-	ldr r1, _080A7EE4 @ =gSprites
-	lsls r0, r2, 4
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r1
-	ldrh r1, [r4, 0x2]
-	strh r1, [r0, 0x24]
-	ldrh r1, [r4, 0x4]
-	strh r1, [r0, 0x26]
-	ldr r1, _080A7EE8 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	strh r2, [r0, 0x8]
-	ldrh r1, [r4, 0x6]
-	strh r1, [r0, 0xA]
-	ldrh r1, [r4, 0x8]
-	strh r1, [r0, 0xC]
-	ldrh r1, [r4, 0x8]
-	strh r1, [r0, 0xE]
-	ldrh r1, [r4, 0x2]
-	strh r1, [r0, 0x10]
-	ldrh r1, [r4, 0x4]
-	strh r1, [r0, 0x12]
-	ldr r1, _080A7EEC @ =sub_80A7EF0
-	str r1, [r0]
-	adds r0, r5, 0
-	bl _call_via_r1
-_080A7EDC:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A7EE4: .4byte gSprites
-_080A7EE8: .4byte gTasks
-_080A7EEC: .4byte sub_80A7EF0
-	thumb_func_end sub_80A7E7C
-
-	thumb_func_start sub_80A7EF0
-sub_80A7EF0: @ 80A7EF0
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, _080A7F2C @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r3, r0, r1
-	ldrh r0, [r3, 0xE]
-	movs r2, 0xE
-	ldrsh r5, [r3, r2]
-	adds r7, r1, 0
-	cmp r5, 0
-	bne _080A7F96
-	ldr r2, _080A7F30 @ =gSprites
-	movs r6, 0x8
-	ldrsh r1, [r3, r6]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	movs r6, 0x24
-	ldrsh r0, [r1, r6]
-	adds r6, r2, 0
-	cmp r0, 0
-	bne _080A7F34
-	ldrh r0, [r3, 0x10]
-	strh r0, [r1, 0x24]
-	b _080A7F36
-	.align 2, 0
-_080A7F2C: .4byte gTasks
-_080A7F30: .4byte gSprites
-_080A7F34:
-	strh r5, [r1, 0x24]
-_080A7F36:
-	lsls r2, r4, 2
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r3, r0, r7
-	movs r0, 0x8
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r6
-	movs r5, 0x26
-	ldrsh r0, [r1, r5]
-	cmp r0, 0
-	bne _080A7F56
-	ldrh r0, [r3, 0x12]
-	b _080A7F58
-_080A7F56:
-	movs r0, 0
-_080A7F58:
-	strh r0, [r1, 0x26]
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r2, r0, r7
-	ldrh r0, [r2, 0xC]
-	strh r0, [r2, 0xE]
-	ldrh r0, [r2, 0xA]
-	subs r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r3, r0, 16
-	cmp r3, 0
-	bne _080A7F9A
-	movs r0, 0x8
-	ldrsh r1, [r2, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	strh r3, [r0, 0x24]
-	movs r5, 0x8
-	ldrsh r1, [r2, r5]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	strh r3, [r0, 0x26]
-	adds r0, r4, 0
-	bl move_anim_task_del
-	b _080A7F9A
-_080A7F96:
-	subs r0, 0x1
-	strh r0, [r3, 0xE]
-_080A7F9A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A7EF0
-
-	thumb_func_start sub_80A7FA0
-sub_80A7FA0: @ 80A7FA0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r6, 0
-	ldr r2, _080A7FC8 @ =gUnknown_03004B00
-	ldrh r0, [r2]
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	cmp r1, 0x3
-	bgt _080A7FCC
-	lsls r0, 24
-	lsrs r0, 24
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0xFF
-	bne _080A8022
-	b _080A8026
-	.align 2, 0
-_080A7FC8: .4byte gUnknown_03004B00
-_080A7FCC:
-	cmp r1, 0x8
-	beq _080A8018
-	movs r1, 0
-	ldrsh r0, [r2, r1]
-	cmp r0, 0x5
-	beq _080A7FEC
-	cmp r0, 0x5
-	bgt _080A7FE2
-	cmp r0, 0x4
-	beq _080A7FE8
-	b _080A7FF4
-_080A7FE2:
-	cmp r0, 0x6
-	beq _080A7FF0
-	b _080A7FF4
-_080A7FE8:
-	movs r0, 0
-	b _080A7FF6
-_080A7FEC:
-	movs r0, 0x2
-	b _080A7FF6
-_080A7FF0:
-	movs r0, 0x1
-	b _080A7FF6
-_080A7FF4:
-	movs r0, 0x3
-_080A7FF6:
-	bl battle_get_side_with_given_state
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl b_side_obj__get_some_boolean
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A800C
-	movs r6, 0x1
-_080A800C:
-	ldr r0, _080A8014 @ =gUnknown_02024BE0
-	adds r0, r4, r0
-	b _080A8020
-	.align 2, 0
-_080A8014: .4byte gUnknown_02024BE0
-_080A8018:
-	ldr r1, _080A8030 @ =gUnknown_02024BE0
-	ldr r0, _080A8034 @ =gUnknown_0202F7C8
-	ldrb r0, [r0]
-	adds r0, r1
-_080A8020:
-	ldrb r3, [r0]
-_080A8022:
-	cmp r6, 0
-	beq _080A8038
-_080A8026:
-	adds r0, r5, 0
-	bl move_anim_task_del
-	b _080A8076
-	.align 2, 0
-_080A8030: .4byte gUnknown_02024BE0
-_080A8034: .4byte gUnknown_0202F7C8
-_080A8038:
-	ldr r1, _080A807C @ =gSprites
-	lsls r0, r3, 4
-	adds r0, r3
-	lsls r0, 2
-	adds r0, r1
-	ldr r2, _080A8080 @ =gUnknown_03004B00
-	ldrh r1, [r2, 0x2]
-	strh r1, [r0, 0x24]
-	ldrh r1, [r2, 0x4]
-	strh r1, [r0, 0x26]
-	ldr r1, _080A8084 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	strh r3, [r0, 0x8]
-	ldrh r1, [r2, 0x6]
-	strh r1, [r0, 0xA]
-	ldrh r1, [r2, 0x8]
-	strh r1, [r0, 0xC]
-	ldrh r1, [r2, 0x8]
-	strh r1, [r0, 0xE]
-	ldrh r1, [r2, 0x2]
-	strh r1, [r0, 0x10]
-	ldrh r1, [r2, 0x4]
-	strh r1, [r0, 0x12]
-	ldr r1, _080A8088 @ =sub_80A808C
-	str r1, [r0]
-	adds r0, r5, 0
-	bl _call_via_r1
-_080A8076:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A807C: .4byte gSprites
-_080A8080: .4byte gUnknown_03004B00
-_080A8084: .4byte gTasks
-_080A8088: .4byte sub_80A808C
-	thumb_func_end sub_80A7FA0
-
-	thumb_func_start sub_80A808C
-sub_80A808C: @ 80A808C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, _080A80D0 @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r3, r0, r1
-	ldrh r2, [r3, 0xE]
-	movs r4, 0xE
-	ldrsh r0, [r3, r4]
-	mov r12, r1
-	cmp r0, 0
-	bne _080A8144
-	ldr r2, _080A80D4 @ =gSprites
-	movs r7, 0x8
-	ldrsh r1, [r3, r7]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r4, r0, r2
-	movs r0, 0x24
-	ldrsh r1, [r4, r0]
-	ldrh r5, [r3, 0x10]
-	movs r7, 0x10
-	ldrsh r0, [r3, r7]
-	adds r7, r2, 0
-	cmp r1, r0
-	bne _080A80D8
-	negs r0, r5
-	strh r0, [r4, 0x24]
-	b _080A80DA
-	.align 2, 0
-_080A80D0: .4byte gTasks
-_080A80D4: .4byte gSprites
-_080A80D8:
-	strh r5, [r4, 0x24]
-_080A80DA:
-	lsls r3, r6, 2
-	adds r1, r3, r6
-	lsls r1, 3
-	add r1, r12
-	movs r0, 0x8
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 4
-	adds r0, r2
-	lsls r0, 2
-	adds r4, r0, r7
-	movs r0, 0x26
-	ldrsh r2, [r4, r0]
-	mov r8, r2
-	ldrh r5, [r1, 0x12]
-	movs r2, 0x12
-	ldrsh r0, [r1, r2]
-	cmp r8, r0
-	bne _080A8104
-	negs r0, r5
-	strh r0, [r4, 0x26]
-	b _080A8106
-_080A8104:
-	strh r5, [r4, 0x26]
-_080A8106:
-	adds r0, r3, r6
-	lsls r0, 3
-	mov r4, r12
-	adds r3, r0, r4
-	ldrh r0, [r3, 0xC]
-	strh r0, [r3, 0xE]
-	ldrh r0, [r3, 0xA]
-	subs r0, 0x1
-	strh r0, [r3, 0xA]
-	lsls r0, 16
-	asrs r2, r0, 16
-	cmp r2, 0
-	bne _080A8148
-	movs r0, 0x8
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	strh r2, [r0, 0x24]
-	movs r4, 0x8
-	ldrsh r1, [r3, r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	strh r2, [r0, 0x26]
-	adds r0, r6, 0
-	bl move_anim_task_del
-	b _080A8148
-_080A8144:
-	subs r0, r2, 0x1
-	strh r0, [r3, 0xE]
-_080A8148:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A808C
-
-	thumb_func_start sub_80A8154
-sub_80A8154: @ 80A8154
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r4, _080A8174 @ =gUnknown_03004B00
-	ldrb r0, [r4]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0xFF
-	bne _080A8178
-	adds r0, r5, 0
-	bl move_anim_task_del
-	b _080A81C6
-	.align 2, 0
-_080A8174: .4byte gUnknown_03004B00
-_080A8178:
-	ldr r0, _080A81CC @ =gSprites
-	lsls r1, r3, 4
-	adds r1, r3
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r4, 0x2]
-	ldrh r2, [r1, 0x24]
-	adds r0, r2
-	movs r2, 0
-	strh r0, [r1, 0x24]
-	ldrh r0, [r4, 0x4]
-	ldrh r6, [r1, 0x26]
-	adds r0, r6
-	strh r0, [r1, 0x26]
-	ldr r0, _080A81D0 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	strh r3, [r1, 0x8]
-	strh r2, [r1, 0xA]
-	ldrh r0, [r4, 0x6]
-	strh r0, [r1, 0xC]
-	strh r2, [r1, 0xE]
-	ldrh r0, [r4, 0x8]
-	strh r0, [r1, 0x10]
-	movs r2, 0x2
-	ldrsh r0, [r4, r2]
-	lsls r0, 1
-	strh r0, [r1, 0x12]
-	movs r6, 0x4
-	ldrsh r0, [r4, r6]
-	lsls r0, 1
-	strh r0, [r1, 0x14]
-	ldr r2, _080A81D4 @ =sub_80A81D8
-	str r2, [r1]
-	adds r0, r5, 0
-	bl _call_via_r2
-_080A81C6:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A81CC: .4byte gSprites
-_080A81D0: .4byte gTasks
-_080A81D4: .4byte sub_80A81D8
-	thumb_func_end sub_80A8154
-
-	thumb_func_start sub_80A81D8
-sub_80A81D8: @ 80A81D8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _080A8230 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r2, [r4, 0xE]
-	movs r3, 0xE
-	ldrsh r0, [r4, r3]
-	adds r6, r1, 0
-	cmp r0, 0
-	beq _080A81F6
-	b _080A8308
-_080A81F6:
-	ldrh r1, [r4, 0xA]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080A8238
-	ldr r2, _080A8234 @ =gSprites
-	movs r0, 0x8
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r4, 0x12]
-	ldrh r3, [r0, 0x24]
-	adds r1, r3
-	strh r1, [r0, 0x24]
-	movs r0, 0x8
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r4, 0x14]
-	ldrh r3, [r0, 0x26]
-	adds r1, r3
-	strh r1, [r0, 0x26]
-	adds r3, r2, 0
-	b _080A8262
-	.align 2, 0
-_080A8230: .4byte gTasks
-_080A8234: .4byte gSprites
-_080A8238:
-	ldr r3, _080A82C4 @ =gSprites
-	movs r0, 0x8
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r0, 0x24]
-	ldrh r2, [r4, 0x12]
-	subs r1, r2
-	strh r1, [r0, 0x24]
-	movs r2, 0x8
-	ldrsh r1, [r4, r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r0, 0x26]
-	ldrh r2, [r4, 0x14]
-	subs r1, r2
-	strh r1, [r0, 0x26]
-_080A8262:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r6
-	ldrh r0, [r4, 0x10]
-	strh r0, [r4, 0xE]
-	ldrh r0, [r4, 0xA]
-	adds r2, r0, 0x1
-	strh r2, [r4, 0xA]
-	lsls r0, r2, 16
-	asrs r0, 16
-	movs r6, 0xC
-	ldrsh r1, [r4, r6]
-	cmp r0, r1
-	blt _080A830C
-	movs r0, 0x1
-	ands r2, r0
-	cmp r2, 0
-	beq _080A82C8
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	movs r2, 0x12
-	ldrsh r0, [r4, r2]
-	lsrs r2, r0, 31
-	adds r0, r2
-	asrs r0, 1
-	ldrh r6, [r1, 0x24]
-	adds r0, r6
-	strh r0, [r1, 0x24]
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	movs r2, 0x14
-	ldrsh r0, [r4, r2]
-	lsrs r2, r0, 31
-	adds r0, r2
-	asrs r0, 1
-	ldrh r3, [r1, 0x26]
-	adds r0, r3
-	strh r0, [r1, 0x26]
-	b _080A8300
-	.align 2, 0
-_080A82C4: .4byte gSprites
-_080A82C8:
-	movs r6, 0x8
-	ldrsh r0, [r4, r6]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r3
-	movs r0, 0x12
-	ldrsh r1, [r4, r0]
-	lsrs r0, r1, 31
-	adds r1, r0
-	asrs r1, 1
-	ldrh r0, [r2, 0x24]
-	subs r0, r1
-	strh r0, [r2, 0x24]
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r3
-	movs r3, 0x14
-	ldrsh r1, [r4, r3]
-	lsrs r0, r1, 31
-	adds r1, r0
-	asrs r1, 1
-	ldrh r0, [r2, 0x26]
-	subs r0, r1
-	strh r0, [r2, 0x26]
-_080A8300:
-	adds r0, r5, 0
-	bl move_anim_task_del
-	b _080A830C
-_080A8308:
-	subs r0, r2, 0x1
-	strh r0, [r4, 0xE]
-_080A830C:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A81D8
-
-	thumb_func_start sub_80A8314
-sub_80A8314: @ 80A8314
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r5, _080A8364 @ =gUnknown_03004B00
-	ldrb r0, [r5]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080A8368 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrh r2, [r5, 0x2]
-	strh r2, [r1, 0x24]
-	ldr r2, _080A836C @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r2
-	strh r0, [r1, 0x8]
-	ldrh r0, [r5, 0x2]
-	strh r0, [r1, 0xA]
-	ldrh r0, [r5, 0x4]
-	strh r0, [r1, 0xC]
-	ldrh r0, [r5, 0x6]
-	strh r0, [r1, 0xE]
-	ldrh r0, [r5, 0x8]
-	strh r0, [r1, 0x10]
-	ldr r2, _080A8370 @ =sub_80A8374
-	str r2, [r1]
-	adds r0, r4, 0
-	bl _call_via_r2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8364: .4byte gUnknown_03004B00
-_080A8368: .4byte gSprites
-_080A836C: .4byte gTasks
-_080A8370: .4byte sub_80A8374
-	thumb_func_end sub_80A8314
-
-	thumb_func_start sub_80A8374
-sub_80A8374: @ 80A8374
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r2, _080A8400 @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r3, r0, r2
-	ldrb r5, [r3, 0x8]
-	ldrh r4, [r3, 0xA]
-	ldrh r1, [r3, 0x18]
-	adds r0, r1, 0x1
-	strh r0, [r3, 0x18]
-	movs r7, 0xC
-	ldrsh r0, [r3, r7]
-	lsls r1, 16
-	asrs r1, 16
-	mov r12, r2
-	ldr r7, _080A8404 @ =gSprites
-	cmp r0, r1
-	bne _080A83C6
-	movs r0, 0
-	strh r0, [r3, 0x18]
-	lsls r0, r5, 4
-	adds r0, r5
-	lsls r0, 2
-	adds r1, r0, r7
-	ldrh r3, [r1, 0x24]
-	movs r0, 0x24
-	ldrsh r2, [r1, r0]
-	lsls r0, r4, 16
-	asrs r0, 16
-	cmp r2, r0
-	bne _080A83BE
-	negs r0, r2
-	lsls r0, 16
-	lsrs r4, r0, 16
-_080A83BE:
-	lsls r0, r4, 16
-	asrs r0, 16
-	adds r0, r3
-	strh r0, [r1, 0x24]
-_080A83C6:
-	lsls r2, r6, 2
-	adds r2, r6
-	lsls r2, 3
-	add r2, r12
-	strh r4, [r2, 0xA]
-	ldrh r1, [r2, 0xE]
-	ldrh r0, [r2, 0x1A]
-	adds r1, r0
-	strh r1, [r2, 0x1A]
-	lsls r0, r5, 4
-	adds r0, r5
-	lsls r0, 2
-	adds r0, r7
-	lsls r1, 16
-	asrs r1, 24
-	strh r1, [r0, 0x26]
-	ldrh r0, [r2, 0x10]
-	subs r0, 0x1
-	strh r0, [r2, 0x10]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080A83F8
-	adds r0, r6, 0
-	bl move_anim_task_del
-_080A83F8:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8400: .4byte gTasks
-_080A8404: .4byte gSprites
-	thumb_func_end sub_80A8374
-
-	thumb_func_start sub_80A8408
-sub_80A8408: @ 80A8408
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r6, 0x1
-	ldr r4, _080A847C @ =gUnknown_03004B00
-	ldrb r0, [r4]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x5
-	ble _080A842C
-	movs r0, 0x5
-	strh r0, [r4, 0x8]
-_080A842C:
-	movs r1, 0
-	movs r2, 0x8
-	ldrsh r0, [r4, r2]
-	adds r3, r4, 0
-	ldr r2, _080A8480 @ =gTasks
-	mov r12, r2
-	lsls r4, r5, 2
-	ldr r2, _080A8484 @ =sub_80A8488
-	mov r8, r2
-	cmp r1, r0
-	bge _080A8452
-	adds r2, r0, 0
-_080A8444:
-	lsls r0, r6, 25
-	lsrs r6, r0, 24
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, r2
-	blt _080A8444
-_080A8452:
-	adds r0, r4, r5
-	lsls r0, 3
-	add r0, r12
-	strh r7, [r0, 0x8]
-	ldrh r1, [r3, 0x2]
-	strh r1, [r0, 0xA]
-	ldrh r1, [r3, 0x4]
-	strh r1, [r0, 0xC]
-	ldrh r1, [r3, 0x6]
-	strh r1, [r0, 0xE]
-	strh r6, [r0, 0x10]
-	mov r1, r8
-	str r1, [r0]
-	adds r0, r5, 0
-	bl _call_via_r8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A847C: .4byte gUnknown_03004B00
-_080A8480: .4byte gTasks
-_080A8484: .4byte sub_80A8488
-	thumb_func_end sub_80A8408
-
-	thumb_func_start sub_80A8488
-sub_80A8488: @ 80A8488
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r0, 0
-	ldr r1, _080A84F8 @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r5, r0, r1
-	ldrb r4, [r5, 0x8]
-	movs r1, 0x12
-	ldrsh r0, [r5, r1]
-	movs r2, 0xA
-	ldrsh r1, [r5, r2]
-	bl Sin
-	ldr r2, _080A84FC @ =gSprites
-	lsls r1, r4, 4
-	adds r1, r4
-	lsls r1, 2
-	adds r4, r1, r2
-	strh r0, [r4, 0x24]
-	movs r1, 0x12
-	ldrsh r0, [r5, r1]
-	movs r2, 0xC
-	ldrsh r1, [r5, r2]
-	bl Cos
-	negs r0, r0
-	strh r0, [r4, 0x26]
-	ldrh r1, [r5, 0xC]
-	adds r0, r1
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5, 0x10]
-	ldrh r1, [r5, 0x12]
-	adds r0, r1
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r5, 0x12]
-	cmp r0, 0
-	bne _080A84E0
-	ldrh r0, [r5, 0xE]
-	subs r0, 0x1
-	strh r0, [r5, 0xE]
-_080A84E0:
-	movs r2, 0xE
-	ldrsh r0, [r5, r2]
-	cmp r0, 0
-	bne _080A84F2
-	strh r0, [r4, 0x24]
-	strh r0, [r4, 0x26]
-	adds r0, r6, 0
-	bl move_anim_task_del
-_080A84F2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A84F8: .4byte gTasks
-_080A84FC: .4byte gSprites
-	thumb_func_end sub_80A8488
-
-	thumb_func_start sub_80A8500
-sub_80A8500: @ 80A8500
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _080A8528 @ =gUnknown_0202F7C8
-	ldrb r0, [r0]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A851C
-	ldr r1, _080A852C @ =gUnknown_03004B00
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-_080A851C:
-	adds r0, r4, 0
-	bl sub_80A8408
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8528: .4byte gUnknown_0202F7C8
-_080A852C: .4byte gUnknown_03004B00
-	thumb_func_end sub_80A8500
-
-	thumb_func_start sub_80A8530
-sub_80A8530: @ 80A8530
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080A8558 @ =gUnknown_0202F7C8
-	ldrb r0, [r0]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A8560
-	ldr r1, _080A855C @ =gUnknown_03004B00
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	b _080A8564
-	.align 2, 0
-_080A8558: .4byte gUnknown_0202F7C8
-_080A855C: .4byte gUnknown_03004B00
-_080A8560:
-	ldr r1, _080A8590 @ =gUnknown_03004B00
-	ldrh r0, [r1, 0x2]
-_080A8564:
-	strh r0, [r4, 0x30]
-	ldrh r2, [r1]
-	movs r0, 0
-	strh r2, [r4, 0x2E]
-	strh r0, [r4, 0x32]
-	ldr r1, _080A8594 @ =gUnknown_02024BE0
-	ldr r0, _080A8598 @ =gUnknown_0202F7C8
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strh r0, [r4, 0x34]
-	strh r2, [r4, 0x36]
-	ldr r1, _080A859C @ =sub_80A85A4
-	adds r0, r4, 0
-	bl oamt_set_x3A_32
-	ldr r0, _080A85A0 @ =sub_8078458
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8590: .4byte gUnknown_03004B00
-_080A8594: .4byte gUnknown_02024BE0
-_080A8598: .4byte gUnknown_0202F7C8
-_080A859C: .4byte sub_80A85A4
-_080A85A0: .4byte sub_8078458
-	thumb_func_end sub_80A8530
-
-	thumb_func_start sub_80A85A4
-sub_80A85A4: @ 80A85A4
-	push {lr}
-	ldrh r1, [r0, 0x36]
-	strh r1, [r0, 0x2E]
-	ldrh r1, [r0, 0x30]
-	negs r1, r1
-	strh r1, [r0, 0x30]
-	ldr r1, _080A85C0 @ =sub_8078458
-	str r1, [r0, 0x1C]
-	ldr r1, _080A85C4 @ =move_anim_8072740
-	bl oamt_set_x3A_32
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A85C0: .4byte sub_8078458
-_080A85C4: .4byte move_anim_8072740
-	thumb_func_end sub_80A85A4
-
-	thumb_func_start sub_80A85C8
-sub_80A85C8: @ 80A85C8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r5, _080A8608 @ =gUnknown_03004B00
-	ldrb r0, [r5, 0x4]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r2, [r5]
-	movs r1, 0
-	strh r2, [r4, 0x2E]
-	strh r1, [r4, 0x30]
-	ldrh r1, [r5, 0x2]
-	strh r1, [r4, 0x32]
-	strh r0, [r4, 0x34]
-	strh r2, [r4, 0x36]
-	ldr r1, _080A860C @ =sub_80A8614
-	adds r0, r4, 0
-	bl oamt_set_x3A_32
-	ldr r0, _080A8610 @ =sub_8078458
-	str r0, [r4, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8608: .4byte gUnknown_03004B00
-_080A860C: .4byte sub_80A8614
-_080A8610: .4byte sub_8078458
-	thumb_func_end sub_80A85C8
-
-	thumb_func_start sub_80A8614
-sub_80A8614: @ 80A8614
-	push {lr}
-	ldrh r1, [r0, 0x36]
-	strh r1, [r0, 0x2E]
-	ldrh r1, [r0, 0x32]
-	negs r1, r1
-	strh r1, [r0, 0x32]
-	ldr r1, _080A8630 @ =sub_8078458
-	str r1, [r0, 0x1C]
-	ldr r1, _080A8634 @ =move_anim_8072740
-	bl oamt_set_x3A_32
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8630: .4byte sub_8078458
-_080A8634: .4byte move_anim_8072740
-	thumb_func_end sub_80A8614
-
-	thumb_func_start sub_80A8638
-sub_80A8638: @ 80A8638
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r6, r0, 0
-	ldr r0, _080A8650 @ =gUnknown_03004B00
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080A865C
-	ldr r1, _080A8654 @ =gUnknown_02024BE0
-	ldr r0, _080A8658 @ =gUnknown_0202F7C8
-	b _080A8660
-	.align 2, 0
-_080A8650: .4byte gUnknown_03004B00
-_080A8654: .4byte gUnknown_02024BE0
-_080A8658: .4byte gUnknown_0202F7C8
-_080A865C:
-	ldr r1, _080A86C0 @ =gUnknown_02024BE0
-	ldr r0, _080A86C4 @ =gUnknown_0202F7C9
-_080A8660:
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r7, [r0]
-	ldr r5, _080A86C8 @ =gUnknown_03004B00
-	ldrh r0, [r5, 0x4]
-	movs r3, 0
-	strh r0, [r6, 0x2E]
-	ldr r0, _080A86CC @ =gSprites
-	lsls r4, r7, 4
-	adds r4, r7
-	lsls r4, 2
-	adds r4, r0
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r6, 0x30]
-	ldrh r0, [r4, 0x20]
-	strh r0, [r6, 0x32]
-	ldrh r0, [r4, 0x26]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r6, 0x34]
-	ldrh r0, [r4, 0x22]
-	strh r0, [r6, 0x36]
-	adds r0, r6, 0
-	str r3, [sp]
-	bl sub_8078A5C
-	ldr r3, [sp]
-	strh r3, [r6, 0x34]
-	strh r3, [r6, 0x36]
-	ldrh r0, [r4, 0x24]
-	strh r0, [r6, 0x38]
-	ldrh r0, [r4, 0x26]
-	strh r0, [r6, 0x3A]
-	adds r2, r6, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	movs r1, 0x2
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	bne _080A86D0
-	strh r3, [r6, 0x32]
-	b _080A86D6
-	.align 2, 0
-_080A86C0: .4byte gUnknown_02024BE0
-_080A86C4: .4byte gUnknown_0202F7C9
-_080A86C8: .4byte gUnknown_03004B00
-_080A86CC: .4byte gSprites
-_080A86D0:
-	cmp r0, 0x2
-	bne _080A86D6
-	strh r3, [r6, 0x30]
-_080A86D6:
-	ldr r0, _080A86EC @ =gUnknown_03004B00
-	ldrh r1, [r0, 0x2]
-	lsls r0, r7, 8
-	orrs r0, r1
-	strh r0, [r6, 0x3C]
-	ldr r0, _080A86F0 @ =sub_80A86F4
-	str r0, [r6, 0x1C]
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A86EC: .4byte gUnknown_03004B00
-_080A86F0: .4byte sub_80A86F4
-	thumb_func_end sub_80A8638
-
-	thumb_func_start sub_80A86F4
-sub_80A86F4: @ 80A86F4
-	push {r4-r6,lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x3C]
-	lsls r1, r0, 24
-	lsrs r4, r1, 24
-	adds r5, r4, 0
-	lsls r0, 16
-	asrs r0, 24
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _080A8730 @ =gSprites
-	adds r3, r1, r0
-	ldrh r0, [r2, 0x2E]
-	movs r6, 0x2E
-	ldrsh r1, [r2, r6]
-	cmp r1, 0
-	bne _080A8734
-	cmp r4, 0x1
-	bhi _080A871E
-	strh r1, [r3, 0x24]
-_080A871E:
-	cmp r5, 0x2
-	beq _080A8726
-	cmp r5, 0
-	bne _080A8728
-_080A8726:
-	strh r1, [r3, 0x26]
-_080A8728:
-	adds r0, r2, 0
-	bl move_anim_8072740
-	b _080A875E
-	.align 2, 0
-_080A8730: .4byte gSprites
-_080A8734:
-	subs r0, 0x1
-	strh r0, [r2, 0x2E]
-	ldrh r1, [r2, 0x30]
-	ldrh r0, [r2, 0x34]
-	adds r1, r0
-	strh r1, [r2, 0x34]
-	ldrh r0, [r2, 0x32]
-	ldrh r4, [r2, 0x36]
-	adds r0, r4
-	strh r0, [r2, 0x36]
-	lsls r1, 16
-	asrs r1, 24
-	ldrh r6, [r2, 0x38]
-	adds r1, r6
-	strh r1, [r3, 0x24]
-	ldrh r0, [r2, 0x36]
-	lsls r0, 16
-	asrs r0, 24
-	ldrh r2, [r2, 0x3A]
-	adds r0, r2
-	strh r0, [r3, 0x26]
-_080A875E:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A86F4
-
-	thumb_func_start sub_80A8764
-sub_80A8764: @ 80A8764
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, _080A8778 @ =gUnknown_03004B00
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080A8780
-	ldr r0, _080A877C @ =gUnknown_0202F7C8
-	b _080A8782
-	.align 2, 0
-_080A8778: .4byte gUnknown_03004B00
-_080A877C: .4byte gUnknown_0202F7C8
-_080A8780:
-	ldr r0, _080A8800 @ =gUnknown_0202F7C9
-_080A8782:
-	ldrb r2, [r0]
-	ldr r0, _080A8804 @ =gUnknown_02024BE0
-	adds r0, r2, r0
-	ldrb r6, [r0]
-	adds r0, r2, 0
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A87AC
-	ldr r1, _080A8808 @ =gUnknown_03004B00
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-	movs r2, 0x6
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x1
-	bne _080A87AC
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-_080A87AC:
-	ldr r2, _080A8808 @ =gUnknown_03004B00
-	ldrh r0, [r2, 0x8]
-	movs r4, 0
-	strh r0, [r5, 0x2E]
-	ldr r0, _080A880C @ =gSprites
-	lsls r1, r6, 4
-	adds r1, r6
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r1, 0x20]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r2, 0x2]
-	ldrh r3, [r1, 0x20]
-	adds r0, r3
-	strh r0, [r5, 0x32]
-	ldrh r0, [r1, 0x22]
-	strh r0, [r5, 0x34]
-	ldrh r0, [r2, 0x4]
-	ldrh r1, [r1, 0x22]
-	adds r0, r1
-	strh r0, [r5, 0x36]
-	adds r0, r5, 0
-	bl sub_8078A5C
-	strh r4, [r5, 0x34]
-	strh r4, [r5, 0x36]
-	strh r6, [r5, 0x38]
-	adds r2, r5, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r1, _080A8810 @ =move_anim_8072740
-	adds r0, r5, 0
-	bl oamt_set_x3A_32
-	ldr r0, _080A8814 @ =sub_80784A8
-	str r0, [r5, 0x1C]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8800: .4byte gUnknown_0202F7C9
-_080A8804: .4byte gUnknown_02024BE0
-_080A8808: .4byte gUnknown_03004B00
-_080A880C: .4byte gSprites
-_080A8810: .4byte move_anim_8072740
-_080A8814: .4byte sub_80784A8
-	thumb_func_end sub_80A8764
-
-	thumb_func_start sub_80A8818
-sub_80A8818: @ 80A8818
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	adds r2, r6, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080A8838 @ =gUnknown_03004B00
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080A8840
-	ldr r0, _080A883C @ =gUnknown_0202F7C8
-	b _080A8842
-	.align 2, 0
-_080A8838: .4byte gUnknown_03004B00
-_080A883C: .4byte gUnknown_0202F7C8
-_080A8840:
-	ldr r0, _080A88C0 @ =gUnknown_0202F7C9
-_080A8842:
-	ldrb r1, [r0]
-	ldr r0, _080A88C4 @ =gUnknown_02024BE0
-	adds r0, r1, r0
-	ldrb r7, [r0]
-	adds r0, r1, 0
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A886C
-	ldr r1, _080A88C8 @ =gUnknown_03004B00
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-	movs r2, 0x6
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x1
-	bne _080A886C
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-_080A886C:
-	ldr r5, _080A88C8 @ =gUnknown_03004B00
-	ldrh r0, [r5, 0x8]
-	strh r0, [r6, 0x2E]
-	ldr r0, _080A88CC @ =gSprites
-	lsls r4, r7, 4
-	adds r4, r7
-	lsls r4, 2
-	adds r4, r0
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r6, 0x30]
-	ldrh r1, [r5, 0x2]
-	adds r0, r1
-	strh r0, [r6, 0x32]
-	ldrh r0, [r4, 0x26]
-	ldrh r2, [r4, 0x22]
-	adds r0, r2
-	strh r0, [r6, 0x34]
-	ldrh r1, [r5, 0x4]
-	adds r0, r1
-	strh r0, [r6, 0x36]
-	adds r0, r6, 0
-	bl sub_8078A5C
-	ldrh r0, [r4, 0x24]
-	lsls r0, 8
-	strh r0, [r6, 0x34]
-	ldrh r0, [r4, 0x26]
-	lsls r0, 8
-	strh r0, [r6, 0x36]
-	strh r7, [r6, 0x38]
-	ldrh r0, [r5, 0xA]
-	strh r0, [r6, 0x3A]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080A88D4
-	ldr r1, _080A88D0 @ =move_anim_8072740
-	adds r0, r6, 0
-	bl oamt_set_x3A_32
-	b _080A88DC
-	.align 2, 0
-_080A88C0: .4byte gUnknown_0202F7C9
-_080A88C4: .4byte gUnknown_02024BE0
-_080A88C8: .4byte gUnknown_03004B00
-_080A88CC: .4byte gSprites
-_080A88D0: .4byte move_anim_8072740
-_080A88D4:
-	ldr r1, _080A88E8 @ =sub_80A88F0
-	adds r0, r6, 0
-	bl oamt_set_x3A_32
-_080A88DC:
-	ldr r0, _080A88EC @ =sub_80784A8
-	str r0, [r6, 0x1C]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A88E8: .4byte sub_80A88F0
-_080A88EC: .4byte sub_80784A8
-	thumb_func_end sub_80A8818
-
-	thumb_func_start sub_80A88F0
-sub_80A88F0: @ 80A88F0
-	push {r4,lr}
-	ldr r4, _080A891C @ =gSprites
-	movs r1, 0x38
-	ldrsh r2, [r0, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r4
-	movs r3, 0
-	strh r3, [r1, 0x24]
-	movs r1, 0x38
-	ldrsh r2, [r0, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r4
-	strh r3, [r1, 0x26]
-	bl move_anim_8072740
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A891C: .4byte gSprites
-	thumb_func_end sub_80A88F0
-
-	thumb_func_start sub_80A8920
-sub_80A8920: @ 80A8920
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r5, _080A89A4 @ =gUnknown_03004B00
-	movs r0, 0x6
-	ldrsh r1, [r5, r0]
-	movs r0, 0x80
-	lsls r0, 8
-	bl __divsi3
-	lsls r0, 16
-	lsrs r7, r0, 16
-	ldr r0, _080A89A8 @ =gUnknown_0202F7C8
-	ldrb r0, [r0]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A8952
-	ldrh r0, [r5, 0x2]
-	negs r0, r0
-	strh r0, [r5, 0x2]
-	ldrh r0, [r5, 0xA]
-	negs r0, r0
-	strh r0, [r5, 0xA]
-_080A8952:
-	ldrb r0, [r5]
-	bl obj_id_for_side_relative_to_move
-	ldr r1, _080A89AC @ =gTasks
-	lsls r4, r6, 2
-	adds r4, r6
-	lsls r4, 3
-	adds r4, r1
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x8]
-	movs r1, 0x2
-	ldrsh r0, [r5, r1]
-	lsls r0, 8
-	movs r2, 0x6
-	ldrsh r1, [r5, r2]
-	bl __divsi3
-	strh r0, [r4, 0xA]
-	ldrh r0, [r5, 0x4]
-	strh r0, [r4, 0xC]
-	ldrh r0, [r5, 0x6]
-	strh r0, [r4, 0xE]
-	ldrh r0, [r5, 0x8]
-	strh r0, [r4, 0x10]
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	lsls r0, 8
-	movs r2, 0xC
-	ldrsh r1, [r5, r2]
-	bl __divsi3
-	strh r0, [r4, 0x12]
-	ldrh r0, [r5, 0xC]
-	strh r0, [r4, 0x14]
-	strh r7, [r4, 0x16]
-	ldr r0, _080A89B0 @ =sub_80A89B4
-	str r0, [r4]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A89A4: .4byte gUnknown_03004B00
-_080A89A8: .4byte gUnknown_0202F7C8
-_080A89AC: .4byte gTasks
-_080A89B0: .4byte sub_80A89B4
-	thumb_func_end sub_80A8920
-
-	thumb_func_start sub_80A89B4
-sub_80A89B4: @ 80A89B4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080A8A0C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r5, r1, r2
-	ldrb r1, [r5, 0x8]
-	ldrh r0, [r5, 0xA]
-	ldrh r2, [r5, 0x1E]
-	adds r0, r2
-	strh r0, [r5, 0x1E]
-	ldr r2, _080A8A10 @ =gSprites
-	lsls r4, r1, 4
-	adds r4, r1
-	lsls r4, 2
-	adds r4, r2
-	lsls r0, 16
-	asrs r0, 24
-	strh r0, [r4, 0x24]
-	ldrh r0, [r5, 0x1C]
-	lsrs r0, 8
-	movs r2, 0xC
-	ldrsh r1, [r5, r2]
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5, 0x16]
-	ldrh r1, [r5, 0x1C]
-	adds r0, r1
-	strh r0, [r5, 0x1C]
-	ldrh r0, [r5, 0xE]
-	subs r0, 0x1
-	strh r0, [r5, 0xE]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080A8A04
-	ldr r0, _080A8A14 @ =sub_80A8A18
-	str r0, [r5]
-_080A8A04:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8A0C: .4byte gTasks
-_080A8A10: .4byte gSprites
-_080A8A14: .4byte sub_80A8A18
-	thumb_func_end sub_80A89B4
-
-	thumb_func_start sub_80A8A18
-sub_80A8A18: @ 80A8A18
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	ldr r1, _080A8A3C @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r1, [r4, 0x10]
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	ble _080A8A40
-	subs r0, r1, 0x1
-	strh r0, [r4, 0x10]
-	b _080A8A74
-	.align 2, 0
-_080A8A3C: .4byte gTasks
-_080A8A40:
-	ldrb r0, [r4, 0x8]
-	ldrh r2, [r4, 0x12]
-	ldrh r1, [r4, 0x20]
-	adds r2, r1
-	strh r2, [r4, 0x20]
-	ldr r3, _080A8A7C @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	lsls r2, 16
-	asrs r2, 24
-	ldrh r0, [r4, 0x1E]
-	lsls r0, 16
-	asrs r0, 24
-	adds r2, r0
-	strh r2, [r1, 0x24]
-	ldrh r0, [r4, 0x14]
-	subs r0, 0x1
-	strh r0, [r4, 0x14]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080A8A74
-	adds r0, r5, 0
-	bl move_anim_task_del
-_080A8A74:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8A7C: .4byte gSprites
-	thumb_func_end sub_80A8A18
-
-	thumb_func_start sub_80A8A80
-sub_80A8A80: @ 80A8A80
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, _080A8AA4 @ =gUnknown_03004B00
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x2
-	beq _080A8AAE
-	cmp r0, 0x2
-	bgt _080A8AA8
-	cmp r0, 0
-	blt _080A8AE0
-	ldrb r0, [r1]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r2, r0, 24
-	b _080A8AE8
-	.align 2, 0
-_080A8AA4: .4byte gUnknown_03004B00
-_080A8AA8:
-	cmp r0, 0x3
-	beq _080A8AB8
-	b _080A8AE0
-_080A8AAE:
-	ldr r5, _080A8AB4 @ =gUnknown_0202F7C8
-	b _080A8ABA
-	.align 2, 0
-_080A8AB4: .4byte gUnknown_0202F7C8
-_080A8AB8:
-	ldr r5, _080A8AD8 @ =gUnknown_0202F7C9
-_080A8ABA:
-	ldrb r0, [r5]
-	movs r4, 0x2
-	eors r0, r4
-	bl b_side_obj__get_some_boolean
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A8AE0
-	ldr r1, _080A8ADC @ =gUnknown_02024BE0
-	ldrb r0, [r5]
-	eors r0, r4
-	adds r0, r1
-	ldrb r2, [r0]
-	b _080A8AE8
-	.align 2, 0
-_080A8AD8: .4byte gUnknown_0202F7C9
-_080A8ADC: .4byte gUnknown_02024BE0
-_080A8AE0:
-	adds r0, r6, 0
-	bl move_anim_task_del
-	b _080A8B28
-_080A8AE8:
-	ldr r1, _080A8B08 @ =gTasks
-	lsls r4, r6, 2
-	adds r0, r4, r6
-	lsls r0, 3
-	adds r5, r0, r1
-	strh r2, [r5, 0x8]
-	ldr r0, _080A8B0C @ =gUnknown_0202F7C9
-	ldrb r0, [r0]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A8B14
-	ldr r0, _080A8B10 @ =gUnknown_03004B00
-	ldrh r0, [r0, 0x2]
-	b _080A8B1A
-	.align 2, 0
-_080A8B08: .4byte gTasks
-_080A8B0C: .4byte gUnknown_0202F7C9
-_080A8B10: .4byte gUnknown_03004B00
-_080A8B14:
-	ldr r0, _080A8B30 @ =gUnknown_03004B00
-	ldrh r0, [r0, 0x2]
-	negs r0, r0
-_080A8B1A:
-	strh r0, [r5, 0xA]
-	ldr r0, _080A8B34 @ =gTasks
-	adds r1, r4, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080A8B38 @ =sub_80A8B3C
-	str r0, [r1]
-_080A8B28:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8B30: .4byte gUnknown_03004B00
-_080A8B34: .4byte gTasks
-_080A8B38: .4byte sub_80A8B3C
-	thumb_func_end sub_80A8A80
-
-	thumb_func_start sub_80A8B3C
-sub_80A8B3C: @ 80A8B3C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _080A8B80 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldrb r2, [r1, 0x8]
-	ldr r3, _080A8B84 @ =gSprites
-	lsls r0, r2, 4
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r1, 0xA]
-	ldrh r2, [r0, 0x24]
-	adds r1, r2
-	strh r1, [r0, 0x24]
-	movs r2, 0x24
-	ldrsh r1, [r0, r2]
-	movs r2, 0x20
-	ldrsh r0, [r0, r2]
-	adds r1, r0
-	adds r1, 0x20
-	movs r0, 0x98
-	lsls r0, 1
-	cmp r1, r0
-	bls _080A8B7A
-	adds r0, r4, 0
-	bl move_anim_task_del
-_080A8B7A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8B80: .4byte gTasks
-_080A8B84: .4byte gSprites
-	thumb_func_end sub_80A8B3C
-
-	thumb_func_start sub_80A8B88
-sub_80A8B88: @ 80A8B88
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r6, _080A8BD8 @ =gUnknown_0202F7C8
-	ldrb r0, [r6]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A8BA4
-	ldr r1, _080A8BDC @ =gUnknown_03004B00
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-_080A8BA4:
-	ldr r4, _080A8BDC @ =gUnknown_03004B00
-	ldrb r0, [r4, 0x8]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080A8BE0 @ =gTasks
-	lsls r3, r5, 2
-	adds r1, r3, r5
-	lsls r1, 3
-	adds r2, r1, r2
-	ldrh r1, [r4]
-	strh r1, [r2, 0x8]
-	ldrh r1, [r4, 0x2]
-	strh r1, [r2, 0xA]
-	ldrh r1, [r4, 0x4]
-	strh r1, [r2, 0xC]
-	ldrh r1, [r4, 0x6]
-	strh r1, [r2, 0xE]
-	strh r0, [r2, 0x10]
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080A8BE4
-	ldrb r0, [r6]
-	b _080A8BE8
-	.align 2, 0
-_080A8BD8: .4byte gUnknown_0202F7C8
-_080A8BDC: .4byte gUnknown_03004B00
-_080A8BE0: .4byte gTasks
-_080A8BE4:
-	ldr r0, _080A8C00 @ =gUnknown_0202F7C9
-	ldrb r0, [r0]
-_080A8BE8:
-	strh r0, [r2, 0x12]
-	ldr r1, _080A8C04 @ =gTasks
-	adds r0, r3, r5
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x1
-	strh r1, [r0, 0x20]
-	ldr r1, _080A8C08 @ =sub_80A8C0C
-	str r1, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8C00: .4byte gUnknown_0202F7C9
-_080A8C04: .4byte gTasks
-_080A8C08: .4byte sub_80A8C0C
-	thumb_func_end sub_80A8B88
-
-	thumb_func_start sub_80A8C0C
-sub_80A8C0C: @ 80A8C0C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, _080A8C5C @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrb r7, [r4, 0x10]
-	ldrh r0, [r4, 0xC]
-	ldrh r1, [r4, 0x1C]
-	adds r0, r1
-	lsls r1, r0, 16
-	strh r0, [r4, 0x1C]
-	lsrs r1, 24
-	mov r8, r1
-	mov r0, r8
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	bl Sin
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r9, r5
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080A8C64
-	ldr r0, _080A8C60 @ =gSprites
-	lsls r2, r7, 4
-	adds r1, r2, r7
-	lsls r1, 2
-	adds r1, r0
-	strh r5, [r1, 0x24]
-	mov r9, r0
-	adds r4, r2, 0
-	b _080A8CAA
-	.align 2, 0
-_080A8C5C: .4byte gTasks
-_080A8C60: .4byte gSprites
-_080A8C64:
-	ldrb r0, [r4, 0x12]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A8C8C
-	ldr r1, _080A8C88 @ =gSprites
-	lsls r2, r7, 4
-	adds r0, r2, r7
-	lsls r0, 2
-	adds r3, r0, r1
-	lsls r0, r5, 16
-	asrs r0, 16
-	mov r9, r1
-	adds r4, r2, 0
-	cmp r0, 0
-	bge _080A8CA8
-	b _080A8CA6
-	.align 2, 0
-_080A8C88: .4byte gSprites
-_080A8C8C:
-	ldr r1, _080A8D2C @ =gSprites
-	lsls r2, r7, 4
-	adds r0, r2, r7
-	lsls r0, 2
-	adds r3, r0, r1
-	mov r4, r9
-	lsls r0, r4, 16
-	asrs r0, 16
-	mov r9, r1
-	adds r4, r2, 0
-	cmp r0, 0
-	bge _080A8CA6
-	negs r0, r0
-_080A8CA6:
-	negs r0, r0
-_080A8CA8:
-	strh r0, [r3, 0x26]
-_080A8CAA:
-	mov r5, r8
-	cmp r5, 0x7F
-	bls _080A8CCC
-	ldr r1, _080A8D30 @ =gTasks
-	lsls r2, r6, 2
-	adds r0, r2, r6
-	lsls r0, 3
-	adds r3, r0, r1
-	movs r5, 0x1E
-	ldrsh r0, [r3, r5]
-	adds r5, r1, 0
-	cmp r0, 0
-	bne _080A8CCC
-	movs r1, 0x20
-	ldrsh r0, [r3, r1]
-	cmp r0, 0x1
-	beq _080A8CEE
-_080A8CCC:
-	mov r2, r8
-	cmp r2, 0x7E
-	bhi _080A8D20
-	ldr r1, _080A8D30 @ =gTasks
-	lsls r2, r6, 2
-	adds r0, r2, r6
-	lsls r0, 3
-	adds r3, r0, r1
-	movs r5, 0x1E
-	ldrsh r0, [r3, r5]
-	adds r5, r1, 0
-	cmp r0, 0x1
-	bne _080A8D20
-	movs r1, 0x20
-	ldrsh r0, [r3, r1]
-	cmp r0, 0
-	bne _080A8D20
-_080A8CEE:
-	adds r1, r2, r6
-	lsls r1, 3
-	adds r1, r5
-	ldrh r0, [r1, 0x1E]
-	movs r2, 0x1
-	eors r0, r2
-	strh r0, [r1, 0x1E]
-	ldrh r0, [r1, 0x20]
-	eors r0, r2
-	strh r0, [r1, 0x20]
-	ldrh r0, [r1, 0xE]
-	subs r0, 0x1
-	strh r0, [r1, 0xE]
-	lsls r0, 16
-	asrs r3, r0, 16
-	cmp r3, 0
-	bne _080A8D20
-	adds r0, r4, r7
-	lsls r0, 2
-	add r0, r9
-	strh r3, [r0, 0x24]
-	strh r3, [r0, 0x26]
-	adds r0, r6, 0
-	bl move_anim_task_del
-_080A8D20:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8D2C: .4byte gSprites
-_080A8D30: .4byte gTasks
-	thumb_func_end sub_80A8C0C
-
-	thumb_func_start sub_80A8D34
-sub_80A8D34: @ 80A8D34
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r6, _080A8D80 @ =gUnknown_03004B00
-	ldrb r0, [r6, 0x6]
-	bl obj_id_for_side_relative_to_move
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldrb r1, [r6, 0x8]
-	adds r0, r5, 0
-	bl sub_8078E70
-	ldr r1, _080A8D84 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r6]
-	strh r1, [r0, 0x8]
-	ldrh r1, [r6, 0x2]
-	strh r1, [r0, 0xA]
-	ldrh r1, [r6, 0x4]
-	strh r1, [r0, 0xC]
-	ldrh r1, [r6, 0x4]
-	strh r1, [r0, 0xE]
-	strh r5, [r0, 0x10]
-	movs r1, 0x80
-	lsls r1, 1
-	strh r1, [r0, 0x1C]
-	strh r1, [r0, 0x1E]
-	ldr r1, _080A8D88 @ =sub_80A8D8C
-	str r1, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8D80: .4byte gUnknown_03004B00
-_080A8D84: .4byte gTasks
-_080A8D88: .4byte sub_80A8D8C
-	thumb_func_end sub_80A8D34
-
-	thumb_func_start sub_80A8D8C
-sub_80A8D8C: @ 80A8D8C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	ldr r1, _080A8DEC @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x8]
-	ldrh r1, [r4, 0x1C]
-	adds r0, r1
-	strh r0, [r4, 0x1C]
-	ldrh r0, [r4, 0xA]
-	ldrh r3, [r4, 0x1E]
-	adds r0, r3
-	strh r0, [r4, 0x1E]
-	ldrb r0, [r4, 0x10]
-	adds r6, r0, 0
-	movs r0, 0x1C
-	ldrsh r1, [r4, r0]
-	movs r3, 0x1E
-	ldrsh r2, [r4, r3]
-	adds r0, r6, 0
-	movs r3, 0
-	bl obj_id_set_rotscale
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	asrs r1, r0, 16
-	cmp r1, 0
-	bne _080A8DFC
-	ldrh r2, [r4, 0xE]
-	movs r3, 0xE
-	ldrsh r0, [r4, r3]
-	cmp r0, 0
-	ble _080A8DF0
-	ldrh r0, [r4, 0x8]
-	negs r0, r0
-	strh r0, [r4, 0x8]
-	ldrh r0, [r4, 0xA]
-	negs r0, r0
-	strh r0, [r4, 0xA]
-	strh r2, [r4, 0xC]
-	strh r1, [r4, 0xE]
-	b _080A8DFC
-	.align 2, 0
-_080A8DEC: .4byte gTasks
-_080A8DF0:
-	adds r0, r6, 0
-	bl sub_8078F40
-	adds r0, r5, 0
-	bl move_anim_task_del
-_080A8DFC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A8D8C
-
-	thumb_func_start sub_80A8E04
-sub_80A8E04: @ 80A8E04
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r4, _080A8E40 @ =gUnknown_03004B00
-	ldrb r0, [r4, 0x4]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r1, 0
-	bl sub_8078E70
-	ldr r1, _080A8E44 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r1, 0
-	strh r1, [r2, 0xA]
-	ldrh r0, [r4]
-	strh r0, [r2, 0xC]
-	movs r3, 0x6
-	ldrsh r0, [r4, r3]
-	cmp r0, 0x1
-	beq _080A8E48
-	strh r1, [r2, 0xE]
-	b _080A8E54
-	.align 2, 0
-_080A8E40: .4byte gUnknown_03004B00
-_080A8E44: .4byte gTasks
-_080A8E48:
-	ldrh r0, [r4]
-	ldrh r1, [r4, 0x2]
-	adds r3, r0, 0
-	muls r3, r1
-	adds r0, r3, 0
-	strh r0, [r2, 0xE]
-_080A8E54:
-	ldr r1, _080A8E80 @ =gTasks
-	lsls r4, r7, 2
-	adds r0, r4, r7
-	lsls r0, 3
-	adds r5, r0, r1
-	ldr r6, _080A8E84 @ =gUnknown_03004B00
-	ldrh r0, [r6, 0x2]
-	strh r0, [r5, 0x10]
-	mov r0, r8
-	strh r0, [r5, 0x12]
-	ldrh r0, [r6, 0x6]
-	strh r0, [r5, 0x14]
-	bl sub_8076BE0
-	lsls r0, 24
-	mov r8, r4
-	cmp r0, 0
-	beq _080A8E88
-	movs r0, 0x1
-	strh r0, [r5, 0x16]
-	b _080A8EAC
-	.align 2, 0
-_080A8E80: .4byte gTasks
-_080A8E84: .4byte gUnknown_03004B00
-_080A8E88:
-	movs r1, 0x4
-	ldrsh r0, [r6, r1]
-	cmp r0, 0
-	bne _080A8E98
-	ldr r0, _080A8E94 @ =gUnknown_0202F7C8
-	b _080A8E9A
-	.align 2, 0
-_080A8E94: .4byte gUnknown_0202F7C8
-_080A8E98:
-	ldr r0, _080A8EF0 @ =gUnknown_0202F7C9
-_080A8E9A:
-	ldrb r0, [r0]
-	bl battle_side_get_owner
-	movs r1, 0
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A8EAA
-	movs r1, 0x1
-_080A8EAA:
-	strh r1, [r5, 0x16]
-_080A8EAC:
-	ldr r0, _080A8EF4 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r4, r1, r0
-	movs r3, 0x16
-	ldrsh r0, [r4, r3]
-	cmp r0, 0
-	beq _080A8ED8
-	bl sub_8076BE0
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A8ED8
-	movs r1, 0xE
-	ldrsh r0, [r4, r1]
-	negs r0, r0
-	strh r0, [r4, 0xE]
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	negs r0, r0
-	strh r0, [r4, 0x10]
-_080A8ED8:
-	ldr r0, _080A8EF4 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080A8EF8 @ =sub_80A8FD8
-	str r0, [r1]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8EF0: .4byte gUnknown_0202F7C9
-_080A8EF4: .4byte gTasks
-_080A8EF8: .4byte sub_80A8FD8
-	thumb_func_end sub_80A8E04
-
-	thumb_func_start sub_80A8EFC
-sub_80A8EFC: @ 80A8EFC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r4, _080A8F38 @ =gUnknown_03004B00
-	ldrb r0, [r4, 0x4]
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r1, 0
-	bl sub_8078E70
-	ldr r1, _080A8F3C @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0, 0xA]
-	ldrh r1, [r4]
-	strh r1, [r0, 0xC]
-	movs r1, 0x4
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080A8F44
-	ldr r0, _080A8F40 @ =gUnknown_0202F7C8
-	b _080A8F46
-	.align 2, 0
-_080A8F38: .4byte gUnknown_03004B00
-_080A8F3C: .4byte gTasks
-_080A8F40: .4byte gUnknown_0202F7C8
-_080A8F44:
-	ldr r0, _080A8F74 @ =gUnknown_0202F7C9
-_080A8F46:
-	ldrb r0, [r0]
-	bl battle_side_get_owner
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A8F58
-	ldrh r0, [r4, 0x2]
-	negs r0, r0
-	strh r0, [r4, 0x2]
-_080A8F58:
-	ldr r0, _080A8F78 @ =gUnknown_03004B00
-	movs r2, 0x6
-	ldrsh r1, [r0, r2]
-	adds r6, r0, 0
-	cmp r1, 0x1
-	beq _080A8F80
-	ldr r2, _080A8F7C @ =gTasks
-	lsls r3, r5, 2
-	adds r0, r3, r5
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0
-	strh r1, [r0, 0xE]
-	b _080A8F9A
-	.align 2, 0
-_080A8F74: .4byte gUnknown_0202F7C9
-_080A8F78: .4byte gUnknown_03004B00
-_080A8F7C: .4byte gTasks
-_080A8F80:
-	ldr r3, _080A8FD0 @ =gTasks
-	lsls r4, r5, 2
-	adds r0, r4, r5
-	lsls r0, 3
-	adds r0, r3
-	ldrh r2, [r6]
-	ldrh r1, [r6, 0x2]
-	adds r7, r2, 0
-	muls r7, r1
-	adds r1, r7, 0
-	strh r1, [r0, 0xE]
-	adds r2, r3, 0
-	adds r3, r4, 0
-_080A8F9A:
-	adds r1, r3, r5
-	lsls r1, 3
-	adds r1, r2
-	ldrh r0, [r6, 0x2]
-	strh r0, [r1, 0x10]
-	mov r0, r8
-	strh r0, [r1, 0x12]
-	ldrh r0, [r6, 0x6]
-	strh r0, [r1, 0x14]
-	movs r0, 0x1
-	strh r0, [r1, 0x16]
-	movs r2, 0xE
-	ldrsh r0, [r1, r2]
-	negs r0, r0
-	strh r0, [r1, 0xE]
-	movs r7, 0x10
-	ldrsh r0, [r1, r7]
-	negs r0, r0
-	strh r0, [r1, 0x10]
-	ldr r0, _080A8FD4 @ =sub_80A8FD8
-	str r0, [r1]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A8FD0: .4byte gTasks
-_080A8FD4: .4byte sub_80A8FD8
-	thumb_func_end sub_80A8EFC
-
-	thumb_func_start sub_80A8FD8
-sub_80A8FD8: @ 80A8FD8
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _080A9030 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x10]
-	ldrh r1, [r4, 0xE]
-	adds r0, r1
-	strh r0, [r4, 0xE]
-	ldrb r0, [r4, 0x12]
-	movs r2, 0x80
-	lsls r2, 1
-	ldrh r3, [r4, 0xE]
-	adds r1, r2, 0
-	bl obj_id_set_rotscale
-	movs r2, 0x16
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _080A900C
-	ldrb r0, [r4, 0x12]
-	bl sub_8078F9C
-_080A900C:
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0xC
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	blt _080A9052
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _080A9034
-	cmp r0, 0x1
-	ble _080A903A
-	cmp r0, 0x2
-	beq _080A9042
-	b _080A903A
-	.align 2, 0
-_080A9030: .4byte gTasks
-_080A9034:
-	ldrb r0, [r4, 0x12]
-	bl sub_8078F40
-_080A903A:
-	adds r0, r5, 0
-	bl move_anim_task_del
-	b _080A9052
-_080A9042:
-	movs r0, 0
-	strh r0, [r4, 0xA]
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	negs r0, r0
-	strh r0, [r4, 0x10]
-	movs r0, 0x1
-	strh r0, [r4, 0x14]
-_080A9052:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A8FD8
-
-	thumb_func_start sub_80A9058
-sub_80A9058: @ 80A9058
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r0, _080A9084 @ =gUnknown_03004B00
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	mov r8, r0
-	cmp r1, 0
-	bne _080A9090
-	ldr r4, _080A9088 @ =gTasks
-	lsls r5, r7, 2
-	adds r0, r5, r7
-	lsls r0, 3
-	adds r6, r0, r4
-	ldr r0, _080A908C @ =gUnknown_0202F7BC
-	ldrh r0, [r0]
-	movs r1, 0xC
-	bl __udivsi3
-	b _080A90A4
-	.align 2, 0
-_080A9084: .4byte gUnknown_03004B00
-_080A9088: .4byte gTasks
-_080A908C: .4byte gUnknown_0202F7BC
-_080A9090:
-	ldr r4, _080A912C @ =gTasks
-	lsls r5, r7, 2
-	adds r0, r5, r7
-	lsls r0, 3
-	adds r6, r0, r4
-	ldr r0, _080A9130 @ =gUnknown_0202F7B8
-	ldr r0, [r0]
-	movs r1, 0xC
-	bl __divsi3
-_080A90A4:
-	strh r0, [r6, 0x26]
-	lsls r0, 16
-	adds r1, r4, 0
-	cmp r0, 0
-	bgt _080A90B2
-	movs r0, 0x1
-	strh r0, [r6, 0x26]
-_080A90B2:
-	movs r2, 0x26
-	ldrsh r0, [r6, r2]
-	cmp r0, 0x10
-	ble _080A90BE
-	movs r0, 0x10
-	strh r0, [r6, 0x26]
-_080A90BE:
-	adds r4, r5, r7
-	lsls r4, 3
-	adds r4, r1
-	movs r0, 0x26
-	ldrsh r1, [r4, r0]
-	lsrs r0, r1, 31
-	adds r1, r0
-	asrs r1, 1
-	movs r5, 0
-	strh r1, [r4, 0x24]
-	ldrh r2, [r4, 0x26]
-	movs r0, 0x1
-	ands r0, r2
-	adds r1, r0
-	strh r1, [r4, 0x22]
-	strh r5, [r4, 0x20]
-	mov r1, r8
-	ldrh r0, [r1, 0x6]
-	strh r0, [r4, 0x1C]
-	ldrh r0, [r1, 0x8]
-	strh r0, [r4, 0x1E]
-	movs r0, 0x1
-	bl obj_id_for_side_relative_to_move
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x16]
-	ldr r2, _080A9134 @ =gSprites
-	movs r0, 0x16
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r0, [r0, 0x24]
-	strh r0, [r4, 0x18]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r0, [r0, 0x26]
-	strh r0, [r4, 0x1A]
-	strh r5, [r4, 0x8]
-	mov r1, r8
-	ldrh r0, [r1, 0x2]
-	strh r0, [r4, 0xA]
-	ldrh r0, [r1, 0x4]
-	strh r0, [r4, 0xC]
-	ldr r0, _080A9138 @ =sub_80A913C
-	str r0, [r4]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A912C: .4byte gTasks
-_080A9130: .4byte gUnknown_0202F7B8
-_080A9134: .4byte gSprites
-_080A9138: .4byte sub_80A913C
-	thumb_func_end sub_80A9058
-
-	thumb_func_start sub_80A913C
-sub_80A913C: @ 80A913C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _080A9190 @ =gTasks
-	adds r3, r0, r1
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0xA
-	ldrsh r1, [r3, r2]
-	cmp r0, r1
-	ble _080A921A
-	movs r0, 0
-	strh r0, [r3, 0x8]
-	ldrh r0, [r3, 0x20]
-	adds r1, r0, 0x1
-	movs r0, 0x1
-	ands r1, r0
-	strh r1, [r3, 0x20]
-	movs r2, 0x1C
-	ldrsh r0, [r3, r2]
-	cmp r0, 0
-	beq _080A91AE
-	cmp r1, 0
-	beq _080A9198
-	ldr r2, _080A9194 @ =gSprites
-	movs r0, 0x16
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r3, 0x22]
-	ldrh r2, [r3, 0x18]
-	adds r1, r2
-	b _080A91AC
-	.align 2, 0
-_080A9190: .4byte gTasks
-_080A9194: .4byte gSprites
-_080A9198:
-	ldr r2, _080A91D4 @ =gSprites
-	movs r0, 0x16
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r3, 0x18]
-	ldrh r2, [r3, 0x24]
-	subs r1, r2
-_080A91AC:
-	strh r1, [r0, 0x24]
-_080A91AE:
-	movs r1, 0x1E
-	ldrsh r0, [r3, r1]
-	cmp r0, 0
-	beq _080A91E8
-	movs r2, 0x20
-	ldrsh r4, [r3, r2]
-	cmp r4, 0
-	beq _080A91D8
-	ldr r2, _080A91D4 @ =gSprites
-	movs r0, 0x16
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r3, 0x26]
-	strh r1, [r0, 0x26]
-	b _080A91E8
-	.align 2, 0
-_080A91D4: .4byte gSprites
-_080A91D8:
-	ldr r2, _080A9220 @ =gSprites
-	movs r0, 0x16
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r4, [r0, 0x26]
-_080A91E8:
-	ldrh r0, [r3, 0xC]
-	subs r0, 0x1
-	strh r0, [r3, 0xC]
-	lsls r0, 16
-	asrs r4, r0, 16
-	cmp r4, 0
-	bne _080A921A
-	ldr r2, _080A9220 @ =gSprites
-	movs r0, 0x16
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r4, [r0, 0x24]
-	movs r0, 0x16
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r4, [r0, 0x26]
-	adds r0, r5, 0
-	bl move_anim_task_del
-_080A921A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A9220: .4byte gSprites
-	thumb_func_end sub_80A913C
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/macros/battle_anim.inc b/asm/macros/battle_anim.inc
index fc2777326..4ff845032 100644
--- a/asm/macros/battle_anim.inc
+++ b/asm/macros/battle_anim.inc
@@ -8,24 +8,24 @@
 	.2byte \id
 	.endm
 
-	.macro sprite template, priority, argc=0, argv:vararg
+	.macro sprite template, priority, argv:vararg
 	.byte 0x02
 	.4byte \template
 	.byte \priority
-	.byte \argc
-	.if \argc > 0
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
 	.2byte \argv
-	.endif
+.Lsprite_\@_2:
 	.endm
 
-	.macro createtask addr, priority, argc=0, argv:vararg
+	.macro createtask addr, priority, argv:vararg
 	.byte 0x03
 	.4byte \addr
 	.byte \priority
-	.byte \argc
-	.if \argc > 0
+	.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2
+.Lcreatetask_\@_1:
 	.2byte \argv
-	.endif
+.Lcreatetask_\@_2:
 	.endm
 
 	.macro pause delay
@@ -167,13 +167,13 @@
 	.2byte \bldcnt
 	.endm
 
-	.macro createtask_1F addr, argc=0, argv:vararg
+	.macro createtask_1F addr, argv:vararg
 	.byte 0x1F
 	.4byte \addr
-	.byte \argc
-	.if \argc > 0
+	.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
+.Lcreatetask_1F_\@_1:
 	.2byte \argv
-	.endif
+.Lcreatetask_1F_\@_2:
 	.endm
 
 	.macro waitsound
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index fad85183f..74205e66c 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -422,8 +422,8 @@ Move_POUND: @ 81C7794
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W003, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -435,89 +435,89 @@ Move_DOUBLE_SLAP: @ 81C77C5
 	setalpha 12, 8
 	ifelse _81C77F0, _81C7804
 _81C77D6:
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W003, 63
 	wait
 	clearmonbg 1
 	blendoff
 	end
 _81C77F0:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -8, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 2
 	jump _81C77D6
 _81C7804:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 8, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 8, 0, 1, 2
 	jump _81C77D6
 
 Move_POISON_POWDER: @ 81C7818
 	loadsprite 10065
 	loadsprite 10150
 	panse_1C SE_W077, 63, 10, 6
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -30, -22, 117, 80, 5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 10, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -25, -22, 117, 112, 5, 3
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -30, -22, 117, 80, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 10, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -25, -22, 117, 112, 5, 3
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -5, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 5, -22, 117, 96, 5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 0, -22, 117, 69, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -15, -22, 117, 112, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -5, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 5, -22, 117, 96, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 0, -22, 117, 69, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -15, -22, 117, 112, 5, 2
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -15, -22, 117, 112, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 15, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -10, -22, 117, 96, 7, 2
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -5, -22, 117, 90, -8, 0
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -15, -22, 117, 112, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 15, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -10, -22, 117, 96, 7, 2
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -5, -22, 117, 90, -8, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, -10, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 0, -22, 117, 89, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 20, -22, 117, 112, -8, 2
-	sprite gBattleAnimSpriteTemplate_83D6254, 130, 6, 5, -22, 117, 80, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, -10, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 0, -22, 117, 89, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 20, -22, 117, 112, -8, 2
+	sprite gBattleAnimSpriteTemplate_83D6254, 130, 5, -22, 117, 80, 5, 1
 	wait
 	end
 
 Move_STUN_SPORE: @ 81C7949
 	loadsprite 10068
 	panse_1C SE_W077, 63, 10, 6
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -30, -22, 117, 80, 5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 10, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -25, -22, 117, 112, 5, 3
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -30, -22, 117, 80, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 10, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -25, -22, 117, 112, 5, 3
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -5, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 5, -22, 117, 96, 5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 0, -22, 117, 69, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -15, -22, 117, 112, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -5, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 5, -22, 117, 96, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 0, -22, 117, 69, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -15, -22, 117, 112, 5, 2
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -15, -22, 117, 112, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 15, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -10, -22, 117, 96, 7, 2
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -5, -22, 117, 90, -8, 0
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -15, -22, 117, 112, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 15, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -10, -22, 117, 96, 7, 2
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -5, -22, 117, 90, -8, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, -10, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 0, -22, 117, 89, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 20, -22, 117, 112, -8, 2
-	sprite gBattleAnimSpriteTemplate_83D623C, 130, 6, 5, -22, 117, 80, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, -10, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 0, -22, 117, 89, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 20, -22, 117, 112, -8, 2
+	sprite gBattleAnimSpriteTemplate_83D623C, 130, 5, -22, 117, 80, 5, 1
 	wait
 	end
 
 Move_SLEEP_POWDER: @ 81C7A77
 	loadsprite 10067
 	panse_1C SE_W077, 63, 10, 6
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -30, -22, 117, 80, 5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 10, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -25, -22, 117, 112, 5, 3
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -30, -22, 117, 80, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 10, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -25, -22, 117, 112, 5, 3
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -5, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 5, -22, 117, 96, 5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 0, -22, 117, 69, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -15, -22, 117, 112, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -5, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 5, -22, 117, 96, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 0, -22, 117, 69, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -15, -22, 117, 112, 5, 2
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -15, -22, 117, 112, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 15, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -10, -22, 117, 96, 7, 2
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -5, -22, 117, 90, -8, 0
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -15, -22, 117, 112, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 15, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -10, -22, 117, 96, 7, 2
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -5, -22, 117, 90, -8, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, -10, -22, 117, 80, -5, 1
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 0, -22, 117, 89, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 20, -22, 117, 112, -8, 2
-	sprite gBattleAnimSpriteTemplate_83D6224, 130, 6, 5, -22, 117, 80, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, -10, -22, 117, 80, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 0, -22, 117, 89, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 20, -22, 117, 112, -8, 2
+	sprite gBattleAnimSpriteTemplate_83D6224, 130, 5, -22, 117, 80, 5, 1
 	wait
 	end
 
@@ -527,21 +527,21 @@ Move_SWIFT: @ 81C7BA5
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6510, 131, 7, 20, -10, 20, 0, 22, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, 20, 1
 	pause 5
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6510, 131, 7, 20, -10, 20, 5, 22, -18, 1
+	sprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 5, 22, -18, 1
 	pause 5
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6510, 131, 7, 20, -10, 20, -10, 22, 15, 1
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 18, 1
-	createtask sub_80A7FA0, 2, 5, 3, 2, 0, 18, 1
+	sprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, -10, 22, 15, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 18, 1
+	createtask sub_80A7FA0, 2, 3, 2, 0, 18, 1
 	pause 5
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6510, 131, 7, 20, -10, 20, 0, 22, -20, 1
+	sprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, -20, 1
 	pause 5
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6510, 131, 7, 20, -10, 20, 0, 22, 12, 1
+	sprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, 12, 1
 	pause 5
 	wait
 	clearmonbg 3
@@ -553,22 +553,22 @@ Move_STRENGTH: @ 81C7C5E
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W036, 192
-	createtask sub_80A8314, 5, 5, 0, 2, 0, 96, 30
+	createtask sub_80A8314, 5, 0, 2, 0, 96, 30
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 4
-	createtask sub_80A8500, 2, 5, 1, 18, 6, 2, 4
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 4
+	createtask sub_80A8500, 2, 1, 18, 6, 2, 4
 	pause 4
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 16, 12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 16, 12, 1, 1
 	pause 4
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -16, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -16, -12, 1, 1
 	pause 4
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 3, 4, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 3, 4, 1, 1
 	wait
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -578,10 +578,10 @@ Move_TACKLE: @ 81C7CF2
 	loadsprite 10135
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W004, 63
 	wait
 	clearmonbg 1
@@ -593,22 +593,22 @@ Move_BODY_SLAM: @ 81C7D30
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W036, 192
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
 	wait
 	pause 11
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 26, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 26, 0, 0, 5
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 4, 4, -10, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 4, -10, 0, 1, 0
 	panse_1C SE_W025B, 63, 10, 2
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -28, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -28, 0, 0, 3
 	wait
-	createtask sub_80A8154, 2, 5, 1, 4, 0, 12, 1
+	createtask sub_80A8154, 2, 1, 4, 0, 12, 1
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
 	wait
 	clearmonbg 3
 	blendoff
@@ -619,7 +619,7 @@ Move_SUPERSONIC: @ 81C7DBD
 	monbg 2
 	monbgprio_2A 0
 	setalpha 12, 8
-	createtask sub_80A7FA0, 2, 5, 0, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 0, 2, 0, 8, 1
 	call _81C7DFB
 	call _81C7DFB
 	call _81C7DFB
@@ -632,22 +632,22 @@ Move_SUPERSONIC: @ 81C7DBD
 	end
 _81C7DFB:
 	panse_19 SE_W048, 192
-	sprite gBattleAnimSpriteTemplate_83D7534, 130, 6, 16, 0, 0, 0, 30, 0
+	sprite gBattleAnimSpriteTemplate_83D7534, 130, 16, 0, 0, 0, 30, 0
 	pause 2
 	ret
 
 Move_SCREECH: @ 81C7E15
 	loadsprite 10164
-	createtask sub_80A7FA0, 2, 5, 0, 3, 0, 2, 1
+	createtask sub_80A7FA0, 2, 0, 3, 0, 2, 1
 	call _81C7E48
 	call _81C7E48
 	pause 16
-	createtask sub_80A8B88, 5, 5, 0, 6, 2048, 2, 1
+	createtask sub_80A8B88, 5, 0, 6, 2048, 2, 1
 	wait
 	end
 _81C7E48:
 	panse_19 SE_W103, 192
-	sprite gBattleAnimSpriteTemplate_83D754C, 130, 6, 16, 0, 0, 0, 30, 0
+	sprite gBattleAnimSpriteTemplate_83D754C, 130, 16, 0, 0, 0, 30, 0
 	pause 2
 	ret
 
@@ -655,41 +655,41 @@ Move_FLAME_WHEEL: @ 81C7E62
 	loadsprite 10029
 	monbg 3
 	monbgprio_2A 1
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 0
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 0
 	panse_19 SE_W172, 192
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 4
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 4
 	panse_19 SE_W172, 192
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 8
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 8
 	panse_19 SE_W172, 192
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 12
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 12
 	panse_19 SE_W172, 192
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 16
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 16
 	panse_19 SE_W172, 192
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 20
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 20
 	panse_19 SE_W172, 192
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 4, 0, 0, 56, 24
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 24
 	panse_19 SE_W172, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 24, 0, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 6
 	pause 4
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 8, 1
-	createtask sub_8079790, 3, 5, 1, 31, 12, 1, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 8, 1
+	createtask sub_8079790, 3, 1, 31, 12, 1, 1
 	panse_19 SE_W172B, 63
 	call _81D11A2
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 9
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 9
 	wait
 	clearmonbg 3
 	end
 
 Unknown_81C7F4C: @ 81C7F4C
-	sprite gBattleAnimSpriteTemplate_83D9694, 3, 3, 0, 0, 50
+	sprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 50
 	pause 4
 	ret
 
@@ -700,23 +700,23 @@ Move_PIN_MISSILE: @ 81C7F5C
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W026, 192
-	sprite gBattleAnimSpriteTemplate_83DABA4, 2, 6, 20, -8, -8, -8, 20, -32
+	sprite gBattleAnimSpriteTemplate_83DABA4, 2, 20, -8, -8, -8, 20, -32
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DABA4, 2, 6, 20, -8, 8, 8, 20, -40
+	sprite gBattleAnimSpriteTemplate_83DABA4, 2, 20, -8, 8, 8, 20, -40
 	pause 4
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -8, -8, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -8, -8, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
 	pause 9
-	sprite gBattleAnimSpriteTemplate_83DABA4, 2, 6, 20, -8, 0, 0, 20, -32
+	sprite gBattleAnimSpriteTemplate_83DABA4, 2, 20, -8, 0, 0, 20, -32
 	pause 4
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 8, 8, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 8, 8, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
 	pause 14
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -729,23 +729,23 @@ Move_ICICLE_SPEAR: @ 81C8021
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W196, 192
-	sprite gBattleAnimSpriteTemplate_83DABBC, 2, 6, 20, -8, -8, -8, 20, -32
+	sprite gBattleAnimSpriteTemplate_83DABBC, 2, 20, -8, -8, -8, 20, -32
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DABBC, 2, 6, 20, -8, 8, 8, 20, -40
+	sprite gBattleAnimSpriteTemplate_83DABBC, 2, 20, -8, 8, 8, 20, -40
 	pause 4
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -8, -8, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -8, -8, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
 	pause 9
-	sprite gBattleAnimSpriteTemplate_83DABBC, 2, 6, 20, -8, 0, 0, 20, -32
+	sprite gBattleAnimSpriteTemplate_83DABBC, 2, 20, -8, 0, 0, 20, -32
 	pause 4
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 8, 8, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 8, 8, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
 	pause 14
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 2, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -756,20 +756,20 @@ Move_TAKE_DOWN: @ 81C80E6
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W036, 192
-	createtask sub_80A8920, 5, 7, 0, -24, 8, 23, 10, 40, 10
+	createtask sub_80A8920, 5, 0, -24, 8, 23, 10, 40, 10
 	pause 35
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 0, 10, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 4, 4, -10, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 4, -10, 0, 1, 0
 	panse_19 SE_W025B, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -16, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -16, 0, 0, 4
 	wait
-	createtask sub_80A8154, 2, 5, 1, 4, 0, 12, 1
+	createtask sub_80A8154, 2, 1, 4, 0, 12, 1
 	wait
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7
 	wait
 	clearmonbg 3
 	blendoff
@@ -778,33 +778,33 @@ Move_TAKE_DOWN: @ 81C80E6
 Move_DOUBLE_EDGE: @ 81C817A
 	loadsprite 10135
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 2, 4, 2, 32767, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 2, 4, 2, 32767, 10, 0, 0
 	wait
 	pause 10
 	panse_19 SE_W207, 192
 	panse_1D SE_W207, 192, 8
-	createtask sub_80A8500, 2, 5, 0, 18, 6, 2, 4
+	createtask sub_80A8500, 2, 0, 18, 6, 2, 4
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 16, 16, 32767
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 20, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 16, 16, 32767
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
 	pause 3
 	wait
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, -10, 0, 1, 0
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -32, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, -10, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -32, 0, 0, 3
 	wait
-	createtask sub_80A8E04, 2, 4, 8, -256, 0, 0
-	createtask sub_80A8E04, 2, 4, 8, -256, 1, 0
-	createtask sub_80A8154, 2, 5, 0, 4, 0, 12, 1
-	createtask sub_80A8154, 2, 5, 1, 4, 0, 12, 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 16, 0, 32767
+	createtask sub_80A8E04, 2, 8, -256, 0, 0
+	createtask sub_80A8E04, 2, 8, -256, 1, 0
+	createtask sub_80A8154, 2, 0, 4, 0, 12, 1
+	createtask sub_80A8154, 2, 1, 4, 0, 12, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 32767
 	wait
-	createtask sub_80A8E04, 2, 4, 8, -256, 0, 1
-	createtask sub_80A8E04, 2, 4, 8, -256, 1, 1
+	createtask sub_80A8E04, 2, 8, -256, 0, 1
+	createtask sub_80A8E04, 2, 8, -256, 1, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7
 	wait
 	end
 
@@ -816,10 +816,10 @@ Move_POISON_STING: @ 81C828D
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83DAB8C, 130, 5, 20, 0, -8, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DAB8C, 130, 20, 0, -8, 0, 20
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_80A7FA0, 2, 1, 2, 0, 5, 1
 	panse_19 SE_W030, 63
 	wait
 	call Unknown_81D5F87
@@ -835,14 +835,14 @@ Move_TWINEEDLE: @ 81C82E2
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_1C SE_W013B, 192, 6, 2
-	sprite gBattleAnimSpriteTemplate_83DAB8C, 130, 5, 10, -4, 0, -4, 20
-	sprite gBattleAnimSpriteTemplate_83DAB8C, 130, 5, 20, 12, 10, 12, 20
+	sprite gBattleAnimSpriteTemplate_83DAB8C, 130, 10, -4, 0, -4, 20
+	sprite gBattleAnimSpriteTemplate_83DAB8C, 130, 20, 12, 10, 12, 20
 	pause 20
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 5, 1
-	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 4, 0, -4, 1, 3
+	createtask sub_80A7FA0, 2, 1, 2, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 0, -4, 1, 3
 	panse_1C SE_W030, 63, 5, 2
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 4, 10, 12, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 10, 12, 1, 3
 	wait
 	clearmonbg 1
 	blendoff
@@ -850,15 +850,15 @@ Move_TWINEEDLE: @ 81C82E2
 
 Move_FIRE_BLAST: @ 81C8355
 	loadsprite 10029
-	createtask_1F sub_812AF30, 2, 144, 145
+	createtask_1F sub_812AF30, 144, 145
 	call _81C83E9
 	call _81C83E9
 	call _81C83E9
 	pause 24
-	createtask sub_80E2A38, 10, 5, 1, 3, 0, 8, 0
+	createtask sub_80E2A38, 10, 1, 3, 0, 8, 0
 	wait
 	pause 19
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 20, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 20, 1
 	call _81C842D
 	pause 3
 	call _81C842D
@@ -877,35 +877,35 @@ Move_FIRE_BLAST: @ 81C8355
 	pause 3
 	call _81C842D
 	wait
-	createtask sub_80E2A38, 10, 5, 1, 2, 8, 0, 0
+	createtask sub_80E2A38, 10, 1, 2, 8, 0, 0
 	wait
 	end
 _81C83E9:
-	sprite gBattleAnimSpriteTemplate_83D962C, 130, 3, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D962C, 130, 3, 0, 0, 51
-	sprite gBattleAnimSpriteTemplate_83D962C, 130, 3, 0, 0, 102
-	sprite gBattleAnimSpriteTemplate_83D962C, 130, 3, 0, 0, 153
-	sprite gBattleAnimSpriteTemplate_83D962C, 130, 3, 0, 0, 204
+	sprite gBattleAnimSpriteTemplate_83D962C, 130, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D962C, 130, 0, 0, 51
+	sprite gBattleAnimSpriteTemplate_83D962C, 130, 0, 0, 102
+	sprite gBattleAnimSpriteTemplate_83D962C, 130, 0, 0, 153
+	sprite gBattleAnimSpriteTemplate_83D962C, 130, 0, 0, 204
 	pause 5
 	ret
 _81C842D:
-	sprite gBattleAnimSpriteTemplate_83D967C, 130, 5, 0, 0, 10, 0, -2
-	sprite gBattleAnimSpriteTemplate_83D967C, 130, 5, 0, 0, 13, -2, 0
-	sprite gBattleAnimSpriteTemplate_83D967C, 130, 5, 0, 0, 13, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D967C, 130, 5, 0, 0, 15, -2, 2
-	sprite gBattleAnimSpriteTemplate_83D967C, 130, 5, 0, 0, 15, 2, 2
+	sprite gBattleAnimSpriteTemplate_83D967C, 130, 0, 0, 10, 0, -2
+	sprite gBattleAnimSpriteTemplate_83D967C, 130, 0, 0, 13, -2, 0
+	sprite gBattleAnimSpriteTemplate_83D967C, 130, 0, 0, 13, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D967C, 130, 0, 0, 15, -2, 2
+	sprite gBattleAnimSpriteTemplate_83D967C, 130, 0, 0, 15, 2, 2
 	ret
 
 Move_LEECH_SEED: @ 81C8483
 	loadsprite 10006
 	panse_19 SE_W077, 192
-	sprite gBattleAnimSpriteTemplate_83D63C8, 130, 6, 15, 0, 0, 24, 35, -32
+	sprite gBattleAnimSpriteTemplate_83D63C8, 130, 15, 0, 0, 24, 35, -32
 	pause 8
 	panse_19 SE_W077, 192
-	sprite gBattleAnimSpriteTemplate_83D63C8, 130, 6, 15, 0, -16, 24, 35, -40
+	sprite gBattleAnimSpriteTemplate_83D63C8, 130, 15, 0, -16, 24, 35, -40
 	pause 8
 	panse_19 SE_W077, 192
-	sprite gBattleAnimSpriteTemplate_83D63C8, 130, 6, 15, 0, 16, 24, 35, -37
+	sprite gBattleAnimSpriteTemplate_83D63C8, 130, 15, 0, 16, 24, 35, -37
 	pause 12
 	panse_1C SE_W039, 63, 10, 8
 	wait
@@ -914,11 +914,11 @@ Move_LEECH_SEED: @ 81C8483
 Move_EMBER: @ 81C84D9
 	loadsprite 10029
 	panse_1C SE_W052, 192, 5, 2
-	sprite gBattleAnimSpriteTemplate_83D95E4, 130, 6, 20, 0, -16, 24, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D95E4, 130, 20, 0, -16, 24, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D95E4, 130, 6, 20, 0, 0, 24, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D95E4, 130, 20, 0, 0, 24, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D95E4, 130, 6, 20, 0, 16, 24, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D95E4, 130, 20, 0, 16, 24, 20, 1
 	pause 16
 	panse_19 SE_W172, 63
 	call _81C8535
@@ -926,7 +926,7 @@ Move_EMBER: @ 81C84D9
 	call _81C8535
 	end
 _81C8535:
-	sprite gBattleAnimSpriteTemplate_83D95FC, 130, 7, -24, 24, 24, 24, 20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D95FC, 130, -24, 24, 24, 24, 20, 1, 1
 	pause 4
 	ret
 
@@ -935,17 +935,17 @@ Move_MEGA_PUNCH: @ 81C854D
 	loadsprite 10143
 	monbg 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 16, 0
 	setalpha 12, 8
 	panse_19 SE_W025, 63
-	sprite gBattleAnimSpriteTemplate_83DA058, 3, 4, 0, 0, 0, 50
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 7, 32767
+	sprite gBattleAnimSpriteTemplate_83DA058, 3, 0, 0, 0, 50
+	createtask sub_80E2A38, 10, 4, 2, 0, 7, 32767
 	pause 50
 	call _81C85E9
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 0
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 22, 1
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 0, 32767
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 0, 8, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+	createtask sub_80A7FA0, 2, 1, 4, 0, 22, 1
+	createtask sub_80E2A38, 10, 4, 2, 0, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
 	panse_19 SE_W233B, 63
 	wait
 	clearmonbg 1
@@ -978,18 +978,18 @@ Move_MEGA_KICK: @ 81C8627
 	loadsprite 10143
 	monbg 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 16, 0
 	setalpha 12, 8
 	panse_19 SE_W025, 63
-	sprite gBattleAnimSpriteTemplate_83DA058, 3, 4, 0, 0, 1, 50
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 7, 32767
+	sprite gBattleAnimSpriteTemplate_83DA058, 3, 0, 0, 1, 50
+	createtask sub_80E2A38, 10, 4, 2, 0, 7, 32767
 	pause 50
 	panse_19 SE_W025B, 63
 	call _81C85E9
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 0
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 22, 1
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 0, 32767
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 0, 8, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+	createtask sub_80A7FA0, 2, 1, 4, 0, 22, 1
+	createtask sub_80E2A38, 10, 4, 2, 0, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
 	wait
 	clearmonbg 1
 	blendoff
@@ -1005,19 +1005,19 @@ Move_COMET_PUNCH: @ 81C86C3
 	setalpha 12, 8
 	ifelse _81C86F1, _81C8716
 _81C86D7:
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W004, 63
 	wait
 	clearmonbg 1
 	blendoff
 	end
 _81C86F1:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -8, -8, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 5, -8, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, -8, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, -8, 0, 8, 1, 0
 	jump _81C86D7
 _81C8716:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 8, -8, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 5, 8, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 8, -8, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 8, 0, 8, 1, 0
 	jump _81C86D7
 
 Move_SONIC_BOOM: @ 81C873B
@@ -1029,7 +1029,7 @@ Move_SONIC_BOOM: @ 81C873B
 	call _81C8772
 	call _81C8772
 	call _81C8772
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 10, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 10, 1
 	call _81C878A
 	wait
 	clearmonbg 3
@@ -1037,32 +1037,32 @@ Move_SONIC_BOOM: @ 81C873B
 	end
 _81C8772:
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83D74A4, 130, 5, 16, 0, 0, 0, 15
+	sprite gBattleAnimSpriteTemplate_83D74A4, 130, 16, 0, 0, 0, 15
 	pause 4
 	ret
 _81C878A:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 2
 	pause 4
 	ret
 
 Move_THUNDER_SHOCK: @ 81C879C
 	loadsprite 10001
 	loadsprite 10011
-	createtask sub_80E2A38, 10, 5, 1, 0, 0, 6, 0
+	createtask sub_80E2A38, 10, 1, 0, 0, 6, 0
 	wait
 	pause 10
-	createtask sub_80D681C, 5, 3, 0, -44, 0
+	createtask sub_80D681C, 5, 0, -44, 0
 	panse_19 SE_W085, 63
 	pause 9
-	createtask sub_80E2A38, 10, 5, 4, 0, 0, 13, 0
+	createtask sub_80E2A38, 10, 4, 0, 0, 13, 0
 	wait
-	createtask sub_80E2A38, 10, 5, 4, 0, 13, 0, 0
+	createtask sub_80E2A38, 10, 4, 0, 13, 0, 0
 	wait
 	pause 20
 	call Unknown_81D6100
 	wait
 	pause 20
-	createtask sub_80E2A38, 10, 5, 1, 0, 6, 0, 0
+	createtask sub_80E2A38, 10, 1, 0, 6, 0, 0
 	wait
 	end
 
@@ -1070,48 +1070,48 @@ Move_THUNDERBOLT: @ 81C880A
 	loadsprite 10001
 	loadsprite 10282
 	loadsprite 10011
-	createtask sub_80E2A38, 10, 5, 1, 0, 0, 6, 0
+	createtask sub_80E2A38, 10, 1, 0, 0, 6, 0
 	wait
 	pause 10
-	createtask sub_80D681C, 5, 3, 24, -52, 0
+	createtask sub_80D681C, 5, 24, -52, 0
 	panse_19 SE_W085, 63
 	pause 7
-	createtask sub_80D681C, 5, 3, -24, -52, 0
+	createtask sub_80D681C, 5, -24, -52, 0
 	panse_19 SE_W085, 63
 	pause 7
-	createtask sub_80D681C, 5, 3, 0, -60, 1
+	createtask sub_80D681C, 5, 0, -60, 1
 	panse_19 SE_W085, 63
 	pause 9
-	createtask sub_80E2A38, 10, 5, 4, 0, 0, 13, 0
+	createtask sub_80E2A38, 10, 4, 0, 0, 13, 0
 	wait
-	createtask sub_80E2A38, 10, 5, 4, 0, 13, 0, 0
+	createtask sub_80E2A38, 10, 4, 0, 13, 0, 0
 	wait
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D98F0, 131, 4, 44, 0, 0, 3
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 32, 44, 0, 40, 0, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 32, 44, 64, 40, 1, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 32, 44, 128, 40, 0, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 32, 44, 192, 40, 2, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 16, 44, 32, 40, 0, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 16, 44, 96, 40, 1, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 16, 44, 160, 40, 0, -32765
-	sprite gBattleAnimSpriteTemplate_83D9908, 132, 8, 0, 0, 16, 44, 224, 40, 2, -32765
+	sprite gBattleAnimSpriteTemplate_83D98F0, 131, 44, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 32, 44, 0, 40, 0, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 32, 44, 64, 40, 1, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 32, 44, 128, 40, 0, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 32, 44, 192, 40, 2, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 32, 40, 0, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 96, 40, 1, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 160, 40, 0, -32765
+	sprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 224, 40, 2, -32765
 	panse_19 SE_W063, 63
 	pause 0
-	createtask sub_80E2A38, 10, 5, 1, 0, 2, 2, 0
+	createtask sub_80E2A38, 10, 1, 0, 2, 2, 0
 	pause 6
-	createtask sub_80E2A38, 10, 5, 1, 0, 6, 6, 0
+	createtask sub_80E2A38, 10, 1, 0, 6, 6, 0
 	pause 6
-	createtask sub_80E2A38, 10, 5, 1, 0, 2, 2, 0
+	createtask sub_80E2A38, 10, 1, 0, 2, 2, 0
 	pause 6
-	createtask sub_80E2A38, 10, 5, 1, 0, 6, 6, 0
+	createtask sub_80E2A38, 10, 1, 0, 6, 6, 0
 	wait
 	pause 20
 	panse_1D SE_W085B, 63, 19
 	call Unknown_81D6100
 	wait
 	pause 20
-	createtask sub_80E2A38, 10, 5, 1, 0, 6, 0, 0
+	createtask sub_80E2A38, 10, 1, 0, 6, 0, 0
 	wait
 	end
 
@@ -1119,20 +1119,20 @@ Move_THUNDER_WAVE: @ 81C89C0
 	loadsprite 10001
 	loadsprite 10011
 	loadsprite 10173
-	createtask sub_80E2A38, 10, 5, 1, 0, 0, 6, 0
+	createtask sub_80E2A38, 10, 1, 0, 0, 6, 0
 	wait
 	pause 10
-	createtask sub_80D681C, 5, 3, 0, -48, 0
+	createtask sub_80D681C, 5, 0, -48, 0
 	panse_19 SE_W086, 63
 	pause 20
 	panse_1C SE_W085B, 63, 10, 4
-	sprite gBattleAnimSpriteTemplate_83D9950, 130, 2, -16, -16
+	sprite gBattleAnimSpriteTemplate_83D9950, 130, -16, -16
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9950, 130, 2, -16, 0
+	sprite gBattleAnimSpriteTemplate_83D9950, 130, -16, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9950, 130, 2, -16, 16
+	sprite gBattleAnimSpriteTemplate_83D9950, 130, -16, 16
 	wait
-	createtask sub_80E2A38, 10, 5, 1, 0, 6, 0, 0
+	createtask sub_80E2A38, 10, 1, 0, 6, 0, 0
 	wait
 	end
 
@@ -1148,25 +1148,25 @@ _81C8A43:
 	blendoff
 	end
 _81C8A48:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -20, -20, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 5, -20, -12, 8, 1, 0
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -20, -20, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, -20, -12, 8, 1, 0
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W233B, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 8, 0, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 5, 8, 8, 8, 1, 0
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 8, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 8, 8, 8, 1, 0
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W233B, 63
 	jump _81C8A43
 _81C8AB9:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 12, -20, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 5, 12, -12, 8, 1, 0
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 12, -20, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 12, -12, 8, 1, 0
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W233B, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -12, 0, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 5, -12, 8, 8, 1, 0
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -12, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, -12, 8, 8, 1, 0
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W233B, 63
 	jump _81C8A43
 
@@ -1176,10 +1176,10 @@ Move_STOMP: @ 81C8B2A
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W104, 63
-	sprite gBattleAnimSpriteTemplate_83DA070, 3, 3, 0, -32, 15
+	sprite gBattleAnimSpriteTemplate_83DA070, 3, 0, -32, 15
 	pause 19
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, -8, 1, 1
-	createtask sub_80A7E7C, 2, 5, 1, 0, 4, 9, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, -8, 1, 1
+	createtask sub_80A7E7C, 2, 1, 0, 4, 9, 1
 	panse_19 SE_W025B, 63
 	wait
 	clearmonbg 1
@@ -1188,7 +1188,7 @@ Move_STOMP: @ 81C8B2A
 
 Move_TAIL_WHIP: @ 81C8B71
 	panse_1C SE_W039, 192, 24, 3
-	createtask sub_80A8500, 2, 5, 0, 12, 4, 2, 3
+	createtask sub_80A8500, 2, 0, 12, 4, 2, 3
 	wait
 	end
 
@@ -1197,9 +1197,9 @@ Move_CUT: @ 81C8B8A
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W015, 63
-	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 3, 40, -32, 0
+	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 0
 	pause 5
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 10, 1
+	createtask sub_80A7E7C, 2, 1, 0, 3, 10, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -1209,31 +1209,31 @@ Move_CUT: @ 81C8B8A
 Move_HIDDEN_POWER: @ 81C8BBC
 	loadsprite 10217
 	panse_19 SE_W036, 192
-	createtask sub_80A8D34, 5, 5, -7, -7, 11, 0, 0
+	createtask sub_80A8D34, 5, -7, -7, 11, 0, 0
 	wait
 	pause 30
-	createtask sub_8079790, 5, 5, 0, 20479, 12, 5, 1
+	createtask sub_8079790, 5, 0, 20479, 12, 5, 1
 	pause 4
-	createtask sub_80A8D34, 5, 5, -7, -7, 11, 0, 0
+	createtask sub_80A8D34, 5, -7, -7, 11, 0, 0
 	panse_19 SE_W179, 192
-	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 2, 26, 0
-	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 2, 26, 42
-	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 2, 26, 84
-	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 2, 26, 126
-	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 2, 26, 168
-	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 2, 26, 210
+	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 26, 0
+	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 26, 42
+	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 26, 84
+	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 26, 126
+	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 26, 168
+	sprite gBattleAnimSpriteTemplate_83D7B14, 2, 26, 210
 	pause 52
 	setvar 7, -1
 	panse_19 SE_W115, 192
-	createtask sub_80A8D34, 5, 5, -7, -7, 11, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 32
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 64
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 96
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 128
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 160
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 192
-	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 1, 224
+	createtask sub_80A8D34, 5, -7, -7, 11, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 0
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 32
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 64
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 96
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 128
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 160
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 192
+	sprite gBattleAnimSpriteTemplate_83D7B2C, 130, 224
 	end
 
 Move_REVERSAL: @ 81C8CA5
@@ -1241,27 +1241,27 @@ Move_REVERSAL: @ 81C8CA5
 	loadsprite 10143
 	loadsprite 10135
 	panse_19 SE_W197, 192
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 3, 32767, 8, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 3, 32767, 8, 0, 0
 	wait
 	pause 30
-	createtask sub_80E1F8C, 2, 6, 31, 3, 2, 0, 10, 32767
+	createtask sub_80E1F8C, 2, 31, 3, 2, 0, 10, 32767
 	pause 10
 	panse_19 SE_W179, 192
-	sprite gBattleAnimSpriteTemplate_8402738, 2, 2, 26, 0
-	sprite gBattleAnimSpriteTemplate_8402738, 2, 2, 26, 42
-	sprite gBattleAnimSpriteTemplate_8402738, 2, 2, 26, 84
-	sprite gBattleAnimSpriteTemplate_8402738, 2, 2, 26, 126
-	sprite gBattleAnimSpriteTemplate_8402738, 2, 2, 26, 168
-	sprite gBattleAnimSpriteTemplate_8402738, 2, 2, 26, 210
+	sprite gBattleAnimSpriteTemplate_8402738, 2, 26, 0
+	sprite gBattleAnimSpriteTemplate_8402738, 2, 26, 42
+	sprite gBattleAnimSpriteTemplate_8402738, 2, 26, 84
+	sprite gBattleAnimSpriteTemplate_8402738, 2, 26, 126
+	sprite gBattleAnimSpriteTemplate_8402738, 2, 26, 168
+	sprite gBattleAnimSpriteTemplate_8402738, 2, 26, 210
 	wait
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 8
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 32767, 8, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 0, 0, 10, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
-	createtask sub_80A9058, 5, 5, 0, 1, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 8, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+	createtask sub_80A9058, 5, 0, 1, 8, 1, 0
 	end
 
 Move_PURSUIT: @ 81C8D80
@@ -1282,13 +1282,13 @@ _81C8D96:
 	end
 _81C8D9F:
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_80A9058, 5, 5, 0, 1, 6, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_80A9058, 5, 0, 1, 6, 1, 0
 	jump _81C8D96
 _81C8DC8:
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
-	createtask sub_80A9058, 5, 5, 0, 1, 6, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+	createtask sub_80A9058, 5, 0, 1, 6, 1, 0
 	jump _81C8D96
 
 Move_SPIKE_CANNON: @ 81C8DF1
@@ -1297,18 +1297,18 @@ Move_SPIKE_CANNON: @ 81C8DF1
 	monbg 1
 	monbgprio_28 1
 	setalpha 12, 8
-	createtask sub_80A8920, 5, 7, 0, -4, 0, 4, 6, 8, 4
+	createtask sub_80A8920, 5, 0, -4, 0, 4, 6, 8, 4
 	wait
 	panse_1C SE_W013B, 192, 5, 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 5
-	sprite gBattleAnimSpriteTemplate_83DAB8C, 2, 5, 10, -8, -8, -8, 20
-	sprite gBattleAnimSpriteTemplate_83DAB8C, 2, 5, 18, 0, 0, 0, 20
-	sprite gBattleAnimSpriteTemplate_83DAB8C, 2, 5, 26, 8, 8, 8, 20
-	wait
-	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 4, -8, -8, 1, 2
-	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 4, 0, 0, 1, 2
-	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 4, 8, 8, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83DAB8C, 2, 10, -8, -8, -8, 20
+	sprite gBattleAnimSpriteTemplate_83DAB8C, 2, 18, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DAB8C, 2, 26, 8, 8, 8, 20
+	wait
+	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, -8, -8, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4C0, 3, 8, 8, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 7, 1
 	panse_1C SE_W030, 63, 5, 3
 	wait
 	clearmonbg 1
@@ -1320,10 +1320,10 @@ Move_SWORDS_DANCE: @ 81C8EA4
 	monbg 0
 	setalpha 12, 8
 	panse_19 SE_W014, 192
-	createtask sub_80A8500, 2, 5, 0, 16, 6, 1, 4
-	sprite gBattleAnimSpriteTemplate_83D748C, 2, 2, 0, 0
+	createtask sub_80A8500, 2, 0, 16, 6, 1, 4
+	sprite gBattleAnimSpriteTemplate_83D748C, 2, 0, 0
 	pause 22
-	createtask sub_80E21A8, 2, 7, 10005, 2, 2, 32754, 16, 0, 0
+	createtask sub_80E21A8, 2, 10005, 2, 2, 32754, 16, 0, 0
 	wait
 	clearmonbg 0
 	blendoff
@@ -1333,16 +1333,16 @@ Move_SWORDS_DANCE: @ 81C8EA4
 Move_PSYCH_UP: @ 81C8EEA
 	loadsprite 10196
 	monbg 2
-	createtask sub_80E1F8C, 2, 6, 25, 2, 6, 1, 11, 0
+	createtask sub_80E1F8C, 2, 25, 2, 6, 1, 11, 0
 	setalpha 12, 8
 	panse_1C SE_W060B, 192, 5, 10
-	sprite gBattleAnimSpriteTemplate_83DA690, 2, 4, 0, 0, 0, 0
-	createtask sub_80A8B88, 5, 5, 0, 5, 2560, 8, 0
+	sprite gBattleAnimSpriteTemplate_83DA690, 2, 0, 0, 0, 0
+	createtask sub_80A8B88, 5, 0, 5, 2560, 8, 0
 	pause 127
 	pause 4
 	panse_19 SE_W060, 192
-	createtask sub_80A8D34, 5, 5, -5, -5, 10, 0, 1
-	createtask sub_80E2A38, 9, 5, 2, 2, 10, 0, 1023
+	createtask sub_80A8D34, 5, -5, -5, 10, 0, 1
+	createtask sub_80E2A38, 9, 2, 2, 10, 0, 1023
 	pause 30
 	clearmonbg 2
 	blendoff
@@ -1356,57 +1356,57 @@ Move_DIZZY_PUNCH: @ 81C8F5C
 	monbg 1
 	setalpha 12, 8
 	call _81C9077
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 133, 5, 16, 8, 20, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, 16, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 133, 16, 8, 20, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 16, 0, 1, 1
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, 16, 8, 160, -32
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, 16, 8, -256, -40
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, 16, 8, 128, -16
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, 16, 8, 416, -38
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, 16, 8, -128, -22
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, 16, 8, -384, -31
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, 160, -32
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, -256, -40
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, 128, -16
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, 416, -38
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, -128, -22
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, -384, -31
 	pause 10
 	call _81C9077
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 133, 5, -16, -8, 20, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, -16, -16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 133, -16, -8, 20, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, -16, -16, 1, 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, -16, -8, 160, -32
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, -16, -8, -256, -40
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, -16, -8, 128, -16
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, -16, -8, 416, -38
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, -16, -8, -128, -22
-	sprite gBattleAnimSpriteTemplate_83DA088, 131, 4, -16, -8, -384, -31
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, 160, -32
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -256, -40
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, 128, -16
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, 416, -38
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -128, -22
+	sprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -384, -31
 	wait
 	clearmonbg 1
 	blendoff
 	end
 _81C9077:
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 6
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 7, 1
+	createtask sub_80A7FA0, 2, 1, 3, 0, 7, 1
 	ret
 
 Move_FIRE_SPIN: @ 81C9096
 	loadsprite 10029
 	panse_19 SE_W221B, 63
-	createtask sub_80A7E7C, 5, 5, 1, 0, 2, 47, 1
+	createtask sub_80A7E7C, 5, 1, 0, 2, 47, 1
 	call _81C90BF
 	call _81C90BF
 	call _81C90BF
 	wait
 	end
 _81C90BF:
-	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 7, 0, 28, 528, 30, 13, 50, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 0, 28, 528, 30, 13, 50, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 7, 0, 32, 480, 20, 16, -46, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 0, 32, 480, 20, 16, -46, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 7, 0, 33, 576, 20, 8, 42, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 0, 33, 576, 20, 8, 42, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 7, 0, 31, 400, 25, 11, -42, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 0, 31, 400, 25, 11, -42, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 7, 0, 28, 512, 25, 16, 46, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 0, 28, 512, 25, 16, 46, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 7, 0, 33, 464, 30, 15, -50, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 130, 0, 33, 464, 30, 15, -50, 1
 	pause 2
 	ret
 
@@ -1426,56 +1426,56 @@ _81C916A:
 	jump _81C91FF
 _81C918E:
 	pause 5
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 10, 1
+	createtask sub_80A7E7C, 2, 1, 0, 3, 10, 1
 	wait
 	clearmonbg 1
 	blendoff
 	wait
 	end
 _81C91A7:
-	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 3, 40, -32, 0
+	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 0
 	jump _81C916A
 _81C91B9:
-	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 3, 40, -32, 1
+	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 1
 	jump _81C916A
 _81C91CB:
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 10505, 4, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 10505, 4, 0, 0
 	jump _81C918E
 _81C91E5:
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 3, 10505, 4, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 3, 10505, 4, 0, 0
 	jump _81C918E
 _81C91FF:
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 3, 10505, 4, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 3, 10505, 4, 0, 0
 	jump _81C918E
 
 Move_SELF_DESTRUCT: @ 81C9219
 	loadsprite 10198
-	createtask sub_80E2A38, 10, 5, 2, 1, 0, 9, 31
-	createtask sub_80A7FA0, 5, 5, 4, 6, 0, 38, 1
-	createtask sub_80A7FA0, 5, 5, 5, 6, 0, 38, 1
-	createtask sub_80A7FA0, 5, 5, 6, 6, 0, 38, 1
-	createtask sub_80A7FA0, 5, 5, 7, 6, 0, 38, 1
-	createtask sub_80A7FA0, 5, 5, 8, 6, 0, 38, 1
+	createtask sub_80E2A38, 10, 2, 1, 0, 9, 31
+	createtask sub_80A7FA0, 5, 4, 6, 0, 38, 1
+	createtask sub_80A7FA0, 5, 5, 6, 0, 38, 1
+	createtask sub_80A7FA0, 5, 6, 6, 0, 38, 1
+	createtask sub_80A7FA0, 5, 7, 6, 0, 38, 1
+	createtask sub_80A7FA0, 5, 8, 6, 0, 38, 1
 	call _81C929F
 	call _81C929F
 	wait
-	createtask sub_80E2A38, 10, 5, 2, 1, 9, 0, 31
+	createtask sub_80E2A38, 10, 2, 1, 9, 0, 31
 	end
 _81C929F:
 	panse_19 SE_W120, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 0, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 0, 1
 	pause 6
 	panse_19 SE_W120, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 24, -24, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 0, 1
 	pause 6
 	panse_19 SE_W120, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -16, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 0, 1
 	pause 6
 	panse_19 SE_W120, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -24, -12, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 0, 1
 	pause 6
 	panse_19 SE_W120, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 16, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 0, 1
 	pause 6
 	ret
 
@@ -1485,19 +1485,19 @@ Move_SLAM: @ 81C9309
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W004, 192
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 20, 3, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 3, 0, 4
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D69DC, 2, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D69DC, 2, 0, 0
 	pause 3
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -12, 10, 0, 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -12, 10, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
 	pause 3
-	createtask sub_80A8154, 2, 5, 1, 0, 3, 6, 1
+	createtask sub_80A8154, 2, 1, 0, 3, 6, 1
 	wait
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
 	wait
 	clearmonbg 1
 	blendoff
@@ -1506,30 +1506,30 @@ Move_SLAM: @ 81C9309
 Move_VINE_WHIP: @ 81C9391
 	loadsprite 10287
 	panse_19 SE_W026, 192
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 6
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6
 	pause 6
 	panse_19 SE_W010, 63
-	sprite gBattleAnimSpriteTemplate_83D69F4, 130, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D69F4, 130, 0, 0
 	pause 6
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 6, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 6, 1
 	end
 
 Move_DRILL_PECK: @ 81C93C8
 	loadsprite 10135
 	loadsprite 10162
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0
 	panse_19 SE_W029, 192
 	wait
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1
 	pause 2
 	panse_1C SE_W030, 63, 4, 8
 	createtask sub_80DB0E8, 5
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 18, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 18, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6
 	wait
 	end
 
@@ -1539,34 +1539,34 @@ Move_WATERFALL: @ 81C9421
 	loadsprite 10141
 	monbg 3
 	setalpha 12, 8
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 23, 1
+	createtask sub_80A7E7C, 5, 0, 0, 2, 23, 1
 	pause 5
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 10, 10, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 10, 10, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, -15, 0, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, -15, 0, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 20, 10, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 20, 10, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 0, -10, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 0, -10, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, -10, 15, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, -10, 15, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 25, 20, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 25, 20, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, -20, 20, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, -20, 20, 25, 0
 	pause 4
 	panse_19 SE_W152, 192
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 12, 0, 25, 0
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 12, 0, 25, 0
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 5
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 5
 	pause 6
 	call _81C9502
 	wait
@@ -1575,86 +1575,86 @@ Move_WATERFALL: @ 81C9421
 	end
 _81C9502:
 	panse_19 SE_W127, 63
-	createtask sub_80A7FA0, 5, 5, 1, 4, 0, 17, 1
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, 20, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 20
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 20
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, 15, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 15
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 15
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, 10, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 10
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 10
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, 5, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 5
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 5
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, 0
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, -5, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -5
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -5
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, -10, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -10
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -10
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, -15, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -15
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -15
-	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 4, 0, -20, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -20
-	sprite gBattleAnimSpriteTemplate_83D9360, 4, 2, 0, -20
+	createtask sub_80A7FA0, 5, 1, 4, 0, 17, 1
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 20
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 20
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 15, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 15
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 15
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 10
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 10
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 5, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 5
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 5
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 0
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, -5, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -5
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -5
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, -10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -10
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -10
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, -15, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -15
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -15
+	pause 2
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, -20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -20
+	sprite gBattleAnimSpriteTemplate_83D9360, 4, 0, -20
 	ret
 
 Move_EXPLOSION: @ 81C9675
 	loadsprite 10198
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 8, 9, 8474, 8, 0, 8
-	createtask sub_80A7FA0, 5, 5, 4, 8, 0, 40, 1
-	createtask sub_80A7FA0, 5, 5, 5, 8, 0, 40, 1
-	createtask sub_80A7FA0, 5, 5, 6, 8, 0, 40, 1
-	createtask sub_80A7FA0, 5, 5, 7, 8, 0, 40, 1
-	createtask sub_80A7FA0, 5, 5, 8, 8, 0, 40, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 8, 9, 8474, 8, 0, 8
+	createtask sub_80A7FA0, 5, 4, 8, 0, 40, 1
+	createtask sub_80A7FA0, 5, 5, 8, 0, 40, 1
+	createtask sub_80A7FA0, 5, 6, 8, 0, 40, 1
+	createtask sub_80A7FA0, 5, 7, 8, 0, 40, 1
+	createtask sub_80A7FA0, 5, 8, 8, 0, 40, 1
 	call _81C9712
 	call _81C9712
 	wait
-	createtask sub_80E2A38, 10, 5, 1, 1, 16, 16, 32767
+	createtask sub_80E2A38, 10, 1, 1, 16, 16, 32767
 	pause 50
-	createtask sub_80E2A38, 10, 5, 1, 3, 16, 0, 32767
+	createtask sub_80E2A38, 10, 1, 3, 16, 0, 32767
 	end
 _81C9712:
 	panse_19 SE_W153, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 0, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 0, 1
 	pause 6
 	panse_19 SE_W153, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 24, -24, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 0, 1
 	pause 6
 	panse_19 SE_W153, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -16, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 0, 1
 	pause 6
 	panse_19 SE_W153, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -24, -12, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 0, 1
 	pause 6
 	panse_19 SE_W153, 192
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 16, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 0, 1
 	pause 6
 	ret
 
 Move_DEFENSE_CURL: @ 81C977C
 	loadsprite 10234
 	panse_1C SE_W161, 192, 18, 3
-	createtask sub_80E0E24, 5, 2, 0, 0
+	createtask sub_80E0E24, 5, 0, 0
 	createtask sub_812D350, 5
 	wait
-	sprite gBattleAnimSpriteTemplate_8402498, 2, 4, 0, 6, 0, 1
+	sprite gBattleAnimSpriteTemplate_8402498, 2, 0, 6, 0, 1
 	wait
-	createtask sub_80E0E24, 5, 2, 0, 1
+	createtask sub_80E0E24, 5, 0, 1
 	wait
 	end
 
@@ -1663,23 +1663,23 @@ Move_PROTECT: @ 81C97B5
 	monbg 2
 	monbgprio_28 0
 	panse_1D SE_W115, 192, 16
-	sprite gBattleAnimSpriteTemplate_83D6BE8, 2, 3, 24, 0, 90
+	sprite gBattleAnimSpriteTemplate_83D6BE8, 2, 24, 0, 90
 	wait
 	clearmonbg 2
 	end
 
 Move_DETECT: @ 81C97D2
 	loadsprite 10071
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 9, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 9, 0
 	wait
-	createtask sub_80E2A38, 10, 5, 2, 1, 0, 9, 32767
+	createtask sub_80E2A38, 10, 2, 1, 0, 9, 32767
 	pause 18
 	panse_19 SE_W197, 192
-	sprite gBattleAnimSpriteTemplate_83930F4, 13, 2, 20, -20
+	sprite gBattleAnimSpriteTemplate_83930F4, 13, 20, -20
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 9, 0, 0
-	createtask sub_80E2A38, 10, 5, 2, 2, 9, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 9, 0, 0
+	createtask sub_80E2A38, 10, 2, 2, 9, 0, 32767
 	wait
 	end
 
@@ -1700,92 +1700,92 @@ _81C985F:
 	end
 _81C9864:
 	panse_19 SE_W082, 192
-	createtask sub_80A7FA0, 5, 5, 0, 1, 0, 15, 1
-	createtask sub_80E2A38, 10, 5, 2, 3, 0, 9, 31
+	createtask sub_80A7FA0, 5, 0, 1, 0, 15, 1
+	createtask sub_80E2A38, 10, 2, 3, 0, 9, 31
 	wait
 	pause 20
 	panse_19 SE_W207B, 192
-	sprite gBattleAnimSpriteTemplate_83D7798, 2, 3, 0, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28
 	wait
 	panse_19 SE_W207B, 192
-	sprite gBattleAnimSpriteTemplate_83D7798, 2, 3, 0, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28
 	wait
 	pause 10
-	createtask sub_80A8B88, 5, 5, 0, 16, 6144, 8, 0
+	createtask sub_80A8B88, 5, 0, 16, 6144, 8, 0
 	pause 5
-	createtask sub_80A7FA0, 5, 5, 1, 4, 0, 30, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 0
+	createtask sub_80A7FA0, 5, 1, 4, 0, 30, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 0
 	panse_19 SE_W004, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 24, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 24, 8, 1, 0
 	panse_19 SE_W004, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -24, -16, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -24, -16, 1, 0
 	panse_19 SE_W004, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 8, 4, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 8, 4, 1, 0
 	panse_19 SE_W004, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -16, 19, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -16, 19, 1, 0
 	panse_19 SE_W004, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 18, -18, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 18, -18, 1, 0
 	panse_19 SE_W004, 63
 	wait
-	createtask sub_80E2A38, 10, 5, 2, 3, 9, 0, 31
+	createtask sub_80E2A38, 10, 2, 3, 9, 0, 31
 	jump _81C985F
 _81C996A:
 	panse_19 SE_W082, 192
-	createtask sub_80A7FA0, 5, 5, 0, 1, 0, 15, 1
-	createtask sub_80E2A38, 10, 5, 2, 3, 0, 9, 31
+	createtask sub_80A7FA0, 5, 0, 1, 0, 15, 1
+	createtask sub_80E2A38, 10, 2, 3, 0, 9, 31
 	wait
 	pause 20
 	panse_19 SE_W207B, 192
-	sprite gBattleAnimSpriteTemplate_83D7798, 2, 3, 0, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28
 	wait
 	pause 5
 	createtask sub_812E498, 5
 	pause 7
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 8, 1, 1
-	createtask sub_80A7FA0, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 8, 1, 1
+	createtask sub_80A7FA0, 5, 1, 4, 0, 6, 1
 	pause 14
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 12, -6, 1, 1
-	createtask sub_80A7FA0, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 12, -6, 1, 1
+	createtask sub_80A7FA0, 5, 1, 4, 0, 6, 1
 	pause 14
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -12, -6, 1, 1
-	createtask sub_80A7FA0, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -12, -6, 1, 1
+	createtask sub_80A7FA0, 5, 1, 4, 0, 6, 1
 	wait
-	createtask sub_80E2A38, 10, 5, 2, 3, 9, 0, 31
+	createtask sub_80E2A38, 10, 2, 3, 9, 0, 31
 	jump _81C985F
 _81C9A37:
 	panse_19 SE_W207B, 192
-	sprite gBattleAnimSpriteTemplate_83D7798, 2, 3, 0, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28
 	wait
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 6
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, 4, 1, 1
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 4, 1, 1
+	createtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 6
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -4, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -4, 1, 2
+	createtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
 	jump _81C985F
 _81C9AB3:
-	sprite gBattleAnimSpriteTemplate_8402630, 2, 2, 20, -28
+	sprite gBattleAnimSpriteTemplate_8402630, 2, 20, -28
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 10, 2
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 10, 2
 	pause 12
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7FA0, 2, 1, 1, 0, 6, 1
 	jump _81C985F
 
 Move_SAFEGUARD: @ 81C9AF7
@@ -1800,7 +1800,7 @@ Move_SAFEGUARD: @ 81C9AF7
 	sprite gBattleAnimSpriteTemplate_83D7D74, 2
 	wait
 	panse_19 SE_REAPOKE, 192
-	createtask sub_80E1F8C, 2, 6, 10, 0, 2, 0, 10, 32767
+	createtask sub_80E1F8C, 2, 10, 0, 2, 0, 10, 32767
 	wait
 	clearmonbg 2
 	blendoff
@@ -1808,26 +1808,26 @@ Move_SAFEGUARD: @ 81C9AF7
 
 Move_PAIN_SPLIT: @ 81C9B39
 	loadsprite 10239
-	sprite gBattleAnimSpriteTemplate_84026F0, 2, 3, -8, -42, 0
-	sprite gBattleAnimSpriteTemplate_84026F0, 130, 3, -8, -42, 1
+	sprite gBattleAnimSpriteTemplate_84026F0, 2, -8, -42, 0
+	sprite gBattleAnimSpriteTemplate_84026F0, 130, -8, -42, 1
 	pause 10
 	panse_19 SE_W207B, 0
-	createtask sub_812EB10, 2, 2, 0, 0
-	createtask sub_812EB10, 2, 2, 1, 0
+	createtask sub_812EB10, 2, 0, 0
+	createtask sub_812EB10, 2, 1, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_84026F0, 2, 3, -24, -42, 0
-	sprite gBattleAnimSpriteTemplate_84026F0, 130, 3, -24, -42, 1
+	sprite gBattleAnimSpriteTemplate_84026F0, 2, -24, -42, 0
+	sprite gBattleAnimSpriteTemplate_84026F0, 130, -24, -42, 1
 	pause 10
 	panse_19 SE_W207B, 0
-	createtask sub_812EB10, 2, 2, 0, 1
-	createtask sub_812EB10, 2, 2, 1, 1
+	createtask sub_812EB10, 2, 0, 1
+	createtask sub_812EB10, 2, 1, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_84026F0, 2, 3, 8, -42, 0
-	sprite gBattleAnimSpriteTemplate_84026F0, 130, 3, 8, -42, 1
+	sprite gBattleAnimSpriteTemplate_84026F0, 2, 8, -42, 0
+	sprite gBattleAnimSpriteTemplate_84026F0, 130, 8, -42, 1
 	pause 10
 	panse_19 SE_W207B, 0
-	createtask sub_812EB10, 2, 2, 0, 2
-	createtask sub_812EB10, 2, 2, 1, 2
+	createtask sub_812EB10, 2, 0, 2
+	createtask sub_812EB10, 2, 1, 2
 	end
 
 Move_VICE_GRIP: @ 81C9BE1
@@ -1836,11 +1836,11 @@ Move_VICE_GRIP: @ 81C9BE1
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W011, 63
-	sprite gBattleAnimSpriteTemplate_83D769C, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D769C, 2, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D769C, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D769C, 2, 1
 	pause 9
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 4, 0, 0, 1, 2
-	createtask sub_80A7FA0, 5, 5, 1, 2, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 0, 0, 1, 2
+	createtask sub_80A7FA0, 5, 1, 2, 0, 5, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -1854,15 +1854,15 @@ Move_GUILLOTINE: @ 81C9C29
 	fadetobg_25 12, 13, 14
 	waitbgfadein
 	panse_19 SE_W011, 63
-	sprite gBattleAnimSpriteTemplate_83D76DC, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D76DC, 2, 1, 1
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83D76DC, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D76DC, 2, 1
+	createtask sub_80E2A38, 10, 4, 2, 0, 16, 0
 	pause 9
-	createtask sub_80A7FA0, 5, 5, 1, 2, 0, 23, 1
+	createtask sub_80A7FA0, 5, 1, 2, 0, 23, 1
 	pause 46
-	createtask sub_80A7FA0, 5, 5, 1, 4, 0, 8, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 0, 8, 0, 0
+	createtask sub_80A7FA0, 5, 1, 4, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
 	panse_19 SE_W013, 63
 	wait
 	clearmonbg 3
@@ -1878,12 +1878,12 @@ Move_PAY_DAY: @ 81C9CB5
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83D75E4, 2, 5, 20, 0, 0, 0, 1152
+	sprite gBattleAnimSpriteTemplate_83D75E4, 2, 20, 0, 0, 0, 1152
 	wait
 	panse_19 SE_W006, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 4, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 0, 0, 1, 2
 	sprite gBattleAnimSpriteTemplate_83D75FC, 2
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 6, 1
+	createtask sub_80A7FA0, 2, 1, 1, 0, 6, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -1892,90 +1892,90 @@ Move_PAY_DAY: @ 81C9CB5
 Move_OUTRAGE: @ 81C9D08
 	loadsprite 10029
 	panse_1C SE_W082, 192, 8, 3
-	createtask sub_80E1F8C, 2, 6, 7, 2, 5, 3, 8, 430
-	createtask sub_80A8500, 2, 5, 0, 12, 6, 5, 4
+	createtask sub_80E1F8C, 2, 7, 2, 5, 3, 8, 430
+	createtask sub_80A8500, 2, 0, 12, 6, 5, 4
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 1280, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, 0, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, -1280, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, 0, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 0, 1280, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 0, 1280, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 0, -1280, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 0, -1280, 3
 	pause 0
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 40, 1
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 1280, 768, 3
+	createtask sub_80A7FA0, 2, 1, 2, 0, 40, 1
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, 768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, -1280, 768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, 768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 1280, -768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, -768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, -1280, -768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, -768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 1280, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, 0, 3
 	call _81C9E0F
 	call _81C9E0F
 	wait
 	end
 _81C9E0F:
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, -1280, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, 0, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 0, 1280, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 0, 1280, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 0, -1280, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 0, -1280, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 1280, 768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, 768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, -1280, 768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, 768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, 1280, -768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, -768, 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 6, 0, 0, 30, -1280, -768, 3
+	sprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, -768, 3
 	ret
 
 Move_SPARK: @ 81C9EA3
 	loadsprite 10135
 	loadsprite 10011
 	pause 0
-	createtask sub_80E1F8C, 2, 6, 3, -31, 1, 5, 5, 23551
+	createtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551
 	panse_19 SE_W085B, 192
-	sprite gBattleAnimSpriteTemplate_83D985C, 0, 7, 32, 24, 190, 12, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D985C, 0, 32, 24, 190, 12, 0, 1, 0
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83D985C, 0, 7, 80, 24, 22, 12, 0, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D985C, 0, 7, 156, 24, 121, 13, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D985C, 0, 80, 24, 22, 12, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D985C, 0, 156, 24, 121, 13, 0, 1, 1
 	pause 0
-	createtask sub_80E1F8C, 2, 6, 3, -31, 1, 0, 0, 23551
+	createtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551
 	pause 10
-	createtask sub_80E1F8C, 2, 6, 3, -31, 1, 5, 5, 23551
+	createtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551
 	panse_19 SE_W085B, 192
-	sprite gBattleAnimSpriteTemplate_83D985C, 0, 7, 100, 24, 60, 10, 0, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D985C, 0, 7, 170, 24, 42, 11, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D985C, 0, 100, 24, 60, 10, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D985C, 0, 170, 24, 42, 11, 0, 1, 1
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83D985C, 0, 7, 238, 24, 165, 10, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D985C, 0, 238, 24, 165, 10, 0, 1, 1
 	pause 0
-	createtask sub_80E1F8C, 2, 6, 3, -31, 1, 0, 0, 23551
+	createtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551
 	pause 20
-	createtask sub_80E1F8C, 2, 6, 3, -31, 1, 7, 7, 23551
+	createtask sub_80E1F8C, 2, 3, -31, 1, 7, 7, 23551
 	panse_19 SE_W085B, 192
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 32, 12, 0, 20, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 32, 12, 64, 20, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 32, 12, 128, 20, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 32, 12, 192, 20, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 16, 12, 32, 20, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 16, 12, 96, 20, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 16, 12, 160, 20, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9908, 4, 8, 0, 0, 16, 12, 224, 20, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 0, 20, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 64, 20, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 128, 20, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 192, 20, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 16, 12, 32, 20, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 16, 12, 96, 20, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 16, 12, 160, 20, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 16, 12, 224, 20, 2, 0
 	pause 4
 	wait
-	createtask sub_80E1F8C, 2, 6, 3, -31, 1, 0, 0, 23551
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	createtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 4
 	panse_19 SE_W063, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
-	createtask sub_80E1F8C, 2, 6, 4, -31, 2, 0, 6, 23551
+	createtask sub_80E1F8C, 2, 4, -31, 2, 0, 6, 23551
 	call Unknown_81D6100
 	wait
 	end
@@ -1983,30 +1983,30 @@ Move_SPARK: @ 81C9EA3
 Move_ATTRACT: @ 81CA0BA
 	loadsprite 10216
 	panse_1C SE_W204, 192, 12, 3
-	createtask sub_80A8B88, 5, 5, 0, 12, 4096, 4, 0
+	createtask sub_80A8B88, 5, 0, 12, 4096, 4, 0
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D7AB0, 131, 2, 20, -8
+	sprite gBattleAnimSpriteTemplate_83D7AB0, 131, 20, -8
 	wait
 	panse_19 SE_W213, 63
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, 160, -32
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, -256, -40
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, 128, -16
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, 416, -38
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, -128, -22
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, -384, -31
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 160, -32
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, -256, -40
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 128, -16
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 416, -38
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, -128, -22
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, -384, -31
 	wait
 	panse_1D SE_W213B, 0, 15
 	createtask sub_80D2100, 5
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 16, 256, 0
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 224, 240, 15
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 126, 272, 30
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 80, 224, 45
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 170, 272, 60
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 40, 256, 75
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 112, 256, 90
-	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 3, 200, 272, 90
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 16, 256, 0
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 224, 240, 15
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 126, 272, 30
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 80, 224, 45
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 170, 272, 60
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 40, 256, 75
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 112, 256, 90
+	sprite gBattleAnimSpriteTemplate_83D7AE0, 40, 200, 272, 90
 	pause 75
-	createtask sub_80E1F8C, 2, 6, 4, 4, 4, 0, 10, 28479
+	createtask sub_80E1F8C, 2, 4, 4, 4, 0, 10, 28479
 	end
 
 Move_GROWTH: @ 81CA1B3
@@ -2016,27 +2016,27 @@ Move_GROWTH: @ 81CA1B3
 	wait
 	end
 _81CA1C0:
-	createtask sub_80E1F8C, 2, 6, 2, 0, 2, 0, 8, 32767
+	createtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767
 	panse_19 SE_W036, 192
-	createtask sub_80A8D34, 5, 5, -3, -3, 16, 0, 0
+	createtask sub_80A8D34, 5, -3, -3, 16, 0, 0
 	ret
 
 Move_WHIRLWIND: @ 81CA1E9
 	loadsprite 10162
-	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 5, 0, -8, 1, 60, 0
-	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 5, 0, 0, 1, 60, 1
-	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 5, 0, 8, 1, 60, 2
-	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 5, 0, 16, 1, 60, 3
-	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 5, 0, 24, 1, 60, 4
-	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 5, 0, 32, 1, 60, 0
+	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, -8, 1, 60, 0
+	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 0, 1, 60, 1
+	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 8, 1, 60, 2
+	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 16, 1, 60, 3
+	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 24, 1, 60, 4
+	sprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 32, 1, 60, 0
 	pause 5
 	panse_1C SE_W104, 63, 10, 4
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 15, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 15, 1
 	pause 29
-	createtask sub_80A8500, 2, 5, 1, 12, 6, 1, 5
+	createtask sub_80A8500, 2, 1, 12, 6, 1, 5
 	pause 7
 	panse_19 SE_W081, 63
-	createtask sub_80A8A80, 5, 2, 1, 8
+	createtask sub_80A8A80, 5, 1, 8
 	wait
 	end
 
@@ -2045,13 +2045,13 @@ Move_CONFUSE_RAY: @ 81CA291
 	monbg 3
 	fadetobg 2
 	waitbgfadein
-	createtask sub_812B374, 2, 4, -64, 63, 2, 0
-	createtask sub_80E2094, 2, 6, 10013, 0, 6, 0, 14, 351
-	sprite gBattleAnimSpriteTemplate_83DAE64, 130, 3, 28, 0, 288
+	createtask sub_812B374, 2, -64, 63, 2, 0
+	createtask sub_80E2094, 2, 10013, 0, 6, 0, 14, 351
+	sprite gBattleAnimSpriteTemplate_83DAE64, 130, 28, 0, 288
 	wait
 	setalpha 8, 8
 	panse_19 SE_W081B, 63
-	sprite gBattleAnimSpriteTemplate_83DAE7C, 130, 2, 0, -16
+	sprite gBattleAnimSpriteTemplate_83DAE7C, 130, 0, -16
 	wait
 	pause 0
 	blendoff
@@ -2063,10 +2063,10 @@ Move_CONFUSE_RAY: @ 81CA291
 Move_LOCK_ON: @ 81CA2E4
 	loadsprite 10014
 	sprite gBattleAnimSpriteTemplate_83D6DAC, 40
-	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1, 3
-	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1, 4
+	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1
+	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 2
+	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 3
+	sprite gBattleAnimSpriteTemplate_83D6DC4, 40, 4
 	pause 120
 	setvar 7, -1
 	wait
@@ -2076,12 +2076,12 @@ Move_MEAN_LOOK: @ 81CA31A
 	loadsprite 10187
 	monbg 3
 	panse_19 SE_W060, 192
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 16, 0
 	panse_1C SE_W109, 63, 15, 4
 	panse_1D SE_W043, 63, 85
 	sprite gBattleAnimSpriteTemplate_8402264, 2
 	pause 120
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 0
 	pause 30
 	clearmonbg 3
 	wait
@@ -2089,21 +2089,21 @@ Move_MEAN_LOOK: @ 81CA31A
 
 Move_ROCK_THROW: @ 81CA35F
 	loadsprite 10058
-	sprite gBattleAnimSpriteTemplate_83DB428, 130, 4, 6, 1, 15, 1
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 0, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB428, 130, 6, 1, 15, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 0, 1, 0, 0
 	panse_19 SE_W088, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 19, 1, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 19, 1, 10, 0
 	panse_19 SE_W088, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -23, 2, -10, 0
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -23, 2, -10, 0
 	panse_19 SE_W088, 63
-	createtask sub_80A7E7C, 2, 5, 1, 0, 5, 20, 1
+	createtask sub_80A7E7C, 2, 1, 0, 5, 20, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -15, 1, -10, 0
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -15, 1, -10, 0
 	panse_19 SE_W088, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 23, 2, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 23, 2, 10, 0
 	panse_19 SE_W088, 63
 	wait
 	end
@@ -2111,20 +2111,20 @@ Move_ROCK_THROW: @ 81CA35F
 Move_ROCK_SLIDE: @ 81CA3EB
 	loadsprite 10058
 	monbg 3
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 7, 1, 11, 1
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -5, 1, -5, 1
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, 7, 1, 11, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -5, 1, -5, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 5, 0, 6, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 19, 1, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 19, 1, 10, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -23, 2, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -23, 2, -10, 1
 	panse_19 SE_W088, 63
-	createtask sub_80A7E7C, 2, 5, 1, 0, 5, 50, 1
-	createtask sub_80A7E7C, 2, 5, 3, 0, 5, 50, 1
+	createtask sub_80A7E7C, 2, 1, 0, 5, 50, 1
+	createtask sub_80A7E7C, 2, 3, 0, 5, 50, 1
 	pause 2
 	call _81CA483
 	call _81CA483
@@ -2132,28 +2132,28 @@ Move_ROCK_SLIDE: @ 81CA3EB
 	clearmonbg 3
 	end
 _81CA483:
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -20, 0, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -20, 0, -10, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 28, 1, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 28, 1, 10, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -10, 1, -5, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -10, 1, -5, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 10, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 10, 0, 6, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 24, 1, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 24, 1, 10, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -32, 2, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -32, 2, -10, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, -20, 0, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, -20, 0, -10, 1
 	panse_19 SE_W088, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 4, 30, 2, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DAC4C, 130, 30, 2, 10, 1
 	panse_19 SE_W088, 63
 	pause 2
 	ret
@@ -2165,11 +2165,11 @@ Move_THIEF: @ 81CA52C
 	fadetobg 1
 	waitbgfadein
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 6
 	panse_19 SE_W233, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7FA0, 2, 1, 1, 0, 8, 1
 	wait
 	pause 20
 	clearmonbg 1
@@ -2186,7 +2186,7 @@ Move_BUBBLE_BEAM: @ 81CA573
 	setalpha 12, 8
 	pause 1
 	call _81CA5AD
-	createtask sub_80A8B88, 5, 5, 0, 3, 3072, 8, 1
+	createtask sub_80A8B88, 5, 0, 3, 3072, 8, 1
 	call _81CA5AD
 	call _81CA5AD
 	wait
@@ -2196,22 +2196,22 @@ Move_BUBBLE_BEAM: @ 81CA573
 	blendoff
 	end
 _81CA5AD:
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 35, 70, 0, 256, 50
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 35, 70, 0, 256, 50
 	panse_19 SE_W145, 192
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 20, 40, -10, 256, 50
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 20, 40, -10, 256, 50
 	panse_19 SE_W145, 192
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 10, -60, 0, 256, 50
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 10, -60, 0, 256, 50
 	panse_19 SE_W145, 192
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 15, -15, 10, 256, 50
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 15, -15, 10, 256, 50
 	panse_19 SE_W145, 192
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 30, 10, -10, 256, 50
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 30, 10, -10, 256, 50
 	panse_19 SE_W145, 192
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 25, -30, 10, 256, 50
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 25, -30, 10, 256, 50
 	panse_19 SE_W145, 192
 	pause 3
 	ret
@@ -2220,7 +2220,7 @@ Move_ICY_WIND: @ 81CA650
 	loadsprite 10141
 	loadsprite 10142
 	monbg 3
-	createtask sub_80E2A38, 10, 5, 11, 4, 0, 4, 0
+	createtask sub_80E2A38, 10, 11, 4, 0, 4, 0
 	fadetobg 15
 	waitbgfadeout
 	panse_19 SE_W196, 0
@@ -2237,42 +2237,42 @@ Move_ICY_WIND: @ 81CA650
 	clearmonbg 3
 	restorebg
 	waitbgfadeout
-	createtask sub_80E2A38, 10, 5, 11, 4, 4, 0, 0
+	createtask sub_80E2A38, 10, 11, 4, 4, 0, 0
 	waitbgfadein
 	end
 _81CA6A8:
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 6, 0, 0, 0, 0, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 0, 0, 0, 0, 72, 1
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 6, 0, 10, 0, 10, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 0, 10, 0, 10, 72, 1
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 6, 0, -10, 0, -10, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 0, -10, 0, -10, 72, 1
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 6, 0, 15, 0, 15, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 0, 15, 0, 15, 72, 1
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 6, 0, -5, 0, -5, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 168, 0, -5, 0, -5, 72, 1
 	ret
 
 Move_SMOKESCREEN: @ 81CA710
 	loadsprite 10016
 	loadsprite 10017
 	panse_19 SE_W104, 192
-	sprite gBattleAnimSpriteTemplate_84021B0, 130, 6, 20, 0, 0, 0, 35, -25
+	sprite gBattleAnimSpriteTemplate_84021B0, 130, 20, 0, 0, 0, 35, -25
 	wait
 	createtask sub_812C1D0, 2
 	pause 2
 	panse_19 SE_W028, 63
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, -12, 104, 0, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, -12, 72, 1, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, -6, 56, 1, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, -6, 88, 0, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 0, 56, 0, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 0, 88, 1, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 6, 72, 0, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 6, 104, 1, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 12, 72, 0, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 12, 56, 1, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 18, 80, 0, 75
-	sprite gBattleAnimSpriteTemplate_8402198, 132, 5, 0, 18, 72, 1, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, -12, 104, 0, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, -12, 72, 1, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, -6, 56, 1, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, -6, 88, 0, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 0, 56, 0, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 0, 88, 1, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 6, 72, 0, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 6, 104, 1, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 12, 72, 0, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 12, 56, 1, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 18, 80, 0, 75
+	sprite gBattleAnimSpriteTemplate_8402198, 132, 0, 18, 72, 1, 75
 	wait
 	end
 
@@ -2283,43 +2283,43 @@ Move_CONVERSION: @ 81CA809
 	setalpha 16, 0
 	pause 0
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -24, -24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, -24
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -8, -24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, -24
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 8, -24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 8, -24
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 24, -24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, -24
 	pause 3
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -24, -8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, -8
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -8, -8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, -8
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 8, -8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 8, -8
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 24, -8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, -8
 	pause 3
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -24, 8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, 8
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -8, 8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, 8
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 8, 8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 8, 8
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 24, 8
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, 8
 	pause 3
 	panse_19 SE_W129, 192
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -24, 24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, 24
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, -8, 24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, 24
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 8, 24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 8, 24
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 2, 24, 24
+	sprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, 24
 	pause 20
 	panse_19 SE_W112, 192
-	createtask sub_80E21A8, 2, 7, 10018, 1, 1, 14335, 12, 0, 0
+	createtask sub_80E21A8, 2, 10018, 1, 1, 14335, 12, 0, 0
 	pause 6
 	createtask sub_80CE108, 5
 	wait
@@ -2335,22 +2335,22 @@ Move_CONVERSION_2: @ 81CA91E
 	setalpha 0, 16
 	pause 0
 	panse_19 SE_W112, 63
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -24, -24, 60
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -8, -24, 65
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 8, -24, 70
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 24, -24, 75
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -24, -8, 80
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -8, -8, 85
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 8, -8, 90
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 24, -8, 95
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -24, 8, 100
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -8, 8, 105
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 8, 8, 110
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 24, 8, 115
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -24, 24, 120
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, -8, 24, 125
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 8, 24, 130
-	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 3, 24, 24, 135
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -24, -24, 60
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -8, -24, 65
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 8, -24, 70
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 24, -24, 75
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -24, -8, 80
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -8, -8, 85
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 8, -8, 90
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 24, -8, 95
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -24, 8, 100
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -8, 8, 105
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 8, 8, 110
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 24, 8, 115
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -24, 24, 120
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, -8, 24, 125
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 8, 24, 130
+	sprite gBattleAnimSpriteTemplate_83D6FB0, 2, 24, 24, 135
 	createtask sub_80CE210, 5
 	pause 60
 	panse_19 SE_W129, 63
@@ -2378,35 +2378,35 @@ Move_ROLLING_KICK: @ 81CAA3A
 	loadsprite 10135
 	monbg 1
 	setalpha 12, 8
-	createtask sub_80A8500, 2, 5, 0, 18, 6, 1, 4
+	createtask sub_80A8500, 2, 0, 18, 6, 1, 4
 	panse_19 SE_W104, 192
 	pause 6
 	panse_19 SE_W104, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 20, 0, 0, 4
-	sprite gBattleAnimSpriteTemplate_83D9FF0, 2, 6, -24, 0, 48, 10, 160, 0
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83D9FF0, 2, -24, 0, 48, 10, 160, 0
 	pause 5
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -8, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 1, 8
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 1, 8
 	clearmonbg 1
 	blendoff
 	end
 
 Move_HEADBUTT: @ 81CAABD
 	loadsprite 10135
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0
 	panse_19 SE_W029, 192
 	wait
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1
 	wait
-	createtask sub_80A8154, 2, 5, 0, 2, 0, 4, 1
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 2
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 0, 0, 1, 1
+	createtask sub_80A8154, 2, 0, 2, 0, 4, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1
 	panse_19 SE_W233B, 63
 	wait
 	end
@@ -2414,17 +2414,17 @@ Move_HEADBUTT: @ 81CAABD
 Move_HORN_ATTACK: @ 81CAB1A
 	loadsprite 10135
 	loadsprite 10020
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0
 	panse_19 SE_W029, 192
 	wait
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D7050, 132, 3, 0, 0, 10
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D7050, 132, 0, 0, 10
 	wait
-	createtask sub_80A8154, 2, 5, 0, 2, 0, 4, 1
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 2
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 0, 0, 1, 1
+	createtask sub_80A8154, 2, 0, 2, 0, 4, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1
 	panse_19 SE_W030, 63
 	wait
 	end
@@ -2432,22 +2432,22 @@ Move_HORN_ATTACK: @ 81CAB1A
 Move_FURY_ATTACK: @ 81CAB87
 	loadsprite 10135
 	loadsprite 10020
-	createtask sub_80A8E04, 2, 4, 4, 256, 0, 2
+	createtask sub_80A8E04, 2, 4, 256, 0, 2
 	ifelse _81CABB8, _81CABDE
 _81CABA5:
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
 	wait
 	end
 _81CABB8:
-	sprite gBattleAnimSpriteTemplate_83D7050, 132, 3, 8, 8, 10
+	sprite gBattleAnimSpriteTemplate_83D7050, 132, 8, 8, 10
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1
 	panse_19 SE_W030, 63
 	jump _81CABA5
 _81CABDE:
-	sprite gBattleAnimSpriteTemplate_83D7050, 132, 3, -8, -8, 10
+	sprite gBattleAnimSpriteTemplate_83D7050, 132, -8, -8, 10
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1
 	panse_19 SE_W030, 63
 	jump _81CABA5
 
@@ -2457,54 +2457,54 @@ Move_HORN_DRILL: @ 81CAC04
 	jumpunkcond _81CAD6A
 	fadetobg 7
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -2304, 768, 1, -1
+	createtask sub_80E3A58, 5, -2304, 768, 1, -1
 _81CAC21:
 	waitbgfadein
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0
 	panse_19 SE_W029, 192
 	wait
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D7050, 132, 3, 0, 0, 12
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D7050, 132, 0, 0, 12
 	wait
 	playse SE_BAN
-	createtask sub_80A8154, 2, 5, 0, 2, 0, 40, 1
-	createtask sub_80A8154, 2, 5, 1, 10, 0, 40, 1
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 0, 0, 1, 3
+	createtask sub_80A8154, 2, 0, 2, 0, 40, 1
+	createtask sub_80A8154, 2, 1, 10, 0, 40, 1
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 0, 2, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 2, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -4, 3, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, -4, 3, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -8, -5, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, -8, -5, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 4, -12, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -12, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 16, 0, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 16, 0, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 5, 18, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 5, 18, 1, 3
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -17, 12, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, -17, 12, 1, 2
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -21, -15, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, -21, -15, 1, 2
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 8, -27, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 8, -27, 1, 2
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 32, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 32, 0, 1, 2
 	panse_19 SE_W030, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2
 	wait
 	restorebg
 	waitbgfadeout
@@ -2514,7 +2514,7 @@ _81CAC21:
 _81CAD6A:
 	fadetobg 8
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, 2304, 768, 0, -1
+	createtask sub_80E3A58, 5, 2304, 768, 0, -1
 	jump _81CAC21
 
 Move_THRASH: @ 81CAD81
@@ -2522,16 +2522,16 @@ Move_THRASH: @ 81CAD81
 	loadsprite 10143
 	createtask sub_80D0A4C, 2
 	createtask sub_80D0AB8, 2
-	sprite gBattleAnimSpriteTemplate_83D9FC0, 131, 3, 1, 10, 0
-	createtask sub_80A8154, 2, 5, 1, 4, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 0
+	createtask sub_80A8154, 2, 1, 4, 0, 7, 1
 	panse_19 SE_W004, 63
 	pause 28
-	sprite gBattleAnimSpriteTemplate_83D9FC0, 131, 3, 1, 10, 1
-	createtask sub_80A8154, 2, 5, 1, 4, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 1
+	createtask sub_80A8154, 2, 1, 4, 0, 7, 1
 	panse_19 SE_W233B, 63
 	pause 28
-	sprite gBattleAnimSpriteTemplate_83D9FC0, 131, 3, 1, 10, 3
-	createtask sub_80A8154, 2, 5, 1, 8, 0, 16, 1
+	sprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 3
+	createtask sub_80A8154, 2, 1, 8, 0, 16, 1
 	panse_19 SE_W025B, 63
 	end
 
@@ -2541,29 +2541,29 @@ Move_SING: @ 81CAE00
 	createtask sub_80CEA20, 2
 	wait
 	panse_1B SE_W047, 192, 63, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 7, 0, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 7, 0, 12
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 6, 1, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 6, 1, 12
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 1, 2, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 1, 2, 12
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 3, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 3, 12
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 3, 0, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 0, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 1, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 1, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 5, 2, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 5, 2, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 6, 3, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 6, 3, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 0, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 0, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 1, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 1, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 1, 2, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 1, 2, 12
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 5, 3, 12
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 5, 3, 12
 	pause 4
 	wait
 	clearmonbg 3
@@ -2574,45 +2574,45 @@ Move_SING: @ 81CAE00
 Move_LOW_KICK: @ 81CAED4
 	loadsprite 10143
 	loadsprite 10135
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 20, 0, 0, 4
-	sprite gBattleAnimSpriteTemplate_83D9FF0, 130, 6, -24, 28, 40, 8, 160, 0
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83D9FF0, 130, -24, 28, 40, 8, 160, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -8, 8, 1, 2
-	createtask sub_80A8E04, 2, 4, 6, 384, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -8, 8, 1, 2
+	createtask sub_80A8E04, 2, 6, 384, 1, 2
 	panse_19 SE_W233B, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 1, 4
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 1, 4
 	end
 
 Move_EARTHQUAKE: @ 81CAF31
-	createtask sub_80E1864, 5, 3, 5, 10, 50
-	createtask sub_80E1864, 5, 3, 4, 10, 50
+	createtask sub_80E1864, 5, 5, 10, 50
+	createtask sub_80E1864, 5, 4, 10, 50
 	panse_19 SE_W089, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
 	pause 16
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
 	end
 
 Move_FISSURE: @ 81CAF7E
 	loadsprite 10074
-	createtask sub_80E1864, 3, 3, 5, 10, 50
-	createtask sub_80E1864, 3, 3, 1, 10, 50
+	createtask sub_80E1864, 3, 5, 10, 50
+	createtask sub_80E1864, 3, 1, 10, 50
 	panse_19 SE_W089, 63
 	pause 8
 	call _81CAFFF
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
 	pause 15
 	call _81CB050
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
 	pause 15
 	call _81CAFFF
 	pause 50
 	fadetobg 21
 	waitbgfadeout
-	createtask sub_80E1BB0, 5, 3, 1, 5, -1
+	createtask sub_80E1BB0, 5, 1, 5, -1
 	waitbgfadein
 	pause 40
 	restorebg
@@ -2621,17 +2621,17 @@ Move_FISSURE: @ 81CAF7E
 	waitbgfadein
 	end
 _81CAFFF:
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 0, 12, -48, -16, 24
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 0, 16, -16, -10, 24
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 1, 14, -52, -18, 24
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 1, 12, -32, -16, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 0, 12, -48, -16, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 0, 16, -16, -10, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 1, 14, -52, -18, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 1, 12, -32, -16, 24
 	panse_19 SE_W091, 63
 	ret
 _81CB050:
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 0, 12, -24, -16, 24
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 0, 16, -38, -10, 24
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 1, 14, -20, -18, 24
-	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 6, 1, 1, 12, -36, -16, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 0, 12, -24, -16, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 0, 16, -38, -10, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 1, 14, -20, -18, 24
+	sprite gBattleAnimSpriteTemplate_83DB34C, 130, 1, 1, 12, -36, -16, 24
 	panse_19 SE_W091, 63
 	ret
 
@@ -2642,11 +2642,11 @@ _81CB0AA:
 _81CB0AB:
 	loadsprite 10074
 	loadsprite 10281
-	sprite gBattleAnimSpriteTemplate_83DB364, 1, 3, 0, 0, 180
-	sprite gBattleAnimSpriteTemplate_83DB364, 1, 3, 0, 1, 180
+	sprite gBattleAnimSpriteTemplate_83DB364, 1, 0, 0, 180
+	sprite gBattleAnimSpriteTemplate_83DB364, 1, 0, 1, 180
 	monbg_22 0
 	pause 1
-	createtask sub_80E1244, 2, 1, 0
+	createtask sub_80E1244, 2, 0
 	pause 6
 	call _81CB16A
 	call _81CB16A
@@ -2656,29 +2656,29 @@ _81CB0AB:
 	wait
 	clearmonbg_23 0
 	pause 1
-	createtask sub_80E1244, 2, 1, 1
+	createtask sub_80E1244, 2, 1
 	jump _81CB0AA
 _81CB106:
 	loadsprite 10135
 	loadsprite 10281
-	createtask sub_80E149C, 2, 1, 0
+	createtask sub_80E149C, 2, 0
 	wait
 	monbg 0
-	sprite gBattleAnimSpriteTemplate_83DB364, 1, 3, 0, 0, 48
-	sprite gBattleAnimSpriteTemplate_83DB364, 1, 3, 0, 1, 48
+	sprite gBattleAnimSpriteTemplate_83DB364, 1, 0, 0, 48
+	sprite gBattleAnimSpriteTemplate_83DB364, 1, 0, 1, 48
 	pause 1
-	createtask sub_80E149C, 2, 1, 1
+	createtask sub_80E149C, 2, 1
 	pause 16
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -8, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
 	panse_19 SE_W025B, 192
 	clearmonbg 0
 	jump _81CB0AA
 _81CB16A:
-	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 6, 0, 0, 12, 4, -16, 18
-	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 6, 0, 0, 16, 4, -10, 18
-	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 6, 0, 1, 14, 4, -18, 18
-	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 6, 0, 1, 12, 4, -16, 18
+	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 0, 0, 12, 4, -16, 18
+	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 0, 0, 16, 4, -10, 18
+	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 0, 1, 14, 4, -18, 18
+	sprite gBattleAnimSpriteTemplate_83DB34C, 2, 0, 1, 12, 4, -16, 18
 	panse_19 SE_W091, 192
 	pause 32
 	ret
@@ -2696,8 +2696,8 @@ Move_MEDITATE: @ 81CB1BD
 Move_AGILITY: @ 81CB1DA
 	monbg 2
 	setalpha 12, 8
-	createtask sub_80A8500, 2, 5, 0, 24, 6, 4, 4
-	createtask sub_80E2DD8, 2, 4, 0, 4, 7, 10
+	createtask sub_80A8500, 2, 0, 24, 6, 4, 4
+	createtask sub_80E2DD8, 2, 0, 4, 7, 10
 	panse_19 SE_W104, 192
 	pause 12
 	panse_19 SE_W104, 192
@@ -2718,12 +2718,12 @@ Move_QUICK_ATTACK: @ 81CB224
 	loadsprite 10135
 	monbg 2
 	setalpha 12, 8
-	createtask sub_80A8500, 2, 5, 0, 24, 6, 1, 5
-	createtask sub_80E2DD8, 2, 4, 0, 4, 7, 3
+	createtask sub_80A8500, 2, 0, 24, 6, 1, 5
+	createtask sub_80E2DD8, 2, 0, 4, 7, 3
 	panse_19 SE_W026, 192
 	pause 4
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, 0, 0, 1, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 0, 0, 1, 1
 	panse_19 SE_W233B, 63
 	wait
 	clearmonbg 2
@@ -2736,17 +2736,17 @@ Move_RAGE: @ 81CB27C
 	loadsprite 10087
 	monbg 1
 	setalpha 12, 8
-	createtask sub_8079790, 3, 5, 0, 31, 10, 0, 2
-	sprite gBattleAnimSpriteTemplate_83D7798, 2, 3, 0, -20, -28
+	createtask sub_8079790, 3, 0, 31, 10, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D7798, 2, 0, -20, -28
 	panse_19 SE_W207B, 192
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D7798, 2, 3, 0, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28
 	panse_19 SE_W207B, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 6
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A9058, 2, 5, 1, 1, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A9058, 2, 1, 1, 10, 1, 0
 	panse_19 SE_W233B, 63
 	wait
 	clearmonbg 1
@@ -2799,10 +2799,10 @@ Move_MINIMIZE: @ 81CB352
 Move_METRONOME: @ 81CB365
 	loadsprite 10064
 	loadsprite 10209
-	sprite gBattleAnimSpriteTemplate_83D7220, 11, 2, 0, 100
+	sprite gBattleAnimSpriteTemplate_83D7220, 11, 0, 100
 	panse_19 SE_W118, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D72C8, 12, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D72C8, 12, 0
 	pause 24
 	panse_1C SE_W039, 192, 22, 3
 	wait
@@ -2818,27 +2818,27 @@ _81CB399:
 	wait
 	jump _81CB398
 _81CB3A9:
-	sprite gBattleAnimSpriteTemplate_83C2010, 2, 6, 0, -24, 0, 0, 10, 0
+	sprite gBattleAnimSpriteTemplate_83C2010, 2, 0, -24, 0, 0, 10, 0
 	panse_19 SE_W036, 192
 	wait
-	createtask sub_80A8E04, 2, 4, 16, 96, 0, 2
+	createtask sub_80A8E04, 2, 16, 96, 0, 2
 	wait
-	sprite gBattleAnimSpriteTemplate_83C2010, 2, 6, 0, 24, 0, 0, 10, 1
+	sprite gBattleAnimSpriteTemplate_83C2010, 2, 0, 24, 0, 0, 10, 1
 	wait
 	ret
 _81CB3E6:
 	loadsprite 10135
-	createtask sub_80CDAC8, 2, 1, 0
+	createtask sub_80CDAC8, 2, 0
 	panse_19 SE_W036, 192
 	wait
 	playse SE_BAN
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
-	createtask sub_80A8154, 2, 5, 0, 2, 0, 40, 1
-	createtask sub_80A8154, 2, 5, 1, 10, 0, 40, 1
-	sprite gBattleAnimSpriteTemplate_83DB538, 132, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
+	createtask sub_80A8154, 2, 0, 2, 0, 40, 1
+	createtask sub_80A8154, 2, 1, 10, 0, 40, 1
+	sprite gBattleAnimSpriteTemplate_83DB538, 132, 0, 0, 1, 0
 	panse_1C SE_W025B, 63, 8, 3
 	wait
-	createtask sub_80CDAC8, 2, 1, 1
+	createtask sub_80CDAC8, 2, 1
 	jump _81CB398
 
 Move_AMNESIA: @ 81CB455
@@ -2859,8 +2859,8 @@ Move_KINESIS: @ 81CB479
 	panse_19 SE_W060, 192
 	call Unknown_81D61E7
 	sprite gBattleAnimSpriteTemplate_83DA824, 20
-	sprite gBattleAnimSpriteTemplate_83D7450, 19, 3, 32, -8, 0
-	sprite gBattleAnimSpriteTemplate_83D7450, 19, 3, 32, 16, 1
+	sprite gBattleAnimSpriteTemplate_83D7450, 19, 32, -8, 0
+	sprite gBattleAnimSpriteTemplate_83D7450, 19, 32, 16, 1
 	panse_1C SE_W109, 192, 21, 2
 	pause 60
 	panse_19 SE_W146, 192
@@ -2875,19 +2875,19 @@ Move_KINESIS: @ 81CB479
 Move_GLARE: @ 81CB4CA
 	loadsprite 10248
 	loadsprite 10218
-	createtask sub_81301EC, 5, 1, 0
+	createtask sub_81301EC, 5, 0
 	panse_19 SE_W060B, 192
 	wait
-	createtask sub_80E2A38, 5, 5, 1, 0, 0, 16, 0
+	createtask sub_80E2A38, 5, 1, 0, 0, 16, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 2, -16, -8
-	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 2, 16, -8
+	sprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8
+	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 16, -8
 	createtask sub_80D23B4, 5
 	panse_19 SE_W043, 192
 	pause 2
-	createtask sub_80D60B4, 3, 3, 20, 1, 0
+	createtask sub_80D60B4, 3, 20, 1, 0
 	wait
-	createtask sub_80E2A38, 5, 5, 1, 0, 16, 0, 0
+	createtask sub_80E2A38, 5, 1, 0, 16, 0, 0
 	end
 
 Move_BARRAGE: @ 81CB533
@@ -2895,9 +2895,9 @@ Move_BARRAGE: @ 81CB533
 	createtask sub_8130554, 3
 	panse_19 SE_W207, 192
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 8, 1, 40, 1
-	createtask sub_80A7E7C, 3, 5, 1, 0, 4, 20, 1
-	createtask sub_80A7E7C, 3, 5, 3, 0, 4, 20, 1
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, 8, 1, 40, 1
+	createtask sub_80A7E7C, 3, 1, 0, 4, 20, 1
+	createtask sub_80A7E7C, 3, 3, 0, 4, 20, 1
 	panse_1C SE_W070, 63, 8, 2
 	end
 
@@ -2908,38 +2908,38 @@ _81CB584:
 _81CB585:
 	monbg 3
 	setalpha 12, 11
-	createtask sub_80E3BA4, 5, 1, 7
+	createtask sub_80E3BA4, 5, 7
 	jumpvareq 7, 0, _81CB5A0
 	jump _81CB617
 _81CB5A0:
-	createtask sub_80E2A38, 10, 5, 27, 1, 0, 12, 0
+	createtask sub_80E2A38, 10, 27, 1, 0, 12, 0
 	wait
 	pause 12
-	createtask sub_80E2A38, 10, 5, 2, 1, 8, 0, 0
-	createtask sub_80E1864, 5, 3, 0, 2, 16
+	createtask sub_80E2A38, 10, 2, 1, 8, 0, 0
+	createtask sub_80E1864, 5, 0, 2, 16
 	panse_1C SE_W287, 192, 4, 8
-	createtask sub_80E2A38, 10, 5, 2, 1, 0, 15, 32767
+	createtask sub_80E2A38, 10, 2, 1, 0, 15, 32767
 	pause 20
-	createtask sub_80E2A38, 10, 5, 2, 1, 15, 0, 32767
+	createtask sub_80E2A38, 10, 2, 1, 15, 0, 32767
 	wait
-	createtask sub_80E2A38, 10, 5, 25, 1, 8, 0, 0
+	createtask sub_80E2A38, 10, 25, 1, 8, 0, 0
 	wait
 	clearmonbg 3
 	blendoff
 	jump _81CB584
 _81CB617:
-	createtask sub_80E2A7C, 10, 5, 1, 1, 0, 12, 0
+	createtask sub_80E2A7C, 10, 1, 1, 0, 12, 0
 	wait
 	pause 12
-	createtask sub_80E2A38, 10, 5, 2, 1, 8, 0, 0
-	createtask sub_80E1864, 5, 3, 0, 2, 16
+	createtask sub_80E2A38, 10, 2, 1, 8, 0, 0
+	createtask sub_80E1864, 5, 0, 2, 16
 	panse_19 SE_W287, 192
 	pause 8
-	createtask sub_80E2A38, 10, 5, 2, 1, 0, 15, 32767
+	createtask sub_80E2A38, 10, 2, 1, 0, 15, 32767
 	pause 20
-	createtask sub_80E2A38, 10, 5, 2, 1, 15, 0, 32767
+	createtask sub_80E2A38, 10, 2, 1, 15, 0, 32767
 	wait
-	createtask sub_80E2A7C, 10, 5, 4, 1, 8, 0, 0
+	createtask sub_80E2A7C, 10, 4, 1, 8, 0, 0
 	wait
 	clearmonbg 3
 	blendoff
@@ -2949,19 +2949,19 @@ _81CB68E:
 	loadsprite 10284
 	call Unknown_81D61FB
 	monbg 0
-	createtask sub_80E2A38, 10, 5, 2, 0, 0, 16, 32767
+	createtask sub_80E2A38, 10, 2, 0, 0, 16, 32767
 	pause 4
-	createtask sub_80DFC24, 5, 1, 0
+	createtask sub_80DFC24, 5, 0
 	wait
-	createtask sub_812B340, 5, 2, 238, -64
+	createtask sub_812B340, 5, 238, -64
 	sprite gBattleAnimSpriteTemplate_83DA65C, 130
 	pause 14
-	createtask sub_80A7FA0, 2, 5, 1, 10, 0, 18, 1
-	createtask sub_812B30C, 5, 2, 141, 63
+	createtask sub_80A7FA0, 2, 1, 10, 0, 18, 1
+	createtask sub_812B30C, 5, 141, 63
 	pause 20
-	createtask sub_80DFD24, 5, 1, 1
+	createtask sub_80DFD24, 5, 1
 	pause 2
-	createtask sub_80E2A38, 10, 5, 2, 0, 15, 0, 32767
+	createtask sub_80E2A38, 10, 2, 0, 15, 0, 32767
 	wait
 	clearmonbg 0
 	call Unknown_81D622B
@@ -2974,7 +2974,7 @@ Move_FLASH: @ 81CB713
 	end
 
 Move_SPLASH: @ 81CB720
-	createtask sub_80D074C, 2, 2, 0, 3
+	createtask sub_80D074C, 2, 0, 3
 	pause 8
 	panse_1C SE_W039, 192, 38, 3
 	wait
@@ -2983,7 +2983,7 @@ Move_SPLASH: @ 81CB720
 Move_ACID_ARMOR: @ 81CB735
 	monbg 0
 	setalpha 15, 0
-	createtask sub_812F314, 2, 1, 0
+	createtask sub_812F314, 2, 0
 	panse_19 SE_W151, 192
 	wait
 	blendoff
@@ -2999,31 +2999,31 @@ Move_SHARPEN: @ 81CB74E
 
 Move_SUPER_FANG: @ 81CB75A
 	loadsprite 10192
-	createtask sub_80A8154, 2, 5, 0, 1, 0, 20, 1
+	createtask sub_80A8154, 2, 0, 1, 0, 20, 1
 	panse_19 SE_W082, 192
 	wait
-	createtask sub_80A8154, 2, 5, 0, 3, 0, 48, 1
-	createtask sub_8079790, 2, 5, 0, 1247, 12, 4, 1
+	createtask sub_80A8154, 2, 0, 3, 0, 48, 1
+	createtask sub_8079790, 2, 0, 1247, 12, 4, 1
 	wait
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 4
 	sprite gBattleAnimSpriteTemplate_83D7080, 130
 	panse_19 SE_W044, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 2143, 14, 32767, 14
-	createtask sub_80A7E7C, 2, 5, 1, 0, 7, 12, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 2143, 14, 32767, 14
+	createtask sub_80A7E7C, 2, 1, 0, 7, 12, 1
 	wait
 	blendoff
 	end
 
 Move_SLASH: @ 81CB7DB
 	loadsprite 10183
-	sprite gBattleAnimSpriteTemplate_83D6E38, 130, 3, 1, -8, 0
+	sprite gBattleAnimSpriteTemplate_83D6E38, 130, 1, -8, 0
 	panse_19 SE_W013, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6E38, 130, 3, 1, 8, 0
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 18, 1
+	sprite gBattleAnimSpriteTemplate_83D6E38, 130, 1, 8, 0
+	createtask sub_80A7FA0, 2, 1, 4, 0, 18, 1
 	panse_19 SE_W013, 63
 	wait
 	end
@@ -3033,13 +3033,13 @@ Move_STRUGGLE: @ 81CB815
 	loadsprite 10215
 	monbg 1
 	setalpha 12, 8
-	createtask sub_80A8154, 2, 5, 0, 3, 0, 12, 4
-	sprite gBattleAnimSpriteTemplate_83D7C90, 2, 3, 0, 0, 2
-	sprite gBattleAnimSpriteTemplate_83D7C90, 2, 3, 0, 1, 2
+	createtask sub_80A8154, 2, 0, 3, 0, 12, 4
+	sprite gBattleAnimSpriteTemplate_83D7C90, 2, 0, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D7C90, 2, 0, 1, 2
 	panse_1C SE_W029, 192, 12, 4
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_80A8154, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_80A8154, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W025B, 63
 	wait
 	clearmonbg 1
@@ -3053,7 +3053,7 @@ Move_SKETCH: @ 81CB87B
 	sprite gBattleAnimSpriteTemplate_83D77E0, 130
 	wait
 	clearmonbg 1
-	createtask sub_80D074C, 2, 2, 0, 2
+	createtask sub_80D074C, 2, 0, 2
 	panse_1C SE_W039, 192, 38, 2
 	end
 
@@ -3063,7 +3063,7 @@ Move_NIGHTMARE: @ 81CB8A3
 	jumpunkcond _81CB8CF
 	monbg 3
 	createtask sub_80DE1B0, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 40, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 40, 1
 	panse_19 SE_W171, 63
 	wait
 	clearmonbg 3
@@ -3071,8 +3071,8 @@ Move_NIGHTMARE: @ 81CB8A3
 	waitbgfadein
 	end
 _81CB8CF:
-	createtask sub_8079790, 2, 5, 0, 32767, 10, 2, 1
-	createtask sub_80A7E7C, 2, 5, 0, 3, 0, 32, 1
+	createtask sub_8079790, 2, 0, 32767, 10, 2, 1
+	createtask sub_80A7E7C, 2, 0, 3, 0, 32, 1
 	panse_19 SE_W171, 63
 	wait
 	restorebg
@@ -3083,11 +3083,11 @@ Move_FLAIL: @ 81CB8F9
 	loadsprite 10135
 	monbg 1
 	setalpha 12, 8
-	createtask sub_812E860, 2, 1, 0
+	createtask sub_812E860, 2, 0
 	panse_1C SE_W029, 192, 8, 2
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 3
-	createtask sub_80A9058, 2, 5, 0, 1, 30, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3
+	createtask sub_80A9058, 2, 0, 1, 30, 1, 0
 	panse_19 SE_W025B, 63
 	wait
 	clearmonbg 1
@@ -3099,7 +3099,7 @@ Move_SPITE: @ 81CB936
 	panse_19 SE_W060, 192
 	waitbgfadein
 	monbg 3
-	createtask sub_80E1F8C, 2, 6, 2, 2, 6, 0, 8, 32767
+	createtask sub_80E1F8C, 2, 2, 2, 6, 0, 8, 32767
 	createtask sub_80DE3AC, 2
 	panse_1C SE_W060, 63, 20, 3
 	wait
@@ -3117,17 +3117,17 @@ Move_MACH_PUNCH: @ 81CB965
 	fadetobg 9
 _81CB97E:
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -2304, 0, 1, -1
+	createtask sub_80E3A58, 5, -2304, 0, 1, -1
 	waitbgfadein
 	pause 0
 	setalpha 9, 8
-	createtask sub_807A69C, 2, 2, 28968, 10
+	createtask sub_807A69C, 2, 28968, 10
 	panse_19 SE_W026, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 0, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
 	panse_19 SE_W004, 63
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
 	clearmonbg 2
 	blendoff
@@ -3145,14 +3145,14 @@ Move_FORESIGHT: @ 81CB9ED
 	monbg 3
 	monbgprio_28 1
 	setalpha 16, 0
-	sprite gBattleAnimSpriteTemplate_8402A24, 130, 1, 1
+	sprite gBattleAnimSpriteTemplate_8402A24, 130, 1
 	pause 17
 	panse_1C SE_W166, 63, 16, 4
 	pause 48
 	pause 24
 	panse_19 SE_W166, 63
 	pause 10
-	createtask sub_8079790, 5, 5, 1, 32767, 12, 2, 1
+	createtask sub_8079790, 5, 1, 32767, 12, 2, 1
 	panse_19 SE_W197, 63
 	wait
 	blendoff
@@ -3164,13 +3164,13 @@ Move_DESTINY_BOND: @ 81CBA2C
 	fadetobg 2
 	panse_19 SE_W060, 192
 	waitbgfadein
-	createtask sub_80DE918, 5, 2, 0, 48
+	createtask sub_80DE918, 5, 0, 48
 	panse_19 SE_W109, 192
 	pause 48
-	createtask sub_80A8154, 2, 5, 0, 2, 0, 24, 1
-	createtask sub_80E2A7C, 2, 5, 6, 1, 0, 12, 30653
+	createtask sub_80A8154, 2, 0, 2, 0, 24, 1
+	createtask sub_80E2A7C, 2, 6, 1, 0, 12, 30653
 	pause 24
-	createtask sub_80E2A7C, 2, 5, 6, 1, 12, 0, 30653
+	createtask sub_80E2A7C, 2, 6, 1, 12, 0, 30653
 	panse_19 SE_W171, 63
 	wait
 	restorebg
@@ -3184,35 +3184,35 @@ Move_ENDURE: @ 81CBA87
 	panse_19 SE_W082, 192
 	call _81CBAC7
 	pause 8
-	createtask sub_80E1F8C, 2, 6, 2, 2, 2, 0, 11, 31
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 32, 1
+	createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31
+	createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1
 	call _81CBAC7
 	pause 8
 	call _81CBAC7
 	wait
 	end
 _81CBAC7:
-	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 4, 0, -24, 26, 2
+	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -24, 26, 2
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 4, 0, 14, 28, 1
+	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 14, 28, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 4, 0, -5, 10, 2
+	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -5, 10, 2
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 4, 0, 28, 26, 3
+	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 28, 26, 3
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 4, 0, -12, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -12, 0, 1
 	ret
 
 Move_CHARM: @ 81CBB1B
 	loadsprite 10210
-	createtask sub_812E568, 5, 3, 0, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, 0, 20
+	createtask sub_812E568, 5, 0, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20
 	panse_19 SE_W204, 192
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, -20, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, -20, 20
 	panse_19 SE_W204, 192
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, 20, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20
 	panse_19 SE_W204, 192
 	wait
 	end
@@ -3226,8 +3226,8 @@ Move_ROLLOUT: @ 81CBB5E
 	setalpha 12, 8
 	createtask sub_80DD4D4, 2
 	wait
-	createtask sub_80A9058, 2, 5, 0, 1, 30, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 4, 4, 0, 0, 1, 2
+	createtask sub_80A9058, 2, 0, 1, 30, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 4, 0, 0, 1, 2
 	panse_19 SE_W025B, 63
 	wait
 	clearmonbg 3
@@ -3240,24 +3240,24 @@ Move_FALSE_SWIPE: @ 81CBB9F
 	sprite gBattleAnimSpriteTemplate_83D6E50, 130
 	panse_19 SE_W233, 63
 	pause 16
-	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 0
 	panse_19 SE_W104, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 1, 16
+	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 1, 32
+	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 32
 	panse_19 SE_W104, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 1, 48
+	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 48
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 1, 64
+	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 64
 	panse_19 SE_W104, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 1, 80
+	sprite gBattleAnimSpriteTemplate_83D6E68, 130, 80
 	pause 2
 	wait
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 6, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, 0, 0, 1, 3
+	createtask sub_80A7E7C, 2, 1, 5, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 0, 0, 1, 3
 	panse_19 SE_W004, 63
 	end
 
@@ -3271,10 +3271,10 @@ Move_SWAGGER: @ 81CBC26
 	panse_1C SE_W207, 192, 4, 2
 	wait
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83D7798, 130, 3, 1, -20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 130, 1, -20, -28
 	panse_19 SE_W207B, 63
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D7798, 130, 3, 1, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 130, 1, 20, -28
 	panse_19 SE_W207B, 63
 	wait
 	end
@@ -3292,7 +3292,7 @@ Move_MILK_DRINK: @ 81CBC6E
 	pause 20
 	panse_19 SE_W152, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83D7928, 3, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 1, 0
 	panse_19 SE_W208, 192
 	wait
 	clearmonbg 1
@@ -3308,34 +3308,34 @@ Move_MAGNITUDE: @ 81CBCB0
 _81CBCC8:
 	end
 _81CBCC9:
-	createtask sub_80E1864, 5, 3, 5, 0, 50
-	createtask sub_80E1864, 5, 3, 4, 0, 50
+	createtask sub_80E1864, 5, 5, 0, 50
+	createtask sub_80E1864, 5, 4, 0, 50
 	panse_1C SE_W070, 63, 8, 10
 	jump _81CBCC8
 _81CBCEE:
-	createtask sub_80E1864, 5, 3, 5, 0, 50
-	createtask sub_80E1864, 5, 3, 4, 0, 50
+	createtask sub_80E1864, 5, 5, 0, 50
+	createtask sub_80E1864, 5, 4, 0, 50
 	panse_1C SE_W070, 63, 8, 10
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
 	pause 16
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, 0, 14, 32767, 14
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14
 	jump _81CBCC8
 
 Move_RAPID_SPIN: @ 81CBD41
 	loadsprite 10135
 	loadsprite 10229
 	monbg 0
-	sprite gBattleAnimSpriteTemplate_84023E8, 2, 6, 0, 0, 32, -32, 40, -2
-	createtask sub_812CDC8, 2, 3, 0, 2, 0
+	sprite gBattleAnimSpriteTemplate_84023E8, 2, 0, 0, 32, -32, 40, -2
+	createtask sub_812CDC8, 2, 0, 2, 0
 	panse_1C SE_W013B, 192, 8, 4
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 2
-	createtask sub_80A9058, 2, 5, 0, 1, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
+	createtask sub_80A9058, 2, 0, 1, 10, 1, 0
 	panse_19 SE_W003, 63
 	wait
 	pause 8
-	createtask sub_812CDC8, 2, 3, 0, 2, 1
+	createtask sub_812CDC8, 2, 0, 2, 1
 	panse_1C SE_W013B, 192, 8, 4
 	wait
 	clearmonbg 0
@@ -3346,21 +3346,21 @@ Move_MOONLIGHT: @ 81CBDAE
 	loadsprite 10195
 	loadsprite 10031
 	setalpha 0, 16
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 16, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83D6FC8, 2, 2, 120, 56
-	createtask sub_8079670, 3, 5, 0, 16, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D6FC8, 2, 120, 56
+	createtask sub_8079670, 3, 0, 16, 16, 0, 1
 	panse_19 SE_W236, 0
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 2, -12, 0
+	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, -12, 0
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 2, -24, 0
+	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, -24, 0
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 2, 21, 0
+	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 21, 0
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 0, 0
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 2, 10, 0
+	sprite gBattleAnimSpriteTemplate_83D6FF8, 40, 10, 0
 	pause 20
 	createtask sub_80CE3EC, 2
 	wait
@@ -3376,7 +3376,7 @@ Move_EXTREME_SPEED: @ 81CBE3E
 	fadetobg 9
 _81CBE55:
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -2304, 0, 1, -1
+	createtask sub_80E3A58, 5, -2304, 0, 1, -1
 	waitbgfadein
 	createtask sub_80D15A4, 2
 	panse_1C SE_W013B, 192, 8, 3
@@ -3389,13 +3389,13 @@ _81CBE55:
 	createtask sub_80D1638, 2
 	pause 2
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB508, 130, 4, 1, 0, -12, 3
+	sprite gBattleAnimSpriteTemplate_83DB508, 130, 1, 0, -12, 3
 	pause 10
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB508, 130, 4, 1, 0, 12, 3
+	sprite gBattleAnimSpriteTemplate_83DB508, 130, 1, 0, 12, 3
 	pause 10
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB508, 130, 4, 1, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DB508, 130, 1, 0, 0, 3
 	wait
 	createtask sub_80D18D4, 2
 	pause 10
@@ -3420,60 +3420,60 @@ Move_UPROAR: @ 81CBEFC
 	loadsprite 10225
 	loadsprite 10203
 	monbg 3
-	createtask sub_80D2CF8, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D79A4, 3, 6, 0, 0, 0, 0, 31, 8
+	createtask sub_80D2CF8, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8
 	panse_19 SE_W253, 192
-	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 4, 0, 29, -12, 0
-	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 4, 0, -12, -29, 1
+	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 29, -12, 0
+	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -12, -29, 1
 	pause 16
-	createtask sub_80D2CF8, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D79A4, 3, 6, 0, 0, 0, 0, 31, 8
+	createtask sub_80D2CF8, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8
 	panse_19 SE_W253, 192
-	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 4, 0, 12, -29, 1
-	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 4, 0, -29, -12, 0
+	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 12, -29, 1
+	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -29, -12, 0
 	pause 16
-	createtask sub_80D2CF8, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D79A4, 3, 6, 0, 0, 0, 0, 31, 8
+	createtask sub_80D2CF8, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8
 	panse_19 SE_W253, 192
-	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 4, 0, 24, -24, 1
-	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 4, 0, -24, -24, 0
+	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 24, -24, 1
+	sprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -24, -24, 0
 	wait
 	clearmonbg 3
 	end
 
 Move_HEAT_WAVE: @ 81CBFC6
 	loadsprite 10261
-	createtask sub_80E2C60, 5, 5, 10261, 0, 6, 6, 31
-	createtask do_boulder_dust, 5, 1, 1
-	createtask sub_80D6080, 6, 2, 6, 31
+	createtask sub_80E2C60, 5, 10261, 0, 6, 6, 31
+	createtask do_boulder_dust, 5, 1
+	createtask sub_80D6080, 6, 6, 31
 	panse_1B SE_W257, 192, 63, 2, 0
 	pause 4
 	createtask sub_80D5DDC, 5
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 10, 2304, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 10, 2304, 96, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 90, 2048, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 90, 2048, 96, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 50, 2560, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 50, 2560, 96, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 20, 2304, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 20, 2304, 96, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 70, 1984, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 70, 1984, 96, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 0, 2816, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 0, 2816, 96, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 60, 2560, 96, 1
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 60, 2560, 96, 1
 	end
 
 Move_HAIL: @ 81CC076
 	loadsprite 10263
 	loadsprite 10141
-	createtask sub_80E2A38, 10, 5, 1, 3, 0, 6, 0
+	createtask sub_80E2A38, 10, 1, 3, 0, 6, 0
 	wait
 	createtask sub_80D8ADC, 5
 	panse_1C SE_W258, 0, 8, 10
 	wait
-	createtask sub_80E2A38, 10, 5, 1, 3, 6, 0, 0
+	createtask sub_80E2A38, 10, 1, 3, 6, 0, 0
 	end
 
 Move_TORMENT: @ 81CC0AE
@@ -3481,11 +3481,11 @@ Move_TORMENT: @ 81CC0AE
 	loadsprite 10209
 	createtask sub_812D008, 2
 	wait
-	createtask sub_8079790, 2, 5, 1, 31, 10, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D7798, 130, 3, 1, -20, -28
+	createtask sub_8079790, 2, 1, 31, 10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7798, 130, 1, -20, -28
 	panse_19 SE_W207B, 63
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D7798, 130, 3, 1, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 130, 1, 20, -28
 	panse_19 SE_W207B, 63
 	end
 
@@ -3515,29 +3515,29 @@ Move_MEMENTO: @ 81CC0F2
 
 Move_FACADE: @ 81CC136
 	loadsprite 10243
-	createtask sub_812FD7C, 2, 2, 0, 3
-	createtask sub_812FFE4, 2, 2, 0, 72
+	createtask sub_812FD7C, 2, 0, 3
+	createtask sub_812FFE4, 2, 0, 72
 	panse_1C SE_W207, 192, 24, 3
 	end
 
 Move_SMELLING_SALT: @ 81CC156
 	loadsprite 10247
 	loadsprite 10255
-	sprite gBattleAnimSpriteTemplate_84029C4, 130, 3, 1, 0, 2
-	sprite gBattleAnimSpriteTemplate_84029C4, 130, 3, 1, 1, 2
+	sprite gBattleAnimSpriteTemplate_84029C4, 130, 1, 0, 2
+	sprite gBattleAnimSpriteTemplate_84029C4, 130, 1, 1, 2
 	pause 32
-	createtask sub_8130918, 3, 2, 1, 2
+	createtask sub_8130918, 3, 1, 2
 	panse_1C SE_W003, 63, 12, 2
 	wait
 	pause 4
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 6, 2
-	sprite gBattleAnimSpriteTemplate_84029F4, 130, 3, 1, 8, 3
+	createtask sub_80A7FA0, 2, 1, 2, 0, 6, 2
+	sprite gBattleAnimSpriteTemplate_84029F4, 130, 1, 8, 3
 	panse_1C SE_W207B, 63, 16, 3
 	end
 
 Move_FOLLOW_ME: @ 81CC1B1
 	loadsprite 10064
-	sprite gBattleAnimSpriteTemplate_83D72E0, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D72E0, 2, 0
 	panse_19 SE_W039, 192
 	pause 18
 	panse_19 SE_W213, 192
@@ -3551,15 +3551,15 @@ Move_CHARGE: @ 81CC1D0
 	loadsprite 10213
 	monbg 0
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 4, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 0
 	wait
-	createtask sub_80D6B3C, 2, 4, 0, 60, 2, 12
+	createtask sub_80D6B3C, 2, 0, 60, 2, 12
 	panse_19 SE_W268, 192
 	pause 30
 	panse_19 SE_W268, 192
 	pause 30
 	panse_19 SE_W268, 192
-	sprite gBattleAnimSpriteTemplate_83D9A6C, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D9A6C, 2, 0
 	pause 25
 	panse_19 SE_W268, 192
 	pause 20
@@ -3570,12 +3570,12 @@ Move_CHARGE: @ 81CC1D0
 	pause 6
 	panse_1C SE_W268, 192, 6, 5
 	wait
-	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 3, 0, 16, 16
+	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, 16, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 3, 0, -16, -16
+	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, -16, -16
 	panse_19 SE_W085B, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 4, 4, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 4, 0, 0
 	clearmonbg 0
 	blendoff
 	end
@@ -3584,53 +3584,53 @@ Move_TAUNT: @ 81CC26B
 	loadsprite 10214
 	loadsprite 10209
 	loadsprite 10087
-	sprite gBattleAnimSpriteTemplate_83D7220, 11, 2, 0, 45
+	sprite gBattleAnimSpriteTemplate_83D7220, 11, 0, 45
 	panse_19 SE_W118, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D7358, 12, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7358, 12, 0
 	pause 4
 	panse_1C SE_W039, 192, 16, 2
 	wait
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D7798, 130, 3, 1, -20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 130, 1, -20, -28
 	panse_19 SE_W207B, 63
 	wait
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D7798, 130, 3, 1, 20, -28
+	sprite gBattleAnimSpriteTemplate_83D7798, 130, 1, 20, -28
 	panse_19 SE_W207B, 63
 	end
 
 Move_HELPING_HAND: @ 81CC2BF
 	loadsprite 10247
 	createtask sub_8130D20, 5
-	sprite gBattleAnimSpriteTemplate_8402A0C, 40, 1, 0
-	sprite gBattleAnimSpriteTemplate_8402A0C, 40, 1, 1
+	sprite gBattleAnimSpriteTemplate_8402A0C, 40, 0
+	sprite gBattleAnimSpriteTemplate_8402A0C, 40, 1
 	pause 19
 	panse_19 SE_W227, 0
-	createtask sub_80A7FA0, 2, 5, 2, 2, 0, 5, 1
+	createtask sub_80A7FA0, 2, 2, 2, 0, 5, 1
 	pause 14
 	panse_19 SE_W227, 0
-	createtask sub_80A7FA0, 2, 5, 2, 2, 0, 5, 1
+	createtask sub_80A7FA0, 2, 2, 2, 0, 5, 1
 	pause 20
 	panse_19 SE_W227, 0
-	createtask sub_80A7FA0, 2, 5, 2, 3, 0, 10, 1
-	createtask sub_8079790, 2, 5, 2, 1023, 12, 1, 1
+	createtask sub_80A7FA0, 2, 2, 3, 0, 10, 1
+	createtask sub_8079790, 2, 2, 1023, 12, 1, 1
 	end
 
 Move_ASSIST: @ 81CC332
 	loadsprite 10252
-	sprite gBattleAnimSpriteTemplate_8402964, 50, 5, 112, -16, 140, 128, 36
+	sprite gBattleAnimSpriteTemplate_8402964, 50, 112, -16, 140, 128, 36
 	pause 2
-	sprite gBattleAnimSpriteTemplate_8402964, 50, 5, 208, 128, -16, 48, 36
+	sprite gBattleAnimSpriteTemplate_8402964, 50, 208, 128, -16, 48, 36
 	panse_19 SE_W010, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_8402964, 50, 5, -16, 112, 256, -16, 36
+	sprite gBattleAnimSpriteTemplate_8402964, 50, -16, 112, 256, -16, 36
 	panse_19 SE_W010, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_8402964, 50, 5, 108, 128, 84, -16, 36
+	sprite gBattleAnimSpriteTemplate_8402964, 50, 108, 128, 84, -16, 36
 	panse_19 SE_W010, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_8402964, 50, 5, -16, 56, 256, 56, 36
+	sprite gBattleAnimSpriteTemplate_8402964, 50, -16, 56, 256, 56, 36
 	panse_19 SE_W010, 0
 	end
 
@@ -3641,26 +3641,26 @@ Move_SUPERPOWER: @ 81CC3A3
 	monbg 2
 	monbgprio_28 0
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DA0FC, 130, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DA0FC, 130, 0
 	panse_19 SE_W025, 192
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 4, 1, 180, 1
-	createtask sub_812B340, 5, 2, 234, 0
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 180, 1
+	createtask sub_812B340, 5, 234, 0
 	pause 40
-	sprite gBattleAnimSpriteTemplate_83DA114, 41, 4, 200, 96, 1, 120
+	sprite gBattleAnimSpriteTemplate_83DA114, 41, 200, 96, 1, 120
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DA114, 41, 4, 20, 248, 4, 112
+	sprite gBattleAnimSpriteTemplate_83DA114, 41, 20, 248, 4, 112
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DA114, 41, 4, 130, 160, 2, 104
+	sprite gBattleAnimSpriteTemplate_83DA114, 41, 130, 160, 2, 104
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DA114, 41, 4, 160, 192, 0, 96
+	sprite gBattleAnimSpriteTemplate_83DA114, 41, 160, 192, 0, 96
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DA114, 41, 4, 60, 288, 3, 88
+	sprite gBattleAnimSpriteTemplate_83DA114, 41, 60, 288, 3, 88
 	pause 74
-	sprite gBattleAnimSpriteTemplate_83DA12C, 131, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DA12C, 131, 0
 	panse_19 SE_W207, 192
 	pause 16
-	createtask sub_80A7FA0, 2, 5, 1, 8, 0, 16, 1
+	createtask sub_80A7FA0, 2, 1, 8, 0, 16, 1
 	panse_19 SE_W025B, 63
 	wait
 	clearmonbg 2
@@ -3676,7 +3676,7 @@ Move_RECYCLE: @ 81CC45E
 	sprite gBattleAnimSpriteTemplate_8402B10, 2
 	panse_1C SE_W036, 192, 24, 3
 	wait
-	createtask sub_8079790, 5, 5, 0, 32767, 12, 2, 1
+	createtask sub_8079790, 5, 0, 32767, 12, 2, 1
 	panse_19 SE_W036, 192
 	wait
 	blendoff
@@ -3693,100 +3693,100 @@ Move_BRICK_BREAK: @ 81CC492
 _81CC4A7:
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 3, 8
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
 	pause 4
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -18, -18, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, -18, -18, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -18, -18, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, -18, -18, 10, 1, 0
 	panse_19 SE_W233, 63
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 3, 8
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 18, 18, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, 18, 18, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 18, 18, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 18, 18, 10, 1, 0
 	panse_19 SE_W233, 63
 	pause 20
-	createtask sub_80A8920, 2, 7, 0, -24, 0, 24, 10, 24, 3
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 6, 0
+	createtask sub_80A8920, 2, 0, -24, 0, 24, 10, 24, 3
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 6, 0
 	pause 37
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, 0, 0, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 0, 0, 10, 1, 0
 	panse_19 SE_W233B, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 6, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 6, 0, 0
 	wait
 	clearmonbg 1
 	end
 _81CC576:
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 3, 8
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DA0A0, 3, 5, 1, 0, 0, 90, 10
+	sprite gBattleAnimSpriteTemplate_83DA0A0, 3, 1, 0, 0, 90, 10
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -18, -18, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, -18, -18, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -18, -18, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, -18, -18, 10, 1, 0
 	panse_19 SE_W233, 63
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 3, 8
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 18, 18, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, 18, 18, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 18, 18, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 18, 18, 10, 1, 0
 	panse_19 SE_W233, 63
 	pause 20
-	createtask sub_80A8920, 2, 7, 0, -24, 0, 24, 10, 24, 3
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 6, 0
+	createtask sub_80A8920, 2, 0, -24, 0, 24, 10, 24, 3
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 6, 0
 	pause 37
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, 0, 0, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 0, 0, 10, 1, 0
 	panse_19 SE_W233B, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 4, 1, 0, -8, -12
-	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 4, 1, 1, 8, -12
-	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 4, 1, 2, -8, 12
-	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 4, 1, 3, 8, 12
+	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 0, -8, -12
+	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 1, 8, -12
+	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 2, -8, 12
+	sprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 3, 8, 12
 	panse_19 SE_W280, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 6, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 6, 0, 0
 	wait
 	clearmonbg 1
 	end
 
 Move_YAWN: @ 81CC697
 	loadsprite 10242
-	createtask sub_812F724, 2, 1, 0
+	createtask sub_812F724, 2, 0
 	panse_19 SE_W281, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_84027EC, 133, 1, 2
+	sprite gBattleAnimSpriteTemplate_84027EC, 133, 2
 	panse_19 SE_W255, 192
 	pause 4
-	sprite gBattleAnimSpriteTemplate_84027EC, 133, 1, 1
+	sprite gBattleAnimSpriteTemplate_84027EC, 133, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_84027EC, 133, 1, 0
+	sprite gBattleAnimSpriteTemplate_84027EC, 133, 0
 	wait
-	createtask sub_812F724, 2, 1, 1
+	createtask sub_812F724, 2, 1
 	panse_19 SE_W281, 63
 	end
 
 Move_ENDEAVOR: @ 81CC6DA
 	loadsprite 10243
 	loadsprite 10135
-	createtask sub_812FD7C, 2, 2, 0, 2
+	createtask sub_812FD7C, 2, 0, 2
 	panse_1C SE_W039, 192, 24, 2
-	createtask sub_8079790, 5, 5, 0, 703, 12, 1, 2
+	createtask sub_8079790, 5, 0, 703, 12, 1, 2
 	pause 6
-	createtask sub_80A9058, 5, 5, 0, 1, 8, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 12, -12, 1, 2
+	createtask sub_80A9058, 5, 0, 1, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 12, -12, 1, 2
 	panse_19 SE_W003, 63
 	pause 24
-	createtask sub_80A9058, 5, 5, 0, 1, 8, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -12, 12, 1, 2
+	createtask sub_80A9058, 5, 0, 1, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -12, 12, 1, 2
 	panse_19 SE_W004, 63
 	end
 
 Move_ERUPTION: @ 81CC74F
 	loadsprite 10201
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 31, 2, 0, 4, 31
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 2, 0, 4, 31
 	wait
 	createtask sub_80D5470, 2
 	panse_1D SE_W153, 192, 60
@@ -3795,29 +3795,29 @@ Move_ERUPTION: @ 81CC74F
 	panse_1D SE_W153, 192, 60
 	wait
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 5, 200, -32, 0, 100, 0
-	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 5, 30, -32, 16, 90, 1
-	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 5, 150, -32, 32, 60, 2
-	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 5, 90, -32, 48, 80, 3
-	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 5, 110, -32, 64, 50, 0
-	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 5, 60, -32, 80, 70, 1
+	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 200, -32, 0, 100, 0
+	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 30, -32, 16, 90, 1
+	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 150, -32, 32, 60, 2
+	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 90, -32, 48, 80, 3
+	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 110, -32, 64, 50, 0
+	sprite gBattleAnimSpriteTemplate_83D96F8, 40, 60, -32, 80, 70, 1
 	pause 22
-	createtask sub_80E1864, 5, 3, 5, 8, 60
-	createtask sub_80E1864, 5, 3, 4, 8, 60
+	createtask sub_80E1864, 5, 5, 8, 60
+	createtask sub_80E1864, 5, 4, 8, 60
 	panse_1C SE_W088, 63, 16, 12
 	pause 80
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 40, 5, 31, 4, 4, 0, 31
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 40, 31, 4, 4, 0, 31
 	end
 
 Move_SKILL_SWAP: @ 81CC81C
 	loadsprite 10251
 	call Unknown_81D61E7
-	createtask sub_80DC0B0, 3, 1, 1
-	createtask sub_8079790, 5, 5, 1, 32767, 12, 3, 1
+	createtask sub_80DC0B0, 3, 1
+	createtask sub_8079790, 5, 1, 32767, 12, 3, 1
 	panse_1C SE_W179, 192, 24, 3
 	pause 16
-	createtask sub_80DC0B0, 3, 1, 0
-	createtask sub_8079790, 5, 5, 0, 32767, 12, 3, 1
+	createtask sub_80DC0B0, 3, 0
+	createtask sub_8079790, 5, 0, 32767, 12, 3, 1
 	wait
 	call Unknown_81D61F3
 	end
@@ -3832,8 +3832,8 @@ Move_IMPRISON: @ 81CC867
 	panse_1C SE_W030, 192, 8, 5
 	wait
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DA8F4, 5, 2, 0, 40
-	createtask sub_80E1864, 5, 3, 4, 1, 10
+	sprite gBattleAnimSpriteTemplate_83DA8F4, 5, 0, 40
+	createtask sub_80E1864, 5, 4, 1, 10
 	panse_19 SE_W063, 192
 	clearmonbg 3
 	call Unknown_81D61F3
@@ -3861,15 +3861,15 @@ Move_CAMOUFLAGE: @ 81CC8D2
 	monbg 2
 	monbgprio_28 0
 	setalpha 16, 0
-	createtask sub_80E2B74, 5, 4, 2, 3, 0, 14
+	createtask sub_80E2B74, 5, 2, 3, 0, 14
 	pause 16
-	createtask sub_80DFC24, 2, 1, 4
+	createtask sub_80DFC24, 2, 4
 	panse_19 SE_W185, 192
 	wait
 	pause 8
-	createtask sub_80E2B74, 5, 4, 2, 0, 0, 0
+	createtask sub_80E2B74, 5, 2, 0, 0, 0
 	wait
-	createtask sub_80DFD24, 2, 1, 1
+	createtask sub_80DFD24, 2, 1
 	wait
 	blendoff
 	clearmonbg 2
@@ -3879,13 +3879,13 @@ Move_TAIL_GLOW: @ 81CC918
 	loadsprite 10212
 	monbg 0
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 4, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83DAC10, 66, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DAC10, 66, 0
 	pause 18
 	panse_1C SE_W234, 192, 16, 6
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 4, 4, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 4, 0, 0
 	clearmonbg 0
 	blendoff
 	pause 1
@@ -3901,33 +3901,33 @@ Move_LUSTER_PURGE: @ 81CC95B
 	monbg 0
 	setalpha 12, 8
 	panse_19 SE_W076, 192
-	sprite gBattleAnimSpriteTemplate_83DA9E0, 41, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA9E0, 41, 0, 0, 0, 0
 	pause 20
-	createtask sub_80E2A7C, 5, 5, 5, 2, 0, 16, -1
-	createtask sub_80E2C60, 5, 5, 10267, 2, 0, 16, -1
+	createtask sub_80E2A7C, 5, 5, 2, 0, 16, -1
+	createtask sub_80E2C60, 5, 10267, 2, 0, 16, -1
 	wait
-	createtask sub_80E2C60, 5, 5, 10135, 0, 12, 12, 23552
+	createtask sub_80E2C60, 5, 10135, 0, 12, 12, 23552
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 2
-	createtask sub_812B30C, 5, 2, 215, 63
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
+	createtask sub_812B30C, 5, 215, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 2
-	createtask sub_812B30C, 5, 2, 215, 63
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
+	createtask sub_812B30C, 5, 215, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 2
-	createtask sub_812B30C, 5, 2, 215, 63
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
+	createtask sub_812B30C, 5, 215, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 2
-	createtask sub_812B30C, 5, 2, 215, 63
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
+	createtask sub_812B30C, 5, 215, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 2
-	createtask sub_812B30C, 5, 2, 215, 63
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
+	createtask sub_812B30C, 5, 215, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 2
-	createtask sub_812B30C, 5, 2, 215, 63
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
+	createtask sub_812B30C, 5, 215, 63
 	wait
-	createtask sub_80E2A7C, 5, 5, 5, 2, 16, 0, -1
-	createtask sub_80E1864, 5, 3, 1, 5, 14
+	createtask sub_80E2A7C, 5, 5, 2, 16, 0, -1
+	createtask sub_80E1864, 5, 1, 5, 14
 	wait
 	clearmonbg 0
 	blendoff
@@ -3939,19 +3939,19 @@ Move_MIST_BALL: @ 81CCA72
 	loadsprite 10270
 	pause 0
 	panse_19 SE_W081, 192
-	sprite gBattleAnimSpriteTemplate_83D9D80, 128, 6, 0, 0, 0, 0, 30, 0
+	sprite gBattleAnimSpriteTemplate_83D9D80, 128, 0, 0, 0, 0, 30, 0
 	wait
 	panse_19 SE_W028, 63
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 10, 0
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 0, 7, 1, 1, 1, 32279, 16, 32767, 16
+	createtask sub_80A7E7C, 2, 1, 5, 0, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 0, 1, 1, 1, 32279, 16, 32767, 16
 	pause 0
 	panse_19 SE_W114, 0
 	createtask sub_80D8414, 5
-	createtask sub_80E2A38, 10, 5, 4, 3, 0, 16, 32767
+	createtask sub_80E2A38, 10, 4, 3, 0, 16, 32767
 	pause 8
-	createtask sub_80A7E7C, 2, 5, 1, 4, 0, 70, 0
+	createtask sub_80A7E7C, 2, 1, 4, 0, 70, 0
 	pause 70
-	createtask sub_80E2A38, 10, 5, 4, 2, 16, 0, 32767
+	createtask sub_80E2A38, 10, 4, 2, 16, 0, 32767
 	end
 
 Move_FEATHER_DANCE: @ 81CCB01
@@ -3960,18 +3960,18 @@ Move_FEATHER_DANCE: @ 81CCB01
 	monbgprio_29
 	panse_19 SE_W080, 63
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 64, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 64, 2, 104, 11304, 32, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 32, 2, 104, 11304, 32, 1
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 0, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 32, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 0, 2, 104, 11304, 32, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 224, 2, 104, 11304, 32, 1
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 128, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 224, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 128, 2, 104, 11304, 32, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 192, 2, 104, 11304, 32, 1
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 160, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 192, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 160, 2, 104, 11304, 32, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA498, 128, 8, 0, -16, 96, 2, 104, 11304, 32, 1
+	sprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 96, 2, 104, 11304, 32, 1
 	wait
 	clearmonbg 3
 	end
@@ -3980,66 +3980,66 @@ Move_TEETER_DANCE: @ 81CCBD1
 	loadsprite 10072
 	loadsprite 10073
 	createtask sub_813219C, 5
-	sprite gBattleAnimSpriteTemplate_83D715C, 2, 3, 0, 16, -2
+	sprite gBattleAnimSpriteTemplate_83D715C, 2, 0, 16, -2
 	panse_19 SE_W298, 192
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83D715C, 2, 3, 0, 0, -2
+	sprite gBattleAnimSpriteTemplate_83D715C, 2, 0, 0, -2
 	panse_19 SE_W298, 192
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83D715C, 2, 3, 0, -16, -2
+	sprite gBattleAnimSpriteTemplate_83D715C, 2, 0, -16, -2
 	panse_19 SE_W298, 192
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83D715C, 2, 3, 1, -8, -2
+	sprite gBattleAnimSpriteTemplate_83D715C, 2, 1, -8, -2
 	panse_19 SE_W298, 192
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83D715C, 2, 3, 2, 8, -2
+	sprite gBattleAnimSpriteTemplate_83D715C, 2, 2, 8, -2
 	panse_19 SE_W298, 192
 	end
 
 Move_MUD_SPORT: @ 81CCC3C
 	loadsprite 10074
-	createtask sub_80D074C, 2, 2, 0, 6
+	createtask sub_80D074C, 2, 0, 6
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 0, -4, -16
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 0, 4, -12
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 0, -4, -16
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 0, 4, -12
 	panse_19 SE_W091, 192
 	pause 32
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 0, -3, -12
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 0, 5, -14
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 0, -3, -12
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 0, 5, -14
 	panse_19 SE_W091, 192
 	pause 32
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 0, -5, -18
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 0, 3, -14
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 0, -5, -18
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 0, 3, -14
 	panse_19 SE_W091, 192
 	pause 16
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 220, 60
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 220, 60
 	panse_1D SE_W145B, 0, 15
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 60, 100
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 60, 100
 	panse_1D SE_W145B, 0, 25
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 140, 55
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 140, 55
 	panse_1D SE_W145B, 0, 14
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 180, 50
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 180, 50
 	panse_1D SE_W145B, 0, 10
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 20, 90
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 20, 90
 	panse_1D SE_W145B, 0, 22
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 90, 90
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 90, 90
 	panse_1D SE_W145B, 0, 22
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 160, 60
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 160, 60
 	panse_1D SE_W145B, 0, 15
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 30, 90
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 30, 90
 	panse_1D SE_W145B, 0, 22
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 120, 60
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 120, 60
 	panse_1D SE_W145B, 0, 15
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB334, 130, 3, 1, 200, 40
+	sprite gBattleAnimSpriteTemplate_83DB334, 130, 1, 200, 40
 	panse_1D SE_W145B, 0, 10
 	end
 
@@ -4048,47 +4048,47 @@ Move_NEEDLE_ARM: @ 81CCD73
 	loadsprite 10135
 	loadsprite 10143
 	panse_1C SE_W030, 63, 2, 16
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 0, -32, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 0, -32, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 22, -22, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 22, -22, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 30, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 30, 0, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 20, 20, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 20, 20, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 0, 28, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 0, 28, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, -19, 19, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, -19, 19, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, -27, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, -27, 0, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, -18, -18, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, -18, -18, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 0, -25, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 0, -25, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 17, -17, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 17, -17, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 23, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 23, 0, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 0, 16, 16, 16
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 16, 16, 16
 	wait
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 18, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 0, 0, 8, 1, 0
+	createtask sub_80A7FA0, 2, 1, 4, 0, 18, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, 0, -24, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, 17, -17, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, 24, 0, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, 17, 17, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, 0, 24, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, -17, 17, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, -24, 0, 10
-	sprite gBattleAnimSpriteTemplate_83D6994, 130, 5, 1, 1, -17, -17, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 0, -24, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 17, -17, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 24, 0, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 17, 17, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 0, 24, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, -17, 17, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, -24, 0, 10
+	sprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, -17, -17, 10
 	end
 
 Move_SLACK_OFF: @ 81CCF23
 	loadsprite 10031
-	createtask sub_813257C, 2, 1, 0
+	createtask sub_813257C, 2, 0
 	panse_19 SE_W281, 192
 	wait
 	call Unknown_81D5EF5
@@ -4101,15 +4101,15 @@ Move_CRUSH_CLAW: @ 81CCF3B
 	loadsprite 10208
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 4
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 18, 1
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, -10, -10, 0
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, -10, 10, 0
+	createtask sub_80A7FA0, 2, 1, 2, 0, 18, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, -10, -10, 0
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, -10, 10, 0
 	panse_19 SE_W013, 63
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, 10, -10, 1
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, 10, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, 10, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, 10, 10, 1
 	panse_19 SE_W013, 63
 	wait
 	wait
@@ -4122,37 +4122,37 @@ Move_AROMATHERAPY: @ 81CCFAB
 	loadsprite 10159
 	loadsprite 10203
 	loadsprite 10049
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 1, 0, 0, 7, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 0, 0, 7, 13293
 	pause 1
 	monbg 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 7, 24, 16, 0, 2, 2, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D68B8, 66, 7, 64, 24, 0, 3, 1, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D68D0, 0, 7, 16, 24, 0, 2, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 24, 16, 0, 2, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 66, 64, 24, 0, 3, 1, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D68D0, 0, 16, 24, 0, 2, 1, 0, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D68B8, 66, 7, 48, 12, 0, 4, 3, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 7, 100, 16, 0, 3, 2, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 7, 74, 24, 180, 3, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 66, 48, 12, 0, 4, 3, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 100, 16, 0, 3, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 74, 24, 180, 3, 2, 0, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D68B8, 66, 7, 80, 30, 0, 4, 1, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 7, 128, 12, 0, 3, 3, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D68D0, 0, 7, 90, 16, 0, 2, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 66, 80, 30, 0, 4, 1, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D68B8, 0, 128, 12, 0, 3, 3, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D68D0, 0, 90, 16, 0, 2, 1, 0, 0
 	wait
 	clearmonbg 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 1, 0, 7, 0, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 0, 7, 0, 13293
 	pause 1
 	panse_19 SE_W287, 192
-	createtask sub_81300A4, 2, 1, 1
+	createtask sub_81300A4, 2, 1
 	wait
 	panse_19 SE_W234, 192
-	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, 7, -15, 0, 0, 0, 32, 60, 1
+	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, -15, 0, 0, 0, 32, 60, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, 7, 12, -5, 0, 0, 32, 60, 1
+	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, 12, -5, 0, 0, 32, 60, 1
 	wait
 	panse_19 SE_REAPOKE, 192
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 43, 3, 10, 0, 13293
-	sprite gBattleAnimSpriteTemplate_83D7974, 16, 4, 0, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 43, 3, 10, 0, 13293
+	sprite gBattleAnimSpriteTemplate_83D7974, 16, 0, 0, 0, 1
 	wait
 	end
 
@@ -4160,22 +4160,22 @@ Move_FAKE_TEARS: @ 81CD10D
 	loadsprite 10155
 	loadsprite 10209
 	loadsprite 10072
-	createtask sub_80E2C60, 5, 5, 10155, 0, 4, 4, 32108
+	createtask sub_80E2C60, 5, 10155, 0, 4, 4, 32108
 	wait
-	createtask sub_812E568, 5, 3, 0, 2, 1
+	createtask sub_812E568, 5, 0, 2, 1
 	panse_1C SE_W039, 192, 12, 4
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 2
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 2
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 3
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 2
-	sprite gBattleAnimSpriteTemplate_83DB238, 2, 2, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 2
+	sprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 3
 	wait
 	end
 
@@ -4187,13 +4187,13 @@ Move_AIR_CUTTER: @ 81CD19D
 	monbg 3
 	setalpha 12, 8
 	pause 0
-	createtask sub_80CFB04, 2, 5, 32, -24, 1536, 2, 128
+	createtask sub_80CFB04, 2, 32, -24, 1536, 2, 128
 	wait
 	panse_19 SE_W015, 63
-	sprite gBattleAnimSpriteTemplate_83D6B40, 2, 4, 40, -32, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D6B40, 2, 40, -32, 0, 2
 	pause 5
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
-	createtask sub_80A7FA0, 2, 5, 3, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 3, 2, 0, 8, 1
 	wait
 	blendoff
 	clearmonbg 3
@@ -4204,69 +4204,69 @@ Move_ODOR_SLEUTH: @ 81CD1FF
 	monbg 1
 	createtask sub_81316F8, 5
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 3, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 4
 	panse_19 SE_W207, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 3, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 4
 	panse_19 SE_W207, 192
 	wait
 	clearmonbg 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 3, 1, -1, 16, -1, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, -1, 16, -1, 0
 	panse_19 SE_W043, 192
 	end
 
 Move_GRASS_WHISTLE: @ 81CD249
 	loadsprite 10072
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 4, 13298
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 13298
 	wait
 	createtask sub_80CEA20, 2
 	wait
 	panse_1B SE_W320, 192, 63, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 7, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 7, 1, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 6, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 6, 1, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 1, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 1, 1, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 1, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 3, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 5, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 6, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 6, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 2, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 1, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 1, 1, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D7114, 130, 3, 5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7114, 130, 5, 1, 0
 	pause 4
 	wait
 	createtask sub_80CEAD8, 2
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 4, 4, 0, 13298
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 4, 0, 13298
 	wait
 	end
 
 Move_TICKLE: @ 81CD33C
 	loadsprite 10218
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, 0, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 0, 0, 16, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 2, -16, -8
-	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 2, 16, -8
+	sprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8
+	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 16, -8
 	panse_19 SE_W197, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, 0, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 0, 16, 0, 0
 	wait
 	pause 20
-	createtask sub_80A8B88, 3, 5, 0, 6, 1280, 3, 0
+	createtask sub_80A8B88, 3, 0, 6, 1280, 3, 0
 	pause 12
-	createtask sub_812E568, 3, 3, 1, 6, 2
+	createtask sub_812E568, 3, 1, 6, 2
 	panse_1C SE_W039, 63, 8, 8
 	wait
 	end
@@ -4295,13 +4295,13 @@ Move_SHADOW_PUNCH: @ 81CD3D6
 	waitbgfadein
 	monbg 2
 	setalpha 9, 8
-	createtask sub_807A69C, 2, 2, 0, 13
+	createtask sub_807A69C, 2, 0, 13
 	panse_19 SE_W026, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 0, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
 	panse_19 SE_W004, 63
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
 	clearmonbg 2
 	blendoff
@@ -4313,16 +4313,16 @@ Move_EXTRASENSORY: @ 81CD431
 	call Unknown_81D61E7
 	monbg 3
 	setalpha 12, 8
-	createtask sub_8079790, 5, 5, 0, 891, 12, 1, 1
-	createtask sub_80DC2D4, 5, 1, 0
+	createtask sub_8079790, 5, 0, 891, 12, 1, 1
+	createtask sub_80DC2D4, 5, 0
 	panse_19 SE_W020, 63
 	wait
-	createtask sub_8079790, 5, 5, 0, 891, 12, 1, 1
-	createtask sub_80DC2D4, 5, 1, 1
+	createtask sub_8079790, 5, 0, 891, 12, 1, 1
+	createtask sub_80DC2D4, 5, 1
 	panse_19 SE_W020, 63
 	wait
-	createtask sub_80DC4F4, 5, 1, 0
-	createtask sub_80DC2D4, 5, 1, 2
+	createtask sub_80DC4F4, 5, 0
+	createtask sub_80DC2D4, 5, 2
 	panse_19 SE_W043, 192
 	wait
 	blendoff
@@ -4334,13 +4334,13 @@ Move_AERIAL_ACE: @ 81CD499
 	loadsprite 10138
 	monbg 1
 	setalpha 12, 8
-	createtask sub_80A8500, 2, 5, 0, 24, 6, 1, 5
-	createtask sub_80E2DD8, 2, 4, 0, 4, 7, 3
-	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 3, 40, -32, 0
+	createtask sub_80A8500, 2, 0, 24, 6, 1, 5
+	createtask sub_80E2DD8, 2, 0, 4, 7, 3
+	sprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 0
 	panse_19 SE_W013B, 192
 	pause 5
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 10, 1
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 0, 10, 0, 0
+	createtask sub_80A7E7C, 2, 1, 0, 3, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 10, 0, 0
 	panse_19 SE_W013, 63
 	wait
 	clearmonbg 1
@@ -4349,8 +4349,8 @@ Move_AERIAL_ACE: @ 81CD499
 
 Move_IRON_DEFENSE: @ 81CD503
 	panse_1C SE_REAPOKE, 192, 28, 2
-	createtask sub_80E0A4C, 5, 3, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 1, 8, 2, -1, 14, -1, 0
+	createtask sub_80E0A4C, 5, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 8, 2, -1, 14, -1, 0
 	wait
 	end
 
@@ -4362,10 +4362,10 @@ Move_BLOCK: @ 81CD52D
 
 Move_HOWL: @ 81CD53C
 	loadsprite 10053
-	createtask sub_812F724, 2, 1, 0
+	createtask sub_812F724, 2, 0
 	pause 12
 	call _81CE35E
-	createtask sub_812B18C, 2, 2, 0, 3
+	createtask sub_812B18C, 2, 0, 3
 	wait
 	pause 30
 	end
@@ -4383,17 +4383,17 @@ Move_BULK_UP: @ 81CD55E
 Move_COVET: @ 81CD57C
 	loadsprite 10210
 	loadsprite 10224
-	createtask sub_812E568, 5, 3, 0, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, 0, 20
+	createtask sub_812E568, 5, 0, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20
 	panse_19 SE_W204, 192
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, -20, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, -20, 20
 	panse_19 SE_W204, 192
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, 20, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20
 	panse_19 SE_W204, 192
 	wait
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	panse_1C SE_W146, 63, 4, 3
 	end
 
@@ -4403,7 +4403,7 @@ Move_VOLT_TACKLE: @ 81CD5D9
 	loadsprite 10213
 	monbg 0
 	setalpha 12, 8
-	createtask sub_80E2A38, 10, 5, 1, 0, 0, 8, 0
+	createtask sub_80E2A38, 10, 1, 0, 0, 8, 0
 	wait
 	sprite gBattleAnimSpriteTemplate_83D9AB4, 1
 	panse_19 SE_W268, 192
@@ -4411,36 +4411,36 @@ Move_VOLT_TACKLE: @ 81CD5D9
 	clearmonbg 0
 	blendoff
 	pause 8
-	createtask sub_80D700C, 5, 1, 0
+	createtask sub_80D700C, 5, 0
 	panse_19 SE_W085, 192
 	wait
-	createtask sub_80D700C, 5, 1, 1
+	createtask sub_80D700C, 5, 1
 	panse_19 SE_W085, 63
 	wait
-	createtask sub_80D700C, 5, 1, 2
+	createtask sub_80D700C, 5, 2
 	panse_19 SE_W085, 192
 	wait
-	createtask sub_80D700C, 5, 1, 3
+	createtask sub_80D700C, 5, 3
 	panse_19 SE_W085, 63
 	wait
-	createtask sub_80D700C, 5, 1, 4
+	createtask sub_80D700C, 5, 4
 	panse_19 SE_W085, 192
 	pause 8
-	createtask sub_80A7FA0, 2, 5, 1, 10, 0, 18, 1
+	createtask sub_80A7FA0, 2, 1, 10, 0, 18, 1
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 3, 1, 16, 16
+	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 1, 16, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 3, 1, -16, -16
+	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 1, -16, -16
 	pause 8
 	createtask sub_80D6E9C, 5
 	wait
-	createtask sub_80A7FA0, 2, 5, 0, 3, 0, 9, 1
+	createtask sub_80A7FA0, 2, 0, 3, 0, 9, 1
 	panse_19 SE_W085B, 192
-	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 3, 0, 16, 16
+	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, 16, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 3, 0, -16, -16
+	sprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, -16, -16
 	wait
-	createtask sub_80E2A38, 10, 5, 1, 0, 8, 0, 0
+	createtask sub_80E2A38, 10, 1, 0, 8, 0, 0
 	wait
 	end
 
@@ -4460,22 +4460,22 @@ Move_WATER_SPORT: @ 81CD6D1
 Move_CALM_MIND: @ 81CD6F7
 	loadsprite 10203
 	monbg 2
-	createtask sub_80E2A7C, 5, 5, 0, 0, 0, 16, 0
+	createtask sub_80E2A7C, 5, 0, 0, 0, 16, 0
 	wait
-	createtask sub_80E3BDC, 5, 1, 1
+	createtask sub_80E3BDC, 5, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83D795C, 40, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D795C, 40, 0, 0, 0, 0
 	panse_19 SE_W048, 192
 	pause 14
-	sprite gBattleAnimSpriteTemplate_83D795C, 40, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D795C, 40, 0, 0, 0, 0
 	panse_19 SE_W048, 192
 	pause 14
-	sprite gBattleAnimSpriteTemplate_83D795C, 40, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D795C, 40, 0, 0, 0, 0
 	panse_19 SE_W048, 192
 	wait
-	createtask sub_80E3BDC, 5, 1, 0
+	createtask sub_80E3BDC, 5, 0
 	wait
-	createtask sub_80E2A7C, 5, 5, 0, 0, 16, 0, 0
+	createtask sub_80E2A7C, 5, 0, 0, 16, 0, 0
 	wait
 	clearmonbg 2
 	end
@@ -4485,20 +4485,20 @@ Move_LEAF_BLADE: @ 81CD775
 	loadsprite 10285
 	createtask sub_80CBDF4, 5
 	pause 2
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	panse_19 SE_W015, 63
 	pause 50
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	panse_19 SE_W015, 63
 	pause 50
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	panse_19 SE_W015, 63
 	wait
 	monbg 1
 	setalpha 12, 8
 	pause 12
-	createtask sub_80A7FA0, 2, 5, 1, 8, 0, 18, 1
-	sprite gBattleAnimSpriteTemplate_83DB520, 130, 4, 0, 0, 1, 36
+	createtask sub_80A7FA0, 2, 1, 8, 0, 18, 1
+	sprite gBattleAnimSpriteTemplate_83DB520, 130, 0, 0, 1, 36
 	panse_19 SE_W043, 63
 	wait
 	clearmonbg 1
@@ -4513,13 +4513,13 @@ Move_DRAGON_DANCE: @ 81CD7F8
 	createtask sub_80DF924, 5
 	panse_19 SE_W100, 192
 	pause 8
-	createtask sub_80798AC, 5, 5, 10249, 19456, 14, 0, 3
-	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 1, 43
-	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 1, 85
-	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 1, 128
-	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 1, 170
-	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 1, 213
+	createtask sub_80798AC, 5, 10249, 19456, 14, 0, 3
+	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 0
+	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 43
+	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 85
+	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 128
+	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 170
+	sprite gBattleAnimSpriteTemplate_83DB0E8, 2, 213
 	pause 30
 	panse_19 SE_W100, 192
 	pause 30
@@ -4536,9 +4536,9 @@ Move_SHOCK_WAVE: @ 81CD867
 	loadsprite 10037
 	monbg 0
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 4, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 4, 0
 	wait
-	createtask sub_80D6B3C, 2, 4, 0, 20, 0, 2
+	createtask sub_80D6B3C, 2, 0, 20, 0, 2
 	panse_19 SE_W268, 192
 	pause 12
 	sprite gBattleAnimSpriteTemplate_83D9B28, 2
@@ -4549,11 +4549,11 @@ Move_SHOCK_WAVE: @ 81CD867
 	createtask sub_80D759C, 5
 	panse_19 SE_W161B, 63
 	wait
-	createtask sub_80A7E7C, 2, 5, 1, 0, 6, 18, 1
-	createtask sub_80E2A38, 5, 5, 1, 3, 16, 0, 32767
-	createtask sub_80E2A38, 5, 5, 4, 0, 16, 16, 0
+	createtask sub_80A7E7C, 2, 1, 0, 6, 18, 1
+	createtask sub_80E2A38, 5, 1, 3, 16, 0, 32767
+	createtask sub_80E2A38, 5, 4, 0, 16, 16, 0
 	pause 4
-	createtask sub_80E2A38, 5, 5, 4, 0, 0, 0, 0
+	createtask sub_80E2A38, 5, 4, 0, 0, 0, 0
 	wait
 	clearmonbg 0
 	blendoff
@@ -4561,7 +4561,7 @@ Move_SHOCK_WAVE: @ 81CD867
 
 Move_HARDEN: @ 81CD909
 	panse_1C SE_W231, 192, 28, 2
-	createtask sub_80E0A4C, 5, 3, 0, 0, 0
+	createtask sub_80E0A4C, 5, 0, 0, 0
 	wait
 	end
 
@@ -4571,39 +4571,39 @@ Move_BELLY_DRUM: @ 81CD91E
 	createtask sub_80CEA20, 2
 	wait
 	call _81CD9EB
-	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 0, 0, 0, 0
 	panse_19 SE_W187, 192
 	pause 15
 	call _81CD9D0
-	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 4, 1, 1, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 1, 1, 1, 0
 	panse_19 SE_W187, 192
 	pause 15
 	call _81CD9EB
-	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 4, 0, 3, 3, 128
+	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 0, 3, 3, 128
 	panse_19 SE_W187, 192
 	pause 7
 	call _81CD9D0
-	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 4, 1, 2, 0, 128
+	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 1, 2, 0, 128
 	panse_19 SE_W187, 192
 	pause 7
 	call _81CD9EB
-	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 4, 0, 1, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 0, 1, 1, 0
 	panse_19 SE_W187, 192
 	pause 7
 	call _81CD9D0
-	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 4, 1, 0, 3, 0
+	sprite gBattleAnimSpriteTemplate_83D71A8, 2, 1, 0, 3, 0
 	panse_19 SE_W187, 192
 	wait
 	createtask sub_80CEAD8, 2
 	wait
 	end
 _81CD9D0:
-	sprite gBattleAnimSpriteTemplate_83D7174, 3, 1, 0
-	createtask sub_80A7E7C, 2, 5, 0, 0, 8, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D7174, 3, 0
+	createtask sub_80A7E7C, 2, 0, 0, 8, 2, 1
 	ret
 _81CD9EB:
-	sprite gBattleAnimSpriteTemplate_83D7174, 3, 1, 1
-	createtask sub_80A7E7C, 2, 5, 0, 0, 8, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D7174, 3, 1
+	createtask sub_80A7E7C, 2, 0, 0, 8, 2, 1
 	ret
 
 Move_MIND_READER: @ 81CDA06
@@ -4612,36 +4612,36 @@ Move_MIND_READER: @ 81CDA06
 	loadsprite 10191
 	monbg 4
 	panse_19 SE_W109, 63
-	sprite gBattleAnimSpriteTemplate_84021DC, 5, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_84021DC, 5, 0, 0, 1, 0
 	sprite gBattleAnimSpriteTemplate_84021F4, 5
 	pause 40
 	panse_19 SE_W043, 63
-	createtask sub_80E1F8C, 2, 6, 1, 1, 2, 0, 10, 0
+	createtask sub_80E1F8C, 2, 1, 1, 2, 0, 10, 0
 	call _81CDA4D
 	wait
 	clearmonbg 4
 	end
 _81CDA4D:
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 70, 0, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 40, 40, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 10, -60, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -50, -40, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -40, 40, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 50, -50, 6
-	pause 2
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 50, -30, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 60, 10, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 0, 60, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 0, -40, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -60, 20, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -60, -30, 6
-	pause 2
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -50, 50, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -60, 20, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, -40, -40, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 20, -60, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 50, -50, 6
-	sprite gBattleAnimSpriteTemplate_840220C, 4, 3, 35, 40, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 70, 0, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 40, 40, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 10, -60, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -50, -40, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -40, 40, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 50, -50, 6
+	pause 2
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 50, -30, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 60, 10, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 0, 60, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 0, -40, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -60, 20, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -60, -30, 6
+	pause 2
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -50, 50, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -60, 20, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, -40, -40, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 20, -60, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 50, -50, 6
+	sprite gBattleAnimSpriteTemplate_840220C, 4, 35, 40, 6
 	pause 2
 	ret
 
@@ -4651,32 +4651,32 @@ Move_ICE_PUNCH: @ 81CDB3E
 	loadsprite 10141
 	loadsprite 10135
 	loadsprite 10143
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 7, 0
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 9, 32588
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 7, 0
+	createtask sub_80E2A38, 10, 4, 2, 0, 9, 32588
 	pause 20
 	panse_19 SE_W081, 63
-	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 1, 64
-	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 1, 128
-	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 1, 192
+	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 64
+	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 128
+	sprite gBattleAnimSpriteTemplate_83D9BF8, 2, 192
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 1, 32
-	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 1, 96
-	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 1, 160
-	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 1, 224
+	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 32
+	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 96
+	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 160
+	sprite gBattleAnimSpriteTemplate_83D9BE0, 2, 224
 	pause 17
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 4, 5, 0, -10, 8, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, -10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 4, 0, -10, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, -10, 1, 1
 	panse_19 SE_W004, 63
 	pause 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 3, 1
+	createtask sub_80A7E7C, 5, 1, 0, 5, 3, 1
 	wait
 	pause 15
 	call Unknown_81D5C36
 	pause 5
-	createtask sub_80E2A38, 10, 5, 4, 2, 9, 0, 32588
+	createtask sub_80E2A38, 10, 4, 2, 9, 0, 32588
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 7, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 7, 0, 0
 	wait
 	clearmonbg 3
 	blendoff
@@ -4685,11 +4685,11 @@ Move_ICE_PUNCH: @ 81CDB3E
 Move_REST: @ 81CDC29
 	panse_19 SE_W173, 192
 	loadsprite 10228
-	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 5, 4, -10, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 5, 4, -10, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 5, 4, -10, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0
 	wait
 	end
 
@@ -4697,12 +4697,12 @@ Move_CONFUSION: @ 81CDC69
 	monbg 3
 	call Unknown_81D61E7
 	setalpha 8, 8
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 10, 1
-	createtask sub_80E1F8C, 2, 6, 2, 0, 2, 0, 8, 32767
+	createtask sub_80A7FA0, 2, 0, 1, 0, 10, 1
+	createtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767
 	wait
 	panse_19 SE_W048, 63
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 15, 1
-	createtask sub_80A8D34, 5, 5, -4, -4, 15, 1, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 15, 1
+	createtask sub_80A8D34, 5, -4, -4, 15, 1, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -4714,12 +4714,12 @@ Move_PSYCHIC: @ 81CDCCA
 	monbg 3
 	call Unknown_81D61E7
 	setalpha 8, 8
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 10, 1
-	createtask sub_80E1F8C, 2, 6, 2, 0, 2, 0, 8, 767
+	createtask sub_80A7FA0, 2, 0, 1, 0, 10, 1
+	createtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 767
 	wait
 	panse_1C SE_W048, 63, 10, 3
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 15, 1
-	createtask sub_80A8D34, 5, 5, -6, -6, 15, 1, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 15, 1
+	createtask sub_80A8D34, 5, -6, -6, 15, 1, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -4740,8 +4740,8 @@ _81CDD3B:
 	call Unknown_81D61E7
 	setalpha 8, 8
 	panse_19 SE_W048, 192
-	createtask sub_80E1F8C, 2, 6, 2, 0, 2, 0, 8, 32767
-	createtask sub_80A8D34, 5, 5, -4, -4, 15, 0, 1
+	createtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767
+	createtask sub_80A8D34, 5, -4, -4, 15, 0, 1
 	wait
 	clearmonbg 2
 	blendoff
@@ -4754,10 +4754,10 @@ Unknown_81CDD7A: @ 81CDD7A
 	setalpha 8, 8
 	panse_19 SE_W048, 63
 	panse_1D SE_W048, 63, 8
-	createtask sub_80A7E7C, 2, 5, 1, 4, 0, 15, 1
-	createtask sub_80A8D34, 5, 5, -5, -5, 15, 1, 1
+	createtask sub_80A7E7C, 2, 1, 4, 0, 15, 1
+	createtask sub_80A8D34, 5, -5, -5, 15, 1, 1
 	wait
-	createtask sub_80A7E7C, 2, 5, 1, 4, 0, 24, 1
+	createtask sub_80A7E7C, 2, 1, 4, 0, 24, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -4767,53 +4767,53 @@ Move_THUNDER: @ 81CDDCE
 	loadsprite 10037
 	fadetobg 11
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -256, 0, 1, -1
+	createtask sub_80E3A58, 5, -256, 0, 1, -1
 	waitbgfadein
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 16, 0
 	pause 16
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	panse_19 SE_W086, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 16, -36
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 16, -36
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 16, -20
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 16, -20
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 16, 12
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 16, 12
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83D97D0, 134, 2, -16, -32
+	sprite gBattleAnimSpriteTemplate_83D97D0, 134, -16, -32
 	panse_19 SE_W086, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 134, 2, -16, -16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 134, -16, -16
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 134, 2, -16, 16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 134, -16, 16
 	panse_19 SE_W086, 63
 	pause 5
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 24, -32
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 24, -32
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 24, -16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 24, -16
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 24, 16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 24, 16
 	pause 30
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 5
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, -32
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -32
 	panse_19 SE_W161B, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, -16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -16
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, 16
 	pause 10
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
-	createtask sub_80D60B4, 2, 4, 30, 3, 1, 0
+	createtask sub_80D60B4, 2, 30, 3, 1, 0
 	pause 2
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 130, 5, 1, 2, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 130, 1, 2, 16, 0, 0
 	wait
 	restorebg
 	waitbgfadeout
@@ -4827,27 +4827,27 @@ Move_THUNDER_PUNCH: @ 81CDF28
 	loadsprite 10037
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 16, 0
 	wait
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 0, 0, 8, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
 	pause 1
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, -48
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -48
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 2, 2, 0, -16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 2, 0, -16
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 2, 2, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 2, 0, 16
 	pause 1
 	panse_19 SE_W161B, 63
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 2
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 15, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 0, 3, 15, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 0
 	pause 20
 	wait
 	clearmonbg 1
@@ -4858,56 +4858,56 @@ Move_SACRED_FIRE: @ 81CDFF1
 	loadsprite 10033
 	loadsprite 10035
 	panse_1C SE_W221, 192, 7, 5
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -32, 0, 50, 5, -2, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -32, 0, 50, 5, -2, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, -20, -10, 50, 5, -1, -1
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, -20, -10, 50, 5, -1, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 0, -16, 50, 5, 0, -1
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 0, -16, 50, 5, 0, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 20, -10, 50, 5, 1, -1
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 20, -10, 50, 5, 1, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, 32, 0, 50, 5, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, 32, 0, 50, 5, 2, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, 20, 10, 50, 5, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, 20, 10, 50, 5, 1, 1
 	pause 1
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, 0, 16, 50, 5, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, 0, 16, 50, 5, 0, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -20, 10, 50, 5, -1, 1
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -20, 10, 50, 5, -1, 1
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
 	wait
 	panse_19 SE_W221B, 63
-	sprite gBattleAnimSpriteTemplate_83D9508, 130, 6, -16, 0, 70, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9508, 130, -16, 0, 70, 16, 0, 1
 	pause 10
 	panse_19 SE_W221B, 63
-	sprite gBattleAnimSpriteTemplate_83D9508, 130, 6, 0, 0, 70, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9508, 130, 0, 0, 70, 16, 0, 1
 	pause 10
 	panse_19 SE_W221B, 63
-	sprite gBattleAnimSpriteTemplate_83D9508, 130, 6, 16, 0, 80, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9508, 130, 16, 0, 80, 16, 0, 1
 	pause 1
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
 	wait
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 1
 	panse_19 SE_W172B, 63
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, -1, 0
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 0, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, -1, -1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 2, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 1, -1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 1, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, -1, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 1, -2
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 1, -2
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 3, 1
 	wait
 	end
 
@@ -4916,8 +4916,8 @@ Move_SCRATCH: @ 81CE1D8
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W010, 63
-	sprite gBattleAnimSpriteTemplate_8402180, 2, 4, 0, 0, 1, 0
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_8402180, 2, 0, 0, 1, 0
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -4929,31 +4929,31 @@ Move_DRAGON_BREATH: @ 81CE20A
 	monbg 3
 	monbgprio_28 1
 	panse_1C SE_W172, 192, 7, 7
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	createtask sub_80E2A38, 10, 5, 4, 1, 0, 9, 31
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	createtask sub_80E2A38, 10, 4, 1, 0, 9, 31
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 21, 1
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	createtask sub_80A7FA0, 2, 1, 2, 0, 21, 1
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB044, 130, 5, 0, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20
 	wait
-	createtask sub_80E2A38, 10, 5, 4, 1, 9, 0, 31
+	createtask sub_80E2A38, 10, 4, 1, 9, 0, 31
 	wait
 	clearmonbg 3
 	end
@@ -4963,11 +4963,11 @@ Move_ROAR: @ 81CE31E
 	monbg 0
 	monbgprio_28 0
 	setalpha 8, 8
-	createtask sub_812B18C, 2, 2, 0, 2
-	createtask sub_80A8D34, 5, 5, -5, -5, 10, 0, 1
+	createtask sub_812B18C, 2, 0, 2
+	createtask sub_80A8D34, 5, -5, -5, 10, 0, 1
 	call _81CE35E
 	pause 20
-	createtask sub_80A8A80, 5, 2, 1, 2
+	createtask sub_80A8A80, 5, 1, 2
 	wait
 	clearmonbg 0
 	blendoff
@@ -4975,22 +4975,22 @@ Move_ROAR: @ 81CE31E
 	pause 20
 	end
 _81CE35E:
-	sprite gBattleAnimSpriteTemplate_8402934, 2, 3, 24, -8, 0
-	sprite gBattleAnimSpriteTemplate_8402934, 2, 3, 24, 0, 2
-	sprite gBattleAnimSpriteTemplate_8402934, 2, 3, 24, 8, 1
+	sprite gBattleAnimSpriteTemplate_8402934, 2, 24, -8, 0
+	sprite gBattleAnimSpriteTemplate_8402934, 2, 24, 0, 2
+	sprite gBattleAnimSpriteTemplate_8402934, 2, 24, 8, 1
 	pause 15
-	sprite gBattleAnimSpriteTemplate_8402934, 2, 3, 24, -8, 0
-	sprite gBattleAnimSpriteTemplate_8402934, 2, 3, 24, 0, 2
-	sprite gBattleAnimSpriteTemplate_8402934, 2, 3, 24, 8, 1
+	sprite gBattleAnimSpriteTemplate_8402934, 2, 24, -8, 0
+	sprite gBattleAnimSpriteTemplate_8402934, 2, 24, 0, 2
+	sprite gBattleAnimSpriteTemplate_8402934, 2, 24, 8, 1
 	ret
 
 Move_GROWL: @ 81CE3AF
 	loadsprite 10053
-	createtask sub_812B18C, 2, 2, 0, 255
+	createtask sub_812B18C, 2, 0, 255
 	call _81CE35E
 	pause 10
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 9, 1
-	createtask sub_80A7FA0, 2, 5, 3, 1, 0, 9, 1
+	createtask sub_80A7FA0, 2, 1, 1, 0, 9, 1
+	createtask sub_80A7FA0, 2, 3, 1, 0, 9, 1
 	wait
 	pause 20
 	end
@@ -5008,12 +5008,12 @@ Move_SNORE: @ 81CE3EA
 	end
 _81CE403:
 	panse_19 SE_W173, 192
-	createtask sub_80A8D34, 5, 5, -7, -7, 7, 0, 1
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 7, 1
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 5, 6, 1, 14, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D77F8, 2, 7, 0, 0, -42, -38, 24, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D77F8, 2, 7, 0, 0, 0, -42, 24, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D77F8, 2, 7, 0, 0, 42, -38, 24, 0, 0
+	createtask sub_80A8D34, 5, -7, -7, 7, 0, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, 6, 1, 14, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D77F8, 2, 0, 0, -42, -38, 24, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D77F8, 2, 0, 0, 0, -42, 24, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D77F8, 2, 0, 0, 42, -38, 24, 0, 0
 	ret
 
 Move_LIGHT_SCREEN: @ 81CE47A
@@ -5021,7 +5021,7 @@ Move_LIGHT_SCREEN: @ 81CE47A
 	loadsprite 10166
 	setalpha 0, 16
 	panse_1D SE_W115, 192, 15
-	sprite gBattleAnimSpriteTemplate_83DA6A8, 1, 3, 40, 0, 10166
+	sprite gBattleAnimSpriteTemplate_83DA6A8, 1, 40, 0, 10166
 	pause 10
 	call _81CE4A1
 	wait
@@ -5029,24 +5029,24 @@ Move_LIGHT_SCREEN: @ 81CE47A
 	blendoff
 	end
 _81CE4A1:
-	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 4, 23, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 23, 0, 0, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 4, 31, -8, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 31, -8, 0, 1
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 4, 30, 20, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 30, 20, 0, 1
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 4, 10, -15, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 10, -15, 0, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 4, 20, 10, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 20, 10, 0, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 4, 10, 18, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA76C, 2, 10, 18, 0, 1
 	ret
 
 Move_MIRROR_COAT: @ 81CE506
 	loadsprite 10070
 	loadsprite 10168
 	setalpha 0, 16
-	sprite gBattleAnimSpriteTemplate_83DA6D8, 1, 3, 40, 0, 10168
+	sprite gBattleAnimSpriteTemplate_83DA6D8, 1, 40, 0, 10168
 	pause 10
 	panse_19 SE_W115, 192
 	call _81CE4A1
@@ -5060,13 +5060,13 @@ Move_REFLECT: @ 81CE52C
 	loadsprite 10167
 	setalpha 0, 16
 	panse_1D SE_W115, 192, 15
-	sprite gBattleAnimSpriteTemplate_83DA6C0, 1, 3, 40, 0, 10167
+	sprite gBattleAnimSpriteTemplate_83DA6C0, 1, 40, 0, 10167
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83DA73C, 2, 4, 30, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA73C, 2, 30, 0, 0, 1
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83DA73C, 2, 4, 19, -12, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA73C, 2, 19, -12, 0, 1
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83DA73C, 2, 4, 10, 20, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA73C, 2, 10, 20, 0, 1
 	wait
 	pause 1
 	blendoff
@@ -5076,7 +5076,7 @@ Move_BARRIER: @ 81CE57F
 	loadsprite 10169
 	setalpha 0, 16
 	panse_1D SE_W112, 192, 15
-	sprite gBattleAnimSpriteTemplate_83DA6F0, 3, 3, 40, 0, 10169
+	sprite gBattleAnimSpriteTemplate_83DA6F0, 3, 40, 0, 10169
 	wait
 	pause 1
 	blendoff
@@ -5088,27 +5088,27 @@ Move_BUBBLE: @ 81CE59C
 	monbg 1
 	setalpha 12, 8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 15, -15, 10, 128, 100
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 15, -15, 10, 128, 100
 	panse_19 SE_W145, 192
 	panse_1D SE_W145B, 63, 100
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 35, 37, 40, 128, 100
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 35, 37, 40, 128, 100
 	panse_19 SE_W145, 192
 	panse_1D SE_W145B, 63, 100
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 10, -37, 30, 128, 100
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 10, -37, 30, 128, 100
 	panse_19 SE_W145, 192
 	panse_1D SE_W145B, 63, 100
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 30, 10, 15, 128, 100
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 30, 10, 15, 128, 100
 	panse_19 SE_W145, 192
 	panse_1D SE_W145B, 63, 100
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 20, 33, 20, 128, 100
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 20, 33, 20, 128, 100
 	panse_19 SE_W145, 192
 	panse_1D SE_W145B, 63, 100
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D9178, 2, 7, 18, 0, 25, -30, 10, 128, 100
+	sprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 25, -30, 10, 128, 100
 	panse_19 SE_W145, 192
 	panse_1D SE_W145B, 63, 100
 	wait
@@ -5133,15 +5133,15 @@ Move_SMOG: @ 81CE672
 	call _81CE6D7
 	pause 120
 	panse_1C SE_W092, 63, 18, 2
-	createtask sub_80E1F8C, 2, 6, 4, 2, 2, 0, 12, 26650
+	createtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 26650
 	pause 10
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 15, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 15, 1
 	wait
 	clearmonbg 3
 	blendoff
 	end
 _81CE6D7:
-	sprite gBattleAnimSpriteTemplate_83D9D54, 2, 6, 0, -24, 48, 240, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D9D54, 2, 0, -24, 48, 240, 1, 0
 	pause 7
 	ret
 
@@ -5152,8 +5152,8 @@ Move_FAINT_ATTACK: @ 81CE6ED
 	waitbgfadein
 	pause 0
 	panse_19 SE_W185, 192
-	createtask sub_80A8500, 2, 5, 0, 18, 6, 1, 3
-	createtask sub_80DFC24, 2, 1, 1
+	createtask sub_80A8500, 2, 0, 18, 6, 1, 3
+	createtask sub_80DFC24, 2, 1
 	wait
 	clearmonbg 0
 	invisible 0
@@ -5163,8 +5163,8 @@ Move_FAINT_ATTACK: @ 81CE6ED
 	setalpha 12, 8
 	pause 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 1
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 9, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 9, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -5173,7 +5173,7 @@ Move_FAINT_ATTACK: @ 81CE6ED
 	pause 32
 	createtask sub_80DFDC0, 2
 	monbg 0
-	createtask sub_80DFD24, 2, 1, 1
+	createtask sub_80DFD24, 2, 1
 	wait
 	clearmonbg 0
 	pause 1
@@ -5187,9 +5187,9 @@ Move_SAND_ATTACK: @ 81CE774
 	monbgprio_28 0
 	setalpha 12, 8
 	panse_19 SE_W028, 192
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, -10, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -10, 0, 0, 3
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 2
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 2
 	call _81CE7C4
 	call _81CE7C4
 	call _81CE7C4
@@ -5201,20 +5201,20 @@ Move_SAND_ATTACK: @ 81CE774
 	blendoff
 	end
 _81CE7C4:
-	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 5, 15, 15, 20, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 5, 15, 15, 20, 10, 10
-	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 5, 15, 15, 20, -10, -10
-	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 5, 15, 15, 20, 20, 5
-	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 5, 15, 15, 20, -20, -5
+	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 15, 15, 20, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 15, 15, 20, 10, 10
+	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 15, 15, 20, -10, -10
+	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 15, 15, 20, 20, 5
+	sprite gBattleAnimSpriteTemplate_83DB2F8, 130, 15, 15, 20, -20, -5
 	pause 2
 	ret
 
 Move_MUD_SLAP: @ 81CE81C
 	loadsprite 10074
 	panse_19 SE_W028, 192
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, -10, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -10, 0, 0, 3
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 2
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 2
 	call _81CE862
 	call _81CE862
 	call _81CE862
@@ -5224,11 +5224,11 @@ Move_MUD_SLAP: @ 81CE81C
 	wait
 	end
 _81CE862:
-	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 5, 15, 15, 20, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 5, 15, 15, 20, 10, 5
-	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 5, 15, 15, 20, -10, -5
-	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 5, 15, 15, 20, 20, 10
-	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 5, 15, 15, 20, -20, -10
+	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 15, 15, 20, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 15, 15, 20, 10, 5
+	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 15, 15, 20, -10, -5
+	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 15, 15, 20, 20, 10
+	sprite gBattleAnimSpriteTemplate_83DB31C, 130, 15, 15, 20, -20, -10
 	pause 2
 	ret
 
@@ -5236,45 +5236,45 @@ Move_DRAGON_RAGE: @ 81CE8BA
 	loadsprite 10029
 	loadsprite 10035
 	panse_19 SE_W082, 192
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 40, 1
+	createtask sub_80A7E7C, 5, 0, 0, 2, 40, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 130, 5, 0, 15, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 130, 0, 15, 0, 0, 4
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB0D0, 130, 5, 30, 15, 0, 10, 10
+	sprite gBattleAnimSpriteTemplate_83DB0D0, 130, 30, 15, 0, 10, 10
 	wait
 	panse_1C SE_W172B, 63, 11, 3
-	createtask sub_80A7E7C, 5, 5, 1, 0, 3, 25, 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 194, 3, 1, 5, 0
+	createtask sub_80A7E7C, 5, 1, 0, 3, 25, 1
+	sprite gBattleAnimSpriteTemplate_83DB078, 194, 1, 5, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 194, 3, 1, -10, -15
+	sprite gBattleAnimSpriteTemplate_83DB078, 194, 1, -10, -15
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 130, 3, 1, 0, 25
+	sprite gBattleAnimSpriteTemplate_83DB078, 130, 1, 0, 25
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 194, 3, 1, 15, 5
+	sprite gBattleAnimSpriteTemplate_83DB078, 194, 1, 15, 5
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 194, 3, 1, -25, 0
+	sprite gBattleAnimSpriteTemplate_83DB078, 194, 1, -25, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 130, 3, 1, 30, 30
+	sprite gBattleAnimSpriteTemplate_83DB078, 130, 1, 30, 30
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 130, 3, 1, -27, 25
+	sprite gBattleAnimSpriteTemplate_83DB078, 130, 1, -27, 25
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB078, 194, 3, 1, 0, 8
+	sprite gBattleAnimSpriteTemplate_83DB078, 194, 1, 0, 8
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 194, 3, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 194, 0, 0, 4
 	wait
 	end
 
 Move_RAIN_DANCE: @ 81CE997
 	loadsprite 10115
 	panse_19 SE_W240, 192
-	createtask sub_80E2A38, 10, 5, 1921, 2, 0, 4, 0
+	createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0
 	wait
-	createtask sub_80D30F0, 2, 3, 0, 3, 120
-	createtask sub_80D30F0, 2, 3, 0, 3, 120
+	createtask sub_80D30F0, 2, 0, 3, 120
+	createtask sub_80D30F0, 2, 0, 3, 120
 	pause 120
 	pause 30
 	wait
-	createtask sub_80E2A38, 10, 5, 1921, 2, 4, 0, 0
+	createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0
 	wait
 	end
 
@@ -5284,11 +5284,11 @@ Move_BITE: @ 81CE9E2
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W044, 63
-	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 6, 0, -32, 0, 0, 819, 10
-	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 6, 0, 32, 4, 0, -819, 10
+	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 0, -32, 0, 0, 819, 10
+	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 0, 32, 4, 0, -819, 10
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 4, 7, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 5, 1, 0, 4, 7, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -5303,18 +5303,18 @@ Move_CRUNCH: @ 81CEA40
 	waitbgfadein
 	setalpha 12, 8
 	panse_19 SE_W044, 63
-	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 6, -32, -32, 1, 819, 819, 10
-	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 6, 32, 32, 5, -819, -819, 10
+	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, -32, -32, 1, 819, 819, 10
+	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 32, 32, 5, -819, -819, 10
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -8, 0, 1, 1
-	createtask sub_80A7E7C, 5, 5, 1, 0, 7, 5, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -8, 0, 1, 1
+	createtask sub_80A7E7C, 5, 1, 0, 7, 5, 2
 	wait
 	panse_19 SE_W044, 63
-	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 6, 32, -32, 7, -819, 819, 10
-	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 6, -32, 32, 3, 819, -819, 10
+	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, 32, -32, 7, -819, 819, 10
+	sprite gBattleAnimSpriteTemplate_83DB1D0, 2, -32, 32, 3, 819, -819, 10
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 8, 0, 1, 1
-	createtask sub_80A7E7C, 5, 5, 1, 0, 8, 4, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 8, 0, 1, 1
+	createtask sub_80A7E7C, 5, 1, 0, 8, 4, 2
 	wait
 	clearmonbg 1
 	blendoff
@@ -5329,11 +5329,11 @@ Move_CLAMP: @ 81CEAF0
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W011, 63
-	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, 6, -32, 0, 2, 819, 0, 10
-	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, 6, 32, 0, 6, -819, 0, 10
+	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, -32, 0, 2, 819, 0, 10
+	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, 32, 0, 6, -819, 0, 10
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 5, 1, 3, 0, 5, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -5345,17 +5345,17 @@ Move_ICE_BEAM: @ 81CEB4D
 	monbgprio_28 1
 	setalpha 12, 8
 	loadsprite 10141
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 7, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 7, 0
 	wait
-	createtask_1F sub_812B058, 7, 183, -64, 63, 4, 4, 0, 10
-	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 5, 20, 12, 0, 12, 20
-	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 5, 20, -12, 0, -12, 20
+	createtask_1F sub_812B058, 183, -64, 63, 4, 4, 0, 10
+	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 20, 12, 0, 12, 20
+	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 20, -12, 0, -12, 20
 	pause 1
 	call _81CEC4E
 	call _81CEC4E
 	call _81CEC4E
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 4, -31, 0, 7, 32384
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 25, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 4, -31, 0, 7, 32384
+	createtask sub_80A7FA0, 2, 1, 2, 0, 25, 1
 	call _81CEC4E
 	call _81CEC4E
 	call _81CEC4E
@@ -5364,23 +5364,23 @@ Move_ICE_BEAM: @ 81CEB4D
 	call _81CEC4E
 	call _81CEC4E
 	call _81CEC4E
-	sprite gBattleAnimSpriteTemplate_83D9C24, 2, 5, 20, 0, 0, 0, 11
+	sprite gBattleAnimSpriteTemplate_83D9C24, 2, 20, 0, 0, 0, 11
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9C24, 2, 5, 20, 0, 0, 0, 11
+	sprite gBattleAnimSpriteTemplate_83D9C24, 2, 20, 0, 0, 0, 11
 	wait
 	pause 20
 	call Unknown_81D5C36
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 4, 5, 7, 0, 32384
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 4, 5, 7, 0, 32384
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 7, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 7, 0, 0
 	wait
 	clearmonbg 1
 	blendoff
 	end
 _81CEC4E:
-	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 5, 20, 12, 0, 12, 20
-	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 5, 20, -12, 0, -12, 20
-	sprite gBattleAnimSpriteTemplate_83D9C24, 2, 5, 20, 0, 0, 0, 11
+	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 20, 12, 0, 12, 20
+	sprite gBattleAnimSpriteTemplate_83D9C3C, 2, 20, -12, 0, -12, 20
+	sprite gBattleAnimSpriteTemplate_83D9C24, 2, 20, 0, 0, 0, 11
 	pause 1
 	ret
 
@@ -5396,15 +5396,15 @@ Move_AURORA_BEAM: @ 81CEC91
 	waitbgfadein
 	panse_19 SE_W062, 192
 	setvar 7, 0
-	createtask sub_80D3490, 10, 1, 130
+	createtask sub_80D3490, 10, 130
 	call _81CED18
-	createtask sub_80A7FA0, 5, 5, 1, 1, 0, 17, 1
+	createtask sub_80A7FA0, 5, 1, 1, 0, 17, 1
 	call _81CED18
 	call _81CED18
 	call _81CED18
 	setvar 7, -1
-	createtask_1F sub_812B058, 7, 183, -64, 63, 3, 6, 0, 10
-	createtask sub_80A7FA0, 5, 5, 1, 2, 0, 40, 1
+	createtask_1F sub_812B058, 183, -64, 63, 3, 6, 0, 10
+	createtask sub_80A7FA0, 5, 1, 2, 0, 40, 1
 	call _81CED18
 	call _81CED18
 	call _81CED18
@@ -5416,13 +5416,13 @@ Move_AURORA_BEAM: @ 81CEC91
 	waitbgfadein
 	end
 _81CED18:
-	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 5, 20, 0, 0, 0, 17
+	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 20, 0, 0, 0, 17
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 5, 20, 0, 0, 0, 17
+	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 20, 0, 0, 0, 17
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 5, 20, 0, 0, 0, 17
+	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 20, 0, 0, 0, 17
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 5, 20, 0, 0, 0, 17
+	sprite gBattleAnimSpriteTemplate_83D91C4, 130, 20, 0, 0, 0, 17
 	pause 1
 	ret
 
@@ -5435,7 +5435,7 @@ _81CED71:
 _81CED73:
 	monbg 2
 	setalpha 12, 8
-	createtask sub_80E1F8C, 2, 6, 2, 1, 4, 0, 11, 12287
+	createtask sub_80E1F8C, 2, 2, 1, 4, 0, 11, 12287
 	panse_19 SE_W025, 192
 	call _81CED9D
 	wait
@@ -5443,75 +5443,75 @@ _81CED73:
 	blendoff
 	jump _81CED71
 _81CED9D:
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 40, 40, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 40, 40, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -40, -40, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -40, -40, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 0, 40, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 0, 40, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 0, -40, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 0, -40, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 40, -20, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 40, -20, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 40, 20, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 40, 20, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -40, -20, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -40, -20, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -40, 20, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -40, 20, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -20, 30, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -20, 30, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 20, -30, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 20, -30, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -20, -30, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -20, -30, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 20, 30, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 20, 30, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -40, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -40, 0, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 40, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 40, 0, 16
 	pause 2
 	ret
 _81CEE70:
 	call Unknown_81D6233
 	panse_1B SE_W076, 192, 63, 2, 0
 	createtask sub_80CA928, 5
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 1
 	pause 4
-	createtask sub_80E2A38, 10, 5, 4, 1, 0, 10, 1017
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 2
+	createtask sub_80E2A38, 10, 4, 1, 0, 10, 1017
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 2
 	pause 4
-	createtask sub_80A7FA0, 5, 5, 1, 2, 0, 65, 1
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 3
+	createtask sub_80A7FA0, 5, 1, 2, 0, 65, 1
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 3
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 4
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 4
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 5
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 5
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 6
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 6
 	pause 4
 	call _81CEF42
 	call _81CEF42
 	wait
-	createtask sub_80E2A38, 10, 5, 4, 1, 10, 0, 1017
+	createtask sub_80E2A38, 10, 4, 1, 10, 0, 1017
 	call Unknown_81D626D
 	jump _81CED71
 _81CEF42:
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 2
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 2
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 3
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 3
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 4
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 4
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 5
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 5
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D6304, 131, 4, 15, 0, 20, 6
+	sprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 6
 	pause 4
 	ret
 
@@ -5523,7 +5523,7 @@ Move_BLIZZARD: @ 81CEFBA
 	fadetobg 9
 _81CEFD0:
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -2304, 0, 1, -1
+	createtask sub_80E3A58, 5, -2304, 0, 1, -1
 	waitbgfadein
 	wait
 	panse_1B SE_W059, 192, 63, 2, 0
@@ -5541,26 +5541,26 @@ _81CEFD0:
 	waitbgfadein
 	end
 _81CF00A:
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -10, 0, -10, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, 0, 0, 0, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -10, 0, -10, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, 0, 0, 0, 80, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -15, 0, -15, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, -10, 0, -10, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -15, 0, -15, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, -10, 0, -10, 80, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -5, 0, -5, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, 10, 0, 10, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -5, 0, -5, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, 10, 0, 10, 80, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -10, 0, -10, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, -20, 0, -20, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -10, 0, -10, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, -20, 0, -20, 80, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -20, 0, -20, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, 15, 0, 15, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -20, 0, -20, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, 15, 0, 15, 80, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -15, 0, -15, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, -20, 0, -20, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -15, 0, -15, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, -20, 0, -20, 80, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 6, 0, -25, 0, -25, 72, 1
-	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 8, 0, 20, 0, 20, 80, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9CA8, 40, 0, -25, 0, -25, 72, 1
+	sprite gBattleAnimSpriteTemplate_83D9CC0, 40, 0, 20, 0, 20, 80, 0, 0, 1
 	pause 3
 	ret
 _81CF13F:
@@ -5570,7 +5570,7 @@ _81CF13F:
 Move_POWDER_SNOW: @ 81CF146
 	loadsprite 10141
 	monbg 3
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 31, 1, 0, 3, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 1, 0, 3, 0
 	wait
 	panse_1B SE_W016, 192, 63, 2, 0
 	call _81CF190
@@ -5582,22 +5582,22 @@ Move_POWDER_SNOW: @ 81CF146
 	wait
 	clearmonbg 3
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 31, 1, 3, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 1, 3, 0, 0
 	end
 _81CF190:
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, 0, 0, 0, 56, 4, 4, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, 0, 0, 0, 56, 4, 4, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, -10, 0, -10, 56, 4, 4, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, -10, 0, -10, 56, 4, 4, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, 10, 0, 10, 56, -4, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, 10, 0, 10, 56, -4, 3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, -20, 0, -20, 56, -4, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, -20, 0, -20, 56, -4, 5, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, 15, 0, 15, 56, 4, 4, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, 15, 0, 15, 56, 4, 4, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, -20, 0, -20, 56, 4, 4, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, -20, 0, -20, 56, 4, 4, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 8, 0, 20, 0, 20, 56, 4, 4, 1
+	sprite gBattleAnimSpriteTemplate_83D9CD8, 40, 0, 20, 0, 20, 56, 4, 4, 1
 	pause 3
 	ret
 
@@ -5607,14 +5607,14 @@ Move_HYDRO_PUMP: @ 81CF240
 	monbg 3
 	monbgprio_28 1
 	setalpha 12, 8
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 40, 1
+	createtask sub_80A7E7C, 5, 0, 0, 2, 40, 1
 	pause 6
 	panse_1B SE_W056, 192, 63, 2, 0
-	createtask sub_80D3630, 5, 1, 100
+	createtask sub_80D3630, 5, 100
 	call _81CF2DF
 	call _81CF2DF
 	call _81CF2DF
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 37, 1
+	createtask sub_80A7E7C, 5, 1, 3, 0, 37, 1
 	call _81CF320
 	call _81CF2DF
 	call _81CF2DF
@@ -5636,34 +5636,34 @@ Move_HYDRO_PUMP: @ 81CF240
 	blendoff
 	end
 _81CF2DF:
-	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 4, 10, 10, 0, 16
-	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 4, 10, 10, 0, -16
+	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 10, 10, 0, -16
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 4, 10, 10, 0, 16
-	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 4, 10, 10, 0, -16
+	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D91F4, 3, 10, 10, 0, -16
 	pause 1
 	ret
 _81CF320:
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 4, 0, 15, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 4, 0, -15, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 15, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, -15, 1, 1
 	ret
 
 Move_SIGNAL_BEAM: @ 81CF33F
 	loadsprite 10264
 	loadsprite 10265
 	loadsprite 10073
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 25, 1
+	createtask sub_80A7E7C, 5, 0, 0, 2, 25, 1
 	pause 6
 	panse_1B SE_W062, 192, 63, 1, 0
-	createtask sub_80D3630, 5, 1, 100
+	createtask sub_80D3630, 5, 100
 	call _81CF406
 	call _81CF406
 	call _81CF406
 	call _81CF406
 	call _81CF406
 	call _81CF406
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 25, 1
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 4, 8, 5, 31, 8, 961, 8
+	createtask sub_80A7E7C, 5, 1, 3, 0, 25, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 4, 8, 5, 31, 8, 961, 8
 	call _81CF406
 	call _81CF406
 	call _81CF406
@@ -5684,8 +5684,8 @@ Move_SIGNAL_BEAM: @ 81CF33F
 	wait
 	end
 _81CF406:
-	sprite gBattleAnimSpriteTemplate_83D9224, 131, 4, 10, 10, 0, 16
-	sprite gBattleAnimSpriteTemplate_83D923C, 131, 4, 10, 10, 0, -16
+	sprite gBattleAnimSpriteTemplate_83D9224, 131, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D923C, 131, 10, 10, 0, -16
 	pause 1
 	ret
 
@@ -5696,12 +5696,12 @@ Move_ABSORB: @ 81CF427
 	monbg 3
 	monbgprio_2A 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 4, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 13293
 	wait
 	panse_19 SE_W071, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
 	pause 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 5, 1
+	createtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
 	wait
 	pause 3
 	call _81CF496
@@ -5709,35 +5709,35 @@ Move_ABSORB: @ 81CF427
 	pause 15
 	call Unknown_81D5EF5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 4, 0, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 4, 0, 13293
 	wait
 	clearmonbg 3
 	blendoff
 	end
 _81CF496:
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
 	pause 4
 	panse_19 SE_W152, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -20, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35
 	pause 4
 	ret
 
@@ -5748,12 +5748,12 @@ Move_MEGA_DRAIN: @ 81CF53F
 	monbg 3
 	monbgprio_2A 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 8, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 8, 13293
 	wait
 	panse_19 SE_W071, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
 	pause 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 5, 1
+	createtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
 	wait
 	pause 3
 	call _81CF5AE
@@ -5761,43 +5761,43 @@ Move_MEGA_DRAIN: @ 81CF53F
 	pause 15
 	call Unknown_81D5EF5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 8, 0, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 8, 0, 13293
 	wait
 	clearmonbg 3
 	blendoff
 	end
 _81CF5AE:
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -20, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
 	pause 4
 	panse_19 SE_W145C, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -20, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35
 	pause 4
 	ret
 
@@ -5808,12 +5808,12 @@ Move_GIGA_DRAIN: @ 81CF6CF
 	monbg 3
 	monbgprio_2A 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 12, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 12, 13293
 	wait
 	panse_19 SE_W071, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
 	pause 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 5, 1
+	createtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
 	wait
 	pause 3
 	call _81CF73E
@@ -5821,51 +5821,51 @@ Move_GIGA_DRAIN: @ 81CF6CF
 	pause 15
 	call Unknown_81D5EF5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 12, 0, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 12, 0, 13293
 	wait
 	clearmonbg 3
 	blendoff
 	end
 _81CF73E:
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -40, 35
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -40, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 28, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 40, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 28, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 40, 39
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -32, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -32, 26
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -40, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -40, 26
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 36, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 36, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
 	pause 4
 	panse_19 SE_W202, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -20, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35
 	pause 4
 	ret
 
@@ -5879,21 +5879,21 @@ Move_LEECH_LIFE: @ 81CF8D7
 	monbgprio_2A 1
 	setalpha 12, 8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DAB10, 2, 3, -20, 15, 12
+	sprite gBattleAnimSpriteTemplate_83DAB10, 2, -20, 15, 12
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
 	panse_19 SE_W071, 63
 	pause 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 5, 1
+	createtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 7, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 7, 0
 	wait
 	call _81CF496
 	wait
 	pause 15
 	call Unknown_81D5EF5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 7, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 7, 0, 0
 	wait
 	clearmonbg 3
 	blendoff
@@ -5902,7 +5902,7 @@ Move_LEECH_LIFE: @ 81CF8D7
 Move_SYNTHESIS: @ 81CF959
 	loadsprite 10031
 	loadsprite 10049
-	createtask sub_80E1F8C, 2, 6, 2, 2, 2, 0, 16, 19451
+	createtask sub_80E1F8C, 2, 2, 2, 2, 0, 16, 19451
 	panse_19 SE_W025, 192
 	call Unknown_81D5ECA
 	wait
@@ -5921,16 +5921,16 @@ Move_TOXIC: @ 81CF983
 	wait
 	end
 _81CF99D:
-	sprite gBattleAnimSpriteTemplate_83DA244, 130, 4, -24, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA244, 130, -24, 16, 1, 1
 	panse_19 SE_W092, 63
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DA244, 130, 4, 8, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA244, 130, 8, 16, 1, 1
 	panse_19 SE_W092, 63
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DA244, 130, 4, -8, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA244, 130, -8, 16, 1, 1
 	panse_19 SE_W092, 63
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83DA244, 130, 4, 24, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA244, 130, 24, 16, 1, 1
 	panse_19 SE_W092, 63
 	pause 15
 	ret
@@ -5938,10 +5938,10 @@ _81CF99D:
 Move_SLUDGE: @ 81CF9F2
 	loadsprite 10150
 	panse_19 SE_W145C, 192
-	sprite gBattleAnimSpriteTemplate_83DA2B8, 130, 4, 20, 0, 40, 0
+	sprite gBattleAnimSpriteTemplate_83DA2B8, 130, 20, 0, 40, 0
 	wait
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 5, 1
-	createtask sub_80E1F8C, 2, 6, 4, 1, 2, 0, 12, 31774
+	createtask sub_80A7E7C, 5, 1, 3, 0, 5, 1
+	createtask sub_80E1F8C, 2, 4, 1, 2, 0, 12, 31774
 	call Unknown_81D5F87
 	wait
 	end
@@ -5958,24 +5958,24 @@ Move_SLUDGE_BOMB: @ 81CFA34
 	call _81CFB44
 	call _81CFB44
 	call _81CFB44
-	createtask sub_80A7FA0, 5, 5, 1, 3, 0, 15, 1
-	createtask sub_80E1F8C, 2, 6, 4, 1, 2, 0, 12, 31774
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, 42, 27, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, -27, 44, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, 39, -28, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, -42, -42, 20
+	createtask sub_80A7FA0, 5, 1, 3, 0, 15, 1
+	createtask sub_80E1F8C, 2, 4, 1, 2, 0, 12, 31774
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 42, 27, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, -27, 44, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 39, -28, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, -42, -42, 20
 	panse_19 SE_W091, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, 0, 40, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, -8, -44, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, -46, -28, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, 46, 9, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 0, 40, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, -8, -44, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, -46, -28, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 46, 9, 20
 	panse_19 SE_W091, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, 42, 0, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, -43, -12, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, 16, -46, 20
-	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 3, -16, 44, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 42, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, -43, -12, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, 16, -46, 20
+	sprite gBattleAnimSpriteTemplate_83DA2E8, 130, -16, 44, 20
 	panse_19 SE_W091, 63
 	pause 0
 	waitsound
@@ -5985,38 +5985,38 @@ Move_SLUDGE_BOMB: @ 81CFA34
 	end
 _81CFB44:
 	panse_19 SE_W145C, 192
-	sprite gBattleAnimSpriteTemplate_83DA2B8, 130, 4, 20, 0, 40, 0
+	sprite gBattleAnimSpriteTemplate_83DA2B8, 130, 20, 0, 40, 0
 	pause 3
 	ret
 
 Move_ACID: @ 81CFB5A
 	loadsprite 10150
 	monbg 3
-	sprite gBattleAnimSpriteTemplate_83DA2D0, 130, 6, 20, 0, 40, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, 0, 0
 	panse_19 SE_W145C, 192
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DA2D0, 130, 6, 20, 0, 40, 1, 24, 0
+	sprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, 24, 0
 	panse_19 SE_W145C, 192
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DA2D0, 130, 6, 20, 0, 40, 1, -24, 0
+	sprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, -24, 0
 	panse_19 SE_W145C, 192
 	pause 15
-	createtask sub_80A7FA0, 5, 5, 1, 2, 0, 10, 1
-	createtask sub_80A7FA0, 5, 5, 3, 2, 0, 10, 1
-	createtask sub_80E1F8C, 2, 6, 20, 2, 2, 0, 12, 31774
-	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 5, 0, -22, 0, 15, 55
+	createtask sub_80A7FA0, 5, 1, 2, 0, 10, 1
+	createtask sub_80A7FA0, 5, 3, 2, 0, 10, 1
+	createtask sub_80E1F8C, 2, 20, 2, 2, 0, 12, 31774
+	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 0, -22, 0, 15, 55
 	panse_19 SE_W145, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 5, -26, -24, 0, 15, 55
+	sprite gBattleAnimSpriteTemplate_83DA31C, 130, -26, -24, 0, 15, 55
 	panse_19 SE_W145, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 5, 15, -27, 0, 15, 50
+	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 15, -27, 0, 15, 50
 	panse_19 SE_W145, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 5, -15, -17, 0, 10, 45
+	sprite gBattleAnimSpriteTemplate_83DA31C, 130, -15, -17, 0, 10, 45
 	panse_19 SE_W145, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 5, 27, -22, 0, 15, 50
+	sprite gBattleAnimSpriteTemplate_83DA31C, 130, 27, -22, 0, 15, 50
 	panse_19 SE_W145, 63
 	wait
 	clearmonbg 3
@@ -6032,11 +6032,11 @@ Move_BONEMERANG: @ 81CFC54
 	sprite gBattleAnimSpriteTemplate_83DB2C8, 2
 	pause 20
 	panse_19 SE_W030, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 1
-	createtask sub_80A7E7C, 5, 5, 1, 5, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
+	createtask sub_80A7E7C, 5, 1, 5, 0, 5, 1
 	pause 17
 	panse_19 SE_W233, 192
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, -4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, -4
 	wait
 	clearmonbg 3
 	blendoff
@@ -6049,11 +6049,11 @@ Move_BONE_CLUB: @ 81CFCA8
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W155, 63
-	sprite gBattleAnimSpriteTemplate_83DB2E0, 2, 5, -42, -25, 0, 0, 15
+	sprite gBattleAnimSpriteTemplate_83DB2E0, 2, -42, -25, 0, 0, 15
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 1
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 5, 1
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 7, 5, 1, 0, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
+	createtask sub_80A7E7C, 5, 1, 0, 5, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 5, 1, 0, 10, 0, 0
 	panse_19 SE_W233B, 63
 	wait
 	clearmonbg 3
@@ -6066,10 +6066,10 @@ Move_BONE_RUSH: @ 81CFD0A
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W155, 63
-	sprite gBattleAnimSpriteTemplate_83DB2E0, 2, 5, -42, -25, 0, 0, 15
+	sprite gBattleAnimSpriteTemplate_83DB2E0, 2, -42, -25, 0, 0, 15
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 0, 3, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 5, 1, 0, 3, 5, 1
 	panse_19 SE_W030, 63
 	wait
 	clearmonbg 3
@@ -6081,14 +6081,14 @@ Move_SPIKES: @ 81CFD55
 	monbg 3
 	panse_19 SE_W026, 192
 	panse_1D SE_W030, 63, 28
-	sprite gBattleAnimSpriteTemplate_840227C, 130, 5, 20, 0, 0, 24, 30
+	sprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, 0, 24, 30
 	pause 10
 	panse_19 SE_W026, 192
 	panse_1D SE_W030, 63, 28
-	sprite gBattleAnimSpriteTemplate_840227C, 130, 5, 20, 0, -24, 24, 30
+	sprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, -24, 24, 30
 	pause 10
 	panse_1D SE_W030, 63, 28
-	sprite gBattleAnimSpriteTemplate_840227C, 130, 5, 20, 0, 24, 24, 30
+	sprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, 24, 24, 30
 	wait
 	clearmonbg 3
 	end
@@ -6101,27 +6101,27 @@ Move_MEGAHORN: @ 81CFDAC
 	jumpunkcond _81CFE83
 	fadetobg 7
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -2304, 768, 1, -1
+	createtask sub_80E3A58, 5, -2304, 768, 1, -1
 _81CFDCF:
 	waitbgfadein
 	setalpha 12, 8
-	createtask sub_80A7E7C, 5, 5, 0, 2, 0, 15, 1
+	createtask sub_80A7E7C, 5, 0, 2, 0, 15, 1
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 24, 0, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 6
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DAABC, 3, 5, -42, 25, 0, 0, 6
+	sprite gBattleAnimSpriteTemplate_83DAABC, 3, -42, 25, 0, 0, 6
 	pause 4
 	panse_19 SE_W011, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 0
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -16, 4, 1, 4
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -16, 4, 1, 4
 	wait
-	createtask sub_80A8154, 2, 5, 1, -4, 1, 12, 1
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 7, 5, 1, 32767, 10, 0, 0
+	createtask sub_80A8154, 2, 1, -4, 1, 12, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 5, 1, 32767, 10, 0, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 11
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7
 	wait
 	wait
 	clearmonbg 3
@@ -6134,7 +6134,7 @@ _81CFDCF:
 _81CFE83:
 	fadetobg 8
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, 2304, 768, 0, -1
+	createtask sub_80E3A58, 5, 2304, 768, 0, -1
 	jump _81CFDCF
 
 Move_GUST: @ 81CFE9A
@@ -6144,11 +6144,11 @@ Move_GUST: @ 81CFE9A
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W016, 63
-	sprite gBattleAnimSpriteTemplate_83DA380, 2, 2, 0, -16
-	createtask sub_80DA09C, 5, 2, 1, 70
+	sprite gBattleAnimSpriteTemplate_83DA380, 2, 0, -16
+	createtask sub_80DA09C, 5, 1, 70
 	wait
-	createtask sub_80A7FA0, 5, 5, 1, 1, 0, 7, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
+	createtask sub_80A7FA0, 5, 1, 1, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
 	panse_19 SE_W016B, 63
 	wait
 	clearmonbg 3
@@ -6162,18 +6162,18 @@ Move_WING_ATTACK: @ 81CFEEB
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_1C SE_W017, 192, 20, 2
-	createtask sub_80A8408, 2, 5, 0, 12, 4, 1, 4
-	createtask sub_80DA09C, 5, 2, 1, 70
-	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, 5, -25, 0, 0, 0, 20
-	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, 5, 25, 0, 0, 0, 20
+	createtask sub_80A8408, 2, 0, 12, 4, 1, 4
+	createtask sub_80DA09C, 5, 1, 70
+	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, -25, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, 25, 0, 0, 0, 20
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 24, 0, 0, 9
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 9
 	pause 17
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 16, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -16, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 16, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -16, 0, 1, 1
 	panse_1C SE_W003, 63, 5, 2
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 11
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11
 	wait
 	clearmonbg 3
 	blendoff
@@ -6182,8 +6182,8 @@ Move_WING_ATTACK: @ 81CFEEB
 Move_PECK: @ 81CFF88
 	loadsprite 10135
 	panse_19 SE_W030, 63
-	createtask sub_80A8EFC, 2, 4, 3, -768, 1, 2
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -12, 0, 1, 3
+	createtask sub_80A8EFC, 2, 3, -768, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, -12, 0, 1, 3
 	wait
 	end
 
@@ -6195,13 +6195,13 @@ Move_AEROBLAST: @ 81CFFAF
 	monbgprio_28 1
 	setalpha 12, 8
 	call _81D000B
-	createtask sub_80A7E7C, 5, 5, 1, 5, 0, 50, 1
+	createtask sub_80A7E7C, 5, 1, 5, 0, 50, 1
 	call _81D000B
 	call _81D000B
 	call _81D000B
 	call _81D000B
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
 	panse_19 SE_W013, 63
 	wait
 	clearmonbg 3
@@ -6211,20 +6211,20 @@ Move_AEROBLAST: @ 81CFFAF
 	end
 _81D000B:
 	panse_19 SE_W026, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, -12, 0, -12, 15, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 26, 8, 12, 8, 15, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 0, 0
 	pause 3
 	panse_19 SE_W026, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, -12, 0, -12, 15, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 26, 8, 12, 8, 15, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 1, 0
 	pause 3
 	panse_19 SE_W026, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, -12, 0, -12, 15, 2, 0
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 26, 8, 12, 8, 15, 2, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 2, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 2, 0
 	pause 3
 	panse_19 SE_W026, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, -12, 0, -12, 15, 3, 0
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 26, 8, 12, 8, 15, 3, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 3, 0
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 3, 0
 	pause 3
 	ret
 
@@ -6234,18 +6234,18 @@ Move_WATER_GUN: @ 81D00CC
 	monbg 3
 	monbgprio_28 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83D9318, 2, 6, 20, 0, 0, 0, 40, -25
+	sprite gBattleAnimSpriteTemplate_83D9318, 2, 20, 0, 0, 0, 40, -25
 	panse_19 SE_W145, 192
 	wait
-	createtask sub_80A7FA0, 5, 5, 1, 1, 0, 8, 1
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 4, 0, 0, 1, 2
-	sprite gBattleAnimSpriteTemplate_83D9330, 2, 5, 0, -15, 0, 15, 55
+	createtask sub_80A7FA0, 5, 1, 1, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D9330, 2, 0, -15, 0, 15, 55
 	panse_19 SE_W152, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D9330, 2, 5, 15, -20, 0, 15, 50
+	sprite gBattleAnimSpriteTemplate_83D9330, 2, 15, -20, 0, 15, 50
 	panse_19 SE_W152, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D9330, 2, 5, -15, -10, 0, 10, 45
+	sprite gBattleAnimSpriteTemplate_83D9330, 2, -15, -10, 0, 10, 45
 	panse_19 SE_W152, 63
 	wait
 	clearmonbg 3
@@ -6257,40 +6257,40 @@ Move_CRABHAMMER: @ 81D0159
 	loadsprite 10148
 	monbg 3
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 0, 1, 0
 	panse_19 SE_W233B, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 32429, 10, 0, 0
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -24, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32429, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -24, 0, 0, 4
 	wait
 	pause 8
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 4
 	wait
 	panse_1C SE_W152, 63, 20, 3
-	createtask sub_80A7E7C, 5, 5, 1, 0, 4, 8, 1
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 10, 10, 20, 1
+	createtask sub_80A7E7C, 5, 1, 0, 4, 8, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 10, 10, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 20, -20, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 20, -20, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, -15, 15, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, -15, 15, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 0, 0, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 0, 0, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, -10, -20, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, -10, -20, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 16, -8, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 16, -8, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, 5, 8, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, 5, 8, 20, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9348, 2, 4, -16, 0, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9348, 2, -16, 0, 20, 1
 	wait
 	clearmonbg 3
 	blendoff
 	end
 
 Move_SURF: @ 81D0253
-	createtask sub_80D38BC, 2, 1, 0
+	createtask sub_80D38BC, 2, 0
 	pause 24
 	panse_1B SE_W057, 192, 63, 2, 0
 	wait
@@ -6301,14 +6301,14 @@ Move_FLAMETHROWER: @ 81D0267
 	monbg 3
 	monbgprio_28 1
 	setalpha 12, 8
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 46, 1
+	createtask sub_80A7E7C, 5, 0, 0, 2, 46, 1
 	pause 6
-	createtask sub_80D3630, 5, 1, 100
+	createtask sub_80D3630, 5, 100
 	panse_1B SE_W053, 192, 63, 2, 0
 	call _81D02E1
 	call _81D02E1
 	call _81D02E1
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 43, 1
+	createtask sub_80A7E7C, 5, 1, 3, 0, 43, 1
 	call _81D02E1
 	call _81D02E1
 	call _81D02E1
@@ -6322,30 +6322,30 @@ Move_FLAMETHROWER: @ 81D0267
 	blendoff
 	end
 _81D02E1:
-	sprite gBattleAnimSpriteTemplate_83D9268, 3, 4, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D9268, 3, 10, 10, 0, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9268, 3, 4, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D9268, 3, 10, 10, 0, 16
 	pause 2
 	ret
 
 Move_SANDSTORM: @ 81D0304
 	loadsprite 10261
 	panse_19 SE_W201, 0
-	createtask do_boulder_dust, 5, 1, 0
+	createtask do_boulder_dust, 5, 0
 	pause 16
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 10, 2304, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 10, 2304, 96, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 90, 2048, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 90, 2048, 96, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 50, 2560, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 50, 2560, 96, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 20, 2304, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 20, 2304, 96, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 70, 1984, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 70, 1984, 96, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 0, 2816, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 0, 2816, 96, 0
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 4, 60, 2560, 96, 0
+	sprite gBattleAnimSpriteTemplate_83DACE8, 40, 60, 2560, 96, 0
 	end
 
 Move_WHIRLPOOL: @ 81D038C
@@ -6354,29 +6354,29 @@ Move_WHIRLPOOL: @ 81D038C
 	monbgprio_28 1
 	setalpha 12, 8
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 0, 7, 23968
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 23968
 	panse_19 SE_W250, 63
-	createtask sub_80A7E7C, 5, 5, 1, 0, 2, 50, 1
+	createtask sub_80A7E7C, 5, 1, 0, 2, 50, 1
 	call _81D03E4
 	call _81D03E4
 	call _81D03E4
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 7, 0, 23968
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 7, 0, 23968
 	wait
 	clearmonbg 3
 	end
 _81D03E4:
-	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 7, 0, 28, 384, 50, 8, 50, 1
+	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 28, 384, 50, 8, 50, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 7, 0, 32, 240, 40, 11, -46, 1
+	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 32, 240, 40, 11, -46, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 7, 0, 33, 416, 40, 4, 42, 1
+	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 33, 416, 40, 4, 42, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 7, 0, 31, 288, 45, 6, -42, 1
+	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 31, 288, 45, 6, -42, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 7, 0, 28, 448, 45, 11, 46, 1
+	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 28, 448, 45, 11, 46, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 7, 0, 33, 464, 50, 10, -50, 1
+	sprite gBattleAnimSpriteTemplate_83DACB8, 130, 0, 33, 464, 50, 10, -50, 1
 	pause 2
 	ret
 
@@ -6389,16 +6389,16 @@ _81D047E:
 	end
 _81D0480:
 	panse_19 SE_W019, 192
-	sprite gBattleAnimSpriteTemplate_83DA450, 2, 4, 0, 0, 13, 336
+	sprite gBattleAnimSpriteTemplate_83DA450, 2, 0, 0, 13, 336
 	jump _81D047E
 _81D0498:
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W104, 192
-	sprite gBattleAnimSpriteTemplate_83DA468, 2, 1, 20
+	sprite gBattleAnimSpriteTemplate_83DA468, 2, 20
 	pause 20
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 0
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 0
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	panse_19 SE_W013, 63
 	wait
 	clearmonbg 3
@@ -6413,7 +6413,7 @@ _81D04E8:
 	end
 _81D04E9:
 	panse_19 SE_W100, 192
-	sprite gBattleAnimSpriteTemplate_83DA568, 2, 2, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA568, 2, 0, 0
 	jump _81D04E8
 _81D04FD:
 	monbg 3
@@ -6422,8 +6422,8 @@ _81D04FD:
 	sprite gBattleAnimSpriteTemplate_83DA594, 131
 	pause 7
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 0
-	createtask sub_80A7E7C, 5, 5, 1, 0, 5, 11, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 0
+	createtask sub_80A7E7C, 5, 1, 0, 5, 11, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -6436,11 +6436,11 @@ Move_KARATE_CHOP: @ 81D053C
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_19 SE_W104, 63
-	sprite gBattleAnimSpriteTemplate_83D9F78, 2, 8, -16, 0, 0, 0, 10, 1, 3, 0
+	sprite gBattleAnimSpriteTemplate_83D9F78, 2, -16, 0, 0, 0, 10, 1, 3, 0
 	wait
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -6452,13 +6452,13 @@ Move_CROSS_CHOP: @ 81D058E
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W025, 63
-	sprite gBattleAnimSpriteTemplate_83D9FD8, 2, 3, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9FD8, 2, 3, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9FD8, 2, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9FD8, 2, 0, 0, 1
 	pause 40
 	panse_19 SE_W013, 63
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 32767, 10, 0, 10
-	sprite gBattleAnimSpriteTemplate_83DB520, 3, 4, 0, 0, 1, 20
-	createtask sub_80A7E7C, 5, 5, 1, 7, 0, 9, 1
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 10, 0, 10
+	sprite gBattleAnimSpriteTemplate_83DB520, 3, 0, 0, 1, 20
+	createtask sub_80A7E7C, 5, 1, 7, 0, 9, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -6469,13 +6469,13 @@ Move_JUMP_KICK: @ 81D05F7
 	loadsprite 10135
 	monbg 3
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D9F90, 2, 8, -16, 8, 0, 0, 10, 1, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1
 	panse_19 SE_W026, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 4, 0, 0, 1, 1
-	createtask sub_80A7E7C, 5, 5, 1, 5, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 0, 0, 1, 1
+	createtask sub_80A7E7C, 5, 1, 5, 0, 7, 1
 	panse_19 SE_W004, 63
 	wait
 	clearmonbg 3
@@ -6487,22 +6487,22 @@ Move_HI_JUMP_KICK: @ 81D0654
 	loadsprite 10135
 	monbg 3
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, -24, 0, 0, 8
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -24, 0, 0, 8
 	wait
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 3
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9F90, 2, 8, -16, 8, 0, 0, 10, 1, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1
 	panse_19 SE_W026, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -28, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -28, 0, 0, 3
 	pause 3
-	createtask sub_80A8154, 2, 5, 1, 3, 0, 11, 1
+	createtask sub_80A8154, 2, 1, 3, 0, 11, 1
 	wait
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
 	wait
 	clearmonbg 3
 	blendoff
@@ -6513,8 +6513,8 @@ Move_DOUBLE_KICK: @ 81D06EA
 	loadsprite 10135
 	monbg 3
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83D9FC0, 3, 3, 1, 20, 1
-	createtask sub_80A7E7C, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D9FC0, 3, 1, 20, 1
+	createtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
 	panse_19 SE_W233B, 63
 	wait
 	wait
@@ -6537,19 +6537,19 @@ _81D073D:
 	blendoff
 	end
 _81D0742:
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, -16, -8, 20, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -16, -16, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, -16, -8, 20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -16, -16, 1, 2
+	createtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
 	jump _81D073D
 _81D0778:
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 8, 8, 20, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 8, 0, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 4, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 8, 8, 20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 8, 0, 1, 2
+	createtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
 	jump _81D073D
 _81D07AE:
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 5, 0, 0, 20, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, -8, 1, 1
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, -8, 1, 1
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	jump _81D073D
 
 Move_DYNAMIC_PUNCH: @ 81D07E4
@@ -6561,26 +6561,26 @@ Move_DYNAMIC_PUNCH: @ 81D07E4
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 5, 0, 0, 20, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 0
-	createtask sub_80A7E7C, 5, 5, 1, 5, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 0, 0, 20, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 0
+	createtask sub_80A7E7C, 5, 1, 5, 0, 7, 1
 	pause 1
 	waitsound
 	panse_19 SE_W120, 63
-	createtask sub_80A7FA0, 5, 5, 1, 5, 0, 28, 1
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 0, 0, 1, 1
+	createtask sub_80A7FA0, 5, 1, 5, 0, 28, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 24, -24, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -24, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -6591,28 +6591,28 @@ Move_COUNTER: @ 81D08AC
 	loadsprite 10143
 	monbg 3
 	setalpha 12, 8
-	createtask sub_80A8500, 2, 5, 0, 18, 6, 1, 4
+	createtask sub_80A8500, 2, 0, 18, 6, 1, 4
 	panse_19 SE_W233, 192
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 20, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -15, 18, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -15, 18, 1, 0
 	panse_19 SE_W233B, 63
 	pause 1
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 25, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 5, -15, 18, 8, 1, 0
+	createtask sub_80A7E7C, 2, 1, 5, 0, 25, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, -15, 18, 8, 1, 0
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, -4, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, -4, 1, 0
 	panse_19 SE_W233B, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 5, 0, -4, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 0, -4, 8, 1, 0
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 15, 9, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 15, 9, 1, 0
 	panse_19 SE_W233B, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 5, 15, 9, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 3, 15, 9, 8, 1, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
 	wait
 	clearmonbg 3
 	blendoff
@@ -6623,19 +6623,19 @@ Move_VITAL_THROW: @ 81D097B
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W233, 192
-	createtask sub_80A8500, 2, 5, 0, 12, 4, 1, 2
+	createtask sub_80A8500, 2, 0, 12, 4, 1, 2
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 20, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
 	panse_19 SE_W233B, 63
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -24, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -24, 0, 0, 4
 	wait
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
 	pause 11
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 10
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 10
 	wait
 	clearmonbg 3
 	blendoff
@@ -6648,21 +6648,21 @@ Move_ROCK_SMASH: @ 81D09F6
 	monbg 3
 	setalpha 12, 8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 5, 0, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 2, 0, 0, 8, 1, 0
 	panse_19 SE_W233B, 63
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 5, 1
+	createtask sub_80A7E7C, 2, 1, 3, 0, 5, 1
 	wait
 	panse_19 SE_W088, 63
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 0, 0, 20, 24, 14, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 5, 0, -20, 24, 14, 1
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 0, 5, 20, -24, 14, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, -5, 0, -20, -24, 14, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 0, -5, 30, 18, 8, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 0, 0, 30, -18, 8, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 0, 0, -30, 18, 8, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 6, 0, 0, -30, -18, 8, 2
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 7, 1
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, 20, 24, 14, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 5, 0, -20, 24, 14, 1
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 5, 20, -24, 14, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, -5, 0, -20, -24, 14, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, -5, 30, 18, 8, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, 30, -18, 8, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, -30, 18, 8, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, -30, -18, 8, 2
+	createtask sub_80A7E7C, 2, 1, 0, 3, 7, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -6682,8 +6682,8 @@ Move_SUBMISSION: @ 81D0AEE
 	panse_1D SE_W004, 63, 70
 	panse_1D SE_W104, 192, 80
 	panse_1D SE_W004, 63, 90
-	createtask sub_80A8408, 2, 5, 0, -18, 6, 6, 4
-	createtask sub_80A8408, 2, 5, 1, 18, 6, 6, 4
+	createtask sub_80A8408, 2, 0, -18, 6, 6, 4
+	createtask sub_80A8408, 2, 1, 18, 6, 6, 4
 	call _81D0B5D
 	call _81D0B5D
 	call _81D0B5D
@@ -6692,11 +6692,11 @@ Move_SUBMISSION: @ 81D0AEE
 	blendoff
 	end
 _81D0B5D:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, -12, 1, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, -12, 8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, -12, 8, 1, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 12, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 12, 0, 1, 1
 	pause 8
 	ret
 
@@ -6704,7 +6704,7 @@ Move_SUNNY_DAY: @ 81D0B91
 	loadsprite 10157
 	monbg 2
 	setalpha 13, 3
-	createtask sub_80E2A38, 10, 5, 1921, 1, 0, 6, 32767
+	createtask sub_80E2A38, 10, 1921, 1, 0, 6, 32767
 	wait
 	panse_26 SE_W080, 192, 63, 1, 0
 	call _81D0BDD
@@ -6712,7 +6712,7 @@ Move_SUNNY_DAY: @ 81D0B91
 	call _81D0BDD
 	call _81D0BDD
 	wait
-	createtask sub_80E2A38, 10, 5, 1921, 1, 6, 0, 32767
+	createtask sub_80E2A38, 10, 1921, 1, 6, 0, 32767
 	wait
 	clearmonbg 2
 	blendoff
@@ -6734,11 +6734,11 @@ Move_COTTON_SPORE: @ 81D0BE7
 	clearmonbg 3
 	end
 _81D0C07:
-	sprite gBattleAnimSpriteTemplate_83D63F8, 2, 5, 0, -20, 85, 80, 0
+	sprite gBattleAnimSpriteTemplate_83D63F8, 2, 0, -20, 85, 80, 0
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D63F8, 2, 5, 0, -10, 170, 80, 0
+	sprite gBattleAnimSpriteTemplate_83D63F8, 2, 0, -10, 170, 80, 0
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D63F8, 2, 5, 0, -15, 0, 80, 0
+	sprite gBattleAnimSpriteTemplate_83D63F8, 2, 0, -15, 0, 80, 0
 	pause 12
 	ret
 
@@ -6757,11 +6757,11 @@ Move_SPORE: @ 81D0C41
 	blendoff
 	end
 _81D0C6C:
-	sprite gBattleAnimSpriteTemplate_83D63F8, 130, 5, 0, -20, 85, 80, 1
+	sprite gBattleAnimSpriteTemplate_83D63F8, 130, 0, -20, 85, 80, 1
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D63F8, 130, 5, 0, -10, 170, 80, 1
+	sprite gBattleAnimSpriteTemplate_83D63F8, 130, 0, -10, 170, 80, 1
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D63F8, 130, 5, 0, -15, 0, 80, 1
+	sprite gBattleAnimSpriteTemplate_83D63F8, 130, 0, -15, 0, 80, 1
 	pause 12
 	ret
 
@@ -6771,33 +6771,33 @@ Move_PETAL_DANCE: @ 81D0CA6
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W080, 192
-	createtask sub_80A8500, 2, 5, 0, 12, 6, 6, 3
-	sprite gBattleAnimSpriteTemplate_83D6428, 2, 4, 0, -24, 8, 140
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, 16, -24, 8, 100
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, -16, -24, 8, 100
+	createtask sub_80A8500, 2, 0, 12, 6, 6, 3
+	sprite gBattleAnimSpriteTemplate_83D6428, 2, 0, -24, 8, 140
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, 16, -24, 8, 100
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, -16, -24, 8, 100
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D6428, 2, 4, 0, -24, 8, 140
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, 32, -24, 8, 100
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, -32, -24, 8, 100
+	sprite gBattleAnimSpriteTemplate_83D6428, 2, 0, -24, 8, 140
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, 32, -24, 8, 100
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, -32, -24, 8, 100
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D6428, 2, 4, 0, -24, 8, 140
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, 24, -24, 8, 100
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, -24, -24, 8, 100
+	sprite gBattleAnimSpriteTemplate_83D6428, 2, 0, -24, 8, 140
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, 24, -24, 8, 100
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, -24, -24, 8, 100
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, 16, -24, 0, 100
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, -16, -24, 0, 100
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, 16, -24, 0, 100
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, -16, -24, 0, 100
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, 20, -16, 14, 80
-	sprite gBattleAnimSpriteTemplate_83D6440, 2, 4, -20, -14, 16, 80
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, 20, -16, 14, 80
+	sprite gBattleAnimSpriteTemplate_83D6440, 2, -20, -14, 16, 80
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 24, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 5
 	pause 3
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 0
-	createtask sub_80A7E7C, 2, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 0
+	createtask sub_80A7E7C, 2, 1, 6, 0, 8, 1
 	wait
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
 	wait
 	clearmonbg 3
 	blendoff
@@ -6811,33 +6811,33 @@ Move_RAZOR_LEAF: @ 81D0DDE
 	setalpha 12, 8
 	pause 1
 	panse_1C SE_W077, 192, 10, 5
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, -2, 10
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -2, 10
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -1, -1, 15
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -1, -1, 15
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -4, -4, 7
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -4, -4, 7
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 3, -3, 11
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, 11
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -1, -6, 8
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -1, -6, 8
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 2, -1, 12
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 2, -1, 12
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, -4, 13
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -4, 13
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 4, -5, 7
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 4, -5, 7
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 2, -6, 11
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 2, -6, 11
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, -5, 8
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -5, 8
 	pause 60
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 7, 20, -10, 20, 0, 22, 20, 1
-	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 7, 20, -10, 20, 0, 22, -20, 1
+	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 22, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 22, -20, 1
 	pause 20
 	panse_19 SE_W013, 63
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
-	createtask sub_80A7FA0, 2, 5, 3, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 3, 2, 0, 8, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -6848,29 +6848,29 @@ Move_ANCIENT_POWER: @ 81D0EE5
 	loadsprite 10135
 	monbg 3
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 4, 1, 10, 1
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 20, 32, -48, 50, 2
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 0, 32, -38, 25, 5
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 32, 32, -28, 40, 3
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, -20, 32, -48, 50, 2
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 20, 32, -28, 60, 1
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 0, 32, -28, 30, 4
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 30, 1
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 20, 32, -48, 50, 2
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -38, 25, 5
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 32, 32, -28, 40, 3
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, -20, 32, -48, 50, 2
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 20, 32, -28, 60, 1
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -28, 30, 4
+	createtask sub_80A7FA0, 2, 0, 1, 0, 30, 1
 	panse_19 SE_W082, 192
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 15, 32, -48, 25, 5
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, -10, 32, -42, 30, 4
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 15, 32, -48, 25, 5
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, -10, 32, -42, 30, 4
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, 0, 32, -42, 25, 5
-	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 5, -25, 32, -48, 30, 4
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -42, 25, 5
+	sprite gBattleAnimSpriteTemplate_83DAD60, 2, -25, 32, -48, 30, 4
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 16, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 16, 0, 0, 4
 	pause 3
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 1
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 1
+	createtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
 	wait
 	clearmonbg 3
 	blendoff
@@ -6880,16 +6880,16 @@ Move_OCTAZOOKA: @ 81D100D
 	loadsprite 10030
 	loadsprite 10017
 	panse_19 SE_W025B, 192
-	sprite gBattleAnimSpriteTemplate_83D6F08, 130, 6, 20, 0, 0, 0, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D6F08, 130, 20, 0, 0, 0, 20, 0
 	wait
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, 4, 8, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, 8, 8, 1, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, 4, -8, -8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, -8, -8, 1, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, 4, 8, -8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, 8, -8, 1, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, 4, -8, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D6F3C, 130, -8, 8, 1, 0
 	wait
 	end
 
@@ -6906,13 +6906,13 @@ Move_MIST: @ 81D1073
 	call _81D10BE
 	call _81D10BE
 	pause 32
-	createtask sub_80E1F8C, 2, 6, 10, 8, 2, 0, 14, 32767
+	createtask sub_80E1F8C, 2, 10, 8, 2, 0, 14, 32767
 	wait
 	clearmonbg 2
 	blendoff
 	end
 _81D10BE:
-	sprite gBattleAnimSpriteTemplate_83D9D3C, 2, 6, 0, -24, 48, 240, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9D3C, 2, 0, -24, 48, 240, 0, 1
 	pause 7
 	ret
 
@@ -6921,9 +6921,9 @@ Move_HAZE: @ 81D10D4
 	panse_19 SE_W114, 0
 	createtask sub_80D80E0, 5
 	pause 30
-	createtask sub_80E2A38, 10, 5, 1920, 2, 0, 16, 0
+	createtask sub_80E2A38, 10, 1920, 2, 0, 16, 0
 	pause 90
-	createtask sub_80E2A38, 10, 5, 1920, 1, 16, 0, 0
+	createtask sub_80E2A38, 10, 1920, 1, 16, 0, 0
 	end
 
 Move_FIRE_PUNCH: @ 81D1107
@@ -6932,33 +6932,33 @@ Move_FIRE_PUNCH: @ 81D1107
 	loadsprite 10135
 	monbg 3
 	setalpha 12, 8
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 9, 31
-	sprite gBattleAnimSpriteTemplate_83D9478, 129, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D9478, 129, 1, 64
-	sprite gBattleAnimSpriteTemplate_83D9478, 129, 1, 128
-	sprite gBattleAnimSpriteTemplate_83D9478, 129, 1, 196
+	createtask sub_80E2A38, 10, 4, 2, 0, 9, 31
+	sprite gBattleAnimSpriteTemplate_83D9478, 129, 0
+	sprite gBattleAnimSpriteTemplate_83D9478, 129, 64
+	sprite gBattleAnimSpriteTemplate_83D9478, 129, 128
+	sprite gBattleAnimSpriteTemplate_83D9478, 129, 196
 	panse_19 SE_W172, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 5, 0, 0, 8, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 1
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 15, 1
+	sprite gBattleAnimSpriteTemplate_83D9FA8, 131, 0, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 1
+	createtask sub_80A7E7C, 2, 1, 0, 3, 15, 1
 	call _81D11A2
 	pause 4
 	panse_19 SE_W007, 63
 	wait
-	createtask sub_80E2A38, 10, 5, 4, 0, 9, 0, 31
+	createtask sub_80E2A38, 10, 4, 0, 9, 0, 31
 	wait
 	clearmonbg 3
 	blendoff
 	end
 _81D11A2:
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, 192, 176, 40
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, -192, 240, 40
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, 192, -160, 40
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, -192, -112, 40
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, 160, 48, 40
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, -224, -32, 40
-	sprite gBattleAnimSpriteTemplate_83D9490, 129, 5, 0, 10, 112, -128, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, 192, 176, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, -192, 240, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, 192, -160, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, -192, -112, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, 160, 48, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, -224, -32, 40
+	sprite gBattleAnimSpriteTemplate_83D9490, 129, 0, 10, 112, -128, 40
 	ret
 
 Move_LEER: @ 81D121A
@@ -6967,12 +6967,12 @@ Move_LEER: @ 81D121A
 	monbgprio_28 0
 	setalpha 8, 8
 	panse_19 SE_W043, 192
-	sprite gBattleAnimSpriteTemplate_84022B0, 2, 2, 24, -12
-	createtask sub_80A8D34, 5, 5, -5, -5, 10, 0, 1
+	sprite gBattleAnimSpriteTemplate_84022B0, 2, 24, -12
+	createtask sub_80A8D34, 5, -5, -5, 10, 0, 1
 	wait
 	pause 10
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 9, 1
-	createtask sub_80A7FA0, 2, 5, 3, 1, 0, 9, 1
+	createtask sub_80A7FA0, 2, 1, 1, 0, 9, 1
+	createtask sub_80A7FA0, 2, 3, 1, 0, 9, 1
 	wait
 	clearmonbg 0
 	blendoff
@@ -6989,11 +6989,11 @@ Move_DREAM_EATER: @ 81D1271
 	call Unknown_81D61E7
 	setalpha 8, 8
 	panse_19 SE_W107, 63
-	createtask sub_80A7E7C, 2, 5, 1, 5, 0, 15, 1
-	createtask sub_80A8D34, 5, 5, -6, -6, 15, 1, 1
+	createtask sub_80A7E7C, 2, 1, 5, 0, 15, 1
+	createtask sub_80A8D34, 5, -6, -6, 15, 1, 1
 	wait
 	setalpha 12, 8
-	createtask sub_80A7E7C, 2, 5, 1, 0, 2, 25, 1
+	createtask sub_80A7E7C, 2, 1, 0, 2, 25, 1
 	call _81D12DB
 	wait
 	pause 15
@@ -7006,44 +7006,44 @@ Move_DREAM_EATER: @ 81D1271
 	end
 _81D12DB:
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -40, 35
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -40, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 28, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 40, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 28, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 40, 39
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -32, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -32, 26
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, -15, -16, 36
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 16, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -40, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -40, 26
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -5, 15, 36, 33
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 10, -5, -8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, -10, 20, 20, 39
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 36, 33
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 0, 5, 8, 26
-	sprite gBattleAnimSpriteTemplate_83D637C, 3, 4, 5, -18, -20, 35
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26
+	sprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35
 	pause 4
 	ret
 
@@ -7056,25 +7056,25 @@ Move_POISON_GAS: @ 81D1474
 	setalpha 12, 8
 	pause 0
 	panse_19 SE_W054, 192
-	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 8, 64, 0, 0, -32, -6, 4192, 1072, 0
+	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	pause 4
 	panse_19 SE_W054, 192
-	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 8, 64, 0, 0, -32, -6, 4192, 1072, 0
+	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	pause 4
 	panse_19 SE_W054, 192
-	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 8, 64, 0, 0, -32, -6, 4192, 1072, 0
+	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	pause 4
 	panse_19 SE_W054, 192
-	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 8, 64, 0, 0, -32, -6, 4192, 1072, 0
+	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	pause 4
 	panse_19 SE_W054, 192
-	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 8, 64, 0, 0, -32, -6, 4192, 1072, 0
+	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	pause 4
 	panse_19 SE_W054, 192
-	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 8, 64, 0, 0, -32, -6, 4192, 1072, 0
+	sprite gBattleAnimSpriteTemplate_83D9DAC, 128, 64, 0, 0, -32, -6, 4192, 1072, 0
 	pause 40
 	panse_1C SE_W054, 63, 28, 6
-	createtask sub_80E1F8C, 2, 6, 4, 6, 2, 0, 12, 26650
+	createtask sub_80E1F8C, 2, 4, 6, 2, 0, 12, 26650
 	wait
 	blendoff
 	clearmonbg 3
@@ -7082,7 +7082,7 @@ Move_POISON_GAS: @ 81D1474
 	end
 
 Move_BIND: @ 81D1552
-	createtask sub_80A8B88, 5, 5, 0, 6, 3328, 4, 0
+	createtask sub_80A8B88, 5, 0, 6, 3328, 4, 0
 	jump _81D1568
 _81D1568:
 	panse_19 SE_W020, 63
@@ -7091,23 +7091,23 @@ _81D1568:
 	wait
 	end
 _81D1578:
-	createtask sub_80A8D34, 5, 5, 10, -5, 5, 1, 0
+	createtask sub_80A8D34, 5, 10, -5, 5, 1, 0
 	pause 16
 	ret
 
 Move_WRAP: @ 81D158C
-	createtask sub_80A8500, 2, 5, 0, 6, 4, 2, 4
+	createtask sub_80A8500, 2, 0, 6, 4, 2, 4
 	jump _81D1568
 
 Move_PSYBEAM: @ 81D15A2
 	loadsprite 10163
 	panse_19 SE_W060, 192
 	call Unknown_81D61E7
-	createtask_1F sub_812B058, 7, 200, -64, 63, 3, 4, 0, 15
+	createtask_1F sub_812B058, 200, -64, 63, 3, 4, 0, 15
 	call _81D1626
 	call _81D1626
-	createtask sub_80A8B88, 5, 5, 0, 6, 2048, 4, 1
-	createtask sub_80E1F8C, 2, 6, 4, 2, 2, 0, 12, 32351
+	createtask sub_80A8B88, 5, 0, 6, 2048, 4, 1
+	createtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 32351
 	call _81D1626
 	call _81D1626
 	call _81D1626
@@ -7122,7 +7122,7 @@ Move_PSYBEAM: @ 81D15A2
 	call Unknown_81D61F3
 	end
 _81D1626:
-	sprite gBattleAnimSpriteTemplate_83DA784, 130, 6, 16, 0, 0, 0, 13, 0
+	sprite gBattleAnimSpriteTemplate_83DA784, 130, 16, 0, 0, 0, 13, 0
 	pause 4
 	ret
 
@@ -7132,15 +7132,15 @@ Move_HYPNOSIS: @ 81D163C
 	call _81D166F
 	call _81D166F
 	call _81D166F
-	createtask sub_80E1F8C, 2, 6, 4, 2, 2, 0, 12, 32351
+	createtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 32351
 	wait
 	pause 1
 	call Unknown_81D61F3
 	end
 _81D166F:
 	panse_19 SE_W048, 192
-	sprite gBattleAnimSpriteTemplate_83DA784, 130, 6, 0, 8, 0, 8, 27, 0
-	sprite gBattleAnimSpriteTemplate_83DA784, 130, 6, 16, -8, 0, -8, 27, 0
+	sprite gBattleAnimSpriteTemplate_83DA784, 130, 0, 8, 0, 8, 27, 0
+	sprite gBattleAnimSpriteTemplate_83DA784, 130, 16, -8, 0, -8, 27, 0
 	pause 6
 	ret
 
@@ -7148,11 +7148,11 @@ Move_PSYWAVE: @ 81D169C
 	loadsprite 10165
 	panse_19 SE_W060, 192
 	call Unknown_81D61E7
-	createtask sub_80D3630, 5, 1, 100
-	createtask_1F sub_812B058, 7, 203, -64, 63, 2, 9, 0, 10
+	createtask sub_80D3630, 5, 100
+	createtask_1F sub_812B058, 203, -64, 63, 2, 9, 0, 10
 	call _81D16FF
 	call _81D16FF
-	createtask sub_80E1F8C, 2, 6, 4, 1, 4, 0, 12, 32351
+	createtask sub_80E1F8C, 2, 4, 1, 4, 0, 12, 32351
 	call _81D16FF
 	call _81D16FF
 	call _81D16FF
@@ -7162,9 +7162,9 @@ Move_PSYWAVE: @ 81D169C
 	call Unknown_81D61F3
 	end
 _81D16FF:
-	sprite gBattleAnimSpriteTemplate_83D9280, 131, 4, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D9280, 131, 10, 10, 0, 16
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9280, 131, 4, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D9280, 131, 10, 10, 0, 16
 	pause 4
 	ret
 
@@ -7172,17 +7172,17 @@ Move_ZAP_CANNON: @ 81D1722
 	loadsprite 10171
 	loadsprite 10011
 	panse_19 SE_W086, 192
-	sprite gBattleAnimSpriteTemplate_83D9874, 131, 6, 10, 0, 0, 0, 30, 0
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 16, 30, 0, 40, 0
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 16, 30, 64, 40, 1
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 16, 30, 128, 40, 0
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 16, 30, 192, 40, 2
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 8, 30, 32, 40, 0
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 8, 30, 96, 40, 1
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 8, 30, 160, 40, 0
-	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 7, 10, 0, 8, 30, 224, 40, 2
-	wait
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D9874, 131, 10, 0, 0, 0, 30, 0
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 0, 40, 0
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 64, 40, 1
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 128, 40, 0
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 192, 40, 2
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 8, 30, 32, 40, 0
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 8, 30, 96, 40, 1
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 8, 30, 160, 40, 0
+	sprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 8, 30, 224, 40, 2
+	wait
+	createtask sub_80A7FA0, 2, 1, 4, 0, 5, 1
 	pause 15
 	panse_1D SE_W085B, 63, 19
 	call Unknown_81D6100
@@ -7193,24 +7193,24 @@ Move_STEEL_WING: @ 81D1807
 	loadsprite 10009
 	loadsprite 10135
 	panse_1C SE_W231, 192, 28, 2
-	createtask sub_80E0A4C, 5, 3, 0, 0, 0
+	createtask sub_80E0A4C, 5, 0, 0, 0
 	wait
 	monbg 3
 	monbgprio_28 1
 	setalpha 12, 8
 	panse_1C SE_W017, 192, 20, 2
-	createtask sub_80A8408, 2, 5, 0, 12, 4, 1, 4
-	createtask sub_80DA09C, 5, 2, 1, 70
-	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, 5, -25, 0, 0, 0, 20
-	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, 5, 25, 0, 0, 0, 20
+	createtask sub_80A8408, 2, 0, 12, 4, 1, 4
+	createtask sub_80DA09C, 5, 1, 70
+	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, -25, 0, 0, 0, 20
+	sprite gBattleAnimSpriteTemplate_83DA3B4, 2, 25, 0, 0, 0, 20
 	pause 24
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 24, 0, 0, 9
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 9
 	pause 17
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 16, 0, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -16, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 16, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -16, 0, 1, 1
 	panse_19 SE_W013, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 11
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11
 	wait
 	clearmonbg 3
 	blendoff
@@ -7219,17 +7219,17 @@ Move_STEEL_WING: @ 81D1807
 Move_IRON_TAIL: @ 81D18B6
 	loadsprite 10135
 	panse_1C SE_W231, 192, 28, 2
-	createtask sub_80E0A4C, 5, 3, 1, 0, 0
+	createtask sub_80E0A4C, 5, 1, 0, 0
 	wait
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W233B, 63
 	wait
-	createtask sub_80E0E24, 5, 2, 0, 1
+	createtask sub_80E0E24, 5, 0, 1
 	clearmonbg 1
 	blendoff
 	wait
@@ -7239,17 +7239,17 @@ Move_POISON_TAIL: @ 81D1914
 	loadsprite 10135
 	loadsprite 10150
 	panse_1C SE_W231, 192, 28, 2
-	createtask sub_80E0A4C, 5, 3, 1, 1, 23768
+	createtask sub_80E0A4C, 5, 1, 1, 23768
 	wait
 	monbg 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	panse_19 SE_W233B, 63
 	wait
-	createtask sub_80E0E24, 5, 2, 0, 1
+	createtask sub_80E0E24, 5, 0, 1
 	clearmonbg 1
 	blendoff
 	call Unknown_81D5F87
@@ -7259,21 +7259,21 @@ Move_POISON_TAIL: @ 81D1914
 Move_METAL_CLAW: @ 81D197A
 	loadsprite 10039
 	panse_1C SE_W231, 192, 28, 2
-	createtask sub_80E0A4C, 5, 3, 0, 0, 0
+	createtask sub_80E0A4C, 5, 0, 0, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 2
 	panse_19 SE_W013, 63
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, -10, -10, 0
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, -10, 10, 0
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 5, -4, 1, 10, 3, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, -10, -10, 0
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, -10, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, -4, 1, 10, 3, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 2
 	panse_19 SE_W013, 63
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, 10, -10, 1
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, 10, 10, 1
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 5, -4, 1, 10, 3, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, 10, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, 10, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, -4, 1, 10, 3, 1
 	wait
 	end
 
@@ -7285,10 +7285,10 @@ Move_NIGHT_SHADE: @ 81D1A0D
 	waitbgfadein
 	pause 10
 	panse_19 SE_W043, 192
-	createtask sub_80DDDF0, 5, 1, 85
+	createtask sub_80DDDF0, 5, 85
 	pause 70
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 12, 1
-	createtask sub_80E1F8C, 2, 6, 4, 0, 2, 0, 13, 0
+	createtask sub_80A7FA0, 2, 1, 2, 0, 12, 1
+	createtask sub_80E1F8C, 2, 4, 0, 2, 0, 13, 0
 	wait
 	clearmonbg 0
 	pause 1
@@ -7300,22 +7300,22 @@ Move_EGG_BOMB: @ 81D1A55
 	loadsprite 10198
 	loadsprite 10175
 	panse_19 SE_W039, 192
-	sprite gBattleAnimSpriteTemplate_83D7594, 130, 6, 10, 0, 0, 0, 25, -32
+	sprite gBattleAnimSpriteTemplate_83D7594, 130, 10, 0, 0, 0, 25, -32
 	wait
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 16, 1
-	sprite gBattleAnimSpriteTemplate_83D7828, 132, 4, 6, 5, 1, 0
+	createtask sub_80A7FA0, 2, 1, 4, 0, 16, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 132, 6, 5, 1, 0
 	panse_19 SE_W120, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D7828, 132, 4, -16, -15, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7828, 132, -16, -15, 1, 0
 	panse_19 SE_W120, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D7828, 132, 4, 16, -5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7828, 132, 16, -5, 1, 0
 	panse_19 SE_W120, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D7828, 132, 4, -12, 18, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7828, 132, -12, 18, 1, 0
 	panse_19 SE_W120, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D7828, 132, 4, 0, 5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7828, 132, 0, 5, 1, 0
 	panse_19 SE_W120, 63
 	pause 3
 	wait
@@ -7326,11 +7326,11 @@ Move_SHADOW_BALL: @ 81D1AEF
 	fadetobg 2
 	waitbgfadein
 	pause 15
-	createtask_1F sub_812B058, 7, 168, -64, 63, 5, 5, 0, 5
-	sprite gBattleAnimSpriteTemplate_83DAEA8, 130, 3, 16, 16, 8
+	createtask_1F sub_812B058, 168, -64, 63, 5, 5, 0, 5
+	sprite gBattleAnimSpriteTemplate_83DAEA8, 130, 16, 16, 8
 	wait
 	panse_19 SE_W028, 63
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 8, 1
 	wait
 	restorebg
 	waitbgfadein
@@ -7340,8 +7340,8 @@ Move_LICK: @ 81D1B32
 	loadsprite 10177
 	pause 15
 	panse_19 SE_W122, 63
-	sprite gBattleAnimSpriteTemplate_83DAEDC, 130, 2, 0, 0
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 16, 1
+	sprite gBattleAnimSpriteTemplate_83DAEDC, 130, 0, 0
+	createtask sub_80A7FA0, 2, 1, 1, 0, 16, 1
 	wait
 	end
 
@@ -7350,8 +7350,8 @@ Move_FOCUS_ENERGY: @ 81D1B59
 	panse_19 SE_W082, 192
 	call _81CBAC7
 	pause 8
-	createtask sub_80E1F8C, 2, 6, 2, 2, 2, 0, 11, 32767
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 32, 1
+	createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767
+	createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1
 	call _81CBAC7
 	pause 8
 	call _81CBAC7
@@ -7363,8 +7363,8 @@ Move_BIDE: @ 81D1B99
 	end
 _81D1BA3:
 	panse_1C SE_W036, 192, 9, 2
-	createtask sub_80E1F8C, 2, 6, 2, 2, 2, 0, 11, 31
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 32, 1
+	createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31
+	createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1
 	wait
 	end
 _81D1BCF:
@@ -7372,26 +7372,26 @@ _81D1BCF:
 	monbg 3
 	setalpha 12, 8
 	panse_1C SE_W036, 192, 9, 2
-	createtask sub_80E2A38, 10, 5, 2, 2, 0, 11, 31
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 32, 1
+	createtask sub_80E2A38, 10, 2, 2, 0, 11, 31
+	createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 24, 0, 0, 4
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 4
 	wait
-	createtask sub_80A8154, 2, 5, 0, 2, 0, 12, 1
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 16, 1
+	createtask sub_80A8154, 2, 0, 2, 0, 12, 1
+	createtask sub_80A7FA0, 2, 1, 3, 0, 16, 1
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 4, 18, -8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 18, -8, 1, 1
 	pause 5
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 4, -18, 8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, -18, 8, 1, 1
 	pause 5
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, 4, -8, -5, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 1, -8, -5, 1, 1
 	wait
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 7
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7
 	wait
-	createtask sub_80E2A38, 10, 5, 2, 2, 11, 0, 31
+	createtask sub_80E2A38, 10, 2, 2, 11, 0, 31
 	wait
 	clearmonbg 3
 	blendoff
@@ -7402,7 +7402,7 @@ Move_STRING_SHOT: @ 81D1C98
 	loadsprite 10180
 	monbg 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 5, 1, 2, 0, 9, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 0, 9, 0
 	wait
 	panse_1C SE_W081, 192, 9, 6
 	call _81D1D56
@@ -7425,19 +7425,19 @@ Move_STRING_SHOT: @ 81D1C98
 	call _81D1D56
 	wait
 	panse_19 SE_W081B, 63
-	sprite gBattleAnimSpriteTemplate_83DAB40, 130, 2, 0, 10
+	sprite gBattleAnimSpriteTemplate_83DAB40, 130, 0, 10
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DAB40, 130, 2, 0, -2
+	sprite gBattleAnimSpriteTemplate_83DAB40, 130, 0, -2
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DAB40, 130, 2, 0, 22
+	sprite gBattleAnimSpriteTemplate_83DAB40, 130, 0, 22
 	wait
 	clearmonbg 3
 	pause 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 5, 1, 2, 9, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 9, 0, 0
 	end
 _81D1D56:
-	sprite gBattleAnimSpriteTemplate_83DAB28, 130, 5, 20, 0, 512, 20, 1
+	sprite gBattleAnimSpriteTemplate_83DAB28, 130, 20, 0, 512, 20, 1
 	pause 1
 	ret
 
@@ -7446,7 +7446,7 @@ Move_SPIDER_WEB: @ 81D1D6A
 	loadsprite 10180
 	monbg 3
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 5, 1, 2, 0, 9, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 0, 9, 0
 	wait
 	monbgprio_28 1
 	panse_1C SE_W081, 192, 9, 6
@@ -7470,10 +7470,10 @@ Move_SPIDER_WEB: @ 81D1D6A
 	wait
 	clearmonbg 3
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 5, 1, 2, 9, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 5, 1, 2, 9, 0, 0
 	end
 _81D1DF7:
-	sprite gBattleAnimSpriteTemplate_83DAB28, 130, 5, 20, 0, 512, 20, 0
+	sprite gBattleAnimSpriteTemplate_83DAB28, 130, 20, 0, 512, 20, 0
 	pause 1
 	ret
 
@@ -7485,9 +7485,9 @@ _81D1E14:
 _81D1E16:
 	loadsprite 10009
 	panse_19 SE_W016, 192
-	sprite gBattleAnimSpriteTemplate_83D765C, 2, 7, 32, 0, 16, 16, 0, 7, 40
-	sprite gBattleAnimSpriteTemplate_83D765C, 2, 7, 32, 0, 16, 16, 85, 7, 40
-	sprite gBattleAnimSpriteTemplate_83D765C, 2, 7, 32, 0, 16, 16, 170, 7, 40
+	sprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 0, 7, 40
+	sprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 85, 7, 40
+	sprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 170, 7, 40
 	wait
 	panse_19 SE_W016B, 192
 	jump _81D1E14
@@ -7497,17 +7497,17 @@ _81D1E66:
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, 8, 0, 0, 22, 2, 1
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, 8, 0, 0, 22, 2, 1
 	pause 2
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, -8, 16, 14, 22, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -8, 16, 14, 22, 1, 1
 	pause 2
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 7, 14, 12, -16, -14, 22, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, 12, -16, -14, 22, 0, 1
 	pause 17
 	panse_19 SE_W013, 63
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 10, 1
-	createtask sub_80A7FA0, 2, 5, 3, 2, 0, 10, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 10, 1
+	createtask sub_80A7FA0, 2, 3, 2, 0, 10, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -7519,7 +7519,7 @@ Move_DISABLE: @ 81D1EF1
 	monbgprio_28 1
 	setalpha 8, 8
 	panse_19 SE_W197, 192
-	sprite gBattleAnimSpriteTemplate_83930F4, 13, 2, 24, -16
+	sprite gBattleAnimSpriteTemplate_83930F4, 13, 24, -16
 	wait
 	createtask sub_80D03C4, 5
 	panse_1C SE_W020, 63, 15, 4
@@ -7535,7 +7535,7 @@ Move_RECOVER: @ 81D1F1F
 	monbg 2
 	setalpha 12, 8
 	panse_1C SE_W025, 192, 13, 3
-	createtask sub_80E1F8C, 2, 6, 2, 0, 6, 0, 11, 12287
+	createtask sub_80E1F8C, 2, 2, 0, 6, 0, 11, 12287
 	call _81D1F5F
 	call _81D1F5F
 	call _81D1F5F
@@ -7547,19 +7547,19 @@ Move_RECOVER: @ 81D1F1F
 	wait
 	end
 _81D1F5F:
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 40, -10, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 40, -10, 13
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -35, -10, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -35, -10, 13
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 15, -40, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 15, -40, 13
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -10, -32, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -10, -32, 13
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 25, -20, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 25, -20, 13
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, -40, -20, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, -40, -20, 13
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 3, 5, -40, 13
+	sprite gBattleAnimSpriteTemplate_83D62EC, 2, 5, -40, 13
 	pause 3
 	ret
 
@@ -7568,14 +7568,14 @@ Move_MIMIC: @ 81D1FC9
 	monbg_22 3
 	setalpha 11, 5
 	panse_1B SE_W107, 63, 192, 253, 0
-	createtask sub_80CB340, 5, 2, 128, 24
+	createtask sub_80CB340, 5, 128, 24
 	pause 15
-	sprite gBattleAnimSpriteTemplate_83D65E8, 130, 2, -12, 24
+	sprite gBattleAnimSpriteTemplate_83D65E8, 130, -12, 24
 	pause 10
 	setvar 7, -1
 	wait
 	panse_19 SE_W036, 192
-	createtask sub_80E1F8C, 2, 6, 2, 0, 2, 0, 11, 32767
+	createtask sub_80E1F8C, 2, 2, 0, 2, 0, 11, 32767
 	wait
 	clearmonbg_23 3
 	blendoff
@@ -7584,14 +7584,14 @@ Move_MIMIC: @ 81D1FC9
 Move_CONSTRICT: @ 81D2013
 	loadsprite 10186
 	panse_1C SE_W010, 63, 6, 4
-	sprite gBattleAnimSpriteTemplate_83D65A0, 132, 4, 0, 16, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 2
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D65A0, 131, 4, 0, 0, 0, 2
-	sprite gBattleAnimSpriteTemplate_83D65A0, 130, 4, 0, 8, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D65A0, 131, 0, 0, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D65A0, 130, 0, 8, 1, 2
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D65A0, 131, 4, 0, -8, 1, 2
+	sprite gBattleAnimSpriteTemplate_83D65A0, 131, 0, -8, 1, 2
 	pause 8
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 6, 1
+	createtask sub_80A7FA0, 2, 1, 3, 0, 6, 1
 	pause 20
 	panse_19 SE_W020, 63
 	setvar 7, -1
@@ -7620,18 +7620,18 @@ _81D2084:
 	monbg 3
 	panse_19 SE_W171, 63
 	sprite gBattleAnimSpriteTemplate_83DAF38, 130
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 14, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 14, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 16, 0, 0
 	wait
 	clearmonbg 3
 	end
 _81D20EB:
-	createtask sub_80A7FA0, 2, 5, 0, 4, 0, 10, 0
+	createtask sub_80A7FA0, 2, 0, 4, 0, 10, 0
 	panse_19 SE_W020, 192
 	ret
 _81D2101:
-	createtask sub_80A8B88, 5, 5, 0, 10, 1536, 3, 0
+	createtask sub_80A8B88, 5, 0, 10, 1536, 3, 0
 	wait
 	pause 10
 	call _81D211C
@@ -7640,7 +7640,7 @@ _81D2101:
 _81D211C:
 	panse_19 SE_W082, 192
 	createtask sub_80E2F2C, 5
-	createtask sub_80E1F8C, 5, 6, 2, 4, 2, 0, 10, 31
+	createtask sub_80E1F8C, 5, 2, 4, 2, 0, 10, 31
 	ret
 
 Move_SOFT_BOILED: @ 81D213B
@@ -7649,16 +7649,16 @@ Move_SOFT_BOILED: @ 81D213B
 	loadsprite 10031
 	monbg 2
 	panse_19 SE_W039, 192
-	createtask sub_80A7E7C, 2, 5, 0, 0, 2, 6, 1
-	sprite gBattleAnimSpriteTemplate_83D78BC, 4, 3, 0, 16, 0
-	sprite gBattleAnimSpriteTemplate_83D78BC, 4, 3, 0, 16, 1
+	createtask sub_80A7E7C, 2, 0, 0, 2, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D78BC, 4, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83D78BC, 4, 0, 16, 1
 	pause 120
 	pause 7
 	panse_19 SE_W030, 192
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 31, 3, 10, 0, 31500
-	sprite gBattleAnimSpriteTemplate_83D7928, 3, 4, 31, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 3, 10, 0, 31500
+	sprite gBattleAnimSpriteTemplate_83D7928, 3, 31, 16, 0, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D7928, 3, 4, 31, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7928, 3, 31, 16, 0, 1
 	pause 60
 	setvar 7, -1
 	wait
@@ -7671,45 +7671,45 @@ Move_HEAL_BELL: @ 81D21BD
 	loadsprite 10206
 	loadsprite 10203
 	loadsprite 10049
-	createtask sub_80E2A38, 10, 5, 10, 0, 0, 10, 32767
+	createtask sub_80E2A38, 10, 10, 0, 0, 10, 32767
 	wait
 	createtask sub_80D1ADC, 5
-	sprite gBattleAnimSpriteTemplate_83D7A44, 2, 4, 0, -24, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D7A44, 2, 0, -24, 0, 1
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, 48, -18, 35, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, -48, 20, 30, 1, 1
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, -38, -29, 30, 2, 2
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, 36, 18, 30, 3, 3
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, 48, -18, 35, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, -48, 20, 30, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, -38, -29, 30, 2, 2
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, 36, 18, 30, 3, 3
 	call _81D2372
 	pause 33
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, 19, 26, 35, 4, 4
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, -34, -12, 30, 5, 5
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, 41, -20, 34, 6, 6
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, -15, 26, 32, 7, 0
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, 19, 26, 35, 4, 4
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, -34, -12, 30, 5, 5
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, 41, -20, 34, 6, 6
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, -15, 26, 32, 7, 0
 	call _81D2372
 	pause 33
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, -48, 18, 31, 0, 2
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, 48, -20, 30, 2, 5
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, 38, 29, 33, 4, 3
-	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 7, 0, -24, -36, -18, 30, 6, 1
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, -48, 18, 31, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, 48, -20, 30, 2, 5
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, 38, 29, 33, 4, 3
+	sprite gBattleAnimSpriteTemplate_83D7A68, 40, 0, -24, -36, -18, 30, 6, 1
 	call _81D2372
 	wait
 	createtask sub_80D1B80, 5
 	wait
 	panse_19 SE_W234, 192
-	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, 7, -15, 0, 0, 0, 32, 60, 1
+	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, -15, 0, 0, 0, 32, 60, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, 7, 12, -5, 0, 0, 32, 60, 1
+	sprite gBattleAnimSpriteTemplate_83D6CA0, 16, 12, -5, 0, 0, 32, 60, 1
 	wait
 	panse_19 SE_REAPOKE, 192
-	createtask sub_80E2A7C, 10, 5, 4, 3, 10, 0, 31500
-	createtask sub_80E2A38, 10, 5, 10, 3, 10, 0, 32767
-	sprite gBattleAnimSpriteTemplate_83D7974, 16, 4, 0, 0, 0, 1
+	createtask sub_80E2A7C, 10, 4, 3, 10, 0, 31500
+	createtask sub_80E2A38, 10, 10, 3, 10, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83D7974, 16, 0, 0, 0, 1
 	end
 _81D2372:
-	createtask sub_80E2A7C, 10, 5, 4, 3, 8, 0, 31500
-	createtask sub_80E2A38, 10, 5, 10, 3, 2, 10, 32767
-	sprite gBattleAnimSpriteTemplate_83D7928, 40, 4, 0, -24, 0, 1
+	createtask sub_80E2A7C, 10, 4, 3, 8, 0, 31500
+	createtask sub_80E2A38, 10, 10, 3, 2, 10, 32767
+	sprite gBattleAnimSpriteTemplate_83D7928, 40, 0, -24, 0, 1
 	panse_19 SE_W215, 192
 	ret
 
@@ -7718,102 +7718,102 @@ Move_FAKE_OUT: @ 81D23A8
 	createtask sub_80D1CD0, 5
 	wait
 	panse_19 SE_W166, 63
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 5, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 5, 1
 	createtask sub_80D1E38, 3
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 16, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 16, 0, 32767
 	end
 
 Move_SCARY_FACE: @ 81D23E3
 	loadsprite 10218
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 27, 3, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 27, 3, 0, 16, 0
 	panse_19 SE_W060, 192
 	wait
 	pause 10
 	panse_19 SE_W043, 192
 	createtask sub_80D23B4, 5
 	pause 13
-	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 2, -16, -8
-	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 2, 16, -8
+	sprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8
+	sprite gBattleAnimSpriteTemplate_83D7B94, 0, 16, -8
 	wait
-	createtask sub_80D60B4, 3, 3, 20, 1, 0
+	createtask sub_80D60B4, 3, 20, 1, 0
 	panse_19 SE_W081B, 63
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 27, 3, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 27, 3, 16, 0, 0
 	wait
 	end
 
 Move_SWEET_KISS: @ 81D2446
 	loadsprite 10216
 	loadsprite 10220
-	sprite gBattleAnimSpriteTemplate_83D7BB8, 130, 2, 16, -48
+	sprite gBattleAnimSpriteTemplate_83D7BB8, 130, 16, -48
 	panse_19 SE_W215, 63
 	pause 23
 	panse_19 SE_W215, 63
 	pause 23
 	panse_19 SE_W215, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, 160, -30
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 160, -30
 	panse_19 SE_W213, 63
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, -256, -42
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, 128, -14
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, 416, -38
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, -128, -22
-	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 2, -384, -31
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, -256, -42
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 128, -14
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, 416, -38
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, -128, -22
+	sprite gBattleAnimSpriteTemplate_83D7AC8, 131, -384, -31
 	end
 
 Move_LOVELY_KISS: @ 81D24AF
 	loadsprite 10219
 	loadsprite 10221
-	sprite gBattleAnimSpriteTemplate_83D7C00, 130, 2, 0, -24
+	sprite gBattleAnimSpriteTemplate_83D7C00, 130, 0, -24
 	panse_19 SE_W060B, 63
 	wait
 	panse_19 SE_W213, 63
-	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, 2, -256, -42
-	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, 2, 128, -14
-	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, 2, 416, -38
-	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, 2, -128, -22
+	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, -256, -42
+	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, 128, -14
+	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, 416, -38
+	sprite gBattleAnimSpriteTemplate_83D7BD0, 131, -128, -22
 	end
 
 Move_FURY_SWIPES: @ 81D24F6
 	loadsprite 10222
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 5, 5
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 5, 5
 	pause 4
 	panse_19 SE_W010, 63
-	sprite gBattleAnimSpriteTemplate_83D7C48, 130, 3, 16, 0, 1
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D7C48, 130, 16, 0, 1
+	createtask sub_80A7FA0, 2, 1, 3, 0, 5, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 130, 2, 5, 5
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 130, 5, 5
 	pause 4
 	panse_19 SE_W010, 63
-	sprite gBattleAnimSpriteTemplate_83D7C48, 130, 3, -16, 0, 0
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 7, 1
+	sprite gBattleAnimSpriteTemplate_83D7C48, 130, -16, 0, 0
+	createtask sub_80A7FA0, 2, 1, 4, 0, 7, 1
 	end
 
 Move_INGRAIN: @ 81D255A
 	loadsprite 10223
 	loadsprite 10147
-	sprite gBattleAnimSpriteTemplate_83D6658, 2, 5, 16, 26, -1, 2, 150
+	sprite gBattleAnimSpriteTemplate_83D6658, 2, 16, 26, -1, 2, 150
 	panse_19 SE_W010, 192
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D6658, 2, 5, -32, 20, 1, 1, 140
+	sprite gBattleAnimSpriteTemplate_83D6658, 2, -32, 20, 1, 1, 140
 	panse_19 SE_W010, 192
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D6658, 2, 5, 32, 22, 1, 0, 130
+	sprite gBattleAnimSpriteTemplate_83D6658, 2, 32, 22, 1, 0, 130
 	panse_19 SE_W010, 192
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D6658, 2, 5, -16, 25, -1, 3, 120
+	sprite gBattleAnimSpriteTemplate_83D6658, 2, -16, 25, -1, 3, 120
 	panse_19 SE_W010, 192
 	pause 40
-	sprite gBattleAnimSpriteTemplate_83D6698, 3, 5, 32, 26, -1, 3, 30
+	sprite gBattleAnimSpriteTemplate_83D6698, 3, 32, 26, -1, 3, 30
 	pause 5
 	panse_19 SE_W145C, 192
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6698, 3, 5, -48, 20, 1, 2, 30
+	sprite gBattleAnimSpriteTemplate_83D6698, 3, -48, 20, 1, 2, 30
 	panse_19 SE_W145C, 192
 	pause 5
 	panse_19 SE_W145C, 192
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6698, 3, 5, 48, 26, -2, 3, 18
+	sprite gBattleAnimSpriteTemplate_83D6698, 3, 48, 26, -2, 3, 18
 	panse_19 SE_W145C, 192
 	pause 10
 	wait
@@ -7822,7 +7822,7 @@ Move_INGRAIN: @ 81D255A
 Move_PRESENT: @ 81D260B
 	loadsprite 10224
 	createtask sub_812C960, 2
-	sprite gBattleAnimSpriteTemplate_83D671C, 130, 5, 0, -5, 10, 2, -1
+	sprite gBattleAnimSpriteTemplate_83D671C, 130, 0, -5, 10, 2, -1
 	panse_19 SE_W039, 192
 	pause 14
 	panse_19 SE_W145B, 192
@@ -7837,41 +7837,41 @@ Move_PRESENT: @ 81D260B
 _81D264E:
 	loadsprite 10198
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 131, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 131, 0, 0, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 131, 4, 24, -24, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 131, 24, -24, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 131, 4, -16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 131, -16, 16, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 131, 4, -24, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 131, -24, -12, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 131, 4, 16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 131, 16, 16, 1, 1
 	end
 _81D26B9:
 	loadsprite 10195
 	loadsprite 10031
 	panse_19 SE_W234, 63
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, -16, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, -16, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, 16, 32, -3, -1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, 16, 32, -3, -1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, 32, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, 32, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, -32, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, -32, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, 0, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, 0, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, -8, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, -8, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, -8, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, -8, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, 24, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, 24, 32, -3, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D6764, 132, 4, -24, 32, -3, 1
+	sprite gBattleAnimSpriteTemplate_83D6764, 132, -24, 32, -3, 1
 	wait
 	waitsound
 	call Unknown_81D5F3E
@@ -7880,70 +7880,70 @@ _81D26B9:
 Move_BATON_PASS: @ 81D2762
 	loadsprite 10226
 	panse_19 SE_W226, 192
-	createtask sub_80E1F8C, 2, 6, 31, 1, 2, 0, 11, 31455
+	createtask sub_80E1F8C, 2, 31, 1, 2, 0, 11, 31455
 	sprite gBattleAnimSpriteTemplate_84024D0, 2
 	end
 
 Move_PERISH_SONG: @ 81D2784
 	loadsprite 10206
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 1, 1, 16
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 2, 1, 32
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 3, 2, 48
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 4, 2, 64
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 5, 0, 80
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 6, 0, 96
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 7, 1, 112
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 8, 2, 128
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 9, 0, 144
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 10, 2, 160
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 11, 0, 176
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 12, 1, 192
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 13, 3, 208
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 14, 3, 224
-	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 15, 0, 240
-	sprite gBattleAnimSpriteTemplate_83D7D34, 4, 3, 15, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 1, 1, 16
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 2, 1, 32
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 3, 2, 48
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 4, 2, 64
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 5, 0, 80
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 6, 0, 96
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 7, 1, 112
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 8, 2, 128
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 9, 0, 144
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 10, 2, 160
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 11, 0, 176
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 12, 1, 192
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 13, 3, 208
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 14, 3, 224
+	sprite gBattleAnimSpriteTemplate_83D7D1C, 4, 15, 0, 240
+	sprite gBattleAnimSpriteTemplate_83D7D34, 4, 15, 0, 0
 	pause 20
 	panse_1B SE_W195, 192, 63, 2, 0
 	pause 80
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 0, 16, 0
-	createtask sub_80E0E24, 5, 2, 4, 0
-	createtask sub_80E0E24, 5, 2, 5, 0
-	createtask sub_80E0E24, 5, 2, 6, 0
-	createtask sub_80E0E24, 5, 2, 7, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 16, 0
+	createtask sub_80E0E24, 5, 4, 0
+	createtask sub_80E0E24, 5, 5, 0
+	createtask sub_80E0E24, 5, 6, 0
+	createtask sub_80E0E24, 5, 7, 0
 	pause 100
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 16, 0, 0
-	createtask sub_80E0E24, 5, 2, 4, 1
-	createtask sub_80E0E24, 5, 2, 5, 1
-	createtask sub_80E0E24, 5, 2, 6, 1
-	createtask sub_80E0E24, 5, 2, 7, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 16, 0, 0
+	createtask sub_80E0E24, 5, 4, 1
+	createtask sub_80E0E24, 5, 5, 1
+	createtask sub_80E0E24, 5, 6, 1
+	createtask sub_80E0E24, 5, 7, 1
 	wait
 	end
 
 Move_SLEEP_TALK: @ 81D28ED
 	loadsprite 10228
-	createtask sub_80A8B88, 5, 5, 0, 4, 4096, 2, 0
+	createtask sub_80A8B88, 5, 0, 4, 4096, 2, 0
 	pause 20
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -1
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1
 	panse_19 SE_W173, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -1
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -1
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1
 	pause 20
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -5
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -5
 	panse_19 SE_W173, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -5
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -5
 	pause 6
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -5
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -5
 	pause 20
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -3
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -3
 	panse_19 SE_W173, 192
 	pause 6
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -3
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -3
 	pause 6
-	sprite gBattleAnimSpriteTemplate_84022F0, 130, 4, 0, 20, 5, -3
+	sprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -3
 	wait
 	end
 
@@ -7961,7 +7961,7 @@ _81D29D6:
 	waitbgfadeout
 	sprite gBattleAnimSpriteTemplate_840233C, 130
 	waitbgfadein
-	createtask sub_80A7E7C, 3, 5, 1, 0, 10, 10, 1
+	createtask sub_80A7E7C, 3, 1, 0, 10, 10, 1
 	panse_19 SE_W043, 63
 	pause 20
 	restorebg
@@ -7980,50 +7980,50 @@ _81D2A08:
 
 Move_TRI_ATTACK: @ 81D2A0F
 	loadsprite 10230
-	sprite gBattleAnimSpriteTemplate_8402458, 130, 2, 16, 0
+	sprite gBattleAnimSpriteTemplate_8402458, 130, 16, 0
 	panse_19 SE_W161, 192
 	pause 20
 	panse_19 SE_W161, 192
 	pause 20
-	createtask_1F sub_812B058, 7, 220, -64, 63, 5, 6, 0, 7
+	createtask_1F sub_812B058, 220, -64, 63, 5, 6, 0, 7
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 16, 0
 	pause 16
 	loadsprite 10033
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, -1, 0
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 0
 	panse_19 SE_W172B, 63
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 0, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, -1, -1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 2, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 1, -1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 1, -1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, -1, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 1, -2
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 1, -2
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D9520, 130, 6, 0, 0, 30, 30, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 3, 1
 	pause 2
-	createtask sub_80D60B4, 2, 4, 20, 3, 1, 1
+	createtask sub_80D60B4, 2, 20, 3, 1, 1
 	wait
 	loadsprite 10037
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	panse_19 SE_W161B, 63
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, -48
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -48
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, -16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -16
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 2, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, 16
 	pause 20
-	createtask sub_80D60B4, 2, 4, 20, 3, 1, 0
+	createtask sub_80D60B4, 2, 20, 3, 1, 0
 	pause 2
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	wait
 	loadsprite 10141
 	call Unknown_81D5C36
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 0
 	wait
 	end
 
@@ -8034,26 +8034,26 @@ Move_WILL_O_WISP: @ 81D2B83
 	monbgprio_2A 1
 	panse_19 SE_W052, 192
 	panse_1D SE_W052, 192, 10
-	createtask sub_812B374, 2, 4, -64, -64, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D974C, 2, 3, 0, 0, 0
+	createtask sub_812B374, 2, -64, -64, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D974C, 2, 0, 0, 0
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D974C, 3, 3, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D974C, 3, 0, 0, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D974C, 4, 3, 0, 0, 2
+	sprite gBattleAnimSpriteTemplate_83D974C, 4, 0, 0, 2
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D974C, 4, 3, 0, 0, 3
+	sprite gBattleAnimSpriteTemplate_83D974C, 4, 0, 0, 3
 	pause 40
-	createtask sub_812B374, 2, 4, -64, 63, 2, 0
+	createtask sub_812B374, 2, -64, 63, 2, 0
 	wait
 	monbgprio_29
 	panse_19 SE_W172B, 63
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 13, 1
-	sprite gBattleAnimSpriteTemplate_83D977C, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83D977C, 2, 1, 42
-	sprite gBattleAnimSpriteTemplate_83D977C, 2, 1, 84
-	sprite gBattleAnimSpriteTemplate_83D977C, 2, 1, 126
-	sprite gBattleAnimSpriteTemplate_83D977C, 2, 1, 168
-	sprite gBattleAnimSpriteTemplate_83D977C, 2, 1, 210
+	createtask sub_80A7FA0, 2, 1, 4, 0, 13, 1
+	sprite gBattleAnimSpriteTemplate_83D977C, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D977C, 2, 42
+	sprite gBattleAnimSpriteTemplate_83D977C, 2, 84
+	sprite gBattleAnimSpriteTemplate_83D977C, 2, 126
+	sprite gBattleAnimSpriteTemplate_83D977C, 2, 168
+	sprite gBattleAnimSpriteTemplate_83D977C, 2, 210
 	wait
 	clearmonbg 3
 	end
@@ -8062,18 +8062,18 @@ Move_ENCORE: @ 81D2C41
 	loadsprite 10227
 	loadsprite 10247
 	createtask sub_812CC44, 2
-	createtask sub_80E2D78, 2, 5, 248, 3, 0, 10, 0
+	createtask sub_80E2D78, 2, 248, 3, 0, 10, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_840238C, 130, 2, 0, -8
-	sprite gBattleAnimSpriteTemplate_84023A4, 2, 5, -2, 0, 0, 0, 9
-	sprite gBattleAnimSpriteTemplate_84023A4, 2, 5, 2, 0, 1, 0, 9
-	sprite gBattleAnimSpriteTemplate_84023BC, 3, 5, -2, 0, 0, 0, 9
-	sprite gBattleAnimSpriteTemplate_84023BC, 3, 5, 2, 0, 1, 0, 9
+	sprite gBattleAnimSpriteTemplate_840238C, 130, 0, -8
+	sprite gBattleAnimSpriteTemplate_84023A4, 2, -2, 0, 0, 0, 9
+	sprite gBattleAnimSpriteTemplate_84023A4, 2, 2, 0, 1, 0, 9
+	sprite gBattleAnimSpriteTemplate_84023BC, 3, -2, 0, 0, 0, 9
+	sprite gBattleAnimSpriteTemplate_84023BC, 3, 2, 0, 1, 0, 9
 	pause 16
-	createtask sub_812B340, 5, 2, 223, 63
-	createtask sub_80A8B88, 5, 5, 1, 8, 1536, 5, 1
+	createtask sub_812B340, 5, 223, 63
+	createtask sub_80A8B88, 5, 1, 8, 1536, 5, 1
 	wait
-	createtask sub_80E2D78, 2, 5, 248, 3, 10, 0, 1
+	createtask sub_80E2D78, 2, 248, 3, 10, 0, 1
 	wait
 	createtask sub_812CCA8, 2
 	end
@@ -8081,8 +8081,8 @@ Move_ENCORE: @ 81D2C41
 Move_TRICK: @ 81D2CE8
 	loadsprite 10224
 	loadsprite 10207
-	sprite gBattleAnimSpriteTemplate_83D67F4, 2, 2, -40, 80
-	sprite gBattleAnimSpriteTemplate_83D67F4, 2, 2, -40, 208
+	sprite gBattleAnimSpriteTemplate_83D67F4, 2, -40, 80
+	sprite gBattleAnimSpriteTemplate_83D67F4, 2, -40, 208
 	pause 16
 	panse_19 SE_W166, 0
 	createtask sub_80D1E38, 3
@@ -8101,15 +8101,15 @@ Move_TRICK: @ 81D2CE8
 	panse_19 SE_W104, 0
 	pause 16
 	panse_19 SE_W213, 0
-	createtask sub_80A7E7C, 3, 5, 0, 5, 0, 7, 2
-	createtask sub_80A7E7C, 3, 5, 1, 5, 0, 7, 2
+	createtask sub_80A7E7C, 3, 0, 5, 0, 7, 2
+	createtask sub_80A7E7C, 3, 1, 5, 0, 7, 2
 	wait
 	end
 
 Move_WISH: @ 81D2D66
 	loadsprite 10233
 	loadsprite 10049
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 0, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 10, 0
 	wait
 	panse_27 SE_W115, 63, 192, 253, 0
 	sprite gBattleAnimSpriteTemplate_84024E8, 40
@@ -8118,36 +8118,36 @@ Move_WISH: @ 81D2D66
 	panse_1C SE_W215, 192, 16, 3
 	call Unknown_81D5ECA
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 10, 0, 0
 	wait
 	end
 
 Move_STOCKPILE: @ 81D2DAE
 	loadsprite 10235
 	panse_19 SE_W025, 192
-	createtask sub_80E1F8C, 2, 6, 2, 8, 1, 0, 12, 32767
+	createtask sub_80E1F8C, 2, 2, 8, 1, 0, 12, 32767
 	createtask sub_812D674, 5
 	call _81D2DEC
 	call _81D2DEC
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, 0, 12, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 0, 12, 0, 32767
 	end
 _81D2DEC:
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, 55, 55, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, 55, 55, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, -55, -55, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, -55, -55, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, 0, 55, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, 0, 55, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, 0, -55, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, 0, -55, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, 55, -34, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, 55, -34, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, 55, 34, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, 55, 34, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, -55, -34, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, -55, -34, 13
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D6350, 2, 3, -55, 34, 13
+	sprite gBattleAnimSpriteTemplate_83D6350, 2, -55, 34, 13
 	pause 1
 	ret
 
@@ -8156,46 +8156,46 @@ Move_SPIT_UP: @ 81D2E65
 	loadsprite 10135
 	panse_19 SE_W036, 192
 	createtask sub_812D6CC, 5
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 8, 2
+	createtask sub_80A7FA0, 2, 0, 1, 0, 8, 2
 	pause 45
 	panse_19 SE_W255, 192
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 0, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 32, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 64, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 96, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 128, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 160, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 192, 12
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 2, 224, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 0, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 32, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 64, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 96, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 128, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 160, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 192, 12
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 224, 12
 	pause 5
 	jumpif 2, _81D2F32
 	jumpif 3, _81D2F5B
 _81D2EF5:
 	pause 5
-	createtask sub_80A9058, 2, 5, 0, 1, 8, 1, 0
+	createtask sub_80A9058, 2, 0, 1, 8, 1, 0
 	panse_19 SE_W003, 63
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -12, 10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, -12, 10, 1, 1
 	pause 5
 	panse_19 SE_W003, 63
-	sprite gBattleAnimSpriteTemplate_83DB538, 131, 4, 12, -10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB538, 131, 12, -10, 1, 1
 	wait
 	end
 _81D2F32:
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 16
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 80
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 144
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 208
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 16
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 80
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 144
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 208
 	jump _81D2EF5
 _81D2F5B:
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 16
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 48
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 80
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 112
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 144
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 176
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 208
-	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 1, 240
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 16
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 48
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 80
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 112
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 144
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 176
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 208
+	sprite gBattleAnimSpriteTemplate_83D7B60, 2, 240
 	jump _81D2EF5
 
 Move_SWALLOW: @ 81D2FA8
@@ -8203,10 +8203,10 @@ Move_SWALLOW: @ 81D2FA8
 	loadsprite 10031
 	panse_19 SE_W036, 192
 	createtask sub_812D790, 5
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 8, 2
+	createtask sub_80A7FA0, 2, 0, 1, 0, 8, 2
 	pause 38
 	panse_19 SE_W255, 192
-	createtask sub_80A7FA0, 2, 5, 0, 2, 0, 12, 1
+	createtask sub_80A7FA0, 2, 0, 2, 0, 12, 1
 	call _81D2FF9
 	jumpif 2, _81D303B
 	jumpif 3, _81D3045
@@ -8215,15 +8215,15 @@ _81D2FF2:
 	call Unknown_81D5EF5
 	end
 _81D2FF9:
-	sprite gBattleAnimSpriteTemplate_8402578, 2, 2, 0, -8
+	sprite gBattleAnimSpriteTemplate_8402578, 2, 0, -8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_8402578, 2, 2, -24, -8
+	sprite gBattleAnimSpriteTemplate_8402578, 2, -24, -8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_8402578, 2, 2, 16, -8
+	sprite gBattleAnimSpriteTemplate_8402578, 2, 16, -8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_8402578, 2, 2, -16, -8
+	sprite gBattleAnimSpriteTemplate_8402578, 2, -16, -8
 	pause 1
-	sprite gBattleAnimSpriteTemplate_8402578, 2, 2, 24, -8
+	sprite gBattleAnimSpriteTemplate_8402578, 2, 24, -8
 	pause 1
 	ret
 _81D303B:
@@ -8238,7 +8238,7 @@ Move_TRANSFORM: @ 81D3054
 	monbg 0
 	panse_19 SE_W100, 192
 	panse_1D SE_W107, 192, 48
-	createtask sub_812D7E8, 2, 1, 0
+	createtask sub_812D7E8, 2, 0
 	wait
 	clearmonbg 0
 	end
@@ -8248,7 +8248,7 @@ Move_MORNING_SUN: @ 81D306C
 	loadsprite 10031
 	createtask sub_812DB84, 5
 	pause 8
-	createtask sub_80E2A38, 10, 5, 1921, 8, 0, 12, 32767
+	createtask sub_80E2A38, 10, 1921, 8, 0, 12, 32767
 	pause 14
 	call _81D30F2
 	call _81D30F2
@@ -8265,73 +8265,73 @@ Move_MORNING_SUN: @ 81D306C
 	call _81D30F2
 	call _81D30F2
 	call _81D30F2
-	createtask sub_80E2A38, 10, 5, 1921, 3, 12, 0, 32767
+	createtask sub_80E2A38, 10, 1921, 3, 12, 0, 32767
 	wait
 	waitsound
 	call Unknown_81D5EF5
 	end
 _81D30F2:
-	sprite gBattleAnimSpriteTemplate_84025EC, 2, 2, 30, 640
+	sprite gBattleAnimSpriteTemplate_84025EC, 2, 30, 640
 	pause 5
 	ret
 
 Move_SWEET_SCENT: @ 81D3100
 	loadsprite 10238
 	panse_19 SE_W230, 192
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 100, 0, 100
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 100, 0, 100
 	pause 25
 	setpan 0
 	call _81D3144
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 2, 55, 0
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 55, 0
 	setpan 63
-	createtask sub_80E1F8C, 2, 6, 20, 1, 5, 5, 13, 22207
+	createtask sub_80E1F8C, 2, 20, 1, 5, 5, 13, 22207
 	call _81D3144
 	wait
 	end
 _81D3144:
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 70, 1, 64
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 70, 1, 64
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 60, 0, 64
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 60, 0, 64
 	pause 5
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 80, 1, 64
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 80, 1, 64
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 58, 0, 120
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 58, 0, 120
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 100, 0, 120
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 100, 0, 120
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 90, 0, 64
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 90, 0, 64
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 48, 0, 64
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 48, 0, 64
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 95, 1, 80
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 95, 1, 80
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 100, 0, 120
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 100, 0, 120
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 75, 1, 64
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 75, 1, 64
 	pause 2
-	sprite gBattleAnimSpriteTemplate_84026A4, 2, 3, 85, 0, 120
+	sprite gBattleAnimSpriteTemplate_84026A4, 2, 85, 0, 120
 	pause 2
 	ret
 
 Move_HYPER_BEAM: @ 81D31EA
 	loadsprite 10147
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 4, 0, 16, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 0, 16, 0
 	wait
 	pause 10
 	panse_19 SE_W063, 192
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 4, 1
+	createtask sub_80A7FA0, 2, 0, 1, 0, 4, 1
 	wait
 	pause 30
-	createtask_1F sub_812B058, 7, 247, -64, 63, 1, 15, 0, 5
-	createtask sub_80A7E7C, 2, 5, 0, 0, 4, 50, 1
-	createtask sub_80E21A8, 2, 7, 10147, 1, 12, 31, 16, 0, 0
+	createtask_1F sub_812B058, 247, -64, 63, 1, 15, 0, 5
+	createtask sub_80A7E7C, 2, 0, 0, 4, 50, 1
+	createtask sub_80E21A8, 2, 10147, 1, 12, 31, 16, 0, 0
 	call _81D331B
 	call _81D331B
 	call _81D331B
 	call _81D331B
 	call _81D331B
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 50, 1
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 11, 26425
+	createtask sub_80A7FA0, 2, 1, 4, 0, 50, 1
+	createtask sub_80E2A38, 10, 4, 2, 0, 11, 26425
 	call _81D331B
 	call _81D331B
 	call _81D331B
@@ -8353,9 +8353,9 @@ Move_HYPER_BEAM: @ 81D31EA
 	call _81D331B
 	call _81D331B
 	call _81D331B
-	createtask sub_80E2A38, 10, 5, 4, 2, 11, 0, 26425
+	createtask sub_80E2A38, 10, 4, 2, 11, 0, 26425
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 4, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 4, 16, 0, 0
 	end
 _81D331B:
 	sprite gBattleAnimSpriteTemplate_83D6394, 130
@@ -8366,17 +8366,17 @@ _81D331B:
 Move_FLATTER: @ 81D332C
 	loadsprite 10227
 	loadsprite 10240
-	createtask sub_812B340, 5, 2, 223, 63
+	createtask sub_812B340, 5, 223, 63
 	createtask sub_812CC44, 2
-	createtask sub_80E2D78, 2, 5, 248, 3, 0, 10, 0
+	createtask sub_80E2D78, 2, 248, 3, 0, 10, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_8402720, 130, 3, 0, -8, 80
+	sprite gBattleAnimSpriteTemplate_8402720, 130, 0, -8, 80
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 5, 2, 1
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 5, 2, 1
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 5, 2, 1
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 5, 2, 1
 	pause 0
-	createtask sub_812B30C, 5, 2, 229, -64
+	createtask sub_812B30C, 5, 229, -64
 	call _81D3415
 	call _81D3415
 	call _81D3415
@@ -8397,44 +8397,44 @@ Move_FLATTER: @ 81D332C
 	call _81D3415
 	call _81D3415
 	pause 5
-	createtask sub_812B30C, 5, 2, 229, 63
+	createtask sub_812B30C, 5, 229, 63
 	wait
-	createtask sub_80E2D78, 2, 5, 248, 3, 10, 0, 1
+	createtask sub_80E2D78, 2, 248, 3, 10, 0, 1
 	wait
 	createtask sub_812CCA8, 2
 	end
 _81D3415:
-	sprite gBattleAnimSpriteTemplate_8402708, 40, 1, 0
-	sprite gBattleAnimSpriteTemplate_8402708, 40, 1, 1
+	sprite gBattleAnimSpriteTemplate_8402708, 40, 0
+	sprite gBattleAnimSpriteTemplate_8402708, 40, 1
 	ret
 
 Move_ROLE_PLAY: @ 81D3428
 	monbg 2
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 16, 32767
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 0, 10, 0
+	createtask sub_80E2A38, 10, 4, 2, 0, 16, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 0, 10, 0
 	wait
 	panse_19 SE_W161, 192
 	panse_1D SE_W197, 192, 30
 	createtask sub_812EFC8, 2
 	wait
 	clearmonbg 2
-	createtask sub_80E2A38, 10, 5, 4, 2, 16, 0, 32767
+	createtask sub_80E2A38, 10, 4, 2, 16, 0, 32767
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 2, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 10, 0, 0
 	end
 
 Move_REFRESH: @ 81D3485
 	loadsprite 10203
 	loadsprite 10049
 	panse_19 SE_W287, 192
-	createtask sub_81300A4, 2, 1, 0
+	createtask sub_81300A4, 2, 0
 	wait
 	panse_19 SE_W234, 192
 	call Unknown_81D5ECA
 	wait
 	panse_19 SE_REAPOKE, 192
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 31, 3, 10, 0, 31500
-	sprite gBattleAnimSpriteTemplate_83D7928, 3, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 3, 10, 0, 31500
+	sprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 0, 0
 	end
 
 Move_BLAZE_KICK: @ 81D34C8
@@ -8444,14 +8444,14 @@ Move_BLAZE_KICK: @ 81D34C8
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W172, 63
-	sprite gBattleAnimSpriteTemplate_83DA024, 131, 4, 0, 0, 1, 30
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 7, 32767
+	sprite gBattleAnimSpriteTemplate_83DA024, 131, 0, 0, 1, 30
+	createtask sub_80E2A38, 10, 4, 2, 0, 7, 32767
 	pause 30
 	panse_19 SE_W007, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 0, 0, 1, 0
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 14, 1
-	createtask sub_80E2A38, 10, 5, 4, 2, 0, 0, 32767
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 3, 1, 0, 8, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 0, 0, 1, 0
+	createtask sub_80A7FA0, 2, 1, 3, 0, 14, 1
+	createtask sub_80E2A38, 10, 4, 2, 0, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0
 	call _81D11A2
 	wait
 	clearmonbg 1
@@ -8468,38 +8468,38 @@ Move_HYPER_VOICE: @ 81D3550
 	end
 _81D3562:
 	createtask sub_812B2B8, 5
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 31, 3, 8, 0, 1023
-	createtask sub_80A8D34, 5, 5, -5, -5, 5, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D798C, 0, 7, 45, 0, 0, 0, 0, 0, 1
-	createtask sub_80A7FA0, 2, 5, 1, 1, 0, 6, 1
-	createtask sub_80A7FA0, 2, 5, 3, 1, 0, 6, 1
-	createtask sub_80E26BC, 2, 4, 1, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 3, 8, 0, 1023
+	createtask sub_80A8D34, 5, -5, -5, 5, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D798C, 0, 45, 0, 0, 0, 0, 0, 1
+	createtask sub_80A7FA0, 2, 1, 1, 0, 6, 1
+	createtask sub_80A7FA0, 2, 3, 1, 0, 6, 1
+	createtask sub_80E26BC, 2, 1, 0, 6, 1
 	ret
 
 Move_SAND_TOMB: @ 81D35D2
 	loadsprite 10074
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 0, 7, 563
-	createtask sub_80A7E7C, 5, 5, 1, 0, 2, 43, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 563
+	createtask sub_80A7E7C, 5, 1, 0, 2, 43, 1
 	panse_19 SE_W328, 63
 	call _81D361F
 	call _81D361F
 	call _81D361F
 	pause 22
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 7, 0, 563
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 7, 0, 563
 	wait
 	end
 _81D361F:
-	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 7, 0, 32, 528, 30, 10, 50, 1
+	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 0, 32, 528, 30, 10, 50, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 7, 0, 36, 480, 20, 13, -46, 1
+	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 0, 36, 480, 20, 13, -46, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 7, 0, 37, 576, 20, 5, 42, 1
+	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 0, 37, 576, 20, 5, 42, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 7, 0, 35, 400, 25, 8, -42, 1
+	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 0, 35, 400, 25, 8, -42, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 7, 0, 32, 512, 25, 13, 46, 1
+	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 0, 32, 512, 25, 13, 46, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 7, 0, 37, 464, 30, 12, -50, 1
+	sprite gBattleAnimSpriteTemplate_83DAC7C, 130, 0, 37, 464, 30, 12, -50, 1
 	pause 2
 	ret
 
@@ -8526,56 +8526,56 @@ Move_ARM_THRUST: @ 81D36CF
 	loadsprite 10135
 	monbgprio_28 1
 	setalpha 12, 8
-	createtask sub_80A8E04, 5, 4, 8, 5, 0, 0
+	createtask sub_80A8E04, 5, 8, 5, 0, 0
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 3
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 3
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83DA144, 130, 4, 10, -8, 14, 3
+	sprite gBattleAnimSpriteTemplate_83DA144, 130, 10, -8, 14, 3
 	wait
-	createtask sub_80A8E04, 5, 4, 8, 5, 0, 1
+	createtask sub_80A8E04, 5, 8, 5, 0, 1
 	panse_19 SE_W003, 63
 	ifelse _81D373C, _81D3750
 _81D3728:
-	createtask sub_80A7E7C, 5, 5, 1, 4, 0, 6, 1
+	createtask sub_80A7E7C, 5, 1, 4, 0, 6, 1
 	wait
 	blendoff
 	end
 _81D373C:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, 8, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 8, 0, 1, 2
 	jump _81D3728
 _81D3750:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -8, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -8, 0, 1, 2
 	jump _81D3728
 
 Move_MUDDY_WATER: @ 81D3764
 	panse_1B SE_W250, 192, 63, 2, 0
-	createtask sub_80D38BC, 2, 1, 1
+	createtask sub_80D38BC, 2, 1
 	wait
 	end
 
 Move_BULLET_SEED: @ 81D3776
 	loadsprite 10006
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 30, 1
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	createtask sub_80A7FA0, 2, 1, 2, 0, 30, 1
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D7628, 130, 2, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0
 	wait
 	end
 
@@ -8583,58 +8583,58 @@ Move_DRAGON_CLAW: @ 81D380C
 	loadsprite 10029
 	loadsprite 10039
 	panse_19 SE_W221B, 192
-	createtask sub_80E2A38, 10, 5, 2, 4, 0, 8, 639
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 15, 1
+	createtask sub_80E2A38, 10, 2, 4, 0, 8, 639
+	createtask sub_80A7E7C, 5, 0, 0, 2, 15, 1
 	call _81D39E9
 	call _81D39E9
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 28, 528, 30, 13, 50, 0
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 528, 30, 13, 50, 0
 	pause 2
-	createtask sub_812B30C, 5, 2, 136, 63
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, -10, -10, 0
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, -10, 10, 0
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 5, -4, 1, 10, 3, 1
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 32, 480, 20, 16, -46, 0
+	createtask sub_812B30C, 5, 136, 63
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, -10, -10, 0
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, -10, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, -4, 1, 10, 3, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 32, 480, 20, 16, -46, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 33, 576, 20, 8, 42, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 33, 576, 20, 8, 42, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 31, 400, 25, 11, -42, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 31, 400, 25, 11, -42, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 28, 512, 25, 16, 46, 0
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 512, 25, 16, 46, 0
 	pause 2
-	createtask sub_812B30C, 5, 2, 136, 63
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, 10, -10, 1
-	sprite gBattleAnimSpriteTemplate_83DB288, 130, 3, 10, 10, 1
-	sprite gBattleAnimSpriteTemplate_83DB428, 2, 5, -4, 1, 10, 3, 1
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 33, 464, 30, 15, -50, 0
+	createtask sub_812B30C, 5, 136, 63
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, 10, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DB288, 130, 10, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DB428, 2, -4, 1, 10, 3, 1
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 33, 464, 30, 15, -50, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 28, 528, 30, 13, 50, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 528, 30, 13, 50, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 32, 480, 20, 16, -46, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 32, 480, 20, 16, -46, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 33, 576, 20, 8, 42, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 33, 576, 20, 8, 42, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 31, 400, 25, 11, -42, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 31, 400, 25, 11, -42, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 28, 512, 25, 16, 46, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 512, 25, 16, 46, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 33, 464, 30, 15, -50, 0
-	createtask sub_80E2A38, 10, 5, 2, 4, 8, 0, 639
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 33, 464, 30, 15, -50, 0
+	createtask sub_80E2A38, 10, 2, 4, 8, 0, 639
 	wait
 	end
 _81D39E9:
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 28, 528, 30, 13, 50, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 528, 30, 13, 50, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 32, 480, 20, 16, -46, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 32, 480, 20, 16, -46, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 33, 576, 20, 8, 42, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 33, 576, 20, 8, 42, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 31, 400, 25, 11, -42, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 31, 400, 25, 11, -42, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 28, 512, 25, 16, 46, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 512, 25, 16, 46, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 7, 0, 33, 464, 30, 15, -50, 0
+	sprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 33, 464, 30, 15, -50, 0
 	pause 2
 	ret
 
@@ -8646,14 +8646,14 @@ Move_MUD_SHOT: @ 81D3A75
 	monbg 3
 	monbgprio_28 1
 	setalpha 12, 8
-	createtask sub_80A7E7C, 5, 5, 0, 0, 2, 46, 1
+	createtask sub_80A7E7C, 5, 0, 0, 2, 46, 1
 	pause 6
-	createtask sub_80D3630, 5, 1, 100
+	createtask sub_80D3630, 5, 100
 	panse_1B SE_W250, 192, 63, 1, 0
 	call _81D3AEF
 	call _81D3AEF
 	call _81D3AEF
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 43, 1
+	createtask sub_80A7E7C, 5, 1, 3, 0, 43, 1
 	call _81D3AEF
 	call _81D3AEF
 	call _81D3AEF
@@ -8667,9 +8667,9 @@ Move_MUD_SHOT: @ 81D3A75
 	blendoff
 	end
 _81D3AEF:
-	sprite gBattleAnimSpriteTemplate_83D920C, 3, 4, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D920C, 3, 10, 10, 0, 16
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D920C, 3, 4, 10, 10, 0, 16
+	sprite gBattleAnimSpriteTemplate_83D920C, 3, 10, 10, 0, 16
 	pause 2
 	ret
 
@@ -8681,16 +8681,16 @@ Move_METEOR_MASH: @ 81D3B12
 	fadetobg 16
 	waitbgfadein
 	wait
-	sprite gBattleAnimSpriteTemplate_8402A3C, 131, 5, -48, -64, 72, 32, 30
+	sprite gBattleAnimSpriteTemplate_8402A3C, 131, -48, -64, 72, 32, 30
 	pause 10
-	sprite gBattleAnimSpriteTemplate_8402A3C, 131, 5, -112, -64, 8, 32, 30
+	sprite gBattleAnimSpriteTemplate_8402A3C, 131, -112, -64, 8, 32, 30
 	pause 40
-	sprite gBattleAnimSpriteTemplate_83DA024, 131, 4, 0, 0, 0, 30
-	sprite gBattleAnimSpriteTemplate_8402A3C, 131, 5, -80, -64, 40, 32, 30
+	sprite gBattleAnimSpriteTemplate_83DA024, 131, 0, 0, 0, 30
+	sprite gBattleAnimSpriteTemplate_8402A3C, 131, -80, -64, 40, 32, 30
 	pause 20
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
-	createtask sub_80A7FA0, 2, 5, 1, 5, 0, 20, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
+	createtask sub_80A7FA0, 2, 1, 5, 0, 20, 1
 	wait
 	pause 10
 	restorebg
@@ -8703,24 +8703,24 @@ Move_REVENGE: @ 81D3B99
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W036, 192
-	sprite gBattleAnimSpriteTemplate_83DA198, 2, 2, 10, -10
+	sprite gBattleAnimSpriteTemplate_83DA198, 2, 10, -10
 	wait
-	createtask sub_80E1F8C, 2, 6, 2, 0, 4, 2, 8, 31
+	createtask sub_80E1F8C, 2, 2, 0, 4, 2, 8, 31
 	wait
 	unloadsprite 10245
 	loadsprite 10246
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 6, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4
 	pause 4
 	panse_19 SE_W207, 63
-	sprite gBattleAnimSpriteTemplate_83DA1E0, 130, 2, 10, -10
+	sprite gBattleAnimSpriteTemplate_83DA1E0, 130, 10, -10
 	wait
 	unloadsprite 10246
 	loadsprite 10135
-	createtask sub_80A7FA0, 2, 5, 1, 3, 0, 10, 1
-	sprite gBattleAnimSpriteTemplate_83DB550, 131, 5, -10, -8, 1, 1, 8
+	createtask sub_80A7FA0, 2, 1, 3, 0, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DB550, 131, -10, -8, 1, 1, 8
 	panse_19 SE_W233B, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB550, 131, 5, 10, 8, 1, 1, 8
+	sprite gBattleAnimSpriteTemplate_83DB550, 131, 10, 8, 1, 1, 8
 	panse_19 SE_W025B, 63
 	wait
 	clearmonbg 1
@@ -8733,9 +8733,9 @@ Move_POISON_FANG: @ 81D3C30
 	panse_19 SE_W044, 63
 	sprite gBattleAnimSpriteTemplate_840233C, 130
 	pause 10
-	createtask sub_80A7E7C, 3, 5, 1, 3, 0, 10, 1
+	createtask sub_80A7E7C, 3, 1, 3, 0, 10, 1
 	wait
-	createtask sub_80E1F8C, 2, 6, 4, 0, 4, 0, 12, 26650
+	createtask sub_80E1F8C, 2, 4, 0, 4, 0, 12, 26650
 	call Unknown_81D5F87
 	wait
 	end
@@ -8751,55 +8751,55 @@ Move_FRENZY_PLANT: @ 81D3C7B
 	monbg 1
 	monbgprio_28 1
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 1, 2, 0, 5, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 2, 0, 5, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 10, 8, 2, 0, 0, 100
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 10, 8, 2, 0, 0, 100
 	panse_19 SE_W010, 192
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 20, -8, -2, 0, 1, 95
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 20, -8, -2, 0, 1, 95
 	panse_19 SE_W010, 213
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 30, 8, -4, 0, 0, 90
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 30, 8, -4, 0, 0, 90
 	panse_19 SE_W010, 234
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 40, -8, 4, 0, 1, 85
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 40, -8, 4, 0, 1, 85
 	panse_19 SE_W010, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 50, 8, 0, 0, 0, 85
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 50, 8, 0, 0, 0, 85
 	panse_19 SE_W010, 21
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 60, -8, -2, 0, 1, 85
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 60, -8, -2, 0, 1, 85
 	panse_19 SE_W010, 42
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 75, 8, 0, 0, 0, 85
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 75, 8, 0, 0, 0, 85
 	panse_19 SE_W010, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 85, 16, 6, 0, 3, 80
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 85, 16, 6, 0, 3, 80
 	panse_19 SE_W010, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83D6670, 2, 6, 85, -16, -6, 0, 2, 75
+	sprite gBattleAnimSpriteTemplate_83D6670, 2, 85, -16, -6, 0, 2, 75
 	panse_19 SE_W010, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -10, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -10, 1, 3
 	panse_19 SE_W003, 63
-	createtask sub_80A7E7C, 3, 5, 1, 8, 0, 20, 1
+	createtask sub_80A7E7C, 3, 1, 8, 0, 20, 1
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, 8, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 8, 1, 3
 	panse_19 SE_W003, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, -3, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, -3, 1, 2
 	panse_19 SE_W003, 63
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -3, 1, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -3, 1, 1, 2
 	panse_19 SE_W003, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, 1, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, 1, 1, 1
 	panse_19 SE_W003, 63
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 10, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 10, 1, 1
 	panse_19 SE_W003, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 1, 2, 5, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 1, 2, 5, 0, 0
 	wait
 	clearmonbg 1
 	blendoff
@@ -8809,7 +8809,7 @@ Move_METAL_SOUND: @ 81D3E1F
 	loadsprite 10260
 	monbg 3
 	monbgprio_2A 1
-	createtask sub_80A7FA0, 2, 5, 0, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 0, 2, 0, 8, 1
 	call _81D3E52
 	call _81D3E52
 	call _81D3E52
@@ -8821,7 +8821,7 @@ Move_METAL_SOUND: @ 81D3E1F
 	end
 _81D3E52:
 	panse_1B SE_W103, 192, 63, 2, 0
-	sprite gBattleAnimSpriteTemplate_83D7564, 130, 6, 16, 0, 0, 0, 30, 0
+	sprite gBattleAnimSpriteTemplate_83D7564, 130, 16, 0, 0, 0, 30, 0
 	pause 2
 	ret
 
@@ -8846,16 +8846,16 @@ _81D3EA4:
 	panse_19 SE_W207, 63
 	sprite gBattleAnimSpriteTemplate_83DA214, 130
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 0
-	createtask sub_80A7E7C, 5, 5, 1, 8, 0, 24, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 0
+	createtask sub_80A7E7C, 5, 1, 8, 0, 24, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 2, 1, 0
 	panse_19 SE_W233B, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, -6, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, -6, 1, 0
 	panse_19 SE_W233B, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 8, 1, 0
 	panse_19 SE_W025B, 63
 	wait
 	restorebg
@@ -8889,144 +8889,144 @@ _81D3F67:
 	blendoff
 	end
 _81D3F6C:
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 16, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 16, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 2
-	createtask sub_812B30C, 5, 2, 139, 63
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+	createtask sub_812B30C, 5, 139, 63
 	jump _81D3F67
 _81D3FBE:
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
 	pause 11
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 5, 4
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 5, 4
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 4, 0, 0, 1, 2
-	createtask sub_812B30C, 5, 2, 141, 63
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 3, 0, 0, 1, 2
+	createtask sub_812B30C, 5, 141, 63
 	jump _81D3F67
 _81D401E:
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 6, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, 10, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 10, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 3, -5, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 3, -5, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -5, 3, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -5, 3, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	jump _81D3F67
 _81D4139:
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 0, 6, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 6, 0
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 16, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 3, -5, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 3, -5, 1, 2
+	createtask sub_812B30C, 5, 123, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 12, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 12, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	wait
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 8, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 8, 1, 0
+	createtask sub_812B340, 5, 167, -64
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
 	wait
 	pause 2
-	createtask sub_80E2DD8, 2, 4, 0, 4, 5, 1
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 4, 1, 0
-	createtask sub_812B340, 5, 2, 167, -64
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
-	createtask sub_80E2DD8, 2, 4, 0, 4, 5, 1
+	createtask sub_80E2DD8, 2, 0, 4, 5, 1
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 1, 0
+	createtask sub_812B340, 5, 167, -64
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+	createtask sub_80E2DD8, 2, 0, 4, 5, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 4, 2, 0
-	createtask sub_812B340, 5, 2, 167, -64
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 2, 0
+	createtask sub_812B340, 5, 167, -64
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
-	createtask sub_80E2DD8, 2, 4, 0, 4, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+	createtask sub_80E2DD8, 2, 0, 4, 5, 1
 	wait
 	call _81D4371
 	call _81D4371
 	call _81D4371
 	call _81D4371
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -10, -8, 1, 0
-	createtask sub_812B30C, 5, 2, 141, 63
-	createtask sub_80A7E7C, 5, 5, 1, 8, 0, 24, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -10, -8, 1, 0
+	createtask sub_812B30C, 5, 141, 63
+	createtask sub_80A7E7C, 5, 1, 8, 0, 24, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 10, 10, 1, 0
-	createtask sub_812B30C, 5, 2, 141, 63
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 10, 10, 1, 0
+	createtask sub_812B30C, 5, 141, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 3, -5, 1, 0
-	createtask sub_812B30C, 5, 2, 141, 63
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 3, -5, 1, 0
+	createtask sub_812B30C, 5, 141, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, -5, 3, 1, 0
-	createtask sub_812B30C, 5, 2, 141, 63
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, -5, 3, 1, 0
+	createtask sub_812B30C, 5, 141, 63
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 6, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 6, 0, 0
 	jump _81D3F67
 _81D4371:
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 4, 3, 0
-	createtask sub_812B340, 5, 2, 167, -64
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_812B30C, 5, 2, 123, 63
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
-	createtask sub_80E2DD8, 2, 4, 0, 4, 5, 1
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 3, 0
+	createtask sub_812B340, 5, 167, -64
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_812B30C, 5, 123, 63
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+	createtask sub_80E2DD8, 2, 0, 4, 5, 1
 	wait
 	ret
 
 Move_COSMIC_POWER: @ 81D43C5
 	loadsprite 10049
-	createtask sub_812B340, 5, 2, 243, 0
+	createtask sub_812B340, 5, 243, 0
 	panse_19 SE_W322, 0
-	createtask sub_80E3A08, 2, 4, 0, 0, 15, 0
+	createtask sub_80E3A08, 2, 0, 0, 15, 0
 	wait
 	fadetobg 16
 	waitbgfadeout
-	createtask sub_80E3A58, 2, 4, 0, 128, 0, -1
+	createtask sub_80E3A58, 2, 0, 128, 0, -1
 	waitbgfadein
 	pause 70
-	createtask sub_812B30C, 5, 2, 228, -64
-	sprite gBattleAnimSpriteTemplate_83D6C88, 2, 6, -15, 0, 0, 0, 32, 60
+	createtask sub_812B30C, 5, 228, -64
+	sprite gBattleAnimSpriteTemplate_83D6C88, 2, -15, 0, 0, 0, 32, 60
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D6C88, 2, 6, 12, -5, 0, 0, 32, 60
+	sprite gBattleAnimSpriteTemplate_83D6C88, 2, 12, -5, 0, 0, 32, 60
 	pause 40
-	createtask sub_80E3A08, 2, 4, 0, 15, 0, 0
+	createtask sub_80E3A08, 2, 0, 15, 0, 0
 	wait
 	restorebg
 	waitbgfadeout
@@ -9041,40 +9041,40 @@ Move_BLAST_BURN: @ 81D444A
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W221, 192
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -32, 0, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -20, -10, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 0, -16, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 20, -10, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 32, 0, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 20, 10, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, 0, 16, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -20, 10, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -32, 0, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -20, -10, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 0, -16, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 20, -10, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 32, 0, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 20, 10, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, 0, 16, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -20, 10, 24, 0, 0, 0
 	pause 25
 	panse_19 SE_W172B, 192
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -64, 0, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 6, 6, -40, -20, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 70, 6, 0, -32, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 70, 6, 40, -20, 24, 0, 0, 0
-	createtask sub_80A7E7C, 5, 5, 1, 6, 0, 8, 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 64, 0, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 40, 20, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, 0, 32, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -40, 20, 24, 0, 0, 0
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -64, 0, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 6, -40, -20, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 70, 0, -32, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 70, 40, -20, 24, 0, 0, 0
+	createtask sub_80A7E7C, 5, 1, 6, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 64, 0, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 40, 20, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, 0, 32, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -40, 20, 24, 0, 0, 0
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 25
 	panse_19 SE_W172B, 192
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -96, 0, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 6, 6, -60, -30, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 70, 6, 0, -48, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 70, 6, 60, -30, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -4, 3, 1, 0
-	createtask sub_80A7E7C, 5, 5, 1, 12, 0, 20, 1
-	createtask sub_80E26BC, 2, 4, 2, 0, 10, 1
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 96, 0, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 66, 6, 60, 30, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, 0, 48, 24, 0, 0, 0
-	sprite gBattleAnimSpriteTemplate_83D9538, 2, 6, -60, 30, 24, 0, 0, 0
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -96, 0, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 6, -60, -30, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 70, 0, -48, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 70, 60, -30, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -4, 3, 1, 0
+	createtask sub_80A7E7C, 5, 1, 12, 0, 20, 1
+	createtask sub_80E26BC, 2, 2, 0, 10, 1
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 96, 0, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 66, 60, 30, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, 0, 48, 24, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9538, 2, -60, 30, 24, 0, 0, 0
+	createtask sub_80E2324, 2, 257, 257, 257
 	wait
 	clearmonbg 3
 	blendoff
@@ -9083,32 +9083,32 @@ Move_BLAST_BURN: @ 81D444A
 Move_ROCK_TOMB: @ 81D468C
 	loadsprite 10250
 	loadsprite 10058
-	createtask sub_80E26BC, 2, 4, 2, 0, 10, 1
+	createtask sub_80E26BC, 2, 2, 0, 10, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DADA8, 130, 5, 20, 12, 64, 114, 0
+	sprite gBattleAnimSpriteTemplate_83DADA8, 130, 20, 12, 64, 114, 0
 	pause 8
-	createtask sub_80E26BC, 2, 4, 0, 2, 3, 1
+	createtask sub_80E26BC, 2, 0, 2, 3, 1
 	panse_19 SE_W070, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DADA8, 130, 5, -20, 12, 64, 98, 0
+	sprite gBattleAnimSpriteTemplate_83DADA8, 130, -20, 12, 64, 98, 0
 	pause 8
-	createtask sub_80E26BC, 2, 4, 0, 2, 3, 1
+	createtask sub_80E26BC, 2, 0, 2, 3, 1
 	panse_19 SE_W070, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DADA8, 194, 5, 3, 6, 64, 82, 0
+	sprite gBattleAnimSpriteTemplate_83DADA8, 194, 3, 6, 64, 82, 0
 	pause 8
-	createtask sub_80E26BC, 2, 4, 0, 2, 3, 1
+	createtask sub_80E26BC, 2, 0, 2, 3, 1
 	panse_19 SE_W070, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DADA8, 130, 5, -3, 13, 64, 66, 0
+	sprite gBattleAnimSpriteTemplate_83DADA8, 130, -3, 13, 64, 66, 0
 	pause 8
-	createtask sub_80E26BC, 2, 4, 0, 2, 3, 1
+	createtask sub_80E26BC, 2, 0, 2, 3, 1
 	panse_19 SE_W070, 63
 	pause 24
 	panse_19 SE_W063, 63
-	sprite gBattleAnimSpriteTemplate_83DA8F4, 133, 2, 1, 50
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 20, 1
-	createtask sub_80E26BC, 2, 4, 2, 0, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DA8F4, 133, 1, 50
+	createtask sub_80A7E7C, 5, 1, 3, 0, 20, 1
+	createtask sub_80E26BC, 2, 2, 0, 10, 1
 	wait
 	end
 
@@ -9120,58 +9120,58 @@ Move_SILVER_WIND: @ 81D4773
 	monbg 3
 	monbgprio_29
 	pause 0
-	createtask sub_80E2A7C, 10, 5, 1, 0, 0, 4, 0
+	createtask sub_80E2A7C, 10, 1, 0, 0, 4, 0
 	createtask sub_80E3B78, 2
 	jumpvareq 7, 1, _81D4974
 	fadetobg 22
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, 1536, 0, 0, -1
+	createtask sub_80E3A58, 5, 1536, 0, 0, -1
 _81D47BA:
 	pause 0
-	createtask sub_80E2A38, 10, 5, 1, 0, 4, 4, 0
+	createtask sub_80E2A38, 10, 1, 0, 4, 4, 0
 	waitbgfadein
-	sprite gBattleAnimSpriteTemplate_83D693C, 194, 7, -32, 16, 0, 6, 2, 3, 1
-	sprite gBattleAnimSpriteTemplate_83D693C, 194, 7, -8, 18, 64, 3, 2, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D693C, 120, 7, -24, 18, 90, 5, 1, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D693C, 120, 7, -40, 14, 128, 4, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D693C, 194, -32, 16, 0, 6, 2, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D693C, 194, -8, 18, 64, 3, 2, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D693C, 120, -24, 18, 90, 5, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D693C, 120, -40, 14, 128, 4, 1, 2, 1
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83D6954, 194, 7, -32, 16, 0, 6, 2, 3, 1
-	sprite gBattleAnimSpriteTemplate_83D6954, 194, 7, -8, 18, 64, 3, 2, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D6954, 120, 7, -24, 18, 90, 5, 1, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D6954, 120, 7, -40, 14, 128, 4, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D6954, 194, -32, 16, 0, 6, 2, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D6954, 194, -8, 18, 64, 3, 2, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D6954, 120, -24, 18, 90, 5, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D6954, 120, -40, 14, 128, 4, 1, 2, 1
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83D696C, 194, 7, -32, 16, 0, 6, 2, 3, 1
-	sprite gBattleAnimSpriteTemplate_83D696C, 194, 7, -8, 18, 64, 3, 2, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D696C, 120, 7, -24, 18, 90, 5, 1, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D696C, 120, 7, -40, 14, 128, 4, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D696C, 194, -32, 16, 0, 6, 2, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D696C, 194, -8, 18, 64, 3, 2, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D696C, 120, -24, 18, 90, 5, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D696C, 120, -40, 14, 128, 4, 1, 2, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83D693C, 194, 7, -4, 16, 0, 6, 1, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D693C, 194, 7, -16, 12, 192, 5, 2, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D693C, 194, -4, 16, 0, 6, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D693C, 194, -16, 12, 192, 5, 2, 3, 1
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83D6954, 194, 7, -4, 16, 0, 6, 1, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D6954, 194, 7, -16, 12, 192, 5, 2, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D6954, 194, -4, 16, 0, 6, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D6954, 194, -16, 12, 192, 5, 2, 3, 1
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83D696C, 194, 7, -4, 16, 0, 6, 1, 2, 1
-	sprite gBattleAnimSpriteTemplate_83D696C, 194, 7, -16, 12, 192, 5, 2, 3, 1
+	sprite gBattleAnimSpriteTemplate_83D696C, 194, -4, 16, 0, 6, 1, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D696C, 194, -16, 12, 192, 5, 2, 3, 1
 	wait
 	panse_19 SE_W016B, 63
 	clearmonbg 3
 	pause 0
 	restorebg
 	waitbgfadeout
-	createtask sub_80E2A7C, 10, 5, 1, 0, 4, 0, 0
+	createtask sub_80E2A7C, 10, 1, 0, 4, 0, 0
 	setvar 7, -1
 	waitbgfadein
 	end
 _81D4974:
 	fadetobg 23
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -1536, 0, 0, -1
+	createtask sub_80E3A58, 5, -1536, 0, 0, -1
 	jump _81D47BA
 
 Move_SNATCH: @ 81D498B
 	panse_19 SE_W036, 192
-	createtask sub_80A8920, 5, 7, 0, -12, 4, 10, 10, 12, 6
+	createtask sub_80A8920, 5, 0, -12, 4, 10, 10, 12, 6
 	end
 
 Move_DIVE: @ 81D49A5
@@ -9181,10 +9181,10 @@ Move_DIVE: @ 81D49A5
 _81D49B4:
 	loadsprite 10156
 	panse_19 SE_W029, 192
-	sprite gBattleAnimSpriteTemplate_83DA5D8, 2, 4, 0, 0, 13, 336
+	sprite gBattleAnimSpriteTemplate_83DA5D8, 2, 0, 0, 13, 336
 	wait
 	panse_19 SE_W291, 192
-	sprite gBattleAnimSpriteTemplate_83DA614, 3, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DA614, 3, 0
 	call _81D49F2
 	call _81D49F2
 	call _81D49F2
@@ -9192,8 +9192,8 @@ _81D49B4:
 	call _81D49F2
 	end
 _81D49F2:
-	sprite gBattleAnimSpriteTemplate_83DA62C, 5, 2, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DA62C, 5, 2, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DA62C, 5, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA62C, 5, 1, 0
 	ret
 _81D4A09:
 	loadsprite 10148
@@ -9201,7 +9201,7 @@ _81D4A09:
 	monbg 3
 	setalpha 12, 8
 	panse_19 SE_W153, 63
-	sprite gBattleAnimSpriteTemplate_83DA614, 131, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA614, 131, 1
 	call _81D4A48
 	call _81D4A48
 	call _81D4A48
@@ -9215,25 +9215,25 @@ _81D4A09:
 	blendoff
 	end
 _81D4A48:
-	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 2, 0, 1
-	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 2, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 1, 1
 	ret
 
 Move_ROCK_BLAST: @ 81D4A5F
 	loadsprite 10058
 	loadsprite 10135
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 6
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6
 	pause 3
 	panse_19 SE_W207, 192
-	sprite gBattleAnimSpriteTemplate_83DADE8, 130, 6, 16, 0, 0, 0, 25, 257
+	sprite gBattleAnimSpriteTemplate_83DADE8, 130, 16, 0, 0, 0, 25, 257
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 1
 	panse_19 SE_W088, 63
-	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 6, 0, 0, 20, 24, 14, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 5, 1
-	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 6, 5, 0, -20, 24, 14, 1
-	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 6, 0, 5, 20, -24, 14, 2
-	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 6, -5, 0, -20, -24, 14, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 0, 0, 20, 24, 14, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 5, 0, -20, 24, 14, 1
+	sprite gBattleAnimSpriteTemplate_83DAC64, 130, 0, 5, 20, -24, 14, 2
+	sprite gBattleAnimSpriteTemplate_83DAC64, 130, -5, 0, -20, -24, 14, 2
 	wait
 	end
 
@@ -9242,75 +9242,75 @@ Move_OVERHEAT: @ 81D4AFC
 	loadsprite 10135
 	monbg 3
 	setalpha 12, 18
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 5, 28
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 5, 28
 	wait
-	createtask sub_80E4028, 5, 2, 0, 1
+	createtask sub_80E4028, 5, 0, 1
 	pause 1
-	createtask sub_80E4178, 5, 1, 0
+	createtask sub_80E4178, 5, 0
 	pause 1
 	panse_19 SE_W082, 192
-	createtask sub_80E4028, 5, 2, 1, 0
+	createtask sub_80E4028, 5, 1, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, 1, 0, 13, 28
-	createtask sub_80A7E7C, 5, 5, 0, 2, 0, 15, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 1, 0, 13, 28
+	createtask sub_80A7E7C, 5, 0, 2, 0, 15, 1
 	wait
 	panse_19 SE_W172B, 192
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 0, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 32, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 64, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 96, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 128, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 160, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 192, 30, 25, -20
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 224, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 0, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 32, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 64, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 96, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 128, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 160, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 192, 30, 25, -20
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 224, 30, 25, -20
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 0, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 32, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 64, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 96, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 128, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 160, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 192, 30, 25, 0
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 224, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 0, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 32, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 64, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 96, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 128, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 160, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 192, 30, 25, 0
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 224, 30, 25, 0
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 0, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 32, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 64, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 96, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 2, 5, 1, 128, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 160, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 192, 30, 25, 10
-	sprite gBattleAnimSpriteTemplate_83DB100, 66, 5, 1, 224, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 0, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 32, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 64, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 96, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 128, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 160, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 192, 30, 25, 10
+	sprite gBattleAnimSpriteTemplate_83DB100, 66, 1, 224, 30, 25, 10
 	pause 5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -5, 3, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -5, 3, 1, 0
 	panse_19 SE_W007, 63
-	createtask sub_80A7E7C, 2, 5, 1, 10, 0, 25, 1
+	createtask sub_80A7E7C, 2, 1, 10, 0, 25, 1
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 8, -5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 8, -5, 1, 0
 	panse_19 SE_W007, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 10, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 10, 10, 1, 0
 	panse_19 SE_W007, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 0
 	panse_19 SE_W007, 63
-	createtask sub_80E4178, 5, 1, 1
+	createtask sub_80E4178, 5, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, -1, 0, 13, 19026
-	createtask sub_80A7E7C, 5, 5, 0, 3, 0, 15, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, -1, 0, 13, 19026
+	createtask sub_80A7E7C, 5, 0, 3, 0, 15, 1
 	wait
-	createtask sub_80E40D0, 5, 2, 0, 1
+	createtask sub_80E40D0, 5, 0, 1
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 5, 0, 28
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 5, 0, 28
 	wait
 	clearmonbg 3
 	blendoff
 	wait
 	pause 15
-	createtask sub_80E40D0, 5, 2, 1, 0
+	createtask sub_80E40D0, 5, 1, 0
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, 0, 13, 0, 19026
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 0, 13, 0, 19026
 	wait
 	end
 
@@ -9322,49 +9322,49 @@ Move_HYDRO_CANNON: @ 81D4DDE
 	panse_19 SE_W057, 192
 	sprite gBattleAnimSpriteTemplate_83D92D0, 130
 	pause 10
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	pause 30
 	panse_1B SE_W056, 192, 63, 2, 0
 	call _81D4EA8
-	createtask sub_80A7E7C, 5, 5, 1, 10, 0, 40, 1
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 4, 0, 0, 1, 0
+	createtask sub_80A7E7C, 5, 1, 10, 0, 40, 1
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
 	call _81D4EA8
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
 	call _81D4EA8
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
 	call _81D4EA8
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
 	call _81D4EA8
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
 	call _81D4EA8
-	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 4, 0, 0, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0
 	wait
-	createtask sub_80E2324, 2, 3, 257, 257, 257
+	createtask sub_80E2324, 2, 257, 257, 257
 	wait
 	clearmonbg 3
 	blendoff
 	end
 _81D4EA8:
-	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 6, 10, -10, 0, 0, 15, 257
+	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 10, -10, 0, 0, 15, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 6, 10, -10, 0, 0, 15, 257
+	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 10, -10, 0, 0, 15, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 6, 10, -10, 0, 0, 15, 257
+	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 10, -10, 0, 0, 15, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 6, 10, -10, 0, 0, 15, 257
+	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 10, -10, 0, 0, 15, 257
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 6, 10, -10, 0, 0, 15, 257
+	sprite gBattleAnimSpriteTemplate_83D92E8, 130, 10, -10, 0, 0, 15, 257
 	ret
 
 Move_ASTONISH: @ 81D4F10
 	loadsprite 10273
 	panse_19 SE_W227, 192
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 6
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6
 	pause 25
-	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 2, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 0, 1
 	panse_19 SE_W166, 63
-	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 2, 1, 1
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DA62C, 133, 1, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 5, 1
 	createtask sub_80D1E38, 3
 	wait
 	end
@@ -9418,29 +9418,29 @@ _81D4FD4:
 	call _81D4FF3
 	jump _81D4FA0
 _81D4FF3:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -10, -8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -10, -8, 1, 1
 	panse_19 SE_W070, 63
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 5, 1
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, -12, 27, 2, 3
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, 8, 28, 3, 4
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, -4, 30, 2, 3
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, 12, 25, 4, 4
+	createtask sub_80A7E7C, 2, 1, 0, 3, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 27, 2, 3
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 28, 3, 4
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 30, 2, 3
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 12, 25, 4, 4
 	ret
 _81D5054:
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 10, -8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 10, -8, 1, 1
 	panse_19 SE_W088, 63
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 5, 1
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, -12, 32, 3, 4
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, 8, 31, 2, 2
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, -4, 28, 2, 3
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, 12, 30, 4, 3
+	createtask sub_80A7E7C, 2, 1, 0, 3, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 32, 3, 4
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 31, 2, 2
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 28, 2, 3
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 12, 30, 4, 3
 	ret
 
 Move_MAGIC_COAT: @ 81D50B5
 	loadsprite 10170
 	setalpha 0, 16
 	panse_1D SE_W112, 192, 15
-	sprite gBattleAnimSpriteTemplate_83DA708, 3, 3, 40, 0, 10170
+	sprite gBattleAnimSpriteTemplate_83DA708, 3, 40, 0, 10170
 	wait
 	pause 1
 	blendoff
@@ -9452,27 +9452,27 @@ Move_WATER_PULSE: @ 81D50D2
 	monbg 1
 	monbgprio_28 1
 	panse_19 SE_W145C, 192
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 0, 0, 7, 29472
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 7, 29472
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D9408, 66, 7, 100, 100, 8, 1, 20, 40, 0
-	sprite gBattleAnimSpriteTemplate_83D9408, 66, 7, 20, 100, 16, 2, 10, 35, 1
-	sprite gBattleAnimSpriteTemplate_83D9408, 66, 7, 200, 80, 8, 1, 40, 20, 0
-	sprite gBattleAnimSpriteTemplate_83D9408, 66, 7, 80, 60, 10, 3, 20, 50, 0
-	sprite gBattleAnimSpriteTemplate_83D9408, 66, 7, 140, 100, 16, 1, 20, 30, 1
+	sprite gBattleAnimSpriteTemplate_83D9408, 66, 100, 100, 8, 1, 20, 40, 0
+	sprite gBattleAnimSpriteTemplate_83D9408, 66, 20, 100, 16, 2, 10, 35, 1
+	sprite gBattleAnimSpriteTemplate_83D9408, 66, 200, 80, 8, 1, 40, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D9408, 66, 80, 60, 10, 3, 20, 50, 0
+	sprite gBattleAnimSpriteTemplate_83D9408, 66, 140, 100, 16, 1, 20, 30, 1
 	panse_19 SE_W145C, 63
 	wait
 	panse_19 SE_W202, 192
-	sprite gBattleAnimSpriteTemplate_83D757C, 130, 4, 0, 0, 40, 15
+	sprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15
 	pause 5
 	panse_19 SE_W202, 192
-	sprite gBattleAnimSpriteTemplate_83D757C, 130, 4, 0, 0, 40, 15
+	sprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15
 	pause 5
 	panse_19 SE_W202, 192
-	sprite gBattleAnimSpriteTemplate_83D757C, 130, 4, 0, 0, 40, 15
+	sprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15
 	pause 13
-	createtask sub_80A7E7C, 2, 5, 1, 0, 8, 18, 1
+	createtask sub_80A7E7C, 2, 1, 0, 8, 18, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 7, 0, 29472
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 7, 0, 29472
 	wait
 	clearmonbg 3
 	end
@@ -9485,18 +9485,18 @@ Move_PSYCHO_BOOST: @ 81D51C7
 	createtask sub_812C624, 5
 	waitbgfadein
 	pause 6
-	createtask sub_80E1F8C, 2, 6, 1, 2, 8, 0, 10, 0
+	createtask sub_80E1F8C, 2, 1, 2, 8, 0, 10, 0
 	pause 0
 	monbgprio_28 0
 	setalpha 8, 8
 	pause 10
-	createtask sub_80A7E7C, 2, 5, 0, 3, 0, 240, 0
+	createtask sub_80A7E7C, 2, 0, 3, 0, 240, 0
 	panse_1C SE_W060B, 192, 14, 10
 	sprite gBattleAnimSpriteTemplate_83DAA68, 2
 	pause 110
 	panse_1C SE_W060B, 192, 7, 10
 	wait
-	createtask sub_80A7FA0, 2, 5, 1, -8, 1, 24, 1
+	createtask sub_80A7FA0, 2, 1, -8, 1, 24, 1
 	panse_19 SE_W043, 63
 	wait
 	clearmonbg 2
@@ -9507,20 +9507,20 @@ Move_PSYCHO_BOOST: @ 81D51C7
 Move_KNOCK_OFF: @ 81D523B
 	loadsprite 10277
 	loadsprite 10135
-	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 2, 4, 6
+	sprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6
 	pause 4
 	panse_19 SE_W233, 63
-	sprite gBattleAnimSpriteTemplate_8402AE4, 130, 2, -16, -16
+	sprite gBattleAnimSpriteTemplate_8402AE4, 130, -16, -16
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 5, 1, 32767, 10, 0, 0
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, 0, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 5, 1, 32767, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, 0, 1, 2
 	panse_19 SE_W004, 63
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -12, 10, 0, 3
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -12, 10, 0, 3
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5
 	pause 3
-	createtask sub_80A8154, 2, 5, 1, 0, 3, 6, 1
+	createtask sub_80A8154, 2, 1, 0, 3, 6, 1
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
 	pause 10
 	wait
 	end
@@ -9529,16 +9529,16 @@ Move_DOOM_DESIRE: @ 81D52CB
 	createtask sub_80E0EE8, 2
 	pause 1
 	monbg 2
-	createtask sub_80E0E24, 5, 2, 1, 0
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 4, 0
+	createtask sub_80E0E24, 5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 0
 	wait
 	setalpha 8, 8
 	panse_19 SE_W060, 192
-	createtask sub_80A8D34, 5, 5, -4, -4, 15, 0, 1
+	createtask sub_80A8D34, 5, -4, -4, 15, 0, 1
 	wait
 	pause 20
-	createtask sub_80E0E24, 5, 2, 1, 1
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 4, 0, 0
+	createtask sub_80E0E24, 5, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 4, 0, 0
 	wait
 	clearmonbg 2
 	blendoff
@@ -9546,7 +9546,7 @@ Move_DOOM_DESIRE: @ 81D52CB
 
 Unknown_81D532F: @ 81D532F
 	loadsprite 10198
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 0, 16, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 16, 32767
 	wait
 	pause 10
 	createtask sub_812E14C, 5
@@ -9557,23 +9557,23 @@ Unknown_81D532F: @ 81D532F
 	pause 10
 	panse_19 SE_W109, 63
 	pause 23
-	createtask sub_80A8154, 2, 5, 1, 10, 0, 20, 1
+	createtask sub_80A8154, 2, 1, 10, 0, 20, 1
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 24, -24, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -24, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 16, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 16, 0, 32767
 	wait
 	end
 
@@ -9584,35 +9584,35 @@ Move_SKY_UPPERCUT: @ 81D53ED
 	fadetobg 17
 	waitbgfadeout
 	panse_19 SE_W327, 192
-	createtask sub_80D9C80, 5, 1, 55
+	createtask sub_80D9C80, 5, 55
 	waitbgfadein
 	setalpha 12, 8
 	pause 38
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 0, 28, 0, 0, 5
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 28, 0, 0, 5
 	pause 4
-	createtask sub_80A7FA0, 2, 5, 1, 4, 0, 6, 1
+	createtask sub_80A7FA0, 2, 1, 4, 0, 6, 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -28, 28, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -28, 28, 1, 1
 	pause 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -15, 8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -15, 8, 1, 1
 	panse_19 SE_W233B, 63
 	pause 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -5, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -5, -12, 1, 1
 	pause 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 0, -32, 1, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 0, -32, 1, 1
 	pause 1
 	panse_19 SE_W233B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 5, -52, 1, 1
-	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 5, 1, -26, 16, 1, 4
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 5, -52, 1, 1
+	sprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -26, 16, 1, 4
 	pause 4
-	createtask sub_80A8154, 2, 5, 1, 0, 3, 6, 1
+	createtask sub_80A8154, 2, 1, 0, 3, 6, 1
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 0, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 3, 1, 0, 6
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6
 	clearmonbg 3
 	blendoff
 	restorebg
@@ -9641,39 +9641,39 @@ Move_TWISTER: @ 81D553A
 	monbg 3
 	monbgprio_28 1
 	panse_19 SE_W239, 63
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 120, 70, 5, 70, 30
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 120, 70, 5, 70, 30
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 115, 55, 6, 60, 25
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 115, 55, 6, 60, 25
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 115, 60, 7, 60, 30
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 115, 55, 10, 60, 30
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 115, 60, 7, 60, 30
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 115, 55, 10, 60, 30
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DAE18, 130, 5, 100, 50, 4, 50, 26
+	sprite gBattleAnimSpriteTemplate_83DAE18, 130, 100, 50, 4, 50, 26
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 105, 25, 8, 60, 20
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 105, 25, 8, 60, 20
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 115, 40, 10, 48, 30
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 115, 40, 10, 48, 30
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DAE18, 130, 5, 120, 30, 6, 45, 25
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 115, 35, 10, 60, 30
+	sprite gBattleAnimSpriteTemplate_83DAE18, 130, 120, 30, 6, 45, 25
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 115, 35, 10, 60, 30
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83DAE18, 130, 5, 105, 20, 8, 40, 0
+	sprite gBattleAnimSpriteTemplate_83DAE18, 130, 105, 20, 8, 40, 0
 	pause 3
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 20, 255, 15, 32, 0
-	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 5, 110, 10, 8, 32, 20
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 20, 255, 15, 32, 0
+	sprite gBattleAnimSpriteTemplate_83D64B4, 130, 110, 10, 8, 32, 20
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, -32, -16, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, -32, -16, 1, 3
 	panse_19 SE_W004, 63
-	createtask sub_80A8154, 2, 5, 1, 3, 0, 12, 1
-	createtask sub_80A8154, 2, 5, 3, 3, 0, 12, 1
+	createtask sub_80A8154, 2, 1, 3, 0, 12, 1
+	createtask sub_80A8154, 2, 3, 3, 0, 12, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3
 	panse_19 SE_W004, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 2, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3
 	panse_19 SE_W004, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 4, 32, 20, 1, 3
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 131, 32, 20, 1, 3
 	panse_19 SE_W004, 63
 	wait
 	clearmonbg 3
@@ -9689,34 +9689,34 @@ Move_MAGICAL_LEAF: @ 81D5699
 	pause 1
 	panse_1C SE_W077, 192, 10, 5
 	createtask sub_80CC5F8, 5
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, -2, 10
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -2, 10
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -1, -1, 15
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -1, -1, 15
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -4, -4, 7
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -4, -4, 7
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 3, -3, 11
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, 11
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -1, -6, 8
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -1, -6, 8
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 2, -1, 12
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 2, -1, 12
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, -4, 13
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -4, 13
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 4, -5, 7
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 4, -5, 7
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, 2, -6, 11
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, 2, -6, 11
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D649C, 2, 3, -3, -5, 8
+	sprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -5, 8
 	pause 60
 	panse_19 SE_W013B, 192
-	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 7, 20, -10, 20, 0, 32, 20, 0
-	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 7, 20, -10, 20, 0, 32, -20, 0
+	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 32, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 32, -20, 0
 	pause 30
 	panse_19 SE_W013, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, -10, -4, 1, 2
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, 10, 4, 1, 2
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, -10, -4, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 10, 4, 1, 2
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	pause 20
 	setvar 7, -1
 	wait
@@ -9727,21 +9727,21 @@ Move_MAGICAL_LEAF: @ 81D5699
 Move_ICE_BALL: @ 81D57BA
 	loadsprite 10043
 	loadsprite 10141
-	createtask sub_80D8FC0, 5, 1, 0
+	createtask sub_80D8FC0, 5, 0
 	jumpvareq 0, 4, _81D5831
 _81D57D1:
 	panse_19 SE_W196, 192
-	sprite gBattleAnimSpriteTemplate_83D9EF4, 130, 6, 15, 0, -12, -16, 30, -40
+	sprite gBattleAnimSpriteTemplate_83D9EF4, 130, 15, 0, -12, -16, 30, -40
 	pause 28
 	panse_19 SE_W280, 63
-	createtask sub_80D8FC0, 5, 1, 0
+	createtask sub_80D8FC0, 5, 0
 	jumpvareq 0, 0, _81D5842
 	jumpvareq 0, 1, _81D5871
 	jumpvareq 0, 2, _81D58AA
 	jumpvareq 0, 3, _81D58ED
 	jumpvareq 0, 4, _81D5935
 _81D581F:
-	createtask sub_80D8FC0, 5, 1, 0
+	createtask sub_80D8FC0, 5, 0
 	jumpvareq 0, 4, _81D5838
 _81D5830:
 	end
@@ -9755,7 +9755,7 @@ _81D5838:
 	waitbgfadein
 	jump _81D5830
 _81D5842:
-	createtask sub_80A9058, 2, 5, 0, 1, 8, 1, 0
+	createtask sub_80A9058, 2, 0, 1, 8, 1, 0
 	call _81D597D
 	call _81D597D
 	call _81D597D
@@ -9763,7 +9763,7 @@ _81D5842:
 	call _81D597D
 	jump _81D581F
 _81D5871:
-	createtask sub_80A9058, 2, 5, 0, 1, 10, 1, 0
+	createtask sub_80A9058, 2, 0, 1, 10, 1, 0
 	call _81D597D
 	call _81D597D
 	call _81D597D
@@ -9773,7 +9773,7 @@ _81D5871:
 	call _81D597D
 	jump _81D581F
 _81D58AA:
-	createtask sub_80A9058, 2, 5, 0, 1, 14, 1, 0
+	createtask sub_80A9058, 2, 0, 1, 14, 1, 0
 	call _81D597D
 	call _81D597D
 	call _81D597D
@@ -9785,7 +9785,7 @@ _81D58AA:
 	call _81D597D
 	jump _81D581F
 _81D58ED:
-	createtask sub_80A9058, 2, 5, 0, 1, 18, 1, 0
+	createtask sub_80A9058, 2, 0, 1, 18, 1, 0
 	call _81D597D
 	call _81D597D
 	call _81D597D
@@ -9798,7 +9798,7 @@ _81D58ED:
 	call _81D597D
 	jump _81D581F
 _81D5935:
-	createtask sub_80A9058, 2, 5, 0, 1, 30, 1, 0
+	createtask sub_80A9058, 2, 0, 1, 30, 1, 0
 	call _81D597D
 	call _81D597D
 	call _81D597D
@@ -9811,19 +9811,19 @@ _81D5935:
 	call _81D597D
 	jump _81D581F
 _81D597D:
-	sprite gBattleAnimSpriteTemplate_83D9F0C, 132, 2, -12, -16
+	sprite gBattleAnimSpriteTemplate_83D9F0C, 132, -12, -16
 	ret
 
 Move_WEATHER_BALL: @ 81D5989
 	loadsprite 10283
-	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 3, 8, 1, 0
+	sprite gBattleAnimSpriteTemplate_83C1FC8, 2, 8, 1, 0
 	pause 8
 	panse_19 SE_W207, 192
 	sprite gBattleAnimSpriteTemplate_83930A8, 2
 	wait
 	pause 15
 	panse_19 SE_W197, 0
-	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 31, 5, 1, 32767, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 5, 1, 32767, 10, 0, 0
 	wait
 	createtask sub_8132528, 2
 	pause 1
@@ -9834,75 +9834,75 @@ Move_WEATHER_BALL: @ 81D5989
 	jumpvareq 7, 4, _81D5B99
 _81D59F4:
 	loadsprite 10135
-	sprite gBattleAnimSpriteTemplate_83930C0, 130, 6, -30, -100, 25, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83930C0, 130, -30, -100, 25, 1, 0, 0
 	wait
 	panse_19 SE_W025B, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, 4, -10, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 132, -10, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 0, 3, 8, 1
 	wait
 	end
 _81D5A31:
 	loadsprite 10029
-	sprite gBattleAnimSpriteTemplate_83D96AC, 130, 6, -30, -100, 25, 1, 40, 10
+	sprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, 40, 10
 	panse_19 SE_W172, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D96AC, 130, 6, -30, -100, 25, 1, -40, 20
+	sprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, -40, 20
 	panse_19 SE_W172, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D96AC, 130, 6, -30, -100, 25, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, 0, 0
 	panse_19 SE_W172, 63
 	wait
 	panse_19 SE_W172B, 63
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 8, 1
+	createtask sub_80A7E7C, 2, 1, 0, 3, 8, 1
 	wait
 	end
 _81D5A95:
 	loadsprite 10155
-	sprite gBattleAnimSpriteTemplate_83D9438, 130, 6, -30, -100, 25, 1, 50, 10
+	sprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, 50, 10
 	panse_19 SE_W152, 63
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D9438, 130, 6, -30, -100, 25, 1, -20, 20
+	sprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, -20, 20
 	panse_19 SE_W152, 63
 	pause 13
-	sprite gBattleAnimSpriteTemplate_83D9438, 130, 6, -30, -100, 25, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, 0, 0
 	panse_19 SE_W152, 63
 	wait
-	createtask sub_80A7E7C, 2, 5, 1, 0, 3, 8, 1
+	createtask sub_80A7E7C, 2, 1, 0, 3, 8, 1
 	panse_19 SE_W202, 63
 	wait
 	end
 _81D5AF9:
 	loadsprite 10058
-	sprite gBattleAnimSpriteTemplate_83DAE30, 130, 6, -30, -100, 25, 1, 30, 0
+	sprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, 30, 0
 	panse_19 SE_W088, 63
 	pause 5
-	sprite gBattleAnimSpriteTemplate_83DAE30, 130, 6, -30, -100, 25, 1, -40, 20
+	sprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, -40, 20
 	panse_19 SE_W088, 63
 	pause 14
-	sprite gBattleAnimSpriteTemplate_83DAE30, 130, 6, -30, -100, 25, 1, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, 0, 0
 	panse_19 SE_W088, 63
 	wait
 	panse_19 SE_W070, 63
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, -12, 27, 2, 3
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, 8, 28, 3, 4
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, -4, 30, 2, 3
-	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 4, 12, 25, 4, 4
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 27, 2, 3
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 28, 3, 4
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 30, 2, 3
+	sprite gBattleAnimSpriteTemplate_83DAE00, 130, 12, 25, 4, 4
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	wait
 	end
 _81D5B99:
 	loadsprite 10263
 	loadsprite 10141
-	sprite gBattleAnimSpriteTemplate_83D9E54, 130, 6, -30, -100, 25, 25, -40, 20
+	sprite gBattleAnimSpriteTemplate_83D9E54, 130, -30, -100, 25, 25, -40, 20
 	panse_19 SE_W258, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D9E54, 130, 6, -30, -100, 25, 25, 40, 0
+	sprite gBattleAnimSpriteTemplate_83D9E54, 130, -30, -100, 25, 25, 40, 0
 	panse_19 SE_W258, 63
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83D9E54, 130, 6, -30, -100, 25, 25, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9E54, 130, -30, -100, 25, 25, 0, 0
 	panse_19 SE_W258, 63
 	wait
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	panse_19 SE_W196, 63
 	call Unknown_81D5C36
 	wait
@@ -9913,234 +9913,234 @@ PoundCopy: @ 81D5C05
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W003, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
 	clearmonbg 1
 	blendoff
 	end
 
 Unknown_81D5C36: @ 81D5C36
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, -10, -10, 0
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, -10, -10, 0
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 10, 20, 0
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 10, 20, 0
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, -5, 10, 0
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, -5, 10, 0
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 17, -12, 0
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 17, -12, 0
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, -15, 15, 0
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, -15, 15, 0
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 0, 0, 0
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, 20, 2, 0
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 20, 2, 0
 	panse_19 SE_W196, 63
 	ret
 
 Unknown_81D5CBA: @ 81D5CBA
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, -10, -10, 1
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, -10, -10, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 10, 20, 1
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 10, 20, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, -29, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, -29, 0, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 29, -20, 1
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 29, -20, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, -5, 10, 1
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, -5, 10, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 17, -12, 1
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 17, -12, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, -20, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, -20, 0, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, -15, 15, 1
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, -15, 15, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 26, -5, 1
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 26, -5, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 3, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D9C90, 130, 0, 0, 1
 	panse_19 SE_W196, 63
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 3, 20, 2, 1
+	sprite gBattleAnimSpriteTemplate_83D9C78, 130, 20, 2, 1
 	panse_19 SE_W196, 63
 	ret
 
 Unknown_81D5D8A: @ 81D5D8A
 	panse_1C SE_W196, 63, 6, 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 0, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 0, 24, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 8, 24, 0
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -8, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 8, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -8, 24, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 16, 24, 0
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -16, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 16, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -16, 24, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 24, 24, 0
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -24, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 24, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -24, 24, 0
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 32, 24, 0
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -32, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 32, 24, 0
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -32, 24, 0
 	ret
 
 Unknown_81D5E0E: @ 81D5E0E
 	panse_1C SE_W196, 63, 6, 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 0, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 0, 24, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 8, 24, 1
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -8, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 8, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -8, 24, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 16, 24, 1
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -16, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 16, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -16, 24, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 24, 24, 1
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -24, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 24, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -24, 24, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 32, 24, 1
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -32, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 32, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -32, 24, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 40, 24, 1
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -40, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 40, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -40, 24, 1
 	pause 4
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, 48, 24, 1
-	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 3, -48, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, 48, 24, 1
+	sprite gBattleAnimSpriteTemplate_83D9D14, 130, -48, 24, 1
 	ret
 
 Unknown_81D5ECA: @ 81D5ECA
-	sprite gBattleAnimSpriteTemplate_83D6C88, 2, 6, -15, 0, 0, 0, 32, 60
+	sprite gBattleAnimSpriteTemplate_83D6C88, 2, -15, 0, 0, 0, 32, 60
 	pause 8
-	sprite gBattleAnimSpriteTemplate_83D6C88, 2, 6, 12, -5, 0, 0, 32, 60
+	sprite gBattleAnimSpriteTemplate_83D6C88, 2, 12, -5, 0, 0, 32, 60
 	pause 8
 	ret
 
 Unknown_81D5EF5: @ 81D5EF5
 	panse_19 SE_W071B, 192
-	sprite gBattleAnimSpriteTemplate_83D7038, 2, 4, 0, -5, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 2, 0, -5, 0, 0
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D7038, 2, 4, -15, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 2, -15, 10, 0, 0
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D7038, 2, 4, -15, -15, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 2, -15, -15, 0, 0
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D7038, 2, 4, 10, -5, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 2, 10, -5, 0, 0
 	pause 7
 	ret
 
 Unknown_81D5F3E: @ 81D5F3E
 	panse_19 SE_W071B, 63
-	sprite gBattleAnimSpriteTemplate_83D7038, 130, 4, 0, -5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 130, 0, -5, 1, 0
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D7038, 130, 4, -15, 10, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 130, -15, 10, 1, 0
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D7038, 130, 4, -15, -15, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 130, -15, -15, 1, 0
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D7038, 130, 4, 10, -5, 1, 0
+	sprite gBattleAnimSpriteTemplate_83D7038, 130, 10, -5, 1, 0
 	pause 7
 	ret
 
 Unknown_81D5F87: @ 81D5F87
-	sprite gBattleAnimSpriteTemplate_83DA350, 130, 3, 10, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DA350, 130, 10, 10, 0
 	panse_19 SE_W092, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA350, 130, 3, 20, -20, 0
+	sprite gBattleAnimSpriteTemplate_83DA350, 130, 20, -20, 0
 	panse_19 SE_W092, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA350, 130, 3, -20, 15, 0
+	sprite gBattleAnimSpriteTemplate_83DA350, 130, -20, 15, 0
 	panse_19 SE_W092, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA350, 130, 3, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA350, 130, 0, 0, 0
 	panse_19 SE_W092, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA350, 130, 3, -20, -20, 0
+	sprite gBattleAnimSpriteTemplate_83DA350, 130, -20, -20, 0
 	panse_19 SE_W092, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA350, 130, 3, 16, -8, 0
+	sprite gBattleAnimSpriteTemplate_83DA350, 130, 16, -8, 0
 	panse_19 SE_W092, 63
 	ret
 
 Unknown_81D5FF8: @ 81D5FF8
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 10, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 10, 10, 0
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 20, -20, 0
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 20, -20, 0
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, -20, 15, 0
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, -20, 15, 0
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 0, 0, 0
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, -20, -20, 0
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, -20, -20, 0
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 16, -8, 0
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 16, -8, 0
 	panse_19 SE_W145C, 63
 	ret
 
 Unknown_81D6069: @ 81D6069
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 10, 10, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 10, 10, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, -28, -10, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, -28, -10, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 20, -20, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 20, -20, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, -20, 15, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, -20, 15, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 0, 0, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 0, 0, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 27, 8, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 27, 8, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, -20, -20, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, -20, -20, 1
 	panse_19 SE_W145C, 63
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83DA368, 2, 3, 16, -8, 1
+	sprite gBattleAnimSpriteTemplate_83DA368, 2, 16, -8, 1
 	panse_19 SE_W145C, 63
 	ret
 
 Unknown_81D6100: @ 81D6100
 	panse_19 SE_W085B, 63
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, 5, 0, 5, 0
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, 5, 0, 5, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, -5, 10, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, -5, 10, 5, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, 15, 20, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, 15, 20, 5, 2
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, -15, -10, 5, 0
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, -15, -10, 5, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, 25, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, 25, 0, 5, 1
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, -8, 8, 5, 2
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, -8, 8, 5, 2
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, 2, -8, 5, 0
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, 2, -8, 5, 0
 	pause 2
-	sprite gBattleAnimSpriteTemplate_83D9920, 130, 4, -20, 15, 5, 1
+	sprite gBattleAnimSpriteTemplate_83D9920, 130, -20, 15, 5, 1
 	ret
 
 Unknown_81D618B: @ 81D618B
 	panse_1C SE_W146, 63, 13, 6
-	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 5, 0, -15, 0, 3, 90
-	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 5, 0, -15, 51, 3, 90
-	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 5, 0, -15, 102, 3, 90
-	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 5, 0, -15, 153, 3, 90
-	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 5, 0, -15, 204, 3, 90
+	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 0, -15, 0, 3, 90
+	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 0, -15, 51, 3, 90
+	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 0, -15, 102, 3, 90
+	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 0, -15, 153, 3, 90
+	sprite gBattleAnimSpriteTemplate_83DB3AC, 130, 0, -15, 204, 3, 90
 	ret
 
 Unknown_81D61E7: @ 81D61E7
@@ -10161,14 +10161,14 @@ Unknown_81D61FB: @ 81D61FB
 	jumpunkcond _81D6214
 	fadetobg 18
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, -2304, 768, 1, -1
+	createtask sub_80E3A58, 5, -2304, 768, 1, -1
 _81D6212:
 	waitbgfadein
 	ret
 _81D6214:
 	fadetobg 19
 	waitbgfadeout
-	createtask sub_80E3A58, 5, 4, 2304, 768, 0, -1
+	createtask sub_80E3A58, 5, 2304, 768, 0, -1
 	jump _81D6212
 
 Unknown_81D622B: @ 81D622B
@@ -10208,8 +10208,8 @@ Unknown_81D626D: @ 81D626D
 
 StatusCondition_Poison: @ 81D6270
 	panse_1C SE_W092, 63, 13, 6
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 18, 2
-	createtask sub_80E1F8C, 2, 6, 2, 2, 2, 0, 12, 31774
+	createtask sub_80A7FA0, 2, 0, 1, 0, 18, 2
+	createtask sub_80E1F8C, 2, 2, 2, 2, 0, 12, 31774
 	end
 
 StatusCondition_Confusion: @ 81D629B
@@ -10226,33 +10226,33 @@ StatusCondition_Burn: @ 81D62A4
 	wait
 	end
 _81D62BC:
-	sprite gBattleAnimSpriteTemplate_83D9614, 130, 7, -24, 24, 24, 24, 20, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D9614, 130, -24, 24, 24, 24, 20, 1, 1
 	pause 4
 	ret
 
 StatusCondition_Love: @ 81D62D4
 	loadsprite 10210
 	panse_19 SE_W204, 192
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, 0, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20
 	pause 15
 	panse_19 SE_W204, 192
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, -20, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, -20, 20
 	pause 15
 	panse_19 SE_W204, 192
-	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 2, 20, 20
+	sprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20
 	end
 
 StatusCondition_Sleep: @ 81D6309
 	loadsprite 10228
 	panse_19 SE_W173, 192
-	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 5, 4, -10, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0
 	pause 30
-	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 5, 4, -10, 16, 0, 0
+	sprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0
 	end
 
 StatusCondition_Paralysis: @ 81D6335
 	loadsprite 10011
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 10, 1
+	createtask sub_80A7FA0, 2, 0, 1, 0, 10, 1
 	call Unknown_81D6100
 	end
 
@@ -10272,7 +10272,7 @@ StatusCondition_Curse: @ 81D636A
 	monbg 3
 	panse_19 SE_W171, 63
 	sprite gBattleAnimSpriteTemplate_83DAF38, 130
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 14, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 14, 1
 	wait
 	clearmonbg 3
 	end
@@ -10282,7 +10282,7 @@ StatusCondition_Nightmare: @ 81D638F
 	monbg 3
 	panse_19 SE_W171, 63
 	sprite gBattleAnimSpriteTemplate_83DAF50, 130
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 14, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 14, 1
 	wait
 	clearmonbg 3
 	end
@@ -10295,12 +10295,12 @@ _81D63C8:
 	monbg 0
 	panse_19 SE_W100, 192
 	panse_1D SE_W107, 192, 48
-	createtask sub_812D7E8, 2, 1, 1
+	createtask sub_812D7E8, 2, 1
 	wait
 	clearmonbg 0
 	end
 _81D63E0:
-	createtask sub_812DB58, 2, 1, 1
+	createtask sub_812DB58, 2, 1
 	end
 
 Unknown_81D63EA: @ 81D63EA
@@ -10311,14 +10311,14 @@ Unknown_81D63EA: @ 81D63EA
 Unknown_81D63F3: @ 81D63F3
 	monbg 0
 	createtask sub_81416C4, 5
-	createtask sub_80E2A38, 10, 5, 2, 0, 0, 16, 32767
+	createtask sub_80E2A38, 10, 2, 0, 0, 16, 32767
 	wait
 	pause 1
 	clearmonbg 0
 	pause 2
 	blendoff
-	createtask sub_80E2A38, 10, 5, 2, 0, 0, 0, 32767
-	createtask sub_814151C, 2, 1, 1
+	createtask sub_80E2A38, 10, 2, 0, 0, 0, 32767
+	createtask sub_814151C, 2, 1
 	end
 
 Unknown_81D6430: @ 81D6430
@@ -10330,10 +10330,10 @@ Unknown_81D6438: @ 81D6438
 	createtask sub_8141BD4, 2
 	pause 0
 	panse_1D SE_W026, 192, 22
-	sprite gBattleAnimSpriteTemplate_840B4FC, 131, 4, -16, 7, 0, 32
+	sprite gBattleAnimSpriteTemplate_840B4FC, 131, -16, 7, 0, 32
 	pause 50
 	panse_1C SE_W039, 63, 19, 2
-	createtask sub_80A8B88, 5, 5, 1, 8, 1536, 2, 1
+	createtask sub_80A8B88, 5, 1, 8, 1536, 2, 1
 	wait
 	createtask sub_8141C08, 2
 	end
@@ -10353,11 +10353,11 @@ Unknown_81D6489: @ 81D6489
 _81D64B5:
 	loadsprite 10186
 	panse_1C SE_W010, 63, 6, 2
-	sprite gBattleAnimSpriteTemplate_83D65A0, 132, 4, 0, 16, 0, 1
+	sprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 1
 	pause 7
-	sprite gBattleAnimSpriteTemplate_83D65A0, 130, 4, 0, 8, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D65A0, 130, 0, 8, 1, 1
 	pause 3
-	createtask sub_80A7FA0, 2, 5, 1, 2, 0, 8, 1
+	createtask sub_80A7FA0, 2, 1, 2, 0, 8, 1
 	pause 20
 	setvar 7, -1
 	panse_19 SE_W020, 63
@@ -10366,7 +10366,7 @@ _81D64B5:
 _81D64FD:
 	loadsprite 10029
 	panse_19 SE_W221B, 63
-	createtask sub_80A7E7C, 5, 5, 1, 0, 2, 30, 1
+	createtask sub_80A7E7C, 5, 1, 0, 2, 30, 1
 	call _81C90BF
 	call _81C90BF
 	wait
@@ -10378,13 +10378,13 @@ _81D6522:
 	monbgprio_28 1
 	setalpha 12, 8
 	pause 0
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 0, 7, 23968
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 23968
 	panse_19 SE_W250, 63
-	createtask sub_80A7E7C, 5, 5, 1, 0, 2, 30, 1
+	createtask sub_80A7E7C, 5, 1, 0, 2, 30, 1
 	call _81D03E4
 	call _81D03E4
 	pause 12
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 7, 0, 23968
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 7, 0, 23968
 	wait
 	stopsound
 	clearmonbg 3
@@ -10395,11 +10395,11 @@ _81D6576:
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W011, 63
-	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, 6, -32, 0, 2, 819, 0, 10
-	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, 6, 32, 0, 6, -819, 0, 10
+	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, -32, 0, 2, 819, 0, 10
+	sprite gBattleAnimSpriteTemplate_83DB1E8, 2, 32, 0, 6, -819, 0, 10
 	pause 10
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 5, 5, 1, 3, 0, 5, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 5, 1, 3, 0, 5, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -10407,13 +10407,13 @@ _81D6576:
 	end
 _81D65D3:
 	loadsprite 10074
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 0, 7, 563
-	createtask sub_80A7E7C, 5, 5, 1, 0, 2, 30, 1
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 0, 7, 563
+	createtask sub_80A7E7C, 5, 1, 0, 2, 30, 1
 	panse_19 SE_W328, 63
 	call _81D361F
 	call _81D361F
 	pause 22
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 4, 2, 7, 0, 563
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 4, 2, 7, 0, 563
 	wait
 	stopsound
 	end
@@ -10423,20 +10423,20 @@ Unknown_81D661C: @ 81D661C
 	loadsprite 10049
 	pause 0
 	panse_19 SE_W036, 192
-	createtask sub_80A8EFC, 2, 4, 16, 128, 0, 2
+	createtask sub_80A8EFC, 2, 16, 128, 0, 2
 	wait
 	panse_19 SE_W036, 192
-	createtask sub_80A8EFC, 2, 4, 16, 128, 0, 2
+	createtask sub_80A8EFC, 2, 16, 128, 0, 2
 	wait
 	panse_19 SE_W036, 192
-	createtask sub_80A8EFC, 2, 4, 16, 128, 0, 2
+	createtask sub_80A8EFC, 2, 16, 128, 0, 2
 	wait
 	panse_19 SE_W234, 192
 	call Unknown_81D5ECA
 	wait
 	panse_19 SE_REAPOKE, 192
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 2, 3, 7, 0, 26609
-	sprite gBattleAnimSpriteTemplate_83D7928, 3, 4, 0, 0, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 3, 7, 0, 26609
+	sprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 0, 0
 	wait
 	end
 
@@ -10446,32 +10446,32 @@ Unknown_81D6690: @ 81D6690
 	setalpha 12, 4
 	pause 0
 	panse_19 SE_BOWA2, 63
-	sprite gBattleAnimSpriteTemplate_8402894, 128, 4, 0, 32, 28, 30
+	sprite gBattleAnimSpriteTemplate_8402894, 128, 0, 32, 28, 30
 	pause 4
 	panse_19 SE_BOWA2, 63
-	sprite gBattleAnimSpriteTemplate_8402894, 127, 4, 2, 12, 20, 30
+	sprite gBattleAnimSpriteTemplate_8402894, 127, 2, 12, 20, 30
 	pause 12
 	panse_19 SE_BOWA2, 63
-	sprite gBattleAnimSpriteTemplate_8402894, 126, 4, 2, -28, 4, 30
+	sprite gBattleAnimSpriteTemplate_8402894, 126, 2, -28, 4, 30
 	pause 4
 	pause 8
 	panse_19 SE_BOWA2, 63
-	sprite gBattleAnimSpriteTemplate_8402894, 124, 4, 2, 14, -20, 30
+	sprite gBattleAnimSpriteTemplate_8402894, 124, 2, 14, -20, 30
 	pause 4
 	panse_19 SE_BOWA2, 63
-	createtask sub_80DFC24, 2, 1, 2
-	sprite gBattleAnimSpriteTemplate_8402894, 123, 4, 3, 4, 4, 30
+	createtask sub_80DFC24, 2, 2
+	sprite gBattleAnimSpriteTemplate_8402894, 123, 3, 4, 4, 30
 	pause 14
 	panse_19 SE_BOWA2, 63
-	sprite gBattleAnimSpriteTemplate_8402894, 122, 4, 3, -14, 18, 46
+	sprite gBattleAnimSpriteTemplate_8402894, 122, 3, -14, 18, 46
 	pause 0
-	sprite gBattleAnimSpriteTemplate_8402894, 121, 4, 3, 14, -14, 46
+	sprite gBattleAnimSpriteTemplate_8402894, 121, 3, 14, -14, 46
 	pause 0
-	sprite gBattleAnimSpriteTemplate_8402894, 120, 4, 3, -12, -10, 46
+	sprite gBattleAnimSpriteTemplate_8402894, 120, 3, -12, -10, 46
 	pause 0
-	sprite gBattleAnimSpriteTemplate_8402894, 119, 4, 3, 14, 14, 46
+	sprite gBattleAnimSpriteTemplate_8402894, 119, 3, 14, 14, 46
 	pause 0
-	sprite gBattleAnimSpriteTemplate_8402894, 118, 4, 3, 0, 0, 46
+	sprite gBattleAnimSpriteTemplate_8402894, 118, 3, 0, 0, 46
 	wait
 	clearmonbg 0
 	invisible 0
@@ -10480,26 +10480,26 @@ Unknown_81D6690: @ 81D6690
 	end
 
 Unknown_81D676E: @ 81D676E
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 2, 7, 0, 9, 31
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 2, 7, 0, 9, 31
 	panse_19 SE_W082, 192
-	createtask sub_812FC68, 5, 7, 30, 128, 0, 1, 2, 0, 1
+	createtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 5, 2, 4, 9, 0, 31
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 2, 4, 9, 0, 31
 	wait
 	pause 6
-	sprite gBattleAnimSpriteTemplate_83C1FE0, 0, 3, 0, 0, 15
+	sprite gBattleAnimSpriteTemplate_83C1FE0, 0, 0, 0, 15
 	end
 
 Unknown_Weather_Rain: @ 81D67BB
 	loadsprite 10115
 	panse_19 SE_W240, 192
-	createtask sub_80E2A38, 10, 5, 1921, 2, 0, 4, 0
+	createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0
 	wait
-	createtask sub_80D30F0, 2, 3, 0, 3, 60
-	createtask sub_80D30F0, 2, 3, 0, 3, 60
+	createtask sub_80D30F0, 2, 0, 3, 60
+	createtask sub_80D30F0, 2, 0, 3, 60
 	pause 50
 	wait
-	createtask sub_80E2A38, 10, 5, 1921, 2, 4, 0, 0
+	createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0
 	wait
 	end
 
@@ -10522,8 +10522,8 @@ Unknown_81D6821: @ 81D6821
 	monbg 1
 	setalpha 12, 8
 	panse_19 SE_W003, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 4, 0, 0, 1, 2
-	createtask sub_80A7E7C, 2, 5, 1, 3, 0, 6, 1
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 2, 0, 0, 1, 2
+	createtask sub_80A7E7C, 2, 1, 3, 0, 6, 1
 	wait
 	clearmonbg 1
 	blendoff
@@ -10534,7 +10534,7 @@ Unknown_81D6852: @ 81D6852
 	createtask sub_80E42D0, 2
 	createtask sub_8141808, 2
 	pause 1
-	sprite gBattleAnimSpriteTemplate_83D677C, 2, 5, 0, -5, 10, 2, -1
+	sprite gBattleAnimSpriteTemplate_83D677C, 2, 0, -5, 10, 2, -1
 	end
 
 Unknown_81D6877: @ 81D6877
@@ -10542,7 +10542,7 @@ Unknown_81D6877: @ 81D6877
 	createtask sub_80E4234, 2
 	call Unknown_81D6AB6
 	pause 1
-	createtask sub_80A8B88, 2, 5, 0, 5, 5120, 4, 1
+	createtask sub_80A8B88, 2, 0, 5, 5120, 4, 1
 	wait
 	createtask sub_80E4264, 2
 	jumpvareq 7, 0, _81D68B5
@@ -10568,10 +10568,10 @@ Unknown_81D68D5: @ 81D68D5
 	setalpha 8, 8
 	panse_19 SE_W048, 63
 	panse_1D SE_W048, 63, 8
-	createtask sub_80A7E7C, 2, 5, 1, 4, 0, 15, 1
-	createtask sub_80A8D34, 5, 5, -5, -5, 15, 1, 1
+	createtask sub_80A7E7C, 2, 1, 4, 0, 15, 1
+	createtask sub_80A8D34, 5, -5, -5, 15, 1, 1
 	wait
-	createtask sub_80A7E7C, 2, 5, 1, 4, 0, 24, 1
+	createtask sub_80A7E7C, 2, 1, 4, 0, 24, 1
 	wait
 	clearmonbg 3
 	blendoff
@@ -10583,7 +10583,7 @@ Unknown_81D68D5: @ 81D68D5
 Unknown_81D6934: @ 81D6934
 	createtask sub_80E42B0, 2
 	loadsprite 10198
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 0, 16, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 16, 32767
 	wait
 	pause 10
 	createtask sub_812E14C, 5
@@ -10594,23 +10594,23 @@ Unknown_81D6934: @ 81D6934
 	pause 9
 	panse_19 SE_W109, 63
 	pause 25
-	createtask sub_80A8154, 2, 5, 1, 10, 0, 20, 1
+	createtask sub_80A8154, 2, 1, 10, 0, 20, 1
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 0, 0, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 24, -24, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, -24, -12, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 1, 1
 	pause 6
 	panse_19 SE_W120, 63
-	sprite gBattleAnimSpriteTemplate_83D7828, 3, 4, 16, 16, 1, 1
+	sprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 16, 0, 32767
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 16, 0, 32767
 	wait
 	end
 
@@ -10619,8 +10619,8 @@ Unknown_81D69F9: @ 81D69F9
 	panse_19 SE_W082, 192
 	call _81CBAC7
 	pause 8
-	createtask sub_80E1F8C, 2, 6, 2, 2, 2, 0, 11, 31
-	createtask sub_80A7FA0, 2, 5, 0, 1, 0, 32, 1
+	createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31
+	createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1
 	call _81CBAC7
 	pause 8
 	call _81CBAC7
@@ -10632,7 +10632,7 @@ Unknown_81D6A39: @ 81D6A39
 	loadsprite 10031
 	monbg 3
 	setalpha 12, 8
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 0, 4, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 13293
 	wait
 	pause 3
 	call _81CF496
@@ -10640,7 +10640,7 @@ Unknown_81D6A39: @ 81D6A39
 	pause 15
 	call Unknown_81D5EF5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 1, 4, 0, 13293
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 4, 0, 13293
 	wait
 	clearmonbg 3
 	blendoff
@@ -10649,14 +10649,14 @@ Unknown_81D6A39: @ 81D6A39
 Unknown_81D6A7C: @ 81D6A7C
 	loadsprite 10031
 	loadsprite 10049
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 0, 10, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 10, 0
 	wait
 	panse_19 SE_W025, 192
 	call Unknown_81D5ECA
 	wait
 	call Unknown_81D5EF5
 	wait
-	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 5, 1, 3, 10, 0, 0
+	sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 10, 0, 0
 	end
 
 Unknown_81D6AB6: @ 81D6AB6
@@ -10666,7 +10666,7 @@ _81D6AC5:
 	wait
 	ret
 _81D6AC7:
-	createtask sub_814151C, 2, 1, 1
+	createtask sub_814151C, 2, 1
 	wait
 	jump _81D6AC5
 
@@ -10677,7 +10677,7 @@ _81D6AE5:
 	wait
 	ret
 _81D6AE7:
-	createtask sub_814151C, 2, 1, 0
+	createtask sub_814151C, 2, 0
 	wait
 	jump _81D6AE5
 
@@ -10685,7 +10685,7 @@ Unknown_81D6AF6: @ 81D6AF6
 	panse_19 SE_EXPMAX, 0
 	createtask sub_813F4EC, 2
 	pause 0
-	createtask sub_813F6A0, 5, 2, 0, 0
+	createtask sub_813F6A0, 5, 0, 0
 	wait
 	createtask sub_813F5E8, 2
 	end
@@ -10720,7 +10720,7 @@ _81D6B65:
 	setalpha 12, 8
 	pause 0
 	panse_19 SE_W003, 63
-	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, 4, -4, -20, 1, 2
+	sprite gBattleAnimSpriteTemplate_83DB4A8, 130, -4, -20, 1, 2
 	wait
 	clearmonbg 3
 	blendoff
@@ -10735,9 +10735,9 @@ Unknown_81D6B8D: @ 81D6B8D
 	end
 
 Unknown_81D6BA6: @ 81D6BA6
-	createtask sub_814151C, 2, 1, 1
+	createtask sub_814151C, 2, 1
 	end
 
 Unknown_81D6BB0: @ 81D6BB0
-	createtask sub_814151C, 2, 1, 0
+	createtask sub_814151C, 2, 0
 	end
diff --git a/ld_script.txt b/ld_script.txt
index be014136c..69cbc2ddc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -121,7 +121,7 @@ SECTIONS {
         asm/fldeff_cut.o(.text);
         asm/rom_80A2B18.o(.text);
         asm/item_menu.o(.text);
-        asm/battle_anim_80A7E7C.o(.text);
+        src/battle_anim_80A7E7C.o(.text);
         src/item.o(.text);
         src/matsuda_debug_menu.o(.text);
         asm/matsuda_debug_menu.o(.text);
diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c
new file mode 100644
index 000000000..1e3bb706e
--- /dev/null
+++ b/src/battle_anim_80A7E7C.c
@@ -0,0 +1,779 @@
+#include "global.h"
+#include "task.h"
+#include "sprite.h"
+#include "trig.h"
+
+#define TASK gTasks[task]
+#define SPRITE gSprites[TASK.data[0]]
+
+extern s16 gUnknown_03004B00[8];
+
+extern u8 gUnknown_02024BE0[];
+extern s32 gUnknown_0202F7B8;
+extern u16 gUnknown_0202F7BC;
+extern u8 gUnknown_0202F7C8;
+extern u8 gUnknown_0202F7C9;
+
+extern u8 obj_id_for_side_relative_to_move(u8 side);
+extern void move_anim_task_del(u8 task);
+extern bool8 b_side_obj__get_some_boolean(u8 side);
+extern u8 battle_get_side_with_given_state(u8 state);
+extern u8 battle_side_get_owner(u8 side);
+extern void oamt_set_x3A_32(struct Sprite *sprite, void (*callback)(struct Sprite*));
+extern void sub_8078458(struct Sprite *sprite);
+extern void move_anim_8072740(struct Sprite *sprite);
+extern void sub_8078A5C(struct Sprite *sprite);
+extern void sub_80784A8(struct Sprite *sprite);
+extern void sub_8078E70(u8 sprite, u8);
+extern void obj_id_set_rotscale(u8 sprite, int, int, u16);
+extern void sub_8078F40(u8 sprite);
+extern bool8 sub_8076BE0();
+extern void sub_8078F9C(u8 sprite);
+
+static void sub_80A7EF0(u8 task);
+static void sub_80A808C(u8 task);
+static void sub_80A81D8(u8 task);
+static void sub_80A8374(u8 task);
+static void sub_80A8488(u8 task);
+static void sub_80A85A4(struct Sprite *sprite);
+void sub_80A8614(struct Sprite* sprite);
+static void sub_80A86F4(struct Sprite *sprite);
+static void sub_80A88F0(struct Sprite *sprite);
+static void sub_80A89B4(u8 task);
+static void sub_80A8A18(u8 task);
+static void sub_80A8C0C(u8 task);
+static void sub_80A8D8C(u8 task);
+void sub_80A8FD8(u8 task);
+static void sub_80A913C(u8 taskId);
+
+void sub_80A7E7C(u8 task) {
+	u8 sprite;
+	sprite = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+	if (sprite == 0xff) {
+		move_anim_task_del(task);
+		return;
+	}
+	gSprites[sprite].pos2.x = gUnknown_03004B00[1];
+	gSprites[sprite].pos2.y = gUnknown_03004B00[2];
+	TASK.data[0] = sprite;
+	TASK.data[1] = gUnknown_03004B00[3];
+	TASK.data[2] = gUnknown_03004B00[4];
+	TASK.data[3] = gUnknown_03004B00[4];
+	TASK.data[4] = gUnknown_03004B00[1];
+	TASK.data[5] = gUnknown_03004B00[2];
+	TASK.func = sub_80A7EF0;
+	sub_80A7EF0(task);
+}
+
+static void sub_80A7EF0(u8 task) {
+	if (TASK.data[3] == 0) {
+		if (SPRITE.pos2.x == 0) {
+			SPRITE.pos2.x = TASK.data[4];
+		} else {
+			SPRITE.pos2.x = 0;
+		}
+		if (SPRITE.pos2.y == 0) {
+			SPRITE.pos2.y = TASK.data[5];
+		} else {
+			SPRITE.pos2.y = 0;
+		}
+		TASK.data[3] = TASK.data[2];
+		if (--TASK.data[1] == 0) {
+			SPRITE.pos2.x = 0;
+			SPRITE.pos2.y = 0;
+			move_anim_task_del(task);
+			return;
+		}
+	} else {
+		TASK.data[3]--;
+	}
+}
+
+
+void sub_80A7FA0(u8 task) {
+	u8 sprite;
+	bool8 r6;
+	u8 side;
+	r6 = 0;
+	if (gUnknown_03004B00[0] < 4) {
+		sprite = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+		if (sprite == 0xff) {
+			move_anim_task_del(task);
+			return;
+		}
+	} else if (gUnknown_03004B00[0] != 8) {
+		switch (gUnknown_03004B00[0]) {
+		case 4:
+			side = battle_get_side_with_given_state(0);
+			break;
+		case 5:
+			side = battle_get_side_with_given_state(2);
+			break;
+		case 6:
+			side = battle_get_side_with_given_state(1);
+			break;
+		case 7:
+		default:
+			side = battle_get_side_with_given_state(3);
+			break;
+		}
+		if (b_side_obj__get_some_boolean(side) == FALSE) {
+			r6 = 1;
+		}
+		sprite = gUnknown_02024BE0[side];
+	} else {
+		sprite = gUnknown_02024BE0[gUnknown_0202F7C8];
+	}
+	if (r6) {
+		move_anim_task_del(task);
+		return;
+	}
+	gSprites[sprite].pos2.x = gUnknown_03004B00[1];
+	gSprites[sprite].pos2.y = gUnknown_03004B00[2];
+	TASK.data[0] = sprite;
+	TASK.data[1] = gUnknown_03004B00[3];
+	TASK.data[2] = gUnknown_03004B00[4];
+	TASK.data[3] = gUnknown_03004B00[4];
+	TASK.data[4] = gUnknown_03004B00[1];
+	TASK.data[5] = gUnknown_03004B00[2];
+	TASK.func = sub_80A808C;
+	sub_80A808C(task);
+}
+
+static void sub_80A808C(u8 task) {
+	if (TASK.data[3] == 0) {
+		if (SPRITE.pos2.x == TASK.data[4]) {
+			SPRITE.pos2.x = -TASK.data[4];
+		} else {
+			SPRITE.pos2.x = TASK.data[4];
+		}
+		if (SPRITE.pos2.y == TASK.data[5]) {
+			SPRITE.pos2.y = -TASK.data[5];
+		} else {
+			SPRITE.pos2.y = TASK.data[5];
+		}
+		TASK.data[3] = TASK.data[2];
+		if (--TASK.data[1] == 0) {
+			SPRITE.pos2.x = 0;
+			SPRITE.pos2.y = 0;
+			move_anim_task_del(task);
+			return;
+		}
+	} else {
+		TASK.data[3]--;
+	}
+}
+
+void sub_80A8154(u8 task) {
+	u8 sprite;
+	sprite = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+	if (sprite == 0xff) {
+		move_anim_task_del(task);
+		return;
+	}
+	gSprites[sprite].pos2.x += gUnknown_03004B00[1];
+	gSprites[sprite].pos2.y += gUnknown_03004B00[2];
+	TASK.data[0] = sprite;
+	TASK.data[1] = 0;
+	TASK.data[2] = gUnknown_03004B00[3];
+	TASK.data[3] = 0;
+	TASK.data[4] = gUnknown_03004B00[4];
+	TASK.data[5] = gUnknown_03004B00[1] * 2;
+	TASK.data[6] = gUnknown_03004B00[2] * 2;
+	TASK.func = sub_80A81D8;
+	sub_80A81D8(task);
+}
+
+static void sub_80A81D8(u8 task) {
+	if (TASK.data[3] == 0) {
+		if (TASK.data[1] & 1) {
+			SPRITE.pos2.x += TASK.data[5];
+			SPRITE.pos2.y += TASK.data[6];
+		} else {
+			SPRITE.pos2.x -= TASK.data[5];
+			SPRITE.pos2.y -= TASK.data[6];
+		}
+		TASK.data[3] = TASK.data[4];
+		if (++TASK.data[1] >= TASK.data[2]) {
+			if (TASK.data[1] & 1) {
+				SPRITE.pos2.x += TASK.data[5] / 2;
+				SPRITE.pos2.y += TASK.data[6] / 2;
+			} else {
+				SPRITE.pos2.x -= TASK.data[5] / 2;
+				SPRITE.pos2.y -= TASK.data[6] / 2;
+			}
+			move_anim_task_del(task);
+			return;
+		}
+	} else {
+		TASK.data[3]--;
+	}
+}
+
+void sub_80A8314(u8 task) {
+	u8 sprite = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+	gSprites[sprite].pos2.x = gUnknown_03004B00[1];
+	TASK.data[0] = sprite;
+	TASK.data[1] = gUnknown_03004B00[1];
+	TASK.data[2] = gUnknown_03004B00[2];
+	TASK.data[3] = gUnknown_03004B00[3];
+	TASK.data[4] = gUnknown_03004B00[4];
+	TASK.func = sub_80A8374;
+	sub_80A8374(task);
+}
+
+static void sub_80A8374(u8 task) {
+	s16 x;
+	u8 sprite;
+	sprite = TASK.data[0];
+	x = TASK.data[1];
+	if (TASK.data[2] == TASK.data[8]++) {
+		TASK.data[8] = 0;
+		if (gSprites[sprite].pos2.x == x) {
+			x = -x;
+		}
+		gSprites[sprite].pos2.x += x;
+	}
+	TASK.data[1] = x;
+	TASK.data[9] += TASK.data[3];
+	gSprites[sprite].pos2.y = TASK.data[9] >> 8;
+	if (--TASK.data[4] == 0) {
+		move_anim_task_del(task);
+		return;
+	}
+}
+
+void sub_80A8408(u8 task) {
+	u8 i;
+	u8 sprite;
+	u8 v1;
+	v1 = 1;
+	sprite = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+	if (gUnknown_03004B00[4] > 5) {
+		gUnknown_03004B00[4] = 5;
+	}
+	for (i = 0; i < gUnknown_03004B00[4]; i++) {
+		v1 <<= 1;
+	}
+	TASK.data[0] = sprite;
+	TASK.data[1] = gUnknown_03004B00[1];
+	TASK.data[2] = gUnknown_03004B00[2];
+	TASK.data[3] = gUnknown_03004B00[3];
+	TASK.data[4] = v1;
+	TASK.func = sub_80A8488;
+	sub_80A8488(task);
+}
+
+static void sub_80A8488(u8 task) {
+	u8 sprite;
+	sprite = TASK.data[0];
+	gSprites[sprite].pos2.x = Sin(TASK.data[5], TASK.data[1]);
+	gSprites[sprite].pos2.y = -Cos(TASK.data[5], TASK.data[2]);
+	gSprites[sprite].pos2.y += TASK.data[2];
+	TASK.data[5] += TASK.data[4];
+	TASK.data[5] &= 0xff;
+	if (TASK.data[5] == 0) {
+		TASK.data[3]--;
+	}
+	if (TASK.data[3] == 0) {
+		gSprites[sprite].pos2.x = 0;
+		gSprites[sprite].pos2.y = 0;
+		move_anim_task_del(task);
+		return;
+	}
+}
+
+void sub_80A8500(u8 task) {
+	if (battle_side_get_owner(gUnknown_0202F7C8)) {
+		gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+	}
+	sub_80A8408(task);
+}
+
+void sub_80A8530(struct Sprite *sprite) {
+	sprite->invisible = TRUE;
+	if (battle_side_get_owner(gUnknown_0202F7C8)) {
+		sprite->data1 = -gUnknown_03004B00[1];
+	} else {
+		sprite->data1 = gUnknown_03004B00[1];
+	}
+	sprite->data0 = gUnknown_03004B00[0];
+	sprite->data2 = 0;
+	sprite->data3 = gUnknown_02024BE0[gUnknown_0202F7C8];
+	sprite->data4 = gUnknown_03004B00[0];
+	oamt_set_x3A_32(sprite, sub_80A85A4);
+	sprite->callback = sub_8078458;
+}
+
+static void sub_80A85A4(struct Sprite *sprite) {
+	sprite->data0 = sprite->data4;
+	sprite->data1 = -sprite->data1;
+	sprite->callback = sub_8078458;
+	oamt_set_x3A_32(sprite, move_anim_8072740);
+}
+
+void sub_80A85C8(struct Sprite *sprite) {
+	u8 spriteId;
+	sprite->invisible = TRUE;
+	spriteId = obj_id_for_side_relative_to_move(gUnknown_03004B00[2]);
+	sprite->data0 = gUnknown_03004B00[0];
+	sprite->data1 = 0;
+	sprite->data2 = gUnknown_03004B00[1];
+	sprite->data3 = spriteId;
+	sprite->data4 = gUnknown_03004B00[0];
+	oamt_set_x3A_32(sprite, sub_80A8614);
+	sprite->callback = sub_8078458;
+}
+
+void sub_80A8614(struct Sprite *sprite) {
+	sprite->data0 = sprite->data4;
+	sprite->data2 = -sprite->data2;
+	sprite->callback = sub_8078458;
+	oamt_set_x3A_32(sprite, move_anim_8072740);
+}
+
+void sub_80A8638(struct Sprite *sprite) {
+	int something;
+	int spriteId;
+	if (!gUnknown_03004B00[0]) {
+		spriteId = gUnknown_02024BE0[gUnknown_0202F7C8];
+	} else {
+		spriteId = gUnknown_02024BE0[gUnknown_0202F7C9];
+	}
+	sprite->data0 = gUnknown_03004B00[2];
+	sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+	sprite->data2 = gSprites[spriteId].pos1.x;
+	sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
+	sprite->data4 = gSprites[spriteId].pos1.y;
+	something = 0;
+	sub_8078A5C(sprite);
+	sprite->data3 = something;
+	sprite->data4 = something;
+	sprite->data5 = gSprites[spriteId].pos2.x;
+	sprite->data6 = gSprites[spriteId].pos2.y;
+	sprite->invisible = TRUE;
+	if (gUnknown_03004B00[1] == 1) {
+		sprite->data2 = something;
+	} else if (gUnknown_03004B00[1] == 2) {
+		sprite->data1 = something;
+	}
+	sprite->data7 = gUnknown_03004B00[1];
+	sprite->data7 |= spriteId << 8;
+	sprite->callback = sub_80A86F4;
+}
+
+static void sub_80A86F4(struct Sprite *sprite) {
+	s8 spriteId;
+	u8 lo;
+	struct Sprite *sprite2;
+	lo = sprite->data7 & 0xff;
+	spriteId = sprite->data7 >> 8;
+	sprite2 = &gSprites[spriteId];
+	if (sprite->data0 == 0) {
+		if (lo < 2) {
+			sprite2->pos2.x = 0;
+		}
+		if (lo == 2 || lo == 0) {
+			sprite2->pos2.y = 0;
+		}
+		move_anim_8072740(sprite);
+	} else {
+		sprite->data0--;
+		sprite->data3 += sprite->data1;
+		sprite->data4 += sprite->data2;
+		sprite2->pos2.x = (s8)(sprite->data3 >> 8) + sprite->data5;
+		sprite2->pos2.y = (s8)(sprite->data4 >> 8) + sprite->data6;
+	}
+}
+
+void sub_80A8764(struct Sprite *sprite) {
+	u8 v1;
+	u8 spriteId;
+	if (!gUnknown_03004B00[0]) {
+		v1 = gUnknown_0202F7C8;
+	} else {
+		v1 = gUnknown_0202F7C9;
+	}
+	spriteId = gUnknown_02024BE0[v1];
+	if (battle_side_get_owner(v1)) {
+		gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+		if (gUnknown_03004B00[3] == 1) {
+			gUnknown_03004B00[2] = -gUnknown_03004B00[2];
+		}
+	}
+	sprite->data0 = gUnknown_03004B00[4];
+	sprite->data1 = gSprites[spriteId].pos1.x;
+	sprite->data2 = gSprites[spriteId].pos1.x + gUnknown_03004B00[1];
+	sprite->data3 = gSprites[spriteId].pos1.y;
+	sprite->data4 = gSprites[spriteId].pos1.y + gUnknown_03004B00[2];
+	sub_8078A5C(sprite);
+	sprite->data3 = 0;
+	sprite->data4 = 0;
+	sprite->data5 = spriteId;
+	sprite->invisible = TRUE;
+	oamt_set_x3A_32(sprite, move_anim_8072740);
+	sprite->callback = sub_80784A8;
+}
+
+void sub_80A8818(struct Sprite *sprite) {
+	u8 spriteId;
+	u8 v1;
+	sprite->invisible = TRUE;
+	if (!gUnknown_03004B00[0]) {
+		v1 = gUnknown_0202F7C8;
+	} else {
+		v1 = gUnknown_0202F7C9;
+	}
+	spriteId = gUnknown_02024BE0[v1];
+	if (battle_side_get_owner(v1)) {
+		gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+		if (gUnknown_03004B00[3] == 1) {
+		gUnknown_03004B00[2] = -gUnknown_03004B00[2];
+		}
+	}
+	sprite->data0 = gUnknown_03004B00[4];
+	sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+	sprite->data2 = sprite->data1 + gUnknown_03004B00[1];
+	sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
+	sprite->data4 = sprite->data3 + gUnknown_03004B00[2];
+	sub_8078A5C(sprite);
+	sprite->data3 = gSprites[spriteId].pos2.x << 8;
+	sprite->data4 = gSprites[spriteId].pos2.y << 8;
+	sprite->data5 = spriteId;
+	sprite->data6 = gUnknown_03004B00[5];
+	if (!gUnknown_03004B00[5]) {
+		oamt_set_x3A_32(sprite, move_anim_8072740);
+	} else {
+		oamt_set_x3A_32(sprite, sub_80A88F0);
+	}
+	sprite->callback = sub_80784A8;
+}
+
+
+static void sub_80A88F0(struct Sprite *sprite) {
+	gSprites[sprite->data5].pos2.x = 0;
+	gSprites[sprite->data5].pos2.y = 0;
+	move_anim_8072740(sprite);
+}
+
+void sub_80A8920(u8 task) {
+	s16 r7;
+	r7 = 0x8000 / gUnknown_03004B00[3];
+	if (battle_side_get_owner(gUnknown_0202F7C8)) {
+		gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+		gUnknown_03004B00[5] = -gUnknown_03004B00[5];
+	}
+	TASK.data[0] = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+	TASK.data[1] = (gUnknown_03004B00[1] << 8) / gUnknown_03004B00[3];
+	TASK.data[2] = gUnknown_03004B00[2];
+	TASK.data[3] = gUnknown_03004B00[3];
+	TASK.data[4] = gUnknown_03004B00[4];
+	TASK.data[5] = (gUnknown_03004B00[5] << 8) / gUnknown_03004B00[6];
+	TASK.data[6] = gUnknown_03004B00[6];
+	TASK.data[7] = r7;
+	TASK.func = sub_80A89B4;
+}
+
+static void sub_80A89B4(u8 task) {
+	u8 spriteId;
+	spriteId = TASK.data[0];
+	TASK.data[11] += TASK.data[1];
+	gSprites[spriteId].pos2.x = TASK.data[11] >> 8;
+	gSprites[spriteId].pos2.y = Sin((u8)(TASK.data[10] >> 8), TASK.data[2]);
+	TASK.data[10] += TASK.data[7];
+	if (--TASK.data[3] == 0) {
+		TASK.func = sub_80A8A18;
+	}
+}
+
+static void sub_80A8A18(u8 task) {
+	u8 spriteId;
+	if (TASK.data[4] > 0) {
+		TASK.data[4]--;
+	} else {
+		spriteId = TASK.data[0];
+		TASK.data[12] += TASK.data[5];
+		gSprites[spriteId].pos2.x = (TASK.data[12] >> 8) + (TASK.data[11] >> 8);
+		if (--TASK.data[6] == 0) {
+			move_anim_task_del(task);
+			return;
+		}
+	}
+}
+
+static void sub_80A8B3C(u8 task);
+
+void sub_80A8A80(u8 task) {
+	u8 spriteId;
+	u8 *r5;
+	switch (gUnknown_03004B00[0]) {
+	case 0:
+	case 1:
+		spriteId = obj_id_for_side_relative_to_move(gUnknown_03004B00[0]);
+		break;
+	case 2:
+		if (!b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2)) {
+			move_anim_task_del(task);
+			return;
+		}
+		spriteId = gUnknown_02024BE0[gUnknown_0202F7C8 ^ 2];
+		break;
+	case 3:
+		if (!b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2)) {
+			move_anim_task_del(task);
+			return;
+		}
+		spriteId = gUnknown_02024BE0[gUnknown_0202F7C9 ^ 2];
+		break;
+	default:
+		move_anim_task_del(task);
+		return;
+	}
+	TASK.data[0] = spriteId;
+	if (battle_side_get_owner(gUnknown_0202F7C9)) {
+		TASK.data[1] = gUnknown_03004B00[1];
+	} else {
+		TASK.data[1] = -gUnknown_03004B00[1];
+	}
+	TASK.func = sub_80A8B3C;
+}
+
+static void sub_80A8B3C(u8 task) {
+	u8 spriteId = TASK.data[0];
+	gSprites[spriteId].pos2.x += TASK.data[1];
+	if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u) {
+		move_anim_task_del(task);
+		return;
+	}
+}
+
+void sub_80A8B88(u8 task) {
+	u8 spriteId;
+	if (battle_side_get_owner(gUnknown_0202F7C8)) {
+		gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+	}
+	spriteId = obj_id_for_side_relative_to_move(gUnknown_03004B00[4]);
+	TASK.data[0] = gUnknown_03004B00[0];
+	TASK.data[1] = gUnknown_03004B00[1];
+	TASK.data[2] = gUnknown_03004B00[2];
+	TASK.data[3] = gUnknown_03004B00[3];
+	TASK.data[4] = spriteId;
+	if (gUnknown_03004B00[4] == 0) {
+		TASK.data[5] = gUnknown_0202F7C8;
+	} else {
+		TASK.data[5] = gUnknown_0202F7C9;
+	}
+	TASK.data[12] = 1;
+	TASK.func = sub_80A8C0C;
+}
+
+static void sub_80A8C0C(u8 task) {
+	s16 y;
+	u8 spriteId;
+	int index;
+	u16 val;
+	spriteId = TASK.data[4];
+	val = TASK.data[10] + TASK.data[2];
+	TASK.data[10] = val;
+	index = val >> 8;
+	y = Sin(index, TASK.data[1]);
+	if (TASK.data[0] == 0) {
+		gSprites[spriteId].pos2.x = y;
+	} else {
+		if (battle_side_get_owner(TASK.data[5]) == 0) {
+			gSprites[spriteId].pos2.y = (y >= 0) ? y : -y;
+		} else {
+			gSprites[spriteId].pos2.y = (y >= 0) ? -y : y;
+		}
+	}
+	if (((index >= 0x80u) && (TASK.data[11] == 0) && (TASK.data[12] == 1))
+	 || ((index < 0x7fu) && (TASK.data[11] == 1) && (TASK.data[12] == 0))) {
+		TASK.data[11] ^= 1;
+		TASK.data[12] ^= 1;
+		if (--TASK.data[3] == 0) {
+			gSprites[spriteId].pos2.x = 0;
+			gSprites[spriteId].pos2.y = 0;
+			move_anim_task_del(task);
+			return;
+		}
+	}
+}
+
+void sub_80A8D34(u8 task) {
+	u8 spriteId;
+	spriteId = obj_id_for_side_relative_to_move(gUnknown_03004B00[3]);
+	sub_8078E70(spriteId, gUnknown_03004B00[4]);
+	TASK.data[0] = gUnknown_03004B00[0];
+	TASK.data[1] = gUnknown_03004B00[1];
+	TASK.data[2] = gUnknown_03004B00[2];
+	TASK.data[3] = gUnknown_03004B00[2];
+	TASK.data[4] = spriteId;
+	TASK.data[10] = 0x100;
+	TASK.data[11] = 0x100;
+	TASK.func = sub_80A8D8C;
+}
+
+static void sub_80A8D8C(u8 task) {
+	u8 spriteId;
+	TASK.data[10] += TASK.data[0];
+	TASK.data[11] += TASK.data[1];
+	spriteId = TASK.data[4];
+	obj_id_set_rotscale(spriteId, TASK.data[10], TASK.data[11], 0);
+	if (--TASK.data[2] == 0) {
+		if (TASK.data[3] > 0) {
+			TASK.data[0] = -TASK.data[0];
+			TASK.data[1] = -TASK.data[1];
+			TASK.data[2] = TASK.data[3];
+			TASK.data[3] = 0;
+		} else {
+			sub_8078F40(spriteId);
+			move_anim_task_del(task);
+			return;
+		}
+	}
+}
+
+void sub_80A8E04(u8 task) {
+	u8 spriteId;
+	spriteId = obj_id_for_side_relative_to_move(gUnknown_03004B00[2]);
+	sub_8078E70(spriteId, 0);
+	TASK.data[1] = 0;
+	TASK.data[2] = gUnknown_03004B00[0];
+	if (gUnknown_03004B00[3] != 1) {
+		TASK.data[3] = 0;
+	} else {
+		TASK.data[3] = gUnknown_03004B00[0] * gUnknown_03004B00[1];
+	}
+	TASK.data[4] = gUnknown_03004B00[1];
+	TASK.data[5] = spriteId;
+	TASK.data[6] = gUnknown_03004B00[3];
+	if (sub_8076BE0()) {
+		TASK.data[7] = 1;
+	} else {
+		if (gUnknown_03004B00[2] == 0) {
+			TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C8);
+		} else {
+			TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C9);
+		}
+	}
+	if (TASK.data[7]) {
+		if (!sub_8076BE0()) {
+			TASK.data[3] *= -1;
+			TASK.data[4] *= -1;
+		}
+	}
+	TASK.func = sub_80A8FD8;
+}
+
+void sub_80A8EFC(u8 task) {
+	u8 spriteId;
+	u8 side;
+	spriteId = obj_id_for_side_relative_to_move(gUnknown_03004B00[2]);
+	sub_8078E70(spriteId, 0);
+	TASK.data[1] = 0;
+	TASK.data[2] = gUnknown_03004B00[0];
+	if (gUnknown_03004B00[2] == 0) {
+		if (battle_side_get_owner(gUnknown_0202F7C8)) {
+			gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+		}
+	} else {
+		if (battle_side_get_owner(gUnknown_0202F7C9)) {
+			gUnknown_03004B00[1] = -gUnknown_03004B00[1];
+		}
+	}
+	if (gUnknown_03004B00[3] != 1) {
+		TASK.data[3] = 0;
+	} else {
+		TASK.data[3] = gUnknown_03004B00[0] * gUnknown_03004B00[1];
+	}
+	TASK.data[4] = gUnknown_03004B00[1];
+	TASK.data[5] = spriteId;
+	TASK.data[6] = gUnknown_03004B00[3];
+	TASK.data[7] = 1;
+	TASK.data[3] *= -1;
+	TASK.data[4] *= -1;
+	TASK.func = sub_80A8FD8;
+}
+
+void sub_80A8FD8(u8 task) {
+	TASK.data[3] += TASK.data[4];
+	obj_id_set_rotscale(TASK.data[5], 0x100, 0x100, TASK.data[3]);
+	if (TASK.data[7]) {
+		sub_8078F9C(TASK.data[5]);
+	}
+	if (++TASK.data[1] >= TASK.data[2]) {
+		switch (TASK.data[6]) {
+		case 1:
+			sub_8078F40(TASK.data[5]);
+		case 0:
+		default:
+			move_anim_task_del(task);
+			return;
+		case 2:
+			TASK.data[1] = 0;
+			TASK.data[4] *= -1;
+			TASK.data[6] = 1;
+			break;
+		}
+	}
+}
+
+void sub_80A9058(u8 task) {
+	if (!gUnknown_03004B00[0]) {
+		TASK.data[15] = gUnknown_0202F7BC / 12;
+		if (TASK.data[15] < 1) {
+			TASK.data[15] = 1;
+		}
+		if (TASK.data[15] > 16) {
+			TASK.data[15] = 16;
+		}
+	} else {
+		TASK.data[15] = gUnknown_0202F7B8 / 12;
+		if (TASK.data[15] < 1) {
+			TASK.data[15] = 1;
+		}
+		if (TASK.data[15] > 16) {
+			TASK.data[15] = 16;
+		}
+	}
+	TASK.data[14] = TASK.data[15] / 2;
+	TASK.data[13] = TASK.data[14] + (TASK.data[15] & 1);
+	TASK.data[12] = 0;
+	TASK.data[10] = gUnknown_03004B00[3];
+	TASK.data[11] = gUnknown_03004B00[4];
+	TASK.data[7] = obj_id_for_side_relative_to_move(1);
+	TASK.data[8] = gSprites[TASK.data[7]].pos2.x;
+	TASK.data[9] = gSprites[TASK.data[7]].pos2.y;
+	TASK.data[0] = 0;
+	TASK.data[1] = gUnknown_03004B00[1];
+	TASK.data[2] = gUnknown_03004B00[2];
+	TASK.func = sub_80A913C;
+}
+
+static void sub_80A913C(u8 taskId) {
+	struct Task *task = &gTasks[taskId];
+	if (++task->data[0] > task->data[1]) {
+		task->data[0] = 0;
+		task->data[12] = (task->data[12] + 1) & 1;
+		if (task->data[10]) {
+			if (task->data[12]) {
+				gSprites[task->data[7]].pos2.x = task->data[8] + task->data[13];
+			} else {
+				gSprites[task->data[7]].pos2.x = task->data[8] - task->data[14];
+			}
+		}
+		if (task->data[11]) {
+			if (task->data[12]) {
+				gSprites[task->data[7]].pos2.y = task->data[15];
+			} else {
+				gSprites[task->data[7]].pos2.y = 0;
+			}
+		}
+		if (!--task->data[2]) {
+			gSprites[task->data[7]].pos2.x = 0;
+			gSprites[task->data[7]].pos2.y = 0;
+			move_anim_task_del(taskId);
+			return;
+		}
+	}
+}