Process profiles and enums cleanup (#1031)

* Fix some profile comments

* Add missing static for local visibility data

* Move proc name and draw priority enums to f_pc

* Add _e suffix to daObjBarrier_c proc enum

* Change proc name enum format to match TP

* Change draw prio enum format to match TP

* Change ItemNo enum format, finish fixing item names

* Revert static for cb1 hio

* Clean up formatting of profile comments

* Fix comment alignment

1 files changed, 42 insertions, 44 deletions

diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp
index aeef8965..eff68df9 100644
--- a/src/d/actor/d_a_fm.cpp
+++ b/src/d/actor/d_a_fm.cpp
@@ -6,8 +6,6 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_fm.h"
 #include "d/actor/d_a_player_main.h"
-#include "d/d_procname.h"
-#include "d/d_priority.h"
 #include "d/d_cc_d.h"
 #include "d/d_lib.h"
 #include "d/d_jnt_hit.h"
@@ -571,12 +569,12 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) {
         f32 dist = fopAcM_searchActorDistanceXZ(this, i_actor);
 
         if(dist < l_HIO.field_0x0E4) {
-            if(fopAcM_GetName(i_actor) == PROC_BOMB) {
+            if(fopAcM_GetName(i_actor) == fpcNm_BOMB_e) {
                 mpActorTarget = i_actor;
                 if(!((daBomb_c*)mpActorTarget)->chk_state(daBomb_c::STATE_0)) {
                     return i_actor;
                 }
-            } else if(fopAcM_GetName(i_actor) == PROC_TSUBO) {
+            } else if(fopAcM_GetName(i_actor) == fpcNm_TSUBO_e) {
                 daPy_lk_c* pLink = daPy_getPlayerLinkActorClass();
 
                 f32 dist2 = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
@@ -611,7 +609,7 @@ static void* searchNearFm_CB(void* param_1, void* param_2) {
 /* 00000F44-00001150       .text searchNearFm__6daFm_cFP10fopAc_ac_c */
 void* daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
     f32 dist;
-    if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FM) { // redundant isactor check?
+    if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FM_e) { // redundant isactor check?
         f32 abs = (field_0x3E4 - current.pos).absXZ();
         dist = fopAcM_searchActorDistanceXZ(this, i_actor);
         if(dist != 0.0f) {
@@ -969,7 +967,7 @@ void daFm_c::setGrabPos() {
     if (bomb == NULL) {
         mGrabPos = current.pos;
     } else {
-        if (fopAcM_GetName(bomb) == PROC_BOMB && bomb->chk_state(daBomb_c::STATE_0)) {
+        if (fopAcM_GetName(bomb) == fpcNm_BOMB_e && bomb->chk_state(daBomb_c::STATE_0)) {
             mGrabPos = current.pos;
             return;
         }
@@ -996,24 +994,24 @@ cXyz daFm_c::getOffsetPos() {
     } else {
 
         s16 procName = fopAcM_GetName(mpActorTarget);
-        if(procName == PROC_NPC_CB1) {
+        if(procName == fpcNm_NPC_CB1_e) {
             if(fopAcM_checkCarryNow(mpActorTarget)) {
                 offset.set(0.0f, 20.0f, 0.0f);
             } else {
                 offset.set(0.0f, 80.0f, 0.0f);
             }
 
-        } else if(procName == PROC_NPC_MD) {
+        } else if(procName == fpcNm_NPC_MD_e) {
             if(fopAcM_checkCarryNow(mpActorTarget)) {
                 offset.set(0.0f, 20.0f, 0.0f);
             } else {
                 offset.set(0.0f, 140.0f, 0.0f);
             }
 
-        } else if(procName == PROC_BOMB) {
+        } else if(procName == fpcNm_BOMB_e) {
             offset.set(0.0f, 80.0f, 0.0f);
 
-        } else if(procName == PROC_TSUBO) {
+        } else if(procName == fpcNm_TSUBO_e) {
 
             switch(((daTsubo::Act_c*)mpActorTarget)->prm_get_type()) {
                 case 5:
@@ -1043,7 +1041,7 @@ u8 daFm_c::checkPlayerGrabBomb() {
     if(ac == NULL) {
         return false;
     }
-    return fopAcM_GetName(ac) == PROC_BOMB;
+    return fopAcM_GetName(ac) == fpcNm_BOMB_e;
 }
 
 /* 000028D4-00002954       .text checkPlayerGrabNpc__6daFm_cFv */
@@ -1592,11 +1590,11 @@ void daFm_c::modeAttack() {
                                 fopAcM_setCarryNow(mpActorTarget, 0);
                                 field_0x684 = 4;
 
-                                if (fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) {
+                                if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) {
                                     ((daNpc_Cb1_c*)mpActorTarget)->noCarryAction();
                                 }
 
-                                if (fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) {
+                                if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) {
                                     ((daNpc_Md_c*)mpActorTarget)->noCarryAction();
                                 }
 
@@ -1626,7 +1624,7 @@ void daFm_c::modeAttack() {
                             fopAc_ac_c* actor = mpActorTarget;
                             s16 procName = fopAcM_GetName(actor);
 
-                            if (procName == PROC_BOMB) {
+                            if (procName == fpcNm_BOMB_e) {
                                 if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
                                     fopAcM_setCarryNow(actor, 0);
                                     field_0x684 = 2;
@@ -1636,7 +1634,7 @@ void daFm_c::modeAttack() {
                                 } else {
                                     modeProcInit(7);
                                 }
-                            } else if (procName == PROC_TSUBO) {
+                            } else if (procName == fpcNm_TSUBO_e) {
                                 if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
                                     fopAcM_setCarryNow(actor, 0);
                                     field_0x684 = 3;
@@ -1714,7 +1712,7 @@ void daFm_c::modeThrow() {
             field_0x684 = 0;
             mGrabPos = current.pos;
         } else {
-            if(fopAcM_GetName(mpActorTarget) == PROC_BOMB || fopAcM_GetName(mpActorTarget) == PROC_TSUBO) {
+            if(fopAcM_GetName(mpActorTarget) == fpcNm_BOMB_e || fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) {
                 mpActorTarget->current.angle.y = shape_angle.y;
                 mpActorTarget->shape_angle.y = shape_angle.y;
                 mpActorTarget->speedF = l_HIO.field_0x0F0;
@@ -1729,7 +1727,7 @@ void daFm_c::modeThrow() {
                 f32 dropspeed = temp *= l_HIO.field_0x0F4;
                 daTsubo::Act_c* tsubo = (daTsubo::Act_c*)mpActorTarget;
                 
-                if(fopAcM_GetName(mpActorTarget) == PROC_TSUBO) {
+                if(fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) {
                     switch(tsubo->prm_get_type()) {
                         case 0:
                         case 1:
@@ -1897,7 +1895,7 @@ void daFm_c::modeGrabInit() {
         setAnm(0xC, false);
     } else {
         s16 procName = fopAcM_GetName(mpActorTarget);
-        if(procName == PROC_BOMB || procName == PROC_TSUBO) {
+        if(procName == fpcNm_BOMB_e || procName == fpcNm_TSUBO_e) {
             setAnm(9, false);
         }
     }
@@ -2007,7 +2005,7 @@ void daFm_c::modeGrab() {
                     }
                 } else {
                     s16 procName = fopAcM_GetName(mpActorTarget);
-                    if (procName == PROC_BOMB || procName == PROC_TSUBO) {
+                    if (procName == fpcNm_BOMB_e || procName == fpcNm_TSUBO_e) {
                         moveRndBack();
                         mGrabPos = field_0x61C;
                         if (!daPy_getPlayerLinkActorClass()->checkPlayerGuard()) {
@@ -2068,13 +2066,13 @@ void daFm_c::modeGrabDemo() {
         } else {
             if (mAnmPrmIdx == 6 && mpMorf->getFrame() == 40.0f) {
                 s16 procName = fopAcM_GetName(mpActorTarget);
-                if (procName == PROC_NPC_MD) {
+                if (procName == fpcNm_NPC_MD_e) {
                     fopAcM_monsSeStart(this, JA_SE_CV_MD_DAMAGE, 0);
-                } else if (procName == PROC_NPC_CB1) {
+                } else if (procName == fpcNm_NPC_CB1_e) {
                     fopAcM_monsSeStart(this, JA_SE_CV_CB_DAMAGE, 0);
                 }
             }
-            if (fopAcM_GetName((daNpc_Md_c *)mpActorTarget) == PROC_NPC_MD) { // ghidra shows cast here but unnecessary
+            if (fopAcM_GetName((daNpc_Md_c *)mpActorTarget) == fpcNm_NPC_MD_e) { // ghidra shows cast here but unnecessary
                 ((daNpc_Md_c *)mpActorTarget)->changeCaught02();
                 field_0x688 = true;
             }
@@ -2082,11 +2080,11 @@ void daFm_c::modeGrabDemo() {
             if (dComIfGp_evmng_endCheck("DEFAULT_FM_SUIKOMI_NPC")) {
                 if (field_0x2C8 != 0xff) {
                     cancelGrab();
-                    if (fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) {
+                    if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) {
                         dComIfGs_onEventBit(dSv_event_flag_c::UNK_3408);
                         ((daPy_npc_c *)mpActorTarget)->setPointRestart(field_0x2C8, 1);
                     }
-                    if (fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) {
+                    if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) {
                         dComIfGs_onEventBit(dSv_event_flag_c::UNK_3404);
                         ((daPy_npc_c *)mpActorTarget)->setPointRestart(field_0x2C8, 2);
                     }
@@ -2145,7 +2143,7 @@ void daFm_c::modePrepareItem() {
         if(temp == 3) {
             if(mpMorf->isStop()) {
                 u32 skullPrm = daTsubo::Act_c::prm_make_skull();
-                mProcId2 = fopAcM_create(PROC_TSUBO, skullPrm, &field_0x61C, tevStr.mRoomNo);
+                mProcId2 = fopAcM_create(fpcNm_TSUBO_e, skullPrm, &field_0x61C, tevStr.mRoomNo);
                 return;
             }
         }
@@ -2678,7 +2676,7 @@ void daFm_c::resetInvKine() {
 
 /* 000070F4-000071E0       .text grabBomb__6daFm_cFv */
 void daFm_c::grabBomb() {
-    if (fopAcM_GetName(mpActorTarget) == PROC_BOMB) {
+    if (fopAcM_GetName(mpActorTarget) == fpcNm_BOMB_e) {
         cXyz temp_pos(5.0f, -10.0f, 5.0f);
         cXyz pos = l_HIO.field_0x038 + temp_pos;
         mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(5));
@@ -2693,7 +2691,7 @@ void daFm_c::grabBomb() {
  
 /* 000071E0-0000743C       .text grabTsubo__6daFm_cFv */
 void daFm_c::grabTsubo() {
-        if(fopAcM_GetName(mpActorTarget) == PROC_TSUBO) {
+        if(fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) {
         daTsubo::Act_c* tsubo = (daTsubo::Act_c*)mpActorTarget;
 
         cXyz pos(0.0f, 0.0f, 0.0f);
@@ -2771,14 +2769,14 @@ void daFm_c::grabNPC() {
     if(isNpc(mpActorTarget) == true) {
         cXyz temp(0.0f, 0.0f, 0.0f);
         csXyz angle(0, 0, 0);
-        if(fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) {
+        if(fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) {
             temp.set(-15.0f, -10.0f, 8.0f);
             angle.x = 0;
             angle.y = 16000;
             angle.z = -4000;
         }
 
-        if(fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) {
+        if(fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) {
             temp.set(10.0f, 0.0f, 5.0f);
             angle.x = 4000;
             angle.y = 18000;
@@ -2799,9 +2797,9 @@ void daFm_c::searchTarget() {
     if(!dComIfGp_event_runCheck() || field_0x2E4 != 0) {
         fopAc_ac_c* actor = mpActorTarget = (fopAc_ac_c*)fopAcM_Search(searchNearOtherActor_CB, this);
         if(mpActorTarget == NULL) {
-            actor = fopAcM_SearchByName(PROC_NPC_CB1);
+            actor = fopAcM_SearchByName(fpcNm_NPC_CB1_e);
             if(actor == NULL) {
-                actor = fopAcM_SearchByName(PROC_NPC_MD);
+                actor = fopAcM_SearchByName(fpcNm_NPC_MD_e);
             }
 
             if(actor != NULL) {
@@ -2846,8 +2844,8 @@ void daFm_c::setBaseTarget() {
     fopAc_ac_c* pMdActor;
     switch(field_0x2DC) {
         case 0:
-            fopAcM_SearchByName(PROC_NPC_CB1);
-            pMdActor = fopAcM_SearchByName(PROC_NPC_MD);
+            fopAcM_SearchByName(fpcNm_NPC_CB1_e);
+            pMdActor = fopAcM_SearchByName(fpcNm_NPC_MD_e);
             pLink = daPy_getPlayerLinkActorClass();
 
             if (field_0x2D0 == 1 || field_0x2D0 == 2) {
@@ -2874,12 +2872,12 @@ void daFm_c::setBaseTarget() {
             mBaseTarget = daPy_getPlayerLinkActorClass();
             break;
         case 2:
-            fopAc_ac_c* actor = fopAcM_SearchByName(PROC_NPC_CB1);
+            fopAc_ac_c* actor = fopAcM_SearchByName(fpcNm_NPC_CB1_e);
 
             if(actor != NULL) {
                 mBaseTarget = actor;
             } else {
-                actor = fopAcM_SearchByName(PROC_NPC_MD);
+                actor = fopAcM_SearchByName(fpcNm_NPC_MD_e);
                 if(actor != NULL) {
                     mBaseTarget = actor;
                 }
@@ -2906,7 +2904,7 @@ bool daFm_c::isNpc(fopAc_ac_c* i_actor) {
     if(i_actor == NULL) {
         return false;
     }
-    return fopAcM_GetName(i_actor) == PROC_NPC_CB1 || fopAcM_GetName(i_actor) == PROC_NPC_MD;
+    return fopAcM_GetName(i_actor) == fpcNm_NPC_CB1_e || fopAcM_GetName(i_actor) == fpcNm_NPC_MD_e;
 }
 
 /* 00007C7C-00007CD0       .text checkHeight__6daFm_cFP10fopAc_ac_c */
@@ -3026,7 +3024,7 @@ bool daFm_c::_execute() {
     holeExecute();
     fopAcM_SearchByID(mProcId, &mpActorTarget);
     daBomb_c* bomb = (daBomb_c*)mpActorTarget;
-    if(bomb != NULL && fopAcM_GetName(bomb) == PROC_BOMB && bomb->chk_state(daBomb_c::STATE_0)) {
+    if(bomb != NULL && fopAcM_GetName(bomb) == fpcNm_BOMB_e && bomb->chk_state(daBomb_c::STATE_0)) {
         mpActorTarget = NULL;
         mProcId = 0;
         modeProcInit(7);
@@ -3519,18 +3517,18 @@ static actor_method_class daFmMethodTable = {
 };
 
 actor_process_profile_definition g_profile_FM = {
-    /* LayerID      */ fpcLy_CURRENT_e,
-    /* ListID       */ 0x0003,
-    /* ListPrio     */ fpcPi_CURRENT_e,
-    /* ProcName     */ PROC_FM,
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 0x0003,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_FM_e,
     /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daFm_c),
-    /* SizeOther    */ 0,
+    /* Size Other   */ 0,
     /* Parameters   */ 0,
     /* Leaf SubMtd  */ &g_fopAc_Method.base,
-    /* Priority     */ PRIO_FM,
+    /* Draw Prio    */ fpcDwPi_FM_e,
     /* Actor SubMtd */ &daFmMethodTable,
     /* Status       */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e,
     /* Group        */ fopAc_ENEMY_e,
-    /* CullType     */ fopAc_CULLBOX_CUSTOM_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };