Merge pull request #509 from progreon/battle_anim

Decompile various battle_anim files

8 files changed, 758 insertions, 1872 deletions

diff --git a/asm/bug.s b/asm/bug.s
deleted file mode 100755
index 83170e9a7..000000000
--- a/asm/bug.s
+++ /dev/null
@@ -1,825 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ bug
-
-	thumb_func_start sub_80DC824
-sub_80DC824: @ 80DC824
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DC850
-	adds r0, r6, 0
-	movs r1, 0x2
-	bl StartSpriteAffineAnim
-	ldr r0, _080DC84C @ =gBattleAnimArgs
-	ldrh r1, [r0, 0x4]
-	negs r1, r1
-	strh r1, [r0, 0x4]
-	ldrh r1, [r0]
-	negs r1, r1
-	strh r1, [r0]
-	b _080DC880
-	.align 2, 0
-_080DC84C: .4byte gBattleAnimArgs
-_080DC850:
-	ldr r0, _080DC8E4 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DC880
-	adds r0, r6, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	ldr r1, _080DC8E8 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-	ldrh r0, [r1, 0x6]
-	negs r0, r0
-	strh r0, [r1, 0x6]
-	ldrh r0, [r1]
-	negs r0, r0
-	strh r0, [r1]
-_080DC880:
-	ldr r5, _080DC8E4 @ =gAnimBankTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl sub_8077EE4
-	lsls r0, 24
-	ldr r4, _080DC8E8 @ =gBattleAnimArgs
-	lsrs r0, 24
-	ldrh r1, [r4]
-	adds r0, r1
-	strh r0, [r6, 0x20]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl sub_8077EE4
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x2]
-	adds r0, r1
-	strh r0, [r6, 0x22]
-	ldrh r0, [r4, 0x8]
-	strh r0, [r6, 0x2E]
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x4]
-	adds r0, r1
-	strh r0, [r6, 0x32]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r4, [r4, 0x6]
-	adds r0, r4
-	strh r0, [r6, 0x36]
-	ldr r0, _080DC8EC @ =sub_8078B34
-	str r0, [r6, 0x1C]
-	ldr r1, _080DC8F0 @ =DestroyAnimSprite
-	adds r0, r6, 0
-	bl StoreSpriteCallbackInData
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DC8E4: .4byte gAnimBankTarget
-_080DC8E8: .4byte gBattleAnimArgs
-_080DC8EC: .4byte sub_8078B34
-_080DC8F0: .4byte DestroyAnimSprite
-	thumb_func_end sub_80DC824
-
-	thumb_func_start sub_80DC8F4
-sub_80DC8F4: @ 80DC8F4
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DC918
-	ldr r1, _080DC914 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	negs r0, r0
-	strh r0, [r1]
-	adds r0, r6, 0
-	movs r1, 0x2
-	bl StartSpriteAffineAnim
-	b _080DC934
-	.align 2, 0
-_080DC914: .4byte gBattleAnimArgs
-_080DC918:
-	ldr r0, _080DC990 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DC934
-	ldr r0, _080DC994 @ =gBattleAnimArgs
-	ldrh r1, [r0, 0x2]
-	negs r1, r1
-	strh r1, [r0, 0x2]
-	ldrh r1, [r0]
-	negs r1, r1
-	strh r1, [r0]
-_080DC934:
-	ldr r5, _080DC990 @ =gAnimBankTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl sub_8077EE4
-	lsls r0, 24
-	ldr r4, _080DC994 @ =gBattleAnimArgs
-	lsrs r0, 24
-	ldrh r1, [r4]
-	adds r0, r1
-	strh r0, [r6, 0x20]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl sub_8077EE4
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x2]
-	adds r0, r1
-	strh r0, [r6, 0x22]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r6, 0x2E]
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x32]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x36]
-	ldr r0, _080DC998 @ =sub_8078B34
-	str r0, [r6, 0x1C]
-	ldr r1, _080DC99C @ =DestroyAnimSprite
-	adds r0, r6, 0
-	bl StoreSpriteCallbackInData
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DC990: .4byte gAnimBankTarget
-_080DC994: .4byte gBattleAnimArgs
-_080DC998: .4byte sub_8078B34
-_080DC99C: .4byte DestroyAnimSprite
-	thumb_func_end sub_80DC8F4
-
-	thumb_func_start sub_80DC9A0
-sub_80DC9A0: @ 80DC9A0
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DC9BC
-	ldr r0, _080DC9FC @ =gBattleAnimArgs
-	movs r2, 0x4
-	ldrsh r1, [r0, r2]
-	lsrs r2, r1, 31
-	adds r1, r2
-	asrs r1, 1
-	strh r1, [r0, 0x4]
-_080DC9BC:
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	ldr r1, _080DC9FC @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x20]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r5, 0x22]
-	strh r0, [r5, 0x34]
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080DCA04
-	ldr r4, _080DCA00 @ =gAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	b _080DCA16
-	.align 2, 0
-_080DC9FC: .4byte gBattleAnimArgs
-_080DCA00: .4byte gAnimBankTarget
-_080DCA04:
-	ldr r0, _080DCA2C @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r2, r5, 0
-	adds r2, 0x32
-	adds r3, r5, 0
-	adds r3, 0x36
-	movs r1, 0x1
-	bl sub_807A3FC
-_080DCA16:
-	adds r0, r5, 0
-	bl sub_8078BD4
-	ldr r0, _080DCA30 @ =gBattleAnimArgs
-	ldrh r0, [r0, 0x6]
-	strh r0, [r5, 0x38]
-	ldr r0, _080DCA34 @ =sub_80DCA38
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCA2C: .4byte gAnimBankTarget
-_080DCA30: .4byte gBattleAnimArgs
-_080DCA34: .4byte sub_80DCA38
-	thumb_func_end sub_80DC9A0
-
-	thumb_func_start sub_80DCA38
-sub_80DCA38: @ 80DCA38
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078B5C
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCA4E
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-	b _080DCA6A
-_080DCA4E:
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	movs r2, 0x38
-	ldrsh r1, [r4, r2]
-	bl Sin
-	ldrh r1, [r4, 0x24]
-	adds r0, r1
-	strh r0, [r4, 0x24]
-	ldrh r0, [r4, 0x3A]
-	adds r0, 0xD
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x3A]
-_080DCA6A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCA38
-
-	thumb_func_start sub_80DCA70
-sub_80DCA70: @ 80DCA70
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080DCAA0 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r2, r4, 0
-	adds r2, 0x20
-	adds r3, r4, 0
-	adds r3, 0x22
-	movs r1, 0
-	bl sub_807A3FC
-	ldr r0, _080DCAA4 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCAAC
-	ldr r0, _080DCAA8 @ =gBattleAnimArgs
-	ldrh r1, [r4, 0x20]
-	ldrh r2, [r0]
-	subs r1, r2
-	strh r1, [r4, 0x20]
-	b _080DCAB8
-	.align 2, 0
-_080DCAA0: .4byte gAnimBankTarget
-_080DCAA4: .4byte gAnimBankAttacker
-_080DCAA8: .4byte gBattleAnimArgs
-_080DCAAC:
-	ldr r1, _080DCAE0 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r4, 0x20]
-	adds r0, r1, 0
-_080DCAB8:
-	ldrh r0, [r0, 0x2]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r4, 0x22]
-	ldr r0, _080DCAE4 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DCAD4
-	ldrh r0, [r4, 0x22]
-	adds r0, 0x8
-	strh r0, [r4, 0x22]
-_080DCAD4:
-	ldr r0, _080DCAE8 @ =sub_80DCAEC
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCAE0: .4byte gBattleAnimArgs
-_080DCAE4: .4byte gAnimBankTarget
-_080DCAE8: .4byte sub_80DCAEC
-	thumb_func_end sub_80DCA70
-
-	thumb_func_start sub_80DCAEC
-sub_80DCAEC: @ 80DCAEC
-	push {lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3
-	bne _080DCB20
-	movs r0, 0
-	strh r0, [r3, 0x2E]
-	movs r0, 0x3E
-	adds r0, r3
-	mov r12, r0
-	ldrb r2, [r0]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	mov r1, r12
-	strb r0, [r1]
-_080DCB20:
-	ldrh r0, [r3, 0x30]
-	adds r0, 0x1
-	strh r0, [r3, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x33
-	bne _080DCB34
-	adds r0, r3, 0
-	bl DestroyAnimSprite
-_080DCB34:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCAEC
-
-	thumb_func_start sub_80DCB38
-sub_80DCB38: @ 80DCB38
-	ldr r2, _080DCB54 @ =REG_BLDCNT
-	movs r3, 0xFD
-	lsls r3, 6
-	adds r1, r3, 0
-	strh r1, [r2]
-	adds r2, 0x2
-	movs r1, 0x10
-	strh r1, [r2]
-	movs r1, 0x10
-	strh r1, [r0, 0x2E]
-	ldr r1, _080DCB58 @ =sub_80DCB5C
-	str r1, [r0, 0x1C]
-	bx lr
-	.align 2, 0
-_080DCB54: .4byte REG_BLDCNT
-_080DCB58: .4byte sub_80DCB5C
-	thumb_func_end sub_80DCB38
-
-	thumb_func_start sub_80DCB5C
-sub_80DCB5C: @ 80DCB5C
-	push {lr}
-	adds r3, r0, 0
-	ldrh r1, [r3, 0x32]
-	movs r2, 0x32
-	ldrsh r0, [r3, r2]
-	cmp r0, 0x13
-	bgt _080DCB70
-	adds r0, r1, 0x1
-	strh r0, [r3, 0x32]
-	b _080DCBA8
-_080DCB70:
-	ldrh r1, [r3, 0x30]
-	adds r0, r1, 0x1
-	strh r0, [r3, 0x30]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080DCBA8
-	ldrh r1, [r3, 0x2E]
-	subs r1, 0x1
-	strh r1, [r3, 0x2E]
-	ldr r2, _080DCBAC @ =REG_BLDALPHA
-	movs r0, 0x10
-	subs r0, r1
-	lsls r0, 8
-	orrs r1, r0
-	strh r1, [r2]
-	movs r1, 0x2E
-	ldrsh r0, [r3, r1]
-	cmp r0, 0
-	bne _080DCBA8
-	adds r2, r3, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080DCBB0 @ =sub_80DCBB4
-	str r0, [r3, 0x1C]
-_080DCBA8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCBAC: .4byte REG_BLDALPHA
-_080DCBB0: .4byte sub_80DCBB4
-	thumb_func_end sub_80DCB5C
-
-	thumb_func_start sub_80DCBB4
-sub_80DCBB4: @ 80DCBB4
-	push {lr}
-	ldr r1, _080DCBC8 @ =REG_BLDCNT
-	movs r2, 0
-	strh r2, [r1]
-	adds r1, 0x2
-	strh r2, [r1]
-	bl DestroyAnimSprite
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCBC8: .4byte REG_BLDCNT
-	thumb_func_end sub_80DCBB4
-
-	thumb_func_start sub_80DCBCC
-sub_80DCBCC: @ 80DCBCC
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r7, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCBEC
-	ldr r1, _080DCBE8 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-	b _080DCC0E
-	.align 2, 0
-_080DCBE8: .4byte gBattleAnimArgs
-_080DCBEC:
-	ldr r0, _080DCCE8 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCC0E
-	ldr r1, _080DCCEC @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-	ldrh r0, [r1, 0x6]
-	negs r0, r0
-	strh r0, [r1, 0x6]
-_080DCC0E:
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DCC5E
-	ldr r0, _080DCCE8 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	adds r4, r0, 0
-	ldr r5, _080DCCF0 @ =gAnimBankTarget
-	ldrb r0, [r5]
-	bl GetBankSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bne _080DCC5E
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCC4C
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080DCC5E
-_080DCC4C:
-	ldr r0, _080DCCEC @ =gBattleAnimArgs
-	movs r2, 0x4
-	ldrsh r1, [r0, r2]
-	negs r1, r1
-	strh r1, [r0, 0x4]
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	negs r1, r1
-	strh r1, [r0]
-_080DCC5E:
-	adds r0, r7, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	ldr r5, _080DCCF0 @ =gAnimBankTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBankPosition
-	adds r4, r0, 0
-	lsls r4, 24
-	ldr r6, _080DCCEC @ =gBattleAnimArgs
-	lsrs r4, 24
-	ldrh r0, [r6, 0x4]
-	adds r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBankPosition
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r2, [r6, 0x6]
-	adds r1, r2
-	lsls r1, 16
-	ldrh r2, [r7, 0x20]
-	lsls r0, r4, 16
-	asrs r0, 16
-	subs r0, r2
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r2, [r7, 0x22]
-	lsrs r5, r1, 16
-	asrs r1, 16
-	subs r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	bl sub_80790F0
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 24
-	adds r0, r1
-	lsrs r0, 16
-	movs r3, 0x80
-	lsls r3, 1
-	str r0, [sp]
-	adds r0, r7, 0
-	movs r1, 0
-	adds r2, r3, 0
-	bl sub_8078FDC
-	ldrh r0, [r6, 0x8]
-	strh r0, [r7, 0x2E]
-	strh r4, [r7, 0x32]
-	strh r5, [r7, 0x36]
-	ldr r0, _080DCCF4 @ =sub_8078B34
-	str r0, [r7, 0x1C]
-	ldr r1, _080DCCF8 @ =DestroyAnimSprite
-	adds r0, r7, 0
-	bl StoreSpriteCallbackInData
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCCE8: .4byte gAnimBankAttacker
-_080DCCEC: .4byte gBattleAnimArgs
-_080DCCF0: .4byte gAnimBankTarget
-_080DCCF4: .4byte sub_8078B34
-_080DCCF8: .4byte DestroyAnimSprite
-	thumb_func_end sub_80DCBCC
-
-	thumb_func_start sub_80DCCFC
-sub_80DCCFC: @ 80DCCFC
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	ldr r0, _080DCD68 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCD1C
-	ldr r1, _080DCD6C @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-_080DCD1C:
-	ldr r4, _080DCD6C @ =gBattleAnimArgs
-	ldrh r0, [r4, 0x8]
-	strh r0, [r6, 0x2E]
-	ldr r5, _080DCD70 @ =gAnimBankTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x4]
-	adds r0, r1
-	strh r0, [r6, 0x32]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x6]
-	adds r0, r1
-	strh r0, [r6, 0x36]
-	ldrh r0, [r4, 0xA]
-	strh r0, [r6, 0x38]
-	adds r0, r6, 0
-	bl sub_80786EC
-	ldr r0, _080DCD74 @ =sub_80DCD78
-	str r0, [r6, 0x1C]
-	adds r2, r6, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCD68: .4byte gAnimBankAttacker
-_080DCD6C: .4byte gBattleAnimArgs
-_080DCD70: .4byte gAnimBankTarget
-_080DCD74: .4byte sub_80DCD78
-	thumb_func_end sub_80DCCFC
-
-	thumb_func_start sub_80DCD78
-sub_80DCD78: @ 80DCD78
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x14
-	adds r4, r0, 0
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r0
-	strb r1, [r2]
-	adds r0, r4, 0
-	bl sub_8078718
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCDA4
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-	b _080DCE34
-_080DCDA4:
-	movs r0, 0x2E
-	adds r0, r4
-	mov r8, r0
-	ldrh r7, [r4, 0x20]
-	ldrh r5, [r4, 0x24]
-	ldrh r1, [r4, 0x22]
-	mov r12, r1
-	ldrh r6, [r4, 0x26]
-	mov r2, r8
-	add r1, sp, 0x4
-	movs r3, 0x7
-_080DCDBA:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	adds r2, 0x2
-	adds r1, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080DCDBA
-	adds r0, r7, r5
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r2, r12
-	adds r0, r2, r6
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r0, r4, 0
-	bl sub_8078718
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DCE34
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	lsls r1, r5, 16
-	asrs r1, 16
-	subs r0, r1
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r1, [r4, 0x26]
-	ldrh r2, [r4, 0x22]
-	adds r1, r2
-	lsls r2, r6, 16
-	asrs r2, 16
-	subs r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	bl sub_80790F0
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 24
-	adds r0, r1
-	lsrs r0, 16
-	movs r3, 0x80
-	lsls r3, 1
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r1, 0
-	adds r2, r3, 0
-	bl sub_8078FDC
-	add r2, sp, 0x4
-	mov r1, r8
-	movs r3, 0x7
-_080DCE26:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	adds r2, 0x2
-	adds r1, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080DCE26
-_080DCE34:
-	add sp, 0x14
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCD78
-
-	thumb_func_start sub_80DCE40
-sub_80DCE40: @ 80DCE40
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _080DCE54 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080DCE5C
-	ldr r4, _080DCE58 @ =gAnimBankAttacker
-	b _080DCE5E
-	.align 2, 0
-_080DCE54: .4byte gBattleAnimArgs
-_080DCE58: .4byte gAnimBankAttacker
-_080DCE5C:
-	ldr r4, _080DCE90 @ =gAnimBankTarget
-_080DCE5E:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x12
-	strh r0, [r5, 0x22]
-	ldr r1, _080DCE94 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData
-	ldr r0, _080DCE98 @ =sub_80785E4
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCE90: .4byte gAnimBankTarget
-_080DCE94: .4byte move_anim_8074EE0
-_080DCE98: .4byte sub_80785E4
-	thumb_func_end sub_80DCE40
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/poison.s b/asm/poison.s
deleted file mode 100755
index 234348df2..000000000
--- a/asm/poison.s
+++ /dev/null
@@ -1,364 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ poison
-
-	thumb_func_start sub_80D9D70
-sub_80D9D70: @ 80D9D70
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _080D9DC4 @ =gBattleAnimArgs
-	movs r1, 0x6
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D9D86
-	adds r0, r5, 0
-	movs r1, 0x2
-	bl StartSpriteAnim
-_080D9D86:
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	ldrh r0, [r4, 0x4]
-	strh r0, [r5, 0x2E]
-	ldr r4, _080D9DC8 @ =gAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBankPosition
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	ldr r0, _080D9DCC @ =0x0000ffe2
-	strh r0, [r5, 0x38]
-	adds r0, r5, 0
-	bl sub_80786EC
-	ldr r0, _080D9DD0 @ =sub_80D9DD4
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D9DC4: .4byte gBattleAnimArgs
-_080D9DC8: .4byte gAnimBankTarget
-_080D9DCC: .4byte 0x0000ffe2
-_080D9DD0: .4byte sub_80D9DD4
-	thumb_func_end sub_80D9D70
-
-	thumb_func_start sub_80D9DD4
-sub_80D9DD4: @ 80D9DD4
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078718
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D9DE8
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080D9DE8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D9DD4
-
-	thumb_func_start sub_80D9DF0
-sub_80D9DF0: @ 80D9DF0
-	push {r4-r6,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldr r5, _080D9E64 @ =gBattleAnimArgs
-	movs r1, 0x6
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _080D9E08
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl StartSpriteAnim
-_080D9E08:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_80787B0
-	ldr r0, _080D9E68 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	mov r6, sp
-	adds r6, 0x2
-	movs r1, 0x1
-	mov r2, sp
-	adds r3, r6, 0
-	bl sub_807A3FC
-	ldr r0, _080D9E6C @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D9E36
-	ldrh r0, [r5, 0x8]
-	negs r0, r0
-	strh r0, [r5, 0x8]
-_080D9E36:
-	ldrh r0, [r5, 0x4]
-	strh r0, [r4, 0x2E]
-	mov r1, sp
-	ldrh r0, [r5, 0x8]
-	ldrh r1, [r1]
-	adds r0, r1
-	strh r0, [r4, 0x32]
-	ldrh r0, [r5, 0xA]
-	ldrh r6, [r6]
-	adds r0, r6
-	strh r0, [r4, 0x36]
-	ldr r0, _080D9E70 @ =0x0000ffe2
-	strh r0, [r4, 0x38]
-	adds r0, r4, 0
-	bl sub_80786EC
-	ldr r0, _080D9E74 @ =sub_80D9E78
-	str r0, [r4, 0x1C]
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D9E64: .4byte gBattleAnimArgs
-_080D9E68: .4byte gAnimBankTarget
-_080D9E6C: .4byte gAnimBankAttacker
-_080D9E70: .4byte 0x0000ffe2
-_080D9E74: .4byte sub_80D9E78
-	thumb_func_end sub_80D9DF0
-
-	thumb_func_start sub_80D9E78
-sub_80D9E78: @ 80D9E78
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078718
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D9E8C
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080D9E8C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D9E78
-
-	thumb_func_start sub_80D9E94
-sub_80D9E94: @ 80D9E94
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _080D9EE0 @ =gBattleAnimArgs
-	ldrh r0, [r5, 0x4]
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r4, 0x20]
-	strh r0, [r4, 0x30]
-	ldrh r1, [r5]
-	adds r0, r1
-	strh r0, [r4, 0x32]
-	ldrh r0, [r4, 0x22]
-	strh r0, [r4, 0x34]
-	ldrh r1, [r5, 0x2]
-	adds r0, r1
-	strh r0, [r4, 0x36]
-	adds r0, r4, 0
-	bl sub_8078A5C
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	movs r2, 0x4
-	ldrsh r1, [r5, r2]
-	bl __divsi3
-	strh r0, [r4, 0x38]
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	movs r2, 0x4
-	ldrsh r1, [r5, r2]
-	bl __divsi3
-	strh r0, [r4, 0x3A]
-	ldr r0, _080D9EE4 @ =sub_80D9EE8
-	str r0, [r4, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D9EE0: .4byte gBattleAnimArgs
-_080D9EE4: .4byte sub_80D9EE8
-	thumb_func_end sub_80D9E94
-
-	thumb_func_start sub_80D9EE8
-sub_80D9EE8: @ 80D9EE8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078394
-	ldrh r0, [r4, 0x30]
-	ldrh r1, [r4, 0x38]
-	subs r0, r1
-	strh r0, [r4, 0x30]
-	ldrh r0, [r4, 0x32]
-	ldrh r1, [r4, 0x3A]
-	subs r0, r1
-	strh r0, [r4, 0x32]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D9F0E
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080D9F0E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D9EE8
-
-	thumb_func_start sub_80D9F14
-sub_80D9F14: @ 80D9F14
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080D9F74 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r2, r4, 0
-	adds r2, 0x20
-	adds r3, r4, 0
-	adds r3, 0x22
-	movs r1, 0x1
-	bl sub_807A3FC
-	ldr r0, _080D9F78 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D9F40
-	ldr r1, _080D9F7C @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	negs r0, r0
-	strh r0, [r1]
-_080D9F40:
-	ldr r0, _080D9F7C @ =gBattleAnimArgs
-	ldrh r2, [r0]
-	ldrh r1, [r4, 0x20]
-	adds r2, r1
-	strh r2, [r4, 0x20]
-	ldrh r1, [r0, 0x2]
-	ldrh r3, [r4, 0x22]
-	adds r1, r3
-	strh r1, [r4, 0x22]
-	ldrh r3, [r0, 0x8]
-	strh r3, [r4, 0x2E]
-	ldrh r0, [r0, 0x4]
-	adds r2, r0
-	strh r2, [r4, 0x32]
-	adds r1, r3
-	strh r1, [r4, 0x36]
-	ldr r0, _080D9F80 @ =sub_8078B34
-	str r0, [r4, 0x1C]
-	ldr r1, _080D9F84 @ =DestroyAnimSprite
-	adds r0, r4, 0
-	bl StoreSpriteCallbackInData
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D9F74: .4byte gAnimBankTarget
-_080D9F78: .4byte gAnimBankAttacker
-_080D9F7C: .4byte gBattleAnimArgs
-_080D9F80: .4byte sub_8078B34
-_080D9F84: .4byte DestroyAnimSprite
-	thumb_func_end sub_80D9F14
-
-	thumb_func_start sub_80D9F88
-sub_80D9F88: @ 80D9F88
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _080D9FA0 @ =gBattleAnimArgs
-	movs r1, 0x4
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _080D9FA4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8078764
-	b _080D9FDA
-	.align 2, 0
-_080D9FA0: .4byte gBattleAnimArgs
-_080D9FA4:
-	ldr r0, _080D9FE4 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r2, r4, 0
-	adds r2, 0x20
-	adds r3, r4, 0
-	adds r3, 0x22
-	movs r1, 0x1
-	bl sub_807A3FC
-	ldr r0, _080D9FE8 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D9FCA
-	ldrh r0, [r5]
-	negs r0, r0
-	strh r0, [r5]
-_080D9FCA:
-	ldrh r0, [r5]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r4, 0x20]
-	ldrh r0, [r5, 0x2]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r4, 0x22]
-_080D9FDA:
-	ldr r0, _080D9FEC @ =sub_80D9FF0
-	str r0, [r4, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D9FE4: .4byte gAnimBankTarget
-_080D9FE8: .4byte gAnimBankAttacker
-_080D9FEC: .4byte sub_80D9FF0
-	thumb_func_end sub_80D9F88
-
-	thumb_func_start sub_80D9FF0
-sub_80D9FF0: @ 80D9FF0
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0xB
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x2E]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	movs r1, 0x4
-	bl Sin
-	strh r0, [r4, 0x24]
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x30
-	strh r0, [r4, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-	negs r0, r0
-	strh r0, [r4, 0x26]
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080DA02C
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080DA02C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D9FF0
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s
deleted file mode 100755
index a6407589f..000000000
--- a/asm/wisp_fire.s
+++ /dev/null
@@ -1,678 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ wisp_fire
-
-	thumb_func_start sub_80D5CC0
-sub_80D5CC0: @ 80D5CC0
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x2E]
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bne _080D5CD8
-	ldr r0, _080D5D4C @ =gBattleAnimArgs
-	ldrh r0, [r0]
-	strh r0, [r4, 0x30]
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x2E]
-_080D5CD8:
-	movs r0, 0xC0
-	lsls r0, 1
-	adds r1, r0, 0
-	ldrh r2, [r4, 0x34]
-	adds r1, r2
-	strh r1, [r4, 0x34]
-	ldrh r0, [r4, 0x36]
-	adds r0, 0xA0
-	strh r0, [r4, 0x36]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	lsls r1, 16
-	asrs r1, 24
-	bl Sin
-	strh r0, [r4, 0x24]
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	ldrh r1, [r4, 0x36]
-	lsls r1, 16
-	asrs r1, 24
-	bl Cos
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x30]
-	adds r2, r0, 0x7
-	movs r0, 0xFF
-	ands r2, r0
-	strh r2, [r4, 0x30]
-	ldr r0, _080D5D50 @ =gMain
-	ldr r1, _080D5D54 @ =0x0000043d
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5D84
-	adds r0, r2, 0
-	subs r0, 0x40
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x83
-	bls _080D5D5C
-	ldr r0, _080D5D58 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	bl sub_8079ED4
-	movs r1, 0x3
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r4, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, 0x5]
-	b _080D5DA0
-	.align 2, 0
-_080D5D4C: .4byte gBattleAnimArgs
-_080D5D50: .4byte gMain
-_080D5D54: .4byte 0x0000043d
-_080D5D58: .4byte gAnimBankTarget
-_080D5D5C:
-	ldr r0, _080D5D80 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	bl sub_8079ED4
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	lsls r0, 2
-	ldrb r2, [r4, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r4, 0x5]
-	b _080D5DA0
-	.align 2, 0
-_080D5D80: .4byte gAnimBankTarget
-_080D5D84:
-	adds r0, r2, 0
-	subs r0, 0x40
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x83
-	bls _080D5D98
-	adds r1, r4, 0
-	adds r1, 0x43
-	movs r0, 0x1D
-	b _080D5D9E
-_080D5D98:
-	adds r1, r4, 0
-	adds r1, 0x43
-	movs r0, 0x1F
-_080D5D9E:
-	strb r0, [r1]
-_080D5DA0:
-	ldrh r0, [r4, 0x32]
-	adds r0, 0x1
-	strh r0, [r4, 0x32]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	ble _080D5DC8
-	adds r3, r4, 0
-	adds r3, 0x3E
-	ldrb r2, [r3]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-_080D5DC8:
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x1E
-	bne _080D5DD6
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080D5DD6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D5CC0
-
-	thumb_func_start sub_80D5DDC
-sub_80D5DDC: @ 80D5DDC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _080D5E3C @ =gTasks
-	adds r4, r1, r0
-	ldr r0, _080D5E40 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	movs r2, 0x1
-	negs r2, r2
-	adds r1, r2, 0
-	cmp r0, 0
-	bne _080D5E02
-	movs r1, 0x1
-_080D5E02:
-	strh r1, [r4, 0x20]
-	ldr r0, _080D5E44 @ =gAnimBankTarget
-	ldrb r1, [r0]
-	movs r0, 0x2
-	eors r0, r1
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x1
-	strh r0, [r4, 0x22]
-	movs r0, 0x1
-	bl GetAnimBankSpriteId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x24]
-	movs r0, 0x3
-	bl GetAnimBankSpriteId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x26]
-	ldr r0, _080D5E48 @ =sub_80D5E4C
-	str r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D5E3C: .4byte gTasks
-_080D5E40: .4byte gAnimBankAttacker
-_080D5E44: .4byte gAnimBankTarget
-_080D5E48: .4byte sub_80D5E4C
-	thumb_func_end sub_80D5DDC
-
-	thumb_func_start sub_80D5E4C
-sub_80D5E4C: @ 80D5E4C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _080D5E70 @ =gTasks
-	adds r2, r0, r1
-	movs r0, 0x8
-	ldrsh r3, [r2, r0]
-	cmp r3, 0x1
-	beq _080D5F14
-	cmp r3, 0x1
-	bgt _080D5E74
-	cmp r3, 0
-	beq _080D5E82
-	b _080D6074
-	.align 2, 0
-_080D5E70: .4byte gTasks
-_080D5E74:
-	cmp r3, 0x2
-	bne _080D5E7A
-	b _080D5F9C
-_080D5E7A:
-	cmp r3, 0x3
-	bne _080D5E80
-	b _080D6030
-_080D5E80:
-	b _080D6074
-_080D5E82:
-	movs r1, 0x20
-	ldrsh r0, [r2, r1]
-	lsls r0, 1
-	ldrh r5, [r2, 0x1C]
-	adds r0, r5
-	strh r0, [r2, 0x1C]
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080D5EB4
-	strh r3, [r2, 0xA]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	strh r0, [r2, 0xC]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5EB0
-	movs r0, 0x2
-	b _080D5EB2
-_080D5EB0:
-	ldr r0, _080D5F0C @ =0x0000fffe
-_080D5EB2:
-	strh r0, [r2, 0x1E]
-_080D5EB4:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r7, 0x22
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	bge _080D5EF6
-	ldr r4, _080D5F10 @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-_080D5EC6:
-	movs r1, 0xE
-	ldrsh r0, [r2, r1]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r5, 0
-	ldrsh r0, [r0, r5]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r2, 0x1E]
-	ldrh r7, [r2, 0x1C]
-	adds r0, r7
-	strh r0, [r1, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r5, 0x22
-	ldrsh r1, [r2, r5]
-	cmp r0, r1
-	blt _080D5EC6
-_080D5EF6:
-	ldrh r0, [r2, 0x1A]
-	adds r0, 0x1
-	strh r0, [r2, 0x1A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	beq _080D5F06
-	b _080D6074
-_080D5F06:
-	movs r0, 0
-	strh r0, [r2, 0x1A]
-	b _080D6020
-	.align 2, 0
-_080D5F0C: .4byte 0x0000fffe
-_080D5F10: .4byte gSprites
-_080D5F14:
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _080D5F3C
-	movs r0, 0
-	strh r0, [r2, 0xA]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	strh r0, [r2, 0xC]
-	ands r0, r3
-	lsls r0, 16
-	cmp r0, 0
-	beq _080D5F38
-	movs r0, 0x2
-	b _080D5F3A
-_080D5F38:
-	ldr r0, _080D5F94 @ =0x0000fffe
-_080D5F3A:
-	strh r0, [r2, 0x1E]
-_080D5F3C:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r7, 0x22
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	bge _080D5F7E
-	ldr r4, _080D5F98 @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-_080D5F4E:
-	movs r1, 0xE
-	ldrsh r0, [r2, r1]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r5, 0
-	ldrsh r0, [r0, r5]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r2, 0x1E]
-	ldrh r7, [r2, 0x1C]
-	adds r0, r7
-	strh r0, [r1, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r5, 0x22
-	ldrsh r1, [r2, r5]
-	cmp r0, r1
-	blt _080D5F4E
-_080D5F7E:
-	ldrh r0, [r2, 0x1A]
-	adds r0, 0x1
-	strh r0, [r2, 0x1A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x60
-	bne _080D6074
-	movs r0, 0
-	strh r0, [r2, 0x1A]
-	b _080D6020
-	.align 2, 0
-_080D5F94: .4byte 0x0000fffe
-_080D5F98: .4byte gSprites
-_080D5F9C:
-	movs r7, 0x20
-	ldrsh r1, [r2, r7]
-	lsls r1, 1
-	ldrh r0, [r2, 0x1C]
-	subs r0, r1
-	strh r0, [r2, 0x1C]
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080D5FD0
-	movs r0, 0
-	strh r0, [r2, 0xA]
-	ldrh r0, [r2, 0xC]
-	adds r0, 0x1
-	strh r0, [r2, 0xC]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5FCC
-	strh r3, [r2, 0x1E]
-	b _080D5FD0
-_080D5FCC:
-	ldr r0, _080D6028 @ =0x0000fffe
-	strh r0, [r2, 0x1E]
-_080D5FD0:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r3, 0x22
-	ldrsh r0, [r2, r3]
-	cmp r1, r0
-	bge _080D6012
-	ldr r4, _080D602C @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-_080D5FE2:
-	movs r5, 0xE
-	ldrsh r0, [r2, r5]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r7, 0
-	ldrsh r0, [r0, r7]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r2, 0x1E]
-	ldrh r5, [r2, 0x1C]
-	adds r0, r5
-	strh r0, [r1, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r7, 0x22
-	ldrsh r1, [r2, r7]
-	cmp r0, r1
-	blt _080D5FE2
-_080D6012:
-	ldrh r0, [r2, 0x1A]
-	adds r0, 0x1
-	strh r0, [r2, 0x1A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	bne _080D6074
-_080D6020:
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	b _080D6074
-	.align 2, 0
-_080D6028: .4byte 0x0000fffe
-_080D602C: .4byte gSprites
-_080D6030:
-	movs r1, 0
-	strh r1, [r2, 0xE]
-	movs r3, 0x22
-	ldrsh r0, [r2, r3]
-	cmp r1, r0
-	bge _080D606E
-	ldr r6, _080D607C @ =gSprites
-	adds r3, r2, 0
-	adds r3, 0x8
-	movs r5, 0
-_080D6044:
-	movs r7, 0xE
-	ldrsh r0, [r2, r7]
-	adds r0, 0xE
-	lsls r0, 1
-	adds r0, r3, r0
-	movs r7, 0
-	ldrsh r1, [r0, r7]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	strh r5, [r0, 0x24]
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r7, 0x22
-	ldrsh r1, [r2, r7]
-	cmp r0, r1
-	blt _080D6044
-_080D606E:
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-_080D6074:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D607C: .4byte gSprites
-	thumb_func_end sub_80D5E4C
-
-	thumb_func_start sub_80D6080
-sub_80D6080: @ 80D6080
-	push {r4,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, sp
-	bl sub_8078914
-	mov r0, sp
-	ldrb r0, [r0, 0x8]
-	lsls r0, 4
-	ldr r1, _080D60B0 @ =gBattleAnimArgs
-	ldrb r2, [r1]
-	ldrh r3, [r1, 0x2]
-	movs r1, 0x10
-	bl BlendPalette
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-	add sp, 0xC
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D60B0: .4byte gBattleAnimArgs
-	thumb_func_end sub_80D6080
-
-	thumb_func_start sub_80D60B4
-sub_80D60B4: @ 80D60B4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r1, _080D610C @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r3, 0x8
-	ldrsh r0, [r2, r3]
-	mov r9, r1
-	ldr r4, _080D6110 @ =gBattleAnimArgs
-	mov r8, r4
-	cmp r0, 0
-	bne _080D60EA
-	ldrh r0, [r4]
-	strh r0, [r2, 0xA]
-	ldrh r0, [r4, 0x2]
-	strh r0, [r2, 0xC]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r2, 0xE]
-	ldrh r0, [r4, 0x6]
-	strh r0, [r2, 0x10]
-_080D60EA:
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	ldr r1, _080D6114 @ =gObjectBankIDs
-	ldr r0, _080D6118 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r6, [r0]
-	movs r5, 0x10
-	ldrsh r0, [r2, r5]
-	cmp r0, 0
-	bne _080D6120
-	ldr r4, _080D611C @ =gUnknown_083D9794
-	movs r1, 0x8
-	ldrsh r0, [r2, r1]
-	b _080D6126
-	.align 2, 0
-_080D610C: .4byte gTasks
-_080D6110: .4byte gBattleAnimArgs
-_080D6114: .4byte gObjectBankIDs
-_080D6118: .4byte gAnimBankTarget
-_080D611C: .4byte gUnknown_083D9794
-_080D6120:
-	ldr r4, _080D616C @ =gUnknown_083D97A4
-	movs r3, 0x8
-	ldrsh r0, [r2, r3]
-_080D6126:
-	movs r1, 0xA
-	bl __modsi3
-	lsls r0, 16
-	asrs r0, 16
-	adds r0, r4
-	ldrb r5, [r0]
-	lsls r0, r7, 2
-	adds r1, r0, r7
-	lsls r1, 3
-	add r1, r9
-	movs r4, 0xE
-	ldrsh r1, [r1, r4]
-	mov r12, r0
-	cmp r1, 0x1
-	bne _080D6174
-	ldr r2, _080D6170 @ =gSprites
-	lsls r3, r6, 4
-	adds r0, r3, r6
-	lsls r0, 2
-	adds r0, r2
-	mov r10, r0
-	mov r0, r8
-	movs r4, 0x2
-	ldrsh r1, [r0, r4]
-	lsls r0, r5, 24
-	asrs r0, 24
-	muls r0, r1
-	cmp r0, 0
-	bge _080D6164
-	negs r0, r0
-_080D6164:
-	mov r5, r10
-	strh r0, [r5, 0x26]
-	b _080D618E
-	.align 2, 0
-_080D616C: .4byte gUnknown_083D97A4
-_080D6170: .4byte gSprites
-_080D6174:
-	ldr r3, _080D61C4 @ =gSprites
-	lsls r4, r6, 4
-	adds r2, r4, r6
-	lsls r2, 2
-	adds r2, r3
-	lsls r0, r5, 24
-	asrs r0, 24
-	mov r5, r8
-	ldrh r1, [r5, 0x2]
-	muls r0, r1
-	strh r0, [r2, 0x24]
-	adds r2, r3, 0
-	adds r3, r4, 0
-_080D618E:
-	mov r1, r12
-	adds r0, r1, r7
-	lsls r0, 3
-	add r0, r9
-	movs r4, 0x8
-	ldrsh r1, [r0, r4]
-	movs r5, 0xA
-	ldrsh r0, [r0, r5]
-	cmp r1, r0
-	bne _080D61B4
-	adds r0, r3, r6
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0
-	strh r1, [r0, 0x24]
-	strh r1, [r0, 0x26]
-	adds r0, r7, 0
-	bl DestroyAnimVisualTask
-_080D61B4:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D61C4: .4byte gSprites
-	thumb_func_end sub_80D60B4
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 11a430764..c8ede2726 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -282,17 +282,17 @@ SECTIONS {
         src/battle/anim/fire_2.o(.text);
         src/battle/anim/heated_rock.o(.text);
         src/battle/anim/wisp_orb.o(.text);
-        asm/wisp_fire.o(.text);
+        src/battle/anim/wisp_fire.o(.text);
         src/battle/anim/thunder.o(.text);
         src/battle/anim/beta_beat_up.o(.text);
         src/battle/anim/shock.o(.text);
         asm/current.o(.text);
         asm/ice.o(.text);
         asm/fight.o(.text);
-        asm/poison.o(.text);
+        src/battle/anim/poison.o(.text);
         asm/flying.o(.text);
         asm/psychic.o(.text);
-        asm/bug.o(.text);
+        src/battle/anim/bug.o(.text);
         asm/rock.o(.text);
         asm/ghost.o(.text);
         asm/dragon.o(.text);
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
new file mode 100644
index 000000000..501d544b1
--- /dev/null
+++ b/src/battle/anim/bug.c
@@ -0,0 +1,417 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "contest.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+// #include "util.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
+
+static void sub_80DCA38(struct Sprite *sprite);
+static void sub_80DCAEC(struct Sprite *sprite);
+static void sub_80DCB5C(struct Sprite *sprite);
+static void sub_80DCBB4(struct Sprite *sprite);
+void sub_80DCD78(struct Sprite *sprite);
+
+// used in Move_MEGAHORN
+void sub_80DC824(struct Sprite *sprite)
+{
+    if (IsContest())
+    {
+        StartSpriteAffineAnim(sprite, 2);
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+    }
+    else if (!GetBankSide(gAnimBankTarget))
+    {
+        StartSpriteAffineAnim(sprite, 1);
+        gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+        gBattleAnimArgs[3] = -gBattleAnimArgs[3];
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+    }
+
+    sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->data[0] = gBattleAnimArgs[4];
+
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+}
+
+// used in Move_LEECH_LIFE
+void sub_80DC8F4(struct Sprite *sprite)
+{
+    if (IsContest())
+    {
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+        StartSpriteAffineAnim(sprite, 2);
+    }
+    else if (!GetBankSide(gAnimBankTarget))
+    {
+        gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+    }
+
+    sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->data[0] = gBattleAnimArgs[2];
+
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+}
+
+// used in 2 moves:
+//         Move_STRING_SHOT, Move_SPIDER_WEB
+void sub_80DC9A0(struct Sprite *sprite)
+{
+    if (IsContest())
+        gBattleAnimArgs[2] /= 2;
+
+    sub_80787B0(sprite, 1);
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[3] = sprite->pos1.y;
+
+    if (!gBattleAnimArgs[4])
+    {
+        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    }
+    else
+    {
+        sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+    }
+
+    sub_8078BD4(sprite);
+    sprite->data[5] = gBattleAnimArgs[3];
+    sprite->callback = sub_80DCA38;
+}
+
+static void sub_80DCA38(struct Sprite *sprite)
+{
+    if (sub_8078B5C(sprite))
+    {
+        DestroyAnimSprite(sprite);
+        return;
+    }
+
+    sprite->pos2.x += Sin(sprite->data[6], sprite->data[5]);
+    sprite->data[6] = (sprite->data[6] + 13) & 0xFF;
+}
+
+// used in Move_STRING_SHOT
+void sub_80DCA70(struct Sprite *sprite)
+{
+    sub_807A3FC(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+    if (GetBankSide(gAnimBankAttacker))
+        sprite->pos1.x -= gBattleAnimArgs[0];
+    else
+        sprite->pos1.x += gBattleAnimArgs[0];
+
+    sprite->pos1.y += gBattleAnimArgs[1];
+    if (!GetBankSide(gAnimBankTarget))
+        sprite->pos1.y += 8;
+
+    sprite->callback = sub_80DCAEC;
+}
+
+static void sub_80DCAEC(struct Sprite *sprite)
+{
+    if (++sprite->data[0] == 3)
+    {
+        sprite->data[0] = 0;
+        sprite->invisible ^= 1;
+    }
+
+    if (++sprite->data[1] == 51)
+    {
+        DestroyAnimSprite(sprite);
+    }
+}
+
+// used in Move_SPIDER_WEB
+void sub_80DCB38(struct Sprite *sprite)
+{
+    REG_BLDCNT = 0x3F40;
+    REG_BLDALPHA = 16;
+
+    sprite->data[0] = 16;
+    sprite->callback = sub_80DCB5C;
+}
+
+static void sub_80DCB5C(struct Sprite *sprite)
+{
+    if (sprite->data[2] < 20)
+    {
+        sprite->data[2]++;
+    }
+    else if (sprite->data[1]++ & 1)
+    {
+        sprite->data[0]--;
+        REG_BLDALPHA = sprite->data[0] | ((16 - sprite->data[0]) << 8);
+
+        if (sprite->data[0] == 0)
+        {
+            sprite->invisible = TRUE;
+            sprite->callback = sub_80DCBB4;
+        }
+    }
+}
+
+static void sub_80DCBB4(struct Sprite *sprite)
+{
+    REG_BLDCNT = 0;
+    REG_BLDALPHA = 0;
+    DestroyAnimSprite(sprite);
+}
+
+// used in 3 moves:
+//         Move_POISON_STING, Move_TWINEEDLE, Move_SPIKE_CANNON
+void sub_80DCBCC(struct Sprite *sprite)
+{
+    s16 lVarX, lVarY;
+    u16 rot;
+
+    if (IsContest())
+    {
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+    }
+    else
+    {
+        if (GetBankSide(gAnimBankAttacker))
+        {
+            gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+            gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+            gBattleAnimArgs[3] = -gBattleAnimArgs[3];
+        }
+    }
+
+    if (!IsContest())
+    {
+        if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+        {
+            if (GetBankIdentity(gAnimBankTarget) == 0 || GetBankIdentity(gAnimBankTarget) == 1)
+            {
+                s16 temp1, temp2;
+
+                temp1 = gBattleAnimArgs[2];
+                gBattleAnimArgs[2] = -temp1;
+
+                temp2 = gBattleAnimArgs[0];
+                gBattleAnimArgs[0] = -temp2;
+            }
+        }
+    }
+
+    sub_80787B0(sprite, 1);
+
+    lVarX = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    lVarY = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    rot = sub_80790F0(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y);
+    rot += 0xC000;
+    sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot);
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = lVarX;
+    sprite->data[4] = lVarY;
+
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+}
+
+// used in 2 moves:
+//         Move_PIN_MISSILE, Move_ICICLE_SPEAR
+void sub_80DCCFC(struct Sprite *sprite)
+{
+    sub_80787B0(sprite, 1);
+
+    if (GetBankSide(gAnimBankAttacker))
+        gBattleAnimArgs[2] = -gBattleAnimArgs[2];
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[5] = gBattleAnimArgs[5];
+    sub_80786EC(sprite);
+
+    sprite->callback = sub_80DCD78;
+    sprite->invisible = TRUE;
+}
+
+#ifdef NONMATCHING
+void sub_80DCD78(struct Sprite *sprite)
+{
+    int i;
+    s16 x1, x2, y1, y2;
+    // s16 scale;
+    // u16 *data;
+    u16 tempData[8];
+    s16 rot;
+
+    sprite->invisible = FALSE;
+
+    if (sub_8078718(sprite))
+    {
+        DestroyAnimSprite(sprite);
+        return;
+    }
+
+    // data = &sprite->data[7];
+    x1 = sprite->pos1.x;
+    x2 = sprite->pos2.x;
+    y1 = sprite->pos1.y;
+    y2 = sprite->pos2.y;
+    for (i = 0; i < 8; i++)
+    {
+        tempData[i] = sprite->data[i];
+    }
+    x2 += x1;
+    y2 += y1;
+
+    if (!sub_8078718(sprite))
+    {
+        rot = sub_80790F0(sprite->pos1.x + sprite->pos2.x - x2,
+                        sprite->pos1.y + sprite->pos2.y - y2);
+        rot += 0xC000;
+        // scale = 0x100
+        sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot);
+
+        for (i = 0; i < 8; i++)
+        {
+            sprite->data[i] = tempData[i];
+        }
+    }
+}
+#else
+__attribute__((naked))
+void sub_80DCD78(struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    sub sp, 0x14\n\
+    adds r4, r0, 0\n\
+    adds r2, r4, 0\n\
+    adds r2, 0x3E\n\
+    ldrb r0, [r2]\n\
+    movs r1, 0x5\n\
+    negs r1, r1\n\
+    ands r1, r0\n\
+    strb r1, [r2]\n\
+    adds r0, r4, 0\n\
+    bl sub_8078718\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080DCDA4\n\
+    adds r0, r4, 0\n\
+    bl DestroyAnimSprite\n\
+    b _080DCE34\n\
+_080DCDA4:\n\
+    movs r0, 0x2E\n\
+    adds r0, r4\n\
+    mov r8, r0\n\
+    ldrh r7, [r4, 0x20]\n\
+    ldrh r5, [r4, 0x24]\n\
+    ldrh r1, [r4, 0x22]\n\
+    mov r12, r1\n\
+    ldrh r6, [r4, 0x26]\n\
+    mov r2, r8\n\
+    add r1, sp, 0x4\n\
+    movs r3, 0x7\n\
+_080DCDBA:\n\
+    ldrh r0, [r2]\n\
+    strh r0, [r1]\n\
+    adds r2, 0x2\n\
+    adds r1, 0x2\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _080DCDBA\n\
+    adds r0, r7, r5\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    mov r2, r12\n\
+    adds r0, r2, r6\n\
+    lsls r0, 16\n\
+    lsrs r6, r0, 16\n\
+    adds r0, r4, 0\n\
+    bl sub_8078718\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080DCE34\n\
+    ldrh r0, [r4, 0x24]\n\
+    ldrh r1, [r4, 0x20]\n\
+    adds r0, r1\n\
+    lsls r1, r5, 16\n\
+    asrs r1, 16\n\
+    subs r0, r1\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    ldrh r1, [r4, 0x26]\n\
+    ldrh r2, [r4, 0x22]\n\
+    adds r1, r2\n\
+    lsls r2, r6, 16\n\
+    asrs r2, 16\n\
+    subs r1, r2\n\
+    lsls r1, 16\n\
+    asrs r1, 16\n\
+    bl sub_80790F0\n\
+    lsls r0, 16\n\
+    movs r1, 0xC0\n\
+    lsls r1, 24\n\
+    adds r0, r1\n\
+    lsrs r0, 16\n\
+    movs r3, 0x80\n\
+    lsls r3, 1\n\
+    str r0, [sp]\n\
+    adds r0, r4, 0\n\
+    movs r1, 0\n\
+    adds r2, r3, 0\n\
+    bl sub_8078FDC\n\
+    add r2, sp, 0x4\n\
+    mov r1, r8\n\
+    movs r3, 0x7\n\
+_080DCE26:\n\
+    ldrh r0, [r2]\n\
+    strh r0, [r1]\n\
+    adds r2, 0x2\n\
+    adds r1, 0x2\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _080DCE26\n\
+_080DCE34:\n\
+    add sp, 0x14\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+void sub_80DCE40(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[0] == 0)
+    {
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 18;
+    }
+    else
+    {
+        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
+        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 18;
+    }
+
+    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    sprite->callback = sub_80785E4;
+}
diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
new file mode 100644
index 000000000..f31c441fb
--- /dev/null
+++ b/src/battle/anim/poison.c
@@ -0,0 +1,140 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
+
+void sub_80D9DD4(struct Sprite *sprite);
+void sub_80D9E78(struct Sprite *sprite);
+void sub_80D9EE8(struct Sprite *sprite);
+void sub_80D9FF0(struct Sprite *sprite);
+
+void sub_80D9D70(struct Sprite *sprite)
+{
+    if (!gBattleAnimArgs[3])
+        StartSpriteAnim(sprite, 2);
+
+    sub_80787B0(sprite, 1);
+
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[5] = -30;
+
+    sub_80786EC(sprite);
+
+    sprite->callback = sub_80D9DD4;
+}
+
+void sub_80D9DD4(struct Sprite *sprite) // same as sub_80D9E78
+{
+    if (sub_8078718(sprite))
+        DestroyAnimSprite(sprite);
+}
+
+void sub_80D9DF0(struct Sprite *sprite)
+{
+    s16 l1, l2;
+    if (!gBattleAnimArgs[3])
+        StartSpriteAnim(sprite, 2);
+
+    sub_80787B0(sprite, 1);
+    sub_807A3FC(gAnimBankTarget, 1, &l1, &l2);
+
+    if (GetBankSide(gAnimBankAttacker))
+        gBattleAnimArgs[4] = -gBattleAnimArgs[4];
+
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[2] = l1 + gBattleAnimArgs[4];
+    sprite->data[4] = l2 + gBattleAnimArgs[5];
+    sprite->data[5] = -30;
+
+    sub_80786EC(sprite);
+
+    sprite->callback = sub_80D9E78;
+}
+
+void sub_80D9E78(struct Sprite *sprite) // same as sub_80D9DD4
+{
+    if (sub_8078718(sprite))
+        DestroyAnimSprite(sprite);
+}
+
+void sub_80D9E94(struct Sprite *sprite)
+{
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0];
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1];
+
+    sub_8078A5C(sprite);
+
+    sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2];
+    sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2];
+
+    sprite->callback = sub_80D9EE8;
+}
+
+void sub_80D9EE8(struct Sprite *sprite)
+{
+    sub_8078394(sprite);
+
+    sprite->data[1] -= sprite->data[5];
+    sprite->data[2] -= sprite->data[6];
+
+    if (!sprite->data[0])
+        DestroyAnimSprite(sprite);
+}
+
+void sub_80D9F14(struct Sprite *sprite)
+{
+    sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+
+    if (GetBankSide(gAnimBankAttacker))
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+
+    sprite->pos1.x += gBattleAnimArgs[0];
+    sprite->pos1.y += gBattleAnimArgs[1];
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
+    sprite->data[4] = sprite->pos1.y + sprite->data[0];
+
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+}
+
+void sub_80D9F88(struct Sprite *sprite)
+{
+    if (!gBattleAnimArgs[2])
+    {
+        sub_8078764(sprite, TRUE);
+    }
+    else
+    {
+        sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+
+        if (GetBankSide(gAnimBankAttacker))
+            gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+    }
+
+    sprite->callback = sub_80D9FF0;
+}
+
+void sub_80D9FF0(struct Sprite *sprite)
+{
+    sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF;
+    sprite->pos2.x = Sin(sprite->data[0], 4);
+    sprite->data[1] += 0x30;
+    sprite->pos2.y = -(sprite->data[1] >> 8);
+
+    if (sprite->affineAnimEnded)
+        DestroyAnimSprite(sprite);
+}
\ No newline at end of file
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
new file mode 100644
index 000000000..348ce6426
--- /dev/null
+++ b/src/battle/anim/wisp_fire.c
@@ -0,0 +1,196 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "blend_palette.h"
+#include "main.h"
+#include "rom_8077ABC.h"
+#include "task.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gAnimBankTarget;
+extern u8 gAnimBankAttacker;
+
+extern u8 gObjectBankIDs[];
+extern s8 gUnknown_083D9794[16];
+extern s8 gUnknown_083D97A4[16];
+
+void sub_80D5E4C(u8 taskId);
+
+void sub_80D5CC0(struct Sprite *sprite)
+{
+    if (!sprite->data[0])
+    {
+        sprite->data[1] = gBattleAnimArgs[0];
+        sprite->data[0] += 1;
+    }
+
+    sprite->data[3] += 0xC0 * 2;
+    sprite->data[4] += 0xA0;
+
+    sprite->pos2.x = Sin(sprite->data[1], sprite->data[3] >> 8);
+    sprite->pos2.y = Cos(sprite->data[1], sprite->data[4] >> 8);
+
+    sprite->data[1] = (sprite->data[1] + 7) & 0xFF;
+
+    if (gMain.inBattle)
+    {
+        if (sprite->data[1] < 64 || sprite->data[1] > 195)
+            sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
+        else
+            sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
+    }
+    else
+    {
+        if (sprite->data[1] < 64 || sprite->data[1] > 195)
+            sprite->subpriority = 0x1D;
+        else
+            sprite->subpriority = 0x1F;
+    }
+
+    if (++sprite->data[2] > 0x14)
+        sprite->invisible ^= 1;
+
+    if (sprite->data[2] == 0x1E)
+        DestroyAnimSprite(sprite);
+}
+
+void sub_80D5DDC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[12] = !GetBankSide(gAnimBankAttacker) ? 1 : -1;
+    task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1;
+    task->data[14] = GetAnimBankSpriteId(1);
+    task->data[15] = GetAnimBankSpriteId(3);
+
+    task->func = sub_80D5E4C;
+}
+
+void sub_80D5E4C(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+        case 0:
+            task->data[10] += task->data[12] * 2;
+            if (++task->data[1] >= 2)
+            {
+                task->data[1] = 0;
+                task->data[2]++;
+                if (task->data[2] & 1)
+                    task->data[11] = 2;
+                else
+                    task->data[11] = -2;
+            }
+
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+            }
+
+            if (++task->data[9] == 16)
+            {
+                task->data[9] = 0;
+                task->data[0]++;
+            }
+            break;
+        case 1:
+            if (++task->data[1] >= 5)
+            {
+                task->data[1] = 0;
+                task->data[2]++;
+
+                if (task->data[2] & 1)
+                    task->data[11] = 2;
+                else
+                    task->data[11] = -2;
+            }
+
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+            }
+
+            if (++task->data[9] == 96)
+            {
+                task->data[9] = 0;
+                task->data[0]++;
+            }
+            break;
+        case 2:
+            task->data[10] -= task->data[12] * 2;
+
+            if (++task->data[1] >= 2)
+            {
+                task->data[1] = 0;
+                task->data[2]++;
+
+                if (task->data[2] & 1)
+                    task->data[11] = 2;
+                else
+                    task->data[11] = -2;
+            }
+
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+            }
+
+            if (++task->data[9] == 16)
+            {
+                task->data[0]++;
+            }
+            break;
+        case 3:
+            for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
+            {
+                gSprites[task->data[task->data[3] + 14]].pos2.x = 0;
+            }
+
+            DestroyAnimVisualTask(taskId);
+            break;
+    }
+}
+
+void sub_80D6080(u8 taskId)
+{
+    struct Struct_sub_8078914 unk;
+    sub_8078914(&unk);
+    BlendPalette(unk.field_8 << 4, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor
+    DestroyAnimVisualTask(taskId);
+}
+
+void sub_80D60B4(u8 taskId)
+{
+    s8 unk;
+    u8 spriteId;
+
+    if (gTasks[taskId].data[0] == 0)
+    {
+        gTasks[taskId].data[1] = gBattleAnimArgs[0];
+        gTasks[taskId].data[2] = gBattleAnimArgs[1];
+        gTasks[taskId].data[3] = gBattleAnimArgs[2];
+        gTasks[taskId].data[4] = gBattleAnimArgs[3];
+    }
+    gTasks[taskId].data[0]++;
+
+    spriteId = gObjectBankIDs[gAnimBankTarget];
+
+    if (!gTasks[taskId].data[4])
+        unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10];
+    else
+        unk = gUnknown_083D97A4[gTasks[taskId].data[0] % 10];
+
+    if (gTasks[taskId].data[3] == 1)
+        gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk;
+    else
+        gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * unk;
+
+    if (gTasks[taskId].data[0] == gTasks[taskId].data[1])
+    {
+        gSprites[spriteId].pos2.x = 0;
+        gSprites[spriteId].pos2.y = 0;
+        DestroyAnimVisualTask(taskId);
+    }
+}
\ No newline at end of file
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 2691da859..2b5a3c036 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -786,7 +786,7 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite)
     sprite->pos2.y = 0;
 }
 
-void sub_8078764(struct Sprite *sprite, u8 a2)
+void sub_8078764(struct Sprite *sprite, bool8 a2)
 {
     if (!a2)
     {
@@ -2105,7 +2105,7 @@ int sub_807A100(u8 slot, u8 a2)
     }
 }
 
-void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4)
+void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4)
 {
     u8 v1, v2;
     s16 v3, v4;