Rename objects

1 files changed, 63 insertions, 63 deletions

diff --git a/src/object.c b/src/object.c
index 42aed751..d4771b3f 100644
--- a/src/object.c
+++ b/src/object.c
@@ -11,41 +11,41 @@ void (*const gObjectFunctions[])(Entity*) = {
     [EZLO_CAP] = EzloCap,
     [PUSHED_BLOCK] = BlockPushed,
     [LOCKED_DOOR] = LockedDoor,
-    [OBJECT_9] = Object9,
+    [CAMERA_TARGET] = CameraTarget,
     [OBJECT_A] = ObjectA,
-    [OBJECT_B] = ObjectB,
+    [LINK_HOLDING_ITEM] = LinkHoldingItem,
     [CHEST_SPAWNER] = ChestSpawner,
-    [OBJECT_D] = ObjectD,
-    [OBJECT_E] = ObjectE,
+    [UNUSED_SKULL] = UnusedSkull,
+    [CRACKING_GROUND] = CrackingGround,
     [SPECIAL_FX] = SpecialFx,
     [PLAYER_CLONE] = PlayerClone,
-    [OBJECT_11] = Object11,
-    [OBJECT_12] = Object12,
+    [BUSH] = Bush,
+    [LIGHT_DOOR] = LightDoor,
     [RAILTRACK] = Railtrack,
     [LILYPAD_LARGE] = LilypadLarge,
-    [OBJECT_15] = Object15,
+    [CHUCHU_BOSS_PARTICLE] = ChuchuBossParticle,
     [FLOATING_PLATFORM] = FloatingPlatform,
-    [OBJECT_17] = Object17,
+    [GUST_JAR_PARTICLE] = GustJarParticle,
     [EVIL_SPIRIT] = EvilSpirit,
     [HOUSE_DOOR_EXT] = HouseDoorExterior,
     [RUPEE_OBJECT] = Rupee,
     [GREAT_FAIRY] = GreatFairy,
-    [OBJECT_1C] = Object1C,
+    [HOUSE_SIGN] = HouseSign,
     [OBJECT_1D] = Object1D,
-    [OBJECT_1E] = Object1E,
+    [MOLE_MITTS_PARTICLE] = MoleMittsParticle,
     [OBJECT_1F] = Object1F,
-    [OBJECT_20] = Object20,
-    [OBJECT_21] = Object21,
+    [SMOKE_PARTICLE] = SmokeParticle,
+    [DIRT_PARTICLE] = DirtParticle,
     [FIGURINE_DEVICE] = FigurineDevice,
     [EYE_SWITCH] = EyeSwitch,
     [PRESSURE_PLATE] = PressurePlate,
     [BIG_BARREL] = BigBarrel,
     [BARREL_INSIDE] = BarrelInside,
     [PUSHABLE_STATUE] = PushableStatue,
-    [OBJECT_28] = Object28,
+    [PARALLAX_ROOM_VIEW] = ParallaxRoomView,
     [AMBIENT_CLOUDS] = AmbientClouds,
-    [OBJECT_2A] = Object2A,
-    [OBJECT_2B] = Object2B,
+    [FLAME] = Flame,
+    [LILYPAD_LARGE_FALLING] = LilypadLargeFalling,
     [BEANSTALK] = Beanstalk,
     [SMOKE] = Smoke,
     [PUSHABLE_ROCK] = PushableRock,
@@ -55,36 +55,36 @@ void (*const gObjectFunctions[])(Entity*) = {
     [PULLABLE_MUSHROOM] = PullableMushroom,
     [BOLLARD] = Bollard,
     [WARP_POINT] = WarpPoint,
-    [OBJECT_35] = Object35,
-    [OBJECT_36] = Object36,
+    [CARLOV_OBJECT] = CarlovObject,
+    [BARREL_SPIDERWEB] = BarrelSpiderweb,
     [OBJECT_37] = Object37,
     [JAR_PORTAL] = JarPortal,
     [BOSS_DOOR] = BossDoor,
-    [OBJECT_3A] = Object3A,
-    [PORTAL_MUSHROOM_STALKS] = MacroMushroomStalks,
+    [WHITE_TRIANGLE_EFFECT] = WhiteTriangleEffect,
+    [PORTAL_MUSHROOM_STALKS] = MacroMushroomStalk,
     [PORTAL_FALLING_PLAYER] = MacroPlayer,
-    [OBJECT_3D] = Object3D,
-    [OBJECT_3E] = Object3E,
+    [MINISH_PORTAL_CLOSEUP] = MinishPortalCloseup,
+    [MINISH_VILLAGE_OBJECT] = MinishVillageObject,
     [GIANT_LEAF] = GiantLeaf,
     [FAIRY] = Fairy,
     [LADDER_UP] = LadderUp,
-    [OBJECT_42] = Object42,
-    [OBJECT_43] = Object43,
-    [OBJECT_44] = Object44,
-    [OBJECT_45] = Object45,
+    [LINK_FIRE] = LinkFire,
+    [SWORD_PARTICLE] = SwordParticle,
+    [ROTATING_TRAPDOOR] = RotatingTrapdoor,
+    [LAMP_PARTICLE] = LampParticle,
     [GIANT_BOOK_LADDER] = GiantBookLadder,
     [HEART_CONTAINER] = HeartContainer,
     [FILE_SCREEN_OBJECTS] = FileScreenObjects,
-    [OBJECT_49] = Object49,
+    [CHUCHU_BOSS_START_PARTICLE] = ChuchuBossStartParticle,
     [BACKGROUND_CLOUD] = BackgroundCloud,
-    [OBJECT_4B] = Object4B,
+    [CHUCHU_BOSS_CUTSCENE] = ChuchuBossCutscene,
     [PUSHABLE_FURNITURE] = PushableFurniture,
     [FURNITURE] = Furniture,
     [MINISH_SIZED_ENTRANCE] = MinishSizedEntrance,
     [ARCHWAY] = Archway,
     [GIANT_ROCK] = GiantRock,
     [GIANT_ROCK2] = GiantRock2,
-    [OBJECT_52] = Object52,
+    [SPECIAL_CHEST] = SpecialChest,
     [OBJECT_53] = Object53,
     [PULLABLE_LEVER] = PullableLever,
     [MINECART] = Minecart,
@@ -93,22 +93,22 @@ void (*const gObjectFunctions[])(Entity*) = {
     [GENTARI_CURTAIN] = GentariCurtain,
     [LAVA_PLATFORM] = LavaPlatform,
     [PAPER] = Paper,
-    [OBJECT_5B] = Object5B,
+    [BED_COVER] = BedCover,
     [MASK] = Mask,
     [HOUSE_DOOR_INT] = HouseDoorInterior,
     [WHIRLWIND] = Whirlwind,
     [OBJECT_BLOCKING_STAIRS] = ObjectBlockingStairs,
     [SWORDSMAN_NEWSLETTER] = SwordsmanNewsletter,
-    [OBJECT_61] = Object61,
+    [EZLO_CAP_FLYING] = EzloCapFlying,
     [GIANT_TWIG] = GiantTwig,
     [OBJECT_63] = Object63,
-    [OBJECT_64] = Object64,
+    [THUNDERBOLD] = Thunderbold,
     [LADDER_HOLE] = LadderHoleInBookshelf,
-    [OBJECT_66] = Object66,
-    [OBJECT_67] = Object67,
-    [OBJECT_68] = Object68,
-    [OBJECT_69] = Object69,
-    [OBJECT_6A] = Object6A,
+    [WATER_DROP_OBJECT] = WaterDropObject,
+    [GLEEROK_PARTICLE] = GleerokParticle,
+    [LINK_EMPTYING_BOTTLE] = LinkEmptyingBottle,
+    [CUTSCENE_ORCHESTRATOR] = CutsceneOrchestrator,
+    [CUTSCENE_MISC_OBJECT] = CutsceneMiscObject,
     [CRENEL_BEAN_SPROUT] = CrenelBeanSprout,
     [MINECART_DOOR] = MinecartDoor,
     [OBJECT_ON_PILLAR] = ObjectOnPillar,
@@ -118,25 +118,25 @@ void (*const gObjectFunctions[])(Entity*) = {
     [PUSHABLE_GRAVE] = PushableGrave,
     [STONE_TABLET] = StoneTablet,
     [LILYPAD_SMALL] = LilypadSmall,
-    [OBJECT_74] = Object74,
-    [OBJECT_75] = Object75,
-    [OBJECT_76] = Object76,
+    [MINISH_PORTAL_STONE] = MinishPortalStone,
+    [MACRO_CRYSTAL] = MacroCrystal,
+    [MACRO_LEAF] = MacroLeaf,
     [BELL] = Bell,
     [HUGE_DECORATION] = MacroDecoration,
-    [OBJECT_79] = Object79,
+    [SHRINKING_HIEROGLYPHS] = ShrinkingHieroglyphs,
     [STEAM] = Steam,
     [PUSHABLE_LEVER] = PushableLever,
-    [HUGE_SHOES] = MacroShoes,
+    [HUGE_SHOES] = MacroShoe,
     [OBJECT_ON_BEETLE] = ObjectOnSpinyBeetle,
-    [OBJECT_7E] = Object7E,
+    [MAZAAL_OBJECT] = MazaalObject,
     [PICO_BLOOM] = PicoBloom,
     [BOARD] = Board,
-    [OBJECT_81] = Object81,
+    [BENCH] = Bench,
     [BIG_VORTEX] = BigVortex,
     [BIG_PUSHABLE_LEVER] = BigPushableLever,
     [SMALL_ICE_BLOCK] = SmallIceBlock,
     [BIG_ICE_BLOCK] = BigIceBlock,
-    [OBJECT_86] = Object86,
+    [TRAPDOOR] = Trapdoor,
     [OCTOROK_BOSS_OBJECT] = OctorokBossObject,
     [HUGE_BOOK] = MacroBook,
     [MAZAAL_BOSS_OBJECT] = MazaalBossObject,
@@ -144,20 +144,20 @@ void (*const gObjectFunctions[])(Entity*) = {
     [DOUBLE_BOOKSHELF] = DoubleBookshelf,
     [BOOK] = Book,
     [FIREPLACE] = Fireplace,
-    [OBJECT_8E] = Object8E,
+    [LIGHT_RAY] = LightRay,
     [FROZEN_WATER_ELEMENT] = FrozenWaterElement,
-    [OBJECT_90] = Object90,
+    [WATER_ELEMENT] = WaterElement,
     [FROZEN_OCTOROK] = FrozenOctorok,
     [BAKER_OVEN] = BakerOven,
     [LAMP] = Lamp,
     [WIND_TRIBE_FLAG] = WindTribeFlag,
     [BIRD] = Bird,
-    [OBJECT_96] = Object96,
+    [GRAVEYARD_KEY] = GraveyardKey,
     [KEY_STEALING_TAKKURI] = KeyStealingTakkuri,
-    [OBJECT_98] = Object98,
-    [OBJECT_99] = Object99,
+    [GURUGURU_BAR] = GuruguruBar,
+    [HIT_SWITCH] = HitSwitch,
     [HUGE_ACORN] = MacroAcorn,
-    [OBJECT_9B] = Object9B,
+    [VAATI2_PARTICLE] = Vaati2Particle,
     [TREE_HIDING_PORTAL] = TreeHidingPortal,
     [LIGHTABLE_SWITCH] = LightableSwitch,
     [TREE_THORNS] = TreeThorns,
@@ -168,34 +168,34 @@ void (*const gObjectFunctions[])(Entity*) = {
     [CLOUD] = Cloud,
     [MINISH_LIGHT] = MinishLight,
     [FIREBALL_CHAIN] = FireballChain,
-    [OBJECT_A6] = ObjectA6,
+    [SANCTUARY_STONE_TABLET] = SanctuaryStoneTablet,
     [OBJECT_A7] = ObjectA7,
     [OBJECT_A8] = ObjectA8,
-    [OBJECT_A9] = ObjectA9,
+    [MULLDOZER_SPAWN_POINT] = MulldozerSpawnPoint,
     [WATERFALL_OPENING] = WaterfallOpening,
-    [OBJECT_AB] = ObjectAB,
+    [VAATI1_PORTAL] = Vaati1Portal,
     [FOUR_ELEMENTS] = FourElements,
-    [OBJECT_AD] = ObjectAD,
+    [ELEMENTS_BACKGROUND] = ElementsBackground,
     [FLOATING_BLOCK] = FloatingBlock,
-    [OBJECT_AF] = ObjectAF,
+    [VAATI3_ARM] = Vaati3Arm,
     [METAL_DOOR] = MetalDoor,
     [JAIL_BARS] = JailBars,
-    [OBJECT_B2] = ObjectB2,
-    [OBJECT_B3] = ObjectB3,
-    [OBJECT_B4] = ObjectB4,
-    [OBJECT_B5] = ObjectB5,
-    [OBJECT_B6] = ObjectB6,
+    [FAN_WIND] = FanWind,
+    [KINSTONE_SPARK] = KinstoneSpark,
+    [JAPANESE_SUBTITLE] = JapaneseSubtitle,
+    [VAATI3_PLAYER_OBJECT] = Vaati3PlayerObject,
+    [VAATI3_DEATH] = Vaati3Death,
     [WELL] = Well,
     [WIND_TRIBE_TELEPORTER] = WindTribeTeleporter,
-    [CUCCO_MINIGAME] = ObjectB9,
+    [CUCCO_MINIGAME] = CuccoMinigame,
     [GYORG_BOSS_OBJECT] = GyorgBossObject,
     [WINDCREST] = Windcrest,
     [LIT_AREA] = LitArea,
-    [OBJECT_BD] = ObjectBD,
+    [TITLE_SCREEN_OBJECT] = TitleScreenObject,
     [PINWHEEL] = Pinwheel,
     [OBJECT_BF] = ObjectBF,
     [ENEMY_ITEM] = EnemyItem,
-    [OBJECT_C1] = ObjectC1,
+    [OBJECT_C1] = LinkAnimation,
 };
 
 void ObjectInit(Entity*);