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_pumpkin.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_pumpkin.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_pumpkin.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 2d77fbaa4d..ff90ed6a74 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -347,7 +347,7 @@ int daObj_Pumpkin_c::Execute() { } } else if (field_0xBAD && cM3d_IsZero(speedF) == 0 && mCyl0.ChkCoHit()) { fopAc_ac_c* actor_p = dCc_GetAc(mCyl0.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(actor_p) != PROC_ALINK) { + if (fopAcM_GetName(actor_p) != fpcNm_ALINK_e) { sp_0x28 = 1; } } @@ -841,7 +841,7 @@ void daObj_Pumpkin_c::setHamonPrtcl() { void daObj_Pumpkin_c::crash() { fopAc_ac_c* actor_p = NULL; s32 reg_r30 = 0; - reg_r30 = fopAcM_SearchByName(PROC_NPC_JAGAR, &actor_p); + reg_r30 = fopAcM_SearchByName(fpcNm_NPC_JAGAR_e, &actor_p); if (reg_r30 && actor_p != NULL) { ((daNpc_Jagar_c*)actor_p)->crashPumpkin(this); } @@ -891,18 +891,18 @@ static actor_method_class daObj_Pumpkin_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_PUMPKIN = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_PUMPKIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Pumpkin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 716, // mPriority - &daObj_Pumpkin_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_PUMPKIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Pumpkin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_PUMPKIN_e, + /* Actor SubMtd */ &daObj_Pumpkin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; |