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_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp
index 1b334ac4b3..89419b1e49 100644
--- a/src/d/actor/d_a_obj_gm.cpp
+++ b/src/d/actor/d_a_obj_gm.cpp
@@ -508,7 +508,7 @@ static void action(obj_gm_class* i_this) {
         }
 
         fopAc_ac_c* actor_p = dCc_GetAc(i_this->mSph.GetTgHitObj()->GetAc());
-        if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_OBJ_GM) {
+        if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_OBJ_GM_e) {
             i_this->field_0xae4 |= 2;
         }
     }
@@ -518,7 +518,7 @@ static void action(obj_gm_class* i_this) {
 }
 
 static void* s_tbox_sub(void* i_actor, void* i_data) {
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TBOX) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TBOX_e) {
         f32 fVar1 = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x;
         f32 fVar2 = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_data)->current.pos.z;
         if (fVar1 * fVar1 + fVar2 * fVar2 < 40000.0f) {
@@ -530,7 +530,7 @@ static void* s_tbox_sub(void* i_actor, void* i_data) {
 }
 
 static void* s_so_sub(void* i_actor, void* i_data) {
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SO_e) {
         return i_actor;
     }
 
@@ -575,7 +575,7 @@ static int daObj_Gm_Execute(obj_gm_class* i_this) {
             i_this->mSound.startCreatureSound(JA_SE_OBJ_BREAK_CHINA_S, 0, -1);
 
             if ((fopAcM_GetParam(a_this) & 0xFF) == 32) {
-                fopAcM_createItemForMidBoss(&a_this->current.pos, fpcNm_ITEM_SMALL_KEY, fopAcM_GetRoomNo(a_this), NULL, NULL, 0, fopAcM_GetParam(a_this) >> 24);
+                fopAcM_createItemForMidBoss(&a_this->current.pos, dItemNo_SMALL_KEY_e, fopAcM_GetRoomNo(a_this), NULL, NULL, 0, fopAcM_GetParam(a_this) >> 24);
             }
         } else if (i_this->mType == 1) {
             daObj::make_eff_break_gm_ootubo(a_this);
@@ -705,11 +705,11 @@ static cPhs_Step daObj_Gm_Create(fopAc_ac_c* a_this) {
 
         daObj_Gm_Execute(i_this);
 
-        fopAcM_createChild(PROC_OBJ_ITO, fopAcM_GetID(a_this), i_this->mType << 1, &a_this->current.pos,
+        fopAcM_createChild(fpcNm_OBJ_ITO_e, fopAcM_GetID(a_this), i_this->mType << 1, &a_this->current.pos,
                            fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL);
 
         if (i_this->field_0x571 == 1) {
-            fopAcM_createChild(PROC_OBJ_ITO, fopAcM_GetID(a_this), (i_this->mType << 1) | 1, &a_this->current.pos,
+            fopAcM_createChild(fpcNm_OBJ_ITO_e, fopAcM_GetID(a_this), (i_this->mType << 1) | 1, &a_this->current.pos,
                             fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL);
         } else {
             a_this->current.angle.x = 0;
@@ -728,18 +728,18 @@ static actor_method_class l_daObj_Gm_Method = {
 };
 
 actor_process_profile_definition g_profile_OBJ_GM = {
-  fpcLy_CURRENT_e,        // mLayerID
-  3,                      // mListID
-  fpcPi_CURRENT_e,        // mListPrio
-  PROC_OBJ_GM,            // mProcName
-  &g_fpcLf_Method.base,  // sub_method
-  sizeof(obj_gm_class),   // mSize
-  0,                      // mSizeOther
-  0,                      // mParameters
-  &g_fopAc_Method.base,   // sub_method
-  57,                     // mPriority
-  &l_daObj_Gm_Method,     // sub_method
-  0x00044100,             // 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_GM_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(obj_gm_class),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_OBJ_GM_e,
+    /* Actor SubMtd */ &l_daObj_Gm_Method,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };