Rename objects

41 files changed, 712 insertions, 712 deletions

diff --git a/data/animations/object/cameraTarget.s b/data/animations/object/cameraTarget.s
new file mode 100644
index 00000000..c9a93269
--- /dev/null
+++ b/data/animations/object/cameraTarget.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_CameraTarget_0:: @ 0811F760
+	.include "animations/gSpriteAnimations_CameraTarget_0.s"
+
+gSpriteAnimations_CameraTarget_1:: @ 0811F795
+	.include "animations/gSpriteAnimations_CameraTarget_1.s"
+
+gSpriteAnimations_CameraTarget:: @ 0811F7CC
+	.4byte gSpriteAnimations_CameraTarget_0
+	.4byte gSpriteAnimations_CameraTarget_1
+	.4byte 00000000
diff --git a/data/animations/object/carlovObject.s b/data/animations/object/carlovObject.s
new file mode 100644
index 00000000..a258c91b
--- /dev/null
+++ b/data/animations/object/carlovObject.s
@@ -0,0 +1,20 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_CarlovObject_0:: @ 081213FC
+	.include "animations/gSpriteAnimations_CarlovObject_0.s"
+
+gSpriteAnimations_CarlovObject_1:: @ 0812140D
+	.include "animations/gSpriteAnimations_CarlovObject_1.s"
+
+gSpriteAnimations_CarlovObject_2:: @ 0812141E
+	.include "animations/gSpriteAnimations_CarlovObject_2.s"
+
+gSpriteAnimations_CarlovObject:: @ 08121430
+	.4byte gSpriteAnimations_CarlovObject_0
+	.4byte gSpriteAnimations_CarlovObject_1
+	.4byte gSpriteAnimations_CarlovObject_2
+	.4byte 00000000
diff --git a/data/animations/object/cutsceneMiscObject.s b/data/animations/object/cutsceneMiscObject.s
new file mode 100644
index 00000000..955ba27a
--- /dev/null
+++ b/data/animations/object/cutsceneMiscObject.s
@@ -0,0 +1,307 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+
+gSpriteAnimations_CutsceneMiscObject_10_0:: @ 08122B4C
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_10_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_10_1:: @ 08122B55
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_10_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_10:: @ 08122B64
+	.4byte gSpriteAnimations_CutsceneMiscObject_10_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_10_1
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_5_2:: @ 08122B70
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_2.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_3:: @ 08122B75
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_3.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_4:: @ 08122B7A
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_4.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_5:: @ 08122B7F
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_5.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_6:: @ 08122B84
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_6.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_7:: @ 08122B89
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_7.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_8:: @ 08122B8E
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_8.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_9:: @ 08122B93
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_9.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_0:: @ 08122B98
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_5_1:: @ 08122BB1
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_5_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_5:: @ 08122BC8
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_1
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_2
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_3
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_4
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_5
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_6
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_7
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_8
+	.4byte gSpriteAnimations_CutsceneMiscObject_5_9
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_9_0:: @ 08122BF4
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_9_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_9_2:: @ 08122BFD
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_9_2.s"
+
+gSpriteAnimations_CutsceneMiscObject_9_3:: @ 08122C06
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_9_3.s"
+
+gSpriteAnimations_CutsceneMiscObject_9_1:: @ 08122C0B
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_9_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_9_4:: @ 08122C74
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_9_4.s"
+
+gSpriteAnimations_CutsceneMiscObject_9_5:: @ 08122C89
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_9_5.s"
+
+gSpriteAnimations_CutsceneMiscObject_9:: @ 08122C90
+	.4byte gSpriteAnimations_CutsceneMiscObject_9_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_9_1
+	.4byte gSpriteAnimations_CutsceneMiscObject_9_2
+	.4byte gSpriteAnimations_CutsceneMiscObject_9_3
+	.4byte gSpriteAnimations_CutsceneMiscObject_9_4
+	.4byte gSpriteAnimations_CutsceneMiscObject_9_5
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_2_0:: @ 08122CAC
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_2_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_2_1:: @ 08122CB5
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_2_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_2:: @ 08122CBC
+	.4byte gSpriteAnimations_CutsceneMiscObject_2_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_2_1
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_0_0:: @ 08122CC8
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_0_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_0_1:: @ 08122CD1
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_0_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_0_2:: @ 08122CD6
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_0_2.s"
+
+gSpriteAnimations_CutsceneMiscObject_0_3:: @ 08122CDB
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_0_3.s"
+
+gSpriteAnimations_CutsceneMiscObject_0:: @ 08122CE4
+	.4byte gSpriteAnimations_CutsceneMiscObject_0_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_0_1
+	.4byte gSpriteAnimations_CutsceneMiscObject_0_2
+	.4byte gSpriteAnimations_CutsceneMiscObject_0_3
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_1_0:: @ 08122CF8
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_1_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_1_1:: @ 08122CFD
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_1_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_1:: @ 08122D04
+	.4byte gSpriteAnimations_CutsceneMiscObject_1_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_1_1
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_6_0:: @ 08122D10
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_1:: @ 08122D19
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_2:: @ 08122D22
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_2.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_3:: @ 08122D2B
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_3.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_4:: @ 08122D34
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_4.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_5:: @ 08122D55
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_5.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_6:: @ 08122D76
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_6.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_7:: @ 08122D97
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_7.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_8:: @ 08122DB8
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_8.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_9:: @ 08122DC5
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_9.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_10:: @ 08122DD2
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_10.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_11:: @ 08122DDF
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_11.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_12:: @ 08122DEC
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_12.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_13:: @ 08122E05
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_13.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_14:: @ 08122E1E
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_14.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_15:: @ 08122E37
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_15.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_16:: @ 08122E50
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_16.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_17:: @ 08122E65
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_17.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_18:: @ 08122E7A
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_18.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_19:: @ 08122E8F
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_19.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_20:: @ 08122EA4
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_20.s"
+
+gSpriteAnimations_CutsceneMiscObject_6_21:: @ 08122EAD
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_6_21.s"
+
+gSpriteAnimations_CutsceneMiscObject_6:: @ 08122ED0
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_1
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_2
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_3
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_4
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_5
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_6
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_7
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_8
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_9
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_10
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_11
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_12
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_13
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_14
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_15
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_16
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_17
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_18
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_19
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_20
+	.4byte gSpriteAnimations_CutsceneMiscObject_6_21
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_3_0:: @ 08122F2C
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_1:: @ 08122F31
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_2:: @ 08122F52
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_2.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_3:: @ 08122F57
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_3.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_4:: @ 08122F78
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_4.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_5:: @ 08122F7D
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_5.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_6:: @ 08122F9E
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_6.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_7:: @ 08122FA3
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_7.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_8:: @ 08122FC4
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_8.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_9:: @ 08122FC9
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_9.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_10:: @ 08122FCE
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_10.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_11:: @ 08122FD3
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_11.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_12:: @ 0812302C
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_12.s"
+
+gSpriteAnimations_CutsceneMiscObject_3_13:: @ 08123059
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_3_13.s"
+
+gSpriteAnimations_CutsceneMiscObject_3:: @ 0812308C
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_1
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_2
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_3
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_4
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_5
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_6
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_7
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_8
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_9
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_10
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_11
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_12
+	.4byte gSpriteAnimations_CutsceneMiscObject_3_13
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_4_0:: @ 081230C8
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_4_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_4:: @ 0812311C
+	.4byte gSpriteAnimations_CutsceneMiscObject_4_0
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_4.s"
+
+gSpriteAnimations_CutsceneMiscObject_7_0:: @ 08123124
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_7_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_7_2:: @ 08123129
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_7_2.s"
+
+gSpriteAnimations_CutsceneMiscObject_7_1:: @ 0812312E
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_7_1.s"
+
+gSpriteAnimations_CutsceneMiscObject_7:: @ 08123140
+	.4byte gSpriteAnimations_CutsceneMiscObject_7_0
+	.4byte gSpriteAnimations_CutsceneMiscObject_7_1
+	.4byte gSpriteAnimations_CutsceneMiscObject_7_2
+	.4byte 00000000
+
+gSpriteAnimations_CutsceneMiscObject_8_0:: @ 08123150
+	.include "animations/gSpriteAnimations_CutsceneMiscObject_8_0.s"
+
+gSpriteAnimations_CutsceneMiscObject_8:: @ 08123160
+	.4byte gSpriteAnimations_CutsceneMiscObject_8_0
+	.4byte 00000000
diff --git a/data/animations/object/fanWind.s b/data/animations/object/fanWind.s
new file mode 100644
index 00000000..3e86312b
--- /dev/null
+++ b/data/animations/object/fanWind.s
@@ -0,0 +1,24 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_FanWind_0:: @ 081249B8
+	.include "animations/gSpriteAnimations_FanWind_0.s"
+
+gSpriteAnimations_FanWind_1:: @ 081249C9
+	.include "animations/gSpriteAnimations_FanWind_1.s"
+
+gSpriteAnimations_FanWind_2:: @ 081249DA
+	.include "animations/gSpriteAnimations_FanWind_2.s"
+
+gSpriteAnimations_FanWind_3:: @ 081249EB
+	.include "animations/gSpriteAnimations_FanWind_3.s"
+
+gSpriteAnimations_FanWind:: @ 081249FC
+	.4byte gSpriteAnimations_FanWind_0
+	.4byte gSpriteAnimations_FanWind_1
+	.4byte gSpriteAnimations_FanWind_2
+	.4byte gSpriteAnimations_FanWind_3
+	.4byte 00000000
diff --git a/data/animations/object/flame.s b/data/animations/object/flame.s
new file mode 100644
index 00000000..d1165b5f
--- /dev/null
+++ b/data/animations/object/flame.s
@@ -0,0 +1,12 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Flame_0:: @ 08120DD8
+	.include "animations/gSpriteAnimations_Flame_0.s"
+
+gSpriteAnimations_Flame:: @ 08120DEC
+	.4byte gSpriteAnimations_Flame_0
+	.4byte 00000000
diff --git a/data/animations/object/gentariCurtains.s b/data/animations/object/gentariCurtain.s
index 92306139..92306139 100644
--- a/data/animations/object/gentariCurtains.s
+++ b/data/animations/object/gentariCurtain.s
diff --git a/data/animations/object/guruguruBar.s b/data/animations/object/guruguruBar.s
new file mode 100644
index 00000000..3301157f
--- /dev/null
+++ b/data/animations/object/guruguruBar.s
@@ -0,0 +1,24 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_GuruguruBar_0:: @ 08124194
+	.include "animations/gSpriteAnimations_GuruguruBar_0.s"
+
+gSpriteAnimations_GuruguruBar_1:: @ 081241DC
+	.include "animations/gSpriteAnimations_GuruguruBar_1.s"
+
+gSpriteAnimations_GuruguruBar_2:: @ 08124224
+	.include "animations/gSpriteAnimations_GuruguruBar_2.s"
+
+gSpriteAnimations_GuruguruBar_3:: @ 0812426C
+	.include "animations/gSpriteAnimations_GuruguruBar_3.s"
+
+gSpriteAnimations_GuruguruBar:: @ 081242B4
+	.4byte gSpriteAnimations_GuruguruBar_0
+	.4byte gSpriteAnimations_GuruguruBar_1
+	.4byte gSpriteAnimations_GuruguruBar_2
+	.4byte gSpriteAnimations_GuruguruBar_3
+	.4byte 00000000
diff --git a/data/animations/object/japaneseSubtitle.s b/data/animations/object/japaneseSubtitle.s
new file mode 100644
index 00000000..536b5180
--- /dev/null
+++ b/data/animations/object/japaneseSubtitle.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_JapaneseSubtitle_0:: @ 08124B38
+	.include "animations/gSpriteAnimations_JapaneseSubtitle_0.s"
+
+gSpriteAnimations_JapaneseSubtitle_1:: @ 08124BA9
+	.include "animations/gSpriteAnimations_JapaneseSubtitle_1.s"
+
+gSpriteAnimations_JapaneseSubtitle:: @ 08124BFC
+	.4byte gSpriteAnimations_JapaneseSubtitle_0
+	.4byte gSpriteAnimations_JapaneseSubtitle_1
+	.4byte 00000000
diff --git a/data/animations/object/kinstoneSpark.s b/data/animations/object/kinstoneSpark.s
new file mode 100644
index 00000000..04a014cf
--- /dev/null
+++ b/data/animations/object/kinstoneSpark.s
@@ -0,0 +1,31 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_KinstoneSpark_0:: @ 08124A2C
+	.include "animations/gSpriteAnimations_KinstoneSpark_0.s"
+
+gSpriteAnimations_KinstoneSpark_1:: @ 08124A7D
+	.include "animations/gSpriteAnimations_KinstoneSpark_1.s"
+
+gSpriteAnimations_KinstoneSpark_2:: @ 08124A82
+	.include "animations/gSpriteAnimations_KinstoneSpark_2.s"
+
+gSpriteAnimations_KinstoneSpark_3:: @ 08124A87
+	.include "animations/gSpriteAnimations_KinstoneSpark_3.s"
+
+gSpriteAnimations_KinstoneSpark_4:: @ 08124A8C
+	.include "animations/gSpriteAnimations_KinstoneSpark_4.s"
+
+gSpriteAnimations_KinstoneSpark_5:: @ 08124AAD
+	.include "animations/gSpriteAnimations_KinstoneSpark_5.s"
+
+gSpriteAnimations_KinstoneSpark:: @ 08124AF8
+	.4byte gSpriteAnimations_KinstoneSpark_0
+	.4byte gSpriteAnimations_KinstoneSpark_1
+	.4byte gSpriteAnimations_KinstoneSpark_2
+	.4byte gSpriteAnimations_KinstoneSpark_3
+	.4byte gSpriteAnimations_KinstoneSpark_4
+	.4byte gSpriteAnimations_KinstoneSpark_5
diff --git a/data/animations/object/lampParticle.s b/data/animations/object/lampParticle.s
new file mode 100644
index 00000000..25dc120e
--- /dev/null
+++ b/data/animations/object/lampParticle.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_LampParticle_0:: @ 08121BE0
+	.include "animations/gSpriteAnimations_LampParticle_0.s"
+
+gSpriteAnimations_LampParticle_1:: @ 08121BF8
+	.include "animations/gSpriteAnimations_LampParticle_1.s"
+
+gSpriteAnimations_LampParticle:: @ 08121C34
+	.4byte gSpriteAnimations_LampParticle_0
+	.4byte gSpriteAnimations_LampParticle_1
+	.4byte 00000000
diff --git a/data/animations/object/moleMittsParticle.s b/data/animations/object/moleMittsParticle.s
new file mode 100644
index 00000000..242d696a
--- /dev/null
+++ b/data/animations/object/moleMittsParticle.s
@@ -0,0 +1,35 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_MoleMittsParticle_2:: @ 081208C8
+	.include "animations/gSpriteAnimations_MoleMittsParticle_2.s"
+
+gSpriteAnimations_MoleMittsParticle_1:: @ 081208FC
+	.include "animations/gSpriteAnimations_MoleMittsParticle_1.s"
+
+gSpriteAnimations_MoleMittsParticle_0:: @ 08120930
+	.include "animations/gSpriteAnimations_MoleMittsParticle_0.s"
+
+gSpriteAnimations_MoleMittsParticle_6:: @ 08120964
+	.include "animations/gSpriteAnimations_MoleMittsParticle_6.s"
+
+gSpriteAnimations_MoleMittsParticle_5:: @ 08120990
+	.include "animations/gSpriteAnimations_MoleMittsParticle_5.s"
+
+gSpriteAnimations_MoleMittsParticle_4:: @ 081209BC
+	.include "animations/gSpriteAnimations_MoleMittsParticle_4.s"
+
+gSpriteAnimations_MoleMittsParticle:: @ 081209E8
+	.4byte gSpriteAnimations_MoleMittsParticle_0
+	.4byte gSpriteAnimations_MoleMittsParticle_1
+	.4byte gSpriteAnimations_MoleMittsParticle_2
+	.4byte gSpriteAnimations_MoleMittsParticle_1
+	.4byte gSpriteAnimations_MoleMittsParticle_4
+	.4byte gSpriteAnimations_MoleMittsParticle_5
+	.4byte gSpriteAnimations_MoleMittsParticle_6
+	.4byte gSpriteAnimations_MoleMittsParticle_5
+	.4byte 00000000
+
diff --git a/data/animations/object/object1E.s b/data/animations/object/object1E.s
deleted file mode 100644
index 5835e534..00000000
--- a/data/animations/object/object1E.s
+++ /dev/null
@@ -1,35 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object1E_2:: @ 081208C8
-	.include "animations/gSpriteAnimations_Object1E_2.s"
-
-gSpriteAnimations_Object1E_1:: @ 081208FC
-	.include "animations/gSpriteAnimations_Object1E_1.s"
-
-gSpriteAnimations_Object1E_0:: @ 08120930
-	.include "animations/gSpriteAnimations_Object1E_0.s"
-
-gSpriteAnimations_Object1E_6:: @ 08120964
-	.include "animations/gSpriteAnimations_Object1E_6.s"
-
-gSpriteAnimations_Object1E_5:: @ 08120990
-	.include "animations/gSpriteAnimations_Object1E_5.s"
-
-gSpriteAnimations_Object1E_4:: @ 081209BC
-	.include "animations/gSpriteAnimations_Object1E_4.s"
-
-gSpriteAnimations_Object1E:: @ 081209E8
-	.4byte gSpriteAnimations_Object1E_0
-	.4byte gSpriteAnimations_Object1E_1
-	.4byte gSpriteAnimations_Object1E_2
-	.4byte gSpriteAnimations_Object1E_1
-	.4byte gSpriteAnimations_Object1E_4
-	.4byte gSpriteAnimations_Object1E_5
-	.4byte gSpriteAnimations_Object1E_6
-	.4byte gSpriteAnimations_Object1E_5
-	.4byte 00000000
-
diff --git a/data/animations/object/object2A.s b/data/animations/object/object2A.s
deleted file mode 100644
index 5a624078..00000000
--- a/data/animations/object/object2A.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object2A_0:: @ 08120DD8
-	.include "animations/gSpriteAnimations_Object2A_0.s"
-
-gSpriteAnimations_Object2A:: @ 08120DEC
-	.4byte gSpriteAnimations_Object2A_0
-	.4byte 00000000
diff --git a/data/animations/object/object35.s b/data/animations/object/object35.s
deleted file mode 100644
index 0152bc3b..00000000
--- a/data/animations/object/object35.s
+++ /dev/null
@@ -1,20 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object35_0:: @ 081213FC
-	.include "animations/gSpriteAnimations_Object35_0.s"
-
-gSpriteAnimations_Object35_1:: @ 0812140D
-	.include "animations/gSpriteAnimations_Object35_1.s"
-
-gSpriteAnimations_Object35_2:: @ 0812141E
-	.include "animations/gSpriteAnimations_Object35_2.s"
-
-gSpriteAnimations_Object35:: @ 08121430
-	.4byte gSpriteAnimations_Object35_0
-	.4byte gSpriteAnimations_Object35_1
-	.4byte gSpriteAnimations_Object35_2
-	.4byte 00000000
diff --git a/data/animations/object/object43.s b/data/animations/object/object43.s
deleted file mode 100644
index 77b7c1b8..00000000
--- a/data/animations/object/object43.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object43_0:: @ 081217E0
-	.include "animations/gSpriteAnimations_Object43_0.s"
-
-gSpriteAnimations_Object43_1:: @ 08121864
-	.include "animations/gSpriteAnimations_Object43_1.s"
-
-gSpriteAnimations_Object43_2:: @ 081218E8
-	.include "animations/gSpriteAnimations_Object43_2.s"
-
-gSpriteAnimations_Object43_3:: @ 0812196C
-	.include "animations/gSpriteAnimations_Object43_3.s"
-
-gSpriteAnimations_Object43_4:: @ 081219F0
-	.include "animations/gSpriteAnimations_Object43_4.s"
-
-gSpriteAnimations_Object43_5:: @ 08121A2D
-	.include "animations/gSpriteAnimations_Object43_5.s"
-
-gSpriteAnimations_Object43_6:: @ 08121A6A
-	.include "animations/gSpriteAnimations_Object43_6.s"
-
-gSpriteAnimations_Object43_7:: @ 08121AA7
-	.include "animations/gSpriteAnimations_Object43_7.s"
-
-gSpriteAnimations_Object43_8:: @ 08121AE4
-	.include "animations/gSpriteAnimations_Object43_8.s"
-
-gSpriteAnimations_Object43_9:: @ 08121AF4
-	.include "animations/gSpriteAnimations_Object43_9.s"
-
-gSpriteAnimations_Object43_10:: @ 08121B04
-	.include "animations/gSpriteAnimations_Object43_10.s"
-
-gSpriteAnimations_Object43_11:: @ 08121B14
-	.include "animations/gSpriteAnimations_Object43_11.s"
-
-gSpriteAnimations_Object43_12:: @ 08121B24
-	.include "animations/gSpriteAnimations_Object43_12.s"
-
-gSpriteAnimations_Object43:: @ 08121B48
-	.4byte gSpriteAnimations_Object43_0
-	.4byte gSpriteAnimations_Object43_1
-	.4byte gSpriteAnimations_Object43_2
-	.4byte gSpriteAnimations_Object43_3
-	.4byte gSpriteAnimations_Object43_4
-	.4byte gSpriteAnimations_Object43_5
-	.4byte gSpriteAnimations_Object43_6
-	.4byte gSpriteAnimations_Object43_7
-	.4byte gSpriteAnimations_Object43_8
-	.4byte gSpriteAnimations_Object43_9
-	.4byte gSpriteAnimations_Object43_10
-	.4byte gSpriteAnimations_Object43_11
-	.4byte gSpriteAnimations_Object43_12
-	.4byte gSpriteAnimations_Object43_12
-	.4byte gSpriteAnimations_Object43_12
-	.4byte gSpriteAnimations_Object43_12
-	.4byte 00000000
diff --git a/data/animations/object/object44.s b/data/animations/object/object44.s
deleted file mode 100644
index 426b9270..00000000
--- a/data/animations/object/object44.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object44_0:: @ 08121B94
-	.include "animations/gSpriteAnimations_Object44_0.s"
-
-gSpriteAnimations_Object44:: @ 08121BD0
-	.4byte gSpriteAnimations_Object44_0
-	.4byte 00000000
diff --git a/data/animations/object/object45.s b/data/animations/object/object45.s
deleted file mode 100644
index fd8892f7..00000000
--- a/data/animations/object/object45.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object45_0:: @ 08121BE0
-	.include "animations/gSpriteAnimations_Object45_0.s"
-
-gSpriteAnimations_Object45_1:: @ 08121BF8
-	.include "animations/gSpriteAnimations_Object45_1.s"
-
-gSpriteAnimations_Object45:: @ 08121C34
-	.4byte gSpriteAnimations_Object45_0
-	.4byte gSpriteAnimations_Object45_1
-	.4byte 00000000
diff --git a/data/animations/object/object64.s b/data/animations/object/object64.s
deleted file mode 100644
index bdba6f08..00000000
--- a/data/animations/object/object64.s
+++ /dev/null
@@ -1,20 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object64_0:: @ 0812296C
-	.include "animations/gSpriteAnimations_Object64_0.s"
-
-gSpriteAnimations_Object64_1:: @ 0812297C
-	.include "animations/gSpriteAnimations_Object64_1.s"
-
-gSpriteAnimations_Object64_2:: @ 08122988
-	.include "animations/gSpriteAnimations_Object64_2.s"
-
-gSpriteAnimations_Object64:: @ 081229A4
-	.4byte gSpriteAnimations_Object64_0
-	.4byte gSpriteAnimations_Object64_1
-	.4byte gSpriteAnimations_Object64_2
-	.4byte 00000000
diff --git a/data/animations/object/object6A.s b/data/animations/object/object6A.s
deleted file mode 100644
index 30e01553..00000000
--- a/data/animations/object/object6A.s
+++ /dev/null
@@ -1,307 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-
-gSpriteAnimations_Object6A_10_0:: @ 08122B4C
-	.include "animations/gSpriteAnimations_Object6A_10_0.s"
-
-gSpriteAnimations_Object6A_10_1:: @ 08122B55
-	.include "animations/gSpriteAnimations_Object6A_10_1.s"
-
-gSpriteAnimations_Object6A_10:: @ 08122B64
-	.4byte gSpriteAnimations_Object6A_10_0
-	.4byte gSpriteAnimations_Object6A_10_1
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_5_2:: @ 08122B70
-	.include "animations/gSpriteAnimations_Object6A_5_2.s"
-
-gSpriteAnimations_Object6A_5_3:: @ 08122B75
-	.include "animations/gSpriteAnimations_Object6A_5_3.s"
-
-gSpriteAnimations_Object6A_5_4:: @ 08122B7A
-	.include "animations/gSpriteAnimations_Object6A_5_4.s"
-
-gSpriteAnimations_Object6A_5_5:: @ 08122B7F
-	.include "animations/gSpriteAnimations_Object6A_5_5.s"
-
-gSpriteAnimations_Object6A_5_6:: @ 08122B84
-	.include "animations/gSpriteAnimations_Object6A_5_6.s"
-
-gSpriteAnimations_Object6A_5_7:: @ 08122B89
-	.include "animations/gSpriteAnimations_Object6A_5_7.s"
-
-gSpriteAnimations_Object6A_5_8:: @ 08122B8E
-	.include "animations/gSpriteAnimations_Object6A_5_8.s"
-
-gSpriteAnimations_Object6A_5_9:: @ 08122B93
-	.include "animations/gSpriteAnimations_Object6A_5_9.s"
-
-gSpriteAnimations_Object6A_5_0:: @ 08122B98
-	.include "animations/gSpriteAnimations_Object6A_5_0.s"
-
-gSpriteAnimations_Object6A_5_1:: @ 08122BB1
-	.include "animations/gSpriteAnimations_Object6A_5_1.s"
-
-gSpriteAnimations_Object6A_5:: @ 08122BC8
-	.4byte gSpriteAnimations_Object6A_5_0
-	.4byte gSpriteAnimations_Object6A_5_1
-	.4byte gSpriteAnimations_Object6A_5_2
-	.4byte gSpriteAnimations_Object6A_5_3
-	.4byte gSpriteAnimations_Object6A_5_4
-	.4byte gSpriteAnimations_Object6A_5_5
-	.4byte gSpriteAnimations_Object6A_5_6
-	.4byte gSpriteAnimations_Object6A_5_7
-	.4byte gSpriteAnimations_Object6A_5_8
-	.4byte gSpriteAnimations_Object6A_5_9
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_9_0:: @ 08122BF4
-	.include "animations/gSpriteAnimations_Object6A_9_0.s"
-
-gSpriteAnimations_Object6A_9_2:: @ 08122BFD
-	.include "animations/gSpriteAnimations_Object6A_9_2.s"
-
-gSpriteAnimations_Object6A_9_3:: @ 08122C06
-	.include "animations/gSpriteAnimations_Object6A_9_3.s"
-
-gSpriteAnimations_Object6A_9_1:: @ 08122C0B
-	.include "animations/gSpriteAnimations_Object6A_9_1.s"
-
-gSpriteAnimations_Object6A_9_4:: @ 08122C74
-	.include "animations/gSpriteAnimations_Object6A_9_4.s"
-
-gSpriteAnimations_Object6A_9_5:: @ 08122C89
-	.include "animations/gSpriteAnimations_Object6A_9_5.s"
-
-gSpriteAnimations_Object6A_9:: @ 08122C90
-	.4byte gSpriteAnimations_Object6A_9_0
-	.4byte gSpriteAnimations_Object6A_9_1
-	.4byte gSpriteAnimations_Object6A_9_2
-	.4byte gSpriteAnimations_Object6A_9_3
-	.4byte gSpriteAnimations_Object6A_9_4
-	.4byte gSpriteAnimations_Object6A_9_5
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_2_0:: @ 08122CAC
-	.include "animations/gSpriteAnimations_Object6A_2_0.s"
-
-gSpriteAnimations_Object6A_2_1:: @ 08122CB5
-	.include "animations/gSpriteAnimations_Object6A_2_1.s"
-
-gSpriteAnimations_Object6A_2:: @ 08122CBC
-	.4byte gSpriteAnimations_Object6A_2_0
-	.4byte gSpriteAnimations_Object6A_2_1
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_0_0:: @ 08122CC8
-	.include "animations/gSpriteAnimations_Object6A_0_0.s"
-
-gSpriteAnimations_Object6A_0_1:: @ 08122CD1
-	.include "animations/gSpriteAnimations_Object6A_0_1.s"
-
-gSpriteAnimations_Object6A_0_2:: @ 08122CD6
-	.include "animations/gSpriteAnimations_Object6A_0_2.s"
-
-gSpriteAnimations_Object6A_0_3:: @ 08122CDB
-	.include "animations/gSpriteAnimations_Object6A_0_3.s"
-
-gSpriteAnimations_Object6A_0:: @ 08122CE4
-	.4byte gSpriteAnimations_Object6A_0_0
-	.4byte gSpriteAnimations_Object6A_0_1
-	.4byte gSpriteAnimations_Object6A_0_2
-	.4byte gSpriteAnimations_Object6A_0_3
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_1_0:: @ 08122CF8
-	.include "animations/gSpriteAnimations_Object6A_1_0.s"
-
-gSpriteAnimations_Object6A_1_1:: @ 08122CFD
-	.include "animations/gSpriteAnimations_Object6A_1_1.s"
-
-gSpriteAnimations_Object6A_1:: @ 08122D04
-	.4byte gSpriteAnimations_Object6A_1_0
-	.4byte gSpriteAnimations_Object6A_1_1
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_6_0:: @ 08122D10
-	.include "animations/gSpriteAnimations_Object6A_6_0.s"
-
-gSpriteAnimations_Object6A_6_1:: @ 08122D19
-	.include "animations/gSpriteAnimations_Object6A_6_1.s"
-
-gSpriteAnimations_Object6A_6_2:: @ 08122D22
-	.include "animations/gSpriteAnimations_Object6A_6_2.s"
-
-gSpriteAnimations_Object6A_6_3:: @ 08122D2B
-	.include "animations/gSpriteAnimations_Object6A_6_3.s"
-
-gSpriteAnimations_Object6A_6_4:: @ 08122D34
-	.include "animations/gSpriteAnimations_Object6A_6_4.s"
-
-gSpriteAnimations_Object6A_6_5:: @ 08122D55
-	.include "animations/gSpriteAnimations_Object6A_6_5.s"
-
-gSpriteAnimations_Object6A_6_6:: @ 08122D76
-	.include "animations/gSpriteAnimations_Object6A_6_6.s"
-
-gSpriteAnimations_Object6A_6_7:: @ 08122D97
-	.include "animations/gSpriteAnimations_Object6A_6_7.s"
-
-gSpriteAnimations_Object6A_6_8:: @ 08122DB8
-	.include "animations/gSpriteAnimations_Object6A_6_8.s"
-
-gSpriteAnimations_Object6A_6_9:: @ 08122DC5
-	.include "animations/gSpriteAnimations_Object6A_6_9.s"
-
-gSpriteAnimations_Object6A_6_10:: @ 08122DD2
-	.include "animations/gSpriteAnimations_Object6A_6_10.s"
-
-gSpriteAnimations_Object6A_6_11:: @ 08122DDF
-	.include "animations/gSpriteAnimations_Object6A_6_11.s"
-
-gSpriteAnimations_Object6A_6_12:: @ 08122DEC
-	.include "animations/gSpriteAnimations_Object6A_6_12.s"
-
-gSpriteAnimations_Object6A_6_13:: @ 08122E05
-	.include "animations/gSpriteAnimations_Object6A_6_13.s"
-
-gSpriteAnimations_Object6A_6_14:: @ 08122E1E
-	.include "animations/gSpriteAnimations_Object6A_6_14.s"
-
-gSpriteAnimations_Object6A_6_15:: @ 08122E37
-	.include "animations/gSpriteAnimations_Object6A_6_15.s"
-
-gSpriteAnimations_Object6A_6_16:: @ 08122E50
-	.include "animations/gSpriteAnimations_Object6A_6_16.s"
-
-gSpriteAnimations_Object6A_6_17:: @ 08122E65
-	.include "animations/gSpriteAnimations_Object6A_6_17.s"
-
-gSpriteAnimations_Object6A_6_18:: @ 08122E7A
-	.include "animations/gSpriteAnimations_Object6A_6_18.s"
-
-gSpriteAnimations_Object6A_6_19:: @ 08122E8F
-	.include "animations/gSpriteAnimations_Object6A_6_19.s"
-
-gSpriteAnimations_Object6A_6_20:: @ 08122EA4
-	.include "animations/gSpriteAnimations_Object6A_6_20.s"
-
-gSpriteAnimations_Object6A_6_21:: @ 08122EAD
-	.include "animations/gSpriteAnimations_Object6A_6_21.s"
-
-gSpriteAnimations_Object6A_6:: @ 08122ED0
-	.4byte gSpriteAnimations_Object6A_6_0
-	.4byte gSpriteAnimations_Object6A_6_1
-	.4byte gSpriteAnimations_Object6A_6_2
-	.4byte gSpriteAnimations_Object6A_6_3
-	.4byte gSpriteAnimations_Object6A_6_4
-	.4byte gSpriteAnimations_Object6A_6_5
-	.4byte gSpriteAnimations_Object6A_6_6
-	.4byte gSpriteAnimations_Object6A_6_7
-	.4byte gSpriteAnimations_Object6A_6_8
-	.4byte gSpriteAnimations_Object6A_6_9
-	.4byte gSpriteAnimations_Object6A_6_10
-	.4byte gSpriteAnimations_Object6A_6_11
-	.4byte gSpriteAnimations_Object6A_6_12
-	.4byte gSpriteAnimations_Object6A_6_13
-	.4byte gSpriteAnimations_Object6A_6_14
-	.4byte gSpriteAnimations_Object6A_6_15
-	.4byte gSpriteAnimations_Object6A_6_16
-	.4byte gSpriteAnimations_Object6A_6_17
-	.4byte gSpriteAnimations_Object6A_6_18
-	.4byte gSpriteAnimations_Object6A_6_19
-	.4byte gSpriteAnimations_Object6A_6_20
-	.4byte gSpriteAnimations_Object6A_6_21
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_3_0:: @ 08122F2C
-	.include "animations/gSpriteAnimations_Object6A_3_0.s"
-
-gSpriteAnimations_Object6A_3_1:: @ 08122F31
-	.include "animations/gSpriteAnimations_Object6A_3_1.s"
-
-gSpriteAnimations_Object6A_3_2:: @ 08122F52
-	.include "animations/gSpriteAnimations_Object6A_3_2.s"
-
-gSpriteAnimations_Object6A_3_3:: @ 08122F57
-	.include "animations/gSpriteAnimations_Object6A_3_3.s"
-
-gSpriteAnimations_Object6A_3_4:: @ 08122F78
-	.include "animations/gSpriteAnimations_Object6A_3_4.s"
-
-gSpriteAnimations_Object6A_3_5:: @ 08122F7D
-	.include "animations/gSpriteAnimations_Object6A_3_5.s"
-
-gSpriteAnimations_Object6A_3_6:: @ 08122F9E
-	.include "animations/gSpriteAnimations_Object6A_3_6.s"
-
-gSpriteAnimations_Object6A_3_7:: @ 08122FA3
-	.include "animations/gSpriteAnimations_Object6A_3_7.s"
-
-gSpriteAnimations_Object6A_3_8:: @ 08122FC4
-	.include "animations/gSpriteAnimations_Object6A_3_8.s"
-
-gSpriteAnimations_Object6A_3_9:: @ 08122FC9
-	.include "animations/gSpriteAnimations_Object6A_3_9.s"
-
-gSpriteAnimations_Object6A_3_10:: @ 08122FCE
-	.include "animations/gSpriteAnimations_Object6A_3_10.s"
-
-gSpriteAnimations_Object6A_3_11:: @ 08122FD3
-	.include "animations/gSpriteAnimations_Object6A_3_11.s"
-
-gSpriteAnimations_Object6A_3_12:: @ 0812302C
-	.include "animations/gSpriteAnimations_Object6A_3_12.s"
-
-gSpriteAnimations_Object6A_3_13:: @ 08123059
-	.include "animations/gSpriteAnimations_Object6A_3_13.s"
-
-gSpriteAnimations_Object6A_3:: @ 0812308C
-	.4byte gSpriteAnimations_Object6A_3_0
-	.4byte gSpriteAnimations_Object6A_3_1
-	.4byte gSpriteAnimations_Object6A_3_2
-	.4byte gSpriteAnimations_Object6A_3_3
-	.4byte gSpriteAnimations_Object6A_3_4
-	.4byte gSpriteAnimations_Object6A_3_5
-	.4byte gSpriteAnimations_Object6A_3_6
-	.4byte gSpriteAnimations_Object6A_3_7
-	.4byte gSpriteAnimations_Object6A_3_8
-	.4byte gSpriteAnimations_Object6A_3_9
-	.4byte gSpriteAnimations_Object6A_3_10
-	.4byte gSpriteAnimations_Object6A_3_11
-	.4byte gSpriteAnimations_Object6A_3_12
-	.4byte gSpriteAnimations_Object6A_3_13
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_4_0:: @ 081230C8
-	.include "animations/gSpriteAnimations_Object6A_4_0.s"
-
-gSpriteAnimations_Object6A_4:: @ 0812311C
-	.4byte gSpriteAnimations_Object6A_4_0
-	.include "animations/gSpriteAnimations_Object6A_4.s"
-
-gSpriteAnimations_Object6A_7_0:: @ 08123124
-	.include "animations/gSpriteAnimations_Object6A_7_0.s"
-
-gSpriteAnimations_Object6A_7_2:: @ 08123129
-	.include "animations/gSpriteAnimations_Object6A_7_2.s"
-
-gSpriteAnimations_Object6A_7_1:: @ 0812312E
-	.include "animations/gSpriteAnimations_Object6A_7_1.s"
-
-gSpriteAnimations_Object6A_7:: @ 08123140
-	.4byte gSpriteAnimations_Object6A_7_0
-	.4byte gSpriteAnimations_Object6A_7_1
-	.4byte gSpriteAnimations_Object6A_7_2
-	.4byte 00000000
-
-gSpriteAnimations_Object6A_8_0:: @ 08123150
-	.include "animations/gSpriteAnimations_Object6A_8_0.s"
-
-gSpriteAnimations_Object6A_8:: @ 08123160
-	.4byte gSpriteAnimations_Object6A_8_0
-	.4byte 00000000
diff --git a/data/animations/object/object79.s b/data/animations/object/object79.s
deleted file mode 100644
index 6834dfbb..00000000
--- a/data/animations/object/object79.s
+++ /dev/null
@@ -1,20 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-@    .align 2
-
-gSpriteAnimations_Object79_0:: @ 08123422
-	.include "animations/gSpriteAnimations_Object79_0.s"
-
-gSpriteAnimations_Object79_1:: @ 0812343B
-	.include "animations/gSpriteAnimations_Object79_1.s"
-
-gSpriteAnimations_Object79_2:: @ 0812344C
-	.include "animations/gSpriteAnimations_Object79_2.s"
-
-gSpriteAnimations_Object79:: @ 08123474
-	.4byte gSpriteAnimations_Object79_0
-	.4byte gSpriteAnimations_Object79_1
-	.4byte gSpriteAnimations_Object79_2
-	.4byte 00000000
diff --git a/data/animations/object/object86.s b/data/animations/object/object86.s
deleted file mode 100644
index c1917491..00000000
--- a/data/animations/object/object86.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object86_0:: @ 0812380C
-	.include "animations/gSpriteAnimations_Object86_0.s"
-
-gSpriteAnimations_Object86_1:: @ 08123820
-	.include "animations/gSpriteAnimations_Object86_1.s"
-
-gSpriteAnimations_Object86:: @ 08123834
-	.4byte gSpriteAnimations_Object86_0
-	.4byte gSpriteAnimations_Object86_1
-	.4byte 00000000
diff --git a/data/animations/object/object9.s b/data/animations/object/object9.s
deleted file mode 100644
index b04dd46d..00000000
--- a/data/animations/object/object9.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object9_0:: @ 0811F760
-	.include "animations/gSpriteAnimations_Object9_0.s"
-
-gSpriteAnimations_Object9_1:: @ 0811F795
-	.include "animations/gSpriteAnimations_Object9_1.s"
-
-gSpriteAnimations_Object9:: @ 0811F7CC
-	.4byte gSpriteAnimations_Object9_0
-	.4byte gSpriteAnimations_Object9_1
-	.4byte 00000000
diff --git a/data/animations/object/object98.s b/data/animations/object/object98.s
deleted file mode 100644
index e406fb28..00000000
--- a/data/animations/object/object98.s
+++ /dev/null
@@ -1,24 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object98_0:: @ 08124194
-	.include "animations/gSpriteAnimations_Object98_0.s"
-
-gSpriteAnimations_Object98_1:: @ 081241DC
-	.include "animations/gSpriteAnimations_Object98_1.s"
-
-gSpriteAnimations_Object98_2:: @ 08124224
-	.include "animations/gSpriteAnimations_Object98_2.s"
-
-gSpriteAnimations_Object98_3:: @ 0812426C
-	.include "animations/gSpriteAnimations_Object98_3.s"
-
-gSpriteAnimations_Object98:: @ 081242B4
-	.4byte gSpriteAnimations_Object98_0
-	.4byte gSpriteAnimations_Object98_1
-	.4byte gSpriteAnimations_Object98_2
-	.4byte gSpriteAnimations_Object98_3
-	.4byte 00000000
diff --git a/data/animations/object/object9B.s b/data/animations/object/object9B.s
deleted file mode 100644
index d93e85d1..00000000
--- a/data/animations/object/object9B.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object9B_0:: @ 081242E8
-	.include "animations/gSpriteAnimations_Object9B_0.s"
-
-gSpriteAnimations_Object9B_1:: @ 08124320
-	.include "animations/gSpriteAnimations_Object9B_1.s"
-
-gSpriteAnimations_Object9B:: @ 08124348
-	.4byte gSpriteAnimations_Object9B_0
-	.4byte gSpriteAnimations_Object9B_1
-	.4byte 00000000
diff --git a/data/animations/object/objectA6.s b/data/animations/object/objectA6.s
deleted file mode 100644
index dc0fff24..00000000
--- a/data/animations/object/objectA6.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectA6_0:: @ 08124808
-	.include "animations/gSpriteAnimations_ObjectA6_0.s"
-
-gSpriteAnimations_ObjectA6:: @ 0812481C
-	.4byte gSpriteAnimations_ObjectA6_0
-	.4byte 00000000
diff --git a/data/animations/object/objectAB.s b/data/animations/object/objectAB.s
deleted file mode 100644
index aa5fede3..00000000
--- a/data/animations/object/objectAB.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectAB_0:: @ 08124878
-	.include "animations/gSpriteAnimations_ObjectAB_0.s"
-
-gSpriteAnimations_ObjectAB:: @ 08124890
-	.4byte gSpriteAnimations_ObjectAB_0
-	.4byte 00000000
diff --git a/data/animations/object/objectAF.s b/data/animations/object/objectAF.s
deleted file mode 100644
index 210b4646..00000000
--- a/data/animations/object/objectAF.s
+++ /dev/null
@@ -1,24 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectAF_0:: @ 081248D0
-	.include "animations/gSpriteAnimations_ObjectAF_0.s"
-
-gSpriteAnimations_ObjectAF_1:: @ 081248E1
-	.include "animations/gSpriteAnimations_ObjectAF_1.s"
-
-gSpriteAnimations_ObjectAF_2:: @ 081248F2
-	.include "animations/gSpriteAnimations_ObjectAF_2.s"
-
-gSpriteAnimations_ObjectAF_3:: @ 0812490E
-	.include "animations/gSpriteAnimations_ObjectAF_3.s"
-
-gSpriteAnimations_ObjectAF:: @ 08124928
-	.4byte gSpriteAnimations_ObjectAF_0
-	.4byte gSpriteAnimations_ObjectAF_1
-	.4byte gSpriteAnimations_ObjectAF_2
-	.4byte gSpriteAnimations_ObjectAF_3
-	.4byte 00000000
diff --git a/data/animations/object/objectB2.s b/data/animations/object/objectB2.s
deleted file mode 100644
index dff98079..00000000
--- a/data/animations/object/objectB2.s
+++ /dev/null
@@ -1,24 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectB2_0:: @ 081249B8
-	.include "animations/gSpriteAnimations_ObjectB2_0.s"
-
-gSpriteAnimations_ObjectB2_1:: @ 081249C9
-	.include "animations/gSpriteAnimations_ObjectB2_1.s"
-
-gSpriteAnimations_ObjectB2_2:: @ 081249DA
-	.include "animations/gSpriteAnimations_ObjectB2_2.s"
-
-gSpriteAnimations_ObjectB2_3:: @ 081249EB
-	.include "animations/gSpriteAnimations_ObjectB2_3.s"
-
-gSpriteAnimations_ObjectB2:: @ 081249FC
-	.4byte gSpriteAnimations_ObjectB2_0
-	.4byte gSpriteAnimations_ObjectB2_1
-	.4byte gSpriteAnimations_ObjectB2_2
-	.4byte gSpriteAnimations_ObjectB2_3
-	.4byte 00000000
diff --git a/data/animations/object/objectB3.s b/data/animations/object/objectB3.s
deleted file mode 100644
index d801d8dd..00000000
--- a/data/animations/object/objectB3.s
+++ /dev/null
@@ -1,31 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectB3_0:: @ 08124A2C
-	.include "animations/gSpriteAnimations_ObjectB3_0.s"
-
-gSpriteAnimations_ObjectB3_1:: @ 08124A7D
-	.include "animations/gSpriteAnimations_ObjectB3_1.s"
-
-gSpriteAnimations_ObjectB3_2:: @ 08124A82
-	.include "animations/gSpriteAnimations_ObjectB3_2.s"
-
-gSpriteAnimations_ObjectB3_3:: @ 08124A87
-	.include "animations/gSpriteAnimations_ObjectB3_3.s"
-
-gSpriteAnimations_ObjectB3_4:: @ 08124A8C
-	.include "animations/gSpriteAnimations_ObjectB3_4.s"
-
-gSpriteAnimations_ObjectB3_5:: @ 08124AAD
-	.include "animations/gSpriteAnimations_ObjectB3_5.s"
-
-gSpriteAnimations_ObjectB3:: @ 08124AF8
-	.4byte gSpriteAnimations_ObjectB3_0
-	.4byte gSpriteAnimations_ObjectB3_1
-	.4byte gSpriteAnimations_ObjectB3_2
-	.4byte gSpriteAnimations_ObjectB3_3
-	.4byte gSpriteAnimations_ObjectB3_4
-	.4byte gSpriteAnimations_ObjectB3_5
diff --git a/data/animations/object/objectB4.s b/data/animations/object/objectB4.s
deleted file mode 100644
index 90fd222a..00000000
--- a/data/animations/object/objectB4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectB4_0:: @ 08124B38
-	.include "animations/gSpriteAnimations_ObjectB4_0.s"
-
-gSpriteAnimations_ObjectB4_1:: @ 08124BA9
-	.include "animations/gSpriteAnimations_ObjectB4_1.s"
-
-gSpriteAnimations_ObjectB4:: @ 08124BFC
-	.4byte gSpriteAnimations_ObjectB4_0
-	.4byte gSpriteAnimations_ObjectB4_1
-	.4byte 00000000
diff --git a/data/animations/object/objectD.s b/data/animations/object/objectD.s
deleted file mode 100644
index 405f3940..00000000
--- a/data/animations/object/objectD.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectD_0:: @ 0811F918
-	.include "animations/gSpriteAnimations_ObjectD_0.s"
-
-gSpriteAnimations_ObjectD_1:: @ 0811F945
-	.include "animations/gSpriteAnimations_ObjectD_1.s"
-
-gSpriteAnimations_ObjectD:: @ 0811F954
-	.4byte gSpriteAnimations_ObjectD_0
-	.4byte gSpriteAnimations_ObjectD_1
-	.4byte 00000000
diff --git a/data/animations/object/rotatingTrapdoor.s b/data/animations/object/rotatingTrapdoor.s
new file mode 100644
index 00000000..a35f7166
--- /dev/null
+++ b/data/animations/object/rotatingTrapdoor.s
@@ -0,0 +1,12 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_RotatingTrapdoor_0:: @ 08121B94
+	.include "animations/gSpriteAnimations_RotatingTrapdoor_0.s"
+
+gSpriteAnimations_RotatingTrapdoor:: @ 08121BD0
+	.4byte gSpriteAnimations_RotatingTrapdoor_0
+	.4byte 00000000
diff --git a/data/animations/object/sanctuaryStoneTablet.s b/data/animations/object/sanctuaryStoneTablet.s
new file mode 100644
index 00000000..25bf9d98
--- /dev/null
+++ b/data/animations/object/sanctuaryStoneTablet.s
@@ -0,0 +1,12 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_SanctuaryStoneTablet_0:: @ 08124808
+	.include "animations/gSpriteAnimations_SanctuaryStoneTablet_0.s"
+
+gSpriteAnimations_SanctuaryStoneTablet:: @ 0812481C
+	.4byte gSpriteAnimations_SanctuaryStoneTablet_0
+	.4byte 00000000
diff --git a/data/animations/object/shrinkingHieroglyphs.s b/data/animations/object/shrinkingHieroglyphs.s
new file mode 100644
index 00000000..68843585
--- /dev/null
+++ b/data/animations/object/shrinkingHieroglyphs.s
@@ -0,0 +1,20 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+@    .align 2
+
+gSpriteAnimations_ShrinkingHieroglyphs_0:: @ 08123422
+	.include "animations/gSpriteAnimations_ShrinkingHieroglyphs_0.s"
+
+gSpriteAnimations_ShrinkingHieroglyphs_1:: @ 0812343B
+	.include "animations/gSpriteAnimations_ShrinkingHieroglyphs_1.s"
+
+gSpriteAnimations_ShrinkingHieroglyphs_2:: @ 0812344C
+	.include "animations/gSpriteAnimations_ShrinkingHieroglyphs_2.s"
+
+gSpriteAnimations_ShrinkingHieroglyphs:: @ 08123474
+	.4byte gSpriteAnimations_ShrinkingHieroglyphs_0
+	.4byte gSpriteAnimations_ShrinkingHieroglyphs_1
+	.4byte gSpriteAnimations_ShrinkingHieroglyphs_2
+	.4byte 00000000
diff --git a/data/animations/object/swordParticle.s b/data/animations/object/swordParticle.s
new file mode 100644
index 00000000..dfd009a3
--- /dev/null
+++ b/data/animations/object/swordParticle.s
@@ -0,0 +1,63 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_SwordParticle_0:: @ 081217E0
+	.include "animations/gSpriteAnimations_SwordParticle_0.s"
+
+gSpriteAnimations_SwordParticle_1:: @ 08121864
+	.include "animations/gSpriteAnimations_SwordParticle_1.s"
+
+gSpriteAnimations_SwordParticle_2:: @ 081218E8
+	.include "animations/gSpriteAnimations_SwordParticle_2.s"
+
+gSpriteAnimations_SwordParticle_3:: @ 0812196C
+	.include "animations/gSpriteAnimations_SwordParticle_3.s"
+
+gSpriteAnimations_SwordParticle_4:: @ 081219F0
+	.include "animations/gSpriteAnimations_SwordParticle_4.s"
+
+gSpriteAnimations_SwordParticle_5:: @ 08121A2D
+	.include "animations/gSpriteAnimations_SwordParticle_5.s"
+
+gSpriteAnimations_SwordParticle_6:: @ 08121A6A
+	.include "animations/gSpriteAnimations_SwordParticle_6.s"
+
+gSpriteAnimations_SwordParticle_7:: @ 08121AA7
+	.include "animations/gSpriteAnimations_SwordParticle_7.s"
+
+gSpriteAnimations_SwordParticle_8:: @ 08121AE4
+	.include "animations/gSpriteAnimations_SwordParticle_8.s"
+
+gSpriteAnimations_SwordParticle_9:: @ 08121AF4
+	.include "animations/gSpriteAnimations_SwordParticle_9.s"
+
+gSpriteAnimations_SwordParticle_10:: @ 08121B04
+	.include "animations/gSpriteAnimations_SwordParticle_10.s"
+
+gSpriteAnimations_SwordParticle_11:: @ 08121B14
+	.include "animations/gSpriteAnimations_SwordParticle_11.s"
+
+gSpriteAnimations_SwordParticle_12:: @ 08121B24
+	.include "animations/gSpriteAnimations_SwordParticle_12.s"
+
+gSpriteAnimations_SwordParticle:: @ 08121B48
+	.4byte gSpriteAnimations_SwordParticle_0
+	.4byte gSpriteAnimations_SwordParticle_1
+	.4byte gSpriteAnimations_SwordParticle_2
+	.4byte gSpriteAnimations_SwordParticle_3
+	.4byte gSpriteAnimations_SwordParticle_4
+	.4byte gSpriteAnimations_SwordParticle_5
+	.4byte gSpriteAnimations_SwordParticle_6
+	.4byte gSpriteAnimations_SwordParticle_7
+	.4byte gSpriteAnimations_SwordParticle_8
+	.4byte gSpriteAnimations_SwordParticle_9
+	.4byte gSpriteAnimations_SwordParticle_10
+	.4byte gSpriteAnimations_SwordParticle_11
+	.4byte gSpriteAnimations_SwordParticle_12
+	.4byte gSpriteAnimations_SwordParticle_12
+	.4byte gSpriteAnimations_SwordParticle_12
+	.4byte gSpriteAnimations_SwordParticle_12
+	.4byte 00000000
diff --git a/data/animations/object/thunderbold.s b/data/animations/object/thunderbold.s
new file mode 100644
index 00000000..e221b379
--- /dev/null
+++ b/data/animations/object/thunderbold.s
@@ -0,0 +1,20 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Thunderbold_0:: @ 0812296C
+	.include "animations/gSpriteAnimations_Thunderbold_0.s"
+
+gSpriteAnimations_Thunderbold_1:: @ 0812297C
+	.include "animations/gSpriteAnimations_Thunderbold_1.s"
+
+gSpriteAnimations_Thunderbold_2:: @ 08122988
+	.include "animations/gSpriteAnimations_Thunderbold_2.s"
+
+gSpriteAnimations_Thunderbold:: @ 081229A4
+	.4byte gSpriteAnimations_Thunderbold_0
+	.4byte gSpriteAnimations_Thunderbold_1
+	.4byte gSpriteAnimations_Thunderbold_2
+	.4byte 00000000
diff --git a/data/animations/object/trapdoor.s b/data/animations/object/trapdoor.s
new file mode 100644
index 00000000..81796baa
--- /dev/null
+++ b/data/animations/object/trapdoor.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Trapdoor_0:: @ 0812380C
+	.include "animations/gSpriteAnimations_Trapdoor_0.s"
+
+gSpriteAnimations_Trapdoor_1:: @ 08123820
+	.include "animations/gSpriteAnimations_Trapdoor_1.s"
+
+gSpriteAnimations_Trapdoor:: @ 08123834
+	.4byte gSpriteAnimations_Trapdoor_0
+	.4byte gSpriteAnimations_Trapdoor_1
+	.4byte 00000000
diff --git a/data/animations/object/unusedSkull.s b/data/animations/object/unusedSkull.s
new file mode 100644
index 00000000..6e17bffd
--- /dev/null
+++ b/data/animations/object/unusedSkull.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_UnusedSkull_0:: @ 0811F918
+	.include "animations/gSpriteAnimations_UnusedSkull_0.s"
+
+gSpriteAnimations_UnusedSkull_1:: @ 0811F945
+	.include "animations/gSpriteAnimations_UnusedSkull_1.s"
+
+gSpriteAnimations_UnusedSkull:: @ 0811F954
+	.4byte gSpriteAnimations_UnusedSkull_0
+	.4byte gSpriteAnimations_UnusedSkull_1
+	.4byte 00000000
diff --git a/data/animations/object/vaati1Portal.s b/data/animations/object/vaati1Portal.s
new file mode 100644
index 00000000..d03dea35
--- /dev/null
+++ b/data/animations/object/vaati1Portal.s
@@ -0,0 +1,12 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Vaati1Portal_0:: @ 08124878
+	.include "animations/gSpriteAnimations_Vaati1Portal_0.s"
+
+gSpriteAnimations_Vaati1Portal:: @ 08124890
+	.4byte gSpriteAnimations_Vaati1Portal_0
+	.4byte 00000000
diff --git a/data/animations/object/vaati2Particle.s b/data/animations/object/vaati2Particle.s
new file mode 100644
index 00000000..ad702a74
--- /dev/null
+++ b/data/animations/object/vaati2Particle.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Vaati2Particle_0:: @ 081242E8
+	.include "animations/gSpriteAnimations_Vaati2Particle_0.s"
+
+gSpriteAnimations_Vaati2Particle_1:: @ 08124320
+	.include "animations/gSpriteAnimations_Vaati2Particle_1.s"
+
+gSpriteAnimations_Vaati2Particle:: @ 08124348
+	.4byte gSpriteAnimations_Vaati2Particle_0
+	.4byte gSpriteAnimations_Vaati2Particle_1
+	.4byte 00000000
diff --git a/data/animations/object/vaati3Arm.s b/data/animations/object/vaati3Arm.s
new file mode 100644
index 00000000..27938bd2
--- /dev/null
+++ b/data/animations/object/vaati3Arm.s
@@ -0,0 +1,24 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Vaati3Arm_0:: @ 081248D0
+	.include "animations/gSpriteAnimations_Vaati3Arm_0.s"
+
+gSpriteAnimations_Vaati3Arm_1:: @ 081248E1
+	.include "animations/gSpriteAnimations_Vaati3Arm_1.s"
+
+gSpriteAnimations_Vaati3Arm_2:: @ 081248F2
+	.include "animations/gSpriteAnimations_Vaati3Arm_2.s"
+
+gSpriteAnimations_Vaati3Arm_3:: @ 0812490E
+	.include "animations/gSpriteAnimations_Vaati3Arm_3.s"
+
+gSpriteAnimations_Vaati3Arm:: @ 08124928
+	.4byte gSpriteAnimations_Vaati3Arm_0
+	.4byte gSpriteAnimations_Vaati3Arm_1
+	.4byte gSpriteAnimations_Vaati3Arm_2
+	.4byte gSpriteAnimations_Vaati3Arm_3
+	.4byte 00000000