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 --------- Co-authored-by: LagoLunatic --- src/d/d_menu_dmap.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/d/d_menu_dmap.cpp') diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 187fa4b172..3fcc8cc094 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -1162,13 +1162,13 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); u8 key_num = 0; - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES1, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES1_e, 1)) { key_num = 1; } - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES2, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES2_e, 1)) { key_num++; } - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES3, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES3_e, 1)) { key_num++; } @@ -1201,34 +1201,34 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); - u8 itemNo = fpcNm_ITEM_NONE; + u8 itemNo = dItemNo_NONE_e; field_0x174[2] = 0; if (g_fmapHIO.mMapIconHIO.mLV5DungeonItemDebug) { itemNo = g_fmapHIO.mMapIconHIO.mLV5DungeonItem; - if (itemNo != fpcNm_ITEM_NONE) { + if (itemNo != dItemNo_NONE_e) { field_0x174[2] = itemNo; } } else { if (dComIfGs_isDungeonItemBossKey()) { - itemNo = fpcNm_ITEM_LV5_BOSS_KEY; - field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_LV5_BOSS_KEY : 0; + itemNo = dItemNo_LV5_BOSS_KEY_e; + field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? dItemNo_LV5_BOSS_KEY_e : 0; /* dSv_event_flag_c::F_0003 - Snowpeak Ruins - Handed over tomato puree and left room */ - } else if (checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1) && !dComIfGs_isEventBit(2)) { - itemNo = fpcNm_ITEM_TOMATO_PUREE; - field_0x174[2] = fpcNm_ITEM_TOMATO_PUREE; + } else if (checkItemGet(dItemNo_TOMATO_PUREE_e, 1) && !dComIfGs_isEventBit(2)) { + itemNo = dItemNo_TOMATO_PUREE_e; + field_0x174[2] = dItemNo_TOMATO_PUREE_e; /* dSv_event_flag_c::F_0004 - Snowpeak Ruins - Handed over secret ingredient and left room */ - } else if (checkItemGet(fpcNm_ITEM_TASTE, 1) && !dComIfGs_isEventBit(1)) { - itemNo = fpcNm_ITEM_TASTE; - field_0x174[2] = fpcNm_ITEM_TASTE; + } else if (checkItemGet(dItemNo_TASTE_e, 1) && !dComIfGs_isEventBit(1)) { + itemNo = dItemNo_TASTE_e; + field_0x174[2] = dItemNo_TASTE_e; } } switch (itemNo) { - case fpcNm_ITEM_TOMATO_PUREE: - case fpcNm_ITEM_TASTE: + case dItemNo_TOMATO_PUREE_e: + case dItemNo_TASTE_e: dMeter2Info_readItemTexture(itemNo, mItemTexBuf, (J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_boss')), NULL, NULL, NULL, NULL, NULL, NULL, -1); @@ -1238,11 +1238,11 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); - field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_BOSS_KEY : 0; + field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? dItemNo_BOSS_KEY_e : 0; } - field_0x174[0] = (u8)dComIfGs_isDungeonItemMap() ? fpcNm_ITEM_MAP : 0; - field_0x174[1] = (u8)dComIfGs_isDungeonItemCompass() ? fpcNm_ITEM_COMPUS : 0; + field_0x174[0] = (u8)dComIfGs_isDungeonItemMap() ? dItemNo_MAP_e : 0; + field_0x174[1] = (u8)dComIfGs_isDungeonItemCompass() ? dItemNo_COMPUS_e : 0; field_0x177 = 0; int bVar6 = 0; -- cgit v1.2.3