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, 73 insertions, 74 deletions

diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 7f4f77eb..b9a6373c 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -16,7 +16,6 @@
 #include "d/d_item_data.h"
 #include "d/d_magma.h"
 #include "d/d_particle.h"
-#include "d/d_procname.h"
 #include "d/d_tree.h"
 #include "d/d_wood.h"
 #include "f_op/f_op_scene_mng.h"
@@ -126,7 +125,7 @@ void dComIfG_play_c::itemInit() {
     mDirection = 0;
     mButtonMode = 0;
 
-    if (dComIfGs_checkGetItem(dItem_TELESCOPE_e)) {
+    if (dComIfGs_checkGetItem(dItemNo_TELESCOPE_e)) {
         mButtonInfo[0] = 0;
     } else {
         mButtonInfo[0] = 0x15;
@@ -480,7 +479,7 @@ void dComIfG_inf_c::ct() {
 /* 800531A8-8005326C       .text dComIfG_changeOpeningScene__FP11scene_classs */
 int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) {
 #if VERSION == VERSION_DEMO
-    if (!fopScnM_ChangeReq(i_scene, i_procName, PROC_OVERLAP0, 30)) {
+    if (!fopScnM_ChangeReq(i_scene, i_procName, fpcNm_OVERLAP0_e, 30)) {
         return FALSE;
     }
 #endif
@@ -493,7 +492,7 @@ int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) {
 #if VERSION > VERSION_DEMO
     dComIfGs_setRestartRoomParam(0);
 
-    fopScnM_ChangeReq(i_scene, i_procName, PROC_OVERLAP0, 30);
+    fopScnM_ChangeReq(i_scene, i_procName, fpcNm_OVERLAP0_e, 30);
     fopScnM_ReRequest(i_procName, 0);
 #endif
 
@@ -742,97 +741,97 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
     u8 get_item = 0;
 
     switch (i_itemNo) {
-    case TACT_SONG1:
+    case dItemNo_WINDS_REQUIEM_e:
         if (dComIfGs_isTact(0)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG2:
+    case dItemNo_BALLAD_OF_GALES_e:
         if (dComIfGs_isTact(1)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG3:
+    case dItemNo_COMMAND_MELODY_e:
         if (dComIfGs_isTact(2)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG4:
+    case dItemNo_EARTH_GODS_LYRIC_e:
         if (dComIfGs_isTact(3)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG5:
+    case dItemNo_WIND_GODS_ARIA_e:
         if (dComIfGs_isTact(4)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG6:
+    case dItemNo_SONG_OF_PASSING_e:
         if (dComIfGs_isTact(5)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE1_e:
+    case dItemNo_TRIFORCE1_e:
         if (dComIfGs_isTriforce(0)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE2_e:
+    case dItemNo_TRIFORCE2_e:
         if (dComIfGs_isTriforce(1)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE3_e:
+    case dItemNo_TRIFORCE3_e:
         if (dComIfGs_isTriforce(2)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE4_e:
+    case dItemNo_TRIFORCE4_e:
         if (dComIfGs_isTriforce(3)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE5_e:
+    case dItemNo_TRIFORCE5_e:
         if (dComIfGs_isTriforce(4)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE6_e:
+    case dItemNo_TRIFORCE6_e:
         if (dComIfGs_isTriforce(5)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE7_e:
+    case dItemNo_TRIFORCE7_e:
         if (dComIfGs_isTriforce(6)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE8_e:
+    case dItemNo_TRIFORCE8_e:
         if (dComIfGs_isTriforce(7)) {
             get_item = 1;
         }
         break;
-    case dItem_PEARL_NAYRU_e:
+    case dItemNo_PEARL_NAYRU_e:
         if (dComIfGs_isSymbol(0)) {
             get_item = 1;
         }
         break;
-    case dItem_PEARL_DIN_e:
+    case dItemNo_PEARL_DIN_e:
         if (dComIfGs_isSymbol(1)) {
             get_item = 1;
         }
         break;
-    case dItem_PEARL_FARORE_e:
+    case dItemNo_PEARL_FARORE_e:
         if (dComIfGs_isSymbol(2)) {
             get_item = 1;
         }
         break;
-    case dItem_PIRATES_CHARM_e:
+    case dItemNo_PIRATES_CHARM_e:
         if (dComIfGs_isCollect(3, 0)) {
             get_item = 1;
         }
         break;
-    case dItem_HEROS_CHARM_e:
+    case dItemNo_HEROS_CHARM_e:
         if (dComIfGs_isCollect(4, 0)) {
             get_item = 1;
         }
@@ -850,8 +849,8 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
             }
         }
 
-        if (i_itemNo >= 0xBF && i_itemNo <= dItem_NONE_e - 1 &&
-            dComIfGs_isGetCollectMap(dItem_NONE_e - i_itemNo))
+        if (i_itemNo >= 0xBF && i_itemNo <= dItemNo_NONE_e - 1 &&
+            dComIfGs_isGetCollectMap(dItemNo_NONE_e - i_itemNo))
         {
             get_item++;
         }
@@ -866,163 +865,163 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
     u8 get_item = 0;
 
     switch (i_itemNo) {
-    case TACT_SONG1:
+    case dItemNo_WINDS_REQUIEM_e:
         if (dComIfGs_isTact(0)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG2:
+    case dItemNo_BALLAD_OF_GALES_e:
         if (dComIfGs_isTact(1)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG3:
+    case dItemNo_COMMAND_MELODY_e:
         if (dComIfGs_isTact(2)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG4:
+    case dItemNo_EARTH_GODS_LYRIC_e:
         if (dComIfGs_isTact(3)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG5:
+    case dItemNo_WIND_GODS_ARIA_e:
         if (dComIfGs_isTact(4)) {
             get_item = 1;
         }
         break;
-    case TACT_SONG6:
+    case dItemNo_SONG_OF_PASSING_e:
         if (dComIfGs_isTact(5)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE1_e:
+    case dItemNo_TRIFORCE1_e:
         if (dComIfGs_isTriforce(0)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE2_e:
+    case dItemNo_TRIFORCE2_e:
         if (dComIfGs_isTriforce(1)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE3_e:
+    case dItemNo_TRIFORCE3_e:
         if (dComIfGs_isTriforce(2)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE4_e:
+    case dItemNo_TRIFORCE4_e:
         if (dComIfGs_isTriforce(3)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE5_e:
+    case dItemNo_TRIFORCE5_e:
         if (dComIfGs_isTriforce(4)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE6_e:
+    case dItemNo_TRIFORCE6_e:
         if (dComIfGs_isTriforce(5)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE7_e:
+    case dItemNo_TRIFORCE7_e:
         if (dComIfGs_isTriforce(6)) {
             get_item = 1;
         }
         break;
-    case dItem_TRIFORCE8_e:
+    case dItemNo_TRIFORCE8_e:
         if (dComIfGs_isTriforce(7)) {
             get_item = 1;
         }
         break;
-    case dItem_PEARL_NAYRU_e:
+    case dItemNo_PEARL_NAYRU_e:
         if (dComIfGs_isSymbol(0)) {
             get_item = 1;
         }
         break;
-    case dItem_PEARL_DIN_e:
+    case dItemNo_PEARL_DIN_e:
         if (dComIfGs_isSymbol(1)) {
             get_item = 1;
         }
         break;
-    case dItem_PEARL_FARORE_e:
+    case dItemNo_PEARL_FARORE_e:
         if (dComIfGs_isSymbol(2)) {
             get_item = 1;
         }
         break;
-    case dItem_PIRATES_CHARM_e:
+    case dItemNo_PIRATES_CHARM_e:
         if (dComIfGs_isCollect(3, 0)) {
             get_item = 1;
         }
         break;
-    case dItem_HEROS_CHARM_e:
+    case dItemNo_HEROS_CHARM_e:
         if (dComIfGs_isCollect(4, 0)) {
             get_item = 1;
         }
         break;
-    case dItem_BOW_e:
-        if (dComIfGs_getItem(dInvSlot_BOW_e) != dItem_HEART_e) { // Bug?
+    case dItemNo_BOW_e:
+        if (dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_HEART_e) { // Bug?
             get_item = dComIfGs_getArrowNum();
         }
         break;
-    case dItem_BOMB_BAG_e:
-        if (dComIfGs_getItem(dInvSlot_BOMB_e) != dItem_HEART_e) { // Bug?
+    case dItemNo_BOMB_BAG_e:
+        if (dComIfGs_getItem(dInvSlot_BOMB_e) != dItemNo_HEART_e) { // Bug?
             get_item = dComIfGs_getBombNum();
         }
         break;
-    case dItem_SKULL_NECKLACE_e:
+    case dItemNo_SKULL_NECKLACE_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_SKULL_NECKLACE_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_SKULL_NECKLACE_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_SKULL_NECKLACE_e);
             }
         }
         break;
-    case dItem_BOKOBABA_SEED_e:
+    case dItemNo_BOKOBABA_SEED_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_BOKOBABA_SEED_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_BOKOBABA_SEED_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_BOKOBABA_SEED_e);
             }
         }
         break;
-    case dItem_GOLDEN_FEATHER_e:
+    case dItemNo_GOLDEN_FEATHER_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_GOLDEN_FEATHER_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_GOLDEN_FEATHER_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e);
             }
         }
         break;
-    case dItem_KNIGHTS_CREST_e:
+    case dItemNo_KNIGHTS_CREST_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_KNIGHTS_CREST_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_KNIGHTS_CREST_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e);
             }
         }
         break;
-    case dItem_RED_JELLY_e:
+    case dItemNo_RED_JELLY_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_RED_JELLY_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_RED_JELLY_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_RED_JELLY_e);
             }
         }
         break;
-    case dItem_GREEN_JELLY_e:
+    case dItemNo_GREEN_JELLY_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_GREEN_JELLY_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_GREEN_JELLY_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_GREEN_JELLY_e);
             }
         }
         break;
-    case dItem_BLUE_JELLY_e:
+    case dItemNo_BLUE_JELLY_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_BLUE_JELLY_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_BLUE_JELLY_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_BLUE_JELLY_e);
             }
         }
         break;
-    case dItem_JOY_PENDANT_e:
+    case dItemNo_JOY_PENDANT_e:
         for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
-            if (dComIfGs_getBeast(beastIdx) == dItem_JOY_PENDANT_e) {
+            if (dComIfGs_getBeast(beastIdx) == dItemNo_JOY_PENDANT_e) {
                 get_item = dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e);
             }
         }
@@ -1040,8 +1039,8 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
             }
         }
 
-        if (i_itemNo >= 0xBF && i_itemNo <= dItem_NONE_e - 1 &&
-            dComIfGs_isGetCollectMap(dItem_NONE_e - i_itemNo))
+        if (i_itemNo >= 0xBF && i_itemNo <= dItemNo_NONE_e - 1 &&
+            dComIfGs_isGetCollectMap(dItemNo_NONE_e - i_itemNo))
         {
             get_item = 1;
         }
@@ -1305,7 +1304,7 @@ void dComIfGs_setPlayerRecollectionData() {
     }
 
 #if VERSION > VERSION_DEMO
-    if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[dInvSlot_TELESCOPE_e] != dItem_TELESCOPE_e) {
+    if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[dInvSlot_TELESCOPE_e] != dItemNo_TELESCOPE_e) {
         dComIfGs_setSelectItem(dItemBtn_X_e, dInvSlot_NONE_e);
         dComIfGs_setSelectItem(dItemBtn_Y_e, dInvSlot_NONE_e);
         dComIfGs_setSelectItem(dItemBtn_Z_e, dInvSlot_NONE_e);
@@ -1627,32 +1626,32 @@ void dComIfGs_setSelectEquip(int i_type, u8 i_itemNo) {
     switch (i_type) {
     case 0:
         switch (i_itemNo) {
-        case dItem_SWORD_e:
+        case dItemNo_SWORD_e:
             dComIfGs_onCollect(i_type, 0);
             break;
-        case dItem_MASTER_SWORD_1_e:
+        case dItemNo_MASTER_SWORD_1_e:
             dComIfGs_onCollect(i_type, 1);
             break;
-        case dItem_MASTER_SWORD_2_e:
+        case dItemNo_MASTER_SWORD_2_e:
             dComIfGs_onCollect(i_type, 2);
             break;
-        case dItem_MASTER_SWORD_3_e:
+        case dItemNo_MASTER_SWORD_3_e:
             dComIfGs_onCollect(i_type, 3);
             break;
         }
         break;
     case 1:
         switch (i_itemNo) {
-        case dItem_SHIELD_e:
+        case dItemNo_SHIELD_e:
             dComIfGs_onCollect(i_type, 0);
             break;
-        case dItem_MIRROR_SHIELD_e:
+        case dItemNo_MIRROR_SHIELD_e:
             dComIfGs_onCollect(i_type, 1);
             break;
         }
         break;
     case 2:
-        if (i_itemNo == dItem_POWER_BRACELETS_e) {
+        if (i_itemNo == dItemNo_POWER_BRACELETS_e) {
             dComIfGs_onCollect(i_type, 0);
         }
         break;