Skip to content

Commit

Permalink
Rename more item enums
Browse files Browse the repository at this point in the history
  • Loading branch information
@LagoLunatic
LagoLunatic committed Jan 18, 2025
1 parent c609b67 commit e8adc6c
Show file tree
Hide file tree
Showing 33 changed files with 937 additions and 935 deletions.
8 changes: 4 additions & 4 deletions include/d/actor/d_a_player.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,13 @@ class daPy_py_c : public fopAc_ac_c {

bool checkGrabWear() const { return field_0x2b0 < 0.0f; }
bool checkNormalSwordEquip() const {
return dComIfGs_getSelectEquip(0) == SWORD ||
return dComIfGs_getSelectEquip(0) == dItem_SWORD_e ||
dComIfGp_getMiniGameType() == 2;
}
bool checkMasterSwordEquip() const {
return dComIfGs_getSelectEquip(0) == MASTER_SWORD ||
dComIfGs_getSelectEquip(0) == LV3_SWORD ||
dComIfGs_getSelectEquip(0) == MASTER_SWORD_EX;
return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e;
}
void setFace(daPy_FACE face) { mFace = face; }

Expand Down
4 changes: 2 additions & 2 deletions include/d/d_com_inf_game.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,14 +874,14 @@ enum dInventorySlot_e {
dInvSlot_SAIL_e = 1,
dInvSlot_WIND_WAKER_e = 2,
dInvSlot_GRAPPLING_HOOK_e = 3,
dInvSlot_EMONO_BAG_e = 4,
dInvSlot_SPOILS_BAG_e = 4,
dInvSlot_BOOMERANG_e = 5,
dInvSlot_DEKU_LEAF_e = 6,
dInvSlot_TINGLE_TUNER_e = 7,
dInvSlot_CAMERA_e = 8,
dInvSlot_IRON_BOOTS_e = 9,
dInvSlot_MAGIC_ARMOR_e = 10,
dInvSlot_ESA_BAG_e = 11,
dInvSlot_BAIT_BAG_e = 11,
dInvSlot_BOW_e = 12,
dInvSlot_BOMB_e = 13,
dInvSlot_BOTTLE0_e = 14,
Expand Down
222 changes: 111 additions & 111 deletions include/d/d_item_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ enum ItemTable {
/* 0x06 */ dItem_ORANGE_RUPEE_e,
/* 0x07 */ dItem_HEART_PIECE_e,
/* 0x08 */ dItem_HEART_CONTAINER_e,
/* 0x09 */ S_MAGIC,
/* 0x0A */ L_MAGIC,
/* 0x0B */ BOMB_5,
/* 0x0C */ BOMB_10,
/* 0x0D */ BOMB_20,
/* 0x0E */ BOMB_30,
/* 0x09 */ dItem_SMALL_MAGIC_e,
/* 0x0A */ dItem_LARGE_MAGIC_e,
/* 0x0B */ dItem_BOMB_5_e,
/* 0x0C */ dItem_BOMB_10_e,
/* 0x0D */ dItem_BOMB_20_e,
/* 0x0E */ dItem_BOMB_30_e,
/* 0x0F */ dItem_SILVER_RUPEE_e,
/* 0x10 */ ARROW_10,
/* 0x11 */ ARROW_20,
/* 0x12 */ ARROW_30,
/* 0x10 */ dItem_ARROW_10_e,
/* 0x11 */ dItem_ARROW_20_e,
/* 0x12 */ dItem_ARROW_30_e,
/* 0x13 */ noentry19, // Unused
/* 0x14 */ noentry20, // Unused
/* 0x15 */ dItem_SMALL_KEY_e,
/* 0x16 */ RECOVER_FAIRY,
/* 0x16 */ dItem_RECOVER_FAIRY_e,
/* 0x17 */ noentry23, // Unused
/* 0x18 */ noentry24, // Unused
/* 0x19 */ noentry25, // Unused
/* 0x1A */ SUB_DUN_RUPEE, // Used in VERSION_JPN only
/* 0x1A */ dItem_SUB_DUN_RUPEE_e, // Used in VERSION_JPN only
/* 0x1B */ noentry27, // Unused
/* 0x1C */ noentry28, // Unused
/* 0x1D */ noentry29, // Unused
Expand All @@ -40,15 +40,15 @@ enum ItemTable {
/* 0x21 */ dItem_TINGLE_TUNER_e,
/* 0x22 */ dItem_WIND_WAKER_e,
/* 0x23 */ CAMERA,
/* 0x24 */ EMONO_BAG,
/* 0x24 */ dItem_SPOILS_BAG_e,
/* 0x25 */ dItem_GRAPPLING_HOOK_e,
/* 0x26 */ CAMERA2,
/* 0x27 */ dItem_BOW_e,
/* 0x28 */ PWR_GROOVE,
/* 0x28 */ dItem_POWER_BRACELETS_e,
/* 0x29 */ dItem_IRON_BOOTS_e,
/* 0x2A */ dItem_MAGIC_ARMOR_e,
/* 0x2B */ WATER_BOOTS, // Unused
/* 0x2C */ ESA_BAG,
/* 0x2C */ dItem_BAIT_BAG_e,
/* 0x2D */ dItem_BOOMERANG_e,
/* 0x2E */ BARE_HAND, // Unused
/* 0x2F */ dItem_HOOKSHOT_e,
Expand All @@ -60,40 +60,40 @@ enum ItemTable {
/* 0x35 */ dItem_MAGIC_ARROW_e,
/* 0x36 */ dItem_LIGHT_ARROW_e,
/* 0x37 */ dItem_NEW_FUKU_e,
/* 0x38 */ SWORD,
/* 0x39 */ MASTER_SWORD,
/* 0x3A */ LV3_SWORD,
/* 0x3B */ SHIELD,
/* 0x3C */ MIRROR_SHIELD,
/* 0x3D */ DROPPED_SWORD,
/* 0x3E */ MASTER_SWORD_EX,
/* 0x38 */ dItem_SWORD_e,
/* 0x39 */ dItem_MASTER_SWORD_1_e,
/* 0x3A */ dItem_MASTER_SWORD_2_e,
/* 0x3B */ dItem_SHIELD_e,
/* 0x3C */ dItem_MIRROR_SHIELD_e,
/* 0x3D */ dItem_DROPPED_SWORD_e,
/* 0x3E */ dItem_MASTER_SWORD_3_e,
/* 0x3F */ KAKERA_HEART2,
/* 0x40 */ noentry64, // Unused
/* 0x41 */ noentry65, // Unused
/* 0x42 */ PIRATES_OMAMORI,
/* 0x43 */ HEROS_OMAMORI,
/* 0x42 */ dItem_PIRATES_CHARM_e,
/* 0x43 */ dItem_HEROS_CHARM_e,
/* 0x44 */ GRASS_BALL, // Unused
/* 0x45 */ SKULL_NECKLACE,
/* 0x46 */ BOKOBABA_SEED,
/* 0x47 */ GOLDEN_FEATHER,
/* 0x45 */ dItem_SKULL_NECKLACE_e,
/* 0x46 */ dItem_BOKOBABA_SEED_e,
/* 0x47 */ dItem_GOLDEN_FEATHER_e,
/* 0x48 */ BOKO_BELT,
/* 0x49 */ RED_JELLY,
/* 0x4A */ GREEN_JELLY,
/* 0x4B */ BLUE_JELLY,
/* 0x49 */ dItem_RED_JELLY_e,
/* 0x4A */ dItem_GREEN_JELLY_e,
/* 0x4B */ dItem_BLUE_JELLY_e,
/* 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,
/* 0x50 */ dItem_EMPTY_BOTTLE_e,
/* 0x51 */ dItem_RED_POTION_e,
/* 0x52 */ dItem_GREEN_POTION_e,
/* 0x53 */ dItem_BLUE_POTION_e,
/* 0x54 */ dItem_HALF_SOUP_BOTTLE_e,
/* 0x55 */ dItem_SOUP_BOTTLE_e,
/* 0x56 */ BIN_IN_WATER,
/* 0x57 */ FAIRY_BOTTLE,
/* 0x58 */ FIREFLY_BOTTLE,
/* 0x59 */ FWATER_BOTTLE,
/* 0x56 */ dItem_WATER_BOTTLE_e,
/* 0x57 */ dItem_FAIRY_BOTTLE_e,
/* 0x58 */ dItem_FIREFLY_BOTTLE_e,
/* 0x59 */ dItem_FOREST_WATER_e,
/* 0x5A */ UNK_BOTTLE_5A, // Unused
/* 0x5B */ UNK_BOTTLE_5B, // Unused
/* 0x5C */ UNK_BOTTLE_5C, // Unused
Expand Down Expand Up @@ -134,7 +134,7 @@ enum ItemTable {
/* 0x7F */ TRIFORCE_MAP7,
/* 0x80 */ TRIFORCE_MAP8,
/* 0x81 */ noentry129, // Unused
/* 0x82 */ BIRD_ESA_5,
/* 0x82 */ dItem_BIRD_BAIT_5_e,
/* 0x83 */ dItem_HYOI_PEAR_e,
/* 0x84 */ ESA1, // Unused
/* 0x85 */ ESA2, // Unused
Expand Down Expand Up @@ -175,14 +175,14 @@ enum ItemTable {
/* 0xA8 */ TINGLE_STATUE6, // Unused
/* 0xA9 */ noentry169, // Unused
/* 0xAA */ dItem_HURRICANE_SPIN_e,
/* 0xAB */ MAX_RUPEE_UP1,
/* 0xAC */ MAX_RUPEE_UP2,
/* 0xAD */ MAX_BOMB_UP1,
/* 0xAE */ MAX_BOMB_UP2,
/* 0xAF */ MAX_ARROW_UP1,
/* 0xB0 */ MAX_ARROW_UP2,
/* 0xB1 */ MAGIC_POWER,
/* 0xB2 */ MAX_MP_UP1,
/* 0xAB */ dItem_MAX_RUPEE_UP1_e,
/* 0xAC */ dItem_MAX_RUPEE_UP2_e,
/* 0xAD */ dItem_MAX_BOMB_UP1_e,
/* 0xAE */ dItem_MAX_BOMB_UP2_e,
/* 0xAF */ dItem_MAX_ARROW_UP1_e,
/* 0xB0 */ dItem_MAX_ARROW_UP2_e,
/* 0xB1 */ dItem_MAGIC_POWER_e,
/* 0xB2 */ dItem_MAX_MP_UP1_e,
/* 0xB3 */ TINCLE_RUPEE1,
/* 0xB4 */ TINCLE_RUPEE2,
/* 0xB5 */ TINCLE_RUPEE3,
Expand All @@ -195,70 +195,70 @@ enum ItemTable {
/* 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,
/* 0xC5 */ COLLECT_MAP_58,
/* 0xC6 */ COLLECT_MAP_57,
/* 0xC7 */ COLLECT_MAP_56,
/* 0xC8 */ COLLECT_MAP_55,
/* 0xC9 */ COLLECT_MAP_54,
/* 0xCA */ COLLECT_MAP_53,
/* 0xCB */ COLLECT_MAP_52,
/* 0xCC */ COLLECT_MAP_51,
/* 0xCD */ COLLECT_MAP_50,
/* 0xCE */ COLLECT_MAP_49,
/* 0xCF */ COLLECT_MAP_48,
/* 0xD0 */ COLLECT_MAP_47,
/* 0xD1 */ COLLECT_MAP_46,
/* 0xD2 */ COLLECT_MAP_45,
/* 0xD3 */ COLLECT_MAP_44,
/* 0xD4 */ COLLECT_MAP_43,
/* 0xD5 */ COLLECT_MAP_42,
/* 0xD6 */ COLLECT_MAP_41,
/* 0xD7 */ COLLECT_MAP_40,
/* 0xD8 */ COLLECT_MAP_39,
/* 0xD9 */ COLLECT_MAP_38,
/* 0xDA */ COLLECT_MAP_37,
/* 0xDB */ COLLECT_MAP_36,
/* 0xDC */ COLLECT_MAP_35,
/* 0xDD */ COLLECT_MAP_34,
/* 0xDE */ COLLECT_MAP_33,
/* 0xDF */ COLLECT_MAP_32,
/* 0xE0 */ COLLECT_MAP_31,
/* 0xE1 */ COLLECT_MAP_30,
/* 0xE2 */ COLLECT_MAP_29,
/* 0xE3 */ COLLECT_MAP_28,
/* 0xE4 */ COLLECT_MAP_27,
/* 0xE5 */ COLLECT_MAP_26,
/* 0xE6 */ COLLECT_MAP_25,
/* 0xE7 */ COLLECT_MAP_24,
/* 0xE8 */ COLLECT_MAP_23,
/* 0xE9 */ COLLECT_MAP_22,
/* 0xEA */ COLLECT_MAP_21,
/* 0xEB */ COLLECT_MAP_20,
/* 0xEC */ COLLECT_MAP_19,
/* 0xED */ COLLECT_MAP_18,
/* 0xEE */ COLLECT_MAP_17,
/* 0xEF */ COLLECT_MAP_16,
/* 0xF0 */ COLLECT_MAP_15,
/* 0xF1 */ COLLECT_MAP_14,
/* 0xF2 */ COLLECT_MAP_13,
/* 0xF3 */ COLLECT_MAP_12,
/* 0xF4 */ COLLECT_MAP_11,
/* 0xF5 */ COLLECT_MAP_10,
/* 0xF6 */ COLLECT_MAP_09,
/* 0xF7 */ COLLECT_MAP_08,
/* 0xF8 */ COLLECT_MAP_07,
/* 0xF9 */ COLLECT_MAP_06,
/* 0xFA */ COLLECT_MAP_05,
/* 0xFB */ COLLECT_MAP_04,
/* 0xFC */ COLLECT_MAP_03,
/* 0xFD */ COLLECT_MAP_02,
/* 0xFE */ COLLECT_MAP_01,
/* 0xBF */ dItem_COLLECT_MAP_64_e, // Unused
/* 0xC0 */ dItem_COLLECT_MAP_63_e, // Unused
/* 0xC1 */ dItem_COLLECT_MAP_62_e, // Unused
/* 0xC2 */ dItem_COLLECT_MAP_61_e,
/* 0xC3 */ dItem_COLLECT_MAP_60_e,
/* 0xC4 */ dItem_COLLECT_MAP_59_e,
/* 0xC5 */ dItem_COLLECT_MAP_58_e,
/* 0xC6 */ dItem_COLLECT_MAP_57_e,
/* 0xC7 */ dItem_COLLECT_MAP_56_e,
/* 0xC8 */ dItem_COLLECT_MAP_55_e,
/* 0xC9 */ dItem_COLLECT_MAP_54_e,
/* 0xCA */ dItem_COLLECT_MAP_53_e,
/* 0xCB */ dItem_COLLECT_MAP_52_e,
/* 0xCC */ dItem_COLLECT_MAP_51_e,
/* 0xCD */ dItem_COLLECT_MAP_50_e,
/* 0xCE */ dItem_COLLECT_MAP_49_e,
/* 0xCF */ dItem_COLLECT_MAP_48_e,
/* 0xD0 */ dItem_COLLECT_MAP_47_e,
/* 0xD1 */ dItem_COLLECT_MAP_46_e,
/* 0xD2 */ dItem_COLLECT_MAP_45_e,
/* 0xD3 */ dItem_COLLECT_MAP_44_e,
/* 0xD4 */ dItem_COLLECT_MAP_43_e,
/* 0xD5 */ dItem_COLLECT_MAP_42_e,
/* 0xD6 */ dItem_COLLECT_MAP_41_e,
/* 0xD7 */ dItem_COLLECT_MAP_40_e,
/* 0xD8 */ dItem_COLLECT_MAP_39_e,
/* 0xD9 */ dItem_COLLECT_MAP_38_e,
/* 0xDA */ dItem_COLLECT_MAP_37_e,
/* 0xDB */ dItem_COLLECT_MAP_36_e,
/* 0xDC */ dItem_COLLECT_MAP_35_e,
/* 0xDD */ dItem_COLLECT_MAP_34_e,
/* 0xDE */ dItem_COLLECT_MAP_33_e,
/* 0xDF */ dItem_COLLECT_MAP_32_e,
/* 0xE0 */ dItem_COLLECT_MAP_31_e,
/* 0xE1 */ dItem_COLLECT_MAP_30_e,
/* 0xE2 */ dItem_COLLECT_MAP_29_e,
/* 0xE3 */ dItem_COLLECT_MAP_28_e,
/* 0xE4 */ dItem_COLLECT_MAP_27_e,
/* 0xE5 */ dItem_COLLECT_MAP_26_e,
/* 0xE6 */ dItem_COLLECT_MAP_25_e,
/* 0xE7 */ dItem_COLLECT_MAP_24_e,
/* 0xE8 */ dItem_COLLECT_MAP_23_e,
/* 0xE9 */ dItem_COLLECT_MAP_22_e,
/* 0xEA */ dItem_COLLECT_MAP_21_e,
/* 0xEB */ dItem_COLLECT_MAP_20_e,
/* 0xEC */ dItem_COLLECT_MAP_19_e,
/* 0xED */ dItem_COLLECT_MAP_18_e,
/* 0xEE */ dItem_COLLECT_MAP_17_e,
/* 0xEF */ dItem_COLLECT_MAP_16_e,
/* 0xF0 */ dItem_COLLECT_MAP_15_e,
/* 0xF1 */ dItem_COLLECT_MAP_14_e,
/* 0xF2 */ dItem_COLLECT_MAP_13_e,
/* 0xF3 */ dItem_COLLECT_MAP_12_e,
/* 0xF4 */ dItem_COLLECT_MAP_11_e,
/* 0xF5 */ dItem_COLLECT_MAP_10_e,
/* 0xF6 */ dItem_COLLECT_MAP_09_e,
/* 0xF7 */ dItem_COLLECT_MAP_08_e,
/* 0xF8 */ dItem_COLLECT_MAP_07_e,
/* 0xF9 */ dItem_COLLECT_MAP_06_e,
/* 0xFA */ dItem_COLLECT_MAP_05_e,
/* 0xFB */ dItem_COLLECT_MAP_04_e,
/* 0xFC */ dItem_COLLECT_MAP_03_e,
/* 0xFD */ dItem_COLLECT_MAP_02_e,
/* 0xFE */ dItem_COLLECT_MAP_01_e,
/* 0xFF */ dItem_NONE_e,
};

Expand Down Expand Up @@ -354,4 +354,4 @@ class dItem_data {
static u16 getSpecialEffect(u8 no);
};

#endif /* D_ITEM_DATA_H */
#endif /* D_ITEM_DATA_H */
4 changes: 2 additions & 2 deletions include/f_op/f_op_actor_mng.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ inline BOOL fopAcM_isItem(fopAc_ac_c* item, int bitNo) {

inline BOOL dComIfGs_isSaveSwitch(int i_stageNo, int i_no);
inline BOOL fopAcM_isItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {
if (itemNo == BLUE_JELLY) {
if (itemNo == dItem_BLUE_JELLY_e) {
// Blue Chu Jelly uses itemBitNo as if it was a switch in stageNo 0xE.
return dComIfGs_isSaveSwitch(dSv_save_c::STAGE_BLUE_CHU_JELLY, itemBitNo);
} else {
Expand All @@ -411,7 +411,7 @@ inline BOOL fopAcM_isItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {

inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no);
inline void fopAcM_onItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {
if (itemNo == BLUE_JELLY) {
if (itemNo == dItem_BLUE_JELLY_e) {
// Blue Chu Jelly uses itemBitNo as if it was a switch in stageNo 0xE.
dComIfGs_onSaveSwitch(dSv_save_c::STAGE_BLUE_CHU_JELLY, itemBitNo);
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/d/actor/d_a_agb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ void daAgb_c::GbaItemUse() {
field_0x65c = 30;
break;
case 7:
if (dComIfGs_checkGetItem(ESA_BAG)) {
if (dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) {
if (dComIfGs_checkBaitItemEmpty()) {
temp_r29 |= 0x1000000;
}
Expand Down Expand Up @@ -1064,7 +1064,7 @@ void daAgb_c::Shopping() {
}
} else {
if (dComIfGs_checkBaitItemEmpty()) {
dComIfGs_setBaitItem(BIRD_ESA_5);
dComIfGs_setBaitItem(dItem_BIRD_BAIT_5_e);
} else {
itemBuy.U8.field_0x1 = 2;
return;
Expand Down
Loading

0 comments on commit e8adc6c

Please sign in to comment.