mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 20:57:46 -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_e_ymb.cpp
+28 -28
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_e_ymb.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -301,7 +301,7 @@ int daE_YMB_c::JointCallBack(J3DJoint* i_joint, int param_2) {
}
static void rideCallBack(dBgW* param_1, fopAc_ac_c* aActor_p, fopAc_ac_c* param_3) {
if (fopAcM_GetName(param_3) == PROC_ALINK) {
if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) {
((daE_YMB_c*)aActor_p)->field_0x724 = 20;
}
}
@@ -362,8 +362,8 @@ int daE_YMB_c::draw() {
cXyz sp58;
sp58.set(current.pos.x, current.pos.y + 100.0f, current.pos.z);
tevStr.field_0x344 = (tevStr.field_0x344 * field_0x6d8) / 255.0f;
mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp58, 2500.0f, 0.0f,
current.pos.y, field_0x6d4, mGndChk, &tevStr, 0,
mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp58, 2500.0f, 0.0f,
current.pos.y, field_0x6d4, mGndChk, &tevStr, 0,
1.0f, dDlst_shadowControl_c::getSimpleTex());
return 1;
@@ -762,7 +762,7 @@ void daE_YMB_c::setDeathEffect() {
}
static void* search_drop(void* i_actor, void* i_data) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Drop) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Drop_e) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) {
u8 switchBit = ((daE_YMB_c*)i_data)->getSwitchBit();
if (switchBit == 0xFF) {
@@ -1075,7 +1075,7 @@ void daE_YMB_c::executeFlyAttack() {
if (field_0x1324.ChkAtHit()) {
actor = dCc_GetAc(field_0x1324.GetAtHitObj()->GetAc());
if (fopAcM_GetName(actor) == PROC_ALINK) {
if (fopAcM_GetName(actor) == fpcNm_ALINK_e) {
field_0x6fc = 30;
speed.y = 0.0f;
speedF = 0.0f;
@@ -1595,7 +1595,7 @@ void daE_YMB_c::executeWaterJump() {
case 5:
mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1);
if (field_0x6fc == 0 && cLib_chaseF(&speed.y, 0.0f, 3.0f) != 0 && mpModelMorf->isStop()) {
setActionMode(1, 1);
}
@@ -1694,7 +1694,7 @@ void daE_YMB_c::executeDamage() {
if (!(u8)checkBck(BCK_YB_FLY_WAIT)) {
cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY(&current.pos, &YMB_DOWN_POS[field_0x711]) + 0x8000, 8, 0x200, 0x80);
}
if (field_0x6fc == 0) {
cLib_chaseF(&speed.y, 0.0f, 5.0f);
}
@@ -2055,7 +2055,7 @@ void daE_YMB_c::setCreateDrop() {
mDoMtx_stack_c::multVecZero(&sp1c);
drop->setPos(sp1c);
drop->setAppear();
fopAcM_OnStatus(drop, fopAcM_STATUS_UNK_0x4000);
fopAcM_OnStatus(drop, fopAcStts_UNK_0x4000_e);
}
field_0x721 = 1;
@@ -2155,7 +2155,7 @@ void daE_YMB_c::executeDeath() {
case 4:
cLib_chaseF(&field_0x75c, -5.0f, 1.0f);
mDemoCamCenter.y += field_0x75c;
camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0);
if (field_0x6fc == 0) {
@@ -2475,7 +2475,7 @@ void daE_YMB_c::executeStartDemo() {
if (field_0x6fc >= 95) {
setBoilEffect(1);
if (field_0x6fc == 95) {
dComIfGp_getVibration().StopQuake(31);
}
@@ -2940,7 +2940,7 @@ void daE_YMB_c::setAttentionPos() {
if (field_0x6f4 == 0) {
mDoMtx_stack_c::copy(model->getAnmMtx(1));
if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_WOLF_JUMP || mAction == 7) {
mDoMtx_stack_c::transM(200.0f, 50.0f, 0.0f);
} else {
@@ -2981,7 +2981,7 @@ void daE_YMB_c::setAttentionPos() {
void daE_YMB_c::cc_set() {
cXyz sp28;
J3DModel* model = mpModelMorf->getModel();
setAttentionPos();
mDoMtx_stack_c::copy(model->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&sp28);
@@ -3147,7 +3147,7 @@ int daE_YMB_c::CreateHeap() {
}
mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
return 1;
}
@@ -3246,18 +3246,18 @@ static actor_method_class l_daE_YMB_Method = {
};
actor_process_profile_definition g_profile_E_YMB = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_YMB, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_YMB_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
196, // mPriority
&l_daE_YMB_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_YMB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_YMB_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_YMB_e,
/* Actor SubMtd */ &l_daE_YMB_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};