From c2ba47d796dfdbd091d534ee70456fd47d2ef4b6 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Fri, 17 Dec 2021 11:26:16 -0800
Subject: identify more objects

---
 src/object/furniture.c  |  2 +-
 src/object/object9E.c   | 43 -------------------------------------------
 src/object/treeThorns.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 src/object/object9E.c
 create mode 100644 src/object/treeThorns.c

(limited to 'src/object')

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/object9E.c
deleted file mode 100644
index d44adf62..00000000
--- a/src/object/object9E.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "global.h"
-#include "entity.h"
-#include "coord.h"
-#include "room.h"
-#include "object.h"
-#include "functions.h"
-
-extern Hitbox gHitbox_1;
-
-void Object9E(Entity* this) {
-    Entity* ent;
-    u32 tilePos;
-    u8* layer;
-
-    if (this->action == 0) {
-        this->action = 1;
-        this->spritePriority.b0 = 6;
-        if (this->type == 0) {
-            COLLISION_ON(this);
-            this->frameIndex = 1;
-            layer = &this->collisionLayer;
-            *layer = 1;
-            this->field_0x3c = 7;
-            this->hurtType = 0x48;
-            this->hitType = 0x7a;
-            this->flags2 = 1;
-            this->hitbox = &gHitbox_1;
-            tilePos = COORD_TO_TILE(this);
-            SetTile(0x4066, tilePos - 1, *layer);
-            SetTile(0x4065, tilePos, *layer);
-            UpdateSpriteForCollisionLayer(this);
-            ent = CreateObject(OBJECT_9E, 1, 0);
-            if (ent != NULL) {
-                this->child = ent;
-                CopyPosition(this, ent);
-            }
-        } else {
-            this->frameIndex = 0;
-            this->collisionLayer = 2;
-            UpdateSpriteForCollisionLayer(this);
-        }
-    }
-}
diff --git a/src/object/treeThorns.c b/src/object/treeThorns.c
new file mode 100644
index 00000000..5a52b9a5
--- /dev/null
+++ b/src/object/treeThorns.c
@@ -0,0 +1,43 @@
+#include "global.h"
+#include "entity.h"
+#include "coord.h"
+#include "room.h"
+#include "object.h"
+#include "functions.h"
+
+extern Hitbox gHitbox_1;
+
+void TreeThorns(Entity* this) {
+    Entity* ent;
+    u32 tilePos;
+    u8* layer;
+
+    if (this->action == 0) {
+        this->action = 1;
+        this->spritePriority.b0 = 6;
+        if (this->type == 0) {
+            COLLISION_ON(this);
+            this->frameIndex = 1;
+            layer = &this->collisionLayer;
+            *layer = 1;
+            this->field_0x3c = 7;
+            this->hurtType = 0x48;
+            this->hitType = 0x7a;
+            this->flags2 = 1;
+            this->hitbox = &gHitbox_1;
+            tilePos = COORD_TO_TILE(this);
+            SetTile(0x4066, tilePos - 1, *layer);
+            SetTile(0x4065, tilePos, *layer);
+            UpdateSpriteForCollisionLayer(this);
+            ent = CreateObject(TREE_THORNS, 1, 0);
+            if (ent != NULL) {
+                this->child = ent;
+                CopyPosition(this, ent);
+            }
+        } else {
+            this->frameIndex = 0;
+            this->collisionLayer = 2;
+            UpdateSpriteForCollisionLayer(this);
+        }
+    }
+}
-- 
cgit v1.2.3