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

diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp
index 830f5a9553..e44cdfeeff 100644
--- a/src/d/actor/d_a_mg_rod.cpp
+++ b/src/d/actor/d_a_mg_rod.cpp
@@ -1036,7 +1036,7 @@ static void sibuki_set(dmg_rod_class* i_this, f32 i_size, cXyz* i_pos, BOOL para
 }
 
 static void* s_boat_sub(void* i_actor, void* i_data) {
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CANOE_e) {
         cXyz spC = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos;
         return i_actor;
     }
@@ -1491,7 +1491,7 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) {
 
 static void* s_wd_sub(void* i_actor, void* i_data) {
     UNUSED(i_data);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_LP) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_LP_e) {
         return i_actor;
     }
 
@@ -2833,7 +2833,7 @@ static void lure_heart(dmg_rod_class* i_this) {
     sp8.y = 0;
     sp8.z = i_this->field_0x10b0;
 
-    fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer);
+    fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e);
     if (obj_life != NULL) {
         fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
         cXyz sp10;
@@ -2900,7 +2900,7 @@ static void lure_heart(dmg_rod_class* i_this) {
             if (obj_life != NULL) {
                 fopAcM_delete(obj_life);
                 fopAcM_onItem(obj_life, 0x80);
-                execItemGet(fpcNm_ITEM_KAKERA_HEART);
+                execItemGet(dItemNo_KAKERA_HEART_e);
                 u8 eventReg = dComIfGs_getEventReg(0xECFF);
                 eventReg |= (u8)0x40;
                 dComIfGs_setEventReg(0xECFF, eventReg);
@@ -3912,11 +3912,11 @@ static int bb_get(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     for (int i = 0; i < 3; i++) {
         u8 itemno =  dComIfGs_getItem(i + 15, false);
-        if (itemno != fpcNm_ITEM_NONE) {
-            if (itemno == fpcNm_ITEM_BOMB_BAG_LV1) {
-                dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_WATER_BOMB, 1, true);
+        if (itemno != dItemNo_NONE_e) {
+            if (itemno == dItemNo_BOMB_BAG_LV1_e) {
+                dComIfGs_setEmptyBombBagItemIn(dItemNo_WATER_BOMB_e, 1, true);
                 return 1;
-            } else if (itemno == fpcNm_ITEM_WATER_BOMB) {
+            } else if (itemno == dItemNo_WATER_BOMB_e) {
                 if (dComIfGs_getBombNum(i) < dComIfGs_getBombMax(itemno)) {
                     dComIfGp_setItemBombNumCount(i, 1);
                     return 1;
@@ -4124,7 +4124,7 @@ static void uki_catch(dmg_rod_class* i_this) {
 
 static void* s_sg_sub(void* i_actor, void* i_data) {
     UNUSED(i_data);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SG_e && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) {
         return i_actor;
     }
 
@@ -4132,7 +4132,7 @@ static void* s_sg_sub(void* i_actor, void* i_data) {
 }
 
 static void* s_bb_sub(void* i_actor, void* i_data) {
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_BG_e && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) {
         return i_actor;
     }
 
@@ -4141,7 +4141,7 @@ static void* s_bb_sub(void* i_actor, void* i_data) {
 
 static void* s_lh_sub(void* i_actor, void* i_data) {
     UNUSED(i_data);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) {
         mg_fish_class* fish = (mg_fish_class*)i_actor;
         if (fish->mGedouKind == 21) {
             if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) {
@@ -4155,7 +4155,7 @@ static void* s_lh_sub(void* i_actor, void* i_data) {
 
 static void* s_bt_sub(void* i_actor, void* i_data) {
     UNUSED(i_data);
-    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) {
+    if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) {
         mg_fish_class* fish = (mg_fish_class*)i_actor;
         if (fish->mGedouKind == 20) {
             if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) {
@@ -5759,7 +5759,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
     if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 && i_this->kind == 0) {
     }
 
-    henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA);
+    henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e);
     if (henna != NULL && henna->field_0x734 != 0) {
         henna = NULL;
     }
@@ -5986,7 +5986,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
     i_this->field_0x1406 = i_this->play_cam_fovy;
 
     if (i_this->kind == MG_ROD_KIND_LURE) {
-        daObjLife_c* obj_life = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer);
+        daObjLife_c* obj_life = (daObjLife_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e);
         if (obj_life != NULL) {
             if (i_this->field_0x10a9 != 0) {
                 if (i_this->field_0x10a9 == 2) {
@@ -6412,20 +6412,20 @@ static actor_method_class l_dmg_rod_Method = {
 };
 
 actor_process_profile_definition g_profile_MG_ROD = {
-  fpcLy_CURRENT_e,            // mLayerID
-  8,                          // mListID
-  fpcPi_CURRENT_e,            // mListPrio
-  PROC_MG_ROD,                // mProcName
-  &g_fpcLf_Method.base,      // sub_method
-  sizeof(dmg_rod_class),      // mSize
-  0,                          // mSizeOther
-  0,                          // mParameters
-  &g_fopAc_Method.base,       // sub_method
-  438,                        // mPriority
-  &l_dmg_rod_Method,          // sub_method
-  0x00060000,                 // mStatus
-  fopAc_ACTOR_e,              // mActorType
-  fopAc_CULLBOX_0_e,          // cullType
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 8,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_MG_ROD_e,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(dmg_rod_class),
+    /* Size Other   */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Draw Prio    */ fpcDwPi_MG_ROD_e,
+    /* Actor SubMtd */ &l_dmg_rod_Method,
+    /* Status       */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* Cull Type    */ fopAc_CULLBOX_0_e,
 };
 
 AUDIO_INSTANCES