mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_fm and d_a_e_hzelda OK (#2657)

Browse Source 
Closes #598, Closes #541
This commit is contained in:
YunataSavior
2025-09-14 00:58:12 -07:00
committed by GitHub
parent 475234e08d
commit bafa5b8bdd
5 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_fm.cpp
+23 -10
View File
@@ -3520,7 +3520,6 @@ static int daE_FM_Delete(e_fm_class* i_this) {
/* 804F8CE8-804F95CC 009CE8 08E4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* i_this) {
// NONMATCHING - REGALLOC
J3DModelData* modelData;
e_fm_class* a_this = (e_fm_class*)i_this;
@@ -3556,7 +3555,9 @@ 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(), static_cast<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) == FALSE) {
return 0;
}
@@ -3569,7 +3570,9 @@ 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(), static_cast<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) == FALSE) {
return 0;
}
}
@@ -3585,7 +3588,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
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)) {
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) == FALSE) {
return 0;
}
@@ -3601,7 +3606,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
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)) {
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) == FALSE) {
return 0;
}
@@ -3610,7 +3617,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
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)) {
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) == FALSE) {
return 0;
}
@@ -3629,7 +3638,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
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)) {
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) == FALSE) {
return 0;
}
}
@@ -3640,12 +3651,14 @@ 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(), static_cast<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) == FALSE) {
return 0;
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes("E_fm", BMDR_KUSARI);
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_KUSARI));
JUT_ASSERT(7404, modelData != 0);
J3DModelData* modelData2 = static_cast<J3DModelData*>(dComIfG_getObjectRes("E_fm", BMDR_HANDLE));
@@ -3663,7 +3676,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
dKy_tevstr_init(&a_this->mChain[i].tevstr[j], fopAcM_GetRoomNo(i_this), 0xFF);
dKy_tevstr_init(&a_this->mChain[i].tevstr[j], (int) fopAcM_GetRoomNo(i_this), 0xFF);
}
a_this->mChain[i].field_0x61d0 = 26;
src/d/actor/d_a_e_hzelda.cpp
+10 -7
View File
@@ -1334,12 +1334,12 @@ static int daE_HZELDA_Delete(e_hzelda_class* i_this) {
}
/* 806F47C4-806F4AD4 003B64 0310+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
// NONMATCHING - equivalent. r30/r31 regswap
static int useHeapInit(fopAc_ac_c* i_this) {
e_hzelda_class* a_this = (e_hzelda_class*)i_this;
J3DModelData* modelData;
a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("Hzelda", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Hzelda", 0x15), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000284);
a_this->mpModelMorf = new mDoExt_McaMorfSO(static_cast<J3DModelData*>(dComIfG_getObjectRes("Hzelda", 0x1B)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Hzelda", 0x15)),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000284);
if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) {
return 0;
}
@@ -1351,14 +1351,14 @@ static int useHeapInit(fopAc_ac_c* i_this) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Hzelda", 0x1C);
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Hzelda", 0x1C));
JUT_ASSERT(2129, modelData != 0);
a_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (a_this->mpSwordModel == NULL) {
return 0;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Hzelda", 0x1A);
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Hzelda", 0x1A));
JUT_ASSERT(2149, modelData != 0);
a_this->mpTriangleAtModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
if (a_this->mpTriangleAtModel == NULL) {
@@ -1370,7 +1370,8 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpTriangleAtBrk->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hzelda", 0x1F), TRUE, 2, 1.0f, 0, -1)) {
if (a_this->mpTriangleAtBrk->init(modelData, static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Hzelda", 0x1F)),
TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == FALSE) {
return 0;
}
@@ -1379,7 +1380,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpTriangleAtBtk->init(a_this->mpTriangleAtModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Hzelda", 0x23), TRUE, 2, 1.0f, 0, -1)) {
if (a_this->mpTriangleAtBtk->init(a_this->mpTriangleAtModel->getModelData(),
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Hzelda", 0x23)),
TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == FALSE) {
return 0;
}