mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-24 23:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_item.cpp
+102 -102
View File
@@ -47,13 +47,13 @@ void daItem_c::setBaseMtx() {
mpModel->setBaseScale(scale);
switch (m_itemNo) {
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
case dItemNo_SILVER_RUPEE_e:
setBaseMtx_1();
break;
default:
@@ -88,10 +88,10 @@ static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
if (a_coActorA != NULL) {
if (a_coActorA->checkPlayerGet() && i_coActorB != NULL) {
if (fopAcM_GetName(i_coActorB) == fopAcM_GetName(dComIfGp_getLinkPlayer()) ||
fopAcM_GetName(i_coActorB) == PROC_NPC_P2 ||
(fopAcM_GetName(i_coActorB) == PROC_CANOE &&
fopAcM_GetName(i_coActorB) == fpcNm_NPC_P2_e ||
(fopAcM_GetName(i_coActorB) == fpcNm_CANOE_e &&
daPy_getPlayerActorClass()->checkCanoeRide()) ||
(fopAcM_GetName(i_coActorB) == PROC_HORSE &&
(fopAcM_GetName(i_coActorB) == fpcNm_HORSE_e &&
daPy_getPlayerActorClass()->checkHorseRide()))
{
a_coActorA->itemGetNextExecute();
@@ -181,9 +181,9 @@ void daItem_c::CreateInit() {
initBaseMtx();
animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
if (m_itemNo == fpcNm_ITEM_BOOMERANG) {
if (m_itemNo == dItemNo_BOOMERANG_e) {
itemGetNextExecute();
} else if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) &&
} else if ((m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) &&
mSparkleEmtr.getEmitter() == NULL)
{
dComIfGp_particle_set(0x0C14, &mSparklePos, NULL, NULL, -1, &mSparkleEmtr, -1, NULL, NULL,
@@ -252,15 +252,15 @@ int daItem_c::_daItem_create() {
return cPhs_ERROR_e;
}
if (m_itemNo == fpcNm_ITEM_SMALL_KEY || m_itemNo == fpcNm_ITEM_KANTERA || m_itemNo == fpcNm_ITEM_LIGHT_DROP ||
m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART)
if (m_itemNo == dItemNo_SMALL_KEY_e || m_itemNo == dItemNo_KANTERA_e || m_itemNo == dItemNo_LIGHT_DROP_e ||
m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e)
{
// "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n"
// "Item is not handled by fpcNm_(ITEM): <%d>\n"
OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo);
JUT_ASSERT(0, FALSE);
return cPhs_ERROR_e;
} else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 ||
m_itemNo == fpcNm_ITEM_BOMB_30)
} else if (m_itemNo == dItemNo_BOMB_5_e || m_itemNo == dItemNo_BOMB_10_e || m_itemNo == dItemNo_BOMB_20_e ||
m_itemNo == dItemNo_BOMB_30_e)
{
// "Bomb Replenish Items are no longer in use!\n"
OS_REPORT_ERROR("補給アイテムの爆弾は使用不可になりました！\n");
@@ -340,7 +340,7 @@ int daItem_c::_daItem_execute() {
mLastPos = current.pos;
field_0x95f = (fopAcM_checkHookCarryNow(this) >> 0x14) & 1;
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) {
mSparklePos = current.pos;
mSparklePos.y += 18.0f;
}
@@ -363,7 +363,7 @@ int daItem_c::_daItem_draw() {
int daItem_c::_daItem_delete() {
mSound.deleteObject();
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) {
mSparkleEmtr.remove();
}
@@ -459,7 +459,7 @@ void daItem_c::procMainSimpleGetDemo() {
void daItem_c::procInitGetDemoEvent() {
hide();
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) {
mSparkleEmtr.remove();
}
@@ -481,7 +481,7 @@ void daItem_c::procWaitGetDemoEvent() {
dComIfGp_event_setItemPartnerId(m_item_id);
}
} else {
if (m_itemNo == fpcNm_ITEM_BOOMERANG) {
if (m_itemNo == dItemNo_BOOMERANG_e) {
fopAcM_orderItemEvent(this, 0, 0);
eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
return;
@@ -704,27 +704,27 @@ void daItem_c::mode_wait() {
}
switch (m_itemNo) {
case fpcNm_ITEM_HEART:
case dItemNo_HEART_e:
itemActionForHeart();
break;
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_PACHINKO_SHOT:
case fpcNm_ITEM_LIGHT_ARROW:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_ARROW_1_e:
case dItemNo_PACHINKO_SHOT_e:
case dItemNo_LIGHT_ARROW_e:
itemActionForArrow();
break;
case fpcNm_ITEM_BOOMERANG:
case dItemNo_BOOMERANG_e:
itemActionForBoomerang();
break;
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
case dItemNo_SILVER_RUPEE_e:
default:
itemActionForRupee();
break;
@@ -748,24 +748,24 @@ void daItem_c::mode_water() {
f32 scale = 1.0f;
switch (m_itemNo) {
case fpcNm_ITEM_HEART:
case dItemNo_HEART_e:
scale = 0.5f;
break;
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
scale = 1.0f;
break;
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_ARROW_1_e:
scale = 1.0f;
break;
case fpcNm_ITEM_PACHINKO_SHOT:
case dItemNo_PACHINKO_SHOT_e:
scale = 1.0f;
break;
}
@@ -785,22 +785,22 @@ void daItem_c::itemGetNextExecute() {
BOOL haveItem = false;
switch (m_itemNo) {
case fpcNm_ITEM_HEART:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case dItemNo_HEART_e:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_ARROW_1_e:
procInitSimpleGetDemo();
itemGet();
break;
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
case fpcNm_ITEM_PACHINKO_SHOT:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
case dItemNo_SILVER_RUPEE_e:
case dItemNo_PACHINKO_SHOT_e:
if (daPy_getPlayerActorClass()->checkCanoeRide() ||
daPy_getPlayerActorClass()->checkHorseRide())
{
@@ -820,7 +820,7 @@ void daItem_c::itemGetNextExecute() {
itemGet();
}
break;
case fpcNm_ITEM_BOOMERANG:
case dItemNo_BOOMERANG_e:
procInitGetDemoEvent();
break;
default:
@@ -838,45 +838,45 @@ void daItem_c::itemGetNextExecute() {
void daItem_c::itemGet() {
switch (m_itemNo) {
case fpcNm_ITEM_HEART:
case dItemNo_HEART_e:
mDoAud_seStart(Z2SE_HEART_PIECE_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_GREEN_RUPEE:
case dItemNo_GREEN_RUPEE_e:
mDoAud_seStart(Z2SE_GREEN_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_BLUE_RUPEE:
case dItemNo_BLUE_RUPEE_e:
mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_YELLOW_RUPEE:
case dItemNo_YELLOW_RUPEE_e:
mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_RED_RUPEE:
case dItemNo_RED_RUPEE_e:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_PURPLE_RUPEE:
case dItemNo_PURPLE_RUPEE_e:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_ORANGE_RUPEE:
case dItemNo_ORANGE_RUPEE_e:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_SILVER_RUPEE:
case dItemNo_SILVER_RUPEE_e:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case fpcNm_ITEM_BOOMERANG:
case dItemNo_BOOMERANG_e:
break;
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_PACHINKO_SHOT:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_ARROW_1_e:
case dItemNo_PACHINKO_SHOT_e:
mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0);
execItemGet(m_itemNo);
default:
@@ -1028,19 +1028,19 @@ void daItem_c::set_bound_se() {
}
switch (m_itemNo) {
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
fopAcM_seStart(this, Z2SE_OBJ_LUPY_BOUND, var_r31);
break;
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_LIGHT_ARROW:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_ARROW_1_e:
case dItemNo_LIGHT_ARROW_e:
fopAcM_seStart(this, Z2SE_OBJ_ARROW_BOUND, var_r31);
break;
}
@@ -1183,7 +1183,7 @@ void daItem_c::initSpeed(BOOL i_noTypeChk) {
u8 type = daItem_prm::getType(this);
if (!i_noTypeChk) {
if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == fpcNm_ITEM_BOOMERANG) {
if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == dItemNo_BOOMERANG_e) {
y_speed = 0.0f;
speedf = 0.0f;
} else if (type == TYPE_LAUNCH_NO_RND_e || type == TYPE_FIXED_PLACE_e) {
@@ -1240,18 +1240,18 @@ static actor_method_class l_daItem_Method = {
};
actor_process_profile_definition g_profile_ITEM = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_ITEM,
&g_fpcLf_Method.base,
sizeof(daItem_c),
0,
0,
&g_fopAc_Method.base,
236,
&l_daItem_Method,
0xC0100,
fopAc_ACTOR_e,
fopAc_CULLSPHERE_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ITEM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daItem_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_ITEM_e,
/* Actor SubMtd */ &l_daItem_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLSPHERE_0_e,
};