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

diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp
index 0ea49a1a08..81cbae20ee 100644
--- a/src/d/actor/d_a_obj_toby.cpp
+++ b/src/d/actor/d_a_obj_toby.cpp
@@ -126,12 +126,12 @@ static void* s_bomb_sub(void* param_1, void* param_2) {
 static void* shot_b_sub(void* param_1, void* param_2) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (fopAcM_IsActor(param_1)) {
-        if (fopAcM_GetName(param_1) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() &&
+        if (fopAcM_GetName(param_1) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() &&
                 fopAcM_GetParam(param_1) == 1) {
             return param_1;
         }
 
-        if (fopAcM_GetName(param_1) == PROC_E_MK_BO && (((fopAc_ac_c*)param_1)->field_0x560 != 0))
+        if (fopAcM_GetName(param_1) == fpcNm_E_MK_BO_e && (((fopAc_ac_c*)param_1)->field_0x560 != 0))
         {
             return param_1;
         }
@@ -149,7 +149,7 @@ static f32 hz_check_pos_z;
 
 static void* s_hz_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1)) {
-        if (fopAcM_GetName(param_1) == PROC_E_HZ) {
+        if (fopAcM_GetName(param_1) == fpcNm_E_HZ_e) {
             daE_HZ_c* hz = (daE_HZ_c*)param_1;
             if (hz->isWait() == true) {
                 f32 xDiff = hz_check_pos_x - hz->current.pos.x;
@@ -705,18 +705,18 @@ static actor_method_class l_daObj_Toby_Method = {
 };
 
 actor_process_profile_definition g_profile_OBJ_TOBY = {
-  fpcLy_CURRENT_e,        // mLayerID
-  3,                      // mListID
-  fpcPi_CURRENT_e,        // mListPrio
-  PROC_OBJ_TOBY,          // mProcName
-  &g_fpcLf_Method.base,  // sub_method
-  sizeof(obj_toby_class), // mSize
-  0,                      // mSizeOther
-  0,                      // mParameters
-  &g_fopAc_Method.base,   // sub_method
-  58,                     // mPriority
-  &l_daObj_Toby_Method,   // sub_method
-  0x00044000,             // mStatus
-  fopAc_ACTOR_e,          // mActorType
-  fopAc_CULLBOX_CUSTOM_e, // cullType
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 3,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_OBJ_TOBY_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(obj_toby_class),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_OBJ_TOBY_e,
+    /* Actor SubMtd */ &l_daObj_Toby_Method,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };