mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -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_theB.cpp
+32 -32
View File
@@ -146,7 +146,7 @@ daNpcTheB_HIO_c::daNpcTheB_HIO_c() {
void daNpcTheB_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
char buffer[2000];
JORReflexible::listenPropertyEvent(event);
JORFile jorFile;
@@ -283,7 +283,7 @@ cPhs_Step daNpcTheB_c::create() {
}
return phase;
}
int daNpcTheB_c::CreateHeap() {
@@ -614,7 +614,7 @@ bool daNpcTheB_c::setExpressionAnm(int i_idx, bool i_modify) {
}
bool res = false;
switch (i_idx) {
case ANM_NONE:
res = setExpressionBtp(EXPR_BTP_THEB);
@@ -730,11 +730,11 @@ void daNpcTheB_c::setMotionAnm(int i_idx, f32 i_morf) {
case ANM_WHIP:
case ANM_WHIP_B:
break;
case ANM_SIT_B:
setExpressionAnm(ANM_FH_TALK_B, true);
break;
case ANM_BEND_WAIT:
setExpressionAnm(ANM_FH_BEND_WAIT, true);
break;
@@ -774,7 +774,7 @@ void daNpcTheB_c::reset() {
initialize();
if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
}
mpMatAnm->initialize();
@@ -880,7 +880,7 @@ BOOL daNpcTheB_c::doEvent() {
e_wb_class* wb_p;
BOOL rv = FALSE;
s32 staffId;
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (chkAction(&daNpcTheB_c::talk)) {
@@ -890,7 +890,7 @@ BOOL daNpcTheB_c::doEvent() {
fopAc_ac_c* actor_p = fopAcM_SearchByID(parentActorID);
if (actor_p != NULL) {
fopAcM_OnStatus(actor_p, fopAcM_STATUS_UNK_0x800);
fopAcM_OnStatus(actor_p, fopAcStts_STAFF_EXTRA_e);
}
}
@@ -901,10 +901,10 @@ BOOL daNpcTheB_c::doEvent() {
if (staffId != -1) {
mStaffID = staffId;
JUT_ASSERT(1357, NULL != mEvtSeqList[mOrderEvtNo]);
actor_p = fopAcM_SearchByID(parentActorID);
if (actor_p != NULL) {
fopAcM_OnStatus(actor_p, fopAcM_STATUS_UNK_0x800);
fopAcM_OnStatus(actor_p, fopAcStts_STAFF_EXTRA_e);
}
if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) {
@@ -917,7 +917,7 @@ BOOL daNpcTheB_c::doEvent() {
EvCut_PersonalCombatAfter();
rv = TRUE;
} else {
wb_p = (e_wb_class*)fopAcM_SearchByName(PROC_E_WB);
wb_p = (e_wb_class*)fopAcM_SearchByName(fpcNm_E_WB_e);
if (wb_p->field_0x169e == 0x60 && wb_p->field_0x16a0 == 1) {
mPersonalCombatAfterFlag = 1;
EvCut_PersonalCombatAfter();
@@ -931,7 +931,7 @@ BOOL daNpcTheB_c::doEvent() {
default:
break;
}
dComIfGp_event_reset();
mOrderEvtNo = EVT_NONE;
mEventIdx = -1;
@@ -970,7 +970,7 @@ void daNpcTheB_c::lookat() {
switch (mLookMode) {
case LOOK_NONE:
break;
case LOOK_RESET:
case LOOK_PLAYER:
player = daPy_getPlayerActorClass();
@@ -1054,7 +1054,7 @@ int daNpcTheB_c::wait(void* param_1) {
mTurnMode = 0;
mMode = 2;
break;
case 2: {
bool bVar1 = mActorMngrs[0].getActorP() != NULL;
@@ -1138,11 +1138,11 @@ int daNpcTheB_c::talk(void* param_1) {
mTurnMode = 0;
mMode = 2;
break;
case 2:
if (talkProc(NULL, TRUE, NULL)) {
field_0x9ec = false;
if (!field_0x9ec) {
dComIfGp_event_reset();
}
@@ -1402,7 +1402,7 @@ void daNpcTheB_c::EvCut_PersonalCombatAfter() {
int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(PROC_START_AND_GOAL);
daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(fpcNm_START_AND_GOAL_e);
if (startAndGoal_p == NULL) {
return 0;
@@ -1517,7 +1517,7 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) {
}
case '0003':
((daCoach2D_c*)fpcM_SearchByName(PROC_COACH2D))->hide();
((daCoach2D_c*)fpcM_SearchByName(fpcNm_COACH2D_e))->hide();
break;
case '0004':
@@ -1576,18 +1576,18 @@ static actor_method_class daNpcTheB_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_THEB = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_THEB, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpcTheB_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
331, // mPriority
&daNpcTheB_MethodTable, // sub_method
0x00040108, // mStatus
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_THEB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpcTheB_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_THEB_e,
/* Actor SubMtd */ &daNpcTheB_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};