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

diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp
index a972d17232..54435631fd 100644
--- a/src/d/actor/d_a_e_arrow.cpp
+++ b/src/d/actor/d_a_e_arrow.cpp
@@ -161,7 +161,7 @@ static void hit_check(e_arrow_class* i_this) {
         dComIfG_Ccsp()->Set(&i_this->mCcTgSph);
 
         if (i_this->mCcAtSph.ChkAtShieldHit() && i_this->mCcAtSph.GetAtHitAc() != NULL &&
-            fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == PROC_ALINK &&
+            fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == fpcNm_ALINK_e &&
             daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall())
         {
             i_this->mAction = ACTION_ARROW_SHIELD;
@@ -253,7 +253,7 @@ static void e_arrow_shot(e_arrow_class* i_this) {
     }
     case 1:
         if (i_this->mFlags & 0x20) {
-            fopAc_ac_c* coach_p = fopAcM_SearchByName(PROC_NPC_COACH);
+            fopAc_ac_c* coach_p = fopAcM_SearchByName(fpcNm_NPC_COACH_e);
 
             if (coach_p != NULL) {
                 cXyz sp30;
@@ -291,9 +291,9 @@ static void e_arrow_bg(e_arrow_class* i_this) {
         i_this->mMode = 1;
         i_this->mTimers[0] = 100;
     case 1:
-        if (checkItemGet(fpcNm_ITEM_BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) {
+        if (checkItemGet(dItemNo_BOW_e, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) {
             dComIfGp_setItemArrowNumCount(1);
-            fopAcM_createItemForSimpleDemo(&i_this->current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f,
+            fopAcM_createItemForSimpleDemo(&i_this->current.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f,
                                            0.0f);
             mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0);
 
@@ -331,7 +331,7 @@ static void e_arrow_spin(e_arrow_class* i_this) {
 
 static void* s_limit_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) != FALSE && i_actor != i_data &&
-        fopAcM_GetName(i_actor) == PROC_E_ARROW &&
+        fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e &&
         static_cast<e_arrow_class*>(i_actor)->mAction == ACTION_ARROW_FIRE &&
         fabsf(static_cast<e_arrow_class*>(i_actor)->field_0xa00.z -
               static_cast<e_arrow_class*>(i_data)->field_0xa00.z) < 300.0f)
@@ -429,7 +429,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) {
 
 static void atHit_CB(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor,
                      dCcD_GObjInf* i_tgObjInf) {
-    if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_ALINK) {
+    if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_ALINK_e) {
         if (daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall()) {
             daAlink_getAlinkActorClass()->getArrowShieldOffset(
                 &i_atActor->current.pos, &i_atActor->shape_angle,
@@ -754,20 +754,20 @@ static actor_method_class l_daE_ARROW_Method = {
 };
 
 actor_process_profile_definition g_profile_E_ARROW = {
-    fpcLy_CURRENT_e,
-    8,
-    fpcPi_CURRENT_e,
-    PROC_E_ARROW,
-    &g_fpcLf_Method.base,
-    sizeof(e_arrow_class),
-    0,
-    0,
-    &g_fopAc_Method.base,
-    163,
-    &l_daE_ARROW_Method,
-    0x44100,
-    fopAc_ENEMY_e,
-    fopAc_CULLBOX_0_e,
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 8,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_E_ARROW_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(e_arrow_class),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_E_ARROW_e,
+    /* Actor SubMtd */ &l_daE_ARROW_Method,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
+    /* Group        */ fopAc_ENEMY_e,
+    /* Cull Type    */ fopAc_CULLBOX_0_e,
 };
 
 AUDIO_INSTANCES;