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 <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
---
 src/d/actor/d_a_grass.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/d/actor/d_a_grass.cpp')

diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp
index c0cedf9e78..a965fe9293 100644
--- a/src/d/actor/d_a_grass.cpp
+++ b/src/d/actor/d_a_grass.cpp
@@ -311,7 +311,7 @@ int daGrass_c::create() {
                         (num >= 16 && num <= 21 && i >= 16) ||
                         (num >= 4 && num <= 7 && i >= 4))
                     {
-                        newGrassData(pos, fopAcM_GetRoomNo(this), fpcNm_ITEM_NONE, 0xFF, add_col, temp_r26);
+                        newGrassData(pos, fopAcM_GetRoomNo(this), dItemNo_NONE_e, 0xFF, add_col, temp_r26);
                     } else {
                         newGrassData(pos, fopAcM_GetRoomNo(this), itemNo, itemBitNo, add_col, temp_r26);
                     }
@@ -401,20 +401,20 @@ static actor_method_class daGrass_METHODS = {
 };
 
 actor_process_profile_definition g_profile_GRASS = {
-  fpcLy_CURRENT_e,       // mLayerID
-  11,                    // mListID
-  fpcPi_CURRENT_e,       // mListPrio
-  PROC_GRASS,            // mProcName
-  &g_fpcLf_Method.base, // sub_method
-  sizeof(daGrass_c),            // mSize
-  0,                     // mSizeOther
-  0,                     // mParameters
-  &g_fopAc_Method.base,  // sub_method
-  8,                     // mPriority
-  &daGrass_METHODS,      // sub_method
-  0x00060000,            // mStatus
-  fopAc_ACTOR_e,         // mActorType
-  fopAc_CULLBOX_0_e,     // cullType
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 11,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_GRASS_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daGrass_c),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_GRASS_e,
+    /* Actor SubMtd */ &daGrass_METHODS,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* Cull Type    */ fopAc_CULLBOX_0_e,
 };
 
 AUDIO_INSTANCES;
-- 
cgit v1.2.3