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 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_npc_taro.cpp
+29 -29
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_npc_taro.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -463,7 +463,7 @@ int daNpc_Taro_c::createHeapCallBack(fopAc_ac_c* i_this) {
void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) {
if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) {
if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW) {
if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == fpcNm_ARROW_e) {
mFindActorPtrs[mFindCount] = (fopAc_ac_c*)param_1;
mFindCount++;
}
@@ -473,9 +473,9 @@ void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) {
void* daNpc_Taro_c::srchNpc(void* param_1, void* param_2) {
if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) {
if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) &&
(fopAcM_GetGroup((fopAc_ac_c*)param_1) == 4 ||
(fopAcM_GetName(param_1) == PROC_TAG_EVTAREA && ((daTag_EvtArea_c*)param_1)->getType() == 15))) {
if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) &&
(fopAcM_GetGroup((fopAc_ac_c*)param_1) == 4 ||
(fopAcM_GetName(param_1) == fpcNm_TAG_EVTAREA_e && ((daTag_EvtArea_c*)param_1)->getType() == 15))) {
mFindActorPtrs[mFindCount] = (fopAc_ac_c*)param_1;
mFindCount++;
}
@@ -944,7 +944,7 @@ void daNpc_Taro_c::action() {
setAction(mAction);
}
}
daTag_Push_c* pushTag = (daTag_Push_c*)field_0xba0.getActorP();
if (pushTag != NULL) {
switch (pushTag->getId()) {
@@ -959,9 +959,9 @@ void daNpc_Taro_c::action() {
}
void daNpc_Taro_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
}
if (checkHide() || mNoDraw) {
attention_info.flags = 0;
@@ -1116,7 +1116,7 @@ BOOL daNpc_Taro_c::selectAction() {
mAction = &daNpc_Taro_c::nurse;
break;
case TYPE_15:
// daNpcKakashi_chkSwdTutorialStage itself doesn't match when it returns bool
// daNpcKakashi_chkSwdTutorialStage itself doesn't match when it returns bool
if ((u8)daNpcKakashi_chkSwdTutorialStage()) {
mAction = &daNpc_Taro_c::swdTutorial;
} else {
@@ -1915,10 +1915,10 @@ int daNpc_Taro_c::cutGiveMeWoodSwd(int param_1) {
case 4:
case 5:
case 6:
case 8:
case 8:
{
switch(prm) {
case 5:
case 5:
case 8: {
fopAc_ac_c* actor_p = mActors[2].getActorP();
JUT_ASSERT(4405, NULL != actor_p);
@@ -1993,7 +1993,7 @@ int daNpc_Taro_c::cutGetWoodSwd(int param_1) {
if (pTimer != NULL) {
timer = *pTimer;
}
int* pSend = dComIfGp_evmng_getMyIntegerP(param_1, "send");
if (pSend != NULL) {
send = *pSend;
@@ -2272,7 +2272,7 @@ int daNpc_Taro_c::cutCacaricoConversation(int param_1) {
}
int msgNos[2] = {-1, -1};
switch (prm) {
case 0:
mJntAnm.lookPlayer(0);
@@ -2512,7 +2512,7 @@ int daNpc_Taro_c::cutCaution(int param_1) {
}
break;
}
return rv;
}
@@ -3261,7 +3261,7 @@ int daNpc_Taro_c::practice(void* param_0) {
break;
}
return 1;
}
@@ -3398,18 +3398,18 @@ static actor_method_class daNpc_Taro_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_TARO = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_TARO, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpc_Taro_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
367, // mPriority
&daNpc_Taro_MethodTable, // sub_method
0x00040107, // mStatus
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_TARO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Taro_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_TARO_e,
/* Actor SubMtd */ &daNpc_Taro_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};