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>

1 files changed, 21 insertions, 21 deletions

diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp
index b8cc97f1ab..803207d257 100644
--- a/src/d/actor/d_a_npc_len.cpp
+++ b/src/d/actor/d_a_npc_len.cpp
@@ -550,18 +550,18 @@ void daNpc_Len_c::srchActors() {
         break;
     case TYPE_4:
         if (mActorMngr[0].getActorP() == NULL) {
-            mActorMngr[0].entry(getNearestActorP(PROC_NPC_KOLINB));
+            mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KOLINB_e));
         }
         break;
     case TYPE_8:
         if (mActorMngr[1].getActorP() == NULL) {
-            mActorMngr[1].entry(getNearestActorP(PROC_NPC_YELIA));
+            mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_YELIA_e));
         }
         if (mActorMngr[2].getActorP() == NULL) {
-            mActorMngr[2].entry(getNearestActorP(PROC_NPC_GRD));
+            mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_GRD_e));
         }
         if (mActorMngr[3].getActorP() == NULL) {
-            mActorMngr[3].entry(getNearestActorP(PROC_NPC_GRZ));
+            mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_GRZ_e));
         }
         break;
     }
@@ -643,9 +643,9 @@ void daNpc_Len_c::action() {
 }
 
 void daNpc_Len_c::beforeMove() {
-    fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
+    fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e);
     if (checkHide()) {
-        fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
+        fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
     }
 
     if (checkHide() || mNoDraw != 0) {
@@ -1213,7 +1213,7 @@ int daNpc_Len_c::talk(void* param_0) {
                  * control) A */
                 daNpcT_offTmpBit(0xB);
             }
-            if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) {
+            if (mPreItemNo == dItemNo_WOOD_STATUE_e) {
                 initTalk(0x28, NULL);
             } else {
                 initTalk(mFlowNodeNo, NULL);
@@ -1297,18 +1297,18 @@ static actor_method_class daNpc_Len_MethodTable = {
 };
 
 actor_process_profile_definition g_profile_NPC_LEN = {
-    fpcLy_CURRENT_e,         // mLayerID
-    7,                       // mListID
-    fpcPi_CURRENT_e,         // mListPrio
-    PROC_NPC_LEN,            // mProcName
-    &g_fpcLf_Method.base,    // sub_method
-    sizeof(daNpc_Len_c),     // mSize
-    0,                       // mSizeOther
-    0,                       // mParameters
-    &g_fopAc_Method.base,    // sub_method
-    337,                     // mPriority
-    &daNpc_Len_MethodTable,  // sub_method
-    0x00040107,              // mStatus
-    fopAc_NPC_e,             // mActorType
-    fopAc_CULLBOX_CUSTOM_e,  // cullType
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 7,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_NPC_LEN_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daNpc_Len_c),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_NPC_LEN_e,
+    /* Actor SubMtd */ &daNpc_Len_MethodTable,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e,
+    /* Group        */ fopAc_NPC_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };