mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 15:23:01 -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 30e839c28b
commit 0b0fdd1f60
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_obj_nan.cpp
+17 -17
View File
@@ -313,7 +313,7 @@ void daObjNAN_c::walk() {
void daObjNAN_c::bin_wait() {
if (field_0x7d0 == 0) {
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
mDraw = false;
field_0x7d0++;
} else if (field_0x7d0 != -1 && field_0x56c != 0) {
@@ -406,7 +406,7 @@ void daObjNAN_c::hook() {
if (mDraw) {
nan_setParticle();
}
if (!fopAcM_CheckStatus(this, 0x100000)) {
if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) {
setAction(&daObjNAN_c::drop);
}
dBgS_LinChk linkChk;
@@ -538,7 +538,7 @@ void daObjNAN_c::action() {
}
static u8 const l_nan_itemno[2] = {
fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI,
dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e,
};
int daObjNAN_c::execute() {
@@ -729,18 +729,18 @@ static actor_method_class l_daObjNAN_Method = {
};
actor_process_profile_definition g_profile_Obj_Nan = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Nan, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjNAN_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
480, // mPriority
&l_daObjNAN_Method, // sub_method
0x000C0120, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_Nan_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjNAN_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Nan_e,
/* Actor SubMtd */ &l_daObjNAN_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};