From 125b16cb17717ab0e535b5c91c02007eab1db515 Mon Sep 17 00:00:00 2001 From: Rozelette Date: Fri, 7 Aug 2020 17:12:03 -0500 Subject: [PATCH] Add object enum (#9) --- include/structs.h | 646 +++++++++++++++++++++++++++++++++++++++++++++ src/code/z_scene.c | 6 +- 2 files changed, 648 insertions(+), 4 deletions(-) diff --git a/include/structs.h b/include/structs.h index a235ac81f5..6890744d76 100644 --- a/include/structs.h +++ b/include/structs.h @@ -3937,4 +3937,650 @@ typedef enum { /* 0x70 */ SCENE_ALLEY } SceneID; +typedef enum { + /* 0x000 */ OBJECT_UNSET_0, + /* 0x001 */ GAMEPLAY_KEEP, + /* 0x002 */ GAMEPLAY_FIELD_KEEP, + /* 0x003 */ GAMEPLAY_DANGEON_KEEP, + /* 0x004 */ OBJECT_NB, + /* 0x005 */ OBJECT_OKUTA, + /* 0x006 */ OBJECT_CROW, + /* 0x007 */ OBJECT_AH, + /* 0x008 */ OBJECT_DY_OBJ, + /* 0x009 */ OBJECT_WALLMASTER, + /* 0x00A */ OBJECT_DODONGO, + /* 0x00B */ OBJECT_FIREFLY, + /* 0x00C */ OBJECT_BOX, + /* 0x00D */ OBJECT_AL, + /* 0x00E */ OBJECT_BUBBLE, + /* 0x00F */ OBJECT_NIW, + /* 0x010 */ OBJECT_LINK_BOY, + /* 0x011 */ OBJECT_LINK_CHILD, + /* 0x012 */ OBJECT_TITE, + /* 0x013 */ OBJECT_TAB, + /* 0x014 */ OBJECT_PH, + /* 0x015 */ OBJECT_AND, + /* 0x016 */ OBJECT_MSMO, + /* 0x017 */ OBJECT_DINOFOS, + /* 0x018 */ OBJECT_DRS, + /* 0x019 */ OBJECT_ZL1, + /* 0x01A */ OBJECT_AN4, + /* 0x01B */ OBJECT_UNSET_1B, + /* 0x01C */ OBJECT_TEST3, + /* 0x01D */ OBJECT_FAMOS, + /* 0x01E */ OBJECT_UNSET_1E, + /* 0x01F */ OBJECT_UNSET_1F, + /* 0x020 */ OBJECT_ST, + /* 0x021 */ OBJECT_UNSET_21, + /* 0x022 */ OBJECT_THIEFBIRD, + /* 0x023 */ OBJECT_UNSET_23, + /* 0x024 */ OBJECT_UNSET_24, + /* 0x025 */ OBJECT_UNSET_25, + /* 0x026 */ OBJECT_UNSET_26, + /* 0x027 */ OBJECT_UNSET_27, + /* 0x028 */ OBJECT_UNSET_28, + /* 0x029 */ OBJECT_UNSET_29, + /* 0x02A */ OBJECT_BOMBF, + /* 0x02B */ OBJECT_UNSET_2B, + /* 0x02C */ OBJECT_UNSET_2C, + /* 0x02D */ OBJECT_UNSET_2D, + /* 0x02E */ OBJECT_UNSET_2E, + /* 0x02F */ OBJECT_UNSET_2F, + /* 0x030 */ OBJECT_AM, + /* 0x031 */ OBJECT_DEKUBABA, + /* 0x032 */ OBJECT_UNSET_32, + /* 0x033 */ OBJECT_UNSET_33, + /* 0x034 */ OBJECT_UNSET_34, + /* 0x035 */ OBJECT_UNSET_35, + /* 0x036 */ OBJECT_UNSET_36, + /* 0x037 */ OBJECT_UNSET_37, + /* 0x038 */ OBJECT_UNSET_38, + /* 0x039 */ OBJECT_UNSET_39, + /* 0x03A */ OBJECT_UNSET_3A, + /* 0x03B */ OBJECT_UNSET_3B, + /* 0x03C */ OBJECT_UNSET_3C, + /* 0x03D */ OBJECT_UNSET_3D, + /* 0x03E */ OBJECT_WARP1, + /* 0x03F */ OBJECT_B_HEART, + /* 0x040 */ OBJECT_DEKUNUTS, + /* 0x041 */ OBJECT_UNSET_41, + /* 0x042 */ OBJECT_UNSET_42, + /* 0x043 */ OBJECT_UNSET_43, + /* 0x044 */ OBJECT_UNSET_44, + /* 0x045 */ OBJECT_UNSET_45, + /* 0x046 */ OBJECT_UNSET_46, + /* 0x047 */ OBJECT_UNSET_47, + /* 0x048 */ OBJECT_UNSET_48, + /* 0x049 */ OBJECT_UNSET_49, + /* 0x04A */ OBJECT_UNSET_4A, + /* 0x04B */ OBJECT_UNSET_4B, + /* 0x04C */ OBJECT_UNSET_4C, + /* 0x04D */ OBJECT_UNSET_4D, + /* 0x04E */ OBJECT_UNSET_4E, + /* 0x04F */ OBJECT_UNSET_4F, + /* 0x050 */ OBJECT_UNSET_50, + /* 0x051 */ OBJECT_BB, + /* 0x052 */ OBJECT_DEATH, + /* 0x053 */ OBJECT_UNSET_53, + /* 0x054 */ OBJECT_UNSET_54, + /* 0x055 */ OBJECT_UNSET_55, + /* 0x056 */ OBJECT_UNSET_56, + /* 0x057 */ OBJECT_UNSET_57, + /* 0x058 */ OBJECT_UNSET_58, + /* 0x059 */ OBJECT_UNSET_59, + /* 0x05A */ OBJECT_UNSET_5A, + /* 0x05B */ OBJECT_UNSET_5B, + /* 0x05C */ OBJECT_F40_OBJ, + /* 0x05D */ OBJECT_PO_COMPOSER, + /* 0x05E */ OBJECT_UNSET_5E, + /* 0x05F */ OBJECT_HATA, + /* 0x060 */ OBJECT_UNSET_60, + /* 0x061 */ OBJECT_WOOD02, + /* 0x062 */ OBJECT_UNSET_62, + /* 0x063 */ OBJECT_UNSET_63, + /* 0x064 */ OBJECT_TRAP, + /* 0x065 */ OBJECT_UNSET_65, + /* 0x066 */ OBJECT_UNSET_66, + /* 0x067 */ OBJECT_UNSET_67, + /* 0x068 */ OBJECT_UNSET_68, + /* 0x069 */ OBJECT_UNSET_69, + /* 0x06A */ OBJECT_VM, + /* 0x06B */ OBJECT_UNSET_6B, + /* 0x06C */ OBJECT_UNSET_6C, + /* 0x06D */ OBJECT_UNSET_6D, + /* 0x06E */ OBJECT_UNSET_6E, + /* 0x06F */ OBJECT_UNSET_6F, + /* 0x070 */ OBJECT_EFC_STAR_FIELD, + /* 0x071 */ OBJECT_UNSET_71, + /* 0x072 */ OBJECT_UNSET_72, + /* 0x073 */ OBJECT_UNSET_73, + /* 0x074 */ OBJECT_UNSET_74, + /* 0x075 */ OBJECT_RD, + /* 0x076 */ OBJECT_YUKIMURA_OBJ, + /* 0x077 */ OBJECT_HEAVY_OBJECT, + /* 0x078 */ OBJECT_UNSET_78, + /* 0x079 */ OBJECT_UNSET_79, + /* 0x07A */ OBJECT_UNSET_7A, + /* 0x07B */ OBJECT_UNSET_7B, + /* 0x07C */ OBJECT_UNSET_7C, + /* 0x07D */ OBJECT_HORSE_LINK_CHILD, + /* 0x07E */ OBJECT_UNSET_7E, + /* 0x07F */ OBJECT_UNSET_7F, + /* 0x080 */ OBJECT_SYOKUDAI, + /* 0x081 */ OBJECT_UNSET_81, + /* 0x082 */ OBJECT_UNSET_82, + /* 0x083 */ OBJECT_UNSET_83, + /* 0x084 */ OBJECT_EFC_TW, + /* 0x085 */ OBJECT_UNSET_85, + /* 0x086 */ OBJECT_GI_KEY, + /* 0x087 */ OBJECT_MIR_RAY, + /* 0x088 */ OBJECT_CTOWER_ROT, + /* 0x089 */ OBJECT_UNSET_89, + /* 0x08A */ OBJECT_BDOOR, + /* 0x08B */ OBJECT_UNSET_8B, + /* 0x08C */ OBJECT_UNSET_8C, + /* 0x08D */ OBJECT_UNSET_8D, + /* 0x08E */ OBJECT_SB, + /* 0x08F */ OBJECT_GI_MELODY, + /* 0x090 */ OBJECT_GI_HEART, + /* 0x091 */ OBJECT_GI_COMPASS, + /* 0x092 */ OBJECT_GI_BOSSKEY, + /* 0x093 */ OBJECT_UNSET_93, + /* 0x094 */ OBJECT_GI_NUTS, + /* 0x095 */ OBJECT_UNSET_95, + /* 0x096 */ OBJECT_GI_HEARTS, + /* 0x097 */ OBJECT_GI_ARROWCASE, + /* 0x098 */ OBJECT_GI_BOMBPOUCH, + /* 0x099 */ OBJECT_IN, + /* 0x09A */ OBJECT_UNSET_9A, + /* 0x09B */ OBJECT_UNSET_9B, + /* 0x09C */ OBJECT_UNSET_9C, + /* 0x09D */ OBJECT_OS_ANIME, + /* 0x09E */ OBJECT_GI_BOTTLE, + /* 0x09F */ OBJECT_GI_STICK, + /* 0x0A0 */ OBJECT_GI_MAP, + /* 0x0A1 */ OBJECT_OF1D_MAP, + /* 0x0A2 */ OBJECT_RU2, + /* 0x0A3 */ OBJECT_UNSET_A3, + /* 0x0A4 */ OBJECT_GI_MAGICPOT, + /* 0x0A5 */ OBJECT_GI_BOMB_1, + /* 0x0A6 */ OBJECT_UNSET_A6, + /* 0x0A7 */ OBJECT_MA2, + /* 0x0A8 */ OBJECT_GI_PURSE, + /* 0x0A9 */ OBJECT_UNSET_A9, + /* 0x0AA */ OBJECT_UNSET_AA, + /* 0x0AB */ OBJECT_RR, + /* 0x0AC */ OBJECT_UNSET_AC, + /* 0x0AD */ OBJECT_UNSET_AD, + /* 0x0AE */ OBJECT_UNSET_AE, + /* 0x0AF */ OBJECT_GI_ARROW, + /* 0x0B0 */ OBJECT_GI_BOMB_2, + /* 0x0B1 */ OBJECT_UNSET_B1, + /* 0x0B2 */ OBJECT_UNSET_B2, + /* 0x0B3 */ OBJECT_GI_SHIELD_2, + /* 0x0B4 */ OBJECT_GI_HOOKSHOT, + /* 0x0B5 */ OBJECT_GI_OCARINA, + /* 0x0B6 */ OBJECT_GI_MILK, + /* 0x0B7 */ OBJECT_MA1, + /* 0x0B8 */ OBJECT_UNSET_B8, + /* 0x0B9 */ OBJECT_UNSET_B9, + /* 0x0BA */ OBJECT_UNSET_BA, + /* 0x0BB */ OBJECT_NY, + /* 0x0BC */ OBJECT_FR, + /* 0x0BD */ OBJECT_UNSET_BD, + /* 0x0BE */ OBJECT_UNSET_BE, + /* 0x0BF */ OBJECT_GI_BOW, + /* 0x0C0 */ OBJECT_GI_GLASSES, + /* 0x0C1 */ OBJECT_GI_LIQUID, + /* 0x0C2 */ OBJECT_ANI, + /* 0x0C3 */ OBJECT_GI_SHIELD_3, + /* 0x0C4 */ OBJECT_UNSET_C4, + /* 0x0C5 */ OBJECT_UNSET_C5, + /* 0x0C6 */ OBJECT_GI_BEAN, + /* 0x0C7 */ OBJECT_GI_FISH, + /* 0x0C8 */ OBJECT_UNSET_C8, + /* 0x0C9 */ OBJECT_UNSET_C9, + /* 0x0CA */ OBJECT_UNSET_CA, + /* 0x0CB */ OBJECT_GI_LONGSWORD, + /* 0x0CC */ OBJECT_UNSET_CC, + /* 0x0CD */ OBJECT_UNSET_CD, + /* 0x0CE */ OBJECT_UNSET_CE, + /* 0x0CF */ OBJECT_UNSET_CF, + /* 0x0D0 */ OBJECT_ZO, + /* 0x0D1 */ OBJECT_UNSET_D1, + /* 0x0D2 */ OBJECT_UMAJUMP, + /* 0x0D3 */ OBJECT_UNSET_D3, + /* 0x0D4 */ OBJECT_UNSET_D4, + /* 0x0D5 */ OBJECT_MASTERGOLON, + /* 0x0D6 */ OBJECT_MASTERZOORA, + /* 0x0D7 */ OBJECT_AOB, + /* 0x0D8 */ OBJECT_IK, + /* 0x0D9 */ OBJECT_AHG, + /* 0x0DA */ OBJECT_CNE, + /* 0x0DB */ OBJECT_UNSET_DB, + /* 0x0DC */ OBJECT_UNSET_DC, + /* 0x0DD */ OBJECT_AN3, + /* 0x0DE */ OBJECT_BJI, + /* 0x0DF */ OBJECT_BBA, + /* 0x0E0 */ OBJECT_AN2, + /* 0x0E1 */ OBJECT_UNSET_E1, + /* 0x0E2 */ OBJECT_AN1, + /* 0x0E3 */ OBJECT_BOJ, + /* 0x0E4 */ OBJECT_FZ, + /* 0x0E5 */ OBJECT_BOB, + /* 0x0E6 */ OBJECT_GE1, + /* 0x0E7 */ OBJECT_YABUSAME_POINT, + /* 0x0E8 */ OBJECT_UNSET_E8, + /* 0x0E9 */ OBJECT_UNSET_E9, + /* 0x0EA */ OBJECT_UNSET_EA, + /* 0x0EB */ OBJECT_UNSET_EB, + /* 0x0EC */ OBJECT_D_HSBLOCK, + /* 0x0ED */ OBJECT_D_LIFT, + /* 0x0EE */ OBJECT_MAMENOKI, + /* 0x0EF */ OBJECT_GOROIWA, + /* 0x0F0 */ OBJECT_TORYO, + /* 0x0F1 */ OBJECT_DAIKU, + /* 0x0F2 */ OBJECT_NWC, + /* 0x0F3 */ OBJECT_GM, + /* 0x0F4 */ OBJECT_MS, + /* 0x0F5 */ OBJECT_HS, + /* 0x0F6 */ OBJECT_UNSET_F6, + /* 0x0F7 */ OBJECT_LIGHTSWITCH, + /* 0x0F8 */ OBJECT_KUSA, + /* 0x0F9 */ OBJECT_TSUBO, + /* 0x0FA */ OBJECT_UNSET_FA, + /* 0x0FB */ OBJECT_UNSET_FB, + /* 0x0FC */ OBJECT_KANBAN, + /* 0x0FD */ OBJECT_OWL, + /* 0x0FE */ OBJECT_MK, + /* 0x0FF */ OBJECT_FU, + /* 0x100 */ OBJECT_GI_KI_TAN_MASK, + /* 0x101 */ OBJECT_UNSET_101, + /* 0x102 */ OBJECT_GI_MASK18, + /* 0x103 */ OBJECT_GI_RABIT_MASK, + /* 0x104 */ OBJECT_GI_TRUTH_MASK, + /* 0x105 */ OBJECT_UNSET_105, + /* 0x106 */ OBJECT_STREAM, + /* 0x107 */ OBJECT_MM, + /* 0x108 */ OBJECT_UNSET_108, + /* 0x109 */ OBJECT_UNSET_109, + /* 0x10A */ OBJECT_UNSET_10A, + /* 0x10B */ OBJECT_UNSET_10B, + /* 0x10C */ OBJECT_UNSET_10C, + /* 0x10D */ OBJECT_UNSET_10D, + /* 0x10E */ OBJECT_UNSET_10E, + /* 0x10F */ OBJECT_JS, + /* 0x110 */ OBJECT_CS, + /* 0x111 */ OBJECT_UNSET_111, + /* 0x112 */ OBJECT_UNSET_112, + /* 0x113 */ OBJECT_GI_SOLDOUT, + /* 0x114 */ OBJECT_UNSET_114, + /* 0x115 */ OBJECT_MAG, + /* 0x116 */ OBJECT_UNSET_116, + /* 0x117 */ OBJECT_UNSET_117, + /* 0x118 */ OBJECT_UNSET_118, + /* 0x119 */ OBJECT_GI_GOLONMASK, + /* 0x11A */ OBJECT_GI_ZORAMASK, + /* 0x11B */ OBJECT_UNSET_11B, + /* 0x11C */ OBJECT_UNSET_11C, + /* 0x11D */ OBJECT_KA, + /* 0x11E */ OBJECT_UNSET_11E, + /* 0x11F */ OBJECT_ZG, + /* 0x120 */ OBJECT_UNSET_120, + /* 0x121 */ OBJECT_GI_M_ARROW, + /* 0x122 */ OBJECT_DS2, + /* 0x123 */ OBJECT_UNSET_123, + /* 0x124 */ OBJECT_FISH, + /* 0x125 */ OBJECT_GI_SUTARU, + /* 0x126 */ OBJECT_UNSET_126, + /* 0x127 */ OBJECT_SSH, + /* 0x128 */ OBJECT_BIGSLIME, + /* 0x129 */ OBJECT_BG, + /* 0x12A */ OBJECT_BOMBIWA, + /* 0x12B */ OBJECT_HINTNUTS, + /* 0x12C */ OBJECT_RS, + /* 0x12D */ OBJECT_UNSET_12D, + /* 0x12E */ OBJECT_GLA, + /* 0x12F */ OBJECT_UNSET_12F, + /* 0x130 */ OBJECT_GELDB, + /* 0x131 */ OBJECT_UNSET_131, + /* 0x132 */ OBJECT_DOG, + /* 0x133 */ OBJECT_KIBAKO2, + /* 0x134 */ OBJECT_DNS, + /* 0x135 */ OBJECT_DNK, + /* 0x136 */ OBJECT_UNSET_136, + /* 0x137 */ OBJECT_GI_INSECT, + /* 0x138 */ OBJECT_UNSET_138, + /* 0x139 */ OBJECT_GI_GHOST, + /* 0x13A */ OBJECT_GI_SOUL, + /* 0x13B */ OBJECT_UNSET_13B, + /* 0x13C */ OBJECT_UNSET_13C, + /* 0x13D */ OBJECT_UNSET_13D, + /* 0x13E */ OBJECT_UNSET_13E, + /* 0x13F */ OBJECT_GI_RUPY, + /* 0x140 */ OBJECT_MU, + /* 0x141 */ OBJECT_WF, + /* 0x142 */ OBJECT_SKB, + /* 0x143 */ OBJECT_GS, + /* 0x144 */ OBJECT_PS, + /* 0x145 */ OBJECT_OMOYA_OBJ, + /* 0x146 */ OBJECT_COW, + /* 0x147 */ OBJECT_UNSET_147, + /* 0x148 */ OBJECT_GI_SWORD_1, + /* 0x149 */ OBJECT_UNSET_149, + /* 0x14A */ OBJECT_UNSET_14A, + /* 0x14B */ OBJECT_ZL4, + /* 0x14C */ OBJECT_LINK_GORON, + /* 0x14D */ OBJECT_LINK_ZORA, + /* 0x14E */ OBJECT_GRASSHOPPER, + /* 0x14F */ OBJECT_BOYO, + /* 0x150 */ OBJECT_UNSET_150, + /* 0x151 */ OBJECT_UNSET_151, + /* 0x152 */ OBJECT_UNSET_152, + /* 0x153 */ OBJECT_FWALL, + /* 0x154 */ OBJECT_LINK_NUTS, + /* 0x155 */ OBJECT_JSO, + /* 0x156 */ OBJECT_KNIGHT, + /* 0x157 */ OBJECT_ICICLE, + /* 0x158 */ OBJECT_SPDWEB, + /* 0x159 */ OBJECT_UNSET_159, + /* 0x15A */ OBJECT_BOSS01, + /* 0x15B */ OBJECT_BOSS02, + /* 0x15C */ OBJECT_BOSS03, + /* 0x15D */ OBJECT_BOSS04, + /* 0x15E */ OBJECT_BOSS05, + /* 0x15F */ OBJECT_BOSS06, + /* 0x160 */ OBJECT_BOSS07, + /* 0x161 */ OBJECT_RAF, + /* 0x162 */ OBJECT_FUNEN, + /* 0x163 */ OBJECT_RAILLIFT, + /* 0x164 */ OBJECT_NUMA_OBJ, + /* 0x165 */ OBJECT_FLOWERPOT, + /* 0x166 */ OBJECT_SPINYROLL, + /* 0x167 */ OBJECT_ICE_BLOCK, + /* 0x168 */ OBJECT_UNSET_168, + /* 0x169 */ OBJECT_KEIKOKU_DEMO, + /* 0x16A */ OBJECT_SLIME, + /* 0x16B */ OBJECT_PR, + /* 0x16C */ OBJECT_F52_OBJ, + /* 0x16D */ OBJECT_F53_OBJ, + /* 0x16E */ OBJECT_UNSET_16E, + /* 0x16F */ OBJECT_KIBAKO, + /* 0x170 */ OBJECT_SEK, + /* 0x171 */ OBJECT_GMO, + /* 0x172 */ OBJECT_BAT, + /* 0x173 */ OBJECT_SEKIHIL, + /* 0x174 */ OBJECT_SEKIHIG, + /* 0x175 */ OBJECT_SEKIHIN, + /* 0x176 */ OBJECT_SEKIHIZ, + /* 0x177 */ OBJECT_UNSET_177, + /* 0x178 */ OBJECT_WIZ, + /* 0x179 */ OBJECT_LADDER, + /* 0x17A */ OBJECT_MKK, + /* 0x17B */ OBJECT_UNSET_17B, + /* 0x17C */ OBJECT_UNSET_17C, + /* 0x17D */ OBJECT_UNSET_17D, + /* 0x17E */ OBJECT_KEIKOKU_OBJ, + /* 0x17F */ OBJECT_SICHITAI_OBJ, + /* 0x180 */ OBJECT_DEKUCITY_ANA_OBJ, + /* 0x181 */ OBJECT_RAT, + /* 0x182 */ OBJECT_WATER_EFFECT, + /* 0x183 */ OBJECT_UNSET_183, + /* 0x184 */ OBJECT_DBLUE_OBJECT, + /* 0x185 */ OBJECT_BAL, + /* 0x186 */ OBJECT_WARP_UZU, + /* 0x187 */ OBJECT_DRIFTICE, + /* 0x188 */ OBJECT_FALL, + /* 0x189 */ OBJECT_HANAREYAMA_OBJ, + /* 0x18A */ OBJECT_CRACE_OBJECT, + /* 0x18B */ OBJECT_DNQ, + /* 0x18C */ OBJECT_OBJECT_UNSET_TOKEIDAI, + /* 0x18D */ OBJECT_EG, + /* 0x18E */ OBJECT_TRU, + /* 0x18F */ OBJECT_TRT, + /* 0x190 */ OBJECT_HAKUGIN_OBJ, + /* 0x191 */ OBJECT_HORSE_GAME_CHECK, + /* 0x192 */ OBJECT_STK, + /* 0x193 */ OBJECT_UNSET_193, + /* 0x194 */ OBJECT_UNSET_194, + /* 0x195 */ OBJECT_MNK, + /* 0x196 */ OBJECT_GI_BOTTLE_RED, + /* 0x197 */ OBJECT_TOKEI_TOBIRA, + /* 0x198 */ OBJECT_AZ, + /* 0x199 */ OBJECT_TWIG, + /* 0x19A */ OBJECT_DEKUCITY_OBJ, + /* 0x19B */ OBJECT_PO_FUSEN, + /* 0x19C */ OBJECT_RACETSUBO, + /* 0x19D */ OBJECT_HA, + /* 0x19E */ OBJECT_BIGOKUTA, + /* 0x19F */ OBJECT_OPEN_OBJ, + /* 0x1A0 */ OBJECT_FU_KAITEN, + /* 0x1A1 */ OBJECT_FU_MATO, + /* 0x1A2 */ OBJECT_MTORIDE, + /* 0x1A3 */ OBJECT_OSN, + /* 0x1A4 */ OBJECT_TOKEI_STEP, + /* 0x1A5 */ OBJECT_LOTUS, + /* 0x1A6 */ OBJECT_TL, + /* 0x1A7 */ OBJECT_DKJAIL_OBJ, + /* 0x1A8 */ OBJECT_VISIBLOCK, + /* 0x1A9 */ OBJECT_TSN, + /* 0x1AA */ OBJECT_DS2N, + /* 0x1AB */ OBJECT_FSN, + /* 0x1AC */ OBJECT_SHN, + /* 0x1AD */ OBJECT_BIGICICLE, + /* 0x1AE */ OBJECT_GI_BOTTLE_15, + /* 0x1AF */ OBJECT_TK, + /* 0x1B0 */ OBJECT_MARKET_OBJ, + /* 0x1B1 */ OBJECT_GI_RESERVE00, + /* 0x1B2 */ OBJECT_GI_RESERVE01, + /* 0x1B3 */ OBJECT_LIGHTBLOCK, + /* 0x1B4 */ OBJECT_TAKARAYA_OBJECTS, + /* 0x1B5 */ OBJECT_WDHAND, + /* 0x1B6 */ OBJECT_SDN, + /* 0x1B7 */ OBJECT_SNOWWD, + /* 0x1B8 */ OBJECT_GIANT, + /* 0x1B9 */ OBJECT_COMB, + /* 0x1BA */ OBJECT_HANA, + /* 0x1BB */ OBJECT_BOSS_HAKUGIN, + /* 0x1BC */ OBJECT_MEGANEANA_OBJ, + /* 0x1BD */ OBJECT_GI_NUTSMASK, + /* 0x1BE */ OBJECT_STK2, + /* 0x1BF */ OBJECT_SPOT11_OBJ, + /* 0x1C0 */ OBJECT_DANPEI_OBJECT, + /* 0x1C1 */ OBJECT_DHOUSE, + /* 0x1C2 */ OBJECT_HAKAISI, + /* 0x1C3 */ OBJECT_PO, + /* 0x1C4 */ OBJECT_SNOWMAN, + /* 0x1C5 */ OBJECT_PO_SISTERS, + /* 0x1C6 */ OBJECT_PP, + /* 0x1C7 */ OBJECT_GORONSWITCH, + /* 0x1C8 */ OBJECT_DELF, + /* 0x1C9 */ OBJECT_BOTIHASIRA, + /* 0x1CA */ OBJECT_GI_BIGBOMB, + /* 0x1CB */ OBJECT_PST, + /* 0x1CC */ OBJECT_BSMASK, + /* 0x1CD */ OBJECT_SPIDERTENT, + /* 0x1CE */ OBJECT_ZORAEGG, + /* 0x1CF */ OBJECT_KBT, + /* 0x1D0 */ OBJECT_GG, + /* 0x1D1 */ OBJECT_MARUTA, + /* 0x1D2 */ OBJECT_GHAKA, + /* 0x1D3 */ OBJECT_OYU, + /* 0x1D4 */ OBJECT_DNP, + /* 0x1D5 */ OBJECT_DAI, + /* 0x1D6 */ OBJECT_KGY, + /* 0x1D7 */ OBJECT_FB, + /* 0x1D8 */ OBJECT_TAISOU, + /* 0x1D9 */ OBJECT_MASK_BU_SAN, + /* 0x1DA */ OBJECT_MASK_KI_TAN, + /* 0x1DB */ OBJECT_MASK_RABIT, + /* 0x1DC */ OBJECT_MASK_SKJ, + /* 0x1DD */ OBJECT_MASK_BAKURETU, + /* 0x1DE */ OBJECT_MASK_TRUTH, + /* 0x1DF */ OBJECT_GK, + /* 0x1E0 */ OBJECT_HAKA_OBJ, + /* 0x1E1 */ OBJECT_MASK_GORON, + /* 0x1E2 */ OBJECT_MASK_ZORA, + /* 0x1E3 */ OBJECT_MASK_NUTS, + /* 0x1E4 */ OBJECT_MASK_BOY, + /* 0x1E5 */ OBJECT_DNT, + /* 0x1E6 */ OBJECT_YUKIYAMA, + /* 0x1E7 */ OBJECT_ICEFLOE, + /* 0x1E8 */ OBJECT_GI_GOLD_DUST, + /* 0x1E9 */ OBJECT_GI_BOTTLE_16, + /* 0x1EA */ OBJECT_GI_BOTTLE_22, + /* 0x1EB */ OBJECT_BEE, + /* 0x1EC */ OBJECT_OT, + /* 0x1ED */ OBJECT_UTUBO, + /* 0x1EE */ OBJECT_DORA, + /* 0x1EF */ OBJECT_GI_LOACH, + /* 0x1F0 */ OBJECT_GI_SEAHORSE, + /* 0x1F1 */ OBJECT_BIGPO, + /* 0x1F2 */ OBJECT_HARIKO, + /* 0x1F3 */ OBJECT_DNO, + /* 0x1F4 */ OBJECT_SINKAI_KABE, + /* 0x1F5 */ OBJECT_KIN2_OBJ, + /* 0x1F6 */ OBJECT_ISHI, + /* 0x1F7 */ OBJECT_HAKUGIN_DEMO, + /* 0x1F8 */ OBJECT_JG, + /* 0x1F9 */ OBJECT_GI_SWORD_2, + /* 0x1FA */ OBJECT_GI_SWORD_3, + /* 0x1FB */ OBJECT_GI_SWORD_4, + /* 0x1FC */ OBJECT_UM, + /* 0x1FD */ OBJECT_MASK_GIBUDO, + /* 0x1FE */ OBJECT_MASK_JSON, + /* 0x1FF */ OBJECT_MASK_KERFAY, + /* 0x200 */ OBJECT_MASK_BIGELF, + /* 0x201 */ OBJECT_RB, + /* 0x202 */ OBJECT_MBAR_OBJ, + /* 0x203 */ OBJECT_IKANA_OBJ, + /* 0x204 */ OBJECT_KZ, + /* 0x205 */ OBJECT_TOKEI_TURRET, + /* 0x206 */ OBJECT_ZOG, + /* 0x207 */ OBJECT_ROTLIFT, + /* 0x208 */ OBJECT_POSTHOUSE_OBJ, + /* 0x209 */ OBJECT_GI_MASK09, + /* 0x20A */ OBJECT_GI_MASK14, + /* 0x20B */ OBJECT_GI_MASK15, + /* 0x20C */ OBJECT_INIBS_OBJECT, + /* 0x20D */ OBJECT_TREE, + /* 0x20E */ OBJECT_KAIZOKU_OBJ, + /* 0x20F */ OBJECT_GI_RESERVE_B_00, + /* 0x210 */ OBJECT_GI_RESERVE_C_00, + /* 0x211 */ OBJECT_ZOB, + /* 0x212 */ OBJECT_MILKBAR, + /* 0x213 */ OBJECT_DMASK, + /* 0x214 */ OBJECT_MASK_KYOJIN, + /* 0x215 */ OBJECT_GI_RESERVE_C_01, + /* 0x216 */ OBJECT_ZOD, + /* 0x217 */ OBJECT_KUMO30, + /* 0x218 */ OBJECT_OBJECT_UNSET_YASI, + /* 0x219 */ OBJECT_MASK_ROMERNY, + /* 0x21A */ OBJECT_TANRON1, + /* 0x21B */ OBJECT_TANRON2, + /* 0x21C */ OBJECT_TANRON3, + /* 0x21D */ OBJECT_GI_MAGICMUSHROOM, + /* 0x21E */ OBJECT_OBJECT_UNSET_CHAN, + /* 0x21F */ OBJECT_GI_MASK10, + /* 0x220 */ OBJECT_ZOS, + /* 0x221 */ OBJECT_MASK_POSTHAT, + /* 0x222 */ OBJECT_F40_SWITCH, + /* 0x223 */ OBJECT_LODMOON, + /* 0x224 */ OBJECT_TRO, + /* 0x225 */ OBJECT_GI_MASK12, + /* 0x226 */ OBJECT_GI_MASK23, + /* 0x227 */ OBJECT_GI_BOTTLE_21, + /* 0x228 */ OBJECT_GI_CAMERA, + /* 0x229 */ OBJECT_KAMEJIMA, + /* 0x22A */ OBJECT_HARFGIBUD, + /* 0x22B */ OBJECT_ZOV, + /* 0x22C */ OBJECT_HGDOOR, + /* 0x22D */ OBJECT_UNSET_22D, + /* 0x22E */ OBJECT_UNSET_22E, + /* 0x22F */ OBJECT_UNSET_22F, + /* 0x230 */ OBJECT_DOR01, + /* 0x231 */ OBJECT_DOR02, + /* 0x232 */ OBJECT_DOR03, + /* 0x233 */ OBJECT_DOR04, + /* 0x234 */ OBJECT_LAST_OBJ, + /* 0x235 */ OBJECT_REDEAD_OBJ, + /* 0x236 */ OBJECT_IKNINSIDE_OBJ, + /* 0x237 */ OBJECT_IKNV_OBJ, + /* 0x238 */ OBJECT_PAMERA, + /* 0x239 */ OBJECT_HSSTUMP, + /* 0x23A */ OBJECT_ZM, + /* 0x23B */ OBJECT_BIG_FWALL, + /* 0x23C */ OBJECT_SECOM_OBJ, + /* 0x23D */ OBJECT_HUNSUI, + /* 0x23E */ OBJECT_UCH, + /* 0x23F */ OBJECT_TANRON4, + /* 0x240 */ OBJECT_TANRON5, + /* 0x241 */ OBJECT_DT, + /* 0x242 */ OBJECT_GI_MASK03, + /* 0x243 */ OBJECT_CHA, + /* 0x244 */ OBJECT_OBJECT_UNSET_DINNER, + /* 0x245 */ OBJECT_GI_RESERVE_B_01, + /* 0x246 */ OBJECT_LASTDAY, + /* 0x247 */ OBJECT_BAI, + /* 0x248 */ OBJECT_IN2, + /* 0x249 */ OBJECT_IKN_DEMO, + /* 0x24A */ OBJECT_YB, + /* 0x24B */ OBJECT_RZ, + /* 0x24C */ OBJECT_MASK_ZACHO, + /* 0x24D */ OBJECT_GI_FIELDMAP, + /* 0x24E */ OBJECT_MASK_STONE, + /* 0x24F */ OBJECT_BJT, + /* 0x250 */ OBJECT_TARU, + /* 0x251 */ OBJECT_MOONSTON, + /* 0x252 */ OBJECT_MASK_BREE, + /* 0x253 */ OBJECT_GI_SCHEDULE, + /* 0x254 */ OBJECT_GI_STONEMASK, + /* 0x255 */ OBJECT_ZORABAND, + /* 0x256 */ OBJECT_KEPN_KOYA, + /* 0x257 */ OBJECT_OBJECT_UNSET_USIYANE, + /* 0x258 */ OBJECT_GI_MASK05, + /* 0x259 */ OBJECT_GI_MASK11, + /* 0x25A */ OBJECT_GI_MASK20, + /* 0x25B */ OBJECT_NNH, + /* 0x25C */ OBJECT_MASK_GERO, + /* 0x25D */ OBJECT_MASK_YOFUKASI, + /* 0x25E */ OBJECT_MASK_MEOTO, + /* 0x25F */ OBJECT_MASK_DANCER, + /* 0x260 */ OBJECT_KZSAKU, + /* 0x261 */ OBJECT_OBJECT_UNSET_MILK_BIN, + /* 0x262 */ OBJECT_RANDOM_OBJ, + /* 0x263 */ OBJECT_KUJIYA, + /* 0x264 */ OBJECT_KITAN, + /* 0x265 */ OBJECT_GI_MASK06, + /* 0x266 */ OBJECT_GI_MASK16, + /* 0x267 */ OBJECT_ASTR_OBJ, + /* 0x268 */ OBJECT_BSB, + /* 0x269 */ OBJECT_FALL2, + /* 0x26A */ OBJECT_STH, + /* 0x26B */ OBJECT_GI_MSSA, + /* 0x26C */ OBJECT_SMTOWER, + /* 0x26D */ OBJECT_GI_MASK21, + /* 0x26E */ OBJECT_YADO_OBJ, + /* 0x26F */ OBJECT_SYOTEN, + /* 0x270 */ OBJECT_MOONEND, + /* 0x271 */ OBJECT_OB, + /* 0x272 */ OBJECT_GI_BOTTLE_04, + /* 0x273 */ OBJECT_OBJECT_UNSET_DANPEILIFT, + /* 0x274 */ OBJECT_WDOR01, + /* 0x275 */ OBJECT_WDOR02, + /* 0x276 */ OBJECT_WDOR03, + /* 0x277 */ OBJECT_STK3, + /* 0x278 */ OBJECT_KINSTA1_OBJ, + /* 0x279 */ OBJECT_KINSTA2_OBJ, + /* 0x27A */ OBJECT_BH, + /* 0x27B */ OBJECT_WDOR04, + /* 0x27C */ OBJECT_WDOR05, + /* 0x27D */ OBJECT_GI_MASK17, + /* 0x27E */ OBJECT_GI_MASK22, + /* 0x27F */ OBJECT_LBFSHOT, + /* 0x280 */ OBJECT_FUSEN, + /* 0x281 */ OBJECT_ENDING_OBJ, + /* 0x282 */ OBJECT_GI_MASK13 +} ObjectID; + #endif diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 4beed73668..b6f5233f4e 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -162,13 +162,11 @@ void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) { if ( (ctxt->linkActorEntry->params & 0x0F00) >> 8 == 0x0C || (gSaveContext.extra.unk10 == 0x02 && gSaveContext.extra.unk42 == 0x0CFF) ) { - // TODO: 0x192 is an object enum - Scene_LoadObject(&ctxt->sceneContext, 0x192); + Scene_LoadObject(&ctxt->sceneContext, OBJECT_STK); return; } - // TODO: 0x11 is an object enum - loadedCount = Scene_LoadObject(&ctxt->sceneContext, 0x11); + loadedCount = Scene_LoadObject(&ctxt->sceneContext, OBJECT_LINK_CHILD); objectVramAddr = global->sceneContext.objects[global->sceneContext.objectCount].vramAddr; ctxt->sceneContext.objectCount = loadedCount; ctxt->sceneContext.spawnedObjectCount = loadedCount;