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, 36 insertions, 36 deletions

diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp
index fbb6ebcad9..2384a380aa 100644
--- a/src/d/actor/d_a_npc_maro.cpp
+++ b/src/d/actor/d_a_npc_maro.cpp
@@ -1,6 +1,6 @@
 /**
  * @file d_a_npc_maro.cpp
- * 
+ *
 */
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -429,7 +429,7 @@ void* daNpc_Maro_c::srchArrow(void* arg0, void* arg1) {
     if (mFindCount < 50) {
         fopAc_ac_c* fop0 = (fopAc_ac_c*) arg0;
         if (fop0 != NULL && fop0 != fop1) {
-            if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == PROC_ARROW) {
+            if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == fpcNm_ARROW_e) {
                 mFindActorPtrs[mFindCount] = fop0;
                 mFindCount++;
             }
@@ -459,7 +459,7 @@ void* daNpc_Maro_c::srchItaMato(void* arg0, void* arg1) {
     if (mFindCount < 50) {
         fopAc_ac_c* fop0 = (fopAc_ac_c*) arg0;
         if (fop0 != NULL && fop0 != fop1) {
-            if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == PROC_OBJ_ITAMATO) {
+            if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == fpcNm_OBJ_ITAMATO_e) {
                 mFindActorPtrs[mFindCount] = fop0;
                 mFindCount++;
             }
@@ -826,37 +826,37 @@ void daNpc_Maro_c::srchActors() {
     switch (mType) {
         case TYPE_0: {
             if (mActorMngr[0].getActorP() == NULL) {
-                mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI));
+                mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e));
             }
 
             if (mActorMngr[1].getActorP() == NULL) {
-                mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO));
+                mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e));
             }
 
             if (mActorMngr[2].getActorP() == NULL) {
-                mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU));
+                mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e));
             }
 
             if (mActorMngr[3].getActorP() == NULL) {
-                mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN));
+                mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e));
             }
             break;
         }
 
         case TYPE_1: {
             if (mActorMngr[0].getActorP() == NULL) {
-                mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI));
+                mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e));
             }
 
             if (mActorMngr[1].getActorP() == NULL) {
-                mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO));
+                mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e));
             }
             break;
         }
 
         case TYPE_3: {
             if (mActorMngr[8].getActorP() == NULL) {
-                mActorMngr[8].entry(getNearestActorP(PROC_NPC_LEN));
+                mActorMngr[8].entry(getNearestActorP(fpcNm_NPC_LEN_e));
             }
 
             break;
@@ -866,7 +866,7 @@ void daNpc_Maro_c::srchActors() {
         case TYPE_7: {
             if (&daNpc_Maro_c::arrowTutorial == field_0x110c) {
                 if (mActorMngr[1].getActorP() == NULL) {
-                    mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO));
+                    mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e));
                 }
 
                 if (mActorMngr[6].getActorP() == NULL) {
@@ -883,7 +883,7 @@ void daNpc_Maro_c::srchActors() {
 
         case TYPE_10: {
             if (mActorMngr[2].getActorP() == NULL) {
-                mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU));
+                mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e));
             }
 
             break;
@@ -891,34 +891,34 @@ void daNpc_Maro_c::srchActors() {
 
         case TYPE_12: {
             if (mActorMngr[1].getActorP() == NULL) {
-                mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO));
+                mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e));
             }
 
             if (mActorMngr[3].getActorP() == NULL) {
-                mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN));
+                mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e));
             }
 
             if (mActorMngr[7].getActorP() == NULL) {
-                mActorMngr[7].entry(getNearestActorP(PROC_NPC_SARU));
+                mActorMngr[7].entry(getNearestActorP(fpcNm_NPC_SARU_e));
             }
             break;
         }
 
         case TYPE_13: {
             if (mActorMngr[0].getActorP() == NULL) {
-                mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI));
+                mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e));
             }
 
             if (mActorMngr[1].getActorP() == NULL) {
-                mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO));
+                mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e));
             }
 
             if (mActorMngr[2].getActorP() == NULL) {
-                mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU));
+                mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e));
             }
 
             if (mActorMngr[3].getActorP() == NULL) {
-                mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN));
+                mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e));
             }
             break;
         }
@@ -1032,9 +1032,9 @@ void daNpc_Maro_c::action() {
 }
 
 void daNpc_Maro_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) {
         attention_info.flags = 0;
@@ -2632,7 +2632,7 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) {
                 actor_p = mActorMngr[0].getActorP();
                 JUT_ASSERT(4088, NULL != actor_p);
                 angle_y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), actor_p);
-                daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, 
+                daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos,
                                                                 angle_y, 0);
                 break;
             }
@@ -3516,18 +3516,18 @@ static actor_method_class daNpc_Maro_MethodTable = {
 };
 
 actor_process_profile_definition g_profile_NPC_MARO = {
-  fpcLy_CURRENT_e,         // mLayerID
-  7,                       // mListID
-  fpcPi_CURRENT_e,         // mListPrio
-  PROC_NPC_MARO,           // mProcName
-  &g_fpcLf_Method.base,   // sub_method
-  sizeof(daNpc_Maro_c),    // mSize
-  0,                       // mSizeOther
-  0,                       // mParameters
-  &g_fopAc_Method.base,    // sub_method
-  353,                     // mPriority
-  &daNpc_Maro_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_MARO_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daNpc_Maro_c),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_NPC_MARO_e,
+    /* Actor SubMtd */ &daNpc_Maro_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,
 };