summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-12-17 11:26:16 -0800
committertheo3 <arisstephenson2@gmail.com>2021-12-17 11:26:16 -0800
commitc2ba47d796dfdbd091d534ee70456fd47d2ef4b6 (patch)
treec95af2d90d4d83b59c3dee53fe29ca6c303af118 /src/object
parent929f6000a634910fd89f54c646d05e6a168e2a18 (diff)
identify more objects
Diffstat (limited to 'src/object')
-rw-r--r--src/object/furniture.c2
-rw-r--r--src/object/treeThorns.c (renamed from src/object/object9E.c)4
2 files changed, 3 insertions, 3 deletions
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);