identify more objects

26 files changed, 238 insertions, 238 deletions

diff --git a/data/animations/object/ambientClouds.s b/data/animations/object/ambientClouds.s
new file mode 100644
index 00000000..16463f0a
--- /dev/null
+++ b/data/animations/object/ambientClouds.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_AmbientClouds_0:: @ 08120DA0
+	.include "animations/gSpriteAnimations_AmbientClouds_0.s"
+
+gSpriteAnimations_AmbientClouds_1:: @ 08120DB1
+	.include "animations/gSpriteAnimations_AmbientClouds_1.s"
+
+gSpriteAnimations_AmbientClouds:: @ 08120DC4
+	.4byte gSpriteAnimations_AmbientClouds_0
+	.4byte gSpriteAnimations_AmbientClouds_1
+	.4byte 00000000
diff --git a/data/animations/object/angryStatue.s b/data/animations/object/angryStatue.s
new file mode 100644
index 00000000..8d1791bf
--- /dev/null
+++ b/data/animations/object/angryStatue.s
@@ -0,0 +1,34 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_AngryStatue_1:: @ 0812468C
+	.include "animations/gSpriteAnimations_AngryStatue_1.s"
+
+gSpriteAnimations_AngryStatue_0:: @ 08124690
+	.include "animations/gSpriteAnimations_AngryStatue_0.s"
+
+gSpriteAnimations_AngryStatue_3:: @ 08124694
+	.include "animations/gSpriteAnimations_AngryStatue_3.s"
+
+gSpriteAnimations_AngryStatue_5:: @ 08124698
+	.include "animations/gSpriteAnimations_AngryStatue_5.s"
+
+gSpriteAnimations_AngryStatue_4:: @ 081246A8
+	.include "animations/gSpriteAnimations_AngryStatue_4.s"
+
+gSpriteAnimations_AngryStatue_7:: @ 081246B8
+	.include "animations/gSpriteAnimations_AngryStatue_7.s"
+
+gSpriteAnimations_AngryStatue:: @ 081246C8
+	.4byte gSpriteAnimations_AngryStatue_0
+	.4byte gSpriteAnimations_AngryStatue_1
+	.4byte gSpriteAnimations_AngryStatue_0
+	.4byte gSpriteAnimations_AngryStatue_3
+	.4byte gSpriteAnimations_AngryStatue_4
+	.4byte gSpriteAnimations_AngryStatue_5
+	.4byte gSpriteAnimations_AngryStatue_4
+	.4byte gSpriteAnimations_AngryStatue_7
+	.4byte 00000000
diff --git a/data/animations/object/objectBA.s b/data/animations/object/gyorgBossObject.s
index 4489eee6..3dc36b66 100644
--- a/data/animations/object/objectBA.s
+++ b/data/animations/object/gyorgBossObject.s
@@ -5,28 +5,28 @@
     .align 2
 
 gUnk_08124F08:: @ 08124F08
-	.incbin "objectBA/gUnk_08124F08.bin"
+	.incbin "gyorgBossObject/gUnk_08124F08.bin"
 
 gUnk_08124F28:: @ 08124F28
-	.incbin "objectBA/gUnk_08124F28.bin"
+	.incbin "gyorgBossObject/gUnk_08124F28.bin"
 
 gUnk_08124F48:: @ 08124F48
-	.incbin "objectBA/gUnk_08124F48.bin"
+	.incbin "gyorgBossObject/gUnk_08124F48.bin"
 
 gUnk_08124F68:: @ 08124F68
-	.incbin "objectBA/gUnk_08124F68.bin"
+	.incbin "gyorgBossObject/gUnk_08124F68.bin"
 
 gUnk_08124F88:: @ 08124F88
-	.incbin "objectBA/gUnk_08124F88.bin"
+	.incbin "gyorgBossObject/gUnk_08124F88.bin"
 
 gUnk_08124FA8:: @ 08124FA8
-	.incbin "objectBA/gUnk_08124FA8.bin"
+	.incbin "gyorgBossObject/gUnk_08124FA8.bin"
 
 gUnk_08124FC8:: @ 08124FC8
-	.incbin "objectBA/gUnk_08124FC8.bin"
+	.incbin "gyorgBossObject/gUnk_08124FC8.bin"
 
 gUnk_08124FDC:: @ 08124FDC
-	.incbin "objectBA/gUnk_08124FDC.bin"
+	.incbin "gyorgBossObject/gUnk_08124FDC.bin"
 
 gUnk_08124FF0:: @ 08124FF0
 	.4byte gUnk_08124F08
diff --git a/data/animations/object/lamp.s b/data/animations/object/lamp.s
new file mode 100644
index 00000000..4fbfe695
--- /dev/null
+++ b/data/animations/object/lamp.s
@@ -0,0 +1,23 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gUnk_08123E80:: @ 08123E80
+	.4byte sub_0809CEA8
+	.4byte sub_0809CEC0
+
+gSpriteAnimations_Lamp_0_0:: @ 08123E88
+	.include "animations/gSpriteAnimations_Lamp_0_0.s"
+
+gSpriteAnimations_Lamp_0:: @ 08123E9C
+	.4byte gSpriteAnimations_Lamp_0_0
+	.include "animations/gSpriteAnimations_Lamp_0.s"
+
+gSpriteAnimations_Lamp_1_0:: @ 08123EA4
+	.include "animations/gSpriteAnimations_Lamp_1_0.s"
+
+gSpriteAnimations_Lamp_1:: @ 08123EB8
+	.4byte gSpriteAnimations_Lamp_1_0
+	.include "animations/gSpriteAnimations_Lamp_1.s"
diff --git a/data/animations/object/minishEmoticon.s b/data/animations/object/minishEmoticon.s
new file mode 100644
index 00000000..6ff92722
--- /dev/null
+++ b/data/animations/object/minishEmoticon.s
@@ -0,0 +1,112 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_MinishEmoticon_2:: @ 0811EE64
+	.include "animations/gSpriteAnimations_MinishEmoticon_2.s"
+
+gSpriteAnimations_MinishEmoticon_10:: @ 0811EE8D
+	.include "animations/gSpriteAnimations_MinishEmoticon_10.s"
+
+gSpriteAnimations_MinishEmoticon_3:: @ 0811EE91
+	.include "animations/gSpriteAnimations_MinishEmoticon_3.s"
+
+gSpriteAnimations_MinishEmoticon_11:: @ 0811EEBA
+	.include "animations/gSpriteAnimations_MinishEmoticon_11.s"
+
+gSpriteAnimations_MinishEmoticon_0:: @ 0811EEBE
+	.include "animations/gSpriteAnimations_MinishEmoticon_0.s"
+
+gSpriteAnimations_MinishEmoticon_8:: @ 0811EEC3
+	.include "animations/gSpriteAnimations_MinishEmoticon_8.s"
+
+gSpriteAnimations_MinishEmoticon_1:: @ 0811EEC7
+	.include "animations/gSpriteAnimations_MinishEmoticon_1.s"
+
+gSpriteAnimations_MinishEmoticon_9:: @ 0811EEF0
+	.include "animations/gSpriteAnimations_MinishEmoticon_9.s"
+
+gSpriteAnimations_MinishEmoticon_12:: @ 0811EEF4
+	.include "animations/gSpriteAnimations_MinishEmoticon_12.s"
+
+gSpriteAnimations_MinishEmoticon_13:: @ 0811EEFD
+	.include "animations/gSpriteAnimations_MinishEmoticon_13.s"
+
+gSpriteAnimations_MinishEmoticon_14:: @ 0811EF06
+	.include "animations/gSpriteAnimations_MinishEmoticon_14.s"
+
+gSpriteAnimations_MinishEmoticon_19:: @ 0811EF0F
+	.include "animations/gSpriteAnimations_MinishEmoticon_19.s"
+
+gSpriteAnimations_MinishEmoticon_15:: @ 0811EF37
+	.include "animations/gSpriteAnimations_MinishEmoticon_15.s"
+
+gSpriteAnimations_MinishEmoticon_16:: @ 0811EF4F
+	.include "animations/gSpriteAnimations_MinishEmoticon_16.s"
+
+gSpriteAnimations_MinishEmoticon_17:: @ 0811EF67
+	.include "animations/gSpriteAnimations_MinishEmoticon_17.s"
+
+gSpriteAnimations_MinishEmoticon_18:: @ 0811EF7F
+	.include "animations/gSpriteAnimations_MinishEmoticon_18.s"
+
+gSpriteAnimations_MinishEmoticon_22:: @ 0811EF97
+	.include "animations/gSpriteAnimations_MinishEmoticon_22.s"
+
+gSpriteAnimations_MinishEmoticon_23:: @ 0811EFA0
+	.include "animations/gSpriteAnimations_MinishEmoticon_23.s"
+
+gSpriteAnimations_MinishEmoticon_20:: @ 0811EFA9
+	.include "animations/gSpriteAnimations_MinishEmoticon_20.s"
+
+gSpriteAnimations_MinishEmoticon_21:: @ 0811EFB2
+	.include "animations/gSpriteAnimations_MinishEmoticon_21.s"
+
+gSpriteAnimations_MinishEmoticon_24:: @ 0811EFBB
+	.include "animations/gSpriteAnimations_MinishEmoticon_24.s"
+
+gSpriteAnimations_MinishEmoticon_25:: @ 0811EFC4
+	.include "animations/gSpriteAnimations_MinishEmoticon_25.s"
+
+gSpriteAnimations_MinishEmoticon_26:: @ 0811EFD9
+	.include "animations/gSpriteAnimations_MinishEmoticon_26.s"
+
+gSpriteAnimations_MinishEmoticon_27:: @ 0811EFEE
+	.include "animations/gSpriteAnimations_MinishEmoticon_27.s"
+
+gSpriteAnimations_MinishEmoticon_28:: @ 0811F003
+	.include "animations/gSpriteAnimations_MinishEmoticon_28.s"
+
+gSpriteAnimations_MinishEmoticon:: @ 0811F018
+	.4byte gSpriteAnimations_MinishEmoticon_0
+	.4byte gSpriteAnimations_MinishEmoticon_1
+	.4byte gSpriteAnimations_MinishEmoticon_2
+	.4byte gSpriteAnimations_MinishEmoticon_3
+	.4byte gSpriteAnimations_MinishEmoticon_0
+	.4byte gSpriteAnimations_MinishEmoticon_1
+	.4byte gSpriteAnimations_MinishEmoticon_2
+	.4byte gSpriteAnimations_MinishEmoticon_3
+	.4byte gSpriteAnimations_MinishEmoticon_8
+	.4byte gSpriteAnimations_MinishEmoticon_9
+	.4byte gSpriteAnimations_MinishEmoticon_10
+	.4byte gSpriteAnimations_MinishEmoticon_11
+	.4byte gSpriteAnimations_MinishEmoticon_12
+	.4byte gSpriteAnimations_MinishEmoticon_13
+	.4byte gSpriteAnimations_MinishEmoticon_14
+	.4byte gSpriteAnimations_MinishEmoticon_15
+	.4byte gSpriteAnimations_MinishEmoticon_16
+	.4byte gSpriteAnimations_MinishEmoticon_17
+	.4byte gSpriteAnimations_MinishEmoticon_18
+	.4byte gSpriteAnimations_MinishEmoticon_19
+	.4byte gSpriteAnimations_MinishEmoticon_20
+	.4byte gSpriteAnimations_MinishEmoticon_21
+	.4byte gSpriteAnimations_MinishEmoticon_22
+	.4byte gSpriteAnimations_MinishEmoticon_23
+	.4byte gSpriteAnimations_MinishEmoticon_24
+	.4byte gSpriteAnimations_MinishEmoticon_25
+	.4byte gSpriteAnimations_MinishEmoticon_26
+	.4byte gSpriteAnimations_MinishEmoticon_27
+	.4byte gSpriteAnimations_MinishEmoticon_28
+	.4byte 00000000
diff --git a/data/animations/object/object24.s b/data/animations/object/object24.s
deleted file mode 100644
index d3de774e..00000000
--- a/data/animations/object/object24.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-@    .align 2
-
-gSpriteAnimations_Object24_0:: @ 08120BF1
-	.include "animations/gSpriteAnimations_Object24_0.s"
-
-gSpriteAnimations_Object24_1:: @ 08120BF5
-	.include "animations/gSpriteAnimations_Object24_1.s"
-
-gSpriteAnimations_Object24_2:: @ 08120BF9
-	.include "animations/gSpriteAnimations_Object24_2.s"
-
-gSpriteAnimations_Object24_3:: @ 08120BFD
-	.include "animations/gSpriteAnimations_Object24_3.s"
-
-gSpriteAnimations_Object24_4:: @ 08120C01
-	.include "animations/gSpriteAnimations_Object24_4.s"
-
-gSpriteAnimations_Object24:: @ 08120C08
-	.4byte gSpriteAnimations_Object24_0
-	.4byte gSpriteAnimations_Object24_1
-	.4byte gSpriteAnimations_Object24_2
-	.4byte gSpriteAnimations_Object24_3
-	.4byte gSpriteAnimations_Object24_4
diff --git a/data/animations/object/object29.s b/data/animations/object/object29.s
deleted file mode 100644
index ea360cd1..00000000
--- a/data/animations/object/object29.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object29_0:: @ 08120DA0
-	.include "animations/gSpriteAnimations_Object29_0.s"
-
-gSpriteAnimations_Object29_1:: @ 08120DB1
-	.include "animations/gSpriteAnimations_Object29_1.s"
-
-gSpriteAnimations_Object29:: @ 08120DC4
-	.4byte gSpriteAnimations_Object29_0
-	.4byte gSpriteAnimations_Object29_1
-	.4byte 00000000
diff --git a/data/animations/object/object4.s b/data/animations/object/object4.s
deleted file mode 100644
index 862d4626..00000000
--- a/data/animations/object/object4.s
+++ /dev/null
@@ -1,112 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_Object4_2:: @ 0811EE64
-	.include "animations/gSpriteAnimations_Object4_2.s"
-
-gSpriteAnimations_Object4_10:: @ 0811EE8D
-	.include "animations/gSpriteAnimations_Object4_10.s"
-
-gSpriteAnimations_Object4_3:: @ 0811EE91
-	.include "animations/gSpriteAnimations_Object4_3.s"
-
-gSpriteAnimations_Object4_11:: @ 0811EEBA
-	.include "animations/gSpriteAnimations_Object4_11.s"
-
-gSpriteAnimations_Object4_0:: @ 0811EEBE
-	.include "animations/gSpriteAnimations_Object4_0.s"
-
-gSpriteAnimations_Object4_8:: @ 0811EEC3
-	.include "animations/gSpriteAnimations_Object4_8.s"
-
-gSpriteAnimations_Object4_1:: @ 0811EEC7
-	.include "animations/gSpriteAnimations_Object4_1.s"
-
-gSpriteAnimations_Object4_9:: @ 0811EEF0
-	.include "animations/gSpriteAnimations_Object4_9.s"
-
-gSpriteAnimations_Object4_12:: @ 0811EEF4
-	.include "animations/gSpriteAnimations_Object4_12.s"
-
-gSpriteAnimations_Object4_13:: @ 0811EEFD
-	.include "animations/gSpriteAnimations_Object4_13.s"
-
-gSpriteAnimations_Object4_14:: @ 0811EF06
-	.include "animations/gSpriteAnimations_Object4_14.s"
-
-gSpriteAnimations_Object4_19:: @ 0811EF0F
-	.include "animations/gSpriteAnimations_Object4_19.s"
-
-gSpriteAnimations_Object4_15:: @ 0811EF37
-	.include "animations/gSpriteAnimations_Object4_15.s"
-
-gSpriteAnimations_Object4_16:: @ 0811EF4F
-	.include "animations/gSpriteAnimations_Object4_16.s"
-
-gSpriteAnimations_Object4_17:: @ 0811EF67
-	.include "animations/gSpriteAnimations_Object4_17.s"
-
-gSpriteAnimations_Object4_18:: @ 0811EF7F
-	.include "animations/gSpriteAnimations_Object4_18.s"
-
-gSpriteAnimations_Object4_22:: @ 0811EF97
-	.include "animations/gSpriteAnimations_Object4_22.s"
-
-gSpriteAnimations_Object4_23:: @ 0811EFA0
-	.include "animations/gSpriteAnimations_Object4_23.s"
-
-gSpriteAnimations_Object4_20:: @ 0811EFA9
-	.include "animations/gSpriteAnimations_Object4_20.s"
-
-gSpriteAnimations_Object4_21:: @ 0811EFB2
-	.include "animations/gSpriteAnimations_Object4_21.s"
-
-gSpriteAnimations_Object4_24:: @ 0811EFBB
-	.include "animations/gSpriteAnimations_Object4_24.s"
-
-gSpriteAnimations_Object4_25:: @ 0811EFC4
-	.include "animations/gSpriteAnimations_Object4_25.s"
-
-gSpriteAnimations_Object4_26:: @ 0811EFD9
-	.include "animations/gSpriteAnimations_Object4_26.s"
-
-gSpriteAnimations_Object4_27:: @ 0811EFEE
-	.include "animations/gSpriteAnimations_Object4_27.s"
-
-gSpriteAnimations_Object4_28:: @ 0811F003
-	.include "animations/gSpriteAnimations_Object4_28.s"
-
-gSpriteAnimations_Object4:: @ 0811F018
-	.4byte gSpriteAnimations_Object4_0
-	.4byte gSpriteAnimations_Object4_1
-	.4byte gSpriteAnimations_Object4_2
-	.4byte gSpriteAnimations_Object4_3
-	.4byte gSpriteAnimations_Object4_0
-	.4byte gSpriteAnimations_Object4_1
-	.4byte gSpriteAnimations_Object4_2
-	.4byte gSpriteAnimations_Object4_3
-	.4byte gSpriteAnimations_Object4_8
-	.4byte gSpriteAnimations_Object4_9
-	.4byte gSpriteAnimations_Object4_10
-	.4byte gSpriteAnimations_Object4_11
-	.4byte gSpriteAnimations_Object4_12
-	.4byte gSpriteAnimations_Object4_13
-	.4byte gSpriteAnimations_Object4_14
-	.4byte gSpriteAnimations_Object4_15
-	.4byte gSpriteAnimations_Object4_16
-	.4byte gSpriteAnimations_Object4_17
-	.4byte gSpriteAnimations_Object4_18
-	.4byte gSpriteAnimations_Object4_19
-	.4byte gSpriteAnimations_Object4_20
-	.4byte gSpriteAnimations_Object4_21
-	.4byte gSpriteAnimations_Object4_22
-	.4byte gSpriteAnimations_Object4_23
-	.4byte gSpriteAnimations_Object4_24
-	.4byte gSpriteAnimations_Object4_25
-	.4byte gSpriteAnimations_Object4_26
-	.4byte gSpriteAnimations_Object4_27
-	.4byte gSpriteAnimations_Object4_28
-	.4byte 00000000
diff --git a/data/animations/object/object93.s b/data/animations/object/object93.s
deleted file mode 100644
index 9fb293f2..00000000
--- a/data/animations/object/object93.s
+++ /dev/null
@@ -1,23 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123E80:: @ 08123E80
-	.4byte sub_0809CEA8
-	.4byte sub_0809CEC0
-
-gSpriteAnimations_Object93_0_0:: @ 08123E88
-	.include "animations/gSpriteAnimations_Object93_0_0.s"
-
-gSpriteAnimations_Object93_0:: @ 08123E9C
-	.4byte gSpriteAnimations_Object93_0_0
-	.include "animations/gSpriteAnimations_Object93_0.s"
-
-gSpriteAnimations_Object93_1_0:: @ 08123EA4
-	.include "animations/gSpriteAnimations_Object93_1_0.s"
-
-gSpriteAnimations_Object93_1:: @ 08123EB8
-	.4byte gSpriteAnimations_Object93_1_0
-	.include "animations/gSpriteAnimations_Object93_1.s"
diff --git a/data/animations/object/objectA0.s b/data/animations/object/objectA0.s
deleted file mode 100644
index bac0fa14..00000000
--- a/data/animations/object/objectA0.s
+++ /dev/null
@@ -1,34 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gSpriteAnimations_ObjectA0_1:: @ 0812468C
-	.include "animations/gSpriteAnimations_ObjectA0_1.s"
-
-gSpriteAnimations_ObjectA0_0:: @ 08124690
-	.include "animations/gSpriteAnimations_ObjectA0_0.s"
-
-gSpriteAnimations_ObjectA0_3:: @ 08124694
-	.include "animations/gSpriteAnimations_ObjectA0_3.s"
-
-gSpriteAnimations_ObjectA0_5:: @ 08124698
-	.include "animations/gSpriteAnimations_ObjectA0_5.s"
-
-gSpriteAnimations_ObjectA0_4:: @ 081246A8
-	.include "animations/gSpriteAnimations_ObjectA0_4.s"
-
-gSpriteAnimations_ObjectA0_7:: @ 081246B8
-	.include "animations/gSpriteAnimations_ObjectA0_7.s"
-
-gSpriteAnimations_ObjectA0:: @ 081246C8
-	.4byte gSpriteAnimations_ObjectA0_0
-	.4byte gSpriteAnimations_ObjectA0_1
-	.4byte gSpriteAnimations_ObjectA0_0
-	.4byte gSpriteAnimations_ObjectA0_3
-	.4byte gSpriteAnimations_ObjectA0_4
-	.4byte gSpriteAnimations_ObjectA0_5
-	.4byte gSpriteAnimations_ObjectA0_4
-	.4byte gSpriteAnimations_ObjectA0_7
-	.4byte 00000000
diff --git a/data/animations/object/pressurePlate.s b/data/animations/object/pressurePlate.s
new file mode 100644
index 00000000..75e87fa0
--- /dev/null
+++ b/data/animations/object/pressurePlate.s
@@ -0,0 +1,27 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+@    .align 2
+
+gSpriteAnimations_PressurePlate_0:: @ 08120BF1
+	.include "animations/gSpriteAnimations_PressurePlate_0.s"
+
+gSpriteAnimations_PressurePlate_1:: @ 08120BF5
+	.include "animations/gSpriteAnimations_PressurePlate_1.s"
+
+gSpriteAnimations_PressurePlate_2:: @ 08120BF9
+	.include "animations/gSpriteAnimations_PressurePlate_2.s"
+
+gSpriteAnimations_PressurePlate_3:: @ 08120BFD
+	.include "animations/gSpriteAnimations_PressurePlate_3.s"
+
+gSpriteAnimations_PressurePlate_4:: @ 08120C01
+	.include "animations/gSpriteAnimations_PressurePlate_4.s"
+
+gSpriteAnimations_PressurePlate:: @ 08120C08
+	.4byte gSpriteAnimations_PressurePlate_0
+	.4byte gSpriteAnimations_PressurePlate_1
+	.4byte gSpriteAnimations_PressurePlate_2
+	.4byte gSpriteAnimations_PressurePlate_3
+	.4byte gSpriteAnimations_PressurePlate_4
diff --git a/data/const/object/object29.s b/data/const/object/ambientClouds.s
index 64113d09..64113d09 100644
--- a/data/const/object/object29.s
+++ b/data/const/object/ambientClouds.s
diff --git a/data/const/object/objectA0.s b/data/const/object/angryStatue.s
index d3b0f552..01589469 100644
--- a/data/const/object/objectA0.s
+++ b/data/const/object/angryStatue.s
@@ -12,4 +12,4 @@ gUnk_08124670:: @ 08124670
 	.4byte sub_0809F254
 
 gUnk_08124684:: @ 08124684
-	.incbin "objectA0/gUnk_08124684.bin"
+	.incbin "angryStatue/gUnk_08124684.bin"
diff --git a/data/const/object/object26.s b/data/const/object/barrelInside.s
index fabcda59..13e148d9 100644
--- a/data/const/object/object26.s
+++ b/data/const/object/barrelInside.s
@@ -5,7 +5,7 @@
     .align 2
 
 gUnk_08120C80:: @ 08120C80
-	.incbin "object26/gUnk_08120C80.bin"
+	.incbin "barrelInside/gUnk_08120C80.bin"
 
 gUnk_08120C92:: @ 08120C92
-	.incbin "object26/gUnk_08120C92.bin"
+	.incbin "barrelInside/gUnk_08120C92.bin"
diff --git a/data/const/object/object80.s b/data/const/object/board.s
index 2d5c1c1d..2f569052 100644
--- a/data/const/object/object80.s
+++ b/data/const/object/board.s
@@ -9,4 +9,4 @@ gUnk_08123664:: @ 08123664
 	.4byte sub_08098BE0
 
 gUnk_0812366C:: @ 0812366C
-	.incbin "object80/gUnk_0812366C.bin"
+	.incbin "board/gUnk_0812366C.bin"
diff --git a/data/const/object/object8A.s b/data/const/object/cabinFurniture.s
index db3fb95d..db3fb95d 100644
--- a/data/const/object/object8A.s
+++ b/data/const/object/cabinFurniture.s
diff --git a/data/const/object/object8B.s b/data/const/object/doubleBookshelf.s
index e450780d..9bd699f0 100644
--- a/data/const/object/object8B.s
+++ b/data/const/object/doubleBookshelf.s
@@ -11,4 +11,4 @@ gUnk_08123D58:: @ 08123D58
 	.4byte sub_0809B0A8
 
 gUnk_08123D68:: @ 08123D68
-	.incbin "object8B/gUnk_08123D68.bin"
+	.incbin "doubleBookshelf/gUnk_08123D68.bin"
diff --git a/data/const/object/object51.s b/data/const/object/giantRock2.s
index a95e84f8..a95e84f8 100644
--- a/data/const/object/object51.s
+++ b/data/const/object/giantRock2.s
diff --git a/data/const/object/objectBA.s b/data/const/object/gyorgBossObject.s
index c6ab4a1f..eb5c2617 100644
--- a/data/const/object/objectBA.s
+++ b/data/const/object/gyorgBossObject.s
@@ -17,4 +17,4 @@ gUnk_08124ED0:: @ 08124ED0
 	.4byte sub_080A1C04
 
 gUnk_08124EF8:: @ 08124EF8
-	.incbin "objectBA/gUnk_08124EF8.bin"
+	.incbin "gyorgBossObject/gUnk_08124EF8.bin"
diff --git a/data/const/object/object89.s b/data/const/object/mazaalBossObject.s
index a58e800e..a58e800e 100644
--- a/data/const/object/object89.s
+++ b/data/const/object/mazaalBossObject.s
diff --git a/data/const/object/object4.s b/data/const/object/minishEmoticon.s
index 2cf717cb..2cf717cb 100644
--- a/data/const/object/object4.s
+++ b/data/const/object/minishEmoticon.s
diff --git a/data/const/object/object5A.s b/data/const/object/paper.s
index 212f6de6..212f6de6 100644
--- a/data/const/object/object5A.s
+++ b/data/const/object/paper.s
diff --git a/data/const/object/object24.s b/data/const/object/pressurePlate.s
index f0e129bb..15f9e807 100644
--- a/data/const/object/object24.s
+++ b/data/const/object/pressurePlate.s
@@ -10,4 +10,4 @@ gUnk_08120BE0:: @ 08120BE0
 	.4byte sub_080888F4
 
 gUnk_08120BEC:: @ 08120BEC
-	.incbin "object24/gUnk_08120BEC.bin"
+	.incbin "PressurePlate/gUnk_08120BEC.bin"
diff --git a/data/const/object/object72.s b/data/const/object/stoneTablet.s
index f211569e..13bd0ece 100644
--- a/data/const/object/object72.s
+++ b/data/const/object/stoneTablet.s
@@ -9,7 +9,7 @@ gUnk_081232E4:: @ 081232E4
 	.4byte nullsub_529
 
 gUnk_081232EC:: @ 081232EC
-	.incbin "object72/gUnk_081232EC.bin"
+	.incbin "stoneTablet/gUnk_081232EC.bin"
 
 gUnk_081232FE:: @ 081232FE
-	.incbin "object72/gUnk_081232FE.bin"
+	.incbin "stoneTablet/gUnk_081232FE.bin"
diff --git a/data/gfx/sprite_frames.s b/data/gfx/sprite_frames.s
index 6dc4cd56..553c2c2d 100644
--- a/data/gfx/sprite_frames.s
+++ b/data/gfx/sprite_frames.s
@@ -31,8 +31,8 @@ gSpriteFrames_8:: @ 08116888
 gSpriteFrames_9:: @ 08116A9C
 	.include "sprites/gSpriteFrames_9.s"
 
-gSpriteFrames_Object4:: @ 08116D0C
-	.include "sprites/gSpriteFrames_Object4.s"
+gSpriteFrames_MinishEmoticon:: @ 08116D0C
+	.include "sprites/gSpriteFrames_MinishEmoticon.s"
 
 gSpriteFrames_EzloCap:: @ 08116DD4
 	.include "sprites/gSpriteFrames_EzloCap.s"
diff --git a/data/gfx/sprite_ptrs.s b/data/gfx/sprite_ptrs.s
index 00f76d64..8cae8cca 100644
--- a/data/gfx/sprite_ptrs.s
+++ b/data/gfx/sprite_ptrs.s
@@ -55,8 +55,8 @@ gSpritePtrs:: @ 080029B4
 	.4byte gSprite_Link
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_Object4
-	.4byte gSpriteFrames_Object4
+	.4byte gSpriteAnimations_MinishEmoticon
+	.4byte gSpriteFrames_MinishEmoticon
 	.4byte gSprite_Link
 	.4byte 00000000
 
@@ -915,7 +915,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_Object24
+	.4byte gSpriteAnimations_PressurePlate
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000
@@ -1000,7 +1000,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_Object29
+	.4byte gSpriteAnimations_AmbientClouds
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000
@@ -1335,7 +1335,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_Object93_0
+	.4byte gSpriteAnimations_Lamp_0
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000
@@ -1375,7 +1375,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_Object93_1
+	.4byte gSpriteAnimations_Lamp_1
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000
@@ -1457,7 +1457,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_ObjectA0
+	.4byte gSpriteAnimations_AngryStatue
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000