mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-17 22:12:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

ChkBit comments and enum work (#2571)

Browse Source 
* Jagar cleanup

* saru work

* e_fm work

* gob enum added

* gob cleanup

* gob anm enums

* dComIfGs_isEventBit comments added

* More bit work and besu enum work

* Maybe fixed the issue?
This commit is contained in:
Carco_21
2025-08-08 14:39:26 -04:00
committed by GitHub
parent 7df70ce3ca
commit 427643edd2
114 changed files with 2680 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_fm.cpp
+31 -16
View File
@@ -1729,7 +1729,8 @@ static void demo_camera(e_fm_class* i_this) {
if (i_this->mDemoCamTimer == VREG_S(3) + 110) {
i_this->mDemoCamMode = 100;
dComIfGs_onStageBossEnemy();
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[64]);
/* dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[64]);
}
break;
}
@@ -1810,10 +1811,12 @@ static s8 e_fm_down(e_fm_class* i_this) {
i_this->mMode = 2;
i_this->mTimers[0] = 33;
i_this->mTimers[1] = l_HIO.field_0x9c;
/* dSv_event_flag_c::F_0256 - For E3 2006 - Knocked down boss at leased once */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[256]);
}
break;
case 2:
/* dSv_event_flag_c::F_0257 - For E3 2006 - Only ON when boss is in hollow state (normally off, changes in real time) */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[257]);
if (i_this->mAnm == BCK_FM_DOWNDAMAGE && i_this->mpFmModelMorf->isStop()) {
@@ -2142,9 +2145,11 @@ static void damage_check(e_fm_class* i_this) {
}
i_this->mSound.startCreatureVoice(Z2SE_EN_FM_V_DAMAGE, -1);
/* dSv_event_flag_c::F_0670 - Goron Mines - Hitting knocked-down Fyrus */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[670]);
} else {
i_this->field_0x804++;
/* dSv_event_flag_c::F_0254 - For E3 2006 - Hit boss's weak spot at least once */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[254]);
if (i_this->field_0x804 >= 10) {
@@ -2508,6 +2513,7 @@ static void chain_control3(e_fm_class* i_this, chain_s* i_chain_s, int param_2)
}
i_chain_s->field_0x617e = 0;
/* dSv_event_flag_c::F_0669 - Goron Mines - Pulled on Fyrus chains at least once */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[669]);
}
}
@@ -2579,8 +2585,10 @@ static void action(e_fm_class* i_this) {
i_this->field_0x1b07c = 1;
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[255]);
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[257]);
/* dSv_event_flag_c::F_0255 - For E3 2006 - Boss exhausted (grabbing chains) only on during state (normally off) */
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[255]);
/* dSv_event_flag_c::F_0257 - For E3 2006 - Only ON when boss is in hollow state (normally off, changes in real time) */
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[257]);
switch (i_this->mAction) {
case ACTION_NORMAL:
@@ -2601,7 +2609,8 @@ static void action(e_fm_class* i_this) {
break;
case ACTION_DAMAGE_RUN:
e_fm_damage_run(i_this);
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[255]);
/* dSv_event_flag_c::F_0255 - For E3 2006 - Boss exhausted (grabbing chains) only on during state (normally off) */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[255]);
break;
case ACTION_ANIMAL:
e_fm_animal(i_this);
@@ -3460,7 +3469,8 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DModelData* modelData;
e_fm_class* a_this = (e_fm_class*)i_this;
a_this->mpFmModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_fm", BMDR_FM), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_fm", BCK_FM_WAIT01), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
a_this->mpFmModelMorf = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_fm", BCK_FM_WAIT01)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpFmModelMorf == NULL || a_this->mpFmModelMorf->getModel() == NULL) {
return 0;
}
@@ -3491,7 +3501,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
BRK_FM, BRK_FM_ATTACK, BRK_FM_PUTOUT, BRK_FM_PUTOUTWAIT, BRK_FM_ANIMAL02,
BRK_FM_OPDEMO, BRK_FM_HANGWAIT, BRK_FM_DEMOEND01, BRK_FM_DEMOEND02
};
if (!a_this->mpFmBrk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_fm", brk[i]), 1, anm_mode, 1.0f, 0, -1)) {
if (!a_this->mpFmBrk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("E_fm", brk[i])), 1, anm_mode, 1.0f, 0, -1)) {
return 0;
}
@@ -3504,12 +3514,13 @@ static int useHeapInit(fopAc_ac_c* i_this) {
BTK_FM, BTK_FM_ATTACK, BTK_FM_PUTOUT, BTK_FM_PUTOUTWAIT, BTK_FM_ANIMAL02,
BTK_FM_OPDEMO, BTK_FM_HANGWAIT, BTK_FM_DEMOEND01, BTK_FM_DEMOEND02
};
if (!a_this->mpFmBtk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_fm", btk[i]), 1, anm_mode, 1.0f, 0, -1)) {
if (!a_this->mpFmBtk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("E_fm", btk[i])), 1, anm_mode, 1.0f, 0, -1)) {
return 0;
}
}
a_this->mpDemoFmModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_fm", BMDR_FM), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_fm", BCK_FM_DEMOEND03), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
a_this->mpDemoFmModelMorf = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_fm", BCK_FM_DEMOEND03)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpDemoFmModelMorf == NULL || a_this->mpDemoFmModelMorf->getModel() == NULL) {
return 0;
}
@@ -3519,11 +3530,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpDemoFmBrk->init(a_this->mpFmModelMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_fm", BRK_FM_DEMOEND03), 1, 0, 1.0f, 0, -1)) {
if (!a_this->mpDemoFmBrk->init(a_this->mpFmModelMorf->getModel()->getModelData(), static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("E_fm", BRK_FM_DEMOEND03)), 1, 0, 1.0f, 0, -1)) {
return 0;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("E_fm", BMDE_FM_CORE);
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDE_FM_CORE));
JUT_ASSERT(7257, modelData != 0);
a_this->mpCoreModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (a_this->mpCoreModel == NULL) {
@@ -3535,7 +3546,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpCoreBrk->init(a_this->mpCoreModel->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_fm", BRK_CORE_LIGHTON), 1, 2, 1.0f, 0, -1)) {
if (!a_this->mpCoreBrk->init(a_this->mpCoreModel->getModelData(), static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("E_fm", BRK_CORE_LIGHTON)), 1, 2, 1.0f, 0, -1)) {
return 0;
}
@@ -3544,7 +3555,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpCoreBtk->init(a_this->mpCoreModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_fm", BTK_CORE_BEAT), 1, 0, 1.0f, 0, -1)) {
if (!a_this->mpCoreBtk->init(a_this->mpCoreModel->getModelData(), static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("E_fm", BTK_CORE_BEAT)), 1, 0, 1.0f, 0, -1)) {
return 0;
}
@@ -3552,7 +3563,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
for (int i = 0; i < 2; i++) {
static int eff_bmd[] = {BMDR_EF_FMATTACK_A, BMDR_EF_FMATTACK_B};
a_this->mpAttackEfModelMorf[i] = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_fm", eff_bmd[i]), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
a_this->mpAttackEfModelMorf[i] = new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", eff_bmd[i])), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284);
if (a_this->mpAttackEfModelMorf[i] == NULL || a_this->mpAttackEfModelMorf[i]->getModel() == NULL) {
return 0;
}
@@ -3563,7 +3574,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpAttackEfBrk->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_fm", BRK_EF_FMATTACK_B), 1, 2, 1.0f, 0, -1)) {
if (!a_this->mpAttackEfBrk->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("E_fm", BRK_EF_FMATTACK_B)), 1, 2, 1.0f, 0, -1)) {
return 0;
}
}
@@ -3574,7 +3585,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
static int eff_btk[] = {BTK_EF_FMATTACK_A, BTK_EF_FMATTACK_B};
if (!a_this->mpAttackEfBtk[i]->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_fm", eff_btk[i]), 1, 2, 1.0f, 0, -1)) {
if (!a_this->mpAttackEfBtk[i]->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("E_fm", eff_btk[i])), 1, 2, 1.0f, 0, -1)) {
return 0;
}
}
@@ -3582,7 +3593,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_fm", BMDR_KUSARI);
JUT_ASSERT(7404, modelData != 0);
J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("E_fm", BMDR_HANDLE);
J3DModelData* modelData2 = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_HANDLE));
JUT_ASSERT(7408, modelData2 != 0);
for (int i = 0; i < 4; i++) {
@@ -3824,9 +3835,13 @@ static int daE_FM_Create(fopAc_ac_c* i_this) {
a_this->field_0x794 = 1.0f;
a_this->field_0x778 = 1.0f;
/* dSv_event_flag_c::F_0254 - For E3 2006 - Hit boss's weak spot at least once */
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[254]);
/* dSv_event_flag_c::F_0256 - For E3 2006 - Knocked down boss at leased once */
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[256]);
/* dSv_event_flag_c::F_0669 - Goron Mines - Pulled on Fyrus chains at least once */
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[669]);
/* dSv_event_flag_c::F_0670 - Goron Mines - Hitting knocked-down Fyrus */
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[670]);
demo_stop = 0;