identify more objects

50 files changed, 426 insertions, 425 deletions

diff --git a/asm/object29.s b/asm/ambientClouds.s
index 59abd928..05a600c8 100644
--- a/asm/object29.s
+++ b/asm/ambientClouds.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object29
-Object29: @ 0x08089848
+	thumb_func_start AmbientClouds
+AmbientClouds: @ 0x08089848
 	push {r4, lr}
 	adds r4, r0, #0
 	ldr r1, _08089870 @ =gUnk_08120D90
diff --git a/asm/objectA0.s b/asm/angryStatue.s
index 17e17e6d..6383a766 100644
--- a/asm/objectA0.s
+++ b/asm/angryStatue.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start ObjectA0
-ObjectA0: @ 0x0809F12C
+	thumb_func_start AngryStatue
+AngryStatue: @ 0x0809F12C
 	push {lr}
 	ldr r2, _0809F140 @ =gUnk_08124670
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object26.s b/asm/barrelInside.s
index 6005735c..e2c26772 100644
--- a/asm/object26.s
+++ b/asm/barrelInside.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object26
-Object26: @ 0x08089134
+	thumb_func_start BarrelInside
+BarrelInside: @ 0x08089134
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldrb r0, [r5, #0xc]
diff --git a/asm/object80.s b/asm/board.s
index 1b158d68..01b22d8c 100644
--- a/asm/object80.s
+++ b/asm/board.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object80
-Object80: @ 0x08098B10
+	thumb_func_start Board
+Board: @ 0x08098B10
 	push {lr}
 	ldr r2, _08098B24 @ =gUnk_08123664
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object8A.s b/asm/cabinFurniture.s
index b6f8f79f..e2799e52 100644
--- a/asm/object8A.s
+++ b/asm/cabinFurniture.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object8A
-Object8A: @ 0x0809ADB4
+	thumb_func_start CabinFurniture
+CabinFurniture: @ 0x0809ADB4
 	push {lr}
 	ldr r2, _0809ADC8 @ =gUnk_08123D4C
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object8B.s b/asm/doubleBookshelf.s
index 0a6e701a..aa06fe22 100644
--- a/asm/object8B.s
+++ b/asm/doubleBookshelf.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object8B
-Object8B: @ 0x0809AF5C
+	thumb_func_start DoubleBookshelf
+DoubleBookshelf: @ 0x0809AF5C
 	push {lr}
 	ldr r2, _0809AF70 @ =gUnk_08123D58
 	ldrb r1, [r0, #0xc]
diff --git a/asm/objectA5.s b/asm/fireballChain.s
index 44831ffc..dfda3925 100644
--- a/asm/objectA5.s
+++ b/asm/fireballChain.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start ObjectA5
-ObjectA5: @ 0x0809F8A4
+	thumb_func_start FireballChain
+FireballChain: @ 0x0809F8A4
 	push {r4, r5, r6, r7, lr}
 	mov r7, r8
 	push {r7}
diff --git a/asm/object51.s b/asm/giantRock2.s
index fddf2b40..b664a087 100644
--- a/asm/object51.s
+++ b/asm/giantRock2.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object51
-Object51: @ 0x08090FF8
+	thumb_func_start GiantRock2
+GiantRock2: @ 0x08090FF8
 	push {lr}
 	ldr r2, _0809100C @ =gUnk_08122278
 	ldrb r1, [r0, #0xc]
diff --git a/asm/objectBA.s b/asm/gyorgBossObject.s
index aaa2d687..bf2efd4e 100644
--- a/asm/objectBA.s
+++ b/asm/gyorgBossObject.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start ObjectBA
-ObjectBA: @ 0x080A16DC
+	thumb_func_start GyorgBossObject
+GyorgBossObject: @ 0x080A16DC
 	push {r4, lr}
 	adds r4, r0, #0
 	ldr r1, _080A1700 @ =gUnk_08124ED0
diff --git a/asm/object93.s b/asm/lamp.s
index 2862be71..f94156fe 100644
--- a/asm/object93.s
+++ b/asm/lamp.s
@@ -6,8 +6,8 @@
 
 	.text
 
-	thumb_func_start Object93
-Object93: @ 0x0809CE90
+	thumb_func_start Lamp
+Lamp: @ 0x0809CE90
 	push {lr}
 	ldr r2, _0809CEA4 @ =gUnk_08123E80
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object89.s b/asm/mazaalBossObject.s
index 69ca1913..22ea10b6 100644
--- a/asm/object89.s
+++ b/asm/mazaalBossObject.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object89
-Object89: @ 0x0809AAEC
+	thumb_func_start MazaalBossObject
+MazaalBossObject: @ 0x0809AAEC
 	push {lr}
 	ldr r2, _0809AB00 @ =gUnk_08123D28
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object4.s b/asm/minishEmoticon.s
index c439f4e3..3a8f533e 100644
--- a/asm/object4.s
+++ b/asm/minishEmoticon.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object4
-Object4: @ 0x08082040
+	thumb_func_start MinishEmoticon
+MinishEmoticon: @ 0x08082040
 	push {lr}
 	ldr r2, _08082054 @ =gUnk_0811EE5C
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object5A.s b/asm/paper.s
index 9bc22d68..cd693e79 100644
--- a/asm/object5A.s
+++ b/asm/paper.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object5A
-Object5A: @ 0x0809271C
+	thumb_func_start Paper
+Paper: @ 0x0809271C
 	push {lr}
 	ldr r2, _08092730 @ =gUnk_08122780
 	ldrb r1, [r0, #0xc]
diff --git a/asm/object24.s b/asm/pressurePlate.s
index 00ed5c8b..a001c65a 100644
--- a/asm/object24.s
+++ b/asm/pressurePlate.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object24
-Object24: @ 0x08088804
+	thumb_func_start PressurePlate
+PressurePlate: @ 0x08088804
 	push {r4, lr}
 	adds r4, r0, #0
 	ldrb r0, [r4, #0xf]
diff --git a/asm/object72.s b/asm/stoneTablet.s
index 0f25ded5..77588487 100644
--- a/asm/object72.s
+++ b/asm/stoneTablet.s
@@ -7,8 +7,8 @@
 	.text
 
 
-	thumb_func_start Object72
-Object72: @ 0x080979B4
+	thumb_func_start StoneTablet
+StoneTablet: @ 0x080979B4
 	push {lr}
 	ldr r2, _080979C8 @ =gUnk_081232E4
 	ldrb r1, [r0, #0xc]
diff --git a/assets/assets.json b/assets/assets.json
index 38ff89a0..67bbda54 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -41660,7 +41660,7 @@
     "type": "sprite_frame"
   },
   {
-    "path": "sprites/gSpriteFrames_Object4.bin",
+    "path": "sprites/gSpriteFrames_MinishEmoticon.bin",
     "start": 1142028,
     "size": 200,
     "type": "sprite_frame"
@@ -42820,151 +42820,151 @@
     "size": 12
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_2.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_2.bin",
     "start": 1175140,
     "size": 41,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_10.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_10.bin",
     "start": 1175181,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_3.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_3.bin",
     "start": 1175185,
     "size": 41,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_11.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_11.bin",
     "start": 1175226,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_0.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_0.bin",
     "start": 1175230,
     "size": 5,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_8.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_8.bin",
     "start": 1175235,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_1.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_1.bin",
     "start": 1175239,
     "size": 41,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_9.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_9.bin",
     "start": 1175280,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_12.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_12.bin",
     "start": 1175284,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_13.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_13.bin",
     "start": 1175293,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_14.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_14.bin",
     "start": 1175302,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_19.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_19.bin",
     "start": 1175311,
     "size": 40,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_15.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_15.bin",
     "start": 1175351,
     "size": 24,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_16.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_16.bin",
     "start": 1175375,
     "size": 24,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_17.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_17.bin",
     "start": 1175399,
     "size": 24,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_18.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_18.bin",
     "start": 1175423,
     "size": 24,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_22.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_22.bin",
     "start": 1175447,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_23.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_23.bin",
     "start": 1175456,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_20.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_20.bin",
     "start": 1175465,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_21.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_21.bin",
     "start": 1175474,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_24.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_24.bin",
     "start": 1175483,
     "size": 9,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_25.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_25.bin",
     "start": 1175492,
     "size": 21,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_26.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_26.bin",
     "start": 1175513,
     "size": 21,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_27.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_27.bin",
     "start": 1175534,
     "size": 21,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object4_28.bin",
+    "path": "animations/gSpriteAnimations_MinishEmoticon_28.bin",
     "start": 1175555,
     "size": 21,
     "type": "animation"
@@ -44273,37 +44273,37 @@
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object24_0.bin",
+    "path": "animations/gSpriteAnimations_PressurePlate_0.bin",
     "start": 1182705,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object24_1.bin",
+    "path": "animations/gSpriteAnimations_PressurePlate_1.bin",
     "start": 1182709,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object24_2.bin",
+    "path": "animations/gSpriteAnimations_PressurePlate_2.bin",
     "start": 1182713,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object24_3.bin",
+    "path": "animations/gSpriteAnimations_PressurePlate_3.bin",
     "start": 1182717,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object24_4.bin",
+    "path": "animations/gSpriteAnimations_PressurePlate_4.bin",
     "start": 1182721,
     "size": 7,
     "type": "animation"
   },
   {
-    "path": "object24/gUnk_08120BEC.bin",
+    "path": "PressurePlate/gUnk_08120BEC.bin",
     "start": 1182700,
     "size": 5
   },
@@ -44360,12 +44360,12 @@
     "size": 8
   },
   {
-    "path": "object26/gUnk_08120C80.bin",
+    "path": "barrelInside/gUnk_08120C80.bin",
     "start": 1182848,
     "size": 18
   },
   {
-    "path": "object26/gUnk_08120C92.bin",
+    "path": "barrelInside/gUnk_08120C92.bin",
     "start": 1182866,
     "size": 6
   },
@@ -44396,13 +44396,13 @@
     "size": 26
   },
   {
-    "path": "animations/gSpriteAnimations_Object29_0.bin",
+    "path": "animations/gSpriteAnimations_AmbientClouds_0.bin",
     "start": 1183136,
     "size": 17,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object29_1.bin",
+    "path": "animations/gSpriteAnimations_AmbientClouds_1.bin",
     "start": 1183153,
     "size": 19,
     "type": "animation"
@@ -46228,12 +46228,12 @@
     "size": 6
   },
   {
-    "path": "object72/gUnk_081232EC.bin",
+    "path": "stoneTablet/gUnk_081232EC.bin",
     "start": 1192684,
     "size": 18
   },
   {
-    "path": "object72/gUnk_081232FE.bin",
+    "path": "stoneTablet/gUnk_081232FE.bin",
     "start": 1192702,
     "size": 26
   },
@@ -46391,7 +46391,7 @@
     "size": 6
   },
   {
-    "path": "object80/gUnk_0812366C.bin",
+    "path": "board/gUnk_0812366C.bin",
     "start": 1193580,
     "size": 8
   },
@@ -46571,7 +46571,7 @@
     "size": 40
   },
   {
-    "path": "object8B/gUnk_08123D68.bin",
+    "path": "doubleBookshelf/gUnk_08123D68.bin",
     "start": 1195368,
     "size": 20
   },
@@ -46602,25 +46602,25 @@
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object93_0_0.bin",
+    "path": "animations/gSpriteAnimations_Lamp_0_0.bin",
     "start": 1195656,
     "size": 20,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object93_0.bin",
+    "path": "animations/gSpriteAnimations_Lamp_0.bin",
     "start": 1195680,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object93_1_0.bin",
+    "path": "animations/gSpriteAnimations_Lamp_1_0.bin",
     "start": 1195684,
     "size": 20,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Object93_1.bin",
+    "path": "animations/gSpriteAnimations_Lamp_1.bin",
     "start": 1195708,
     "size": 4,
     "type": "animation"
@@ -46801,43 +46801,43 @@
     "size": 8
   },
   {
-    "path": "animations/gSpriteAnimations_ObjectA0_1.bin",
+    "path": "animations/gSpriteAnimations_AngryStatue_1.bin",
     "start": 1197708,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_ObjectA0_0.bin",
+    "path": "animations/gSpriteAnimations_AngryStatue_0.bin",
     "start": 1197712,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_ObjectA0_3.bin",
+    "path": "animations/gSpriteAnimations_AngryStatue_3.bin",
     "start": 1197716,
     "size": 4,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_ObjectA0_5.bin",
+    "path": "animations/gSpriteAnimations_AngryStatue_5.bin",
     "start": 1197720,
     "size": 16,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_ObjectA0_4.bin",
+    "path": "animations/gSpriteAnimations_AngryStatue_4.bin",
     "start": 1197736,
     "size": 16,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_ObjectA0_7.bin",
+    "path": "animations/gSpriteAnimations_AngryStatue_7.bin",
     "start": 1197752,
     "size": 16,
     "type": "animation"
   },
   {
-    "path": "objectA0/gUnk_08124684.bin",
+    "path": "angryStatue/gUnk_08124684.bin",
     "start": 1197700,
     "size": 8
   },
@@ -47082,47 +47082,47 @@
     "size": 4
   },
   {
-    "path": "objectBA/gUnk_08124F08.bin",
+    "path": "gyorgBossObject/gUnk_08124F08.bin",
     "start": 1199880,
     "size": 32
   },
   {
-    "path": "objectBA/gUnk_08124F28.bin",
+    "path": "gyorgBossObject/gUnk_08124F28.bin",
     "start": 1199912,
     "size": 32
   },
   {
-    "path": "objectBA/gUnk_08124F48.bin",
+    "path": "gyorgBossObject/gUnk_08124F48.bin",
     "start": 1199944,
     "size": 32
   },
   {
-    "path": "objectBA/gUnk_08124F68.bin",
+    "path": "gyorgBossObject/gUnk_08124F68.bin",
     "start": 1199976,
     "size": 32
   },
   {
-    "path": "objectBA/gUnk_08124F88.bin",
+    "path": "gyorgBossObject/gUnk_08124F88.bin",
     "start": 1200008,
     "size": 32
   },
   {
-    "path": "objectBA/gUnk_08124FA8.bin",
+    "path": "gyorgBossObject/gUnk_08124FA8.bin",
     "start": 1200040,
     "size": 32
   },
   {
-    "path": "objectBA/gUnk_08124FC8.bin",
+    "path": "gyorgBossObject/gUnk_08124FC8.bin",
     "start": 1200072,
     "size": 20
   },
   {
-    "path": "objectBA/gUnk_08124FDC.bin",
+    "path": "gyorgBossObject/gUnk_08124FDC.bin",
     "start": 1200092,
     "size": 20
   },
   {
-    "path": "objectBA/gUnk_08124EF8.bin",
+    "path": "gyorgBossObject/gUnk_08124EF8.bin",
     "start": 1199864,
     "size": 16
   },
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
diff --git a/include/definitions.h b/include/definitions.h
index f2d631d9..d8374ab0 100644
--- a/include/definitions.h
+++ b/include/definitions.h
@@ -113,7 +113,7 @@ typedef enum {
     SPRITE_7,
     SPRITE_8,
     SPRITE_9,
-    SPRITE_OBJECT4,
+    SPRITE_MINISHEMOTICON,
     SPRITE_EZLOCAP,
     SPRITE_12,
     SPRITE_13,
@@ -285,7 +285,7 @@ typedef enum {
     SPRITE_DOORMIMIC_1,
     SPRITE_ROCKCHUCHU,
     SPRITE_SPINYCHUCHU,
-    SPRITE_OBJECT24,
+    SPRITE_PRESSUREPLATE,
     SPRITE_OBJECT1E,
     SPRITE_CHESTSPAWNER,
     SPRITE_BIGBARREL,
@@ -302,7 +302,7 @@ typedef enum {
     SPRITE_PULLABLEMUSHROOM,
     SPRITE_BOLLARD,
     SPRITE_WARPPOINT,
-    SPRITE_OBJECT29,
+    SPRITE_AMBIENTCLOUDS,
     SPRITE_CHUCHUBOSS_1,
     SPRITE_CHUCHUBOSS_2,
     SPRITE_OBJECT9,
@@ -369,7 +369,7 @@ typedef enum {
     SPRITE_FLYINGSKULL,
     SPRITE_BONEPROJECTILE,
     SPRITE_BAKEROVEN,
-    SPRITE_OBJECT93_0,
+    SPRITE_LAMP_0,
     SPRITE_LAKITULIGHTNING,
     SPRITE_OBJECT6A_5,
     SPRITE_BIRD_1,
@@ -377,7 +377,7 @@ typedef enum {
     SPRITE_TORCHTRAPPROJECTILE_0,
     SPRITE_TORCHTRAPPROJECTILE_1,
     SPRITE_OBJECT98,
-    SPRITE_OBJECT93_1,
+    SPRITE_LAMP_1,
     SPRITE_FIGURINEDEVICE,
     SPRITE_PULLABLELEVER_1,
     SPRITE_VAATIPROJECTILE,
@@ -395,7 +395,7 @@ typedef enum {
     SPRITE_OBJECTB4_1,
 #endif
     SPRITE_FAN,
-    SPRITE_OBJECTA0,
+    SPRITE_ANGRYSTATUE,
     SPRITE_CANNONBALLPROJECTILE,
     SPRITE_V1EYELASER,
     SPRITE_V1DARKMAGICPROJECTILE,
diff --git a/include/object.h b/include/object.h
index 05cdfa7c..1a219e09 100644
--- a/include/object.h
+++ b/include/object.h
@@ -9,7 +9,7 @@ typedef enum {
     DEATH_FX,
     SHOP_ITEM,
     BUTTON,
-    OBJECT_4,
+    MINISH_EMOTICON,
     POT,
     EZLO_CAP,
     PUSHED_BLOCK,
@@ -41,12 +41,12 @@ typedef enum {
     OBJECT_21,
     FIGURINE_DEVICE,
     EYE_SWITCH,
-    OBJECT_24,
+    PRESSURE_PLATE,
     BIG_BARREL,
-    OBJECT_26,
+    BARREL_INSIDE,
     PUSHABLE_STATUE,
     OBJECT_28,
-    OBJECT_29,
+    AMBIENT_CLOUDS,
     OBJECT_2A,
     OBJECT_2B,
     BEANSTALK,
@@ -86,7 +86,7 @@ typedef enum {
     MINISH_SIZED_ENTRANCE,
     ARCHWAY,
     GIANT_ROCK,
-    OBJECT_51,
+    GIANT_ROCK2,
     OBJECT_52,
     OBJECT_53,
     PULLABLE_LEVER,
@@ -95,7 +95,7 @@ typedef enum {
     HIDDEN_LADDER_DOWN,
     GENTARI_CURTAIN,
     LAVA_PLATFORM,
-    OBJECT_5A,
+    PAPER,
     OBJECT_5B,
     MASK,
     HOUSE_DOOR_INT,
@@ -119,7 +119,7 @@ typedef enum {
     MINISH_SIZED_ARCHWAY,
     OBJECT_70,
     PUSHABLE_GRAVE,
-    OBJECT_72,
+    STONE_TABLET,
     LILYPAD_SMALL,
     OBJECT_74,
     OBJECT_75,
@@ -133,7 +133,7 @@ typedef enum {
     OBJECT_ON_BEETLE,
     OBJECT_7E,
     PICO_BLOOM,
-    OBJECT_80,
+    BOARD,
     OBJECT_81,
     BIG_VORTEX,
     BIG_PUSHABLE_LEVER,
@@ -142,9 +142,9 @@ typedef enum {
     OBJECT_86,
     OCTOROK_BOSS_OBJECT,
     HUGE_BOOK,
-    OBJECT_89,
-    OBJECT_8A,
-    OBJECT_8B,
+    MAZAAL_BOSS_OBJECT,
+    CABIN_FURNITURE,
+    DOUBLE_BOOKSHELF,
     BOOK,
     FIREPLACE,
     OBJECT_8E,
@@ -152,7 +152,7 @@ typedef enum {
     OBJECT_90,
     OBJECT_91,
     BAKER_OVEN,
-    OBJECT_93,
+    LAMP,
     WIND_TRIBE_FLAG,
     BIRD,
     OBJECT_96,
@@ -163,14 +163,14 @@ typedef enum {
     OBJECT_9B,
     TREE_HIDING_PORTAL,
     LIGHTABLE_SWITCH,
-    OBJECT_9E,
+    TREE_THORNS,
     FAN,
-    OBJECT_A0,
+    ANGRY_STATUE,
     PALACE_ARCHWAY,
     OBJECT_A2,
     CLOUD,
     MINISH_LIGHT,
-    OBJECT_A5,
+    FIREBALL_CHAIN,
     OBJECT_A6,
     OBJECT_A7,
     OBJECT_A8,
@@ -191,7 +191,7 @@ typedef enum {
     WELL,
     WIND_TRIBE_TELEPORTER,
     OBJECT_B9,
-    OBJECT_BA,
+    GYORG_BOSS_OBJECT,
     WINDCREST,
     LIT_AREA,
     OBJECT_BD,
@@ -205,7 +205,7 @@ extern void ItemOnGround(Entity*);
 extern void DeathFx(Entity*);
 extern void ItemForSale(Entity*);
 extern void Button(Entity*);
-extern void Object4(Entity*);
+extern void MinishEmoticon(Entity*);
 extern void Pot(Entity*);
 extern void EzloCap(Entity*);
 extern void BlockPushed(Entity*);
@@ -237,12 +237,12 @@ extern void Object20(Entity*);
 extern void Object21(Entity*);
 extern void FigurineDevice(Entity*);
 extern void EyeSwitch(Entity*);
-extern void Object24(Entity*);
+extern void PressurePlate(Entity*);
 extern void BigBarrel(Entity*);
-extern void Object26(Entity*);
+extern void BarrelInside(Entity*);
 extern void PushableStatue(Entity*);
 extern void Object28(Entity*);
-extern void Object29(Entity*);
+extern void AmbientClouds(Entity*);
 extern void Object2A(Entity*);
 extern void Object2B(Entity*);
 extern void Beanstalk(Entity*);
@@ -282,7 +282,7 @@ extern void Furniture(Entity*);
 extern void MinishSizedEntrance(Entity*);
 extern void Archway(Entity*);
 extern void GiantRock(Entity*);
-extern void Object51(Entity*);
+extern void GiantRock2(Entity*);
 extern void Object52(Entity*);
 extern void Object53(Entity*);
 extern void PullableLever(Entity*);
@@ -291,7 +291,7 @@ extern void ThoughtBubble(Entity*);
 extern void HiddenLadderDown(Entity*);
 extern void GentariCurtain(Entity*);
 extern void LavaPlatform(Entity*);
-extern void Object5A(Entity*);
+extern void Paper(Entity*);
 extern void Object5B(Entity*);
 extern void Mask(Entity*);
 extern void HouseDoorInterior(Entity*);
@@ -315,7 +315,7 @@ extern void MineralWaterSource(Entity*);
 extern void MinishSizedArchway(Entity*);
 extern void Object70(Entity*);
 extern void PushableGrave(Entity*);
-extern void Object72(Entity*);
+extern void StoneTablet(Entity*);
 extern void LilypadSmall(Entity*);
 extern void Object74(Entity*);
 extern void Object75(Entity*);
@@ -329,7 +329,7 @@ extern void MacroShoes(Entity*);
 extern void ObjectOnSpinyBeetle(Entity*);
 extern void Object7E(Entity*);
 extern void PicoBloom(Entity*);
-extern void Object80(Entity*);
+extern void Board(Entity*);
 extern void Object81(Entity*);
 extern void BigVortex(Entity*);
 extern void BigPushableLever(Entity*);
@@ -338,9 +338,9 @@ extern void BigIceBlock(Entity*);
 extern void Object86(Entity*);
 extern void OctorokBossObject(Entity*);
 extern void MacroBook(Entity*);
-extern void Object89(Entity*);
-extern void Object8A(Entity*);
-extern void Object8B(Entity*);
+extern void MazaalBossObject(Entity*);
+extern void CabinFurniture(Entity*);
+extern void DoubleBookshelf(Entity*);
 extern void Book(Entity*);
 extern void Fireplace(Entity*);
 extern void Object8E(Entity*);
@@ -348,7 +348,7 @@ extern void FrozenWaterElement(Entity*);
 extern void Object90(Entity*);
 extern void Object91(Entity*);
 extern void BakerOven(Entity*);
-extern void Object93(Entity*);
+extern void Lamp(Entity*);
 extern void WindTribeFlag(Entity*);
 extern void Bird(Entity*);
 extern void Object96(Entity*);
@@ -359,14 +359,14 @@ extern void MacroAcorn(Entity*);
 extern void Object9B(Entity*);
 extern void TreeHidingPortal(Entity*);
 extern void LightableSwitch(Entity*);
-extern void Object9E(Entity*);
+extern void TreeThorns(Entity*);
 extern void Fan(Entity*);
-extern void ObjectA0(Entity*);
+extern void AngryStatue(Entity*);
 extern void PalaceArchway(Entity*);
 extern void ObjectA2(Entity*);
 extern void Cloud(Entity*);
 extern void MinishLight(Entity*);
-extern void ObjectA5(Entity*);
+extern void FireballChain(Entity*);
 extern void ObjectA6(Entity*);
 extern void ObjectA7(Entity*);
 extern void ObjectA8(Entity*);
@@ -387,7 +387,7 @@ extern void ObjectB6(Entity*);
 extern void Well(Entity*);
 extern void WindTribeTeleporter(Entity*);
 extern void ObjectB9(Entity*);
-extern void ObjectBA(Entity*);
+extern void GyorgBossObject(Entity*);
 extern void Windcrest(Entity*);
 extern void LitArea(Entity*);
 extern void ObjectBD(Entity*);
diff --git a/linker.ld b/linker.ld
index 2d25fba6..ba7c1b31 100644
--- a/linker.ld
+++ b/linker.ld
@@ -705,7 +705,7 @@ SECTIONS {
         asm/deathFx.o(.text);
         asm/itemForSale.o(.text);
         src/object/button.o(.text);
-        asm/object4.o(.text);
+        asm/minishEmoticon.o(.text);
         src/object/pot.o(.text);
         asm/ezloCap.o(.text);
         asm/blockPushed.o(.text);
@@ -738,12 +738,12 @@ SECTIONS {
         asm/object21.o(.text);
         asm/figurineDevice.o(.text);
         asm/eyeSwitch.o(.text);
-        asm/object24.o(.text);
+        asm/PressurePlate.o(.text);
         asm/bigBarrel.o(.text);
-        asm/object26.o(.text);
+        asm/barrelInside.o(.text);
         asm/pushableStatue.o(.text);
         asm/object28.o(.text);
-        asm/object29.o(.text);
+        asm/ambientClouds.o(.text);
         src/object/object2A.o(.text);
         asm/object2A.o(.text);
         asm/object2B.o(.text);
@@ -787,7 +787,7 @@ SECTIONS {
         src/object/minishSizedEntrance.o(.text);
         src/object/archway.o(.text);
         asm/giantRock.o(.text);
-        asm/object51.o(.text);
+        asm/giantRock2.o(.text);
         asm/object52.o(.text);
         asm/object53.o(.text);
         asm/pullableLever.o(.text);
@@ -797,7 +797,7 @@ SECTIONS {
         src/object/hiddenLadderDown.o(.text);
         asm/gentariCurtains.o(.text);
         asm/lavaPlatform.o(.text);
-        asm/object5A.o(.text);
+        asm/paper.o(.text);
         asm/object5B.o(.text);
         src/object/mask.o(.text);
         asm/houseDoorInterior.o(.text);
@@ -821,7 +821,7 @@ SECTIONS {
         src/object/minishSizedArchway.o(.text);
         asm/object70.o(.text);
         asm/pushableGrave.o(.text);
-        asm/object72.o(.text);
+        asm/stoneTablet.o(.text);
         src/object/lilypadSmall.o(.text);
         asm/object74.o(.text);
         src/object/bell.o(.text);
@@ -833,7 +833,7 @@ SECTIONS {
         asm/objectOnSpinyBeetle.o(.text);
         src/object/object7E.o(.text);
         asm/picoBloom.o(.text);
-        asm/object80.o(.text);
+        asm/board.o(.text);
         asm/object81.o(.text);
         src/object/bigVortex.o(.text);
         asm/bigPushableLever.o(.text);
@@ -842,9 +842,9 @@ SECTIONS {
         src/object/object86.o(.text);
         src/object/octorokBossObject.o(.text);
         asm/macroBook.o(.text);
-        asm/object89.o(.text);
-        asm/object8A.o(.text);
-        asm/object8B.o(.text);
+        asm/mazaalBossObject.o(.text);
+        asm/cabinFurniture.o(.text);
+        asm/doubleBookshelf.o(.text);
         src/object/book.o(.text);
         src/object/fireplace.o(.text);
         asm/object8E.o(.text);
@@ -852,7 +852,7 @@ SECTIONS {
         asm/object90.o(.text);
         asm/object91.o(.text);
         src/object/bakerOven.o(.text);
-        asm/object93.o(.text);
+        asm/lamp.o(.text);
         src/object/windTribeFlag.o(.text);
         src/object/bird.o(.text);
         asm/bird.o(.text);
@@ -865,15 +865,15 @@ SECTIONS {
         src/object/treeHidingPortal.o(.text);
         asm/treeHidingPortal.o(.text);
         src/object/lightableSwitch.o(.text);
-        src/object/object9E.o(.text);
+        src/object/treeThorns.o(.text);
         src/object/fan.o(.text);
         asm/fan.o(.text);
-        asm/objectA0.o(.text);
+        asm/angryStatue.o(.text);
         src/object/palaceArchway.o(.text);
         src/object/objectA2.o(.text);
         src/object/cloud.o(.text);
         src/object/minishLight.o(.text);
-        asm/objectA5.o(.text);
+        asm/fireballChain.o(.text);
         asm/objectA6.o(.text);
         asm/objectA7.o(.text);
         src/object/objectA8.o(.text);
@@ -895,7 +895,7 @@ SECTIONS {
         src/object/well.o(.text);
         asm/windTribeTeleporter.o(.text);
         asm/objectB9.o(.text);
-        asm/objectBA.o(.text);
+        asm/gyorgBossObject.o(.text);
         src/object/windcrest.o(.text);
         asm/litArea.o(.text);
         asm/objectBD.o(.text);
@@ -1416,8 +1416,8 @@ SECTIONS {
         data/animations/object/deathFx.o(.rodata);
         data/const/object/itemForSale.o(.rodata);
         data/const/object/button.o(.rodata);
-        data/const/object/object4.o(.rodata);
-        data/animations/object/object4.o(.rodata);
+        data/const/object/minishEmoticon.o(.rodata);
+        data/animations/object/minishEmoticon.o(.rodata);
         data/const/object/pot.o(.rodata);
         data/animations/object/pot.o(.rodata);
         data/const/object/ezloCap.o(.rodata);
@@ -1459,15 +1459,15 @@ SECTIONS {
         data/animations/object/figurineDevice.o(.rodata);
         data/const/object/eyeSwitch.o(.rodata);
         data/animations/object/eyeSwitch.o(.rodata);
-        data/const/object/object24.o(.rodata);
-        data/animations/object/object24.o(.rodata);
+        data/const/object/pressurePlate.o(.rodata);
+        data/animations/object/pressurePlate.o(.rodata);
         data/const/object/bigBarrel.o(.rodata);
         data/animations/object/bigBarrel.o(.rodata);
-        data/const/object/object26.o(.rodata);
+        data/const/object/barrelInside.o(.rodata);
         data/const/object/pushableStatue.o(.rodata);
         data/animations/object/pushableStatue.o(.rodata);
-        data/const/object/object29.o(.rodata);
-        data/animations/object/object29.o(.rodata);
+        data/const/object/ambientClouds.o(.rodata);
+        data/animations/object/ambientClouds.o(.rodata);
         data/const/object/object2A.o(.rodata);
         data/animations/object/object2A.o(.rodata);
         data/const/object/beanstalk.o(.rodata);
@@ -1522,7 +1522,7 @@ SECTIONS {
         src/object/furniture.o(.rodata);
         data/const/object/minishSizedEntrance.o(.rodata);
         data/animations/object/minishSizedEntrance.o(.rodata);
-        data/const/object/object51.o(.rodata);
+        data/const/object/giantRock2.o(.rodata);
         data/const/object/object53.o(.rodata);
         data/const/object/pullableLever.o(.rodata);
         data/animations/object/pullableLever.o(.rodata);
@@ -1535,7 +1535,7 @@ SECTIONS {
         data/animations/object/gentariCurtains.o(.rodata);
         data/const/object/lavaPlatform.o(.rodata);
         data/animations/object/lavaPlatform.o(.rodata);
-        data/const/object/object5A.o(.rodata);
+        data/const/object/paper.o(.rodata);
         data/const/object/object5B.o(.rodata);
         data/const/object/mask.o(.rodata);
         data/const/object/houseDoorInterior.o(.rodata);
@@ -1560,7 +1560,7 @@ SECTIONS {
         data/const/object/mineralWaterSource.o(.rodata);
         data/const/object/object70.o(.rodata);
         data/const/object/pushableGrave.o(.rodata);
-        data/const/object/object72.o(.rodata);
+        data/const/object/stoneTablet.o(.rodata);
         data/const/object/lilypadSmall.o(.rodata);
         data/const/object/object74.o(.rodata);
         data/const/object/bell.o(.rodata);
@@ -1575,7 +1575,7 @@ SECTIONS {
         data/const/object/objectOnSpinyBeetle.o(.rodata);
         data/const/object/picoBloom.o(.rodata);
         data/animations/object/picoBloom.o(.rodata);
-        data/const/object/object80.o(.rodata);
+        data/const/object/board.o(.rodata);
         data/const/object/object81.o(.rodata);
         data/const/object/bigVortex.o(.rodata);
         data/animations/object/bigVortex.o(.rodata);
@@ -1590,9 +1590,9 @@ SECTIONS {
         src/object/octorokBossObject.o(.rodata);
         data/const/object/macroBook.o(.rodata);
         data/animations/object/macroBook.o(.rodata);
-        data/const/object/object89.o(.rodata);
-        data/const/object/object8A.o(.rodata);
-        data/const/object/object8B.o(.rodata);
+        data/const/object/mazaalBossObject.o(.rodata);
+        data/const/object/cabinFurniture.o(.rodata);
+        data/const/object/doubleBookshelf.o(.rodata);
         src/object/book.o(.rodata);
         data/const/object/fireplace.o(.rodata);
         data/const/object/object8E.o(.rodata);
@@ -1601,7 +1601,7 @@ SECTIONS {
         data/const/object/object91.o(.rodata);
         data/const/object/bakerOven.o(.rodata);
         data/animations/object/bakerOven.o(.rodata);
-        data/animations/object/object93.o(.rodata);
+        data/animations/object/lamp.o(.rodata);
         data/const/object/bird.o(.rodata);
         data/animations/object/bird.o(.rodata);
         data/const/object/object96.o(.rodata);
@@ -1615,9 +1615,10 @@ SECTIONS {
         data/const/object/lightableSwitch.o(.rodata);
         data/const/object/fan.o(.rodata);
         data/animations/object/fan.o(.rodata);
-        data/const/object/objectA0.o(.rodata);
-        data/animations/object/objectA0.o(.rodata);
-        data/const/object/palaceArchway.o(.rodata);        src/object/objectA2.o(.rodata);
+        data/const/object/angryStatue.o(.rodata);
+        data/animations/object/angryStatue.o(.rodata);
+        data/const/object/palaceArchway.o(.rodata);
+        src/object/objectA2.o(.rodata);
         data/animations/object/objectA2.o(.rodata);
         data/const/object/cloud.o(.rodata);
         data/const/object/minishLight.o(.rodata);
@@ -1643,8 +1644,8 @@ SECTIONS {
         data/const/object/well.o(.rodata);
         data/const/object/windTribeTeleporter.o(.rodata);
         data/const/object/objectB9.o(.rodata);
-        data/const/object/objectBA.o(.rodata);
-        data/animations/object/objectBA.o(.rodata);
+        data/const/object/gyorgBossObject.o(.rodata);
+        data/animations/object/gyorgBossObject.o(.rodata);
         data/const/object/windcrest.o(.rodata);
         data/const/object/objectBD.o(.rodata);
         data/const/object/pinwheel.o(.rodata);
diff --git a/src/manager/manager2B.c b/src/manager/manager2B.c
index 3ef01daf..f4cc8868 100644
--- a/src/manager/manager2B.c
+++ b/src/manager/manager2B.c
@@ -46,7 +46,7 @@ void sub_0805D02C(Manager2B* this) {
         objectData = GetCurrentRoomProperty(this->manager.unk_0a);
         counter = 0;
         while (counter < 4) {
-            object = CreateObject(OBJECT_A0, objectData[2], counter);
+            object = CreateObject(ANGRY_STATUE, objectData[2], counter);
             object->x.HALF.HI = objectData[0] + gRoomControls.roomOriginX;
             object->y.HALF.HI = objectData[1] + gRoomControls.roomOriginY;
             object->parent = (Entity*)this;
diff --git a/src/object.c b/src/object.c
index b7b65ad5..9a1f983e 100644
--- a/src/object.c
+++ b/src/object.c
@@ -8,7 +8,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [DEATH_FX] = DeathFx,
     [SHOP_ITEM] = ItemForSale,
     [BUTTON] = Button,
-    [OBJECT_4] = Object4,
+    [MINISH_EMOTICON] = MinishEmoticon,
     [POT] = Pot,
     [EZLO_CAP] = EzloCap,
     [PUSHED_BLOCK] = BlockPushed,
@@ -40,12 +40,12 @@ void (*const gObjectFunctions[])(Entity*) = {
     [OBJECT_21] = Object21,
     [FIGURINE_DEVICE] = FigurineDevice,
     [EYE_SWITCH] = EyeSwitch,
-    [OBJECT_24] = Object24,
+    [PRESSURE_PLATE] = PressurePlate,
     [BIG_BARREL] = BigBarrel,
-    [OBJECT_26] = Object26,
+    [BARREL_INSIDE] = BarrelInside,
     [PUSHABLE_STATUE] = PushableStatue,
     [OBJECT_28] = Object28,
-    [OBJECT_29] = Object29,
+    [AMBIENT_CLOUDS] = AmbientClouds,
     [OBJECT_2A] = Object2A,
     [OBJECT_2B] = Object2B,
     [BEANSTALK] = Beanstalk,
@@ -85,7 +85,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [MINISH_SIZED_ENTRANCE] = MinishSizedEntrance,
     [ARCHWAY] = Archway,
     [GIANT_ROCK] = GiantRock,
-    [OBJECT_51] = Object51,
+    [GIANT_ROCK2] = GiantRock2,
     [OBJECT_52] = Object52,
     [OBJECT_53] = Object53,
     [PULLABLE_LEVER] = PullableLever,
@@ -94,7 +94,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [HIDDEN_LADDER_DOWN] = HiddenLadderDown,
     [GENTARI_CURTAIN] = GentariCurtain,
     [LAVA_PLATFORM] = LavaPlatform,
-    [OBJECT_5A] = Object5A,
+    [PAPER] = Paper,
     [OBJECT_5B] = Object5B,
     [MASK] = Mask,
     [HOUSE_DOOR_INT] = HouseDoorInterior,
@@ -118,7 +118,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [MINISH_SIZED_ARCHWAY] = MinishSizedArchway,
     [OBJECT_70] = Object70,
     [PUSHABLE_GRAVE] = PushableGrave,
-    [OBJECT_72] = Object72,
+    [STONE_TABLET] = StoneTablet,
     [LILYPAD_SMALL] = LilypadSmall,
     [OBJECT_74] = Object74,
     [OBJECT_75] = Object75,
@@ -132,7 +132,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [OBJECT_ON_BEETLE] = ObjectOnSpinyBeetle,
     [OBJECT_7E] = Object7E,
     [PICO_BLOOM] = PicoBloom,
-    [OBJECT_80] = Object80,
+    [BOARD] = Board,
     [OBJECT_81] = Object81,
     [BIG_VORTEX] = BigVortex,
     [BIG_PUSHABLE_LEVER] = BigPushableLever,
@@ -141,9 +141,9 @@ void (*const gObjectFunctions[])(Entity*) = {
     [OBJECT_86] = Object86,
     [OCTOROK_BOSS_OBJECT] = OctorokBossObject,
     [HUGE_BOOK] = MacroBook,
-    [OBJECT_89] = Object89,
-    [OBJECT_8A] = Object8A,
-    [OBJECT_8B] = Object8B,
+    [MAZAAL_BOSS_OBJECT] = MazaalBossObject,
+    [CABIN_FURNITURE] = CabinFurniture,
+    [DOUBLE_BOOKSHELF] = DoubleBookshelf,
     [BOOK] = Book,
     [FIREPLACE] = Fireplace,
     [OBJECT_8E] = Object8E,
@@ -151,7 +151,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [OBJECT_90] = Object90,
     [OBJECT_91] = Object91,
     [BAKER_OVEN] = BakerOven,
-    [OBJECT_93] = Object93,
+    [LAMP] = Lamp,
     [WIND_TRIBE_FLAG] = WindTribeFlag,
     [BIRD] = Bird,
     [OBJECT_96] = Object96,
@@ -162,14 +162,14 @@ void (*const gObjectFunctions[])(Entity*) = {
     [OBJECT_9B] = Object9B,
     [TREE_HIDING_PORTAL] = TreeHidingPortal,
     [LIGHTABLE_SWITCH] = LightableSwitch,
-    [OBJECT_9E] = Object9E,
+    [TREE_THORNS] = TreeThorns,
     [FAN] = Fan,
-    [OBJECT_A0] = ObjectA0,
+    [ANGRY_STATUE] = AngryStatue,
     [PALACE_ARCHWAY] = PalaceArchway,
     [OBJECT_A2] = ObjectA2,
     [CLOUD] = Cloud,
     [MINISH_LIGHT] = MinishLight,
-    [OBJECT_A5] = ObjectA5,
+    [FIREBALL_CHAIN] = FireballChain,
     [OBJECT_A6] = ObjectA6,
     [OBJECT_A7] = ObjectA7,
     [OBJECT_A8] = ObjectA8,
@@ -190,7 +190,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [WELL] = Well,
     [WIND_TRIBE_TELEPORTER] = WindTribeTeleporter,
     [OBJECT_B9] = ObjectB9,
-    [OBJECT_BA] = ObjectBA,
+    [GYORG_BOSS_OBJECT] = GyorgBossObject,
     [WINDCREST] = Windcrest,
     [LIT_AREA] = LitArea,
     [OBJECT_BD] = ObjectBD,
diff --git a/src/object/furniture.c b/src/object/furniture.c
index b313ca3f..a4d003bd 100644
--- a/src/object/furniture.c
+++ b/src/object/furniture.c
@@ -82,7 +82,7 @@ typedef enum {
     FORGE_HELPER,
     MINISH_UNLIT_CANDLE,
     MINISH_GEARS,
-    DOUBLE_BOOKSHELF,
+    DOUBLE_BOOKSHELF_STATIC,
     MINISH_DECOR1,
     MINISH_DECOR2,
     MINISH_JAM,
diff --git a/src/object/object9E.c b/src/object/treeThorns.c
index d44adf62..5a52b9a5 100644
--- a/src/object/object9E.c
+++ b/src/object/treeThorns.c
@@ -7,7 +7,7 @@
 
 extern Hitbox gHitbox_1;
 
-void Object9E(Entity* this) {
+void TreeThorns(Entity* this) {
     Entity* ent;
     u32 tilePos;
     u8* layer;
@@ -29,7 +29,7 @@ void Object9E(Entity* this) {
             SetTile(0x4066, tilePos - 1, *layer);
             SetTile(0x4065, tilePos, *layer);
             UpdateSpriteForCollisionLayer(this);
-            ent = CreateObject(OBJECT_9E, 1, 0);
+            ent = CreateObject(TREE_THORNS, 1, 0);
             if (ent != NULL) {
                 this->child = ent;
                 CopyPosition(this, ent);
diff --git a/src/objectDefinitions.c b/src/objectDefinitions.c
index c8154dec..4a0186a1 100644
--- a/src/objectDefinitions.c
+++ b/src/objectDefinitions.c
@@ -118,9 +118,9 @@ const ObjectDefinition gObjectDefinition_25[] = {
     { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, SPRITE_0, 0, 0 } },
 };
 const ObjectDefinition gObjectDefinition_24[] = {
-    { { 1, 0, 0, 0, 22, 0, 0 }, { 0, 0, 0, 0, SPRITE_OBJECT24, 0, 0 } },
-    { { 1, 0, 0, 0, 39, 0, 0 }, { 0, 0, 0, 0, SPRITE_OBJECT24, 0, 0 } },
-    { { 1, 0, 0, 0, 40, 0, 0 }, { 0, 0, 0, 0, SPRITE_OBJECT24, 0, 0 } },
+    { { 1, 0, 0, 0, 22, 0, 0 }, { 0, 0, 0, 0, SPRITE_PRESSUREPLATE, 0, 0 } },
+    { { 1, 0, 0, 0, 39, 0, 0 }, { 0, 0, 0, 0, SPRITE_PRESSUREPLATE, 0, 0 } },
+    { { 1, 0, 0, 0, 40, 0, 0 }, { 0, 0, 0, 0, SPRITE_PRESSUREPLATE, 0, 0 } },
 };
 #ifdef EU
 const ObjectDefinition gObjectDefinition_1C[] = {