mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 05:37:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename more item enums

Browse Source
This commit is contained in:
LagoLunatic
2025-01-17 20:58:43 -05:00
parent c609b6780c
commit e8adc6c9e5
33 changed files with 937 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agb.cpp
+2 -2
View File
@@ -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;
}
@@ -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;
src/d/actor/d_a_agbsw0.cpp
+9 -9
View File
@@ -915,7 +915,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
}
}
if(!dComIfGs_isGetCollectMap(3)) {
if(dComIfGs_checkGetItem(ESA_BAG)) {
if(dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) {
if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) {
#if VERSION == VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
@@ -1259,7 +1259,7 @@ BOOL daAgbsw0_c::ExeSubR() {
itemNo = 0;
}
if(itemNo != RECOVER_FAIRY) {
if(itemNo != dItem_RECOVER_FAIRY_e) {
current.pos.y += scale.y / 2.0f;
}
@@ -1524,7 +1524,7 @@ BOOL daAgbsw0_c::ExeSubD() {
}
else if(field_0x299 == 2 && fopAcM_isSwitch(this, getSw1())) {
s32 itemNo = getParamNo();
if(itemNo != RECOVER_FAIRY) {
if(itemNo != dItem_RECOVER_FAIRY_e) {
current.pos.y += scale.y / 2;
}
if(0 <= itemNo && itemNo < 0x1F && itemNo != dItem_HEART_PIECE_e && itemNo != dItem_HEART_CONTAINER_e && itemNo != dItem_SMALL_KEY_e) {
@@ -2193,13 +2193,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x4E:
if(dComIfGs_checkGetItem(MIRROR_SHIELD)) {
if(dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) {
return FALSE;
}
break;
case 0x4F:
if(!dComIfGs_checkGetItem(MIRROR_SHIELD)) {
if(!dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) {
return FALSE;
}
@@ -2259,25 +2259,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x59:
if(dComIfGs_checkGetItem(LV3_SWORD) || dComIfGs_checkGetItem(MASTER_SWORD_EX)) {
if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) || dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
return FALSE;
}
break;
case 0x5A:
if(!dComIfGs_checkGetItem(LV3_SWORD) && !dComIfGs_checkGetItem(MASTER_SWORD_EX)) {
if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) && !dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
return FALSE;
}
break;
case 0x5B:
if(dComIfGs_checkGetItem(MASTER_SWORD_EX)) {
if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
return FALSE;
}
break;
case 0x5C:
if(!dComIfGs_checkGetItem(MASTER_SWORD_EX)) {
if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
return FALSE;
}
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -993,7 +993,7 @@ BOOL daArrow_c::procStop_BG() {
if (mCoSph.ChkCoHit()) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, dItem_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
fopAcM_delete(this);
return TRUE;
src/d/actor/d_a_auction.cpp
+2 -2
View File
@@ -50,8 +50,8 @@ static daAuction_HIO_c l_HIO;
static daAuction_c::ItemData l_item_dat[] = {
{dItem_JOY_PENDANT_e, 0x1D10, 40, 0x0F01},
{COLLECT_MAP_27, 0x1D11, 5, 0x1080},
{COLLECT_MAP_18, 0x1D12, 60, 0x1040},
{dItem_COLLECT_MAP_27_e, 0x1D11, 5, 0x1080},
{dItem_COLLECT_MAP_18_e, 0x1D12, 60, 0x1040},
{dItem_HEART_PIECE_e, 0x1D13, 80, 0x1020},
};
src/d/actor/d_a_bk.cpp
+1 -1
View File
@@ -1183,7 +1183,7 @@ static void jyunkai(bk_class* i_this) {
static void* ken_s_sub(void* param_1, void*) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_ITEM) {
daItem_c* item = (daItem_c*)param_1;
if (item->getItemNo() == DROPPED_SWORD) {
if (item->getItemNo() == dItem_DROPPED_SWORD_e) {
return param_1;
}
}
src/d/actor/d_a_demo_item.cpp
+118 -118
View File
@@ -28,24 +28,24 @@ u8 daDitem_c::m_effect_type[0x100] = {
0x03, // dItem_ORANGE_RUPEE_e
0x00, // dItem_HEART_PIECE_e
0x00, // dItem_HEART_CONTAINER_e
0x04, // S_MAGIC
0x04, // L_MAGIC
0x04, // BOMB_5
0x04, // BOMB_10
0x04, // BOMB_20
0x04, // BOMB_30
0x04, // dItem_SMALL_MAGIC_e
0x04, // dItem_LARGE_MAGIC_e
0x04, // dItem_BOMB_5_e
0x04, // dItem_BOMB_10_e
0x04, // dItem_BOMB_20_e
0x04, // dItem_BOMB_30_e
0x03, // dItem_SILVER_RUPEE_e
0x04, // ARROW_10
0x04, // ARROW_20
0x04, // ARROW_30
0x04, // dItem_ARROW_10_e
0x04, // dItem_ARROW_20_e
0x04, // dItem_ARROW_30_e
0x04, // noentry19
0x04, // noentry20
0x02, // dItem_SMALL_KEY_e
0x04, // RECOVER_FAIRY
0x04, // dItem_RECOVER_FAIRY_e
0x04, // noentry23
0x04, // noentry24
0x04, // noentry25
0x03, // SUB_DUN_RUPEE
0x03, // dItem_SUB_DUN_RUPEE_e
0x04, // noentry27
0x04, // noentry28
0x04, // noentry29
@@ -55,15 +55,15 @@ u8 daDitem_c::m_effect_type[0x100] = {
0x00, // dItem_TINGLE_TUNER_e
0x00, // dItem_WIND_WAKER_e
0x00, // CAMERA
0x00, // EMONO_BAG
0x00, // dItem_SPOILS_BAG_e
0x00, // dItem_GRAPPLING_HOOK_e
0x00, // CAMERA2
0x00, // dItem_BOW_e
0x00, // PWR_GROOVE
0x00, // dItem_POWER_BRACELETS_e
0x00, // dItem_IRON_BOOTS_e
0x00, // dItem_MAGIC_ARMOR_e
0x04, // WATER_BOOTS
0x00, // ESA_BAG
0x00, // dItem_BAIT_BAG_e
0x00, // dItem_BOOMERANG_e
0x04, // BARE_HAND
0x00, // dItem_HOOKSHOT_e
@@ -75,40 +75,40 @@ u8 daDitem_c::m_effect_type[0x100] = {
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
0x00, // dItem_SWORD_e
0x00, // dItem_MASTER_SWORD_1_e
0x04, // dItem_MASTER_SWORD_2_e
0x00, // dItem_SHIELD_e
0x00, // dItem_MIRROR_SHIELD_e
0x00, // dItem_DROPPED_SWORD_e
0x04, // dItem_MASTER_SWORD_3_e
0x01, // KAKERA_HEART2
0x04, // noentry64
0x04, // noentry65
0x00, // PIRATES_OMAMORI
0x00, // HEROS_OMAMORI
0x00, // dItem_PIRATES_CHARM_e
0x00, // dItem_HEROS_CHARM_e
0x04, // GRASS_BALL
0x01, // SKULL_NECKLACE
0x01, // BOKOBABA_SEED
0x01, // GOLDEN_FEATHER
0x01, // dItem_SKULL_NECKLACE_e
0x01, // dItem_BOKOBABA_SEED_e
0x01, // dItem_GOLDEN_FEATHER_e
0x01, // BOKO_BELT
0x01, // RED_JELLY
0x01, // GREEN_JELLY
0x01, // BLUE_JELLY
0x01, // dItem_RED_JELLY_e
0x01, // dItem_GREEN_JELLY_e
0x01, // dItem_BLUE_JELLY_e
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_EMPTY_BOTTLE_e
0x02, // dItem_RED_POTION_e
0x02, // dItem_GREEN_POTION_e
0x02, // dItem_BLUE_POTION_e
0x00, // dItem_HALF_SOUP_BOTTLE_e
0x00, // dItem_SOUP_BOTTLE_e
0x02, // BIN_IN_WATER
0x02, // FAIRY_BOTTLE
0x00, // FIREFLY_BOTTLE
0x02, // FWATER_BOTTLE
0x02, // dItem_WATER_BOTTLE_e
0x02, // dItem_FAIRY_BOTTLE_e
0x00, // dItem_FIREFLY_BOTTLE_e
0x02, // dItem_FOREST_WATER_e
0x04, // UNK_BOTTLE_5A
0x04, // UNK_BOTTLE_5B
0x04, // UNK_BOTTLE_5C
@@ -149,7 +149,7 @@ u8 daDitem_c::m_effect_type[0x100] = {
0x00, // TRIFORCE_MAP7
0x00, // TRIFORCE_MAP8
0x04, // noentry129
0x02, // BIRD_ESA_5
0x02, // dItem_BIRD_BAIT_5_e
0x02, // dItem_HYOI_PEAR_e
0x04, // ESA1
0x04, // ESA2
@@ -190,14 +190,14 @@ u8 daDitem_c::m_effect_type[0x100] = {
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
0x00, // dItem_MAX_RUPEE_UP1_e
0x00, // dItem_MAX_RUPEE_UP2_e
0x00, // dItem_MAX_BOMB_UP1_e
0x00, // dItem_MAX_BOMB_UP2_e
0x00, // dItem_MAX_ARROW_UP1_e
0x00, // dItem_MAX_ARROW_UP2_e
0x04, // dItem_MAGIC_POWER_e
0x04, // dItem_MAX_MP_UP1_e
0x03, // TINCLE_RUPEE1
0x03, // TINCLE_RUPEE2
0x03, // TINCLE_RUPEE3
@@ -210,70 +210,70 @@ u8 daDitem_c::m_effect_type[0x100] = {
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_COLLECT_MAP_64_e
0x04, // dItem_COLLECT_MAP_63_e
0x04, // dItem_COLLECT_MAP_62_e
0x00, // dItem_COLLECT_MAP_61_e
0x00, // dItem_COLLECT_MAP_60_e
0x00, // dItem_COLLECT_MAP_59_e
0x00, // dItem_COLLECT_MAP_58_e
0x00, // dItem_COLLECT_MAP_57_e
0x00, // dItem_COLLECT_MAP_56_e
0x00, // dItem_COLLECT_MAP_55_e
0x00, // dItem_COLLECT_MAP_54_e
0x00, // dItem_COLLECT_MAP_53_e
0x00, // dItem_COLLECT_MAP_52_e
0x00, // dItem_COLLECT_MAP_51_e
0x00, // dItem_COLLECT_MAP_50_e
0x00, // dItem_COLLECT_MAP_49_e
0x00, // dItem_COLLECT_MAP_48_e
0x00, // dItem_COLLECT_MAP_47_e
0x00, // dItem_COLLECT_MAP_46_e
0x00, // dItem_COLLECT_MAP_45_e
0x00, // dItem_COLLECT_MAP_44_e
0x00, // dItem_COLLECT_MAP_43_e
0x00, // dItem_COLLECT_MAP_42_e
0x00, // dItem_COLLECT_MAP_41_e
0x00, // dItem_COLLECT_MAP_40_e
0x00, // dItem_COLLECT_MAP_39_e
0x00, // dItem_COLLECT_MAP_38_e
0x00, // dItem_COLLECT_MAP_37_e
0x00, // dItem_COLLECT_MAP_36_e
0x00, // dItem_COLLECT_MAP_35_e
0x00, // dItem_COLLECT_MAP_34_e
0x00, // dItem_COLLECT_MAP_33_e
0x00, // dItem_COLLECT_MAP_32_e
0x00, // dItem_COLLECT_MAP_31_e
0x00, // dItem_COLLECT_MAP_30_e
0x00, // dItem_COLLECT_MAP_29_e
0x00, // dItem_COLLECT_MAP_28_e
0x00, // dItem_COLLECT_MAP_27_e
0x00, // dItem_COLLECT_MAP_26_e
0x00, // dItem_COLLECT_MAP_25_e
0x00, // dItem_COLLECT_MAP_24_e
0x00, // dItem_COLLECT_MAP_23_e
0x00, // dItem_COLLECT_MAP_22_e
0x00, // dItem_COLLECT_MAP_21_e
0x00, // dItem_COLLECT_MAP_20_e
0x00, // dItem_COLLECT_MAP_19_e
0x00, // dItem_COLLECT_MAP_18_e
0x00, // dItem_COLLECT_MAP_17_e
0x00, // dItem_COLLECT_MAP_16_e
0x00, // dItem_COLLECT_MAP_15_e
0x00, // dItem_COLLECT_MAP_14_e
0x00, // dItem_COLLECT_MAP_13_e
0x00, // dItem_COLLECT_MAP_12_e
0x00, // dItem_COLLECT_MAP_11_e
0x00, // dItem_COLLECT_MAP_10_e
0x00, // dItem_COLLECT_MAP_09_e
0x00, // dItem_COLLECT_MAP_08_e
0x00, // dItem_COLLECT_MAP_07_e
0x00, // dItem_COLLECT_MAP_06_e
0x00, // dItem_COLLECT_MAP_05_e
0x00, // dItem_COLLECT_MAP_04_e
0x00, // dItem_COLLECT_MAP_03_e
0x00, // dItem_COLLECT_MAP_02_e
0x00, // dItem_COLLECT_MAP_01_e
0x04, // dItem_NONE_e
};
@@ -378,16 +378,16 @@ void daDitem_c::set_pos() {
void daDitem_c::anim_control() {
switch (m_itemNo) {
case EMPTY_BSHIP:
case EMPTY_BOTTLE:
case RED_BOTTLE:
case GREEN_BOTTLE:
case BLUE_BOTTLE:
case dItem_EMPTY_BOTTLE_e:
case dItem_RED_POTION_e:
case dItem_GREEN_POTION_e:
case dItem_BLUE_POTION_e:
case dItem_HALF_SOUP_BOTTLE_e:
case dItem_SOUP_BOTTLE_e:
case BIN_IN_WATER:
case FAIRY_BOTTLE:
case FIREFLY_BOTTLE:
case FWATER_BOTTLE:
case dItem_WATER_BOTTLE_e:
case dItem_FAIRY_BOTTLE_e:
case dItem_FIREFLY_BOTTLE_e:
case dItem_FOREST_WATER_e:
case UNK_BOTTLE_5A:
case UNK_BOTTLE_5B:
case UNK_BOTTLE_5C:
src/d/actor/d_a_disappear.cpp
+2 -2
View File
@@ -32,8 +32,8 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
// This also seems to be used by several other enemies, such as Molgera's spawn.
static u32 ki_item_d[] = {
dItem_HEART_e,
L_MAGIC,
ARROW_10,
dItem_LARGE_MAGIC_e,
dItem_ARROW_10_e,
};
if (dropType < daDisItem_HEART_e + (int)ARRAY_SIZE(ki_item_d)) {
fopAcM_createItem(&i_this->current.pos, ki_item_d[dropType - daDisItem_HEART_e], -1, -1, daItemType_0_e, NULL, daItemAct_4_e);
src/d/actor/d_a_item.cpp
+67 -67
View File
@@ -36,24 +36,24 @@ float daItem_c::getYOffset() {
switch (m_itemNo) {
case BOKO_BELT:
return 0.0f;
case SKULL_NECKLACE:
case dItem_SKULL_NECKLACE_e:
return 0.0f;
case BOKOBABA_SEED:
case dItem_BOKOBABA_SEED_e:
return 0.0f;
case GOLDEN_FEATHER:
case dItem_GOLDEN_FEATHER_e:
return 0.0f;
case RED_JELLY:
case GREEN_JELLY:
case BLUE_JELLY:
case dItem_RED_JELLY_e:
case dItem_GREEN_JELLY_e:
case dItem_BLUE_JELLY_e:
return 0.0f;
case dItem_SMALL_KEY_e:
case dItem_BOSS_KEY_e:
return 0.0f;
case SHIELD:
case dItem_SHIELD_e:
return 23.0f;
case SWORD:
case dItem_SWORD_e:
return 20.0f;
case DROPPED_SWORD:
case dItem_DROPPED_SWORD_e:
return 10.0f;
case dItem_HEART_PIECE_e:
case dItem_HEART_CONTAINER_e:
@@ -172,10 +172,10 @@ void daItem_c::CreateInit() {
}
switch (m_itemNo) {
case BOMB_5:
case BOMB_10:
case BOMB_20:
case BOMB_30:
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
mScaleTarget.setall(0.6f);
break;
default:
@@ -195,11 +195,11 @@ void daItem_c::CreateInit() {
initAction();
switch (m_itemNo) {
case SWORD:
case SHIELD:
case dItem_SWORD_e:
case dItem_SHIELD_e:
fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
break;
case DROPPED_SWORD:
case dItem_DROPPED_SWORD_e:
current.angle.x = 0x4000;
break;
}
@@ -224,7 +224,7 @@ s32 daItem_c::_daItem_create() {
}
mItemBitNo = daItem_prm::getItemBitNo(this);
if (m_itemNo != BLUE_JELLY) { // Blue Chu Jelly uses mItemBitNo as if it was a switch.
if (m_itemNo != dItem_BLUE_JELLY_e) { // Blue Chu Jelly uses mItemBitNo as if it was a switch.
mItemBitNo &= 0x7F;
if (fopAcM_isItem(this, mItemBitNo) && mItemBitNo != 0x7F) {
// Already picked up, don't create the item again.
@@ -618,21 +618,21 @@ void daItem_c::itemGetExecute() {
mDoAud_seStart(JA_SE_HEART_PIECE);
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case S_MAGIC:
case dItem_SMALL_MAGIC_e:
mDoAud_seStart(JA_SE_MAGIC_POT_GET_S);
execItemGet(m_itemNo);
break;
case L_MAGIC:
case dItem_LARGE_MAGIC_e:
mDoAud_seStart(JA_SE_MAGIC_POT_GET_L);
execItemGet(m_itemNo);
break;
case BOMB_5:
case BOMB_10:
case BOMB_20:
case BOMB_30:
case ARROW_10:
case ARROW_20:
case ARROW_30:
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
case dItem_ARROW_10_e:
case dItem_ARROW_20_e:
case dItem_ARROW_30_e:
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
execItemGet(m_itemNo);
break;
@@ -655,26 +655,26 @@ void daItem_c::itemGetExecute() {
case dItem_DEKU_LEAF_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case SWORD: {
case dItem_SWORD_e: {
daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM);
if (item && item->m_itemNo == SHIELD) {
if (item && item->m_itemNo == dItem_SHIELD_e) {
item->itemGetExecute();
}
mItemStatus = STATUS_INIT_GET_DEMO;
break;
}
case SHIELD: {
case dItem_SHIELD_e: {
daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM);
if (item && item->m_itemNo == SWORD) {
if (item && item->m_itemNo == dItem_SWORD_e) {
item->itemGetExecute();
}
mItemStatus = STATUS_INIT_GET_DEMO;
break;
}
case DROPPED_SWORD:
case dItem_DROPPED_SWORD_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case SKULL_NECKLACE:
case dItem_SKULL_NECKLACE_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(0)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -683,7 +683,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case BOKOBABA_SEED:
case dItem_BOKOBABA_SEED_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(1)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -692,7 +692,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case GOLDEN_FEATHER:
case dItem_GOLDEN_FEATHER_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(2)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -710,7 +710,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case RED_JELLY:
case dItem_RED_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(4)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -719,7 +719,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case GREEN_JELLY:
case dItem_GREEN_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(5)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -728,7 +728,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case BLUE_JELLY:
case dItem_BLUE_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(6)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -737,7 +737,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case BIRD_ESA_5:
case dItem_BIRD_BAIT_5_e:
mDoAud_seStart(JA_SE_ESA_GET);
if (!dComIfGs_isGetItemBait(0)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -979,11 +979,11 @@ BOOL daItem_c::itemActionForSword() {
f32 temp = field_0x650 * 0.9f;
fopAcM_SetSpeed(this, 0.0f, -temp, 0.0f);
if (m_itemNo == SWORD) {
if (m_itemNo == dItem_SWORD_e) {
if (m_get_timer > 15) {
fopAcM_seStart(this, JA_SE_OBJ_LNK_SWORD_FALL, 0);
}
} else if (m_itemNo == SHIELD) {
} else if (m_itemNo == dItem_SHIELD_e) {
if (m_get_timer > 15) {
fopAcM_seStart(this, JA_SE_OBJ_LNK_SHIELD_FALL, 0);
}
@@ -1135,13 +1135,13 @@ void daItem_c::set_bound_se() {
case dItem_ORANGE_RUPEE_e:
fopAcM_seStart(this, JA_SE_OBJ_LUPY_BOUND, temp);
break;
case S_MAGIC:
case L_MAGIC:
case dItem_SMALL_MAGIC_e:
case dItem_LARGE_MAGIC_e:
fopAcM_seStart(this, JA_SE_OBJ_M_POT_BOUND, temp);
break;
case ARROW_10:
case ARROW_20:
case ARROW_30:
case dItem_ARROW_10_e:
case dItem_ARROW_20_e:
case dItem_ARROW_30_e:
case dItem_MAGIC_ARROW_e:
case dItem_LIGHT_ARROW_e:
fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp);
@@ -1150,10 +1150,10 @@ void daItem_c::set_bound_se() {
case dItem_HEART_CONTAINER_e:
fopAcM_seStart(this, JA_SE_CM_BST_HEART_BOUND, temp);
break;
case BOMB_5:
case BOMB_10:
case BOMB_20:
case BOMB_30:
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
fopAcM_seStart(this, JA_SE_CM_BST_BOMB_BOUND, temp);
break;
}
@@ -1254,13 +1254,13 @@ void daItem_c::mode_wait() {
break;
case dItem_HEART_PIECE_e:
case dItem_HEART_CONTAINER_e:
case BOMB_5:
case BOMB_10:
case BOMB_20:
case BOMB_30:
case ARROW_10:
case ARROW_20:
case ARROW_30:
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
case dItem_ARROW_10_e:
case dItem_ARROW_20_e:
case dItem_ARROW_30_e:
case dItem_MAGIC_ARROW_e:
case dItem_LIGHT_ARROW_e:
itemActionForArrow();
@@ -1268,21 +1268,21 @@ void daItem_c::mode_wait() {
case dItem_SMALL_KEY_e:
itemActionForKey();
break;
case S_MAGIC:
case L_MAGIC:
case dItem_SMALL_MAGIC_e:
case dItem_LARGE_MAGIC_e:
case dItem_JOY_PENDANT_e:
case SKULL_NECKLACE:
case BOKOBABA_SEED:
case GOLDEN_FEATHER:
case dItem_SKULL_NECKLACE_e:
case dItem_BOKOBABA_SEED_e:
case dItem_GOLDEN_FEATHER_e:
case BOKO_BELT:
case RED_JELLY:
case GREEN_JELLY:
case BLUE_JELLY:
case dItem_RED_JELLY_e:
case dItem_GREEN_JELLY_e:
case dItem_BLUE_JELLY_e:
itemActionForEmono();
break;
case SWORD:
case SHIELD:
case DROPPED_SWORD:
case dItem_SWORD_e:
case dItem_SHIELD_e:
case dItem_DROPPED_SWORD_e:
itemActionForSword();
break;
default:
src/d/actor/d_a_itembase.cpp
+2 -2
View File
@@ -39,12 +39,12 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
}
switch (m_itemNo) {
case ARROW_30:
case dItem_ARROW_30_e:
mpModelArrow[0] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (!mpModelArrow[0]) {
return FALSE;
}
case ARROW_20:
case dItem_ARROW_20_e:
mpModelArrow[1] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (!mpModelArrow[1]) {
return FALSE;
src/d/actor/d_a_mmusic.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ BOOL daMmusic::Act_c::Macore_is_playing() {
dComIfGs_isEventBit(0x2910) ||
dComIfGs_isEventBit(0x2e02) ||
dComIfGs_isEventBit(0x1610) ||
!dComIfGs_checkGetItem(LV3_SWORD))
!dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e))
return FALSE;
return TRUE;
src/d/actor/d_a_nh.cpp
+1 -1
View File
@@ -204,7 +204,7 @@ BOOL daNh_c::checkBinCatch() {
}
dComIfGp_getAttention().CatchRequest(
this, FIREFLY_BOTTLE,
this, dItem_FIREFLY_BOTTLE_e,
l_HIO.prm.field_0x08, l_HIO.prm.field_0x0c,
l_HIO.prm.field_0x10, l_HIO.prm.field_0x3c,
1
src/d/actor/d_a_npc_bs1.cpp
+17 -17
View File
@@ -362,25 +362,25 @@ void daNpc_Bs1_c::checkOrder() {
static u32 daNpc_Bs1_getBuyItemMax(int i_itemCost, int i_itemNo) {
int beastIdx;
switch (i_itemNo) {
case BOKOBABA_SEED:
case dItem_BOKOBABA_SEED_e:
beastIdx = 1;
break;
case SKULL_NECKLACE:
case dItem_SKULL_NECKLACE_e:
beastIdx = 0;
break;
case RED_JELLY:
case dItem_RED_JELLY_e:
beastIdx = 4;
break;
case GREEN_JELLY:
case dItem_GREEN_JELLY_e:
beastIdx = 5;
break;
case BLUE_JELLY:
case dItem_BLUE_JELLY_e:
beastIdx = 6;
break;
case dItem_JOY_PENDANT_e:
beastIdx = 7;
break;
case GOLDEN_FEATHER:
case dItem_GOLDEN_FEATHER_e:
beastIdx = 2;
break;
default:
@@ -828,7 +828,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
fopAcM_seStart(this, JA_SE_SHOP_BOUGHT, 0);
mShopItems.hideSelectItem();
dComIfGp_setItemRupeeCount(-rupee);
if(mShopItems.getSelectItemNo() == ESA_BAG) {
if(mShopItems.getSelectItemNo() == dItem_BAIT_BAG_e) {
mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx);
m76C[mShopItems.mSelectedItemIdx] = 1;
}
@@ -891,18 +891,18 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
mShopItems.hideSelectItem();
dComIfGp_setItemRupeeCount(-rupee);
u8 itemNo = mShopItems.getSelectItemNo();
if(itemNo == EMPTY_BOTTLE || itemNo == dItem_HEART_PIECE_e || itemNo == COLLECT_MAP_30) {
if(itemNo == dItem_EMPTY_BOTTLE_e || itemNo == dItem_HEART_PIECE_e || itemNo == dItem_COLLECT_MAP_30_e) {
mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx);
m76C[mShopItems.mSelectedItemIdx] = 1;
switch(itemNo) {
case EMPTY_BOTTLE:
case dItem_EMPTY_BOTTLE_e:
dComIfGs_onEventBit(0x2020);
break;
case dItem_HEART_PIECE_e:
dComIfGs_onEventBit(0x2010);
break;
case COLLECT_MAP_30:
case dItem_COLLECT_MAP_30_e:
dComIfGs_onEventBit(0x2008);
break;
}
@@ -988,25 +988,25 @@ u32 daNpc_Bs1_c::getMsg() {
if(isEmono(itemNo)) {
m840 = itemNo;
switch(itemNo) {
case BOKOBABA_SEED:
case dItem_BOKOBABA_SEED_e:
msgNo = 0xF78;
break;
case SKULL_NECKLACE:
case dItem_SKULL_NECKLACE_e:
msgNo = 0xF80;
break;
case RED_JELLY:
case dItem_RED_JELLY_e:
msgNo = 0xF85;
break;
case GREEN_JELLY:
case dItem_GREEN_JELLY_e:
msgNo = 0xF8A;
break;
case BLUE_JELLY:
case dItem_BLUE_JELLY_e:
msgNo = 0xF8F;
break;
case dItem_JOY_PENDANT_e:
msgNo = 0xF94;
break;
case GOLDEN_FEATHER:
case dItem_GOLDEN_FEATHER_e:
msgNo = 0xF99;
break;
default:
@@ -1470,7 +1470,7 @@ void daNpc_Bs1_c::createShopList() {
for(int i = 0; i < 3; i++) {
u8 itemNo = pDataSet[i]->mpItemData->mItemNo;
int idx = i;
if((itemNo == ESA_BAG && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(dItem_BOMB_BAG_e))) {
if((itemNo == dItem_BAIT_BAG_e && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(dItem_BOMB_BAG_e))) {
itemNo = pDataSet[i + 3][0].mpItemData->mItemNo;
idx += 3;
}
src/d/actor/d_a_npc_ji1.cpp
+4 -4
View File
@@ -1242,7 +1242,7 @@ void daNpc_Ji1_c::createItem() {
u8 itemNo;
if(field_0xD7C) {
itemNo = SWORD;
itemNo = dItem_SWORD_e;
}
else if(field_0xD7B == 1) {
itemNo = dItem_HURRICANE_SPIN_e;
@@ -2588,15 +2588,15 @@ BOOL daNpc_Ji1_c::battleAction(void*) {
if(field_0xC78 == 0) {
u8 icon;
switch(dComIfGs_getSelectEquip(0)) {
case SWORD:
case dItem_SWORD_e:
icon = 1;
break;
icon = 2;
break;
case LV3_SWORD:
case dItem_MASTER_SWORD_2_e:
icon = 2;
break;
case MASTER_SWORD:
case dItem_MASTER_SWORD_1_e:
default:
icon = 2;
break;
src/d/actor/d_a_npc_md.cpp
+4 -4
View File
@@ -329,17 +329,17 @@ s16 daNpc_Md_c::XyCheckCB(int i_itemBtn) {
if (selectItemNo == dItem_WIND_WAKER_e) {
return TRUE;
}
if (selectItemNo == GOLDEN_FEATHER) {
if (selectItemNo == dItem_GOLDEN_FEATHER_e) {
if (!dComIfGs_isEventBit(0x2E40) || (dComIfGs_isEventBit(0x2E40) && m_seaTalk)) {
return TRUE;
}
}
} else if (isTypeM_Dai() || isTypeEdaichi()) {
if (selectItemNo == GOLDEN_FEATHER && !dComIfGs_isEventBit(0x3B80)) {
if (selectItemNo == dItem_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(0x3B80)) {
return TRUE;
}
}
if (selectItemNo == GOLDEN_FEATHER) {
if (selectItemNo == dItem_GOLDEN_FEATHER_e) {
dComIfGs_onEventBit(0x2C08);
}
return FALSE;
@@ -356,7 +356,7 @@ s16 daNpc_Md_c::XyEventCB(int i_itemBtn) {
if (selectItemNo == dItem_WIND_WAKER_e) {
offDefaultTalkXY();
return mEventIdxTable[5];
} else if (selectItemNo == GOLDEN_FEATHER) {
} else if (selectItemNo == dItem_GOLDEN_FEATHER_e) {
onDefaultTalkXY();
}
return -1;
src/d/actor/d_a_npc_nz.cpp
+17 -17
View File
@@ -206,7 +206,7 @@ daNpc_Nz_HIO_c::daNpc_Nz_HIO_c() {
static s16 daNpc_Nz_XyCheckCB(void* i_actor, int i_itemBtn) {
daNpc_Nz_c* i_this = static_cast<daNpc_Nz_c*>(i_actor);
if(dComIfGp_getSelectItem(i_itemBtn) == BIRD_ESA_5) {
if(dComIfGp_getSelectItem(i_itemBtn) == dItem_BIRD_BAIT_5_e) {
f32 temp2 = l_HIO.field_0x20;
daPy_py_c* player = daPy_getPlayerActorClass();
cXyz temp(player->current.pos);
@@ -394,22 +394,22 @@ void daNpc_Nz_c::setMtx() {
cXyz temp3 = temp + temp2;
switch(field_0x908) {
case BIRD_ESA_5:
case dItem_BIRD_BAIT_5_e:
temp4 = -15.0f;
break;
case dItem_HYOI_PEAR_e:
temp4 = -5.0f;
break;
case RED_BOTTLE:
case BLUE_BOTTLE:
case dItem_RED_POTION_e:
case dItem_BLUE_POTION_e:
temp4 = -5.0f;
break;
case BOMB_10:
case BOMB_30:
case dItem_BOMB_10_e:
case dItem_BOMB_30_e:
temp4 = -15.0f;
break;
case ARROW_10:
case ARROW_30:
case dItem_ARROW_10_e:
case dItem_ARROW_30_e:
temp4 = -10.0f;
break;
}
@@ -496,7 +496,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) {
return 0x3405;
}
if((itemNo == RED_BOTTLE || itemNo == BLUE_BOTTLE) && !dComIfGs_checkEmptyBottle()) {
if((itemNo == dItem_RED_POTION_e || itemNo == dItem_BLUE_POTION_e) && !dComIfGs_checkEmptyBottle()) {
return 0x3406;
}
@@ -508,7 +508,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) {
return 0x3407;
}
if((itemNo == BIRD_ESA_5 || itemNo == dItem_HYOI_PEAR_e) && !dComIfGs_checkBaitItemEmpty()) {
if((itemNo == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e) && !dComIfGs_checkBaitItemEmpty()) {
return 0x3407;
}
@@ -594,20 +594,20 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) {
const u8 itemArr1[4][2] = {
{
BIRD_ESA_5,
dItem_BIRD_BAIT_5_e,
dItem_HYOI_PEAR_e
},
{
RED_BOTTLE,
BLUE_BOTTLE
dItem_RED_POTION_e,
dItem_BLUE_POTION_e
},
{
BOMB_10,
BOMB_30
dItem_BOMB_10_e,
dItem_BOMB_30_e
},
{
ARROW_10,
ARROW_30
dItem_ARROW_10_e,
dItem_ARROW_30_e
}
};
src/d/actor/d_a_npc_people.cpp
+15 -15
View File
@@ -3713,11 +3713,11 @@ static u32 l_msg_ug2_out_area[] = {
static int l_get_item_no[] = {
dItem_HEART_PIECE_e,
COLLECT_MAP_20,
COLLECT_MAP_16,
dItem_COLLECT_MAP_20_e,
dItem_COLLECT_MAP_16_e,
dItem_HEART_PIECE_e,
dItem_HEART_PIECE_e,
COLLECT_MAP_15,
dItem_COLLECT_MAP_15_e,
};
struct PsoData {
@@ -4116,7 +4116,7 @@ static s32 phase_1(daNpcPeople_c* i_this) {
switch(i_this->getNpcNo()) {
case 0x6:
if(strcmp(dComIfGp_getStartStageName(), "Ocmera") == 0) {
if(dComIfGs_checkGetItem(COLLECT_MAP_20) || arg0 != dComIfGp_getStartStagePoint()) {
if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) {
return cPhs_STOP_e;
}
@@ -4417,7 +4417,7 @@ s32 daNpcPeople_c::createInit() {
m_jnt.setParam(mpNpcDat->field_0x04, mpNpcDat->field_0x06, mpNpcDat->field_0x0C, mpNpcDat->field_0x0E, mpNpcDat->field_0x00, mpNpcDat->field_0x02, mpNpcDat->field_0x08, mpNpcDat->field_0x0A, mpNpcDat->field_0x10);
if(mNpcType == 0xB && !mbIsNight) {
dComIfGs_checkGetItem(COLLECT_MAP_15);
dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e);
}
m79D = mpNpcDat->field_0x5A;
@@ -4640,7 +4640,7 @@ bool daNpcPeople_c::_execute() {
break;
case 0xB:
if(!dComIfGs_checkGetItem(COLLECT_MAP_15) && (m795 & 0x3)) {
if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && (m795 & 0x3)) {
m795 &= ~0x3;
u8 rand = getRand(8);
if(rand == m794) {
@@ -6457,7 +6457,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) {
break;
case 0x11:
if(mpCurrMsg->mSelectNum == 0) {
if(dComIfGs_checkGetItemNum(SKULL_NECKLACE) < 3) {
if(dComIfGs_checkGetItemNum(dItem_SKULL_NECKLACE_e) < 3) {
m734 = l_msg_xy_sa5_yes_ng;
}
else {
@@ -6562,7 +6562,7 @@ u32 daNpcPeople_c::getMsg() {
else if(!isColor()) {
m734 = l_msg_xy_ub4_no_color;
}
else if(!dComIfGs_checkGetItem(COLLECT_MAP_16)) {
else if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_16_e)) {
m734 = l_msg_xy_ub4_get_item;
dComIfGs_onEventBit(0x2504);
}
@@ -6628,7 +6628,7 @@ u32 daNpcPeople_c::getMsg() {
msgNo = 0x2D63;
break;
case 0x10:
if(itemNo != SKULL_NECKLACE) {
if(itemNo != dItem_SKULL_NECKLACE_e) {
m734 = l_msg_xy_sa5_no_skull_necklace;
}
else if(!dComIfGs_isEventBit(0x2620)) {
@@ -6897,7 +6897,7 @@ u32 daNpcPeople_c::getMsg() {
else if(!dComIfGs_isEventBit(0x2310)) {
m734 = l_msg_um3_no_nazo_talk;
}
else if(dComIfGs_checkGetItem(COLLECT_MAP_15)) {
else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) {
m734 = l_msg_um3_map15;
}
else {
@@ -6911,7 +6911,7 @@ u32 daNpcPeople_c::getMsg() {
else if(!dComIfGs_isEventBit(0x2308)) {
m734 = l_msg_um3_no_look_moon;
}
else if(dComIfGs_checkGetItem(COLLECT_MAP_15) && dComIfGs_isEventBit(0x2280)) {
else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && dComIfGs_isEventBit(0x2280)) {
m734 = l_msg_um3_map15_n;
}
else {
@@ -7720,7 +7720,7 @@ void daNpcPeople_c::setWaitAnm() {
if(mNpcType == 5 && m789 != 0) {
setAnmTbl(l_npc_anm_wait, 0);
}
else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(COLLECT_MAP_15)) {
else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) {
setAnmTbl(l_npc_anm_um3_wait3, 1);
}
else if(mNpcType == 8 && m793 == 1) {
@@ -7771,7 +7771,7 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) {
break;
case 0xB:
if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(0x2310) && !dComIfGs_checkGetItem(COLLECT_MAP_15)) {
if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(0x2310) && !dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) {
return true;
}
@@ -7810,7 +7810,7 @@ s16 daNpcPeople_c::XyEventCB(int i_itemBtn) {
break;
case 0x10:
if(itemNo == SKULL_NECKLACE) {
if(itemNo == dItem_SKULL_NECKLACE_e) {
ret = m766[0];
m79C = 0;
@@ -8008,7 +8008,7 @@ BOOL daNpcPeople_c::chkEndEvent() {
/* 000090D0-00009100 .text is1GetMap20__13daNpcPeople_cFv */
BOOL daNpcPeople_c::is1GetMap20() {
return dComIfGs_checkGetItem(COLLECT_MAP_20) ? TRUE : FALSE;
return dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) ? TRUE : FALSE;
}
/* 00009100-00009144 .text is1DayGetMap20__13daNpcPeople_cFv */
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ void daObjBarrier_c::break_start_wait_proc() {
daPy_py_c* player_p = (daPy_py_c*)daPy_getPlayerActorClass();
if ((player_p->current.pos - current.pos).absXZ() >= 8800.0f &&
dComIfGs_getSelectEquip(0) == MASTER_SWORD_EX)
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e)
{
switch (player_p->getCutType()) {
case 1:
src/d/actor/d_a_obj_toripost.cpp
+13 -13
View File
@@ -25,19 +25,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, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM},
{false, 0x0CF9, dItem_HEART_PIECE_e, 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, dItem_HEART_PIECE_e, 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},
{false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM},
{false, 0x0CF9, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_KOMALIS_FATHER},
{false, 0x0CFA, dItem_COLLECT_MAP_60_e, 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, dItem_COLLECT_MAP_52_e, dSv_evtBit_c::LETTER_TINGLE},
{false, 0x1148, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ARYLL},
{false, 0x1AAF, dItem_HEART_PIECE_e, 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 = {
src/d/actor/d_a_player_main.cpp
+11 -11
View File
@@ -954,7 +954,7 @@ BOOL daPy_lk_c::draw() {
if (checkFreezeState() && checkMaskDraw()) {
entryDLSetLight(mpYamuModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
}
if (dComIfGs_getSelectEquip(2) == PWR_GROOVE) {
if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
entryDLSetLight(mpPringModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
}
if (checkMasterSwordEquip() && !checkCaughtShapeHide() && !checkDemoShieldNoDraw()) {
@@ -1014,7 +1014,7 @@ BOOL daPy_lk_c::draw() {
}
entryDLSetLight(mpEquipItemModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
if (mpSwordModel1 != NULL) {
if (checkChanceMode() || checkNoResetFlg1(daPyFlg1_UNK8000) || dComIfGs_getSelectEquip(0) == MASTER_SWORD_EX) {
if (checkChanceMode() || checkNoResetFlg1(daPyFlg1_UNK8000) || dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e) {
updateDLSetLight(mpSwordModel1, 0);
}
}
@@ -1575,7 +1575,7 @@ void daPy_lk_c::makeItemType() {
} else if (mEquipItem == dItem_SKULL_HAMMER_e) {
setHammerModel();
return;
} else if (mEquipItem == EMPTY_BOTTLE) {
} else if (mEquipItem == dItem_EMPTY_BOTTLE_e) {
setBottleModel(mEquipItem);
return;
} else {
@@ -1655,8 +1655,8 @@ BOOL daPy_lk_c::checkItemChangeFromButton() {
return procBootsEquip_init(dItem_IRON_BOOTS_e);
} else if (checkSetItemTrigger(daPyItem_DRINK_BOTTLE_e, 0)) {
return procBottleDrink_init(dComIfGp_getSelectItem(mReadyItemBtn));
} else if (checkSetItemTrigger(FAIRY_BOTTLE, 0)) {
return procBottleOpen_init(FAIRY_BOTTLE);
} else if (checkSetItemTrigger(dItem_FAIRY_BOTTLE_e, 0)) {
return procBottleOpen_init(dItem_FAIRY_BOTTLE_e);
} else if (doTrigger()) {
if (dComIfGp_getDoStatus() == 0x08) { // A button shows "Put Away"
setAnimeUnequip();
@@ -1753,7 +1753,7 @@ BOOL daPy_lk_c::setDamagePoint(f32 amount) {
dComIfGp_setItemLifeCount(amount);
if (amount < 0.0f) {
offNoResetFlg1(daPyFlg1_UNK8000);
if (dComIfGs_getSelectEquip(0) != MASTER_SWORD_EX) {
if (dComIfGs_getSelectEquip(0) != dItem_MASTER_SWORD_3_e) {
offNoResetFlg1(daPyFlg1_UNK200000);
}
}
@@ -2058,17 +2058,17 @@ BOOL daPy_lk_c::checkHeavyStateOn() {
/* 80111F5C-80111F7C .text checkBottleItem__9daPy_lk_cCFi */
BOOL daPy_lk_c::checkBottleItem(int itemNo) const {
return itemNo >= EMPTY_BOTTLE && itemNo <= UNK_BOTTLE_60;
return itemNo >= dItem_EMPTY_BOTTLE_e && itemNo <= UNK_BOTTLE_60;
}
/* 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 == dItem_SOUP_BOTTLE_e || itemNo == dItem_HALF_SOUP_BOTTLE_e;
return itemNo == dItem_RED_POTION_e || itemNo == dItem_GREEN_POTION_e || itemNo == dItem_BLUE_POTION_e || itemNo == dItem_SOUP_BOTTLE_e || itemNo == dItem_HALF_SOUP_BOTTLE_e;
}
/* 80111FEC-8011201C .text checkOpenBottleItem__9daPy_lk_cCFi */
BOOL daPy_lk_c::checkOpenBottleItem(int itemNo) const {
return itemNo == FIREFLY_BOTTLE || itemNo == BIN_IN_WATER || itemNo == FWATER_BOTTLE || itemNo == FAIRY_BOTTLE;
return itemNo == dItem_FIREFLY_BOTTLE_e || itemNo == dItem_WATER_BOTTLE_e || itemNo == dItem_FOREST_WATER_e || itemNo == dItem_FAIRY_BOTTLE_e;
}
/* 8011201C-80112044 .text checkBowItem__9daPy_lk_cCFi */
@@ -3269,11 +3269,11 @@ BOOL daPy_lk_c::execute() {
return TRUE;
}
if (dComIfGs_checkBottle(FWATER_BOTTLE)) {
if (dComIfGs_checkBottle(dItem_FOREST_WATER_e)) {
if (dComIfGs_getFwaterTimer() == 0) {
if (dComIfGp_event_compulsory(this)) {
onNoResetFlg1(daPyFlg1_UNK200);
dComIfGs_setBottleItemIn(FWATER_BOTTLE, BIN_IN_WATER);
dComIfGs_setBottleItemIn(dItem_FOREST_WATER_e, dItem_WATER_BOTTLE_e);
mDemo.setDemoType(5);
m3628 = fpcM_ERROR_PROCESS_ID_e;
if (mCurProc == daPyProc_SCOPE_e) {
src/d/actor/d_a_rd.cpp
+1 -1
View File
@@ -1574,7 +1574,7 @@ bool daRd_c::_execute() {
return true;
}
fopAcM_setGbaName(this, MIRROR_SHIELD, 0x12, 0x30);
fopAcM_setGbaName(this, dItem_MIRROR_SHIELD_e, 0x12, 0x30);
setIceCollision();
if (mMode != MODE_SILENT_PRAY && mMode != MODE_DEATH && mMode != MODE_DAMAGE &&
mMode != MODE_ATTACK && mMode != MODE_CRY && mMode != MODE_CRY_WAIT)
src/d/actor/d_a_spc_item01.cpp
+3 -3
View File
@@ -77,7 +77,7 @@ BOOL daSpcItem01_c::_delete() {
s32 daSpcItem01_c::_create() {
fopAcM_SetupActor(this, daSpcItem01_c);
m_itemNo = daSpcItem01_prm::getItemNo(this);
if (m_itemNo == SHIELD && dComIfGs_isEventBit(0xE20)) {
if (m_itemNo == dItem_SHIELD_e && dComIfGs_isEventBit(0xE20)) {
setLoadError();
return cPhs_ERROR_e;
}
@@ -114,7 +114,7 @@ BOOL daSpcItem01_c::CreateInit() {
field_0x644 = daSpcItem01_prm::getFlag(this);
fopAcM_SetGravity(this, -4.0f);
switch ((s8)m_itemNo) {
case SHIELD:
case dItem_SHIELD_e:
scale.x = 1.5f;
scale.y = 1.5f;
scale.z = 1.5f;
@@ -173,7 +173,7 @@ void daSpcItem01_c::move() {
fopAcM_posMoveF(this, mStts.GetCCMoveP());
mAcch.CrrPos(*dComIfG_Bgsp());
switch (m_itemNo) {
case SHIELD:
case dItem_SHIELD_e:
break;
case dItem_JOY_PENDANT_e:
if (mAcch.ChkGroundLanding()) {