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_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp
index eafd4740e2..4d8432f1c4 100644
--- a/src/d/actor/d_a_obj_mirror_screw.cpp
+++ b/src/d/actor/d_a_obj_mirror_screw.cpp
@@ -7,7 +7,7 @@
 
 #include "d/actor/d_a_obj_mirror_screw.h"
 #include "d/actor/d_a_player.h"
-#include "d/d_procname.h"
+#include "f_pc/f_pc_name.h"
 
 static char const* l_arcName = "MR-Screw";
 
@@ -192,7 +192,7 @@ int daObjMirrorScrew_c::Create() {
     initBaseMtx();
 
     cXyz sw_pos(current.pos.x, current.pos.y + 2636.121f, current.pos.z);
-    fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos,
+    fopAcM_createChild(fpcNm_Obj_SwSpinner_e, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos,
                        fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL);
 
     mpSwSpinner = NULL;
@@ -208,27 +208,27 @@ int daObjMirrorScrew_c::Create() {
 
 int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) {
     if (mpSwSpinner == NULL) {
-        mpSwSpinner = static_cast<daObjSwSpinner_c*>(fopAcM_SearchByName(PROC_Obj_SwSpinner));
+        mpSwSpinner = static_cast<daObjSwSpinner_c*>(fopAcM_SearchByName(fpcNm_Obj_SwSpinner_e));
     }
 
     if (mpSpPath == NULL) {
-        mpSpPath = static_cast<daTagSppath_c*>(fopAcM_SearchByName(PROC_Tag_Sppath));
+        mpSpPath = static_cast<daTagSppath_c*>(fopAcM_SearchByName(fpcNm_Tag_Sppath_e));
     }
 
     if (mpChain == NULL) {
-        mpChain = static_cast<daObjMirrorChain_c*>(fopAcM_SearchByName(PROC_Obj_MirrorChain));
+        mpChain = static_cast<daObjMirrorChain_c*>(fopAcM_SearchByName(fpcNm_Obj_MirrorChain_e));
     }
 
     if (mpTable == NULL) {
-        mpTable = static_cast<daObjMirrorTable_c*>(fopAcM_SearchByName(PROC_Obj_MirrorTable));
+        mpTable = static_cast<daObjMirrorTable_c*>(fopAcM_SearchByName(fpcNm_Obj_MirrorTable_e));
     }
 
     if (mp6Pole == NULL) {
-        mp6Pole = static_cast<daObjMirror6Pole_c*>(fopAcM_SearchByName(PROC_Obj_Mirror6Pole));
+        mp6Pole = static_cast<daObjMirror6Pole_c*>(fopAcM_SearchByName(fpcNm_Obj_Mirror6Pole_e));
     }
 
     if (mpSand == NULL) {
-        mpSand = static_cast<daObjMirrorSand_c*>(fopAcM_SearchByName(PROC_Obj_MirrorSand));
+        mpSand = static_cast<daObjMirrorSand_c*>(fopAcM_SearchByName(fpcNm_Obj_MirrorSand_e));
     }
 
     callExecute();
@@ -259,18 +259,18 @@ static actor_method_class l_daObjMirrorScrew_Method = {
 };
 
 actor_process_profile_definition g_profile_Obj_MirrorScrew = {
-    fpcLy_CURRENT_e,
-    3,
-    fpcPi_CURRENT_e,
-    PROC_Obj_MirrorScrew,
-    &g_fpcLf_Method.base,
-    sizeof(daObjMirrorScrew_c),
-    0,
-    0,
-    &g_fopAc_Method.base,
-    0x2A6,
-    &l_daObjMirrorScrew_Method,
-    0x40000,
-    fopAc_ACTOR_e,
-    fopAc_CULLBOX_CUSTOM_e,
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 3,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_Obj_MirrorScrew_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daObjMirrorScrew_c),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_Obj_MirrorScrew_e,
+    /* Actor SubMtd */ &l_daObjMirrorScrew_Method,
+    /* Status       */ fopAcStts_UNK_0x40000_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };