From 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 Mon Sep 17 00:00:00 2001 From: Huitzi <73550465+marwernerh@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:33:31 -0400 Subject: 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 --------- Co-authored-by: LagoLunatic --- src/d/d_timer.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/d/d_timer.cpp') diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 5dc0201483..bb526cd086 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1539,7 +1539,7 @@ static int dTimer_Create(msg_class* i_this) { fpc_ProcID dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7) { if (dComIfG_getTimerMode() == -1) { - return fopMsgM_Timer_create(PROC_TIMER, i_mode, i_limitMs, i_type, param_3, param_4, + return fopMsgM_Timer_create(fpcNm_TIMER_e, i_mode, i_limitMs, i_type, param_3, param_4, param_5, param_6, param_7, NULL); } @@ -1555,7 +1555,7 @@ s32 dTimer_createStockTimer() { return -1; } else { u8 timer_type = dComIfG_getTimerType(); - return fopMsgM_Timer_create(PROC_TIMER, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, + return fopMsgM_Timer_create(fpcNm_TIMER_e, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, 419.0f, NULL); } } else { @@ -1634,15 +1634,15 @@ static leafdraw_method_class l_dTimer_Method = { }; msg_process_profile_definition g_profile_TIMER = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_TIMER, - &g_fpcLf_Method.base, - sizeof(dTimer_c), - 0, - 0, - &g_fopMsg_Method, - 768, - &l_dTimer_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TIMER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dTimer_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_TIMER_e, + /* Msg SubMtd */ &l_dTimer_Method, }; -- cgit v1.2.3