Merge branch 'master' of github.com:pret/pokefirered into dism_more_data

5 files changed, 73 insertions, 994 deletions

diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s
index cccdb2793..ff14e90a4 100644
--- a/data/battle_anim_effects_misc.s
+++ b/data/battle_anim_effects_misc.s
@@ -1353,7 +1353,7 @@ gUnknown_83E3F4C:: @ 83E3F4C
 	spr_template 10002, 10002, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8A1C
 
 gUnknown_83E3F64:: @ 83E3F64
-	spr_template 10197, 10197, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8075F0C
+	spr_template 10197, 10197, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSnoreZ
 
 gUnknown_83E3F7C:: @ 83E3F7C
 	obj_image_anim_frame 0, 5
@@ -1866,900 +1866,3 @@ gUnknown_83E5B88:: @ 83E5B88
 
 gUnknown_83E5BA0:: @ 83E5BA0
 	spr_template 10155, 10155, gOamData_83ACA30, gUnknown_83E5B18, NULL, gUnknown_83E5B6C, sub_8077350
-
-gUnknown_83E5BB8:: @ 83E5BB8
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_jump 0
-
-gUnknown_83E5BC8:: @ 83E5BC8
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_jump 0
-
-gUnknown_83E5BD8:: @ 83E5BD8
-	.4byte gUnknown_83E5BB8
-	.4byte gUnknown_83E5BC8
-
-gUnknown_83E5BE0:: @ 83E5BE0
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5BD8, NULL, gDummySpriteAffineAnimTable, sub_80AC90C
-
-gUnknown_83E5BF8:: @ 83E5BF8
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5BD8, NULL, gDummySpriteAffineAnimTable, sub_80AC94C
-
-gUnknown_83E5C10:: @ 83E5C10
-	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_frame 80, 3
-	obj_image_anim_frame 96, 3
-	obj_image_anim_frame 112, 3
-	obj_image_anim_jump 0
-
-gUnknown_83E5C34:: @ 83E5C34
-	.4byte gUnknown_83E5C10
-
-gUnknown_83E5C38:: @ 83E5C38
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_frame 64, 5
-	obj_image_anim_jump 0
-
-gUnknown_83E5C50:: @ 83E5C50
-	.4byte gUnknown_83E5C38
-
-gUnknown_83E5C54:: @ 83E5C54
-	obj_rot_scal_anim_frame 50, 256, 0, 0
-	obj_rot_scal_anim_frame 32, 0, 0, 7
-	obj_rot_scal_anim_end
-
-gUnknown_83E5C6C:: @ 83E5C6C
-	.4byte gUnknown_83E5C54
-
-gUnknown_83E5C70:: @ 83E5C70
-	spr_template 10033, 10033, gOamData_83ACA38, gUnknown_83E5C34, NULL, gUnknown_83E5C6C, sub_80ACA00
-
-gUnknown_83E5C88:: @ 83E5C88
-	spr_template 10033, 10033, gOamData_83AC9D8, gUnknown_83E5C34, NULL, gDummySpriteAffineAnimTable, sub_80ACA00
-
-gUnknown_83E5CA0:: @ 83E5CA0
-	spr_template 10035, 10035, gOamData_83AC9D8, gUnknown_83E5C50, NULL, gDummySpriteAffineAnimTable, sub_80AC990
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5C50, NULL, gDummySpriteAffineAnimTable, sub_80AC990
-
-gUnknown_83E5CD0:: @ 83E5CD0
-	obj_image_anim_frame 0x0010, 6
-	obj_image_anim_frame 0x0020, 6
-	obj_image_anim_frame 0x0030, 6
-	obj_image_anim_jump 0
-
-gUnknown_83E5CE0::
-	.4byte gUnknown_83E5CD0
-
-gUnknown_83E5CE4::
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5CE0, NULL, gDummySpriteAffineAnimTable, sub_80ACAA8
-
-gUnknown_83E5CFC:: @ 83E5CFC
-	obj_rot_scal_anim_frame 80, 80, 0, 0
-	obj_rot_scal_anim_frame 2, 2, 10, 1
-	obj_rot_scal_anim_jump 1
-
-gUnknown_83E5D14:: @ 83E5D14
-	.4byte gUnknown_83E5CFC
-
-gUnknown_83E5D18:: @ 83E5D18
-	spr_template 10157, 10157, gOamData_83ACB58, gDummySpriteAnimTable, NULL, gUnknown_83E5D14, sub_80ACBB0
-
-gUnknown_83E5D30:: @ 83E5D30
-	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_jump 0
-
-gUnknown_83E5D48:: @ 83E5D48
-	.4byte gUnknown_83E5D30
-
-gUnknown_83E5D4C:: @ 83E5D4C
-	spr_template 10029, 10029, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
-
-gUnknown_83E5D64:: @ 83E5D64
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5D48, NULL, gDummySpriteAffineAnimTable, sub_80ACBDC
-
-gUnknown_83E5D7C:: @ 83E5D7C
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5D48, NULL, gDummySpriteAffineAnimTable, sub_80ACC44
-
-gUnknown_83E5D94:: @ 83E5D94
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5D48, NULL, gDummySpriteAffineAnimTable, sub_80ACC60
-
-gUnknown_83E5DAC:: @ 83E5DAC
-	obj_image_anim_frame 32, 6
-	obj_image_anim_frame 48, 6
-	obj_image_anim_jump 0
-
-gUnknown_83E5DB8:: @ 83E5DB8
-	.4byte gUnknown_83E5DAC
-
-gUnknown_83E5DBC:: @ 83E5DBC
-	obj_rot_scal_anim_frame 0, 0, 0, 1
-	obj_rot_scal_anim_end
-
-gUnknown_83E5DCC::
-	obj_rot_scal_anim_frame 160, 160, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E55DC::
-	.4byte gUnknown_83E5DBC
-    .4byte gUnknown_83E5DCC
-
-gUnknown_83E5DE4:: @ 83E5DE4
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5DB8, NULL, gDummySpriteAffineAnimTable, sub_80ACDA8
-
-gUnknown_83E5DFC:: @ 83E5DFC
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5D48, NULL, gDummySpriteAffineAnimTable, sub_80ACDE8
-
-gUnknown_83E5E14:: @ 83E5E14
-	spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E5D48, NULL, gDummySpriteAffineAnimTable, sub_8077350
-
-gUnknown_83E5E2C:: @ 83E5E2C
-	spr_template 10201, 10201, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AD330
-
-gUnknown_83E5E44:: @ 83E5E44
-	.2byte 0xfffe, 0xfffb, 0xffff, 0xffff, 0x0003, 0xfffa, 0x0004, 0xfffe, 0x0002, 0xfff8, 0xfffb, 0xfffb, 0x0004, 0xfff9
-
-gUnknown_83E5E60:: @ 83E5E60
-	spr_template 10201, 10201, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AD454
-
-gUnknown_83E5E78:: @ 83E5E78
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_jump 0
-
-gUnknown_83E5E8C:: @ 83E5E8C
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-gUnknown_83E5E94:: @ 83E5E94
-	obj_image_anim_frame 20, 5
-	obj_image_anim_end
-
-gUnknown_83E5E9C:: @ 83E5E9C
-	obj_image_anim_frame 20, 5
-	obj_image_anim_end
-
-gUnknown_83E5EA4:: @ 83E5EA4
-	.4byte gUnknown_83E5E78
-	.4byte gUnknown_83E5E8C
-	.4byte gUnknown_83E5E94
-	.4byte gUnknown_83E5E9C
-
-gUnknown_83E5EB4:: @ 83E5EB4
-	spr_template 10231, 10231, gOamData_83AC9D0, gUnknown_83E5EA4, NULL, gDummySpriteAffineAnimTable, sub_80AD540
-
-gUnknown_83E5ECC:: @ 83E5ECC
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_jump 0
-
-gUnknown_83E5EE0:: @ 83E5EE0
-	.4byte gUnknown_83E5ECC
-
-gUnknown_83E5EE4:: @ 83E5EE4
-	spr_template 10232, 10232, gOamData_83AC9D8, gUnknown_83E5EE0, NULL, gDummySpriteAffineAnimTable, sub_80AD6F4
-
-gUnknown_83E5EFC:: @ 83E5EFC
-	.byte 0xff, 0xff, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0x01, 0x00, 0x00, 0xff, 0x00, 0x01
-
-gUnknown_83E5F0C:: @ 83E5F0C
-	.byte 0xff, 0x00, 0x01, 0x00, 0xff, 0x01, 0x00, 0xff, 0x00, 0x01, 0x00, 0xff, 0x00, 0x01, 0x00, 0x01
-
-gUnknown_83E5F1C:: @ 83E5F1C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 8
-	obj_image_anim_frame 48, 5
-	obj_image_anim_frame 64, 5
-	obj_image_anim_end
-
-gUnknown_83E5F34:: @ 83E5F34
-	.4byte gUnknown_83E5F1C
-
-gUnknown_83E5F38:: @ 83E5F38
-	spr_template 10037, 10037, gOamData_83AC9D8, gUnknown_83E5F34, NULL, gDummySpriteAffineAnimTable, sub_80ADBEC
-
-gUnknown_83E5F50:: @ 83E5F50
-	obj_rot_scal_anim_frame 256, 256, 0, 0
-	obj_rot_scal_anim_frame 0, 0, 0, 20
-	obj_rot_scal_anim_frame 0, 0, 240, 60
-	obj_rot_scal_anim_end
-
-gUnknown_83E5F70::
-	.4byte gUnknown_83E5F50
-
-gUnknown_83E5F74::
-	spr_template 10143, 10143, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E5F70, sub_80ADC58
-
-gUnknown_83E5F8C::
-	obj_image_anim_frame 0x0000, 5
-	obj_image_anim_frame 0x0010, 5
-	obj_image_anim_frame 0x0020, 5
-	obj_image_anim_frame 0x0030, 5
-	obj_image_anim_frame 0x0040, 5
-	obj_image_anim_frame 0x0050, 5
-	obj_image_anim_jump 0
-
-gUnknown_83E5FA8::
-	.4byte gUnknown_83E5F8C
-
-gUnknown_83E5FAC::
-	spr_template 10079, 10079, gOamData_83AC9D8, gUnknown_83E5FA8, NULL, gDummySpriteAffineAnimTable, sub_80ADCB8
-
-gUnknown_83E5FC4:: @ 83E5FC4
-	spr_template 10011, 10011, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ADD4C
-
-gUnknown_83E5FDC:: @ 83E5FDC
-	spr_template 10171, 10171, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
-
-gUnknown_83E5FF4:: @ 83E5FF4
-	obj_rot_scal_anim_frame 0, 0, 20, 1
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83E6004:: @ 83E6004
-	.4byte gUnknown_83E5FF4
-
-gUnknown_83E6008:: @ 83E6008
-	spr_template 10011, 10011, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E6004, sub_80ADEB0
-
-gUnknown_83E6020:: @ 83E6020
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 6
-	obj_image_anim_jump 0
-
-gUnknown_83E6030:: @ 83E6030
-	.4byte gUnknown_83E6020
-
-gUnknown_83E6034:: @ 83E6034
-	obj_rot_scal_anim_frame 232, 232, 0, 0
-	obj_rot_scal_anim_frame -8, -8, 0, 10
-	obj_rot_scal_anim_frame 8, 8, 0, 10
-	obj_rot_scal_anim_jump 1
-
-gUnknown_83E6054:: @ 83E6054
-	.4byte gUnknown_83E6034
-
-gUnknown_83E6058:: @ 83E6058
-	spr_template 10282, 10282, gOamData_83ACA38, gUnknown_83E6030, NULL, gUnknown_83E6054, sub_80AE000
-
-gUnknown_83E6070:: @ 83E6070
-	spr_template 10011, 10011, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E6004, sub_80AE06C
-
-gUnknown_83E6088:: @ 83E6088
-	spr_template 10011, 10011, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AE1A0
-
-gUnknown_83E60A0:: @ 83E60A0
-	spr_template 10001, 10001, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AE420
-
-gUnknown_83E60B8:: @ 83E60B8
-	spr_template 10173, 10173, gOamData_83AC9F8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AE470
-
-gUnknown_83E60D0:: @ 83E60D0
-	.byte 0x3a, 0xc4
-	.byte 0xc8, 0xdc
-	.byte 0x08, 0xc8
-	.byte 0xf0, 0x38
-	.byte 0x3a, 0xf6
-	.byte 0xc6, 0x0a
-	.byte 0x30, 0xee
-	.byte 0xf8, 0x38
-	.byte 0x10, 0xc8
-	.byte 0xc6, 0xd6
-	.byte 0x3a, 0x1e
-	.byte 0xd0, 0x28
-	.byte 0x0c, 0xd0
-	.byte 0x30, 0xf4
-	.byte 0xc8, 0x12
-	.byte 0x30, 0x30
-
-gUnknown_83E60F0:: @ 83E60F0
-	obj_image_anim_frame 3, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-gUnknown_83E6104:: @ 83E6104
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 1, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 3, 5
-	obj_image_anim_end
-
-gUnknown_83E6118:: @ 83E6118
-	.4byte gUnknown_83E60F0
-	.4byte gUnknown_83E6104
-
-gUnknown_83E6120:: @ 83E6120
-	spr_template 10211, 10211, gOamData_83AC9C8, gUnknown_83E6118, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_83E6138:: @ 83E6138
-	obj_rot_scal_anim_frame 16, 16, 0, 0
-	obj_rot_scal_anim_frame 4, 4, 0, 60
-	obj_rot_scal_anim_frame 256, 256, 0, 0
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame -4, -4, 0, 5
-	obj_rot_scal_anim_frame 4, 4, 0, 5
-	obj_rot_scal_anim_loop 10
-	obj_rot_scal_anim_end
-
-gUnknown_83E6178:: @ 83E6178
-	obj_rot_scal_anim_frame 16, 16, 0, 0
-	obj_rot_scal_anim_frame 8, 8, 0, 30
-	obj_rot_scal_anim_frame 256, 256, 0, 0
-	obj_rot_scal_anim_frame -4, -4, 0, 5
-	obj_rot_scal_anim_frame 4, 4, 0, 5
-	obj_rot_scal_anim_jump 3
-
-gUnknown_83E61A8:: @ 83E61A8
-	obj_rot_scal_anim_frame 16, 16, 0, 0
-	obj_rot_scal_anim_frame 8, 8, 0, 30
-	obj_rot_scal_anim_frame -8, -8, 0, 30
-	obj_rot_scal_anim_end
-
-gUnknown_83E61C8:: @ 83E61C8
-	.4byte gUnknown_83E6138
-	.4byte gUnknown_83E6178
-	.4byte gUnknown_83E61A8
-
-gUnknown_83E61D4:: @ 83E61D4
-	spr_template 10212, 10212, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E61C8, sub_80AE71C
-
-gUnknown_83E61EC:: @ 83E61EC
-	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_end
-
-gUnknown_83E6200:: @ 83E6200
-	.4byte gUnknown_83E61EC
-
-gUnknown_83E6204:: @ 83E6204
-	spr_template 10213, 10213, gOamData_83AC9D8, gUnknown_83E6200, NULL, gDummySpriteAffineAnimTable, sub_80AE774
-
-gUnknown_83E621C:: @ 83E621C
-	spr_template 10212, 10212, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E61C8, sub_80AE7DC
-
-gUnknown_83E6234:: @ 83E6234
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-gUnknown_83E623C:: @ 83E623C
-	obj_image_anim_frame 2, 3
-	obj_image_anim_end
-
-gUnknown_83E6244:: @ 83E6244
-	obj_image_anim_frame 4, 3
-	obj_image_anim_end
-
-gUnknown_83E624C:: @ 83E624C
-	obj_image_anim_frame 6, 3
-	obj_image_anim_end
-
-gUnknown_83E6254:: @ 83E6254
-	.4byte gUnknown_83E6234
-	.4byte gUnknown_83E623C
-	.4byte gUnknown_83E6244
-	.4byte gUnknown_83E624C
-
-gUnknown_83E6264:: @ 83E6264
-	obj_rot_scal_anim_frame 256, 256, 64, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6274:: @ 83E6274
-	.4byte gUnknown_83E6264
-
-gUnknown_83E6278:: @ 83E6278
-	spr_template 10001, 10001, gOamData_83ACAC8, gUnknown_83E6254, NULL, gUnknown_83E6274, sub_80AEC34
-
-gUnknown_83E6290:: @ 83E6290
-	spr_template 10212, 10212, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E61C8, sub_80AEC80
-
-gUnknown_83E62A8:: @ 83E62A8
-	spr_template 10001, 10001, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AEF60
-
-gUnknown_83E62C0:: @ 83E62C0
-	obj_image_anim_frame 0x0000, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0x0001, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-gUnknown_83E62CC::
-	.4byte gUnknown_83E62C0
-
-gUnknown_83E62D0::
-	spr_template 10141, 10141, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AF108
-
-gUnknown_83E62E8::
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-gUnknown_83E62F0:: @ 83E62F0
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-gUnknown_83E62F8:: @ 83E62F8
-	obj_image_anim_frame 6, 1
-	obj_image_anim_end
-
-gUnknown_83E6300:: @ 83E6300
-	obj_image_anim_frame 7, 1
-	obj_image_anim_end
-
-gUnknown_83E6308:: @ 83E6308
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-gUnknown_83E6310:: @ 83E6310
-	obj_image_anim_frame 12, 6
-	obj_image_anim_frame 13, 6
-	obj_image_anim_jump 0
-
-gUnknown_83E631C:: @ 83E631C
-	.4byte gUnknown_83E62E8
-
-gUnknown_83E6320:: @ 83E6320
-	.4byte gUnknown_83E62F0
-
-gUnknown_83E6324:: @ 83E6324
-	.4byte gUnknown_83E62F8
-
-gUnknown_83E6328:: @ 83E6328
-	.4byte gUnknown_83E6300
-
-gUnknown_83E632C:: @ 83E632C
-	.4byte gUnknown_83E6308
-
-gUnknown_83E6330:: @ 83E6330
-	.4byte gUnknown_83E6310
-
-gUnknown_83E6334:: @ 83E6334
-	obj_rot_scal_anim_frame 0, 0, 40, 1
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83E6344:: @ 83E6344
-	.4byte gUnknown_83E6334
-
-gUnknown_83E6348:: @ 83E6348
-	spr_template 10141, 10141, gOamData_83ACBE8, gUnknown_83E6320, NULL, gUnknown_83E6344, sub_80AF2F0
-
-gUnknown_83E6360:: @ 83E6360
-	spr_template 10141, 10141, gOamData_83ACAE8, gUnknown_83E6324, NULL, gDummySpriteAffineAnimTable, sub_80AF2F0
-
-gUnknown_83E6378:: @ 83E6378
-	obj_rot_scal_anim_frame 0, 0, 10, 1
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83E6388:: @ 83E6388
-	.4byte gUnknown_83E6378
-
-gUnknown_83E638C:: @ 83E638C
-	spr_template 10141, 10141, gOamData_83ACB88, gUnknown_83E6320, NULL, gUnknown_83E6388, sub_80AF330
-
-gUnknown_83E63A4:: @ 83E63A4
-	spr_template 10141, 10141, gOamData_83ACAE8, gUnknown_83E6324, NULL, gDummySpriteAffineAnimTable, sub_80AF330
-
-gUnknown_83E63BC:: @ 83E63BC
-	obj_rot_scal_anim_frame 206, 206, 0, 0
-	obj_rot_scal_anim_frame 5, 5, 0, 10
-	obj_rot_scal_anim_frame 0, 0, 0, 6
-	obj_rot_scal_anim_end
-
-gUnknown_83E63DC:: @ 83E63DC
-	.4byte gUnknown_83E63BC
-
-gUnknown_83E63E0:: @ 83E63E0
-	spr_template 10141, 10141, gOamData_83ACB88, gUnknown_83E6320, NULL, gUnknown_83E63DC, sub_80AF3B8
-
-gUnknown_83E63F8:: @ 83E63F8
-	spr_template 10141, 10141, gOamData_83ACB48, gUnknown_83E6324, NULL, gUnknown_83E63DC, sub_80AF3B8
-
-gUnknown_83E6410:: @ 83E6410
-	spr_template 10141, 10141, gOamData_83AC9C8, gUnknown_83E6328, NULL, gDummySpriteAffineAnimTable, sub_80AF468
-
-gUnknown_83E6428:: @ 83E6428
-	spr_template 10141, 10141, gOamData_83AC9D0, gUnknown_83E632C, NULL, gDummySpriteAffineAnimTable, sub_80AF6D8
-
-gUnknown_83E6440:: @ 83E6440
-	spr_template 10141, 10141, gOamData_83AC9C8, gUnknown_83E6328, NULL, gDummySpriteAffineAnimTable, sub_80AF6D8
-
-gUnknown_83E6458:: @ 83E6458
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 6, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-gUnknown_83E6478:: @ 83E6478
-	.4byte gUnknown_83E6458
-
-gUnknown_83E647C:: @ 83E647C
-	spr_template 10142, 10142, gOamData_83ACB28, gUnknown_83E6478, NULL, gDummySpriteAffineAnimTable, sub_80AF88C
-
-gUnknown_83E6494:: @ 83E6494
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 8, 8
-	obj_image_anim_jump 0
-
-gUnknown_83E64A0:: @ 83E64A0
-	.4byte gUnknown_83E6494
-
-gUnknown_83E64A4:: @ 83E64A4
-	spr_template 10144, 10144, gOamData_83ACB18, gUnknown_83E64A0, NULL, gDummySpriteAffineAnimTable, sub_80AF914
-
-gUnknown_83E64BC:: @ 83E64BC
-	spr_template 10172, 10172, gOamData_83ACB18, gUnknown_83E64A0, NULL, gDummySpriteAffineAnimTable, sub_80AF914
-
-gUnknown_83E64D4:: @ 83E64D4
-	.byte 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x04, 0x04, 0x04, 0x05, 0x06, 0x06, 0x06, 0x06, 0x07, 0x08, 0x08, 0x08, 0x09
-
-gUnknown_83E64E8:: @ 83E64E8
-	spr_template 10155, 10155, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AFD4C
-
-gUnknown_83E6500:: @ 83E6500
-	.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05
-
-gUnknown_83E6514:: @ 83E6514
-	spr_template 10172, 10172, gOamData_83ACB18, gUnknown_83E64A0, NULL, gDummySpriteAffineAnimTable, sub_80AFFD4
-
-gUnknown_83E652C:: @ 83E652C
-	.2byte 0xe064, 0x2001
-	.2byte 0xe055, 0x0001
-	.2byte 0xe0f2, 0x1011
-	.2byte 0xe042, 0x1021
-	.2byte 0xe0b6, 0x0031
-	.2byte 0xe03c, 0x2001
-	.2byte 0xe0d6, 0x0011
-	.2byte 0xe071, 0x1001
-	.2byte 0xe0d2, 0x1031
-	.2byte 0xe026, 0x0021
-
-gUnknown_83E6554:: @ 83E6554
-	obj_rot_scal_anim_frame 256, 256, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6564:: @ 83E6564
-	obj_rot_scal_anim_frame 240, 240, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6574:: @ 83E6574
-	obj_rot_scal_anim_frame 224, 224, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6584:: @ 83E6584
-	obj_rot_scal_anim_frame 336, 336, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6594:: @ 83E6594
-	.4byte gUnknown_83E6554
-	.4byte gUnknown_83E6564
-	.4byte gUnknown_83E6574
-
-gUnknown_83E65A0:: @ 83E65A0
-	.4byte gUnknown_83E6584
-
-gUnknown_83E65A4:: @ 83E65A4
-	spr_template 10263, 10263, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E6594, sub_80B05CC
-
-gUnknown_83E65BC:: @ 83E65BC
-	spr_template 10263, 10263, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E65A0, sub_8077350
-
-gUnknown_83E65D4:: @ 83E65D4
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-gUnknown_83E65DC:: @ 83E65DC
-	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
-
-gUnknown_83E65F0:: @ 83E65F0
-	.4byte gUnknown_83E65D4
-	.4byte gUnknown_83E65DC
-
-gUnknown_83E65F8:: @ 83E65F8
-	obj_rot_scal_anim_frame 224, 224, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6608:: @ 83E6608
-	obj_rot_scal_anim_frame 280, 280, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6618:: @ 83E6618
-	obj_rot_scal_anim_frame 336, 336, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6628:: @ 83E6628
-	obj_rot_scal_anim_frame 384, 384, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6638:: @ 83E6638
-	obj_rot_scal_anim_frame 448, 448, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6648:: @ 83E6648
-	.4byte gUnknown_83E65F8
-	.4byte gUnknown_83E6608
-	.4byte gUnknown_83E6618
-	.4byte gUnknown_83E6628
-	.4byte gUnknown_83E6638
-
-gUnknown_83E665C:: @ 83E665C
-	spr_template 10043, 10043, gOamData_83ACA98, gUnknown_83E65F0, NULL, gUnknown_83E6648, unc_080B06FC
-
-gUnknown_83E6674:: @ 83E6674
-	spr_template 10141, 10141, gOamData_83AC9C8, gUnknown_83E6324, NULL, gDummySpriteAffineAnimTable, sub_80B07C0
-	spr_template 10050, 10050, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, unc_080B08A0
-
-gUnknown_83E66A4:: @ 83E66A4
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-gUnknown_83E66AC:: @ 83E66AC
-	obj_image_anim_frame 16, 1
-	obj_image_anim_end
-
-gUnknown_83E66B4:: @ 83E66B4
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-gUnknown_83E66BC:: @ 83E66BC
-	obj_image_anim_frame 48, 1
-	obj_image_anim_end
-
-gUnknown_83E66C4:: @ 83E66C4
-	obj_image_anim_frame 48, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-gUnknown_83E66CC:: @ 83E66CC
-	.4byte gUnknown_83E66A4
-
-gUnknown_83E66D0:: @ 83E66D0
-	.4byte gUnknown_83E66AC
-	.4byte gUnknown_83E66B4
-
-gUnknown_83E66D8:: @ 83E66D8
-	.4byte gUnknown_83E66BC
-	.4byte gUnknown_83E66C4
-
-gUnknown_83E66E0:: @ 83E66E0
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B08DC
-
-gUnknown_83E66F8:: @ 83E66F8
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B0928
-
-gUnknown_83E6710:: @ 83E6710
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B0954
-
-gUnknown_83E6728:: @ 83E6728
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B09A4
-
-gUnknown_83E6740:: @ 83E6740
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66D8, NULL, gDummySpriteAffineAnimTable, sub_80B0B80
-
-gUnknown_83E6758:: @ 83E6758
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66D0, NULL, gDummySpriteAffineAnimTable, sub_80B0C28
-
-gUnknown_83E6770:: @ 83E6770
-	obj_rot_scal_anim_frame 256, 256, 0, 0
-	obj_rot_scal_anim_frame -8, -8, 20, 1
-	obj_rot_scal_anim_jump 1
-
-gUnknown_83E6788:: @ 83E6788
-	.4byte gUnknown_83E6770
-
-gUnknown_83E678C:: @ 83E678C
-	spr_template 10143, 10143, gOamData_83ACA98, gUnknown_83E66CC, NULL, gUnknown_83E6788, sub_80B0CEC
-
-gUnknown_83E67A4:: @ 83E67A4
-	obj_rot_scal_anim_frame 256, 256, 0, 0
-	obj_rot_scal_anim_frame -4, -4, 20, 1
-	obj_rot_scal_anim_jump 1
-
-gUnknown_83E67BC:: @ 83E67BC
-	.4byte gUnknown_83E67A4
-
-gUnknown_83E67C0:: @ 83E67C0
-	spr_template 10143, 10143, gOamData_83ACA98, gUnknown_83E66CC, NULL, gUnknown_83E67BC, sub_80B0CEC
-
-gUnknown_83E67D8:: @ 83E67D8
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66D0, NULL, gDummySpriteAffineAnimTable, sub_80B0D58
-
-gUnknown_83E67F0:: @ 83E67F0
-	spr_template 10073, 10073, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80B0DF0
-
-gUnknown_83E6808:: @ 83E6808
-	spr_template 10167, 10167, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80B0E80
-
-gUnknown_83E6820:: @ 83E6820
-	spr_template 10208, 10208, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80B0F68
-
-gUnknown_83E6838:: @ 83E6838
-	obj_rot_scal_anim_frame 32, 32, 0, 0
-	obj_rot_scal_anim_frame 4, 4, 0, 64
-	obj_rot_scal_anim_frame -6, -6, 0, 8
-	obj_rot_scal_anim_frame 6, 6, 0, 8
-	obj_rot_scal_anim_jump 2
-
-gUnknown_83E6860:: @ 83E6860
-	.4byte gUnknown_83E6838
-
-gUnknown_83E6864:: @ 83E6864
-	spr_template 10212, 10212, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E6860, sub_80B107C
-
-gUnknown_83E687C:: @ 83E687C
-	spr_template 10257, 10257, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80B1188
-
-gUnknown_83E6894:: @ 83E6894
-	spr_template 10256, 10256, gOamData_83AC9E0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80B12E8
-
-gUnknown_83E68AC:: @ 83E68AC
-	spr_template 10143, 10143, gOamData_83AC9D8, gUnknown_83E66CC, NULL, gDummySpriteAffineAnimTable, sub_80B13F8
-
-gUnknown_83E68C4:: @ 83E68C4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_end
-
-gUnknown_83E68D4:: @ 83E68D4
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-gUnknown_83E68E4:: @ 83E68E4
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-gUnknown_83E68F4:: @ 83E68F4
-	.4byte gUnknown_83E68C4
-	.4byte gUnknown_83E68D4
-	.4byte gUnknown_83E68E4
-
-gUnknown_83E6900:: @ 83E6900
-	spr_template 10245, 10245, gOamData_83AC9D8, gUnknown_83E68F4, NULL, gDummySpriteAffineAnimTable, sub_80B1484
-
-gUnknown_83E6918:: @ 83E6918
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 64, 6
-	obj_image_anim_end
-
-gUnknown_83E6924:: @ 83E6924
-	obj_image_anim_frame 0, 6, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 64, 6, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-gUnknown_83E6930:: @ 83E6930
-	obj_image_anim_frame 0, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-gUnknown_83E693C:: @ 83E693C
-	.4byte gUnknown_83E6918
-	.4byte gUnknown_83E6924
-	.4byte gUnknown_83E6930
-
-gUnknown_83E6948:: @ 83E6948
-	spr_template 10246, 10246, gOamData_83AC9E0, gUnknown_83E693C, NULL, gDummySpriteAffineAnimTable, sub_80B1484
-
-gUnknown_83E6960:: @ 83E6960
-	obj_rot_scal_anim_frame 512, 512, 0, 0
-	obj_rot_scal_anim_frame -32, -32, 0, 8
-	obj_rot_scal_anim_end
-
-gUnknown_83E6978:: @ 83E6978
-	.4byte gUnknown_83E6960
-
-gUnknown_83E697C:: @ 83E697C
-	spr_template 10143, 10143, gOamData_83ACA98, gUnknown_83E66CC, NULL, gUnknown_83E6978, sub_80B14F0
-
-gUnknown_83E6994:: @ 83E6994
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 24, 5
-	obj_image_anim_end
-
-gUnknown_83E69A8:: @ 83E69A8
-	.4byte gUnknown_83E6994
-
-gUnknown_83E69AC:: @ 83E69AC
-	spr_template 10151, 10151, gOamData_83ACA18, gUnknown_83E69A8, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos
-
-gUnknown_83E69C4:: @ 83E69C4
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-gUnknown_83E69CC:: @ 83E69CC
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-gUnknown_83E69D4:: @ 83E69D4
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-gUnknown_83E69DC:: @ 83E69DC
-	.4byte gUnknown_83E69C4
-
-gUnknown_83E69E0:: @ 83E69E0
-	.4byte gUnknown_83E69CC
-
-gUnknown_83E69E4:: @ 83E69E4
-	.4byte gUnknown_83E69D4
-
-gUnknown_83E69E8:: @ 83E69E8
-	obj_rot_scal_anim_frame 352, 352, 0, 0
-	obj_rot_scal_anim_frame -10, -10, 0, 10
-	obj_rot_scal_anim_frame 10, 10, 0, 10
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83E6A08:: @ 83E6A08
-	obj_rot_scal_anim_frame 236, 236, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_83E6A18:: @ 83E6A18
-	.4byte gUnknown_83E69E8
-
-gUnknown_83E6A1C:: @ 83E6A1C
-	.4byte gUnknown_83E6A08
-
-gUnknown_83E6A20:: @ 83E6A20
-	spr_template 10150, 10150, gOamData_83ACA90, gUnknown_83E69DC, NULL, gUnknown_83E6A18, sub_80B1620
-
-gUnknown_83E6A38:: @ 83E6A38
-	spr_template 10150, 10150, gOamData_83ACA90, gUnknown_83E69DC, NULL, gUnknown_83E6A18, sub_80B16A0
-
-gUnknown_83E6A50:: @ 83E6A50
-	spr_template 10150, 10150, gOamData_83ACA30, gUnknown_83E69E4, NULL, gUnknown_83E6A1C, sub_80B1744
-
-gUnknown_83E6A68:: @ 83E6A68
-	obj_rot_scal_anim_frame -16, 16, 0, 6
-	obj_rot_scal_anim_frame 16, -16, 0, 6
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83E6A80:: @ 83E6A80
-	.4byte gUnknown_83E6A68
-
-gUnknown_83E6A84:: @ 83E6A84
-	spr_template 10150, 10150, gOamData_83ACA90, gUnknown_83E69E0, NULL, gUnknown_83E6A80, sub_80B17C4
-
-gUnknown_83E6A9C:: @ 83E6A9C
-	obj_rot_scal_anim_frame 156, 156, 0, 0
-	obj_rot_scal_anim_frame 5, 5, 0, 20
-	obj_rot_scal_anim_end
-
-gUnknown_83E6AB4:: @ 83E6AB4
-	.4byte gUnknown_83E6A9C
-
-gUnknown_83E6AB8:: @ 83E6AB8
-	spr_template 10150, 10150, gOamData_83ACA30, gUnknown_83E69DC, NULL, gUnknown_83E6AB4, sub_80B1838
-
-gUnknown_83E6AD0:: @ 83E6AD0
-	spr_template 10155, 10155, gOamData_83ACB50, gUnknown_83E5A78, NULL, gUnknown_83E6AB4, sub_80B1838
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 8f5348fd2..cf4cf25cb 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -924,11 +924,11 @@ Move_LEECH_SEED:: @ 81C7C23
 Move_EMBER:: @ 81C7C79
 	loadspritegfx 10029
 	loopsewithpan SE_W052, 192, 5, 2
-	createsprite gUnknown_83E5D4C, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1
+	createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1
 	delay 4
-	createsprite gUnknown_83E5D4C, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1
+	createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1
 	delay 4
-	createsprite gUnknown_83E5D4C, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1
+	createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1
 	delay 16
 	playsewithpan SE_W172, 63
 	call gUnknown_81C7CD5
@@ -937,7 +937,7 @@ Move_EMBER:: @ 81C7C79
 	end
 
 gUnknown_81C7CD5:: @ 81C7CD5
-	createsprite gUnknown_83E5D64, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1
+	createsprite gEmberFlareSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1
 	delay 4
 	return
 
@@ -949,7 +949,7 @@ Move_MEGA_PUNCH:: @ 81C7CED
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0
 	setalpha 12, 8
 	playsewithpan SE_W025, 63
-	createsprite gUnknown_83E67C0, ANIM_ATTACKER, 3, 0, 0, 0, 50
+	createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50
 	createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767
 	delay 50
 	call gUnknown_81C7D89
@@ -997,7 +997,7 @@ Move_MEGA_KICK:: @ 81C7DC7
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0
 	setalpha 12, 8
 	playsewithpan SE_W025, 63
-	createsprite gUnknown_83E67C0, ANIM_ATTACKER, 3, 0, 0, 1, 50
+	createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50
 	createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767
 	delay 50
 	playsewithpan SE_W025B, 63
@@ -1031,12 +1031,12 @@ gUnknown_81C7E77:: @ 81C7E77
 
 gUnknown_81C7E91:: @ 81C7E91
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 1, 2
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0
 	goto gUnknown_81C7E77
 
 gUnknown_81C7EB6:: @ 81C7EB6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 1, 2
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0
 	goto gUnknown_81C7E77
 
 Move_SONIC_BOOM:: @ 81C7EDB
@@ -1172,24 +1172,24 @@ gUnknown_81C81E3:: @ 81C81E3
 
 gUnknown_81C81E8:: @ 81C81E8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2
-	createsprite gUnknown_83E6710, ANIM_TARGET, 3, -20, -12, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
 	playsewithpan SE_W233B, 63
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2
-	createsprite gUnknown_83E6710, ANIM_TARGET, 3, 8, 8, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
 	playsewithpan SE_W233B, 63
 	goto gUnknown_81C81E3
 
 gUnknown_81C8259:: @ 81C8259
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2
-	createsprite gUnknown_83E6710, ANIM_TARGET, 3, 12, -12, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
 	playsewithpan SE_W233B, 63
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, 1, 2
-	createsprite gUnknown_83E6710, ANIM_TARGET, 3, -12, 8, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
 	playsewithpan SE_W233B, 63
 	goto gUnknown_81C81E3
@@ -1283,7 +1283,7 @@ Move_REVERSAL:: @ 81C8445
 	delay 8
 	playsewithpan SE_W233B, 63
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32767, 8, 0, 0
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
 	createvisualtask sub_8099BD4, 5, 0, 1, 8, 1, 0
 	end
@@ -1383,7 +1383,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC
 	monbg 1
 	setalpha 12, 8
 	call gUnknown_81C8817
-	createsprite gUnknown_83E6710, ANIM_TARGET, 5, 16, 8, 20, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, 1, 1
 	playsewithpan SE_W004, 63
 	createsprite gUnknown_83E67F0, ANIM_TARGET, 3, 16, 8, 160, -32
@@ -1394,7 +1394,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC
 	createsprite gUnknown_83E67F0, ANIM_TARGET, 3, 16, 8, -384, -31
 	delay 10
 	call gUnknown_81C8817
-	createsprite gUnknown_83E6710, ANIM_TARGET, 5, -16, -8, 20, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, 1, 1
 	playsewithpan SE_W233B, 63
 	createsprite gUnknown_83E67F0, ANIM_TARGET, 3, -16, -8, 160, -32
@@ -3196,7 +3196,7 @@ gUnknown_81CB11E:: @ 81CB11E
 	playsewithpan SE_W026, 192
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
 	playsewithpan SE_W004, 63
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
 	waitforvisualfinish
@@ -3523,7 +3523,7 @@ Move_HEAT_WAVE:: @ 81CB766
 	loadspritegfx 10261
 	createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31
 	createvisualtask AnimTask_LoadSandstormBackground, 5, 1
-	createvisualtask sub_80ADAA4, 6, 6, 31
+	createvisualtask AnimTask_BlendBackground, 6, 6, 31
 	panse_1B SE_W257, 192, 63, 2, 0
 	delay 4
 	createvisualtask sub_80AD800, 5, 
@@ -3548,7 +3548,7 @@ Move_HAIL:: @ 81CB816
 	loadspritegfx 10141
 	createvisualtask sub_80BA7F8, 10, 1, 3, 0, 6, 0
 	waitforvisualfinish
-	createvisualtask sub_80B038C, 5, 
+	createvisualtask AnimTask_Hail1, 5, 
 	loopsewithpan SE_W258, 0, 8, 10
 	waitforvisualfinish
 	createvisualtask sub_80BA7F8, 10, 1, 3, 6, 0, 0
@@ -3776,20 +3776,20 @@ gUnknown_81CBC47:: @ 81CBC47
 	delay 4
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
 	playsewithpan SE_W233, 63
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
 	playsewithpan SE_W233, 63
 	delay 20
 	createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0
 	delay 37
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
 	playsewithpan SE_W233B, 63
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, 0
@@ -3805,20 +3805,20 @@ gUnknown_81CBD16:: @ 81CBD16
 	createsprite gUnknown_83E6808, ANIM_ATTACKER, 3, 1, 0, 0, 90, 10
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0
 	playsewithpan SE_W233, 63
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0
 	playsewithpan SE_W233, 63
 	delay 20
 	createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0
 	delay 37
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0
 	playsewithpan SE_W233B, 63
 	waitforvisualfinish
 	createsprite gUnknown_83E6820, ANIM_ATTACKER, 2, 1, 0, -8, -12
@@ -4026,7 +4026,7 @@ Move_MIST_BALL:: @ 81CC212
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, 32767, 16
 	delay 0
 	playsewithpan SE_W114, 0
-	createvisualtask sub_80AFD80, 5, 
+	createvisualtask AnimTask_LoadMistTiles, 5, 
 	createvisualtask sub_80BA7F8, 10, 4, 3, 0, 16, 32767
 	delay 8
 	createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 70, 0
@@ -4154,7 +4154,7 @@ Move_NEEDLE_ARM:: @ 81CC513
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
 	playsewithpan SE_W233B, 63
 	createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 0, -24, 10
 	createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 17, -17, 10
@@ -4379,7 +4379,7 @@ Move_SHADOW_PUNCH:: @ 81CCB76
 	playsewithpan SE_W026, 192
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
 	playsewithpan SE_W004, 63
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1
 	waitforvisualfinish
@@ -4749,7 +4749,7 @@ Move_ICE_PUNCH:: @ 81CD2E0
 	createsprite gUnknown_83E6348, ANIM_ATTACKER, 2, 160
 	createsprite gUnknown_83E6348, ANIM_ATTACKER, 2, 224
 	delay 17
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, 1, 1
 	playsewithpan SE_W004, 63
 	delay 2
@@ -4914,7 +4914,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0
 	waitforvisualfinish
 	playsewithpan SE_W004, 63
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
 	delay 1
 	createvisualtask sub_80BA0E8, 2, 257, 257, 257
@@ -6661,19 +6661,19 @@ gUnknown_81CFEEB:: @ 81CFEEB
 	end
 
 gUnknown_81CFEF0:: @ 81CFEF0
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, -16, -8, 20, 1, 1
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, -16, -8, 20, 1, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -16, -16, 1, 2
 	createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
 	goto gUnknown_81CFEEB
 
 gUnknown_81CFF26:: @ 81CFF26
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 8, 8, 20, 1, 1
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 8, 8, 20, 1, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, 0, 1, 2
 	createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1
 	goto gUnknown_81CFEEB
 
 gUnknown_81CFF5C:: @ 81CFF5C
-	createsprite gUnknown_83E6710, ANIM_TARGET, 4, 0, 0, 20, 1, 1
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 20, 1, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 1
 	createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1
 	goto gUnknown_81CFEEB
@@ -6687,7 +6687,7 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92
 	monbg 3
 	setalpha 12, 8
 	playsewithpan SE_W233B, 63
-	createsprite gUnknown_83E6710, ANIM_TARGET, 3, 0, 0, 20, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1
 	delay 1
@@ -6726,17 +6726,17 @@ Move_COUNTER:: @ 81D005A
 	playsewithpan SE_W233B, 63
 	delay 1
 	createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 25, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, 1, 0
 	playsewithpan SE_W233B, 63
 	delay 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, 1, 0
 	playsewithpan SE_W233B, 63
 	delay 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0
 	delay 5
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
 	waitforvisualfinish
@@ -6775,7 +6775,7 @@ Move_ROCK_SMASH:: @ 81D01A4
 	setalpha 12, 8
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
-	createsprite gUnknown_83E6710, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0
 	playsewithpan SE_W233B, 63
 	createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 5, 1
 	waitforvisualfinish
@@ -7050,7 +7050,7 @@ gUnknown_81D086C:: @ 81D086C
 Move_HAZE:: @ 81D0882
 	waitforvisualfinish
 	playsewithpan SE_W114, 0
-	createvisualtask sub_80AFAE4, 5, 
+	createvisualtask AnimTask_Haze1, 5, 
 	delay 30
 	createvisualtask sub_80BA7F8, 10, 1920, 2, 0, 16, 0
 	delay 90
@@ -7070,7 +7070,7 @@ Move_FIRE_PUNCH:: @ 81D08B5
 	createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 196
 	playsewithpan SE_W172, 63
 	waitforvisualfinish
-	createsprite gUnknown_83E6710, ANIM_TARGET, 3, 0, 0, 8, 1, 0
+	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 1
 	createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 15, 1
 	call gUnknown_81D0950
@@ -9935,7 +9935,7 @@ Move_MAGICAL_LEAF:: @ 81D4E6D
 Move_ICE_BALL:: @ 81D4F8E
 	loadspritegfx 10043
 	loadspritegfx 10141
-	createvisualtask sub_80B0870, 5, 0
+	createvisualtask AnimTask_GetRolloutCounter, 5, 0
 	jumpargeq 0, 4, gUnknown_81D5005
 
 gUnknown_81D4FA5:: @ 81D4FA5
@@ -9943,7 +9943,7 @@ gUnknown_81D4FA5:: @ 81D4FA5
 	createsprite gUnknown_83E665C, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40
 	delay 28
 	playsewithpan SE_W280, 63
-	createvisualtask sub_80B0870, 5, 0
+	createvisualtask AnimTask_GetRolloutCounter, 5, 0
 	jumpargeq 0, 0, gUnknown_81D5016
 	jumpargeq 0, 1, gUnknown_81D5045
 	jumpargeq 0, 2, gUnknown_81D507E
@@ -9951,7 +9951,7 @@ gUnknown_81D4FA5:: @ 81D4FA5
 	jumpargeq 0, 4, gUnknown_81D5109
 
 gUnknown_81D4FF3:: @ 81D4FF3
-	createvisualtask sub_80B0870, 5, 0
+	createvisualtask AnimTask_GetRolloutCounter, 5, 0
 	jumpargeq 0, 4, gUnknown_81D500C
 
 gUnknown_81D5004:: @ 81D5004
@@ -10272,88 +10272,88 @@ gUnknown_81D5712:: @ 81D5712
 	return
 
 gUnknown_81D575B:: @ 81D575B
-	createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 10, 10, 0
+	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0
 	playsewithpan SE_W092, 63
 	delay 6
-	createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 20, -20, 0
+	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0
 	playsewithpan SE_W092, 63
 	delay 6
-	createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, -20, 15, 0
+	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0
 	playsewithpan SE_W092, 63
 	delay 6
-	createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 0, 0, 0
+	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0
 	playsewithpan SE_W092, 63
 	delay 6
-	createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, -20, -20, 0
+	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0
 	playsewithpan SE_W092, 63
 	delay 6
-	createsprite gUnknown_83E6AB8, ANIM_TARGET, 2, 16, -8, 0
+	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0
 	playsewithpan SE_W092, 63
 	return
 
 gUnknown_81D57CC:: @ 81D57CC
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 10, 10, 0
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 20, -20, 0
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, 15, 0
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 0, 0, 0
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, -20, 0
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 16, -8, 0
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0
 	playsewithpan SE_W145C, 63
 	return
 
 gUnknown_81D583D:: @ 81D583D
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 10, 10, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -28, -10, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 20, -20, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, 15, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 0, 0, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 27, 8, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, -20, -20, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1
 	playsewithpan SE_W145C, 63
 	delay 6
-	createsprite gUnknown_83E6AD0, ANIM_ATTACKER, 2, 16, -8, 1
+	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1
 	playsewithpan SE_W145C, 63
 	return
 
 gUnknown_81D58D4:: @ 81D58D4
 	playsewithpan SE_W085B, 63
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, 5, 0, 5, 0
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, -5, 10, 5, 1
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, 15, 20, 5, 2
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, -15, -10, 5, 0
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, 25, 0, 5, 1
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, -8, 8, 5, 2
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, 2, -8, 5, 0
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0
 	delay 2
-	createsprite gUnknown_83E6088, ANIM_TARGET, 2, -20, 15, 5, 1
+	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1
 	return
 
 gUnknown_81D595F:: @ 81D595F
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index 82d507ea1..62a23c646 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -191,30 +191,6 @@ gUnknown_8478EC4:: @ 8478EC4
 gUnknown_8478F14:: @ 8478F14
 	.incbin "baserom.gba", 0x478F14, 0x8
 
-gUnknown_8478F1C:: @ 8478F1C
-	.incbin "baserom.gba", 0x478F1C, 0x144
-
-gUnknown_8479060:: @ 8479060
-	.incbin "baserom.gba", 0x479060, 0x78
-
-gUnknown_84790D8:: @ 84790D8
-	.incbin "baserom.gba", 0x4790D8, 0xC0
-
-gUnknown_8479198:: @ 8479198
-	.incbin "baserom.gba", 0x479198, 0x10
-
-gUnknown_84791A8:: @ 84791A8
-	.incbin "baserom.gba", 0x4791A8, 0x10
-
-gUnknown_84791B8:: @ 84791B8
-	.incbin "baserom.gba", 0x4791B8, 0x14
-
-gUnknown_84791CC:: @ 84791CC
-	.incbin "baserom.gba", 0x4791CC, 0x1C
-
-gUnknown_84791E8:: @ 84791E8
-	.incbin "baserom.gba", 0x4791E8, 0x18
-
 	.section .rodata.8479668
 
 	.align 2
diff --git a/data/field_weather.s b/data/field_weather.s
index 517480d9a..03b3e8faa 100644
--- a/data/field_weather.s
+++ b/data/field_weather.s
@@ -25,7 +25,7 @@ gUnknown_83C2D00:: @ 83C2D00
 gUnknown_83C2D20:: @ 83C2D20
 	.incbin "baserom.gba", 0x3C2D20, 0x820
 
-gUnknown_83C3540:: @ 83C3540
+gWeatherFog1Tiles:: @ 83C3540
 	.incbin "baserom.gba", 0x3C3540, 0x3080
 
 gUnknown_83C65C0:: @ 83C65C0
diff --git a/data/graphics.s b/data/graphics.s
index 7ead75c74..5eacc0cb2 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13760,7 +13760,7 @@ gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00
 	.incbin "graphics/battle_anims/sprites/277.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_fog_tilemap:: @ 8E7F1F4
+gBattleAnimFogTilemap:: @ 8E7F1F4
 	.incbin "graphics/battle_anims/backgrounds/fog.bin.lz"
 
 	.align 2