From 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 Mon Sep 17 00:00:00 2001
From: Huitzi <73550465+marwernerh@users.noreply.github.com>
Date: Mon, 9 Mar 2026 21:33:31 -0400
Subject: 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>
---
 src/d/d_file_select.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/d/d_file_select.cpp')

diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index 55456ad826..1bbc3eb78c 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -1007,10 +1007,10 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) {
     ken0->hide();
     ken1->hide();
 
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_SWORD)) {
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_SWORD_e)) {
         ken0->hide();
         ken1->show();
-    } else if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WOOD_STICK) &&
+    } else if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WOOD_STICK_e) &&
                !pSave->getEvent().isEventBit(dSv_event_flag_c::F_0026))
     {
         ken0->show();
@@ -1018,8 +1018,8 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) {
     }
 
     J2DPane* ken2 = mSelDt.ScrDt->search(MULTI_CHAR('ken_02'));
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_MASTER_SWORD) ||
-        pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_LIGHT_SWORD))
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_MASTER_SWORD_e) ||
+        pSave->getPlayer().getGetItem().isFirstBit(dItemNo_LIGHT_SWORD_e))
     {
         ken2->show();
     } else {
@@ -1031,37 +1031,37 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) {
     tate0->hide();
     tate1->hide();
 
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_SHIELD)) {
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_SHIELD_e)) {
         tate0->show();
         tate1->hide();
-    } else if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WOOD_SHIELD)) {
+    } else if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WOOD_SHIELD_e)) {
         tate0->hide();
         tate1->show();
     }
 
     J2DPane* tate2 = mSelDt.ScrDt->search(MULTI_CHAR('tate_02'));
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) {
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_HYLIA_SHIELD_e)) {
         tate2->show();
     } else {
         tate2->hide();
     }
 
     J2DPane* fuku0 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_00'));
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_KOKIRI)) {
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WEAR_KOKIRI_e)) {
         fuku0->show();
     } else {
         fuku0->hide();
     }
 
     J2DPane* fuku1 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_01'));
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_ZORA)) {
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WEAR_ZORA_e)) {
         fuku1->show();
     } else {
         fuku1->hide();
     }
 
     J2DPane* fuku2 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_02'));
-    if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_ARMOR)) {
+    if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_ARMOR_e)) {
         fuku2->show();
     } else {
         fuku2->hide();
-- 
cgit v1.2.3