identify more objects

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;

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,

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,

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);

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[] = {