mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-31 23:48:17 -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/f_op/f_op_actor.cpp
+8 -8
View File
@@ -245,7 +245,7 @@ static int fopAc_Draw(void* i_this) {
int var_r28 = dComIfGp_event_moveApproval(actor);
if ((var_r28 == 2 || (!fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) &&
(!fopAcM_CheckStatus(actor, fopAcStts_CULL_e) || !fopAcM_cullingCheck(actor)))) &&
!fopAcM_CheckStatus(actor, 0x21000000))
!fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20000000_e | fopAcStts_NODRAW_e))
{
fopAcM_OffCondition(actor, fopAcCnd_NODRAW_e);
@@ -320,9 +320,9 @@ static int fopAc_Execute(void* i_this) {
daSus_c::check(actor);
actor->eventInfo.beforeProc();
s32 move = dComIfGp_event_moveApproval(actor);
fopAcM_OffStatus(actor, 0x40000000);
fopAcM_OffStatus(actor, fopAcStts_UNK_0x40000000_e);
if (!fopAcM_CheckStatus(actor, 0x20000000) &&
if (!fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20000000_e) &&
(move == 2 ||
(move != 0 && !fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) &&
(!fopAcM_CheckStatus(actor, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e)))))
@@ -345,7 +345,7 @@ static int fopAc_Execute(void* i_this) {
fopAcM_OnCondition(actor, fopAcCnd_NOEXEC_e);
}
if (fopAcM_CheckStatus(actor, 0x20) &&
if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20_e) &&
actor->home.pos.y - actor->current.pos.y > 5000.0f)
{
fopAcM_delete(actor);
@@ -385,7 +385,7 @@ static int fopAc_IsDelete(void* i_this) {
#endif
ret = fpcMtd_IsDelete((process_method_class*)actor->sub_method, actor);
#if DEBUG
}
#endif
@@ -407,7 +407,7 @@ static int fopAc_Delete(void* i_this) {
#endif
ret = fpcMtd_Delete((process_method_class*)actor->sub_method, actor);
#if DEBUG
}
#endif
@@ -533,13 +533,13 @@ static int fopAc_Create(void* i_this) {
#endif
ret = fpcMtd_Create((process_method_class*)actor->sub_method, actor);
#if DEBUG
}
fopAcM_assert(1113, actor, fopAcM_CheckCondition(actor, fopAcCnd_INIT_e), "fopAcM_ct No Call !!");
#endif
if (ret == cPhs_COMPLEATE_e) {
fopDwTg_ToDrawQ(&actor->draw_tag, fpcM_DrawPriority(actor));
} else if (ret == cPhs_ERROR_e) {