mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-28 10:20:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Started cleaning up the itemNo enum

Browse Source
This commit is contained in:
LagoLunatic
2024-02-25 02:05:17 -05:00
parent 914393649b
commit fdba7c3a7b
37 changed files with 807 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main.h
+1 -1
View File
@@ -1676,7 +1676,7 @@ public:
}
}
bool checkSwordEquip() const {
return dComIfGs_getSelectEquip(0) != NO_ITEM ||
return dComIfGs_getSelectEquip(0) != dItem_NONE_e ||
dComIfGp_getMiniGameType() == 2;
}
include/d/d_item_data.h
+91 -91
View File
@@ -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 {
src/d/actor/d_a_agb.cpp
+1 -1
View File
@@ -1019,7 +1019,7 @@ void daAgb_c::GbaItemUse() {
temp_r29 |= 0x10000;
}
if (dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() < dComIfGs_getArrowMax())
if (dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax())
{
temp_r29 |= 0x100;
}
src/d/actor/d_a_agbsw0.cpp
+30 -30
View File
@@ -96,7 +96,7 @@ BOOL daAgbsw0_c::draw() {
}
}
else if(behavior == 0xD) {
if(!dComIfGs_checkGetItem(HUMMER) || dComIfGs_isEventBit(0x2D01)) {
if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) || dComIfGs_isEventBit(0x2D01)) {
return true;
}
}
@@ -741,7 +741,7 @@ BOOL daAgbsw0_c::ExeSubM2() {
return true;
}
else {
if(!dComIfGs_checkGetItem(HUMMER)) {
if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
return true;
}
else {
@@ -847,7 +847,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
if(!dComIfGs_isGetCollectMap(1)) {
return 0x309;
}
if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(HUMMER)) {
if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
if(dComIfGs_checkGetItem(COTTAGE_PAPER)) {
#if VERSION == VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
@@ -857,13 +857,13 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
return roomNo == 0x21 ? 0x30A : 0x30B;
}
else {
u8 num = dComIfGs_checkGetItemNum(PENDANT);
u8 num = dComIfGs_checkGetItemNum(dItem_JOY_PENDANT_e);
return num >= 0x14 ? 0x30C : 0x30D;
}
}
if(!dComIfGs_isGetCollectMap(3)) {
if(dComIfGs_checkGetItem(ESA_BAG)) {
if(dComIfGs_checkBaitItem(ANIMAL_ESA)) {
if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) {
#if VERSION == VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
#else
@@ -878,7 +878,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
return 0x30E;
}
if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(HOOKSHOT)) {
if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
if(dComIfGs_isOpenCollectMap(0x24)) {
s32 hour = dKy_getdaytime_hour();
if(hour < 6 || hour >= 0x13) {
@@ -972,7 +972,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
}
}
if(!dComIfGs_isCollect(2, 0)) {
if(dComIfGs_checkGetItem(MAGIC_ARROW)) {
if(dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e)) {
return 0x328;
}
else {
@@ -996,7 +996,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
#endif
return roomNo == 0x1F ? 0x327 : 0x326;
}
if(dComIfGs_checkGetItem(HOOKSHOT)) {
if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
#if VERSION == VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
#else
@@ -1475,7 +1475,7 @@ BOOL daAgbsw0_c::ExeSubD() {
if(itemNo != RECOVER_FAIRY) {
current.pos.y += mScale.y / 2;
}
if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != SMALL_KEY) {
if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != dItem_SMALL_KEY_e) {
s8 roomNo = fopAcM_GetHomeRoomNo(this);
f32 rnd = cM_rndF(10.0f) + 40.0f;
fopAcM_fastCreateItem(&current.pos, itemNo, roomNo, NULL, NULL, 0.0f, rnd, -7.0f);
@@ -1738,25 +1738,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x11:
if(dComIfGp_getSelectItem(0) != BOW && dComIfGp_getSelectItem(1) != BOW && dComIfGp_getSelectItem(2) != BOW) {
if(dComIfGp_getSelectItem(0) != dItem_BOW_e && dComIfGp_getSelectItem(1) != dItem_BOW_e && dComIfGp_getSelectItem(2) != dItem_BOW_e) {
return 0;
}
break;
case 0x12:
if(dComIfGp_getSelectItem(0) != BOOMERANG && dComIfGp_getSelectItem(1) != BOOMERANG && dComIfGp_getSelectItem(2) != BOOMERANG) {
if(dComIfGp_getSelectItem(0) != dItem_BOOMERANG_e && dComIfGp_getSelectItem(1) != dItem_BOOMERANG_e && dComIfGp_getSelectItem(2) != dItem_BOOMERANG_e) {
return 0;
}
break;
case 0x13:
if(dComIfGp_getSelectItem(0) != DEKU_LEAF && dComIfGp_getSelectItem(1) != DEKU_LEAF && dComIfGp_getSelectItem(2) != DEKU_LEAF) {
if(dComIfGp_getSelectItem(0) != dItem_DEKU_LEAF_e && dComIfGp_getSelectItem(1) != dItem_DEKU_LEAF_e && dComIfGp_getSelectItem(2) != dItem_DEKU_LEAF_e) {
return 0;
}
break;
case 0x14:
if(dComIfGp_getSelectItem(0) != ROPE && dComIfGp_getSelectItem(1) != ROPE && dComIfGp_getSelectItem(2) != ROPE) {
if(dComIfGp_getSelectItem(0) != dItem_GRAPPLING_HOOK_e && dComIfGp_getSelectItem(1) != dItem_GRAPPLING_HOOK_e && dComIfGp_getSelectItem(2) != dItem_GRAPPLING_HOOK_e) {
return 0;
}
@@ -1768,13 +1768,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x16:
if(dComIfGp_getSelectItem(0) != HOOKSHOT && dComIfGp_getSelectItem(1) != HOOKSHOT && dComIfGp_getSelectItem(2) != HOOKSHOT) {
if(dComIfGp_getSelectItem(0) != dItem_HOOKSHOT_e && dComIfGp_getSelectItem(1) != dItem_HOOKSHOT_e && dComIfGp_getSelectItem(2) != dItem_HOOKSHOT_e) {
return 0;
}
break;
case 0x17:
if(dComIfGs_checkGetItem(DRGN_SHIELD)) {
if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) {
return 0;
}
@@ -1792,7 +1792,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x1A:
if(dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
if(dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
return 0;
}
@@ -1816,7 +1816,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x1E:
if(dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() == 0) {
if(dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) {
return 0;
}
@@ -1828,7 +1828,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x20:
if(dComIfGs_isEventBit(0x1708) && dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() == 0) {
if(dComIfGs_isEventBit(0x1708) && dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) {
return 0;
}
@@ -1869,9 +1869,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x26:
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
dComIfGp_getSelectItem(0) != ROPE &&
dComIfGp_getSelectItem(1) != ROPE &&
dComIfGp_getSelectItem(2) != ROPE)
dComIfGp_getSelectItem(0) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(1) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(2) != dItem_GRAPPLING_HOOK_e)
{
return 0;
}
@@ -1890,13 +1890,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x29:
if(dComIfGs_checkGetItem(ROPE)) {
if(dComIfGs_checkGetItem(dItem_GRAPPLING_HOOK_e)) {
return 0;
}
break;
case 0x2A:
if(dComIfGs_checkGetItem(BOOMERANG)) {
if(dComIfGs_checkGetItem(dItem_BOOMERANG_e)) {
return 0;
}
@@ -1908,7 +1908,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x2C:
if(dComIfGs_getItem(12) != NO_ITEM) {
if(dComIfGs_getItem(12) != dItem_NONE_e) {
return 0;
}
@@ -2104,13 +2104,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x4C:
if(dComIfGs_checkGetItem(HUMMER)) {
if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
return 0;
}
break;
case 0x4D:
if(!dComIfGs_checkGetItem(HUMMER)) {
if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
return 0;
}
@@ -2140,13 +2140,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x52:
if(dComIfGs_checkGetItem(HOOKSHOT)) {
if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
return 0;
}
break;
case 0x53:
if(!dComIfGs_checkGetItem(HOOKSHOT)) {
if(!dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
return 0;
}
@@ -2176,7 +2176,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x58:
if(!dComIfGs_checkGetItem(HVY_BOOTS)) {
if(!dComIfGs_checkGetItem(dItem_IRON_BOOTS_e)) {
return 0;
}
@@ -2426,7 +2426,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
break;
case 0x7E:
if(dComIfGs_checkGetItem(HUMMER) && !dComIfGs_isEventBit(0x2D01)) {
if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) && !dComIfGs_isEventBit(0x2D01)) {
return 0;
}
src/d/actor/d_a_am.cpp
+1 -1
View File
@@ -951,7 +951,7 @@ static void action_itai_move(am_class* i_this) {
/* 000034F4-000039A4 .text daAM_Execute__FP8am_class */
static BOOL daAM_Execute(am_class* i_this) {
fopAcM_setGbaName(i_this, BOW, 0xC, 0x2A);
fopAcM_setGbaName(i_this, dItem_BOW_e, 0xC, 0x2A);
if (enemy_ice(&i_this->mEnemyIce)) {
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
src/d/actor/d_a_am2.cpp
+1 -1
View File
@@ -1101,7 +1101,7 @@ static BOOL daAM2_Execute(am2_class* i_this) {
}
}
fopAcM_setGbaName(i_this, BOW, 0xB, 0x29);
fopAcM_setGbaName(i_this, dItem_BOW_e, 0xB, 0x29);
if (enemy_ice(&i_this->mEnemyIce)) {
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
src/d/actor/d_a_arrow.cpp
+6 -6
View File
@@ -451,19 +451,19 @@ daArrow_c* daArrow_c::changeArrowType() {
daArrow_c* ret = this;
if (mArrowType == TYPE_NORMAL) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW)) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e)) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_FIRE;
}
} else if (mArrowType == TYPE_FIRE) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW)) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e)) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_ICE;
}
} else if (mArrowType == TYPE_ICE) {
if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(0xC) != LIGHT_ARROW) {
if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(0xC) != dItem_LIGHT_ARROW_e) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_LIGHT;
@@ -496,18 +496,18 @@ void daArrow_c::changeArrowTypeNotReady() {
if (dComIfGs_getMagic() < 1) {
return;
}
if (dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW) {
if (dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e) {
m_keep_type = TYPE_FIRE;
}
} else if (m_keep_type == TYPE_FIRE) {
if (dComIfGs_getMagic() < 1) {
return;
}
if (dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW) {
if (dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e) {
m_keep_type = TYPE_ICE;
}
} else if (m_keep_type == TYPE_ICE) {
if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(0xC) == LIGHT_ARROW) {
if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e) {
m_keep_type = TYPE_LIGHT;
} else {
m_keep_type = TYPE_NORMAL;
src/d/actor/d_a_demo_item.cpp
+260 -260
View File
@@ -19,262 +19,262 @@ static u8 dummy[0x4C]; // TODO
const int daDitem_c::m_rot_time = 8*30;
u8 daDitem_c::m_effect_type[0x100] = {
/* HEART */ 0x04,
/* GREEN_RUPEE */ 0x03,
/* BLUE_RUPEE */ 0x03,
/* YELLOW_RUPEE */ 0x03,
/* RED_RUPEE */ 0x03,
/* PURPLE_RUPEE */ 0x03,
/* ORANGE_RUPEE */ 0x03,
/* KAKERA_HEART */ 0x00,
/* UTUWA_HEART */ 0x00,
/* S_MAGIC */ 0x04,
/* L_MAGIC */ 0x04,
/* BOMB_5 */ 0x04,
/* BOMB_10 */ 0x04,
/* BOMB_20 */ 0x04,
/* BOMB_30 */ 0x04,
/* SILVER_RUPEE */ 0x03,
/* ARROW_10 */ 0x04,
/* ARROW_20 */ 0x04,
/* ARROW_30 */ 0x04,
/* noentry19 */ 0x04,
/* noentry20 */ 0x04,
/* SMALL_KEY */ 0x02,
/* RECOVER_FAIRY */ 0x04,
/* noentry23 */ 0x04,
/* noentry24 */ 0x04,
/* noentry25 */ 0x04,
/* SUB_DUN_RUPEE */ 0x03,
/* noentry27 */ 0x04,
/* noentry28 */ 0x04,
/* noentry29 */ 0x04,
/* TRIPLE_HEART */ 0x04,
/* PENDANT */ 0x01,
/* TELESCOPE */ 0x00,
/* TNCL_WHITSL */ 0x00,
/* WIND_TACT */ 0x00,
/* CAMERA */ 0x00,
/* EMONO_BAG */ 0x00,
/* ROPE */ 0x00,
/* CAMERA2 */ 0x00,
/* BOW */ 0x00,
/* PWR_GROOVE */ 0x00,
/* HVY_BOOTS */ 0x00,
/* DRGN_SHIELD */ 0x00,
/* WATER_BOOTS */ 0x04,
/* ESA_BAG */ 0x00,
/* BOOMERANG */ 0x00,
/* BARE_HAND */ 0x04,
/* HOOKSHOT */ 0x00,
/* WARASHIBE_BAG */ 0x00,
/* BOMB_BAG */ 0x00,
/* FUKU */ 0x03,
/* HUMMER */ 0x00,
/* DEKU_LEAF */ 0x00,
/* MAGIC_ARROW */ 0x00,
/* LIGHT_ARROW */ 0x00,
/* noentry55 */ 0x04,
/* SWORD */ 0x00,
/* MASTER_SWORD */ 0x00,
/* LV3_SWORD */ 0x04,
/* SHIELD */ 0x00,
/* MIRROR_SHIELD */ 0x00,
/* DROPPED_SWORD */ 0x00,
/* MASTER_SWORD_EX */ 0x04,
/* KAKERA_HEART2 */ 0x01,
/* noentry64 */ 0x04,
/* noentry65 */ 0x04,
/* PIRATES_OMAMORI */ 0x00,
/* HEROS_OMAMORI */ 0x00,
/* GRASS_BALL */ 0x04,
/* SKULL_NECKLACE */ 0x01,
/* BOKOBABA_SEED */ 0x01,
/* GOLDEN_FEATHER */ 0x01,
/* BOKO_BELT */ 0x01,
/* RED_JELLY */ 0x01,
/* GREEN_JELLY */ 0x01,
/* BLUE_JELLY */ 0x01,
/* MAP */ 0x01,
/* COMPASS */ 0x01,
/* BOSS_KEY */ 0x00,
/* EMPTY_BSHIP */ 0x04,
/* EMPTY_BOTTLE */ 0x00,
/* RED_BOTTLE */ 0x02,
/* GREEN_BOTTLE */ 0x02,
/* BLUE_BOTTLE */ 0x02,
/* BOTTLESHIP */ 0x00,
/* SOUP_BOTTLE */ 0x00,
/* BIN_IN_WATER */ 0x02,
/* FAIRY_BOTTLE */ 0x02,
/* FIREFLY_BOTTLE */ 0x00,
/* FWATER_BOTTLE */ 0x02,
/* UNK_BOTTLE_5A */ 0x04,
/* UNK_BOTTLE_5B */ 0x04,
/* UNK_BOTTLE_5C */ 0x04,
/* UNK_BOTTLE_5D */ 0x04,
/* UNK_BOTTLE_5E */ 0x04,
/* UNK_BOTTLE_5F */ 0x04,
/* UNK_BOTTLE_60 */ 0x04,
/* TRIFORCE1 */ 0x00,
/* TRIFORCE2 */ 0x00,
/* TRIFORCE3 */ 0x00,
/* TRIFORCE4 */ 0x00,
/* TRIFORCE5 */ 0x00,
/* TRIFORCE6 */ 0x00,
/* TRIFORCE7 */ 0x00,
/* TRIFORCE8 */ 0x00,
/* PEARL1 */ 0x00,
/* PEARL2 */ 0x00,
/* PEARL3 */ 0x00,
/* KNOWLEDGE_TF */ 0x04,
/* TACT_SONG1 */ 0x04,
/* TACT_SONG2 */ 0x04,
/* TACT_SONG3 */ 0x04,
/* TACT_SONG4 */ 0x04,
/* TACT_SONG5 */ 0x04,
/* TACT_SONG6 */ 0x04,
/* noentry115 */ 0x04,
/* noentry116 */ 0x04,
/* noentry117 */ 0x04,
/* noentry118 */ 0x04,
/* noentry119 */ 0x04,
/* NORMAL_SAIL */ 0x00,
/* TRIFORCE_MAP1 */ 0x00,
/* TRIFORCE_MAP2 */ 0x00,
/* TRIFORCE_MAP3 */ 0x00,
/* TRIFORCE_MAP4 */ 0x00,
/* TRIFORCE_MAP5 */ 0x00,
/* TRIFORCE_MAP6 */ 0x00,
/* TRIFORCE_MAP7 */ 0x00,
/* TRIFORCE_MAP8 */ 0x00,
/* noentry129 */ 0x04,
/* BIRD_ESA_5 */ 0x02,
/* ANIMAL_ESA */ 0x02,
/* ESA1 */ 0x04,
/* ESA2 */ 0x04,
/* ESA3 */ 0x04,
/* ESA4 */ 0x04,
/* ESA5 */ 0x04,
/* MAGIC_BEAN */ 0x04,
/* BIRD_ESA_10 */ 0x04,
/* noentry139 */ 0x04,
/* FLOWER_1 */ 0x02,
/* FLOWER_2 */ 0x02,
/* FLOWER_3 */ 0x02,
/* HEROS_FLAG */ 0x02,
/* TAIRYO_FLAG */ 0x02,
/* SALES_FLAG */ 0x02,
/* WIND_FLAG */ 0x02,
/* RED_FLAG */ 0x02,
/* FOSSIL_HEAD */ 0x02,
/* WATER_STATUE */ 0x02,
/* POSTMAN_STATUE */ 0x02,
/* PRESIDENT_STATUE */ 0x02,
/* LETTER00 */ 0x02,
/* MAGIC_SEED */ 0x02,
/* MAGYS_LETTER */ 0x02,
/* MO_LETTER */ 0x02,
/* COTTAGE_PAPER */ 0x00,
/* KAISEN_PRESENT1 */ 0x02,
/* KAISEN_PRESENT2 */ 0x02,
/* SALVAGE_ITEM1 */ 0x00,
/* SALVAGE_ITEM2 */ 0x04,
/* SALVAGE_ITEM3 */ 0x04,
/* XXX_039 */ 0x04,
/* TINGLE_STATUE1 */ 0x00,
/* TINGLE_STATUE2 */ 0x00,
/* TINGLE_STATUE3 */ 0x00,
/* TINGLE_STATUE4 */ 0x00,
/* TINGLE_STATUE5 */ 0x00,
/* TINGLE_STATUE6 */ 0x00,
/* noentry169 */ 0x04,
/* HURRICANE_SPIN */ 0x04,
/* MAX_RUPEE_UP1 */ 0x00,
/* MAX_RUPEE_UP2 */ 0x00,
/* MAX_BOMB_UP1 */ 0x00,
/* MAX_BOMB_UP2 */ 0x00,
/* MAX_ARROW_UP1 */ 0x00,
/* MAX_ARROW_UP2 */ 0x00,
/* MAGIC_POWER */ 0x04,
/* MAX_MP_UP1 */ 0x04,
/* TINCLE_RUPEE1 */ 0x03,
/* TINCLE_RUPEE2 */ 0x03,
/* TINCLE_RUPEE3 */ 0x03,
/* TINCLE_RUPEE4 */ 0x03,
/* TINCLE_RUPEE5 */ 0x03,
/* TINCLE_RUPEE6 */ 0x03,
/* LITHOGRAPH1 */ 0x04,
/* LITHOGRAPH2 */ 0x04,
/* LITHOGRAPH3 */ 0x04,
/* LITHOGRAPH4 */ 0x04,
/* LITHOGRAPH5 */ 0x04,
/* LITHOGRAPH6 */ 0x04,
/* COLLECT_MAP_64 */ 0x04,
/* COLLECT_MAP_63 */ 0x04,
/* COLLECT_MAP_62 */ 0x04,
/* COLLECT_MAP_61 */ 0x00,
/* COLLECT_MAP_60 */ 0x00,
/* COLLECT_MAP_59 */ 0x00,
/* COLLECT_MAP_58 */ 0x00,
/* COLLECT_MAP_57 */ 0x00,
/* COLLECT_MAP_56 */ 0x00,
/* COLLECT_MAP_55 */ 0x00,
/* COLLECT_MAP_54 */ 0x00,
/* COLLECT_MAP_53 */ 0x00,
/* COLLECT_MAP_52 */ 0x00,
/* COLLECT_MAP_51 */ 0x00,
/* COLLECT_MAP_50 */ 0x00,
/* COLLECT_MAP_49 */ 0x00,
/* COLLECT_MAP_48 */ 0x00,
/* COLLECT_MAP_47 */ 0x00,
/* COLLECT_MAP_46 */ 0x00,
/* COLLECT_MAP_45 */ 0x00,
/* COLLECT_MAP_44 */ 0x00,
/* COLLECT_MAP_43 */ 0x00,
/* COLLECT_MAP_42 */ 0x00,
/* COLLECT_MAP_41 */ 0x00,
/* COLLECT_MAP_40 */ 0x00,
/* COLLECT_MAP_39 */ 0x00,
/* COLLECT_MAP_38 */ 0x00,
/* COLLECT_MAP_37 */ 0x00,
/* COLLECT_MAP_36 */ 0x00,
/* COLLECT_MAP_35 */ 0x00,
/* COLLECT_MAP_34 */ 0x00,
/* COLLECT_MAP_33 */ 0x00,
/* COLLECT_MAP_32 */ 0x00,
/* COLLECT_MAP_31 */ 0x00,
/* COLLECT_MAP_30 */ 0x00,
/* COLLECT_MAP_29 */ 0x00,
/* COLLECT_MAP_28 */ 0x00,
/* COLLECT_MAP_27 */ 0x00,
/* COLLECT_MAP_26 */ 0x00,
/* COLLECT_MAP_25 */ 0x00,
/* COLLECT_MAP_24 */ 0x00,
/* COLLECT_MAP_23 */ 0x00,
/* COLLECT_MAP_22 */ 0x00,
/* COLLECT_MAP_21 */ 0x00,
/* COLLECT_MAP_20 */ 0x00,
/* COLLECT_MAP_19 */ 0x00,
/* COLLECT_MAP_18 */ 0x00,
/* COLLECT_MAP_17 */ 0x00,
/* COLLECT_MAP_16 */ 0x00,
/* COLLECT_MAP_15 */ 0x00,
/* COLLECT_MAP_14 */ 0x00,
/* COLLECT_MAP_13 */ 0x00,
/* COLLECT_MAP_12 */ 0x00,
/* COLLECT_MAP_11 */ 0x00,
/* COLLECT_MAP_10 */ 0x00,
/* COLLECT_MAP_09 */ 0x00,
/* COLLECT_MAP_08 */ 0x00,
/* COLLECT_MAP_07 */ 0x00,
/* COLLECT_MAP_06 */ 0x00,
/* COLLECT_MAP_05 */ 0x00,
/* COLLECT_MAP_04 */ 0x00,
/* COLLECT_MAP_03 */ 0x00,
/* COLLECT_MAP_02 */ 0x00,
/* COLLECT_MAP_01 */ 0x00,
/* NO_ITEM */ 0x04,
0x04, // dItem_HEART_e
0x03, // dItem_GREEN_RUPEE_e
0x03, // dItem_BLUE_RUPEE_e
0x03, // dItem_YELLOW_RUPEE_e
0x03, // dItem_RED_RUPEE_e
0x03, // dItem_PURPLE_RUPEE_e
0x03, // dItem_ORANGE_RUPEE_e
0x00, // KAKERA_HEART
0x00, // UTUWA_HEART
0x04, // S_MAGIC
0x04, // L_MAGIC
0x04, // BOMB_5
0x04, // BOMB_10
0x04, // BOMB_20
0x04, // BOMB_30
0x03, // dItem_SILVER_RUPEE_e
0x04, // ARROW_10
0x04, // ARROW_20
0x04, // ARROW_30
0x04, // noentry19
0x04, // noentry20
0x02, // dItem_SMALL_KEY_e
0x04, // RECOVER_FAIRY
0x04, // noentry23
0x04, // noentry24
0x04, // noentry25
0x03, // SUB_DUN_RUPEE
0x04, // noentry27
0x04, // noentry28
0x04, // noentry29
0x04, // dItem_TRIPLE_HEART_e
0x01, // dItem_JOY_PENDANT_e
0x00, // dItem_TELESCOPE_e
0x00, // dItem_TINGLE_TUNER_e
0x00, // dItem_WIND_WAKER_e
0x00, // CAMERA
0x00, // EMONO_BAG
0x00, // dItem_GRAPPLING_HOOK_e
0x00, // CAMERA2
0x00, // dItem_BOW_e
0x00, // PWR_GROOVE
0x00, // dItem_IRON_BOOTS_e
0x00, // dItem_MAGIC_ARMOR_e
0x04, // WATER_BOOTS
0x00, // ESA_BAG
0x00, // dItem_BOOMERANG_e
0x04, // BARE_HAND
0x00, // dItem_HOOKSHOT_e
0x00, // dItem_DELIVERY_BAG_e
0x00, // BOMB_BAG
0x03, // dItem_FUKU_e
0x00, // dItem_SKULL_HAMMER_e
0x00, // dItem_DEKU_LEAF_e
0x00, // dItem_MAGIC_ARROW_e
0x00, // dItem_LIGHT_ARROW_e
0x04, // dItem_NEW_FUKU_e
0x00, // SWORD
0x00, // MASTER_SWORD
0x04, // LV3_SWORD
0x00, // SHIELD
0x00, // MIRROR_SHIELD
0x00, // DROPPED_SWORD
0x04, // MASTER_SWORD_EX
0x01, // KAKERA_HEART2
0x04, // noentry64
0x04, // noentry65
0x00, // PIRATES_OMAMORI
0x00, // HEROS_OMAMORI
0x04, // GRASS_BALL
0x01, // SKULL_NECKLACE
0x01, // BOKOBABA_SEED
0x01, // GOLDEN_FEATHER
0x01, // BOKO_BELT
0x01, // RED_JELLY
0x01, // GREEN_JELLY
0x01, // BLUE_JELLY
0x01, // dItem_MAP_e
0x01, // dItem_COMPASS_e
0x00, // dItem_BOSS_KEY_e
0x04, // EMPTY_BSHIP
0x00, // EMPTY_BOTTLE
0x02, // RED_BOTTLE
0x02, // GREEN_BOTTLE
0x02, // BLUE_BOTTLE
0x00, // dItem_HALF_SOUP_BOTTLE_e
0x00, // dItem_SOUP_BOTTLE_e
0x02, // BIN_IN_WATER
0x02, // FAIRY_BOTTLE
0x00, // FIREFLY_BOTTLE
0x02, // FWATER_BOTTLE
0x04, // UNK_BOTTLE_5A
0x04, // UNK_BOTTLE_5B
0x04, // UNK_BOTTLE_5C
0x04, // UNK_BOTTLE_5D
0x04, // UNK_BOTTLE_5E
0x04, // UNK_BOTTLE_5F
0x04, // UNK_BOTTLE_60
0x00, // TRIFORCE1
0x00, // TRIFORCE2
0x00, // TRIFORCE3
0x00, // TRIFORCE4
0x00, // TRIFORCE5
0x00, // TRIFORCE6
0x00, // TRIFORCE7
0x00, // TRIFORCE8
0x00, // dItem_PEARL_NAYRU_e
0x00, // dItem_PEARL_DIN_e
0x00, // dItem_PEARL_FARORE_e
0x04, // KNOWLEDGE_TF
0x04, // TACT_SONG1
0x04, // TACT_SONG2
0x04, // TACT_SONG3
0x04, // TACT_SONG4
0x04, // TACT_SONG5
0x04, // TACT_SONG6
0x04, // noentry115
0x04, // noentry116
0x04, // noentry117
0x04, // noentry118
0x04, // noentry119
0x00, // NORMAL_SAIL
0x00, // TRIFORCE_MAP1
0x00, // TRIFORCE_MAP2
0x00, // TRIFORCE_MAP3
0x00, // TRIFORCE_MAP4
0x00, // TRIFORCE_MAP5
0x00, // TRIFORCE_MAP6
0x00, // TRIFORCE_MAP7
0x00, // TRIFORCE_MAP8
0x04, // noentry129
0x02, // BIRD_ESA_5
0x02, // dItem_HYOI_PEAR_e
0x04, // ESA1
0x04, // ESA2
0x04, // ESA3
0x04, // ESA4
0x04, // ESA5
0x04, // MAGIC_BEAN
0x04, // BIRD_ESA_10
0x04, // noentry139
0x02, // FLOWER_1
0x02, // FLOWER_2
0x02, // FLOWER_3
0x02, // HEROS_FLAG
0x02, // TAIRYO_FLAG
0x02, // SALES_FLAG
0x02, // WIND_FLAG
0x02, // RED_FLAG
0x02, // FOSSIL_HEAD
0x02, // WATER_STATUE
0x02, // POSTMAN_STATUE
0x02, // PRESIDENT_STATUE
0x02, // dItem_FATHER_LETTER_e
0x02, // dItem_NOTE_TO_MOM_e
0x02, // MAGYS_LETTER
0x02, // MO_LETTER
0x00, // COTTAGE_PAPER
0x02, // KAISEN_PRESENT1
0x02, // KAISEN_PRESENT2
0x00, // SALVAGE_ITEM1
0x04, // SALVAGE_ITEM2
0x04, // SALVAGE_ITEM3
0x04, // XXX_039
0x00, // TINGLE_STATUE1
0x00, // TINGLE_STATUE2
0x00, // TINGLE_STATUE3
0x00, // TINGLE_STATUE4
0x00, // TINGLE_STATUE5
0x00, // TINGLE_STATUE6
0x04, // noentry169
0x04, // dItem_HURRICANE_SPIN_e
0x00, // MAX_RUPEE_UP1
0x00, // MAX_RUPEE_UP2
0x00, // MAX_BOMB_UP1
0x00, // MAX_BOMB_UP2
0x00, // MAX_ARROW_UP1
0x00, // MAX_ARROW_UP2
0x04, // MAGIC_POWER
0x04, // MAX_MP_UP1
0x03, // TINCLE_RUPEE1
0x03, // TINCLE_RUPEE2
0x03, // TINCLE_RUPEE3
0x03, // TINCLE_RUPEE4
0x03, // TINCLE_RUPEE5
0x03, // TINCLE_RUPEE6
0x04, // LITHOGRAPH1
0x04, // LITHOGRAPH2
0x04, // LITHOGRAPH3
0x04, // LITHOGRAPH4
0x04, // LITHOGRAPH5
0x04, // LITHOGRAPH6
0x04, // COLLECT_MAP_64
0x04, // COLLECT_MAP_63
0x04, // COLLECT_MAP_62
0x00, // COLLECT_MAP_61
0x00, // COLLECT_MAP_60
0x00, // COLLECT_MAP_59
0x00, // COLLECT_MAP_58
0x00, // COLLECT_MAP_57
0x00, // COLLECT_MAP_56
0x00, // COLLECT_MAP_55
0x00, // COLLECT_MAP_54
0x00, // COLLECT_MAP_53
0x00, // COLLECT_MAP_52
0x00, // COLLECT_MAP_51
0x00, // COLLECT_MAP_50
0x00, // COLLECT_MAP_49
0x00, // COLLECT_MAP_48
0x00, // COLLECT_MAP_47
0x00, // COLLECT_MAP_46
0x00, // COLLECT_MAP_45
0x00, // COLLECT_MAP_44
0x00, // COLLECT_MAP_43
0x00, // COLLECT_MAP_42
0x00, // COLLECT_MAP_41
0x00, // COLLECT_MAP_40
0x00, // COLLECT_MAP_39
0x00, // COLLECT_MAP_38
0x00, // COLLECT_MAP_37
0x00, // COLLECT_MAP_36
0x00, // COLLECT_MAP_35
0x00, // COLLECT_MAP_34
0x00, // COLLECT_MAP_33
0x00, // COLLECT_MAP_32
0x00, // COLLECT_MAP_31
0x00, // COLLECT_MAP_30
0x00, // COLLECT_MAP_29
0x00, // COLLECT_MAP_28
0x00, // COLLECT_MAP_27
0x00, // COLLECT_MAP_26
0x00, // COLLECT_MAP_25
0x00, // COLLECT_MAP_24
0x00, // COLLECT_MAP_23
0x00, // COLLECT_MAP_22
0x00, // COLLECT_MAP_21
0x00, // COLLECT_MAP_20
0x00, // COLLECT_MAP_19
0x00, // COLLECT_MAP_18
0x00, // COLLECT_MAP_17
0x00, // COLLECT_MAP_16
0x00, // COLLECT_MAP_15
0x00, // COLLECT_MAP_14
0x00, // COLLECT_MAP_13
0x00, // COLLECT_MAP_12
0x00, // COLLECT_MAP_11
0x00, // COLLECT_MAP_10
0x00, // COLLECT_MAP_09
0x00, // COLLECT_MAP_08
0x00, // COLLECT_MAP_07
0x00, // COLLECT_MAP_06
0x00, // COLLECT_MAP_05
0x00, // COLLECT_MAP_04
0x00, // COLLECT_MAP_03
0x00, // COLLECT_MAP_02
0x00, // COLLECT_MAP_01
0x04, // dItem_NONE_e
};
/* 000000EC-00000320 .text setParticle__9daDitem_cFv */
@@ -382,8 +382,8 @@ void daDitem_c::anim_control() {
case RED_BOTTLE:
case GREEN_BOTTLE:
case BLUE_BOTTLE:
case BOTTLESHIP:
case SOUP_BOTTLE:
case dItem_HALF_SOUP_BOTTLE_e:
case dItem_SOUP_BOTTLE_e:
case BIN_IN_WATER:
case FAIRY_BOTTLE:
case FIREFLY_BOTTLE:
@@ -427,7 +427,7 @@ void daDitem_c::set_mtx() {
/* 00000880-000008F0 .text settingBeforeDraw__9daDitem_cFv */
void daDitem_c::settingBeforeDraw() {
if (isBomb(m_itemNo) || m_itemNo == BOMB_BAG || m_itemNo == HUMMER || m_itemNo == SMALL_KEY) {
if (isBomb(m_itemNo) || m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
}
}
@@ -459,7 +459,7 @@ s32 daDitem_c::create() {
char* arcName = dItem_data::getArcname(m_itemNo);
if (dItem_data::getBmdIdx(m_itemNo) == -1 || arcName == NULL) {
m_itemNo = GREEN_RUPEE;
m_itemNo = dItem_GREEN_RUPEE_e;
}
s32 phase_state = dComIfG_resLoad(&mPhs, dItem_data::getArcname(m_itemNo));
src/d/actor/d_a_disappear.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
// Special type for Keese (ki) spawned in the Puppet Ganon fight.
if (health < 0x0D) {
static u32 ki_item_d[] = {
HEART,
dItem_HEART_e,
L_MAGIC,
ARROW_10,
};
src/d/actor/d_a_ib.cpp
+2 -2
View File
@@ -138,11 +138,11 @@ BOOL daIball_c::createItem() {
itemBitNo = daIball_prm::getItemBitNo(this);
if ((itemBitNo == 0x1F || itemBitNo == 0xFF || itemBitNo == -1) || fopAcM_isItemForIb(itemBitNo, items[i], current.roomNo)) {
itemBitNo = -1;
items[i] = YELLOW_RUPEE;
items[i] = dItem_YELLOW_RUPEE_e;
}
} else if (isNonSavedEmono(items[i])) {
if (daIball_prm::getItemBitNo(this) != 0) {
items[i] = YELLOW_RUPEE;
items[i] = dItem_YELLOW_RUPEE_e;
}
itemBitNo = -1;
}
src/d/actor/d_a_item.cpp
+39 -39
View File
@@ -49,8 +49,8 @@ float daItem_c::getYOffset() {
case GREEN_JELLY:
case BLUE_JELLY:
return 0.0f;
case SMALL_KEY:
case BOSS_KEY:
case dItem_SMALL_KEY_e:
case dItem_BOSS_KEY_e:
return 0.0f;
case SHIELD:
return 23.0f;
@@ -61,15 +61,15 @@ float daItem_c::getYOffset() {
case KAKERA_HEART:
case UTUWA_HEART:
return 0.0f;
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case dItem_GREEN_RUPEE_e:
case dItem_BLUE_RUPEE_e:
case dItem_YELLOW_RUPEE_e:
case dItem_RED_RUPEE_e:
case dItem_PURPLE_RUPEE_e:
case dItem_ORANGE_RUPEE_e:
case dItem_SILVER_RUPEE_e:
return 0.0f;
case HEART:
case dItem_HEART_e:
return 0.0f;
default:
return 0.0f;
@@ -168,7 +168,7 @@ void daItem_c::CreateInit() {
show();
if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != SMALL_KEY || (m_itemNo == SMALL_KEY && checkFlag(FLAG_UNK02)))) {
if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != dItem_SMALL_KEY_e || (m_itemNo == dItem_SMALL_KEY_e && checkFlag(FLAG_UNK02)))) {
u16 particleID = dItem_data::getSpecialEffect(m_itemNo);
dComIfGp_particle_set(particleID, &current.pos, NULL, NULL, 0xFF, &mPtclFollowCb);
}
@@ -582,35 +582,35 @@ void daItem_c::itemGetExecute() {
mItemStatus = STATUS_INIT_NORMAL;
switch (m_itemNo) {
case HEART:
case dItem_HEART_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
execItemGet(m_itemNo);
break;
case GREEN_RUPEE:
case dItem_GREEN_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
execItemGet(m_itemNo);
break;
case BLUE_RUPEE:
case dItem_BLUE_RUPEE_e:
mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
execItemGet(m_itemNo);
break;
case YELLOW_RUPEE:
case dItem_YELLOW_RUPEE_e:
mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
execItemGet(m_itemNo);
break;
case RED_RUPEE:
case dItem_RED_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case PURPLE_RUPEE:
case dItem_PURPLE_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case ORANGE_RUPEE:
case dItem_ORANGE_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case SILVER_RUPEE:
case dItem_SILVER_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
@@ -640,14 +640,14 @@ void daItem_c::itemGetExecute() {
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
execItemGet(m_itemNo);
break;
case SMALL_KEY:
case dItem_SMALL_KEY_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case TRIPLE_HEART:
case dItem_TRIPLE_HEART_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
execItemGet(m_itemNo);
break;
case PENDANT:
case dItem_JOY_PENDANT_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(7)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -656,7 +656,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case DEKU_LEAF:
case dItem_DEKU_LEAF_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case SWORD:
@@ -748,7 +748,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case ANIMAL_ESA:
case dItem_HYOI_PEAR_e:
mDoAud_seStart(JA_SE_ESA_GET);
if (!dComIfGs_isGetItemBait(1)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -1132,12 +1132,12 @@ void daItem_c::set_bound_se() {
}
switch (m_itemNo) {
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case dItem_GREEN_RUPEE_e:
case dItem_BLUE_RUPEE_e:
case dItem_YELLOW_RUPEE_e:
case dItem_RED_RUPEE_e:
case dItem_PURPLE_RUPEE_e:
case dItem_ORANGE_RUPEE_e:
fopAcM_seStart(this, JA_SE_OBJ_LUPY_BOUND, temp);
break;
case S_MAGIC:
@@ -1147,8 +1147,8 @@ void daItem_c::set_bound_se() {
case ARROW_10:
case ARROW_20:
case ARROW_30:
case MAGIC_ARROW:
case LIGHT_ARROW:
case dItem_MAGIC_ARROW_e:
case dItem_LIGHT_ARROW_e:
fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp);
break;
case KAKERA_HEART:
@@ -1237,7 +1237,7 @@ void daItem_c::mode_water_init() {
cXyz scale;
f32 temp = dItem_data::getShadowSize(m_itemNo);
f32 temp3 = temp / dItem_data::getShadowSize(GREEN_RUPEE);
f32 temp3 = temp / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e);
temp3 *= mScale.x;
scale.setall(temp3);
@@ -1253,8 +1253,8 @@ void daItem_c::mode_wait() {
}
switch (m_itemNo) {
case HEART:
case TRIPLE_HEART:
case dItem_HEART_e:
case dItem_TRIPLE_HEART_e:
itemActionForHeart();
break;
case KAKERA_HEART:
@@ -1266,16 +1266,16 @@ void daItem_c::mode_wait() {
case ARROW_10:
case ARROW_20:
case ARROW_30:
case MAGIC_ARROW:
case LIGHT_ARROW:
case dItem_MAGIC_ARROW_e:
case dItem_LIGHT_ARROW_e:
itemActionForArrow();
break;
case SMALL_KEY:
case dItem_SMALL_KEY_e:
itemActionForKey();
break;
case S_MAGIC:
case L_MAGIC:
case PENDANT:
case dItem_JOY_PENDANT_e:
case SKULL_NECKLACE:
case BOKOBABA_SEED:
case GOLDEN_FEATHER:
src/d/actor/d_a_itembase.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ void daItemBase_c::settingBeforeDraw() {
mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL);
}
if (m_itemNo == BOMB_BAG || m_itemNo == HUMMER || m_itemNo == SMALL_KEY) {
if (m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
}
}
src/d/actor/d_a_npc_btsw2.cpp
+1 -1
View File
@@ -598,7 +598,7 @@ BOOL daNpc_Btsw2_c::wait_action(void*) {
s32 daNpc_Btsw2_c::_create() {
fopAcM_SetupActor(this, daNpc_Btsw2_c);
if (dComIfGs_getEventReg(0xC203) == 3 || !checkItemGet(PEARL2, TRUE)) {
if (dComIfGs_getEventReg(0xC203) == 3 || !checkItemGet(dItem_PEARL_DIN_e, TRUE)) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_npc_ji1.cpp
+4 -4
View File
@@ -941,16 +941,16 @@ void daNpc_Ji1_c::createItem() {
itemNo = SWORD;
}
else if(field_0xD7B == 1) {
itemNo = HURRICANE_SPIN;
itemNo = dItem_HURRICANE_SPIN_e;
}
else if(dComIfGs_getEventReg(0xD003) == 1) {
itemNo = PURPLE_RUPEE;
itemNo = dItem_PURPLE_RUPEE_e;
}
else if(dComIfGs_getEventReg(0xD003) == 2) {
itemNo = ORANGE_RUPEE;
itemNo = dItem_ORANGE_RUPEE_e;
}
else if(field_0xD70 >= l_HIO.field_0x60[3] && dComIfGs_isEventBit(0xF10)) {
itemNo = SILVER_RUPEE;
itemNo = dItem_SILVER_RUPEE_e;
}
else {
itemNo = KAKERA_HEART;
src/d/actor/d_a_npc_kamome.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ static s16 daNpc_kam_XyCheckCB(void* i_this, int equippedItemIdx) {
/* 00000260-000002A4 .text XyCheckCB__11daNpc_kam_cFi */
s16 daNpc_kam_c::XyCheckCB(int equippedItemIdx) {
if (dComIfGp_getSelectItem(equippedItemIdx) == ANIMAL_ESA) {
if (dComIfGp_getSelectItem(equippedItemIdx) == dItem_HYOI_PEAR_e) {
return callDemoStartCheck();
} else {
return FALSE;
src/d/actor/d_a_npc_md.cpp
+2 -2
View File
@@ -331,7 +331,7 @@ static s16 daNpc_Md_XyCheckCB(void* i_this, int param_1) {
s16 daNpc_Md_c::XyCheckCB(int equippedItemIdx) {
u8 selectItemNo = dComIfGp_getSelectItem(equippedItemIdx);
if (m3138 == 3) {
if (selectItemNo == WIND_TACT) {
if (selectItemNo == dItem_WIND_WAKER_e) {
return TRUE;
}
if (selectItemNo == GOLDEN_FEATHER) {
@@ -358,7 +358,7 @@ static s16 daNpc_Md_XyEventCB(void* i_this, int param_1) {
/* 0000081C-00000864 .text XyEventCB__10daNpc_Md_cFi */
s16 daNpc_Md_c::XyEventCB(int equippedItemIdx) {
u8 selectItemNo = dComIfGp_getSelectItem(equippedItemIdx);
if (selectItemNo == WIND_TACT) {
if (selectItemNo == dItem_WIND_WAKER_e) {
offDefaultTalkXY();
return mEventIdxTable[5];
} else if (selectItemNo == GOLDEN_FEATHER) {
src/d/actor/d_a_obj_mknjd.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ static s16 daObjMknjD_XyEventCB(void* i_this, int i_param2) {
/* 000002F0-00000314 .text XyCheckCB__Q210daObjMknjD5Act_cFi */
s16 daObjMknjD::Act_c::XyCheckCB(int i_itemIdx) {
return dComIfGp_getSelectItem(i_itemIdx) == WIND_TACT ? 1 : 0;
return dComIfGp_getSelectItem(i_itemIdx) == dItem_WIND_WAKER_e ? 1 : 0;
}
/* 00000314-0000031C .text XyEventCB__Q210daObjMknjD5Act_cFi */
src/d/actor/d_a_obj_toripost.cpp
+16 -16
View File
@@ -22,19 +22,19 @@ extern dScnPly_reg_HIO_c g_regHIO;
const char daObjTpost_c::m_arc_name[] = "Toripost";
const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
{false, 0x1AAF, KAKERA_HEART, dSv_evtBit_c::LETTER_BAITOS_MOM},
{false, 0x0CF9, KAKERA_HEART, dSv_evtBit_c::LETTER_KOMALIS_FATHER},
{false, 0x0CFA, COLLECT_MAP_60, dSv_evtBit_c::LETTER_BOMBS_AD},
{false, 0x0CFC, RED_RUPEE, dSv_evtBit_c::LETTER_ORCA},
{false, 0x0805, RED_RUPEE, dSv_evtBit_c::LETTER_GRANDMA},
{false, 0x0CFD, GREEN_RUPEE, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD},
{true, 0x0DB6, COLLECT_MAP_52, dSv_evtBit_c::LETTER_TINGLE},
{false, 0x1148, RED_RUPEE, dSv_evtBit_c::LETTER_ARYLL},
{false, 0x1AAF, KAKERA_HEART, dSv_evtBit_c::LETTER_BAITOS_MOM},
{true, 0x0F76, KAISEN_PRESENT1, dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP},
{false, 0x19A6, KAKERA_HEART2, dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND},
{true, 0x0CFB, RED_RUPEE, dSv_evtBit_c::LETTER_BAITO},
{true, 0x0F77, KAISEN_PRESENT2, dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP}
{false, 0x1AAF, KAKERA_HEART, dSv_evtBit_c::LETTER_BAITOS_MOM},
{false, 0x0CF9, KAKERA_HEART, dSv_evtBit_c::LETTER_KOMALIS_FATHER},
{false, 0x0CFA, COLLECT_MAP_60, dSv_evtBit_c::LETTER_BOMBS_AD},
{false, 0x0CFC, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ORCA},
{false, 0x0805, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_GRANDMA},
{false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD},
{true, 0x0DB6, COLLECT_MAP_52, dSv_evtBit_c::LETTER_TINGLE},
{false, 0x1148, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ARYLL},
{false, 0x1AAF, KAKERA_HEART, dSv_evtBit_c::LETTER_BAITOS_MOM},
{true, 0x0F76, KAISEN_PRESENT1, dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP},
{false, 0x19A6, KAKERA_HEART2, dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND},
{true, 0x0CFB, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_BAITO},
{true, 0x0F77, KAISEN_PRESENT2, dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP},
};
const dCcD_SrcCyl daObjTpost_c::m_cyl_src = {
@@ -216,7 +216,7 @@ void daObjTpost_c::deliverLetter() {
case MAGYS_LETTER:
dComIfGs_onEventBit(0x1220);
break;
case MAGIC_SEED:
case dItem_NOTE_TO_MOM_e:
dLetter_send(dSv_evtBit_c::LETTER_BAITOS_MOM);
break;
}
@@ -324,7 +324,7 @@ int daObjTpost_c::getMsgXY() {
cXyz scale(2.0f, 2.0f, 2.0f);
switch(mPreItemNo) {
case MAGIC_SEED:
case dItem_NOTE_TO_MOM_e:
case MAGYS_LETTER:
msgId = 0xCE8;
col.r = g_regHIO.mChild[12].mShortRegs[0] + 0x80;
@@ -335,7 +335,7 @@ int daObjTpost_c::getMsgXY() {
dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col);
break;
case LETTER00:
case dItem_FATHER_LETTER_e:
case MO_LETTER:
setAnm(3, false);
field_0x8EA = 1;
src/d/actor/d_a_player_food.inc
+3 -3
View File
@@ -19,13 +19,13 @@
/* 80154334-801543A0 .text setHyoiModel__9daPy_lk_cFv */
void daPy_lk_c::setHyoiModel() {
if (mHeldItemType == ANIMAL_ESA) {
if (mHeldItemType == dItem_HYOI_PEAR_e) {
return;
}
JKRHeap* oldHeap = setItemHeap();
initModel(&mpHeldItemModel, LINK_BDL_HYOINOMI, 0x13000022);
mDoExt_setCurrentHeap(oldHeap);
mHeldItemType = ANIMAL_ESA;
mHeldItemType = dItem_HYOI_PEAR_e;
}
/* 801543A0-801546F4 .text procFoodThrow_init__9daPy_lk_cFv */
@@ -151,7 +151,7 @@ BOOL daPy_lk_c::procFoodThrow() {
BOOL daPy_lk_c::procFoodSet_init() {
if (mCurProc == daPyProc_FOOD_SET_e) {
if (mDemo.getParam0() == 1) {
if (mHeldItemType == ANIMAL_ESA) {
if (mHeldItemType == dItem_HYOI_PEAR_e) {
u8 btnIdx = dComIfGp_event_getTalkXYBtn();
if (btnIdx == 1) {
dComIfGs_setEquipBottleItemEmpty(0);
src/d/actor/d_a_player_main.cpp
+31 -31
View File
@@ -1012,7 +1012,7 @@ BOOL daPy_lk_c::draw() {
entryDLSetLight(mpEquippedSwordModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
}
}
if (dComIfGs_getSelectEquip(1) != NO_ITEM && !checkCaughtShapeHide() && !checkDemoShieldNoDraw()) {
if (dComIfGs_getSelectEquip(1) != dItem_NONE_e && !checkCaughtShapeHide() && !checkDemoShieldNoDraw()) {
entryDLSetLight(mpEquippedShieldModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
}
dComIfGd_setList();
@@ -1024,7 +1024,7 @@ BOOL daPy_lk_c::draw() {
}
if (mpHeldItemModel && !checkCaughtShapeHide() && !checkDemoSwordNoDraw(0)) {
if (!checkBowItem(mHeldItemType) || !checkPlayerGuard()) {
if (mHeldItemType == HOOKSHOT) {
if (mHeldItemType == dItem_HOOKSHOT_e) {
if (mActorKeepEquip.getActor()) {
daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor();
mpHeldItemModel->setAnmMtx(4, hookshot->getMtxTop());
@@ -1380,9 +1380,9 @@ void daPy_lk_c::deleteEquipItem(BOOL param_1) {
fopAcM_delete(equipActor);
}
if ((mHeldItemType == ROPE && checkRopeAnime()) ||
(mHeldItemType == BOOMERANG && checkBoomerangAnime()) ||
(mHeldItemType == HOOKSHOT && checkHookshotReadyAnime()) ||
if ((mHeldItemType == dItem_GRAPPLING_HOOK_e && checkRopeAnime()) ||
(mHeldItemType == dItem_BOOMERANG_e && checkBoomerangAnime()) ||
(mHeldItemType == dItem_HOOKSHOT_e && checkHookshotReadyAnime()) ||
(checkBowItem(mHeldItemType) && checkBowAnime())
) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
@@ -1450,14 +1450,14 @@ void daPy_lk_c::returnKeepItemData() {
/* 8010C8D4-8010CB70 .text makeItemType__9daPy_lk_cFv */
void daPy_lk_c::makeItemType() {
if (mHeldItemType == ROPE) {
if (mHeldItemType == dItem_GRAPPLING_HOOK_e) {
fopAc_ac_c* rope = (fopAc_ac_c*)fopAcM_fastCreate(PROC_HIMO2, 0, &current.pos);
mActorKeepEquip.setData(rope);
} else if (mHeldItemType == HOOKSHOT) {
} else if (mHeldItemType == dItem_HOOKSHOT_e) {
fopAc_ac_c* hookshot = (fopAc_ac_c*)fopAcM_fastCreate(PROC_HOOKSHOT, 0, &current.pos);
mActorKeepEquip.setData(hookshot);
setHookshotModel();
} else if (mHeldItemType == BOOMERANG) {
} else if (mHeldItemType == dItem_BOOMERANG_e) {
fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &current.pos);
mActorKeepEquip.setData(boomerang);
return;
@@ -1476,23 +1476,23 @@ void daPy_lk_c::makeItemType() {
} else if (checkBowItem(mHeldItemType)) {
setBowModel();
return;
} else if (mHeldItemType == TELESCOPE) {
} else if (mHeldItemType == dItem_TELESCOPE_e) {
setScopeModel();
return;
} else if (checkPhotoBoxItem(mHeldItemType)) {
setPhotoBoxModel();
return;
} else if (mHeldItemType == TNCL_WHITSL) {
} else if (mHeldItemType == dItem_TINGLE_TUNER_e) {
setTinkleCeiverModel();
return;
} else if (mHeldItemType == DEKU_LEAF) {
} else if (mHeldItemType == dItem_DEKU_LEAF_e) {
setSmallFanModel();
return;
} else if (mHeldItemType == WIND_TACT) {
mHeldItemType = NO_ITEM;
} else if (mHeldItemType == dItem_WIND_WAKER_e) {
mHeldItemType = dItem_NONE_e;
setTactModel();
return;
} else if (mHeldItemType == HUMMER) {
} else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
setHammerModel();
return;
} else if (mHeldItemType == EMPTY_BOTTLE) {
@@ -1568,11 +1568,11 @@ BOOL daPy_lk_c::checkItemChangeFromButton() {
}
}
} else {
if (checkEquipDragonShield() && checkSetItemTrigger(DRGN_SHIELD, 0)) {
if (checkEquipDragonShield() && checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 0)) {
offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD);
} else if (mAcch.ChkGroundHit() && !daPy_lk_c::checkPlayerFly()) {
if (checkEquipHeavyBoots() && checkSetItemTrigger(HVY_BOOTS, 0)) {
return procBootsEquip_init(HVY_BOOTS);
if (checkEquipHeavyBoots() && checkSetItemTrigger(dItem_IRON_BOOTS_e, 0)) {
return procBootsEquip_init(dItem_IRON_BOOTS_e);
} else if (checkSetItemTrigger(0x105, 0)) {
return procBottleDrink_init(dComIfGp_getSelectItem(mLastUsedItemButtonIdx));
} else if (checkSetItemTrigger(FAIRY_BOTTLE, 0)) {
@@ -1983,7 +1983,7 @@ BOOL daPy_lk_c::checkBottleItem(int itemNo) const {
/* 80111F7C-80111FEC .text checkDrinkBottleItem__9daPy_lk_cCFi */
BOOL daPy_lk_c::checkDrinkBottleItem(int itemNo) const {
return itemNo == RED_BOTTLE || itemNo == GREEN_BOTTLE || itemNo == BLUE_BOTTLE || itemNo == SOUP_BOTTLE || itemNo == BOTTLESHIP;
return itemNo == RED_BOTTLE || itemNo == GREEN_BOTTLE || itemNo == BLUE_BOTTLE || itemNo == dItem_SOUP_BOTTLE_e || itemNo == dItem_HALF_SOUP_BOTTLE_e;
}
/* 80111FEC-8011201C .text checkOpenBottleItem__9daPy_lk_cCFi */
@@ -1993,7 +1993,7 @@ BOOL daPy_lk_c::checkOpenBottleItem(int itemNo) const {
/* 8011201C-80112044 .text checkBowItem__9daPy_lk_cCFi */
BOOL daPy_lk_c::checkBowItem(int itemNo) const {
return itemNo == BOW || itemNo == MAGIC_ARROW || itemNo == LIGHT_ARROW;
return itemNo == dItem_BOW_e || itemNo == dItem_MAGIC_ARROW_e || itemNo == dItem_LIGHT_ARROW_e;
}
/* 80112044-80112064 .text checkPhotoBoxItem__9daPy_lk_cCFi */
@@ -2061,7 +2061,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
deleteEquipItem(FALSE);
mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
setSmallFanModel();
mHeldItemType = DEKU_LEAF;
mHeldItemType = dItem_DEKU_LEAF_e;
m35F0 = m3688.y;
m3730 = cXyz::Zero;
m34E0 = 0;
@@ -2191,7 +2191,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
m35EC = 0.0f;
if (mHeldItemType == HUMMER) {
if (mHeldItemType == dItem_SKULL_HAMMER_e) {
mSwordAnim.changeBckOnly(getItemAnimeResource(0x97));
} else if (checkBowItem(mHeldItemType) && !checkBowAnime()) {
mSwordAnim.changeBckOnly(getItemAnimeResource(0xD));
@@ -3122,15 +3122,15 @@ BOOL daPy_lk_c::execute() {
}
if (checkEquipHeavyBoots() &&
dComIfGp_getSelectItem(0) != HVY_BOOTS &&
dComIfGp_getSelectItem(1) != HVY_BOOTS &&
dComIfGp_getSelectItem(2) != HVY_BOOTS
dComIfGp_getSelectItem(0) != dItem_IRON_BOOTS_e &&
dComIfGp_getSelectItem(1) != dItem_IRON_BOOTS_e &&
dComIfGp_getSelectItem(2) != dItem_IRON_BOOTS_e
) {
offNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS);
} else if (checkEquipDragonShield() &&
dComIfGp_getSelectItem(0) != DRGN_SHIELD &&
dComIfGp_getSelectItem(1) != DRGN_SHIELD &&
dComIfGp_getSelectItem(2) != DRGN_SHIELD
dComIfGp_getSelectItem(0) != dItem_MAGIC_ARMOR_e &&
dComIfGp_getSelectItem(1) != dItem_MAGIC_ARMOR_e &&
dComIfGp_getSelectItem(2) != dItem_MAGIC_ARMOR_e
) {
offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD);
}
@@ -3246,7 +3246,7 @@ BOOL daPy_lk_c::execute() {
setDemoData();
setStickData();
if (mHeldItemType == ROPE &&
if (mHeldItemType == dItem_GRAPPLING_HOOK_e &&
(mCurProc == daPyProc_ROPE_SUBJECT_e || mCurProc == daPyProc_ROPE_MOVE_e) &&
mActorKeepEquip.getActor() != NULL && fopAcM_GetParam(mActorKeepEquip.getActor()) == 2
) {
@@ -3502,7 +3502,7 @@ BOOL daPy_lk_c::execute() {
daBoko_c* boko = static_cast<daBoko_c*>(mActorKeepEquip.getActor());
boko->getTopPos(&mSwordTopPos);
boko->getBlurRootPos(&m36C4);
} else if (mHeldItemType == HUMMER) {
} else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
cMtx_multVec(mpHeldItemModel->getBaseTRMtx(), &hammer_top, &mSwordTopPos);
cMtx_multVec(mpHeldItemModel->getBaseTRMtx(), &hammer_root, &m36C4);
} else if (mHeldItemType == 0x103) {
@@ -4517,11 +4517,11 @@ const daPy_anmIndex_c* daPy_lk_c::getAnmData(daPy_ANM anm) const {
if (anm < (s32)ARRAY_SIZE(mBokoAnmIndexTable)) {
return &mBokoAnmIndexTable[anm];
}
} else if (mHeldItemType == HUMMER) {
} else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
if (anm < (s32)ARRAY_SIZE(mHammerAnmIndexTable)) {
return &mHammerAnmIndexTable[anm];
}
} else if (mHeldItemType == BOOMERANG || mHeldItemType == DEKU_LEAF || mHeldItemType == TELESCOPE) {
} else if (mHeldItemType == dItem_BOOMERANG_e || mHeldItemType == dItem_DEKU_LEAF_e || mHeldItemType == dItem_TELESCOPE_e) {
if (anm == ANM_DASH) {
return &mSwordAnmIndexTable[anm];
}
src/d/actor/d_a_player_sword.inc
+1 -1
View File
@@ -233,7 +233,7 @@ void daPy_lk_c::setJumpCutAtParam() {
m35FC = daPy_HIO_cut_c0::m.field_0x58;
}
setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcD_SE_UNK1, G_AT_MARK_BIG_HIT, 0xA, radius);
} else if (mHeldItemType == HUMMER) {
} else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcD_SE_UNK5, G_AT_MARK_NORMAL_HIT, 0x13, 50.0f);
} else if (mActorKeepEquip.getActor()) {
setEnemyWeaponAtParam(TRUE);
src/d/actor/d_a_player_tact.inc
+3 -3
View File
@@ -30,11 +30,11 @@ u32 daPy_lk_c::getDayNightParamData() {
/* 8014D7D4-8014D8AC .text setTactModel__9daPy_lk_cFv */
void daPy_lk_c::setTactModel() {
if (mHeldItemType == WIND_TACT)
if (mHeldItemType == dItem_WIND_WAKER_e)
return;
deleteEquipItem(FALSE);
mHeldItemType = WIND_TACT;
mHeldItemType = dItem_WIND_WAKER_e;
JKRHeap* oldHeap = setItemHeap();
J3DModelData* modelData = initModel(&mpHeldItemModel, LINK_BDL_TAKT, 0x37221222);
@@ -124,7 +124,7 @@ void daPy_lk_c::setTactZev(unsigned int tactZevPartnerPID, int r30, char* r31) {
/* 8014DA78-8014DACC .text getTactTopPos__9daPy_lk_cFP4cXyz */
BOOL daPy_lk_c::getTactTopPos(cXyz* out) {
if (mHeldItemType != WIND_TACT || mpHeldItemModel == NULL) {
if (mHeldItemType != dItem_WIND_WAKER_e || mpHeldItemModel == NULL) {
return FALSE;
} else {
MTXMultVec(mpHeldItemModel->getBaseTRMtx(), &l_tact_top, out);
src/d/actor/d_a_shop_item.cpp
+2 -2
View File
@@ -202,7 +202,7 @@ bool daShopItem_c::_draw() {
/* 00000694-0000070C .text settingBeforeDraw__12daShopItem_cFv */
void daShopItem_c::settingBeforeDraw() {
if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == HUMMER) || m_itemNo == SMALL_KEY || m_itemNo == PRESIDENT_STATUE) {
if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == dItem_SKULL_HAMMER_e) || m_itemNo == dItem_SMALL_KEY_e || m_itemNo == PRESIDENT_STATUE) {
dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
}
}
@@ -232,7 +232,7 @@ int daShopItem_c::_create() {
const char* arcName = getShopArcname();
if (getShopBmdIdx() == -1 || arcName == 0) {
m_itemNo = GREEN_RUPEE;
m_itemNo = dItem_GREEN_RUPEE_e;
}
arcName = getShopArcname();
src/d/actor/d_a_spc_item01.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ void daSpcItem01_c::move() {
switch (m_itemNo) {
case SHIELD:
break;
case PENDANT:
case dItem_JOY_PENDANT_e:
if (mAcch.ChkGroundLanding()) {
speed.x = 0.0f;
speed.y = 0.0f;
src/d/actor/d_a_tag_ret.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ namespace daTagRet {
s32 Act_c::_create() {
fopAcM_SetupActor(this, daTagRet::Act_c);
if (checkItemGet(PEARL3, TRUE)) {
if (checkItemGet(dItem_PEARL_FARORE_e, TRUE)) {
return cPhs_UNK3_e;
}
src/d/d_a_race_item_static.cpp
+15 -15
View File
@@ -25,31 +25,31 @@ void daRaceItem_c::raceItemForceGet() {
/* 80068AA4-80068D48 .text raceItemGet__12daRaceItem_cFv */
void daRaceItem_c::raceItemGet() {
switch(m_itemNo) {
case GREEN_RUPEE:
case dItem_GREEN_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
dComIfGp_plusMiniGameRupee(1);
break;
case BLUE_RUPEE:
case dItem_BLUE_RUPEE_e:
mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
dComIfGp_plusMiniGameRupee(5);
break;
case YELLOW_RUPEE:
case dItem_YELLOW_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
dComIfGp_plusMiniGameRupee(10);
break;
case RED_RUPEE:
case dItem_RED_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
dComIfGp_plusMiniGameRupee(20);
break;
case PURPLE_RUPEE:
case dItem_PURPLE_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
dComIfGp_plusMiniGameRupee(50);
break;
case ORANGE_RUPEE:
case dItem_ORANGE_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
dComIfGp_plusMiniGameRupee(100);
break;
case SILVER_RUPEE:
case dItem_SILVER_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
dComIfGp_plusMiniGameRupee(200);
break;
@@ -65,25 +65,25 @@ void daRaceItem_c::normalItemGet() {
}
switch(m_itemNo) {
case GREEN_RUPEE:
case dItem_GREEN_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
break;
case BLUE_RUPEE:
case dItem_BLUE_RUPEE_e:
mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
break;
case YELLOW_RUPEE:
case dItem_YELLOW_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
break;
case RED_RUPEE:
case dItem_RED_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
break;
case PURPLE_RUPEE:
case dItem_PURPLE_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
break;
case ORANGE_RUPEE:
case dItem_ORANGE_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
break;
case SILVER_RUPEE:
case dItem_SILVER_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
break;
case S_MAGIC:
@@ -101,7 +101,7 @@ void daRaceItem_c::normalItemGet() {
case ARROW_30:
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
break;
case TRIPLE_HEART:
case dItem_TRIPLE_HEART_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
break;
}
src/d/d_com_inf_game.cpp
+27 -27
View File
@@ -124,7 +124,7 @@ void dComIfG_play_c::itemInit() {
field_0x4941 = 0;
mButtonMode = 0;
if (dComIfGs_checkGetItem(TELESCOPE)) {
if (dComIfGs_checkGetItem(dItem_TELESCOPE_e)) {
field_0x4943 = 0;
} else {
field_0x4943 = 0x15;
@@ -795,17 +795,17 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
get_item = 1;
}
break;
case PEARL1:
case dItem_PEARL_NAYRU_e:
if (dComIfGs_isSymbol(0)) {
get_item = 1;
}
break;
case PEARL2:
case dItem_PEARL_DIN_e:
if (dComIfGs_isSymbol(1)) {
get_item = 1;
}
break;
case PEARL3:
case dItem_PEARL_FARORE_e:
if (dComIfGs_isSymbol(2)) {
get_item = 1;
}
@@ -833,8 +833,8 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
}
}
if (i_itemNo >= 0xBF && i_itemNo <= NO_ITEM - 1 &&
dComIfGs_isGetCollectMap(NO_ITEM - i_itemNo))
if (i_itemNo >= 0xBF && i_itemNo <= dItem_NONE_e - 1 &&
dComIfGs_isGetCollectMap(dItem_NONE_e - i_itemNo))
{
get_item++;
}
@@ -919,17 +919,17 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
get_item = 1;
}
break;
case PEARL1:
case dItem_PEARL_NAYRU_e:
if (dComIfGs_isSymbol(0)) {
get_item = 1;
}
break;
case PEARL2:
case dItem_PEARL_DIN_e:
if (dComIfGs_isSymbol(1)) {
get_item = 1;
}
break;
case PEARL3:
case dItem_PEARL_FARORE_e:
if (dComIfGs_isSymbol(2)) {
get_item = 1;
}
@@ -944,7 +944,7 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
get_item = 1;
}
break;
case BOW:
case dItem_BOW_e:
if (dComIfGs_getItem(12)) {
get_item = dComIfGs_getArrowNum();
}
@@ -1003,9 +1003,9 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
}
}
break;
case PENDANT:
case dItem_JOY_PENDANT_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == PENDANT) {
if (dComIfGs_getBeast(i) == dItem_JOY_PENDANT_e) {
get_item = dComIfGs_getBeastNum(7);
}
}
@@ -1023,8 +1023,8 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
}
}
if (i_itemNo >= 0xBF && i_itemNo <= NO_ITEM - 1 &&
dComIfGs_isGetCollectMap(NO_ITEM - i_itemNo))
if (i_itemNo >= 0xBF && i_itemNo <= dItem_NONE_e - 1 &&
dComIfGs_isGetCollectMap(dItem_NONE_e - i_itemNo))
{
get_item = 1;
}
@@ -1281,16 +1281,16 @@ void dComIfGs_setPlayerRecollectionData() {
tbl = 3;
dComIfGp_setPlayerInfoBufferStageNo(4);
} else {
dComIfGs_setSelectItem(0, NO_ITEM);
dComIfGs_setSelectItem(1, NO_ITEM);
dComIfGs_setSelectItem(2, NO_ITEM);
dComIfGs_setSelectItem(0, dItem_NONE_e);
dComIfGs_setSelectItem(1, dItem_NONE_e);
dComIfGs_setSelectItem(2, dItem_NONE_e);
return;
}
if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[0] != TELESCOPE) {
dComIfGs_setSelectItem(0, NO_ITEM);
dComIfGs_setSelectItem(1, NO_ITEM);
dComIfGs_setSelectItem(2, NO_ITEM);
if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[0] != dItem_TELESCOPE_e) {
dComIfGs_setSelectItem(0, dItem_NONE_e);
dComIfGs_setSelectItem(1, dItem_NONE_e);
dComIfGs_setSelectItem(2, dItem_NONE_e);
return;
}
@@ -1389,9 +1389,9 @@ void dComIfGs_setPlayerRecollectionData() {
dComIfGs_setItem(17, tmp_item.mItems[17]);
dComIfGs_setItem(8, tmp_item.mItems[8]);
dComIfGs_setSelectItem(0, NO_ITEM);
dComIfGs_setSelectItem(1, NO_ITEM);
dComIfGs_setSelectItem(2, NO_ITEM);
dComIfGs_setSelectItem(0, dItem_NONE_e);
dComIfGs_setSelectItem(1, dItem_NONE_e);
dComIfGs_setSelectItem(2, dItem_NONE_e);
}
/* 80055318-80055580 .text dComIfGs_revPlayerRecollectionData__Fv */
@@ -1488,9 +1488,9 @@ void dComIfGs_revPlayerRecollectionData() {
dComIfGs_setItem(17, tmp_item.mItems[17]);
dComIfGs_setItem(8, tmp_item.mItems[8]);
dComIfGs_setSelectItem(0, NO_ITEM);
dComIfGs_setSelectItem(1, NO_ITEM);
dComIfGs_setSelectItem(2, NO_ITEM);
dComIfGs_setSelectItem(0, dItem_NONE_e);
dComIfGs_setSelectItem(1, dItem_NONE_e);
dComIfGs_setSelectItem(2, dItem_NONE_e);
}
/* 80055580-8005586C .text dComIfGs_exchangePlayerRecollectionData__Fv */
src/d/d_event.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
break;
}
if (dComIfGp_getSelectItem(equippedItemIdx) == NO_ITEM) {
if (dComIfGp_getSelectItem(equippedItemIdx) == dItem_NONE_e) {
return FALSE;
}
src/d/d_item.cpp
+45 -45
View File
@@ -677,7 +677,7 @@ void item_func_triple_heart() {
/* 800C3200-800C3258 .text item_func_pendant__Fv */
void item_func_pendant() {
dComIfGs_setBeastItem(PENDANT);
dComIfGs_setBeastItem(dItem_JOY_PENDANT_e);
dComIfGs_onGetItemBeast(0x7);
dComIfGp_setItemBeastNumCount(0x7, 1);
}
@@ -685,19 +685,19 @@ void item_func_pendant() {
/* 800C3258-800C329C .text item_func_telescope__Fv */
void item_func_telescope() {
dComIfGs_onGetItem(0x0, 0);
dComIfGs_setItem(0x0, TELESCOPE);
dComIfGs_setItem(0x0, dItem_TELESCOPE_e);
}
/* 800C329C-800C32E0 .text item_func_tncl_whitsl__Fv */
void item_func_tncl_whitsl() {
dComIfGs_onGetItem(0x7, 0);
dComIfGs_setItem(0x7, TNCL_WHITSL);
dComIfGs_setItem(0x7, dItem_TINGLE_TUNER_e);
}
/* 800C32E0-800C3324 .text item_func_wind_tact__Fv */
void item_func_wind_tact() {
dComIfGs_onGetItem(0x2, 0);
dComIfGs_setItem(0x2, WIND_TACT);
dComIfGs_setItem(0x2, dItem_WIND_WAKER_e);
}
/* 800C3324-800C3368 .text item_func_camera__Fv */
@@ -715,7 +715,7 @@ void item_func_emono_bag() {
/* 800C33AC-800C33F0 .text item_func_rope__Fv */
void item_func_rope() {
dComIfGs_onGetItem(0x3, 0);
dComIfGs_setItem(0x3, ROPE);
dComIfGs_setItem(0x3, dItem_GRAPPLING_HOOK_e);
}
/* 800C33F0-800C3434 .text item_func_camera2__Fv */
@@ -727,7 +727,7 @@ void item_func_camera2() {
/* 800C3434-800C3484 .text item_func_bow__Fv */
void item_func_bow() {
dComIfGs_onGetItem(0xC, 0);
dComIfGs_setItem(0xC, BOW);
dComIfGs_setItem(0xC, dItem_BOW_e);
dComIfGs_setArrowNum(30);
dComIfGs_setArrowMax(30);
}
@@ -741,13 +741,13 @@ void item_func_pwr_groove() {
/* 800C34C4-800C3508 .text item_func_hvy_boots__Fv */
void item_func_hvy_boots() {
dComIfGs_onGetItem(0x9, 0);
dComIfGs_setItem(0x9, HVY_BOOTS);
dComIfGs_setItem(0x9, dItem_IRON_BOOTS_e);
}
/* 800C3508-800C354C .text item_func_drgn_shield__Fv */
void item_func_drgn_shield() {
dComIfGs_onGetItem(0xA, 0);
dComIfGs_setItem(0xA, DRGN_SHIELD);
dComIfGs_setItem(0xA, dItem_MAGIC_ARMOR_e);
}
/* 800C354C-800C3550 .text item_func_water_boots__Fv */
@@ -763,7 +763,7 @@ void item_func_esa_bag() {
/* 800C3594-800C35D8 .text item_func_boomerang__Fv */
void item_func_boomerang() {
dComIfGs_onGetItem(0x5, 0);
dComIfGs_setItem(0x5, BOOMERANG);
dComIfGs_setItem(0x5, dItem_BOOMERANG_e);
}
/* 800C35D8-800C3600 .text item_func_bare_hand__Fv */
@@ -774,13 +774,13 @@ void item_func_bare_hand() {
/* 800C3600-800C3644 .text item_func_hookshot__Fv */
void item_func_hookshot() {
dComIfGs_onGetItem(0x13, 0);
dComIfGs_setItem(0x13, HOOKSHOT);
dComIfGs_setItem(0x13, dItem_HOOKSHOT_e);
}
/* 800C3644-800C3688 .text item_func_warasibe_bag__Fv */
void item_func_warasibe_bag() {
dComIfGs_onGetItem(0x12, 0);
dComIfGs_setItem(0x12, WARASHIBE_BAG);
dComIfGs_setItem(0x12, dItem_DELIVERY_BAG_e);
}
/* 800C3688-800C36D8 .text item_func_bomb_bag__Fv */
@@ -798,13 +798,13 @@ void item_func_fuku() {
/* 800C36DC-800C3720 .text item_func_hummer__Fv */
void item_func_hummer() {
dComIfGs_onGetItem(0x14, 0);
dComIfGs_setItem(0x14, HUMMER);
dComIfGs_setItem(0x14, dItem_SKULL_HAMMER_e);
}
/* 800C3720-800C377C .text item_func_deku_leaf__Fv */
void item_func_deku_leaf() {
dComIfGs_onGetItem(0x6, 0);
dComIfGs_setItem(0x6, DEKU_LEAF);
dComIfGs_setItem(0x6, dItem_DEKU_LEAF_e);
dComIfGp_setItemMaxMagicCount(16);
dComIfGp_setItemMagicCount(16);
}
@@ -812,12 +812,12 @@ void item_func_deku_leaf() {
/* 800C377C-800C3928 .text item_func_magic_arrow__Fv */
void item_func_magic_arrow() {
dComIfGs_onGetItem(0xC, 1);
dComIfGs_setItem(0xC, MAGIC_ARROW);
dComIfGs_setItem(0xC, dItem_MAGIC_ARROW_e);
#if VERSION != VERSION_JPN
// If the regular bow was equipped on an X/Y/Z button, force it to update.
for (int btnIdx = 0; btnIdx < 3; btnIdx++) {
if (dComIfGp_getSelectItem(btnIdx) == BOW) {
if (dComIfGp_getSelectItem(btnIdx) == dItem_BOW_e) {
dComIfGp_setSelectItem(btnIdx);
}
}
@@ -827,12 +827,12 @@ void item_func_magic_arrow() {
/* 800C3928-800C3AD4 .text item_func_light_arrow__Fv */
void item_func_light_arrow() {
dComIfGs_onGetItem(0xC, 2);
dComIfGs_setItem(0xC, LIGHT_ARROW);
dComIfGs_setItem(0xC, dItem_LIGHT_ARROW_e);
#if VERSION != VERSION_JPN
// If the fire/ice bow was equipped on an X/Y/Z button, force it to update.
for (int btnIdx = 0; btnIdx < 3; btnIdx++) {
if (dComIfGp_getSelectItem(btnIdx) == MAGIC_ARROW) {
if (dComIfGp_getSelectItem(btnIdx) == dItem_MAGIC_ARROW_e) {
dComIfGp_setSelectItem(btnIdx);
}
}
@@ -990,12 +990,12 @@ void item_func_blue_bottle() {
/* 800C4134-800C4164 .text item_func_bottleship__Fv */
void item_func_bottleship() {
dComIfGs_onGetBottleItem(BOTTLESHIP);
dComIfGs_onGetBottleItem(dItem_HALF_SOUP_BOTTLE_e);
}
/* 800C4164-800C4194 .text item_func_soup_bottle__Fv */
void item_func_soup_bottle() {
dComIfGs_onGetBottleItem(SOUP_BOTTLE);
dComIfGs_onGetBottleItem(dItem_SOUP_BOTTLE_e);
}
/* 800C4194-800C41C4 .text item_func_bin_in_water__Fv */
@@ -1158,7 +1158,7 @@ void item_func_bird_esa_5() {
/* 800C462C-800C4670 .text item_func_animal_esa__Fv */
void item_func_animal_esa() {
dComIfGs_onGetItemBait(0x1);
dComIfGs_setBaitItem(ANIMAL_ESA);
dComIfGs_setBaitItem(dItem_HYOI_PEAR_e);
}
/* 800C4670-800C4674 .text item_func_esa1__Fv */
@@ -1264,13 +1264,13 @@ void item_func_president_statue() {
/* 800C49BC-800C4A00 .text item_func_letter00__Fv */
void item_func_letter00() {
dComIfGs_onGetItemReserve(0xC);
dComIfGs_setReserveItem(LETTER00);
dComIfGs_setReserveItem(dItem_FATHER_LETTER_e);
}
/* 800C4A00-800C4A44 .text item_func_magic_seed__Fv */
void item_func_magic_seed() {
dComIfGs_onGetItemReserve(0xD);
dComIfGs_setReserveItem(MAGIC_SEED);
dComIfGs_setReserveItem(dItem_NOTE_TO_MOM_e);
}
/* 800C4A44-800C4A88 .text item_func_magys_letter__Fv */
@@ -2246,12 +2246,12 @@ int item_getcheck_func_blue_bottle() {
/* 800C6DD0-800C6E00 .text item_getcheck_func_bottleship__Fv */
int item_getcheck_func_bottleship() {
return dComIfGs_isGetBottleItem(BOTTLESHIP);
return dComIfGs_isGetBottleItem(dItem_HALF_SOUP_BOTTLE_e);
}
/* 800C6E00-800C6E30 .text item_getcheck_func_bin_in_bottleship__Fv */
int item_getcheck_func_bin_in_bottleship() {
return dComIfGs_isGetBottleItem(SOUP_BOTTLE);
return dComIfGs_isGetBottleItem(dItem_SOUP_BOTTLE_e);
}
/* 800C6E30-800C6E60 .text item_getcheck_func_bin_in_water__Fv */
@@ -2652,7 +2652,7 @@ BOOL isArrow(u8 itemNo) {
/* 800C7BD4-800C7C08 .text isEmono__FUc */
BOOL isEmono(u8 itemNo) {
BOOL isEmono = FALSE;
if (itemNo == PENDANT || itemNo == SKULL_NECKLACE || itemNo == BOKOBABA_SEED || itemNo == GOLDEN_FEATHER ||
if (itemNo == dItem_JOY_PENDANT_e || itemNo == SKULL_NECKLACE || itemNo == BOKOBABA_SEED || itemNo == GOLDEN_FEATHER ||
itemNo == BOKO_BELT || itemNo == RED_JELLY || itemNo == GREEN_JELLY || itemNo == BLUE_JELLY)
{
isEmono = TRUE;
@@ -2663,7 +2663,7 @@ BOOL isEmono(u8 itemNo) {
/* 800C7C08-800C7C34 .text isEsa__FUc */
BOOL isEsa(u8 itemNo) {
BOOL isEsa = FALSE;
if (itemNo == BIRD_ESA_5 || itemNo == ANIMAL_ESA || itemNo == MAGIC_BEAN) {
if (itemNo == BIRD_ESA_5 || itemNo == dItem_HYOI_PEAR_e || itemNo == MAGIC_BEAN) {
isEsa = TRUE;
}
return isEsa;
@@ -2672,8 +2672,8 @@ BOOL isEsa(u8 itemNo) {
/* 800C7C34-800C7C60 .text isRupee__FUc */
BOOL isRupee(u8 itemNo) {
BOOL isRupee = FALSE;
if (itemNo == GREEN_RUPEE || itemNo == BLUE_RUPEE || itemNo == YELLOW_RUPEE || itemNo == RED_RUPEE ||
itemNo == PURPLE_RUPEE || itemNo == ORANGE_RUPEE || itemNo == SILVER_RUPEE)
if (itemNo == dItem_GREEN_RUPEE_e || itemNo == dItem_BLUE_RUPEE_e || itemNo == dItem_YELLOW_RUPEE_e || itemNo == dItem_RED_RUPEE_e ||
itemNo == dItem_PURPLE_RUPEE_e || itemNo == dItem_ORANGE_RUPEE_e || itemNo == dItem_SILVER_RUPEE_e)
{
isRupee = TRUE;
}
@@ -2692,7 +2692,7 @@ BOOL isLimitedItem(u8 itemNo) {
/* 800C7C7C-800C7CB0 .text isNonSavedEmono__FUc */
BOOL isNonSavedEmono(u8 itemNo) {
BOOL isEmono = FALSE;
if (itemNo == PENDANT || itemNo == SKULL_NECKLACE || itemNo == BOKOBABA_SEED || itemNo == GOLDEN_FEATHER ||
if (itemNo == dItem_JOY_PENDANT_e || itemNo == SKULL_NECKLACE || itemNo == BOKOBABA_SEED || itemNo == GOLDEN_FEATHER ||
itemNo == BOKO_BELT || itemNo == RED_JELLY || itemNo == GREEN_JELLY) // No BLUE_JELLY
{
isEmono = TRUE;
@@ -2723,7 +2723,7 @@ BOOL isTriforce(u8 itemNo) {
/* 800C7D08-800C7D28 .text isHeart__FUc */
BOOL isHeart(u8 itemNo) {
BOOL isHeart = FALSE;
if (itemNo == HEART || itemNo == TRIPLE_HEART) {
if (itemNo == dItem_HEART_e || itemNo == dItem_TRIPLE_HEART_e) {
isHeart = TRUE;
}
return isHeart;
@@ -2737,11 +2737,11 @@ u8 getItemNoByLife(u8 itemNo) {
if (lifePercent != 100) {
return itemNo;
}
if (itemNo == HEART) {
itemNo = GREEN_RUPEE;
if (itemNo == dItem_HEART_e) {
itemNo = dItem_GREEN_RUPEE_e;
}
if (itemNo == TRIPLE_HEART) {
return YELLOW_RUPEE;
if (itemNo == dItem_TRIPLE_HEART_e) {
return dItem_YELLOW_RUPEE_e;
}
return itemNo;
}
@@ -2749,32 +2749,32 @@ u8 getItemNoByLife(u8 itemNo) {
/* 800C7D70-800C7ED0 .text check_itemno__Fi */
u8 check_itemno(int itemNo) {
if (dComIfGs_getMaxMagic() == 0 && (itemNo == S_MAGIC || itemNo == L_MAGIC)) {
return GREEN_RUPEE;
return dItem_GREEN_RUPEE_e;
}
if (!dComIfGs_isGetItem(0xC, 0) && !dComIfGs_isGetItem(0xC, 1) && !dComIfGs_isGetItem(0xC, 2)) {
// Does not own any bow.
if (isArrow(itemNo)) {
return GREEN_RUPEE;
return dItem_GREEN_RUPEE_e;
}
}
if (!dComIfGs_isGetItem(0xD, 0)) {
// Does not own bombs.
if (isBomb(itemNo)) {
return GREEN_RUPEE;
return dItem_GREEN_RUPEE_e;
}
}
if (!checkItemGet(ESA_BAG, TRUE)) {
if (isEsa(itemNo)) {
return GREEN_RUPEE;
return dItem_GREEN_RUPEE_e;
}
}
if (!checkItemGet(EMONO_BAG, TRUE)) {
if (isEmono(itemNo)) {
return GREEN_RUPEE;
return dItem_GREEN_RUPEE_e;
}
}
if (itemNo == TRIPLE_HEART) {
itemNo = HEART;
if (itemNo == dItem_TRIPLE_HEART_e) {
itemNo = dItem_HEART_e;
}
return itemNo;
}
@@ -2821,7 +2821,7 @@ u8 getEmonoItemFromLifeBallTable(u16 itemTableIdx) {
}
}
return NO_ITEM;
return dItem_NONE_e;
}
/* 800C8214-800C8498 .text getItemFromLifeBallTableWithoutEmono__FUs */
@@ -2847,16 +2847,16 @@ u8 getItemFromLifeBallTableWithoutEmono(u16 itemTableIdx) {
for (int i = 0; i < 8; i++) {
int randIdx = cM_rndF(15.999f);
if (!isEmono(items[randIdx]) && items[randIdx] != NO_ITEM) {
if (!isEmono(items[randIdx]) && items[randIdx] != dItem_NONE_e) {
return items[randIdx];
}
}
for (int i = 0; i < 16; i++) {
if (!isEmono(items[i]) && items[i] != NO_ITEM) {
if (!isEmono(items[i]) && items[i] != dItem_NONE_e) {
return items[i];
}
}
return NO_ITEM;
return dItem_NONE_e;
}
src/d/d_item_data.cpp
+155 -155
View File
File diff suppressed because it is too large Load Diff
src/d/d_npc.cpp
+1 -1
View File
@@ -650,7 +650,7 @@ bool dNpc_chkArasoi() {
bool dNpc_chkLetterPassed() {
bool ret = false;
if(dComIfGs_isGetItemReserve(0xC)) {
ret = dComIfGs_checkReserveItem(LETTER00) == 0;
ret = dComIfGs_checkReserveItem(dItem_FATHER_LETTER_e) == 0;
}
return ret;
}
src/d/d_s_play.cpp
+9 -9
View File
@@ -1343,28 +1343,28 @@ s32 phase_4(dScnPly_ply_c* i_this) {
stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
if (stag_info != NULL && dStage_stagInfo_GetSTType(stag_info) == dStageType_FF1_e && dComIfGs_isEventBit(0x0801)) {
dComIfGs_setSelectEquip(0, NO_ITEM);
dComIfGp_setSelectEquip(0, NO_ITEM);
dComIfGs_setSelectEquip(0, dItem_NONE_e);
dComIfGp_setSelectEquip(0, dItem_NONE_e);
dComIfGs_offCollect(0, 0);
}
if (strcmp(dComIfGp_getStartStageName(), "GTower") == 0) {
dComIfGs_setItem(12, NO_ITEM); // take away the bow
dComIfGs_setItem(12, dItem_NONE_e); // take away the bow
for (s32 i = 0; i < 3; i++) {
u32 itemno = dComIfGp_getSelectItem(i);
if (itemno == BOW || itemno == MAGIC_ARROW || itemno == LIGHT_ARROW) {
dComIfGs_setSelectItem(i, NO_ITEM);
if (itemno == dItem_BOW_e || itemno == dItem_MAGIC_ARROW_e || itemno == dItem_LIGHT_ARROW_e) {
dComIfGs_setSelectItem(i, dItem_NONE_e);
dComIfGp_setSelectItem(i);
}
}
} else if (dComIfGs_getItem(12) == NO_ITEM) {
} else if (dComIfGs_getItem(12) == dItem_NONE_e) {
// give the bow back
if (dComIfGs_isGetItem(12, 2))
dComIfGs_setItem(12, LIGHT_ARROW);
dComIfGs_setItem(12, dItem_LIGHT_ARROW_e);
else if (dComIfGs_isGetItem(12, 1))
dComIfGs_setItem(12, MAGIC_ARROW);
dComIfGs_setItem(12, dItem_MAGIC_ARROW_e);
else if (dComIfGs_isGetItem(12, 0))
dComIfGs_setItem(12, BOW);
dComIfGs_setItem(12, dItem_BOW_e);
}
if (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 ||
src/d/d_s_room.cpp
+2 -2
View File
@@ -269,10 +269,10 @@ s32 phase_4(room_of_scene_class* i_this) {
setMapImage(i_this);
if (dComIfGs_checkGetItem(PEARL2))
if (dComIfGs_checkGetItem(dItem_PEARL_DIN_e))
i_this->field_0x1dc = 1;
if (strcmp(dComIfGp_getStartStageName(), "Omori") == 0 && dComIfGs_checkGetItem(PEARL3))
if (strcmp(dComIfGp_getStartStageName(), "Omori") == 0 && dComIfGs_checkGetItem(dItem_PEARL_FARORE_e))
i_this->field_0x1dc = 2;
if (roomNo == 13) {
src/d/d_save.cpp
+27 -27
View File
@@ -29,12 +29,12 @@ void dSv_player_status_a_c::init() {
field_0x8 = 0;
for (int i = 0; i < 5; i++) {
mSelectItem[i] = NO_ITEM;
mSelectItem[i] = dItem_NONE_e;
dComIfGp_setSelectItem(i);
}
for (int i = 0; i < 4; i++) {
mSelectEquip[i] = NO_ITEM;
mSelectEquip[i] = dItem_NONE_e;
}
mRupee = 0;
@@ -75,7 +75,7 @@ void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status
/* 80058C60-80058C7C .text init__17dSv_player_item_cFv */
void dSv_player_item_c::init() {
for (int i = 0; i < 21; i++) {
mItems[i] = NO_ITEM;
mItems[i] = dItem_NONE_e;
}
}
@@ -103,7 +103,7 @@ void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) {
void dSv_player_item_c::setEmptyBottle() {
for (int bottleIdx = 0; bottleIdx < 4; bottleIdx++) {
int invIdx = 0xE + bottleIdx;
if (dComIfGs_getItem((u8)invIdx) == NO_ITEM) {
if (dComIfGs_getItem((u8)invIdx) == dItem_NONE_e) {
dComIfGs_setItem((u8)invIdx, EMPTY_BOTTLE);
break;
}
@@ -230,10 +230,10 @@ void dSv_player_get_item_c::onBottleItem(u8 i_item) {
case BLUE_BOTTLE:
mItemFlags[0] |= 0x20;
break;
case BOTTLESHIP:
case dItem_HALF_SOUP_BOTTLE_e:
mItemFlags[0] |= 0x40;
break;
case SOUP_BOTTLE:
case dItem_SOUP_BOTTLE_e:
mItemFlags[0] |= 0x80;
break;
case BIN_IN_WATER:
@@ -285,9 +285,9 @@ BOOL dSv_player_get_item_c::isBottleItem(u8 i_item) {
return (mItemFlags[0] >> 4) & 1;
case BLUE_BOTTLE:
return (mItemFlags[0] >> 5) & 1;
case BOTTLESHIP:
case dItem_HALF_SOUP_BOTTLE_e:
return (mItemFlags[0] >> 6) & 1;
case SOUP_BOTTLE:
case dItem_SOUP_BOTTLE_e:
return (mItemFlags[0] >> 7) & 1;
case BIN_IN_WATER:
return (mItemFlags[1] >> 1) & 1;
@@ -366,15 +366,15 @@ void dSv_player_item_max_c::init() {
/* 80059908-80059968 .text init__21dSv_player_bag_item_cFv */
void dSv_player_bag_item_c::init() {
for (int i = 0; i < 8; i++) {
mBeast[i] = NO_ITEM;
mBeast[i] = dItem_NONE_e;
}
for (int i = 0; i < 8; i++) {
mBait[i] = NO_ITEM;
mBait[i] = dItem_NONE_e;
}
for (int i = 0; i < 8; i++) {
mReserve[i] = NO_ITEM;
mReserve[i] = dItem_NONE_e;
}
}
@@ -382,7 +382,7 @@ void dSv_player_bag_item_c::init() {
void dSv_player_bag_item_c::setBeastItem(u8 i_itemNo) {
if (!checkBeastItem(i_itemNo)) {
for (int i = 0; i < 8; i++) {
if (mBeast[i] == NO_ITEM) {
if (mBeast[i] == dItem_NONE_e) {
mBeast[i] = i_itemNo;
return;
}
@@ -395,11 +395,11 @@ void dSv_player_bag_item_c::setBeastItemEmpty(u8 i_itemNo) {
if (checkBeastItem(i_itemNo)) {
for (int i = 0; i < 8; i++) {
if (mBeast[i] == i_itemNo) {
mBeast[i] = NO_ITEM;
mBeast[i] = dItem_NONE_e;
for (int btnIdx = 0; btnIdx < 3; btnIdx++) {
if (dComIfGp_getSelectItem(btnIdx) == i_itemNo) {
dComIfGs_setItem(dComIfGs_getSelectItem(btnIdx), NO_ITEM);
dComIfGp_setItem(dComIfGs_getSelectItem(btnIdx), NO_ITEM);
dComIfGs_setItem(dComIfGs_getSelectItem(btnIdx), dItem_NONE_e);
dComIfGp_setItem(dComIfGs_getSelectItem(btnIdx), dItem_NONE_e);
dComIfGp_setSelectItem(btnIdx);
}
}
@@ -490,9 +490,9 @@ void dSv_player_bag_item_c::setBaitItemEmpty() {
u8 num = dComIfGs_getBaitNum(baitSlotIdx);
u8 itemNo = dComIfGp_getSelectItem(btnIdx);
if (itemNo == ANIMAL_ESA) {
if (itemNo == dItem_HYOI_PEAR_e) {
u8 num = dComIfGs_getBaitNum(baitSlotIdx);
setBaitItemChange(NO_ITEM);
setBaitItemChange(dItem_NONE_e);
} else if (itemNo == BIRD_ESA_5) {
num = dComIfGs_getBaitNum(baitSlotIdx);
if (num > 0) {
@@ -500,7 +500,7 @@ void dSv_player_bag_item_c::setBaitItemEmpty() {
}
dComIfGs_setBaitNum(baitSlotIdx, num);
if (num == 0) {
setBaitItemChange(NO_ITEM);
setBaitItemChange(dItem_NONE_e);
}
}
}
@@ -523,9 +523,9 @@ void dSv_player_bag_item_c::setBaitItemEmpty(u8 i_btnIdx) {
u8 num = dComIfGs_getBaitNum(baitSlotIdx);
u8 itemNo = dComIfGp_getSelectItem(i_btnIdx);
if (itemNo == ANIMAL_ESA) {
if (itemNo == dItem_HYOI_PEAR_e) {
u8 num = dComIfGs_getBaitNum(baitSlotIdx);
setBaitItemChange(i_btnIdx, NO_ITEM);
setBaitItemChange(i_btnIdx, dItem_NONE_e);
} else if (itemNo == BIRD_ESA_5) {
num = dComIfGs_getBaitNum(baitSlotIdx);
if (num > 0) {
@@ -533,7 +533,7 @@ void dSv_player_bag_item_c::setBaitItemEmpty(u8 i_btnIdx) {
}
dComIfGs_setBaitNum(baitSlotIdx, num);
if (num == 0) {
setBaitItemChange(i_btnIdx, NO_ITEM);
setBaitItemChange(i_btnIdx, dItem_NONE_e);
}
}
}
@@ -542,7 +542,7 @@ void dSv_player_bag_item_c::setBaitItemEmpty(u8 i_btnIdx) {
void dSv_player_bag_item_c::setBaitItem(u8 i_itemNo) {
if (checkBaitItemEmpty()) {
for (int i = 0; i < 8; i++) {
if (mBait[i] == NO_ITEM) {
if (mBait[i] == dItem_NONE_e) {
mBait[i] = i_itemNo;
dComIfGs_setBaitNum(i, 3);
return;
@@ -553,7 +553,7 @@ void dSv_player_bag_item_c::setBaitItem(u8 i_itemNo) {
/* 8005A2D0-8005A2F4 .text checkBaitItemEmpty__21dSv_player_bag_item_cFv */
u8 dSv_player_bag_item_c::checkBaitItemEmpty() {
return checkBaitItem(NO_ITEM);
return checkBaitItem(dItem_NONE_e);
}
/* 8005A2F4-8005A334 .text checkBaitItem__21dSv_player_bag_item_cFUc */
@@ -616,19 +616,19 @@ void dSv_player_bag_item_c::setReserveItemChange(u8 i_btnIdx, u8 i_itemNo) {
/* 8005A79C-8005A7C0 .text setReserveItemEmpty__21dSv_player_bag_item_cFv */
void dSv_player_bag_item_c::setReserveItemEmpty() {
setReserveItemChange(NO_ITEM);
setReserveItemChange(dItem_NONE_e);
}
/* 8005A7C0-8005A7E4 .text setReserveItemEmpty__21dSv_player_bag_item_cFUc */
void dSv_player_bag_item_c::setReserveItemEmpty(u8 i_itemNo) {
setReserveItemChange(i_itemNo, NO_ITEM);
setReserveItemChange(i_itemNo, dItem_NONE_e);
}
/* 8005A7E4-8005A854 .text setReserveItem__21dSv_player_bag_item_cFUc */
void dSv_player_bag_item_c::setReserveItem(u8 i_itemNo) {
if (checkReserveItemEmpty()) {
for (int i = 0; i < 8; i++) {
if (mReserve[i] == NO_ITEM) {
if (mReserve[i] == dItem_NONE_e) {
mReserve[i] = i_itemNo;
return;
}
@@ -638,7 +638,7 @@ void dSv_player_bag_item_c::setReserveItem(u8 i_itemNo) {
/* 8005A854-8005A878 .text checkReserveItemEmpty__21dSv_player_bag_item_cFv */
u8 dSv_player_bag_item_c::checkReserveItemEmpty() {
return checkReserveItem(NO_ITEM);
return checkReserveItem(dItem_NONE_e);
}
/* 8005A878-8005A8B8 .text checkReserveItem__21dSv_player_bag_item_cFUc */
src/d/d_shop.cpp
+6 -6
View File
@@ -43,8 +43,8 @@ ShopItems_c__ItemData shopItemData_FoodAll = {
};
ShopItems_c__ItemData shopItemData_FoodHyoi = {
/* mItemNo */ ANIMAL_ESA,
/* mMustNotOwnItemNo */ ANIMAL_ESA,
/* mItemNo */ dItem_HYOI_PEAR_e,
/* mMustNotOwnItemNo */ dItem_HYOI_PEAR_e,
/* mMustOwnItemNo */ ESA_BAG,
/* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e,
};
@@ -52,14 +52,14 @@ ShopItems_c__ItemData shopItemData_FoodHyoi = {
ShopItems_c__ItemData shopItemData_arrow10 = {
/* mItemNo */ ARROW_10,
/* mMustNotOwnItemNo */ ARROW_10,
/* mMustOwnItemNo */ BOW,
/* mMustOwnItemNo */ dItem_BOW_e,
/* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e,
};
ShopItems_c__ItemData shopItemData_arrow30 = {
/* mItemNo */ ARROW_30,
/* mMustNotOwnItemNo */ ARROW_30,
/* mMustOwnItemNo */ BOW,
/* mMustOwnItemNo */ dItem_BOW_e,
/* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e,
};
@@ -1314,7 +1314,7 @@ BOOL dShop_now_triggercheck(msg_class* msg, STControl* stickControl, ShopItems_c
/* 8006036C-8006044C .text dShop_maxCheck__Fii */
BOOL dShop_maxCheck(int itemNo, int) {
if (itemNo == BIRD_ESA_5 || itemNo == ANIMAL_ESA) {
if (itemNo == BIRD_ESA_5 || itemNo == dItem_HYOI_PEAR_e) {
if (!dComIfGs_checkBaitItemEmpty()) {
return TRUE;
}
@@ -1343,7 +1343,7 @@ u8 dShop_BoughtErrorStatus(ShopItems_c* shopItems, int param_2, int param_3) {
u8 errorStatus = 0x00;
if (buyCond & Shop_BuyCond_MUST_OWN_ITEM_e) {
if (itemData->mMustOwnItemNo == BOW) {
if (itemData->mMustOwnItemNo == dItem_BOW_e) {
if (dComIfGs_getItem(0xC) == 0xFF) {
errorStatus |= Shop_BuyCond_MUST_OWN_ITEM_e;
}
src/d/d_timer.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ void dDlst_TimerScrnDraw_c::setIconType(void* tex, u8 type) {
itemNo = dComIfGs_getSelectEquip(0);
break;
case 4:
itemNo = LETTER00;
itemNo = dItem_FATHER_LETTER_e;
break;
default:
itemNo = (u32)tex;
src/f_op/f_op_actor_mng.cpp
+17 -17
View File
@@ -772,7 +772,7 @@ s32 fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roo
dComIfGp_event_setGtItm(i_itemNo);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -785,7 +785,7 @@ s32 fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param
dComIfGp_event_setGtItm(i_itemNo);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -842,7 +842,7 @@ s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int r
u8* pItemTable = itemTableList->mItemTables[tableIdx];
u32 itemNo;
u32 lastItemPID;
for (int i = 0; (itemNo = *pItemTable) != NO_ITEM && i < 0x10; pItemTable++, i++) {
for (int i = 0; (itemNo = *pItemTable) != dItem_NONE_e && i < 0x10; pItemTable++, i++) {
if (p_pos) {
pos = *p_pos;
}
@@ -906,7 +906,7 @@ s32 fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int
s32 fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale,
createFunc createFunc) {
JUT_ASSERT(2716, 0 <= i_itemNo && i_itemNo < 256);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -916,7 +916,7 @@ s32 fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz*
/* 8002688C-80026980 .text fopAcM_createRaceItem__FP4cXyziiP5csXyziP4cXyzi */
s32 fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, int param_7) {
JUT_ASSERT(2763, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -928,7 +928,7 @@ s32 fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot,
/* 80026980-80026A68 .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */
s32 fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) {
JUT_ASSERT(2813, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -954,7 +954,7 @@ s32 fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int
JUT_ASSERT(2915, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -970,7 +970,7 @@ s32 fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int
switch (i_itemNo) {
case RECOVER_FAIRY:
return fopAcM_create(PROC_NPC_FA1, 1, pos, roomNo, rot, scale);
case TRIPLE_HEART:
case dItem_TRIPLE_HEART_e:
// Make the two extra hearts first, then fall-through to make the third heart as normal.
for (int i = 0; i < 2; i++) {
fopAcM_create(PROC_ITEM, params, pos, roomNo, &prmRot, scale);
@@ -994,7 +994,7 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN
csXyz prmRot = csXyz::Zero;
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return NULL;
}
@@ -1009,7 +1009,7 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN
switch (i_itemNo) {
case RECOVER_FAIRY:
return fopAcM_fastCreate(PROC_NPC_FA1, 1, pos, roomNo, rot, scale);
case TRIPLE_HEART:
case dItem_TRIPLE_HEART_e:
// Make the two extra hearts first, then fall-through to make the third heart as normal.
for (i = 0; i < 2; i++) {
fopAcM_fastCreate(PROC_ITEM, params, pos, roomNo, &prmRot, scale);
@@ -1023,7 +1023,7 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN
/* 80026E5C-80026F5C .text fopAcM_createItemForKP2__FP4cXyziiP5csXyzP4cXyzfffUs */
fopAc_ac_c* fopAcM_createItemForKP2(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXyz* scale, f32 speedF, f32 speedY, f32 gravity, u16 i_itemBitNo) {
JUT_ASSERT(0xc25, 0 <= i_itemNo && i_itemNo < 256);
if (i_itemNo == NO_ITEM)
if (i_itemNo == dItem_NONE_e)
return NULL;
fopAc_ac_c* ac = (fopAc_ac_c*)fopAcM_fastCreate(PROC_SPC_ITEM01, i_itemNo | (i_itemBitNo & 0xFFFF) << 8, pos, roomNo, rot, scale);
@@ -1052,7 +1052,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXy
int switchNo2 = 0xFF;
JUT_ASSERT(3201, 0 <= i_itemNo && i_itemNo < 256);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == dItem_NONE_e) {
return NULL;
}
@@ -1072,7 +1072,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXy
case RECOVER_FAIRY:
item = (daItem_c*)fopAcM_fastCreate(PROC_NPC_FA1, 1, pos, roomNo, rot, scale);
return item;
case TRIPLE_HEART:
case dItem_TRIPLE_HEART_e:
// Make the two extra hearts first, then fall-through to make the third heart as normal.
for (i = 0; i < 2; i++) {
if (rot) {
@@ -1140,7 +1140,7 @@ void* fopAcM_createStealItem(cXyz* p_pos, int i_tblNo, int i_roomNo, csXyz* p_an
}
i_itemBitNo = -1;
} else {
if (itemNo == NO_ITEM) {
if (itemNo == dItem_NONE_e) {
itemNo = getItemFromLifeBallTableWithoutEmono(i_tblNo);
}
i_itemBitNo = -1;
@@ -1181,7 +1181,7 @@ void* fopAcM_createItemFromEnemyTable(u16 itemTableIdx, int i_itemBitNo, int i_r
)
) {
i_itemBitNo = -1;
items[itemIdx] = YELLOW_RUPEE;
items[itemIdx] = dItem_YELLOW_RUPEE_e;
}
} else if (isNonSavedEmono(items[itemIdx])) {
if (i_itemBitNo != 0) {
@@ -1427,8 +1427,8 @@ s32 fopAcM_getWaterY(const cXyz* pPos, f32* pDstWaterY) {
/* 80028684-80028724 .text fopAcM_setGbaName__FP10fopAc_ac_cUcUcUc */
void fopAcM_setGbaName(fopAc_ac_c* i_this, u8 itemNo, u8 gbaName0, u8 gbaName1) {
if (dComIfGs_checkGetItem(itemNo) ||
(itemNo == BOW && (dComIfGs_checkGetItem(MAGIC_ARROW) || dComIfGs_checkGetItem(LIGHT_ARROW))) ||
(itemNo == MAGIC_ARROW && dComIfGs_checkGetItem(LIGHT_ARROW))
(itemNo == dItem_BOW_e && (dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e) || dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e))) ||
(itemNo == dItem_MAGIC_ARROW_e && dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e))
)
i_this->mGbaName = gbaName1;
else