mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* 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>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 8e2545f2ec
commit 56890c32e8
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_midna.cpp
+16 -16
View File
@@ -3170,8 +3170,8 @@ int daMidna_c::execute() {
if (
checkStateFlg0(FLG0_NO_DRAW) && (eventInfo.checkCommandTalk() || checkStateFlg0(FLG0_WOLF_NO_POS) ||
mDemoMode == 2 || (dComIfGp_event_runCheck() && talk_partner != NULL && (checkStateFlg0(FLG0_UNK_2000000) ||
fopAcM_GetName(talk_partner) == PROC_Tag_Mhint || fopAcM_GetName(talk_partner) == PROC_Tag_Mstop ||
fopAcM_GetName(talk_partner) == PROC_Tag_Mwait)))
fopAcM_GetName(talk_partner) == fpcNm_Tag_Mhint_e || fopAcM_GetName(talk_partner) == fpcNm_Tag_Mstop_e ||
fopAcM_GetName(talk_partner) == fpcNm_Tag_Mwait_e)))
) {
if (
mDemoMode == 3 || mDemoMode == 0x10 || mDemoMode == 4 || mDemoMode == 6 ||
@@ -3598,18 +3598,18 @@ static actor_method_class l_daMidna_Method = {
};
actor_process_profile_definition g_profile_MIDNA = {
fpcLy_CURRENT_e,
6,
fpcPi_CURRENT_e,
PROC_MIDNA,
&g_fpcLf_Method.base,
sizeof(daMidna_c),
0,
0,
&g_fopAc_Method.base,
0x5C,
&l_daMidna_Method,
0x60000,
fopAc_ENV_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 6,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_MIDNA_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daMidna_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_MIDNA_e,
/* Actor SubMtd */ &l_daMidna_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};