mirror
/
tww
mirror of https://github.com/zeldaret/tww
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_gnnbtltaki OK (#887) 

* d_a_obj_gnnbtltaki OK

* d_a_obj_gnnbtltaki Cleanup

* set d_a_obj_gnnbtltaki as matching.

* d_a_obj_gnnbtltaki OK for GZLJ01, GZLE01, GZLP01

* Update d_a_obj_gnnbtltaki.cpp

* d_a_obj_gnnbtltaki Retail and Demo OK
This commit is contained in:
Kristopher Early 2025-11-11 07:49:10 +00:00 committed by GitHub
parent e7b951841e
commit 2c7dbdc59d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 121 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1691,7 +1691,7 @@ config.libs = [
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ganonbed"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gaship"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gaship2"),
ActorRel(NonMatching, "d_a_obj_gnnbtltaki"),
ActorRel(Matching, "d_a_obj_gnnbtltaki"),
ActorRel(NonMatching, "d_a_obj_gnndemotakie"),
ActorRel(NonMatching, "d_a_obj_gnndemotakis"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gong"),

11
include/d/actor/d_a_obj_gnnbtltaki.h
View File

@ -5,16 +5,21 @@
class daObjGnnbtaki_c : public fopAc_ac_c {
public:
void solidHeapCB(fopAc_ac_c*);
void create_heap();
static BOOL solidHeapCB(fopAc_ac_c*);
BOOL create_heap();
cPhs_State _create();
bool _delete();
void init_mtx();
bool _execute();
bool _draw();
static const char M_arcname[];
public:
/* Place member variables here */
/* 0x290 */ J3DModel* mJ3DModel;
/* 0x294 */ request_of_phase_process_class mPhase;
/* 0x29C */ mDoExt_btkAnm mBtkAnm;
/* 0x2B0 */ u8 field_0x2B0;
/* 0x2B1 */ u8 field_0x2B1;
};
#endif /* D_A_OBJ_GNNBTLTAKI_H */

149
src/d/actor/d_a_obj_gnnbtltaki.cpp
View File

@ -2,80 +2,155 @@
* d_a_obj_gnnbtltaki.cpp
* Object - Ganondorf Fight - Background waterfalls (during fight)
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_gnnbtltaki.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_kamome.h"
const char daObjGnnbtaki_c::M_arcname[] = "Gnnbtltaki";
/* 00000078-00000098 .text solidHeapCB__15daObjGnnbtaki_cFP10fopAc_ac_c */
void daObjGnnbtaki_c::solidHeapCB(fopAc_ac_c*) {
/* Nonmatching */
BOOL daObjGnnbtaki_c::solidHeapCB(fopAc_ac_c *i_this) {
daObjGnnbtaki_c *a_this = (daObjGnnbtaki_c *) i_this;
return a_this->create_heap();
}
/* 00000098-000001F4 .text create_heap__15daObjGnnbtaki_cFv */
void daObjGnnbtaki_c::create_heap() {
/* Nonmatching */
BOOL daObjGnnbtaki_c::create_heap() {
#if VERSION == VERSION_DEMO
J3DModelData* mdl_data;
J3DAnmTextureSRTKey* btk_data;
BOOL ret = FALSE;
mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, 4);
#else
BOOL ret = FALSE;
J3DModelData *mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, 4));
#endif
JUT_ASSERT(0x5A, mdl_data != NULL);
if (mdl_data != NULL) {
mJ3DModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
if (mJ3DModel != NULL) {
#if VERSION == VERSION_DEMO
btk_data = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(M_arcname, 7);
#else
J3DAnmTextureSRTKey *btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, 7));
#endif
JUT_ASSERT(0x61, btk_data != NULL);
if (btk_data != NULL) {
if (mBtkAnm.init(mdl_data, btk_data, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0, 0, -1, false, FALSE)) {
ret = TRUE;
}
}
}
}
return ret;
}
/* 000001F4-00000348 .text _create__15daObjGnnbtaki_cFv */
cPhs_State daObjGnnbtaki_c::_create() {
/* Nonmatching */
fopAcM_SetupActor(this, daObjGnnbtaki_c);
cPhs_State state = dComIfG_resLoad(&mPhase, M_arcname);
if (state == cPhs_COMPLEATE_e) {
state = cPhs_ERROR_e;
if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) {
field_0x2B1 = base.mParameters & 0xF;
if (field_0x2B1 == 0xF) {
field_0x2B1 = 0;
}
cullMtx = mJ3DModel->getBaseTRMtx();
init_mtx();
mBtkAnm.getFrameCtrl()->setFrame(mBtkAnm.getStartFrame());
if (field_0x2B1 == 1) {
mBtkAnm.setPlaySpeed(0.0);
field_0x2B0 = 0;
} else {
mBtkAnm.setPlaySpeed(1.0);
field_0x2B0 = 1;
}
state = cPhs_COMPLEATE_e;
}
}
return state;
}
/* 000003EC-0000041C .text _delete__15daObjGnnbtaki_cFv */
bool daObjGnnbtaki_c::_delete() {
/* Nonmatching */
#if VERSION == VERSION_DEMO
dComIfG_deleteObjectRes(M_arcname);
#else
dComIfG_resDelete(&mPhase, M_arcname);
#endif
return true;
}
/* 0000041C-0000043C .text init_mtx__15daObjGnnbtaki_cFv */
void daObjGnnbtaki_c::init_mtx() {
/* Nonmatching */
mJ3DModel->setBaseScale(scale);
}
/* 0000043C-00000548 .text _execute__15daObjGnnbtaki_cFv */
bool daObjGnnbtaki_c::_execute() {
/* Nonmatching */
if (field_0x2B1 == 1 &&
!strcmp(dComIfGp_getStartStageName(), "GTower") &&
dComIfGp_event_runCheck() != FALSE &&
dComIfGp_evmng_startCheck("g2before") &&
dComIfGp_demo_get() != NULL &&
field_0x2B0 == 0 &&
dComIfGp_demo_get()->getFrameNoMsg() >= 0x126F) {
f32 startFrame = mBtkAnm.getStartFrame();
mBtkAnm.setFrame(startFrame);
mBtkAnm.setPlaySpeed(1.0f);
field_0x2B0 = 1;
}
mBtkAnm.play();
return true;
}
/* 00000548-000005CC .text _draw__15daObjGnnbtaki_cFv */
bool daObjGnnbtaki_c::_draw() {
/* Nonmatching */
if (field_0x2B0 != NULL) {
g_env_light.settingTevStruct(TEV_TYPE_BG3, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mJ3DModel, &tevStr);
mBtkAnm.entry(mJ3DModel->getModelData());
mDoExt_modelUpdateDL(mJ3DModel);
}
return true;
}
namespace {
/* 000005CC-000005EC .text Mthd_Create__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
cPhs_State Mthd_Create(void* i_this) {
return ((daObjGnnbtaki_c*)i_this)->_create();
}
/* 000005CC-000005EC .text Mthd_Create__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
cPhs_State Mthd_Create(void *i_this) {
return ((daObjGnnbtaki_c *) i_this)->_create();
}
/* 000005EC-00000610 .text Mthd_Delete__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_Delete(void* i_this) {
return ((daObjGnnbtaki_c*)i_this)->_delete();
}
/* 000005EC-00000610 .text Mthd_Delete__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_Delete(void *i_this) {
return ((daObjGnnbtaki_c *) i_this)->_delete();
}
/* 00000610-00000634 .text Mthd_Execute__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_Execute(void* i_this) {
return ((daObjGnnbtaki_c*)i_this)->_execute();
}
/* 00000610-00000634 .text Mthd_Execute__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_Execute(void *i_this) {
return ((daObjGnnbtaki_c *) i_this)->_execute();
}
/* 00000634-00000658 .text Mthd_Draw__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_Draw(void* i_this) {
return ((daObjGnnbtaki_c*)i_this)->_draw();
}
/* 00000634-00000658 .text Mthd_Draw__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_Draw(void *i_this) {
return ((daObjGnnbtaki_c *) i_this)->_draw();
}
/* 00000658-00000660 .text Mthd_IsDelete__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_IsDelete(void*) {
return TRUE;
}
/* 00000658-00000660 .text Mthd_IsDelete__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */
BOOL Mthd_IsDelete(void *) {
return TRUE;
}
static actor_method_class Gnnbtaki_Mthd_Table = {
(process_method_func)Mthd_Create,
(process_method_func)Mthd_Delete,
(process_method_func)Mthd_Execute,
(process_method_func)Mthd_IsDelete,
(process_method_func)Mthd_Draw,
};
static actor_method_class Gnnbtaki_Mthd_Table = {
(process_method_func) Mthd_Create,
(process_method_func) Mthd_Delete,
(process_method_func) Mthd_Execute,
(process_method_func) Mthd_IsDelete,
(process_method_func) Mthd_Draw,
};
}; // namespace
actor_process_profile_definition g_profile_Obj_Gnnbtaki = {