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, 57 insertions, 59 deletions

diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index ce3b3634..fcd11823 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -9,8 +9,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_ship.h"
 #include "d/actor/d_a_dai.h"
-#include "d/d_procname.h"
-#include "d/d_priority.h"
 #include "d/d_com_lib_game.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_camera.h"
@@ -3433,10 +3431,10 @@ static u16 l_item_chk_sa3[] = {
 };
 
 static int l_item_id_sa3[] = {
-    dItem_PURPLE_RUPEE_e,
-    dItem_PURPLE_RUPEE_e,
-    dItem_RED_RUPEE_e,
-    dItem_RED_RUPEE_e,
+    dItemNo_PURPLE_RUPEE_e,
+    dItemNo_PURPLE_RUPEE_e,
+    dItemNo_RED_RUPEE_e,
+    dItemNo_RED_RUPEE_e,
 };
 
 static u32 l_msg_sa3_night[] = {
@@ -3827,15 +3825,15 @@ static u32 l_msg_ug2_out_area[] = {
 
 static int l_get_item_no[] = {
 #if VERSION <= VERSION_JPN
-    dItem_ORANGE_RUPEE_e,
+    dItemNo_ORANGE_RUPEE_e,
 #else
-    dItem_HEART_PIECE_e,
+    dItemNo_HEART_PIECE_e,
 #endif
-    dItem_COLLECT_MAP_20_e,
-    dItem_COLLECT_MAP_16_e,
-    dItem_HEART_PIECE_e,
-    dItem_HEART_PIECE_e,
-    dItem_COLLECT_MAP_15_e,
+    dItemNo_COLLECT_MAP_20_e,
+    dItemNo_COLLECT_MAP_16_e,
+    dItemNo_HEART_PIECE_e,
+    dItemNo_HEART_PIECE_e,
+    dItemNo_COLLECT_MAP_15_e,
 };
 
 struct PsoData {
@@ -4238,7 +4236,7 @@ static cPhs_State phase_1(daNpcPeople_c* i_this) {
     switch(i_this->getNpcNo()) {
         case 0x6:
             if(strcmp(dComIfGp_getStartStageName(), "Ocmera") == 0) {
-                if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) {
+                if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) {
                     return cPhs_STOP_e;
                 }
 
@@ -4554,7 +4552,7 @@ cPhs_State daNpcPeople_c::createInit() {
     m_jnt.setParam(mpNpcDat->field_0x04, mpNpcDat->field_0x06, mpNpcDat->field_0x0C, mpNpcDat->field_0x0E, mpNpcDat->field_0x00, mpNpcDat->field_0x02, mpNpcDat->field_0x08, mpNpcDat->field_0x0A, mpNpcDat->field_0x10);
 
     if(mNpcType == 0xB && !mbIsNight) {
-        dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e);
+        dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e);
     }
 
     m79D = mpNpcDat->field_0x5A;
@@ -4791,7 +4789,7 @@ bool daNpcPeople_c::_execute() {
 
                     break;
                 case 0xB:
-                    if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && (mAnmFlag & 0x3)) {
+                    if(!dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e) && (mAnmFlag & 0x3)) {
                         mAnmFlag &= ~0x3;
                         u8 rand = getRand(8);
                         if(rand == m794) {
@@ -4984,7 +4982,7 @@ void daNpcPeople_c::executeWait() {
                 m7A6 = 5;
                 break;
             case 0xB:
-                if(mbIsNight && (!dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) || dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e))) {
+                if(mbIsNight && (!dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) || dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e))) {
                     if(dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) {
                         m748 = (s16)(mpNpcDat->field_0x28 * 2.0f);
                     }
@@ -5287,7 +5285,7 @@ void daNpcPeople_c::executeFurue() {
 /* 00002EC4-00002F80       .text executeKyoroInit__13daNpcPeople_cFv */
 s32 daNpcPeople_c::executeKyoroInit() {
     fopAc_ac_c* mailbox;
-    if (fopAcM_SearchByName(PROC_OBJ_TORIPOST, &mailbox) == true && mailbox != NULL) {
+    if (fopAcM_SearchByName(fpcNm_OBJ_TORIPOST_e, &mailbox) == true && mailbox != NULL) {
         dNpc_calc_DisXZ_AngY(current.pos, mailbox->current.pos, NULL, &m77A);
     }
 
@@ -5491,7 +5489,7 @@ void daNpcPeople_c::executeUgWalk() {
 
                 if(mCyl.ChkCoHit()) {
                     daNpcPeople_c* pActor = (daNpcPeople_c*)mCyl.GetCoHitAc();
-                    if(pActor && fopAcM_GetProfName(pActor) == PROC_NPC_PEOPLE) {
+                    if(pActor && fopAcM_GetProfName(pActor) == fpcNm_NPC_PEOPLE_e) {
                         u8 type = pActor->getNpcNo();
                         if((mNpcType == 0x11 && type == 0x12) || (mNpcType == 0x12 && type == 0x11)) {
                             pActor->setEtcFlag(0x60000);
@@ -5504,7 +5502,7 @@ void daNpcPeople_c::executeUgWalk() {
             else {
                 if(mCyl.ChkCoHit()) {
                     fopAc_ac_c* pActor = mCyl.GetCoHitAc();
-                    if(pActor && fopAcM_GetProfName(pActor) == PROC_PLAYER) {
+                    if(pActor && fopAcM_GetProfName(pActor) == fpcNm_PLAYER_e) {
                         diff = (pActor->current.pos - home.pos);
                         diff.y = 0.0f;
                         if(temp2 > diff.abs()) {
@@ -5951,16 +5949,16 @@ void daNpcPeople_c::eventMesSetInit(int staffIdx) {
                 mEtcFlag |= 0x800;
 
                 dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0208);
-                if(!dComIfGs_checkGetItem(NORMAL_SAIL)) {
+                if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) {
                     setMessage(0x3594);
                 }
                 else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) {
                     setMessage(0x3595);
                 }
-                else if(!dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) {
+                else if(!dComIfGs_checkGetItem(dItemNo_MAGIC_ARMOR_e)) {
                     setMessage(0x3596);
                 }
-                else if(!dComIfGs_checkGetItem(CAMERA2)) {
+                else if(!dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) {
                     setMessage(0x3597);
                 }
                 else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C08)) {
@@ -6053,7 +6051,7 @@ void daNpcPeople_c::eventUb1TalkInit(int) {
         m73C = l_msg_ub1_1st_talk;
         dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A40);
     }
-    else if(!dComIfGs_checkGetItem(CAMERA) && !dComIfGs_checkGetItem(CAMERA2)) {
+    else if(!dComIfGs_checkGetItem(dItemNo_PICTO_BOX_e) && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) {
         m73C = l_msg_ub1_no_camera;
     }
     else {
@@ -6648,7 +6646,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) {
                         break;
                     case 0x11:
                         if(mpCurrMsg->mSelectNum == 0) {
-                            if(dComIfGs_checkGetItemNum(dItem_SKULL_NECKLACE_e) < 3) {
+                            if(dComIfGs_checkGetItemNum(dItemNo_SKULL_NECKLACE_e) < 3) {
                                 m734 = l_msg_xy_sa5_yes_ng;
                             }
                             else {
@@ -6751,7 +6749,7 @@ u32 daNpcPeople_c::getMsg() {
                 else if(!isColor()) {
                     m734 = l_msg_xy_ub4_no_color;
                 }
-                else if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_16_e)) {
+                else if(!dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_16_e)) {
                     m734 = l_msg_xy_ub4_get_item;
 #if VERSION > VERSION_JPN
                     dComIfGs_onEventBit(dSv_event_flag_c::UNK_2504);
@@ -6821,7 +6819,7 @@ u32 daNpcPeople_c::getMsg() {
                 msgNo = 0x2D63;
                 break;
             case 0x10:
-                if(itemNo != dItem_SKULL_NECKLACE_e) {
+                if(itemNo != dItemNo_SKULL_NECKLACE_e) {
                     m734 = l_msg_xy_sa5_no_skull_necklace;
                 }
                 else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2620)) {
@@ -6838,7 +6836,7 @@ u32 daNpcPeople_c::getMsg() {
         cXyz diff;
         switch(mNpcType) {
             case 0:
-                if(!dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) {
+                if(!dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e)) {
                     if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2501)) {
                         dComIfGs_onEventBit(dSv_event_flag_c::UNK_2501);
                         m734 = l_msg_uo1_1st_haitatu;
@@ -6922,7 +6920,7 @@ u32 daNpcPeople_c::getMsg() {
                     if(temp <= 500.0f) {
                         m734 = l_msg_ub3_ship_near5;
                     }
-                    else if(dComIfGs_checkGetItem(dItem_WIND_WAKER_e)) {
+                    else if(dComIfGs_checkGetItem(dItemNo_WIND_WAKER_e)) {
                         m734 = l_msg_ub3_tact;
                     }
                     else {
@@ -6942,7 +6940,7 @@ u32 daNpcPeople_c::getMsg() {
                 else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2504)) {
                     m734 = l_msg_ub4_color_photo;
                 }
-                else if(!dComIfGs_checkGetItem(CAMERA) && !dComIfGs_checkGetItem(CAMERA2)) {
+                else if(!dComIfGs_checkGetItem(dItemNo_PICTO_BOX_e) && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) {
                     m734 = l_msg_ub4_no_photo_box;
                 }
                 else {
@@ -6951,7 +6949,7 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 7:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x2DC9;
                 }
                 else if(!mbIsNight) {
@@ -6967,8 +6965,8 @@ u32 daNpcPeople_c::getMsg() {
                     m734 = l_msg_uw1_1st_talk_night;
                     dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E10);
                 }
-                else if(dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) {
-                    if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) {
+                else if(dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e)) {
+                    if(dComIfGs_checkGetItem(dItemNo_MAGIC_ARMOR_e)) {
                         m734 = l_msg_uw1_magic_shield;
                     }
                     else {
@@ -7019,7 +7017,7 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 9:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x2FBD;
                 }
                 else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2104)) {
@@ -7089,11 +7087,11 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 0xB:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x347B;
                 }
                 else if(!mbIsNight) {
-                    if(!dComIfGs_checkGetItem(NORMAL_SAIL)) {
+                    if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) {
                         m734 = l_msg_um3_not_sail;
                     }
                     else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2340)) {
@@ -7103,7 +7101,7 @@ u32 daNpcPeople_c::getMsg() {
                     else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310)) {
                         m734 = l_msg_um3_no_nazo_talk;
                     }
-                    else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) {
+                    else if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e)) {
                         m734 = l_msg_um3_map15;
                     }
                     else {
@@ -7117,7 +7115,7 @@ u32 daNpcPeople_c::getMsg() {
                 else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2308)) {
                     m734 = l_msg_um3_no_look_moon;
                 }
-                else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2280)) {
+                else if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2280)) {
                     m734 = l_msg_um3_map15_n;
                 }
                 else {
@@ -7126,7 +7124,7 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 0xC:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x2E82;
                 }
                 else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2304)) {
@@ -7160,11 +7158,11 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 0xE:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x30E4;
                 }
                 else if(!mbIsNight) {
-                    if(!dComIfGs_checkGetItem(NORMAL_SAIL)) {
+                    if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) {
                         m734 = l_msg_sa3_not_sail;
                     }
                     else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2301)) {
@@ -7181,11 +7179,11 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 0xF:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x321E;
                 }
                 else if(!mbIsNight) {
-                    if(!dComIfGs_checkGetItem(NORMAL_SAIL)) {
+                    if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) {
                         m734 = l_msg_sa4_not_sail;
                     }
                     else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2480)) {
@@ -7202,7 +7200,7 @@ u32 daNpcPeople_c::getMsg() {
 
                 break;
             case 0x10:
-                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) {
+                if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) {
                     msgNo = 0x3299;
                 }
                 else if(!mbIsNight) {
@@ -7927,7 +7925,7 @@ void daNpcPeople_c::setWaitAnm() {
     if(mNpcType == 5 && m789 != 0) {
         setAnmTbl(l_npc_anm_wait, 0);
     }
-    else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) {
+    else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e)) {
         setAnmTbl(l_npc_anm_um3_wait3, 1);
     }
     else if(mNpcType == 8 && m793 == 1) {
@@ -7956,13 +7954,13 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) {
                 return true;
             }
 
-            if(itemNo == dItem_JOY_PENDANT_e) {
+            if(itemNo == dItemNo_JOY_PENDANT_e) {
                 return true;
             }
 
             break;
         case 0x5:
-            if(itemNo == dItem_JOY_PENDANT_e) {
+            if(itemNo == dItemNo_JOY_PENDANT_e) {
                 return true;
             }
 
@@ -7972,13 +7970,13 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) {
                 return true;
             }
 
-            if(itemNo == dItem_JOY_PENDANT_e) {
+            if(itemNo == dItemNo_JOY_PENDANT_e) {
                 return true;
             }
 
             break;
         case 0xB:
-            if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310) && !dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) {
+            if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310) && !dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e)) {
                 return true;
             }
 
@@ -8014,7 +8012,7 @@ s16 daNpcPeople_c::XyEventCB(int i_itemBtn) {
     switch(mNpcType) {
         case 0x3:
         case 0x4:
-            if(itemNo != dItem_JOY_PENDANT_e) {
+            if(itemNo != dItemNo_JOY_PENDANT_e) {
                 ret = m766[1];
                 m79C = 0;
 
@@ -8025,7 +8023,7 @@ s16 daNpcPeople_c::XyEventCB(int i_itemBtn) {
 
             break;
         case 0x10:
-            if(itemNo == dItem_SKULL_NECKLACE_e) {
+            if(itemNo == dItemNo_SKULL_NECKLACE_e) {
                 ret = m766[0];
                 m79C = 0;
 
@@ -8223,7 +8221,7 @@ BOOL daNpcPeople_c::chkEndEvent() {
 
 /* 000090D0-00009100       .text is1GetMap20__13daNpcPeople_cFv */
 BOOL daNpcPeople_c::is1GetMap20() {
-    return dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) ? TRUE : FALSE;
+    return dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_20_e) ? TRUE : FALSE;
 }
 
 /* 00009100-00009144       .text is1DayGetMap20__13daNpcPeople_cFv */
@@ -8471,18 +8469,18 @@ static actor_method_class daNpc_PeopleMethodTable = {
 };
 
 actor_process_profile_definition g_profile_NPC_PEOPLE = {
-    /* LayerID      */ fpcLy_CURRENT_e,
-    /* ListID       */ 0x0007,
-    /* ListPrio     */ fpcPi_CURRENT_e,
-    /* ProcName     */ PROC_NPC_PEOPLE,
+    /* Layer ID     */ fpcLy_CURRENT_e,
+    /* List ID      */ 0x0007,
+    /* List Prio    */ fpcPi_CURRENT_e,
+    /* Proc Name    */ fpcNm_NPC_PEOPLE_e,
     /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daNpcPeople_c),
-    /* SizeOther    */ 0,
+    /* Size Other   */ 0,
     /* Parameters   */ 0,
     /* Leaf SubMtd  */ &g_fopAc_Method.base,
-    /* Priority     */ PRIO_NPC_PEOPLE,
+    /* Draw Prio    */ fpcDwPi_NPC_PEOPLE_e,
     /* Actor SubMtd */ &daNpc_PeopleMethodTable,
     /* Status       */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
     /* Group        */ fopAc_ACTOR_e,
-    /* CullType     */ fopAc_CULLBOX_CUSTOM_e,
+    /* Cull Type    */ fopAc_CULLBOX_CUSTOM_e,
 };