mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_nbomb.cpp
+17 -17
View File
@@ -49,7 +49,7 @@ void daNbomb_c::tgHitCallback(dCcD_GObjInf* i_hitObj) {
{
procBoomerangMoveInit(i_hitObj);
}
} else if (i_hitObj->ChkAtType(AT_TYPE_HOOKSHOT) && fopAcM_CheckStatus(this, 0x80000)) {
} else if (i_hitObj->ChkAtType(AT_TYPE_HOOKSHOT) && fopAcM_CheckStatus(this, fopAcStts_UNK_0x80000_e)) {
if (fopAcM_checkCarryNow(this)) {
fopAcM_cancelCarryNow(this);
}
@@ -350,7 +350,7 @@ int daNbomb_c::create() {
mDoMtx_stack_c::transS(current.pos);
if (!checkStateFlg0(FLG0_INSECT_BOMB)) {
fopAcM_OnStatus(this, 0x80000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
}
mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z);
@@ -607,7 +607,7 @@ void daNbomb_c::setHitPolygon(BOOL param_0) {
}
BOOL daNbomb_c::procExplodeInit() {
fopAcM_OnStatus(this, 0x20000);
fopAcM_OnStatus(this, fopAcStts_NOPAUSE_e);
daAlink_c* player = daAlink_getAlinkActorClass();
scale.x = player->getBombEffScale();
@@ -1685,18 +1685,18 @@ static actor_method_class l_daNbombMethod = {
};
actor_process_profile_definition g_profile_NBOMB = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NBOMB, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNbomb_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
270, // mPriority
&l_daNbombMethod, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NBOMB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNbomb_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NBOMB_e,
/* Actor SubMtd */ &l_daNbombMethod,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};