Merge remote-tracking branch 'upstream/master' into battle-anim-labels

3 files changed, 35 insertions, 826 deletions

diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s
deleted file mode 100644
index dc0ebf9e3..000000000
--- a/data/battle_anim_812C144.s
+++ /dev/null
@@ -1,643 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteAnim_8402164:: @ 8402164
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840217C:: @ 840217C
-	.4byte gSpriteAnim_8402164
-
-	.align 2
-gBattleAnimSpriteTemplate_8402180:: @ 8402180
-	spr_template 10137, 10137, gOamData_837E054, gSpriteAnimTable_840217C, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gBattleAnimSpriteTemplate_8402198:: @ 8402198
-	spr_template 10016, 10016, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C144
-
-	.align 2
-gBattleAnimSpriteTemplate_84021B0:: @ 84021B0
-	spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80794A8
-
-	.align 2
-gSpriteAnim_84021C8:: @ 84021C8
-	obj_image_anim_frame 0, 40
-	obj_image_anim_frame 16, 8
-	obj_image_anim_frame 32, 40
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84021D8:: @ 84021D8
-	.4byte gSpriteAnim_84021C8
-
-	.align 2
-gBattleAnimSpriteTemplate_84021DC:: @ 84021DC
-	spr_template 10190, 10190, gOamData_837DF34, gSpriteAnimTable_84021D8, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gBattleAnimSpriteTemplate_84021F4:: @ 84021F4
-	spr_template 10191, 10191, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C220
-
-	.align 2
-gBattleAnimSpriteTemplate_840220C:: @ 840220C
-	spr_template 10189, 10189, gOamData_837DF94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C2BC
-
-	.align 2
-gSpriteAffineAnim_8402224:: @ 8402224
-	obj_rot_scal_anim_frame 0x180, 0x180, 0, 0
-	obj_rot_scal_anim_frame 0xFFE0, 0x18, 0, 5
-	obj_rot_scal_anim_frame 0x18, 0xFFE0, 0, 5
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnim_8402244:: @ 8402244
-	obj_rot_scal_anim_frame 0x30, 0x30, 0, 0
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 6
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_840225C:: @ 840225C
-	.4byte gSpriteAffineAnim_8402224
-	.4byte gSpriteAffineAnim_8402244
-
-	.align 2
-gBattleAnimSpriteTemplate_8402264:: @ 8402264
-	spr_template 10187, 10187, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_840225C, sub_812C358
-
-	.align 2
-gBattleAnimSpriteTemplate_840227C:: @ 840227C
-	spr_template 10152, 10152, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C720
-
-	.align 2
-gSpriteAnim_8402294:: @ 8402294
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84022AC:: @ 84022AC
-	.4byte gSpriteAnim_8402294
-
-	.align 2
-gBattleAnimSpriteTemplate_84022B0:: @ 84022B0
-	spr_template 10027, 10027, gOamData_837DF34, gSpriteAnimTable_84022AC, NULL, gDummySpriteAffineAnimTable, sub_812C80C
-
-	.align 2
-gSpriteAnim_84022C8:: @ 84022C8
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84022D0:: @ 84022D0
-	.4byte gSpriteAnim_84022C8
-
-	.align 2
-gSpriteAffineAnim_84022D4:: @ 84022D4
-	obj_rot_scal_anim_frame 0xFFF9, 0xFFF9, -3, 16
-	obj_rot_scal_anim_frame 0x7, 0x7, 3, 16
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_84022EC:: @ 84022EC
-	.4byte gSpriteAffineAnim_84022D4
-
-	.align 2
-gBattleAnimSpriteTemplate_84022F0:: @ 84022F0
-	spr_template 10228, 10228, gOamData_837DF94, gSpriteAnimTable_84022D0, NULL, gSpriteAffineAnimTable_84022EC, sub_812C848
-
-	.align 2
-gSpriteAnim_8402308:: @ 8402308
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 16, 16
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840231C:: @ 840231C
-	.4byte gSpriteAnim_8402308
-
-	.align 2
-gSpriteAffineAnim_8402320:: @ 8402320
-	obj_rot_scal_anim_frame 0x200, 0x200, 0, 0
-	obj_rot_scal_anim_frame 0xFFE0, 0xFFE0, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8402338:: @ 8402338
-	.4byte gSpriteAffineAnim_8402320
-
-	.align 2
-gBattleAnimSpriteTemplate_840233C:: @ 840233C
-	spr_template 10192, 10192, gOamData_837DFF4, gSpriteAnimTable_840231C, NULL, gSpriteAffineAnimTable_8402338, sub_812C908
-
-	.align 2
-gSpriteAffineAnim_8402354:: @ 8402354
-	obj_rot_scal_anim_frame 0x0, 0x180, 0, 0
-	obj_rot_scal_anim_frame 0x10, 0x0, 0, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_840236C:: @ 840236C
-	obj_rot_scal_anim_frame 0x140, 0x180, 0, 0
-	obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 19
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8402384:: @ 8402384
-	.4byte gSpriteAffineAnim_8402354
-	.4byte gSpriteAffineAnim_840236C
-
-	.align 2
-gBattleAnimSpriteTemplate_840238C:: @ 840238C
-	spr_template 10227, 10227, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402384, sub_812C990
-
-	.align 2
-gBattleAnimSpriteTemplate_84023A4:: @ 84023A4
-	spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812CAFC
-
-	.align 2
-gBattleAnimSpriteTemplate_84023BC:: @ 84023BC
-	spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812CC28
-
-	.align 2
-gSpriteAnim_84023D4:: @ 84023D4
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 8, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_84023E4:: @ 84023E4
-	.4byte gSpriteAnim_84023D4
-
-	.align 2
-gBattleAnimSpriteTemplate_84023E8:: @ 84023E8
-	spr_template 10229, 10229, gOamData_837DF54, gSpriteAnimTable_84023E4, NULL, gDummySpriteAffineAnimTable, sub_812CCE8
-
-	.align 2
-gUnknown_08402400:: @ 8402400
-	obj_rot_scal_anim_frame -12, 8, 0, 4
-	obj_rot_scal_anim_frame 20, -20, 0, 4
-	obj_rot_scal_anim_frame -8, 12, 0, 4
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteAnim_8402420:: @ 8402420
-	obj_image_anim_frame 0, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402428:: @ 8402428
-	.4byte gSpriteAnim_8402420
-
-	.align 2
-gSpriteAffineAnim_840242C:: @ 840242C
-	obj_rot_scal_anim_frame 0x0, 0x0, 5, 40
-	obj_rot_scal_anim_frame 0x0, 0x0, 10, 10
-	obj_rot_scal_anim_frame 0x0, 0x0, 15, 10
-	obj_rot_scal_anim_frame 0x0, 0x0, 20, 40
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_8402454:: @ 8402454
-	.4byte gSpriteAffineAnim_840242C
-
-	.align 2
-gBattleAnimSpriteTemplate_8402458:: @ 8402458
-	spr_template 10230, 10230, gOamData_837DFFC, gSpriteAnimTable_8402428, NULL, gSpriteAffineAnimTable_8402454, sub_812D294
-
-	.align 2
-gSpriteAnim_8402470:: @ 8402470
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402494:: @ 8402494
-	.4byte gSpriteAnim_8402470
-
-	.align 2
-gBattleAnimSpriteTemplate_8402498:: @ 8402498
-	spr_template 10234, 10234, gOamData_837DF34, gSpriteAnimTable_8402494, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gUnknown_084024B0:: @ 84024B0
-	obj_rot_scal_anim_frame -12, 20, 0, 8
-	obj_rot_scal_anim_frame 12, -20, 0, 8
-	obj_rot_scal_anim_loop 2
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gBattleAnimSpriteTemplate_84024D0:: @ 84024D0
-	spr_template 10226, 10226, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D3AC
-
-	.align 2
-gBattleAnimSpriteTemplate_84024E8:: @ 84024E8
-	spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D4B4
-
-	.align 2
-gSpriteTemplate_8402500:: @ 8402500
-	spr_template 10233, 10233, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D588
-
-	.align 2
-gUnknown_08402518:: @ 8402518
-	obj_rot_scal_anim_frame 8, -8, 0, 12
-	obj_rot_scal_anim_frame -16, 16, 0, 12
-	obj_rot_scal_anim_frame 8, -8, 0, 12
-	obj_rot_scal_anim_loop 1
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gUnknown_08402540:: @ 8402540
-	obj_rot_scal_anim_frame 0, 6, 0, 20
-	obj_rot_scal_anim_frame 0, 0, 0, 20
-	obj_rot_scal_anim_frame 0, -18, 0, 6
-	obj_rot_scal_anim_frame -18, -18, 0, 3
-	obj_rot_scal_anim_frame 0, 0, 0, 15
-	obj_rot_scal_anim_frame 4, 4, 0, 13
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gBattleAnimSpriteTemplate_8402578:: @ 8402578
-	spr_template 10236, 10236, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D724
-
-	.align 2
-gUnknown_08402590:: @ 8402590
-	obj_rot_scal_anim_frame 0, 6, 0, 20
-	obj_rot_scal_anim_frame 0, 0, 0, 20
-	obj_rot_scal_anim_frame 7, -30, 0, 6
-	obj_rot_scal_anim_frame 0, 0, 0, 20
-	obj_rot_scal_anim_frame -2, 3, 0, 20
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gUnknown_084025C0:: @ 84025C0
-	.byte 0xE8, 0x18, 0xFC, 0x00 @ last could be align padding
-
-	.align 2
-gSpriteAnim_84025C4:: @ 84025C4
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_84025D0:: @ 84025D0
-	obj_image_anim_frame 8, 6
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_84025D8:: @ 84025D8
-	obj_image_anim_frame 12, 6
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84025E0:: @ 84025E0
-	.4byte gSpriteAnim_84025C4
-	.4byte gSpriteAnim_84025D0
-	.4byte gSpriteAnim_84025D8
-
-	.align 2
-gBattleAnimSpriteTemplate_84025EC:: @ 84025EC
-	spr_template 10241, 10241, gOamData_837DF2C, gSpriteAnimTable_84025E0, NULL, gDummySpriteAffineAnimTable, sub_812DEAC
-
-	.align 2
-gUnknown_08402604:: @ 8402604
-	.byte 0x78, 0x50, 0x28, 0x00 @ last could be align padding
-
-	.align 2
-gUnknown_08402608:: @ 8402608
-	.byte 0, 0, 0, 0, 50
-
-	.align 2
-gUnknown_08402610:: @ 8402610
-	obj_rot_scal_anim_frame 0, -15, 0, 7
-	obj_rot_scal_anim_frame 0, 15, 0, 7
-	obj_rot_scal_anim_loop 2
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gBattleAnimSpriteTemplate_8402630:: @ 8402630
-	spr_template 10087, 10087, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812E4F0
-
-	.align 2
-gSpriteAnim_8402648:: @ 8402648
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_840266C:: @ 840266C
-	obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_8402690:: @ 8402690
-	obj_image_anim_frame 0, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402698:: @ 8402698
-	.4byte gSpriteAnim_8402648
-	.4byte gSpriteAnim_840266C
-	.4byte gSpriteAnim_8402690
-
-	.align 2
-gBattleAnimSpriteTemplate_84026A4:: @ 84026A4
-	spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0
-
-	.align 2
-@ probably unknown palette
-	.incbin "graphics/unknown/unknown_4026BC.gbapal"
-
-	.align 2
-gSpriteAnim_84026DC:: @ 84026DC
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 4, 9
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84026EC:: @ 84026EC
-	.4byte gSpriteAnim_84026DC
-
-	.align 2
-gBattleAnimSpriteTemplate_84026F0:: @ 84026F0
-	spr_template 10239, 10239, gOamData_837DF2C, gSpriteAnimTable_84026EC, NULL, gDummySpriteAffineAnimTable, sub_812EA4C
-
-	.align 2
-gBattleAnimSpriteTemplate_8402708:: @ 8402708
-	spr_template 10240, 10240, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812EC78
-
-	.align 2
-gBattleAnimSpriteTemplate_8402720:: @ 8402720
-	spr_template 10227, 10227, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402384, sub_812ED84
-
-	.align 2
-gBattleAnimSpriteTemplate_8402738:: @ 8402738
-	spr_template 10236, 10236, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812EEA4
-
-	.align 2
-gUnknown_08402750:: @ 8402750
-	obj_rot_scal_anim_frame 16, 0, 0, 4
-	obj_rot_scal_anim_frame 0, -3, 0, 16
-	obj_rot_scal_anim_frame 4, 0, 0, 4
-	obj_rot_scal_anim_frame 0, 0, 0, 24
-	obj_rot_scal_anim_frame -5, 3, 0, 16
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteAffineAnim_8402780:: @ 8402780
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_84027A0:: @ 84027A0
-	obj_rot_scal_anim_frame 0xC0, 0xC0, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_84027C0:: @ 84027C0
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_84027E0:: @ 84027E0
-	.4byte gSpriteAffineAnim_8402780
-	.4byte gSpriteAffineAnim_84027A0
-	.4byte gSpriteAffineAnim_84027C0
-
-	.align 2
-gBattleAnimSpriteTemplate_84027EC:: @ 84027EC
-	spr_template 10242, 10242, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_84027E0, sub_812F88C
-
-	.align 2
-gSpriteAffineAnim_8402804:: @ 8402804
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFA, 0, 16
-	obj_rot_scal_anim_frame 0x4, 0x6, 0, 16
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_8402824:: @ 8402824
-	obj_rot_scal_anim_frame 0xC0, 0xC0, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x6, 0, 16
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFA, 0, 16
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_8402844:: @ 8402844
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x6, 0, 16
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFA, 0, 16
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_8402864:: @ 8402864
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0xA, 0, 30
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF6, 0, 16
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_8402884:: @ 8402884
-	.4byte gSpriteAffineAnim_8402804
-	.4byte gSpriteAffineAnim_8402824
-	.4byte gSpriteAffineAnim_8402844
-	.4byte gSpriteAffineAnim_8402864
-
-	.align 2
-gBattleAnimSpriteTemplate_8402894:: @ 8402894
-	spr_template 10242, 10242, gOamData_837DFF4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402884, sub_812F948
-
-	.align 2
-gUnknown_084028AC:: @ 84028AC
-	obj_rot_scal_anim_frame -16, 16, 0, 6
-	obj_rot_scal_anim_frame 16, -16, 0, 12
-	obj_rot_scal_anim_frame -16, 16, 0, 6
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteTemplate_84028CC:: @ 84028CC
-	spr_template 10243, 10243, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812FF94
-
-	.align 2
-gUnknown_084028E4:: @ 84028E4
-	.incbin "graphics/battle_anims/sprites/effect.gbapal"
-
-	.align 2
-gSpriteAnim_8402914:: @ 8402914
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_8402920:: @ 8402920
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_840292C:: @ 840292C
-	.4byte gSpriteAnim_8402914
-	.4byte gSpriteAnim_8402920
-
-	.align 2
-gBattleAnimSpriteTemplate_8402934:: @ 8402934
-	spr_template 10053, 10053, gOamData_837DF34, gSpriteAnimTable_840292C, NULL, gDummySpriteAffineAnimTable, sub_81300F4
-
-	.align 2
-gSpriteTemplate_840294C:: @ 840294C
-	spr_template 10248, 10248, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81304DC
-
-	.align 2
-gBattleAnimSpriteTemplate_8402964:: @ 8402964
-	spr_template 10252, 10252, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_813051C
-
-	.align 2
-gSpriteAffineAnim_840297C:: @ 840297C
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 24
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_840298C:: @ 840298C
-	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 4, 24
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_84029A4:: @ 84029A4
-	.4byte gSpriteAffineAnim_840297C
-	.4byte gSpriteAffineAnim_840298C
-
-	.align 2
-gSpriteTemplate_84029AC:: @ 84029AC
-	spr_template 10254, 10254, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_84029A4, SpriteCallbackDummy
-
-	.align 2
-gBattleAnimSpriteTemplate_84029C4:: @ 84029C4
-	spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81307B0
-
-	.align 2
-gUnknown_084029DC:: @ 84029DC
-	obj_rot_scal_anim_frame 0, -16, 0, 6
-	obj_rot_scal_anim_frame 0, 16, 0, 6
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gBattleAnimSpriteTemplate_84029F4:: @ 84029F4
-	spr_template 10255, 10255, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130A2C
-
-	.align 2
-gBattleAnimSpriteTemplate_8402A0C:: @ 8402A0C
-	spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130AEC
-
-	.align 2
-gBattleAnimSpriteTemplate_8402A24:: @ 8402A24
-	spr_template 10258, 10258, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130F5C
-
-	.align 2
-gBattleAnimSpriteTemplate_8402A3C:: @ 8402A3C
-	spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131264
-
-	.align 2
-gSpriteTemplate_8402A54:: @ 8402A54
-	spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1FDC
-
-	.align 2
-gBattleAnimSpriteTemplate_8402A6C:: @ 8402A6C
-	spr_template 10250, 10250, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131564
-
-	.align 2
-gSpriteTemplate_8402A84:: @ 8402A84
-	spr_template 10224, 10224, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131EB8
-
-	.align 2
-gSpriteAnim_8402A9C:: @ 8402A9C
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402AA8:: @ 8402AA8
-	.4byte gSpriteAnim_8402A9C
-
-	.align 2
-gSpriteAffineAnim_8402AAC:: @ 8402AAC
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8402AC4:: @ 8402AC4
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 4, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8402ADC:: @ 8402ADC
-	.4byte gSpriteAffineAnim_8402AAC
-	.4byte gSpriteAffineAnim_8402AC4
-
-	.align 2
-gBattleAnimSpriteTemplate_8402AE4:: @ 8402AE4
-	spr_template 10277, 10277, gOamData_837DF9C, gSpriteAnimTable_8402AA8, NULL, gSpriteAffineAnimTable_8402ADC, sub_8132370
-
-	.align 2
-gSpriteAffineAnim_8402AFC:: @ 8402AFC
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 64
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_8402B0C:: @ 8402B0C
-	.4byte gSpriteAffineAnim_8402AFC
-
-	.align 2
-gBattleAnimSpriteTemplate_8402B10:: @ 8402B10
-	spr_template 10278, 10278, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402B0C, sub_81323E0
-
-	.align 2
-gUnknown_08402B28:: @ 8402B28
-	obj_rot_scal_anim_frame 0, 16, 0, 4
-	obj_rot_scal_anim_frame -2, 0, 0, 8
-	obj_rot_scal_anim_frame 0, 4, 0, 4
-	obj_rot_scal_anim_frame 0, 0, 0, 24
-	obj_rot_scal_anim_frame 1, -5, 0, 16
-	obj_rot_scal_anim_end 0
diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s
deleted file mode 100644
index b043929c3..000000000
--- a/data/battle_anim_813F0F4.s
+++ /dev/null
@@ -1,150 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gBallOpenParticleSpritesheets:: @ 840B258
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55020
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55021
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55022
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55023
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55024
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55025
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55026
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55027
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55028
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55029
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55030
-	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55031
-
-	.align 2
-gBallOpenParticlePalettes:: @ 840B2B8
-	obj_pal gBattleAnimSpritePalette_136, 55020
-	obj_pal gBattleAnimSpritePalette_136, 55021
-	obj_pal gBattleAnimSpritePalette_136, 55022
-	obj_pal gBattleAnimSpritePalette_136, 55023
-	obj_pal gBattleAnimSpritePalette_136, 55024
-	obj_pal gBattleAnimSpritePalette_136, 55025
-	obj_pal gBattleAnimSpritePalette_136, 55026
-	obj_pal gBattleAnimSpritePalette_136, 55027
-	obj_pal gBattleAnimSpritePalette_136, 55028
-	obj_pal gBattleAnimSpritePalette_136, 55029
-	obj_pal gBattleAnimSpritePalette_136, 55030
-	obj_pal gBattleAnimSpritePalette_136, 55031
-
-	.align 2
-gSpriteAnim_840B318:: @ 840B318
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_840B334:: @ 840B334
-	obj_image_anim_frame 3, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B33C:: @ 840B33C
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B344:: @ 840B344
-	obj_image_anim_frame 5, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B34C:: @ 840B34C
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_840B358:: @ 840B358
-	obj_image_anim_frame 7, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840B360:: @ 840B360
-	.4byte gSpriteAnim_840B318
-	.4byte gSpriteAnim_840B334
-	.4byte gSpriteAnim_840B33C
-	.4byte gSpriteAnim_840B344
-	.4byte gSpriteAnim_840B34C
-	.4byte gSpriteAnim_840B358
-
-gBallOpenParticleAnimNums:: @ 840B378
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 5
-	.byte 1
-	.byte 2
-	.byte 2
-	.byte 3
-	.byte 5
-	.byte 5
-	.byte 4
-	.byte 4
-
-	.align 2
-gBallOpenParticleAnimationFuncs:: @ 840B384
-	.4byte PokeBallOpenParticleAnimation
-	.4byte GreatBallOpenParticleAnimation
-	.4byte SafariBallOpenParticleAnimation
-	.4byte UltraBallOpenParticleAnimation
-	.4byte MasterBallOpenParticleAnimation
-	.4byte SafariBallOpenParticleAnimation
-	.4byte DiveBallOpenParticleAnimation
-	.4byte UltraBallOpenParticleAnimation
-	.4byte RepeatBallOpenParticleAnimation
-	.4byte TimerBallOpenParticleAnimation
-	.4byte GreatBallOpenParticleAnimation
-	.4byte PremierBallOpenParticleAnimation
-
-	.align 2
-gSpriteTemplates_840B3B4:: @ 840B3B4
-	spr_template 55020, 55020, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55021, 55021, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55022, 55022, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55023, 55023, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55024, 55024, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55025, 55025, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55026, 55026, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55027, 55027, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55028, 55028, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55029, 55029, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55030, 55030, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 55031, 55031, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 1
-gUnknown_0840B4D4:: @ 840B4D4
-	.2byte 0x7ADF
-	.2byte 0x7AF0
-	.2byte 0x53D7
-	.2byte 0x3FFF
-	.2byte 0x7297
-	.2byte 0x67F5
-	.2byte 0x7B2C
-	.2byte 0x2B7E
-	.2byte 0x431F
-	.2byte 0x7BDD
-	.2byte 0x2A3F
-	.2byte 0x293F
-	.2byte    0x0
-	.2byte  0x201
-	.2byte  0x403
-	.2byte  0x101
-	.2byte  0x100
-	.2byte  0x503
-	.2byte  0x506
-	.2byte    0x4
-
-	.align 2
-gBattleAnimSpriteTemplate_840B4FC:: @ 840B4FC
-	spr_template 10269, 10269, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8141C30
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index a52dc150b..f6f52aad2 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -2980,7 +2980,7 @@ Move_FLASH: @ 81CB713
 	end
 
 Move_SPLASH: @ 81CB720
-	createvisualtask sub_80D074C, 2, 0, 3
+	createvisualtask AnimTask_Splash, 2, 0, 3
 	delay 8
 	loopsewithpan SE_W039, 192, 38, 3
 	waitforvisualfinish
@@ -3059,7 +3059,7 @@ Move_SKETCH: @ 81CB87B
 	createsprite gBattleAnimSpriteTemplate_83D77E0, 130
 	waitforvisualfinish
 	clearmonbg ANIM_BANK_TARGET
-	createvisualtask sub_80D074C, 2, 0, 2
+	createvisualtask AnimTask_Splash, 2, 0, 2
 	loopsewithpan SE_W039, 192, 38, 2
 	end
 
@@ -3451,25 +3451,27 @@ Move_UPROAR: @ 81CBEFC
 Move_HEAT_WAVE: @ 81CBFC6
 	loadspritegfx ANIM_TAG_261
 	createvisualtask sub_80E2C60, 5, 10261, 0, 6, 6, 31
+	loadspritegfx ANIM_TAG_261
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, rgb(31, 0, 0)
 	createvisualtask do_boulder_dust, 5, 1
-	createvisualtask sub_80D6080, 6, 6, 31
+	createvisualtask AnimTask_BlendInterfaceColor, 6, 6, 31
 	panse_1B SE_W257, 192, 63, 2, 0
 	delay 4
 	createvisualtask sub_80D5DDC, 5
 	delay 12
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 10, 2304, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 10, 2304, 96, 1
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 90, 2048, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 90, 2048, 96, 1
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 50, 2560, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 50, 2560, 96, 1
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 20, 2304, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 20, 2304, 96, 1
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 70, 1984, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 70, 1984, 96, 1
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 0, 2816, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 0, 2816, 96, 1
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 60, 2560, 96, 1
+	createsprite gFlyingDirtSpriteTemplate, 40, 60, 2560, 96, 1
 	end
 
 Move_HAIL: @ 81CC076
@@ -3911,9 +3913,9 @@ Move_LUSTER_PURGE: @ 81CC95B
 	createsprite gBattleAnimSpriteTemplate_83DA9E0, 41, 0, 0, 0, 0
 	delay 20
 	createvisualtask sub_80E2A7C, 5, 5, 2, 0, 16, -1
-	createvisualtask sub_80E2C60, 5, 10267, 2, 0, 16, -1
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10267, 2, 0, 16, 0xFFFF
 	waitforvisualfinish
-	createvisualtask sub_80E2C60, 5, 10135, 0, 12, 12, 23552
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10135, 0, 12, 12, rgb(0, 0, 23)
 	waitforvisualfinish
 	createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2
 	createvisualtask sub_812B30C, 5, 215, 63
@@ -4005,7 +4007,7 @@ Move_TEETER_DANCE: @ 81CCBD1
 
 Move_MUD_SPORT: @ 81CCC3C
 	loadspritegfx ANIM_TAG_074
-	createvisualtask sub_80D074C, 2, 0, 6
+	createvisualtask AnimTask_Splash, 2, 0, 6
 	delay 24
 	createsprite gMudSportDirtSpriteTemplate, 130, 0, -4, -16
 	createsprite gMudSportDirtSpriteTemplate, 130, 0, 4, -12
@@ -4167,7 +4169,7 @@ Move_FAKE_TEARS: @ 81CD10D
 	loadspritegfx ANIM_TAG_155
 	loadspritegfx ANIM_TAG_209
 	loadspritegfx ANIM_TAG_072
-	createvisualtask sub_80E2C60, 5, 10155, 0, 4, 4, 32108
+	createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, rgb(12, 11, 31)
 	waitforvisualfinish
 	createvisualtask sub_812E568, 5, 0, 2, 1
 	loopsewithpan SE_W039, 192, 12, 4
@@ -6340,19 +6342,19 @@ Move_SANDSTORM: @ 81D0304
 	playsewithpan SE_W201, 0
 	createvisualtask do_boulder_dust, 5, 0
 	delay 16
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 10, 2304, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 10, 2304, 96, 0
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 90, 2048, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 90, 2048, 96, 0
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 50, 2560, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 50, 2560, 96, 0
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 20, 2304, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 20, 2304, 96, 0
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 70, 1984, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 70, 1984, 96, 0
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 0, 2816, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 0, 2816, 96, 0
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DACE8, 40, 60, 2560, 96, 0
+	createsprite gFlyingDirtSpriteTemplate, 40, 60, 2560, 96, 0
 	end
 
 Move_WHIRLPOOL: @ 81D038C
@@ -6856,20 +6858,20 @@ Move_ANCIENT_POWER: @ 81D0EE5
 	monbg ANIM_BANK_DEF_PARTNER
 	setalpha 12, 8
 	createsprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 10, 1
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 20, 32, -48, 50, 2
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -38, 25, 5
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 32, 32, -28, 40, 3
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, -20, 32, -48, 50, 2
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 20, 32, -28, 60, 1
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -28, 30, 4
+	createsprite gAncientPowerRockSpriteTemplate, 2, 20, 32, -48, 50, 2
+	createsprite gAncientPowerRockSpriteTemplate, 2, 0, 32, -38, 25, 5
+	createsprite gAncientPowerRockSpriteTemplate, 2, 32, 32, -28, 40, 3
+	createsprite gAncientPowerRockSpriteTemplate, 2, -20, 32, -48, 50, 2
+	createsprite gAncientPowerRockSpriteTemplate, 2, 20, 32, -28, 60, 1
+	createsprite gAncientPowerRockSpriteTemplate, 2, 0, 32, -28, 30, 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 30, 1
 	playsewithpan SE_W082, 192
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 15, 32, -48, 25, 5
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, -10, 32, -42, 30, 4
+	createsprite gAncientPowerRockSpriteTemplate, 2, 15, 32, -48, 25, 5
+	createsprite gAncientPowerRockSpriteTemplate, 2, -10, 32, -42, 30, 4
 	delay 10
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -42, 25, 5
-	createsprite gBattleAnimSpriteTemplate_83DAD60, 2, -25, 32, -48, 30, 4
+	createsprite gAncientPowerRockSpriteTemplate, 2, 0, 32, -42, 25, 5
+	createsprite gAncientPowerRockSpriteTemplate, 2, -25, 32, -48, 30, 4
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4
 	delay 3
@@ -7334,7 +7336,7 @@ Move_SHADOW_BALL: @ 81D1AEF
 	waitbgfadein
 	delay 15
 	createsoundtask sub_812B058, 168, -64, 63, 5, 5, 0, 5
-	createsprite gBattleAnimSpriteTemplate_83DAEA8, 130, 16, 16, 8
+	createsprite gShadowBallSpriteTemplate, 130, 16, 16, 8
 	waitforvisualfinish
 	playsewithpan SE_W028, 63
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 8, 1
@@ -9551,7 +9553,7 @@ Move_DOOM_DESIRE: @ 81D52CB
 	blendoff
 	end
 
-Unknown_81D532F: @ 81D532F
+Move_DOOM_DESIRE_Activate: @ 81D532F
 	loadspritegfx ANIM_TAG_198
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, rgb(31, 31, 31)
 	waitforvisualfinish