Document a bunch of battle anim stuff

6 files changed, 102 insertions, 102 deletions

diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s
index 394bc7104..84f7a7883 100644
--- a/asm/battle_anim_815A0D4.s
+++ b/asm/battle_anim_815A0D4.s
@@ -253,7 +253,7 @@ _0815A2B2:
 	adds r0, r5, 0
 	movs r1, 0
 	adds r2, r3, 0
-	bl sub_80A73E0
+	bl TrySetSpriteRotScale
 	ldr r0, =gBattleAnimArgs
 	ldrh r0, [r0, 0x4]
 	strh r0, [r5, 0x2E]
@@ -879,7 +879,7 @@ _0815A7AC:
 sub_815A7B0: @ 815A7B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
-	bl sub_80A6838
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r5, =gBattleAnimArgs
 	movs r0, 0
 	ldrsh r1, [r5, r0]
@@ -889,7 +889,7 @@ sub_815A7B0: @ 815A7B0
 	ldrh r1, [r4, 0x22]
 	adds r0, r1
 	strh r0, [r4, 0x22]
-	ldr r0, =sub_80A67D8
+	ldr r0, =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, =DestroyAnimSprite
 	adds r0, r4, 0
@@ -909,7 +909,7 @@ sub_815A7EC: @ 815A7EC
 	cmp r0, 0
 	bne _0815A84C
 	adds r0, r4, 0
-	bl sub_80A6838
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r5, =gBattleAnimArgs
 	movs r2, 0
 	ldrsh r1, [r5, r2]
@@ -2050,7 +2050,7 @@ _0815B138:
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE2A0
 	adds r0, r6, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldrh r0, [r6, 0xA]
 	adds r0, 0x1
 	strh r0, [r6, 0xA]
@@ -2059,7 +2059,7 @@ _0815B138:
 	.pool
 _0815B160:
 	adds r0, r6, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -2326,7 +2326,7 @@ _0815B35C:
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE350
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -2334,7 +2334,7 @@ _0815B35C:
 	.pool
 _0815B37C:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815B38E
@@ -2385,7 +2385,7 @@ _0815B3BE:
 	strh r0, [r5, 0x22]
 	adds r0, r6, 0
 	movs r1, 0
-	bl sub_80A7270
+	bl PrepareBattlerSpriteForRotScale
 	movs r0, 0x80
 	lsls r0, 1
 	strh r0, [r5, 0x30]
@@ -2405,7 +2405,7 @@ _0815B3F4:
 	ldrsh r2, [r5, r0]
 	adds r0, r6, 0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r5, 0x34]
 	adds r0, 0x1
 	strh r0, [r5, 0x34]
@@ -2429,7 +2429,7 @@ _0815B424:
 	ldrsh r2, [r5, r0]
 	adds r0, r6, 0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r5, 0x34]
 	adds r0, 0x1
 	strh r0, [r5, 0x34]
@@ -2450,7 +2450,7 @@ _0815B424:
 	orrs r1, r2
 	strb r1, [r0]
 	adds r0, r6, 0
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 _0815B46C:
 	ldrh r0, [r5, 0x2E]
 	adds r0, 0x1
@@ -2734,7 +2734,7 @@ sub_815B65C: @ 815B65C
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE3B8
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -2742,7 +2742,7 @@ sub_815B65C: @ 815B65C
 	.pool
 _0815B69C:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815B6AE
@@ -2776,7 +2776,7 @@ sub_815B6B4: @ 815B6B4
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE3E0
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -2784,7 +2784,7 @@ sub_815B6B4: @ 815B6B4
 	.pool
 _0815B6F4:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815B706
@@ -2874,7 +2874,7 @@ sub_815B778: @ 815B778
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE430
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -2882,7 +2882,7 @@ sub_815B778: @ 815B778
 	.pool
 _0815B7B8:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815B7CA
@@ -4278,7 +4278,7 @@ sub_815C3A8: @ 815C3A8
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE4B0
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -4286,7 +4286,7 @@ sub_815C3A8: @ 815C3A8
 	.pool
 _0815C3E8:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815C3FA
@@ -4452,7 +4452,7 @@ _0815C528:
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
-	bl sub_80A7270
+	bl PrepareBattlerSpriteForRotScale
 	ldr r0, =sub_815C548
 	str r0, [r4]
 _0815C538:
@@ -4513,11 +4513,11 @@ _0815C57C:
 	lsls r2, 1
 	ldrh r3, [r4, 0xC]
 	adds r1, r2, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A73A0
+	bl SetBattlerSpriteYOffsetFromRotation
 	ldrh r0, [r4, 0xA]
 	adds r0, 0x1
 	strh r0, [r4, 0xA]
@@ -4553,11 +4553,11 @@ _0815C5D0:
 	lsls r2, 1
 	ldrh r3, [r4, 0xC]
 	adds r1, r2, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A73A0
+	bl SetBattlerSpriteYOffsetFromRotation
 	ldrh r1, [r4, 0xA]
 	adds r1, 0x1
 	strh r1, [r4, 0xA]
@@ -4596,11 +4596,11 @@ _0815C628:
 	lsls r2, 1
 	ldrh r3, [r4, 0xC]
 	adds r1, r2, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A73A0
+	bl SetBattlerSpriteYOffsetFromRotation
 	ldrh r0, [r4, 0xA]
 	adds r0, 0x1
 	strh r0, [r4, 0xA]
@@ -4630,7 +4630,7 @@ _0815C698:
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 	adds r0, r5, 0
 	bl DestroyAnimVisualTask
 _0815C6A8:
@@ -4763,7 +4763,7 @@ sub_815C770: @ 815C770
 	lsrs r0, 24
 	strh r0, [r4, 0x26]
 	movs r1, 0
-	bl sub_80A7270
+	bl PrepareBattlerSpriteForRotScale
 	ldr r0, =sub_815C7C4
 	str r0, [r4]
 	pop {r4}
@@ -4907,7 +4907,7 @@ _0815C8C8:
 	ldrh r0, [r7, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 	adds r0, r4, 0
 	bl DestroyAnimVisualTask
 	b _0815C950
@@ -4919,11 +4919,11 @@ _0815C8DA:
 	lsls r2, 1
 	ldrh r3, [r7, 0xC]
 	adds r1, r2, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r7, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A73A0
+	bl SetBattlerSpriteYOffsetFromRotation
 	ldr r2, =gSprites
 	movs r0, 0x26
 	ldrsh r1, [r7, r0]
@@ -5121,7 +5121,7 @@ _0815CA5E:
 	strh r5, [r6, 0x1C]
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80A7270
+	bl PrepareBattlerSpriteForRotScale
 	mov r2, r8
 	movs r3, 0x2
 	ldrsh r0, [r2, r3]
@@ -5145,9 +5145,9 @@ _0815CAA8:
 	adds r0, r5, 0
 	movs r1, 0xE0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	adds r0, r5, 0
-	bl sub_80A7E6C
+	bl SetBattlerSpriteYOffsetFromYScale
 	lsls r2, r5, 4
 	b _0815CB08
 _0815CAC0:
@@ -5164,9 +5164,9 @@ _0815CACA:
 _0815CAD2:
 	adds r0, r5, 0
 	movs r1, 0xD0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	adds r0, r5, 0
-	bl sub_80A7E6C
+	bl SetBattlerSpriteYOffsetFromYScale
 	bl IsContest
 	lsls r0, 24
 	cmp r0, 0
@@ -5230,7 +5230,7 @@ _0815CB50:
 	cmp r0, 0xD
 	bne _0815CB78
 	adds r0, r5, 0
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 	ldr r1, =gSprites
 	lsls r0, r5, 4
 	adds r0, r5
@@ -5588,14 +5588,14 @@ sub_815CDFC: @ 815CDFC
 _0815CE36:
 	ldr r0, =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	subs r0, 0x1
 	b _0815CE52
 	.pool
 _0815CE48:
 	ldr r0, =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	adds r0, 0x1
 _0815CE52:
 	adds r1, r4, 0
@@ -6034,7 +6034,7 @@ sub_815D1BC: @ 815D1BC
 	str r4, [sp]
 	adds r0, r6, 0
 	movs r1, 0x1
-	bl sub_80A73E0
+	bl TrySetSpriteRotScale
 	ldrh r0, [r5, 0x20]
 	adds r0, 0x1
 	strh r0, [r5, 0x20]
@@ -6569,7 +6569,7 @@ sub_815D64C: @ 815D64C
 	strh r1, [r4, 0x26]
 	ldr r2, =gUnknown_085CE5F0
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldr r0, =sub_815D694
 	str r0, [r4]
 	pop {r4}
@@ -6638,7 +6638,7 @@ _0815D708:
 	adds r0, r4
 	lsls r0, 3
 	adds r0, r6
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815D720
@@ -6731,7 +6731,7 @@ sub_815D7B4: @ 815D7B4
 	adds r4, r0, 0
 	ldrh r6, [r4, 0x20]
 	ldrh r5, [r4, 0x22]
-	bl sub_80A6838
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r0, =gBattleAnimArgs
 	ldrb r1, [r0]
 	adds r0, r4, 0
@@ -6810,7 +6810,7 @@ sub_815D804: @ 815D804
 	cmp r0, 0x3
 	ble _0815D86A
 	adds r0, r5, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _0815D86A:
 	pop {r4,r5}
 	pop {r0}
@@ -7393,7 +7393,7 @@ _0815DCEA:
 	lsrs r0, 24
 	strh r0, [r5, 0x12]
 	adds r0, r4, 0
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r5, 0x14]
@@ -7406,7 +7406,7 @@ _0815DCEA:
 	strh r1, [r5, 0x26]
 	ldr r2, =gUnknown_085CE74C
 	adds r0, r5, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldr r0, =sub_815DD48
 	str r0, [r5]
 	pop {r4,r5}
@@ -7454,7 +7454,7 @@ _0815DD82:
 	bl sub_815DDE0
 _0815DD92:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0
@@ -7476,7 +7476,7 @@ _0815DDB4:
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE74C
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	b _0815DDDA
 	.pool
 _0815DDCC:
@@ -8395,7 +8395,7 @@ _0815E4EE:
 	ldrsh r6, [r7, r1]
 	mov r1, r8
 	ldrb r0, [r1]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	adds r3, r0, 0
 	subs r3, 0x5
 	lsls r3, 24
@@ -8834,7 +8834,7 @@ _0815E85C:
 	strh r1, [r4, 0x26]
 	ldr r2, =gUnknown_085CE87C
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldr r0, =sub_815E898
 	str r0, [r4]
 _0815E884:
@@ -8891,7 +8891,7 @@ _0815E8F0:
 	strh r1, [r0, 0x24]
 _0815E8F2:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0
@@ -8919,7 +8919,7 @@ _0815E8F2:
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r2, =gUnknown_085CE87C
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	strh r5, [r4, 0xA]
 	strh r5, [r4, 0xC]
 	b _0815E94E
@@ -10075,7 +10075,7 @@ AnimTask_MonToSubstitute: @ 815F20C
 	bne _0815F254
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80A7270
+	bl PrepareBattlerSpriteForRotScale
 	movs r0, 0x80
 	lsls r0, 1
 	strh r0, [r4, 0xA]
@@ -10097,7 +10097,7 @@ _0815F254:
 	ldrsh r2, [r4, r0]
 	adds r0, r5, 0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r4, 0xE]
 	adds r0, 0x1
 	strh r0, [r4, 0xE]
@@ -10108,7 +10108,7 @@ _0815F254:
 	movs r0, 0
 	strh r0, [r4, 0xE]
 	adds r0, r5, 0
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 	ldr r1, =gSprites
 	lsls r0, r5, 4
 	adds r0, r5
@@ -10367,7 +10367,7 @@ sub_815F48C: @ 815F48C
 	cmp r0, 0
 	bne _0815F4B8
 	ldrb r0, [r4]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	subs r0, 0x2
 	adds r1, r5, 0
 	adds r1, 0x43
@@ -10377,7 +10377,7 @@ sub_815F48C: @ 815F48C
 	.pool
 _0815F4B8:
 	ldrb r0, [r4]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	adds r0, 0x2
 	adds r1, r5, 0
 	adds r1, 0x43
@@ -10566,7 +10566,7 @@ sub_815F620: @ 815F620
 	cmp r7, 0
 	bne _0815F66E
 	movs r0, 0x1
-	bl duplicate_obj_of_side_rel2move_in_transparent_mode
+	bl CloneBattlerSpriteWithBlend
 	lsls r0, 16
 	lsrs r1, r0, 16
 	mov r10, r1
@@ -10574,7 +10574,7 @@ sub_815F620: @ 815F620
 	cmp r6, 0
 	blt _0815F66E
 	movs r0, 0x1
-	bl duplicate_obj_of_side_rel2move_in_transparent_mode
+	bl CloneBattlerSpriteWithBlend
 	lsls r0, 16
 	lsrs r1, r0, 16
 	mov r9, r1
@@ -11038,7 +11038,7 @@ _0815F9F4:
 	ldrh r6, [r0]
 	ldr r0, =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r7, 0
@@ -12329,7 +12329,7 @@ _081604DA:
 	b _081604E8
 _081604E2:
 	adds r0, r4, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _081604E8:
 	pop {r4}
 	pop {r0}
@@ -12403,7 +12403,7 @@ sub_8160544: @ 8160544
 	strh r1, [r4, 0x26]
 	ldr r2, =gUnknown_085CE9C8
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldr r0, =sub_816058C
 	str r0, [r4]
 	pop {r4}
@@ -12472,7 +12472,7 @@ _08160600:
 	adds r0, r4
 	lsls r0, 3
 	adds r0, r6
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _08160618
diff --git a/asm/dark.s b/asm/dark.s
index e4373723d..d3f44db0b 100644
--- a/asm/dark.s
+++ b/asm/dark.s
@@ -447,7 +447,7 @@ sub_8113A58: @ 8113A58
 	cmp r0, 0
 	bne _08113A8A
 	adds r0, r3, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _08113A8A:
 	pop {r0}
 	bx r0
@@ -581,7 +581,7 @@ sub_8113B90: @ 8113B90
 	cmp r0, 0
 	beq _08113BA4
 	adds r0, r4, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _08113BA4:
 	pop {r4}
 	pop {r0}
@@ -1684,7 +1684,7 @@ sub_81144BC: @ 81144BC
 	ldrb r1, [r1, 0x4]
 	adds r0, r4, 0
 	bl StartSpriteAnim
-	ldr r0, =sub_80A67D8
+	ldr r0, =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, =DestroyAnimSprite
 	adds r0, r4, 0
@@ -1895,7 +1895,7 @@ _0811465C:
 	bne _08114708
 	adds r0, r1, 0
 	movs r1, 0
-	bl sub_80A750C
+	bl SetGreyscaleOrOriginalPalette
 	b _08114714
 	.pool
 _08114708:
@@ -1984,7 +1984,7 @@ _08114776:
 	bne _081147B8
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_80A750C
+	bl SetGreyscaleOrOriginalPalette
 _081147B8:
 	movs r0, 0x8
 	ldrsh r1, [r4, r0]
@@ -2159,7 +2159,7 @@ _0811492E:
 	adds r0, 0x10
 	ldr r1, =gBattleAnimArgs
 	ldrb r1, [r1, 0x2]
-	bl sub_80A750C
+	bl SetGreyscaleOrOriginalPalette
 _0811494A:
 	adds r0, r5, 0
 	bl DestroyAnimVisualTask
diff --git a/asm/flying.s b/asm/flying.s
index b981b4306..dd6ca32ae 100644
--- a/asm/flying.s
+++ b/asm/flying.s
@@ -201,7 +201,7 @@ _0810DFC8:
 	strh r0, [r6, 0x36]
 	adds r0, r6, 0
 	bl InitAnimLinearTranslation
-	ldr r0, =sub_80A67BC
+	ldr r0, =RunStoredCallbackWhenAffineAnimEnds
 	str r0, [r6, 0x1C]
 	ldr r1, =sub_810E028
 	adds r0, r6, 0
@@ -2056,7 +2056,7 @@ _0810EE42:
 	str r0, [sp]
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80A73E0
+	bl TrySetSpriteRotScale
 	ldrh r0, [r5, 0x2E]
 	adds r0, 0x1
 	strh r0, [r5, 0x2E]
@@ -2085,7 +2085,7 @@ _0810EE92:
 	ldrsh r3, [r5, r0]
 	str r1, [sp]
 	adds r0, r5, 0
-	bl sub_80A73E0
+	bl TrySetSpriteRotScale
 	ldrb r1, [r5, 0x3]
 	lsls r1, 26
 	lsrs r1, 27
@@ -2409,7 +2409,7 @@ sub_810F084: @ 810F084
 	mov r0, r8
 	movs r1, 0x1
 	adds r2, r3, 0
-	bl sub_80A73E0
+	bl TrySetSpriteRotScale
 	ldr r0, =sub_810F140
 	mov r2, r8
 	str r0, [r2, 0x1C]
@@ -2456,7 +2456,7 @@ sub_810F140: @ 810F140
 	bge _0810F180
 _0810F17A:
 	adds r0, r2, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _0810F180:
 	pop {r0}
 	bx r0
diff --git a/asm/ice.s b/asm/ice.s
index 3202213b4..3187d3110 100644
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -355,7 +355,7 @@ sub_810B8AC: @ 810B8AC
 	ldr r1, =DestroyAnimSprite
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r1, =sub_80A634C
+	ldr r1, =TranslateSpriteInGrowingCircleOverDuration
 	str r1, [r4, 0x1C]
 	adds r0, r4, 0
 	bl _call_via_r1
@@ -466,7 +466,7 @@ _0810B9C6:
 	ldr r1, =sub_810B9E8
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, =sub_80A67BC
+	ldr r0, =RunStoredCallbackWhenAffineAnimEnds
 	str r0, [r4, 0x1C]
 	pop {r4,r5}
 	pop {r0}
@@ -501,7 +501,7 @@ sub_810B9E8: @ 810B9E8
 	cmp r0, 0x14
 	bne _0810BA1E
 	adds r0, r3, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _0810BA1E:
 	pop {r0}
 	bx r0
@@ -2816,7 +2816,7 @@ sub_810CD1C: @ 810CD1C
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl StartSpriteAnim
-	ldr r0, =sub_80A67D8
+	ldr r0, =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, =DestroyAnimSprite
 	adds r0, r4, 0
diff --git a/asm/psychic.s b/asm/psychic.s
index ef1915241..0a39ea856 100644
--- a/asm/psychic.s
+++ b/asm/psychic.s
@@ -535,7 +535,7 @@ _0810F618:
 	cmp r0, 0
 	beq _0810F62C
 	adds r0, r4, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _0810F62C:
 	pop {r4-r6}
 	pop {r0}
@@ -589,7 +589,7 @@ _0810F692:
 	ldr r1, =DestroyAnimSprite
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, =sub_80A67D8
+	ldr r0, =RunStoredCallbackWhenAnimEnds
 	str r0, [r5, 0x1C]
 	pop {r4,r5}
 	pop {r0}
@@ -656,7 +656,7 @@ _0810F722:
 	ldr r1, =sub_810F740
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, =sub_80A67D8
+	ldr r0, =RunStoredCallbackWhenAnimEnds
 	str r0, [r5, 0x1C]
 	pop {r4-r7}
 	pop {r0}
@@ -760,7 +760,7 @@ sub_810F7D4: @ 810F7D4
 	strh r1, [r4, 0x8]
 	ldr r2, =gUnknown_0859675C
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldr r0, =sub_810F810
 	str r0, [r4]
 	pop {r4}
@@ -779,7 +779,7 @@ sub_810F810: @ 810F810
 	lsls r0, 3
 	ldr r1, =gTasks
 	adds r0, r1
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _0810F830
@@ -823,7 +823,7 @@ _0810F870:
 	ldrb r1, [r4, 0x8]
 	ldr r2, =gUnknown_0859677C
 	adds r0, r4, 0
-	bl sub_80A7CFC
+	bl PrepareAffineAnimInTaskData
 	ldr r0, =sub_810F898
 	str r0, [r4]
 	pop {r4}
@@ -852,7 +852,7 @@ sub_810F898: @ 810F898
 	.pool
 _0810F8BC:
 	adds r0, r4, 0
-	bl sub_80A7D34
+	bl RunAffineAnimFromTaskData
 	ldrh r0, [r4, 0xC]
 	adds r0, 0x1
 	strh r0, [r4, 0xC]
@@ -907,7 +907,7 @@ _0810F900:
 	lsls r1, 1
 	strh r1, [r0, 0x20]
 	ldrb r0, [r4, 0x8]
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 	adds r0, r5, 0
 	bl DestroyAnimVisualTask
 _0810F936:
@@ -1805,7 +1805,7 @@ sub_8110034: @ 8110034
 _0811006C:
 	ldr r1, =gBattleAnimArgs
 	ldrb r0, [r1]
-	bl duplicate_obj_of_side_rel2move_in_transparent_mode
+	bl CloneBattlerSpriteWithBlend
 	lsls r0, 16
 	lsrs r1, r0, 16
 	mov r9, r1
@@ -1860,7 +1860,7 @@ _08110094:
 	lsls r2, 1
 	adds r1, r2, 0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrb r3, [r4, 0x1]
 	lsrs r1, r3, 6
 	ldrb r2, [r4, 0x3]
@@ -1942,14 +1942,14 @@ _08110166:
 	ldrsh r2, [r4, r1]
 	adds r1, r2, 0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
 	ldrh r1, [r4, 0x22]
 	lsls r1, 24
 	lsrs r1, 24
-	bl sub_80A7EC0
+	bl SetBattlerSpriteYOffsetFromOtherYScale
 	movs r2, 0xA
 	ldrsh r0, [r4, r2]
 	cmp r0, 0x30
@@ -1980,14 +1980,14 @@ _081101B8:
 	ldrsh r2, [r4, r1]
 	adds r1, r2, 0
 	movs r3, 0
-	bl obj_id_set_rotscale
+	bl SetSpriteRotScale
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
 	ldrh r1, [r4, 0x22]
 	lsls r1, 24
 	lsrs r1, 24
-	bl sub_80A7EC0
+	bl SetBattlerSpriteYOffsetFromOtherYScale
 	movs r2, 0xA
 	ldrsh r0, [r4, r2]
 	cmp r0, 0
diff --git a/asm/water.s b/asm/water.s
index ece2359cb..693aceddd 100644
--- a/asm/water.s
+++ b/asm/water.s
@@ -315,7 +315,7 @@ sub_8107408: @ 8107408
 	negs r1, r1
 	ands r1, r2
 	strb r1, [r3]
-	ldr r1, =sub_80A67D8
+	ldr r1, =RunStoredCallbackWhenAnimEnds
 	str r1, [r0, 0x1C]
 	ldr r1, =sub_8107430
 	bl StoreSpriteCallbackInData6
@@ -331,7 +331,7 @@ sub_8107430: @ 8107430
 	strh r1, [r0, 0x2E]
 	ldr r1, =WaitAnimForDuration
 	str r1, [r0, 0x1C]
-	ldr r1, =move_anim_8074EE0
+	ldr r1, =DestroySpriteAndMatrix
 	bl StoreSpriteCallbackInData6
 	pop {r0}
 	bx r0
@@ -711,7 +711,7 @@ sub_8107730: @ 8107730
 	ldr r6, =0x0000fff6
 	strh r6, [r4, 0x26]
 	ldrb r0, [r7]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	lsls r0, 24
 	lsrs r5, r0, 24
 	bl IsContest
@@ -1906,7 +1906,7 @@ sub_81080E4: @ 81080E4
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
-	bl sub_80A7270
+	bl PrepareBattlerSpriteForRotScale
 	ldr r0, =sub_8108140
 	str r0, [r4]
 	pop {r4}
@@ -2026,7 +2026,7 @@ _08108222:
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A7E6C
+	bl SetBattlerSpriteYOffsetFromYScale
 	ldr r2, =gSprites
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
@@ -2166,7 +2166,7 @@ _08108320:
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80A7344
+	bl ResetSpriteRotScale
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
 	lsls r0, r1, 4
@@ -2286,7 +2286,7 @@ sub_8108408: @ 8108408
 	lsrs r6, r0, 24
 	movs r5, 0xAC
 	ldrb r0, [r4]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	subs r0, 0x1
 	lsls r0, 24
 	lsrs r0, 24
@@ -3517,7 +3517,7 @@ _08108DE2:
 	strh r0, [r4, 0x30]
 	ldr r0, =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	subs r0, 0x1
 	adds r1, r4, 0
 	adds r1, 0x43
@@ -3572,7 +3572,7 @@ _08108E58:
 	strh r0, [r4, 0x30]
 	ldr r0, =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl GetBattlerSubpriority
+	bl GetBattlerSpriteSubpriority
 	subs r0, 0x1
 	adds r1, r4, 0
 	adds r1, 0x43