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

diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp
index 2ccb112a26..257a9c8b18 100644
--- a/src/d/actor/d_a_obj_mirror_table.cpp
+++ b/src/d/actor/d_a_obj_mirror_table.cpp
@@ -9,7 +9,7 @@
 #include "d/actor/d_a_mirror.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
-#include "d/d_procname.h"
+#include "f_pc/f_pc_name.h"
 #include <cstring>
 
 static char const* l_arcName = "MR-Table";
@@ -202,13 +202,13 @@ void daObjMirrorTable_c::checkOnPanel() {
 }
 
 static void rideCallBack1(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
-    if (fopAcM_GetName(i_actor) == PROC_ALINK) {
+    if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) {
         static_cast<daObjMirrorTable_c*>(i_this)->checkOnPanel();
     }
 }
 
 static void rideCallBack2(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
-    if (fopAcM_GetName(i_actor) == PROC_ALINK) {
+    if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) {
         static_cast<daObjMirrorTable_c*>(i_this)->field_0x875 = 15;
     }
 }
@@ -443,7 +443,7 @@ void daObjMirrorTable_c::create_init() {
         cXyz pos(1760.0f, 4714.3f, -20624.0f);
         csXyz angle(0, 0x8000, 0);
         cXyz scale(1.35f, 1.35f, 1.0f);
-        fopAcM_create(PROC_MIRROR, daMirror_c::getMirrorRoomPrm(),
+        fopAcM_create(fpcNm_MIRROR_e, daMirror_c::getMirrorRoomPrm(),
                       &pos, current.roomNo, &angle, &scale, 0xff);
     }
 }
@@ -463,18 +463,18 @@ static actor_method_class l_daObjMirrorTable_Method = {
 };
 
 actor_process_profile_definition g_profile_Obj_MirrorTable = {
-    fpcLy_CURRENT_e,
-    3,
-    fpcPi_CURRENT_e,
-    PROC_Obj_MirrorTable,
-    &g_fpcLf_Method.base,
-    sizeof(daObjMirrorTable_c),
-    0,
-    0,
-    &g_fopAc_Method.base,
-    0x2A8,
-    &l_daObjMirrorTable_Method,
-    0x44000,
-    fopAc_ACTOR_e,
-    fopAc_CULLBOX_CUSTOM_e,
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 3,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_Obj_MirrorTable_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daObjMirrorTable_c),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_Obj_MirrorTable_e,
+    /* Actor SubMtd */ &l_daObjMirrorTable_Method,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };