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

diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp
index c486572932..9f303d8f3f 100644
--- a/src/d/actor/d_a_npc_gra.cpp
+++ b/src/d/actor/d_a_npc_gra.cpp
@@ -592,7 +592,7 @@ BOOL daNpc_grA_c::setHomeJump() {
 
 static void* s_sub(void* i_actor, void* i_this) {
     // a bit ugly, but the debug version can't have any local variables
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e) {
         if (((daNpc_grA_c*)i_this)->checkTagGraSub((fopAc_ac_c*)i_actor)) {
             return i_actor;
         }
@@ -613,7 +613,7 @@ bool daNpc_grA_c::checkTagGraSub(fopAc_ac_c* i_this) {
 
 static void* s_sub2(void* i_actor, void* i_this) {
     // a bit ugly, but the debug version can't have any local variables
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e) {
         if (((daNpc_grA_c*)i_this)->checkTagGraSub2((fopAc_ac_c*)i_actor)) {
             return i_actor;
         }
@@ -634,7 +634,7 @@ bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) {
 
 static void* s_subShop(void* i_actor, void* i_this) {
     UNUSED(i_this);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRM) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRM_e) {
         return i_actor;
     }
     return NULL;
@@ -642,7 +642,7 @@ static void* s_subShop(void* i_actor, void* i_this) {
 
 static void* s_subGRD(void* i_actor, void* i_this) {
     UNUSED(i_this);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_WRESTLER) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_WRESTLER_e) {
         return i_actor;
     }
     return NULL;
@@ -650,7 +650,7 @@ static void* s_subGRD(void* i_actor, void* i_this) {
 
 static void *s_subOnsenTaru(void* i_actor, void* i_this) {
     UNUSED(i_this);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_OnsenTaru &&
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_OnsenTaru_e &&
         !fpcM_IsCreating(fopAcM_GetID((i_actor))))
     {
         return i_actor;
@@ -659,14 +659,14 @@ static void *s_subOnsenTaru(void* i_actor, void* i_this) {
 }
 
 static void *s_subCarry(void* i_actor, void* i_this) {
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) {
         ((daNpc_grA_c*)i_this)->addCarryNum();
     }
     return NULL;
 }
 
 static void *s_subCrashed(void* i_actor, void* i_this) {
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA &&
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e &&
         ((daNpc_grA_c*)i_this)->checkTagGraSubCrashed((fopAc_ac_c*)i_actor))
     {
         return i_actor;
@@ -3631,7 +3631,7 @@ BOOL daNpc_grA_c::waitSpaWater(void*) {
         if (field_0xC98.ChkTgHit()) {
             daOnsTaru_c* hit = (daOnsTaru_c*)field_0xC98.GetTgHitAc();
             if (fopAcM_GetName(hit) == 0x16c) {
-                fopAcM_OnStatus(hit, 0x4000);
+                fopAcM_OnStatus(hit, fopAcStts_UNK_0x4000_e);
                 if (hit->getTempStat()) {
                     mOrderEvtNo = 7;
                 } else {
@@ -4107,20 +4107,20 @@ static actor_method_class daNpc_grA_MethodTable = {
 };
 
 actor_process_profile_definition g_profile_NPC_GRA = {
-  fpcLy_CURRENT_e,        // mLayerID
-  7,                      // mListID
-  fpcPi_CURRENT_e,        // mListPrio
-  PROC_NPC_GRA,           // mProcName
-  &g_fpcLf_Method.base,  // sub_method
-  sizeof(daNpc_grA_c),    // mSize
-  0,                      // mSizeOther
-  0,                      // mParameters
-  &g_fopAc_Method.base,   // sub_method
-  306,                    // mPriority
-  &daNpc_grA_MethodTable, // sub_method
-  0x00044100,             // 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_GRA_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daNpc_grA_c),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_NPC_GRA_e,
+    /* Actor SubMtd */ &daNpc_grA_MethodTable,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
+    /* Group        */ fopAc_NPC_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };
 
 AUDIO_INSTANCES;