diff options
| author | Huitzi <73550465+marwernerh@users.noreply.github.com> | 2026-03-09 21:33:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-09 18:33:31 -0700 |
| commit | 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 (patch) | |
| tree | a39b648ba460b5f80dad748690fa43f6f780e5a6 /src/d/actor/d_a_obj_master_sword.cpp | |
| parent | 30e839c28be83fb07bfbe008d3eb9eb9127e3801 (diff) | |
Actor status consolidation & process profile definition editing (#3117)
* 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>
Diffstat (limited to 'src/d/actor/d_a_obj_master_sword.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_master_sword.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 9c8082bb8f..cc00bc91f4 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -45,7 +45,7 @@ void daObjMasterSword_c::executeWait() { } if (fopAcM_checkCarryNow(this)) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); fopAcM_orderMapToolEvent(this, getEventID(), 0xFF, 0xFFFF, 1, 0); } } @@ -186,9 +186,9 @@ int daObjMasterSword_c::execute() { mBrk.play(); if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); + dComIfGs_setSelectEquipSword(dItemNo_MASTER_SWORD_e); dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()]); @@ -245,18 +245,18 @@ static actor_method_class l_daObjMasterSword_Method = { }; actor_process_profile_definition g_profile_Obj_MasterSword = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MasterSword, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMasterSword_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 562, // mPriority - &l_daObjMasterSword_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MasterSword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMasterSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MasterSword_e, + /* Actor SubMtd */ &l_daObjMasterSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; |