mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-22 06:20:02 -04:00
Started cleaning up the itemNo enum
This commit is contained in:
LagoLunatic
@@ -1676,7 +1676,7 @@ public:
|
||||
}
|
||||
}
|
||||
bool checkSwordEquip() const {
|
||||
return dComIfGs_getSelectEquip(0) != NO_ITEM ||
|
||||
return dComIfGs_getSelectEquip(0) != dItem_NONE_e ||
|
||||
dComIfGp_getMiniGameType() == 2;
|
||||
}
|
||||
|
||||
|
||||
+91
-91
@@ -4,13 +4,13 @@
|
||||
#include "global.h"
|
||||
|
||||
enum ItemTable {
|
||||
/* 0x00 */ HEART,
|
||||
/* 0x01 */ GREEN_RUPEE,
|
||||
/* 0x02 */ BLUE_RUPEE,
|
||||
/* 0x03 */ YELLOW_RUPEE,
|
||||
/* 0x04 */ RED_RUPEE,
|
||||
/* 0x05 */ PURPLE_RUPEE,
|
||||
/* 0x06 */ ORANGE_RUPEE,
|
||||
/* 0x00 */ dItem_HEART_e,
|
||||
/* 0x01 */ dItem_GREEN_RUPEE_e,
|
||||
/* 0x02 */ dItem_BLUE_RUPEE_e,
|
||||
/* 0x03 */ dItem_YELLOW_RUPEE_e,
|
||||
/* 0x04 */ dItem_RED_RUPEE_e,
|
||||
/* 0x05 */ dItem_PURPLE_RUPEE_e,
|
||||
/* 0x06 */ dItem_ORANGE_RUPEE_e,
|
||||
/* 0x07 */ KAKERA_HEART,
|
||||
/* 0x08 */ UTUWA_HEART,
|
||||
/* 0x09 */ S_MAGIC,
|
||||
@@ -19,47 +19,47 @@ enum ItemTable {
|
||||
/* 0x0C */ BOMB_10,
|
||||
/* 0x0D */ BOMB_20,
|
||||
/* 0x0E */ BOMB_30,
|
||||
/* 0x0F */ SILVER_RUPEE,
|
||||
/* 0x0F */ dItem_SILVER_RUPEE_e,
|
||||
/* 0x10 */ ARROW_10,
|
||||
/* 0x11 */ ARROW_20,
|
||||
/* 0x12 */ ARROW_30,
|
||||
/* 0x13 */ noentry19,
|
||||
/* 0x14 */ noentry20,
|
||||
/* 0x15 */ SMALL_KEY,
|
||||
/* 0x13 */ noentry19, // Unused
|
||||
/* 0x14 */ noentry20, // Unused
|
||||
/* 0x15 */ dItem_SMALL_KEY_e,
|
||||
/* 0x16 */ RECOVER_FAIRY,
|
||||
/* 0x17 */ noentry23,
|
||||
/* 0x18 */ noentry24,
|
||||
/* 0x19 */ noentry25,
|
||||
/* 0x1A */ SUB_DUN_RUPEE,
|
||||
/* 0x1B */ noentry27,
|
||||
/* 0x1C */ noentry28,
|
||||
/* 0x1D */ noentry29,
|
||||
/* 0x1E */ TRIPLE_HEART,
|
||||
/* 0x1F */ PENDANT,
|
||||
/* 0x20 */ TELESCOPE,
|
||||
/* 0x21 */ TNCL_WHITSL,
|
||||
/* 0x22 */ WIND_TACT,
|
||||
/* 0x17 */ noentry23, // Unused
|
||||
/* 0x18 */ noentry24, // Unused
|
||||
/* 0x19 */ noentry25, // Unused
|
||||
/* 0x1A */ SUB_DUN_RUPEE, // Used in VERSION_JPN only
|
||||
/* 0x1B */ noentry27, // Unused
|
||||
/* 0x1C */ noentry28, // Unused
|
||||
/* 0x1D */ noentry29, // Unused
|
||||
/* 0x1E */ dItem_TRIPLE_HEART_e,
|
||||
/* 0x1F */ dItem_JOY_PENDANT_e,
|
||||
/* 0x20 */ dItem_TELESCOPE_e,
|
||||
/* 0x21 */ dItem_TINGLE_TUNER_e,
|
||||
/* 0x22 */ dItem_WIND_WAKER_e,
|
||||
/* 0x23 */ CAMERA,
|
||||
/* 0x24 */ EMONO_BAG,
|
||||
/* 0x25 */ ROPE,
|
||||
/* 0x25 */ dItem_GRAPPLING_HOOK_e,
|
||||
/* 0x26 */ CAMERA2,
|
||||
/* 0x27 */ BOW,
|
||||
/* 0x27 */ dItem_BOW_e,
|
||||
/* 0x28 */ PWR_GROOVE,
|
||||
/* 0x29 */ HVY_BOOTS,
|
||||
/* 0x2A */ DRGN_SHIELD,
|
||||
/* 0x2B */ WATER_BOOTS,
|
||||
/* 0x29 */ dItem_IRON_BOOTS_e,
|
||||
/* 0x2A */ dItem_MAGIC_ARMOR_e,
|
||||
/* 0x2B */ WATER_BOOTS, // Unused
|
||||
/* 0x2C */ ESA_BAG,
|
||||
/* 0x2D */ BOOMERANG,
|
||||
/* 0x2E */ BARE_HAND,
|
||||
/* 0x2F */ HOOKSHOT,
|
||||
/* 0x30 */ WARASHIBE_BAG,
|
||||
/* 0x2D */ dItem_BOOMERANG_e,
|
||||
/* 0x2E */ BARE_HAND, // Unused
|
||||
/* 0x2F */ dItem_HOOKSHOT_e,
|
||||
/* 0x30 */ dItem_DELIVERY_BAG_e,
|
||||
/* 0x31 */ BOMB_BAG,
|
||||
/* 0x32 */ FUKU,
|
||||
/* 0x33 */ HUMMER,
|
||||
/* 0x34 */ DEKU_LEAF,
|
||||
/* 0x35 */ MAGIC_ARROW,
|
||||
/* 0x36 */ LIGHT_ARROW,
|
||||
/* 0x37 */ noentry55,
|
||||
/* 0x32 */ dItem_FUKU_e,
|
||||
/* 0x33 */ dItem_SKULL_HAMMER_e,
|
||||
/* 0x34 */ dItem_DEKU_LEAF_e,
|
||||
/* 0x35 */ dItem_MAGIC_ARROW_e,
|
||||
/* 0x36 */ dItem_LIGHT_ARROW_e,
|
||||
/* 0x37 */ dItem_NEW_FUKU_e,
|
||||
/* 0x38 */ SWORD,
|
||||
/* 0x39 */ MASTER_SWORD,
|
||||
/* 0x3A */ LV3_SWORD,
|
||||
@@ -68,11 +68,11 @@ enum ItemTable {
|
||||
/* 0x3D */ DROPPED_SWORD,
|
||||
/* 0x3E */ MASTER_SWORD_EX,
|
||||
/* 0x3F */ KAKERA_HEART2,
|
||||
/* 0x40 */ noentry64,
|
||||
/* 0x41 */ noentry65,
|
||||
/* 0x40 */ noentry64, // Unused
|
||||
/* 0x41 */ noentry65, // Unused
|
||||
/* 0x42 */ PIRATES_OMAMORI,
|
||||
/* 0x43 */ HEROS_OMAMORI,
|
||||
/* 0x44 */ GRASS_BALL,
|
||||
/* 0x44 */ GRASS_BALL, // Unused
|
||||
/* 0x45 */ SKULL_NECKLACE,
|
||||
/* 0x46 */ BOKOBABA_SEED,
|
||||
/* 0x47 */ GOLDEN_FEATHER,
|
||||
@@ -80,27 +80,27 @@ enum ItemTable {
|
||||
/* 0x49 */ RED_JELLY,
|
||||
/* 0x4A */ GREEN_JELLY,
|
||||
/* 0x4B */ BLUE_JELLY,
|
||||
/* 0x4C */ MAP,
|
||||
/* 0x4D */ COMPASS,
|
||||
/* 0x4E */ BOSS_KEY,
|
||||
/* 0x4F */ EMPTY_BSHIP,
|
||||
/* 0x4C */ dItem_MAP_e,
|
||||
/* 0x4D */ dItem_COMPASS_e,
|
||||
/* 0x4E */ dItem_BOSS_KEY_e,
|
||||
/* 0x4F */ EMPTY_BSHIP, // Unused
|
||||
/* 0x50 */ EMPTY_BOTTLE,
|
||||
/* 0x51 */ RED_BOTTLE,
|
||||
/* 0x52 */ GREEN_BOTTLE,
|
||||
/* 0x53 */ BLUE_BOTTLE,
|
||||
/* 0x54 */ BOTTLESHIP,
|
||||
/* 0x55 */ SOUP_BOTTLE,
|
||||
/* 0x54 */ dItem_HALF_SOUP_BOTTLE_e,
|
||||
/* 0x55 */ dItem_SOUP_BOTTLE_e,
|
||||
/* 0x56 */ BIN_IN_WATER,
|
||||
/* 0x57 */ FAIRY_BOTTLE,
|
||||
/* 0x58 */ FIREFLY_BOTTLE,
|
||||
/* 0x59 */ FWATER_BOTTLE,
|
||||
/* 0x5A */ UNK_BOTTLE_5A,
|
||||
/* 0x5B */ UNK_BOTTLE_5B,
|
||||
/* 0x5C */ UNK_BOTTLE_5C,
|
||||
/* 0x5D */ UNK_BOTTLE_5D,
|
||||
/* 0x5E */ UNK_BOTTLE_5E,
|
||||
/* 0x5F */ UNK_BOTTLE_5F,
|
||||
/* 0x60 */ UNK_BOTTLE_60,
|
||||
/* 0x5A */ UNK_BOTTLE_5A, // Unused
|
||||
/* 0x5B */ UNK_BOTTLE_5B, // Unused
|
||||
/* 0x5C */ UNK_BOTTLE_5C, // Unused
|
||||
/* 0x5D */ UNK_BOTTLE_5D, // Unused
|
||||
/* 0x5E */ UNK_BOTTLE_5E, // Unused
|
||||
/* 0x5F */ UNK_BOTTLE_5F, // Unused
|
||||
/* 0x60 */ UNK_BOTTLE_60, // Unused
|
||||
/* 0x61 */ TRIFORCE1,
|
||||
/* 0x62 */ TRIFORCE2,
|
||||
/* 0x63 */ TRIFORCE3,
|
||||
@@ -109,21 +109,21 @@ enum ItemTable {
|
||||
/* 0x66 */ TRIFORCE6,
|
||||
/* 0x67 */ TRIFORCE7,
|
||||
/* 0x68 */ TRIFORCE8,
|
||||
/* 0x69 */ PEARL1,
|
||||
/* 0x6A */ PEARL2,
|
||||
/* 0x6B */ PEARL3,
|
||||
/* 0x6C */ KNOWLEDGE_TF,
|
||||
/* 0x69 */ dItem_PEARL_NAYRU_e,
|
||||
/* 0x6A */ dItem_PEARL_DIN_e,
|
||||
/* 0x6B */ dItem_PEARL_FARORE_e,
|
||||
/* 0x6C */ KNOWLEDGE_TF, // Unused
|
||||
/* 0x6D */ TACT_SONG1,
|
||||
/* 0x6E */ TACT_SONG2,
|
||||
/* 0x6F */ TACT_SONG3,
|
||||
/* 0x70 */ TACT_SONG4,
|
||||
/* 0x71 */ TACT_SONG5,
|
||||
/* 0x72 */ TACT_SONG6,
|
||||
/* 0x73 */ noentry115,
|
||||
/* 0x74 */ noentry116,
|
||||
/* 0x75 */ noentry117,
|
||||
/* 0x76 */ noentry118,
|
||||
/* 0x77 */ noentry119,
|
||||
/* 0x73 */ noentry115, // Unused
|
||||
/* 0x74 */ noentry116, // Unused
|
||||
/* 0x75 */ noentry117, // Unused
|
||||
/* 0x76 */ noentry118, // Unused
|
||||
/* 0x77 */ noentry119, // Unused
|
||||
/* 0x78 */ NORMAL_SAIL,
|
||||
/* 0x79 */ TRIFORCE_MAP1,
|
||||
/* 0x7A */ TRIFORCE_MAP2,
|
||||
@@ -133,17 +133,17 @@ enum ItemTable {
|
||||
/* 0x7E */ TRIFORCE_MAP6,
|
||||
/* 0x7F */ TRIFORCE_MAP7,
|
||||
/* 0x80 */ TRIFORCE_MAP8,
|
||||
/* 0x81 */ noentry129,
|
||||
/* 0x81 */ noentry129, // Unused
|
||||
/* 0x82 */ BIRD_ESA_5,
|
||||
/* 0x83 */ ANIMAL_ESA,
|
||||
/* 0x84 */ ESA1,
|
||||
/* 0x85 */ ESA2,
|
||||
/* 0x86 */ ESA3,
|
||||
/* 0x87 */ ESA4,
|
||||
/* 0x88 */ ESA5,
|
||||
/* 0x89 */ MAGIC_BEAN,
|
||||
/* 0x8A */ BIRD_ESA_10,
|
||||
/* 0x8B */ noentry139,
|
||||
/* 0x83 */ dItem_HYOI_PEAR_e,
|
||||
/* 0x84 */ ESA1, // Unused
|
||||
/* 0x85 */ ESA2, // Unused
|
||||
/* 0x86 */ ESA3, // Unused
|
||||
/* 0x87 */ ESA4, // Unused
|
||||
/* 0x88 */ ESA5, // Unused
|
||||
/* 0x89 */ MAGIC_BEAN, // Unused
|
||||
/* 0x8A */ BIRD_ESA_10, // Unused
|
||||
/* 0x8B */ noentry139, // Unused
|
||||
/* 0x8C */ FLOWER_1,
|
||||
/* 0x8D */ FLOWER_2,
|
||||
/* 0x8E */ FLOWER_3,
|
||||
@@ -156,25 +156,25 @@ enum ItemTable {
|
||||
/* 0x95 */ WATER_STATUE,
|
||||
/* 0x96 */ POSTMAN_STATUE,
|
||||
/* 0x97 */ PRESIDENT_STATUE,
|
||||
/* 0x98 */ LETTER00,
|
||||
/* 0x99 */ MAGIC_SEED, // actually Note to Mom
|
||||
/* 0x98 */ dItem_FATHER_LETTER_e,
|
||||
/* 0x99 */ dItem_NOTE_TO_MOM_e,
|
||||
/* 0x9A */ MAGYS_LETTER,
|
||||
/* 0x9B */ MO_LETTER,
|
||||
/* 0x9C */ COTTAGE_PAPER,
|
||||
/* 0x9D */ KAISEN_PRESENT1,
|
||||
/* 0x9E */ KAISEN_PRESENT2,
|
||||
/* 0x9F */ SALVAGE_ITEM1,
|
||||
/* 0xA0 */ SALVAGE_ITEM2,
|
||||
/* 0xA1 */ SALVAGE_ITEM3,
|
||||
/* 0xA2 */ XXX_039,
|
||||
/* 0xA0 */ SALVAGE_ITEM2, // Unused
|
||||
/* 0xA1 */ SALVAGE_ITEM3, // Unused
|
||||
/* 0xA2 */ XXX_039, // Unused
|
||||
/* 0xA3 */ TINGLE_STATUE1,
|
||||
/* 0xA4 */ TINGLE_STATUE2,
|
||||
/* 0xA5 */ TINGLE_STATUE3,
|
||||
/* 0xA6 */ TINGLE_STATUE4,
|
||||
/* 0xA7 */ TINGLE_STATUE5,
|
||||
/* 0xA8 */ TINGLE_STATUE6,
|
||||
/* 0xA9 */ noentry169,
|
||||
/* 0xAA */ HURRICANE_SPIN,
|
||||
/* 0xA8 */ TINGLE_STATUE6, // Unused
|
||||
/* 0xA9 */ noentry169, // Unused
|
||||
/* 0xAA */ dItem_HURRICANE_SPIN_e,
|
||||
/* 0xAB */ MAX_RUPEE_UP1,
|
||||
/* 0xAC */ MAX_RUPEE_UP2,
|
||||
/* 0xAD */ MAX_BOMB_UP1,
|
||||
@@ -189,15 +189,15 @@ enum ItemTable {
|
||||
/* 0xB6 */ TINCLE_RUPEE4,
|
||||
/* 0xB7 */ TINCLE_RUPEE5,
|
||||
/* 0xB8 */ TINCLE_RUPEE6,
|
||||
/* 0xB9 */ LITHOGRAPH1,
|
||||
/* 0xBA */ LITHOGRAPH2,
|
||||
/* 0xBB */ LITHOGRAPH3,
|
||||
/* 0xBC */ LITHOGRAPH4,
|
||||
/* 0xBD */ LITHOGRAPH5,
|
||||
/* 0xBE */ LITHOGRAPH6,
|
||||
/* 0xBF */ COLLECT_MAP_64,
|
||||
/* 0xC0 */ COLLECT_MAP_63,
|
||||
/* 0xC1 */ COLLECT_MAP_62,
|
||||
/* 0xB9 */ LITHOGRAPH1, // Unused
|
||||
/* 0xBA */ LITHOGRAPH2, // Unused
|
||||
/* 0xBB */ LITHOGRAPH3, // Unused
|
||||
/* 0xBC */ LITHOGRAPH4, // Unused
|
||||
/* 0xBD */ LITHOGRAPH5, // Unused
|
||||
/* 0xBE */ LITHOGRAPH6, // Unused
|
||||
/* 0xBF */ COLLECT_MAP_64, // Unused
|
||||
/* 0xC0 */ COLLECT_MAP_63, // Unused
|
||||
/* 0xC1 */ COLLECT_MAP_62, // Unused
|
||||
/* 0xC2 */ COLLECT_MAP_61,
|
||||
/* 0xC3 */ COLLECT_MAP_60,
|
||||
/* 0xC4 */ COLLECT_MAP_59,
|
||||
@@ -259,7 +259,7 @@ enum ItemTable {
|
||||
/* 0xFC */ COLLECT_MAP_03,
|
||||
/* 0xFD */ COLLECT_MAP_02,
|
||||
/* 0xFE */ COLLECT_MAP_01,
|
||||
/* 0xFF */ NO_ITEM,
|
||||
/* 0xFF */ dItem_NONE_e,
|
||||
};
|
||||
|
||||
struct dItem_data_item_resource {
|
||||
|
||||
Reference in New Issue
Block a user