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

d_a_obj_ganonwall matching (#2346) 

* d_a_obj_ganonwall matching

* applied suggestions

* Rework l_idx into 2d array
This commit is contained in:
Sam Chaturvedi 2025-03-24 20:01:39 -04:00 committed by GitHub
parent c33ddb3ac1
commit acad3dba2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 156 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1892,7 +1892,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_food"),
ActorRel(NonMatching, "d_a_obj_fw"),
ActorRel(NonMatching, "d_a_obj_gadget"),
ActorRel(NonMatching, "d_a_obj_ganonwall"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ganonwall"),
ActorRel(NonMatching, "d_a_obj_ganonwall2"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_gb"),
ActorRel(NonMatching, "d_a_obj_geyser"),

7
include/d/actor/d_a_obj_ganonwall.h
View File

@ -1,7 +1,6 @@
#ifndef D_A_OBJ_GANONWALL_H
#define D_A_OBJ_GANONWALL_H
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
/**
@ -31,9 +30,9 @@ private:
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x578 */ u16 field_0x578;
/* 0x57A */ u16 field_0x57a;
/* 0x57C */ s16 field_0x57c;
/* 0x578 */ u16 mEventBit1;
/* 0x57A */ u16 mEventBit2;
/* 0x57C */ u16 mMatIdx;
};
STATIC_ASSERT(sizeof(daObjGWall_c) == 0x580);

339
src/d/actor/d_a_obj_ganonwall.cpp
View File

@ -4,95 +4,23 @@
*/
#include "d/actor/d_a_obj_ganonwall.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static void CheckCreateHeap__FP10fopAc_ac_c();
extern "C" void initBaseMtx__12daObjGWall_cFv();
extern "C" void setBaseMtx__12daObjGWall_cFv();
extern "C" void Create__12daObjGWall_cFv();
extern "C" void CreateHeap__12daObjGWall_cFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" void create__12daObjGWall_cFv();
extern "C" void execute__12daObjGWall_cFv();
extern "C" void checkDraw__12daObjGWall_cFv();
extern "C" void draw__12daObjGWall_cFv();
extern "C" void _delete__12daObjGWall_cFv();
extern "C" static void daObjGWall_Draw__FP12daObjGWall_c();
extern "C" static void daObjGWall_Execute__FP12daObjGWall_c();
extern "C" static void daObjGWall_Delete__FP12daObjGWall_c();
extern "C" static void daObjGWall_Create__FP12daObjGWall_c();
extern "C" extern char const* const d_a_obj_ganonwall__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void dKy_getdaytime_hour__Fv();
extern "C" void dKy_getdaytime_minute__Fv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void getName__10JUTNameTabCFUs();
extern "C" void init__12J3DFrameCtrlFs();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
//
// Declarations:
//
/* 80BF4CF8-80BF4D18 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */
static int CheckCreateHeap(fopAc_ac_c* i_this) {
// NONMATCHING
}
/* 80BF4D18-80BF4D54 000098 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjGWall_cFv */
void daObjGWall_c::initBaseMtx() {
// NONMATCHING
}
/* 80BF4D54-80BF4DA8 0000D4 0054+00 1/1 0/0 0/0 .text setBaseMtx__12daObjGWall_cFv */
void daObjGWall_c::setBaseMtx() {
// NONMATCHING
}
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
/* ############################################################################################## */
/* 80BF55EC-80BF564C 000000 0060+00 1/1 0/0 0/0 .rodata l_idx */
SECTION_RODATA static u8 const l_idx[96] = {
0x17, 0x05, 0x06, 0x01, 0x17, 0x05, 0x06, 0x02, 0x17, 0x05, 0x06, 0x03, 0x17, 0x05, 0x06, 0x04,
0x17, 0x05, 0x06, 0x05, 0x05, 0x06, 0x01, 0x00, 0x06, 0x0B, 0x05, 0x00, 0x06, 0x0B, 0x05, 0x01,
0x06, 0x0B, 0x05, 0x02, 0x06, 0x0B, 0x05, 0x03, 0x06, 0x0B, 0x05, 0x04, 0x0B, 0x11, 0x06, 0x00,
0x0B, 0x11, 0x06, 0x01, 0x0B, 0x11, 0x06, 0x02, 0x0B, 0x11, 0x06, 0x03, 0x0B, 0x11, 0x06, 0x04,
0x0B, 0x11, 0x06, 0x05, 0x11, 0x13, 0x02, 0x00, 0x11, 0x13, 0x02, 0x01, 0x13, 0x17, 0x04, 0x00,
0x13, 0x17, 0x04, 0x01, 0x13, 0x17, 0x04, 0x02, 0x13, 0x17, 0x04, 0x03, 0x17, 0x05, 0x06, 0x00,
static u8 const l_idx[24][4] = {
{0x17, 0x05, 0x06, 0x01}, {0x17, 0x05, 0x06, 0x02}, {0x17, 0x05, 0x06, 0x03},
{0x17, 0x05, 0x06, 0x04}, {0x17, 0x05, 0x06, 0x05}, {0x05, 0x06, 0x01, 0x00},
{0x06, 0x0B, 0x05, 0x00}, {0x06, 0x0B, 0x05, 0x01}, {0x06, 0x0B, 0x05, 0x02},
{0x06, 0x0B, 0x05, 0x03}, {0x06, 0x0B, 0x05, 0x04}, {0x0B, 0x11, 0x06, 0x00},
{0x0B, 0x11, 0x06, 0x01}, {0x0B, 0x11, 0x06, 0x02}, {0x0B, 0x11, 0x06, 0x03},
{0x0B, 0x11, 0x06, 0x04}, {0x0B, 0x11, 0x06, 0x05}, {0x11, 0x13, 0x02, 0x00},
{0x11, 0x13, 0x02, 0x01}, {0x13, 0x17, 0x04, 0x00}, {0x13, 0x17, 0x04, 0x01},
{0x13, 0x17, 0x04, 0x02}, {0x13, 0x17, 0x04, 0x03}, {0x17, 0x05, 0x06, 0x00},
};
COMPILER_STRIP_GATE(0x80BF55EC, &l_idx);
/* 80BF564C-80BF56AC 000060 0060+00 0/1 0/0 0/0 .rodata l_color */
#pragma push
#pragma force_active on
static const GXColor l_color[24] = {
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0x96, 0xFF},
@ -103,11 +31,6 @@ static const GXColor l_color[24] = {
{0xFF, 0xFF, 0xFF, 0xFF}, {0x78, 0x78, 0x78, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xB4, 0xB4, 0xB4, 0xFF},
};
#pragma pop
/* 80BF56AC-80BF56B0 0000C0 0004+00 1/1 0/0 0/0 .rodata @3681 */
SECTION_RODATA static f32 const lit_3681 = 1000000.0f;
COMPILER_STRIP_GATE(0x80BF56AC, &lit_3681);
/* 80BF56E4-80BF56E8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "Y_gwall";
@ -115,149 +38,191 @@ static char* l_arcName = "Y_gwall";
/* 80BF56E8-80BF56EC -00001 0004+00 1/1 0/0 0/0 .data l_matName */
static char* l_matName = "mat00";
/* 80BF4DA8-80BF4E8C 000128 00E4+00 1/1 0/0 0/0 .text Create__12daObjGWall_cFv */
int daObjGWall_c::Create() {
// NONMATCHING
/* 80BF4CF8-80BF4D18 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */
static int CheckCreateHeap(fopAc_ac_c* i_this) {
return static_cast<daObjGWall_c*>(i_this)->CreateHeap();
}
/* ############################################################################################## */
/* 80BF56B0-80BF56B4 0000C4 0004+00 1/1 0/0 0/0 .rodata @3711 */
SECTION_RODATA static f32 const lit_3711 = 1.0f;
COMPILER_STRIP_GATE(0x80BF56B0, &lit_3711);
/* 80BF4D18-80BF4D54 000098 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjGWall_cFv */
void daObjGWall_c::initBaseMtx() {
mpModel->setBaseScale(scale);
setBaseMtx();
}
/* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGWall_Method */
static actor_method_class l_daObjGWall_Method = {
(process_method_func)daObjGWall_Create__FP12daObjGWall_c,
(process_method_func)daObjGWall_Delete__FP12daObjGWall_c,
(process_method_func)daObjGWall_Execute__FP12daObjGWall_c,
0,
(process_method_func)daObjGWall_Draw__FP12daObjGWall_c,
};
/* 80BF4D54-80BF4DA8 0000D4 0054+00 1/1 0/0 0/0 .text setBaseMtx__12daObjGWall_cFv */
void daObjGWall_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(this->shape_angle.y);
MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx);
}
/* 80BF570C-80BF573C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GanonWall */
extern actor_process_profile_definition g_profile_Obj_GanonWall = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_GanonWall, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjGWall_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
570, // mPriority
&l_daObjGWall_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80BF573C-80BF5748 000058 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */
SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12J3DFrameCtrlFv,
};
/* 80BF4DA8-80BF4E8C 000128 00E4+00 1/1 0/0 0/0 .text Create__12daObjGWall_cFv */
int daObjGWall_c::Create() {
mEventBit1 = getEventBit1();
mEventBit2 = getEventBit2();
initBaseMtx();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
cullSizeFar = 1000000.f;
mMatIdx = 0xffff;
JUTNameTab* name_table = mpModel->mModelData->getMaterialTable().getMaterialName();
for (u16 i = 0; i < mpModel->mModelData->getMaterialTable().getMaterialNum(); i++) {
if (strcmp(name_table->getName(i), l_matName) == 0) {
mMatIdx = i;
}
}
execute();
return 1;
}
/* 80BF4E8C-80BF4FA8 00020C 011C+00 1/1 0/0 0/0 .text CreateHeap__12daObjGWall_cFv */
int daObjGWall_c::CreateHeap() {
// NONMATCHING
}
/* 80BF4FA8-80BF4FF0 000328 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */
// J3DFrameCtrl::~J3DFrameCtrl()
extern "C" void __dt__12J3DFrameCtrlFv() {
// NONMATCHING
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11000284);
if (mpModel == NULL) {
return 0;
}
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 7);
mpBtkAnm = new mDoExt_btkAnm();
if (mpBtkAnm == NULL ||
mpBtkAnm->init(&model_data->getMaterialTable(), btk, 1, 2, 1.0, 0, -1) == 0)
{
return 0;
}
return 1;
}
/* 80BF4FF0-80BF50A4 000370 00B4+00 1/1 0/0 0/0 .text create__12daObjGWall_cFv */
int daObjGWall_c::create() {
// NONMATCHING
fopAcM_SetupActor(this, daObjGWall_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x3500)) {
return cPhs_ERROR_e;
}
if (!Create()) {
return cPhs_ERROR_e;
}
}
return phase;
}
/* 80BF50A4-80BF50CC 000424 0028+00 2/2 0/0 0/0 .text execute__12daObjGWall_cFv */
int daObjGWall_c::execute() {
// NONMATCHING
mpBtkAnm->play();
return 1;
}
/* 80BF50CC-80BF5168 00044C 009C+00 1/1 0/0 0/0 .text checkDraw__12daObjGWall_cFv */
int daObjGWall_c::checkDraw() {
// NONMATCHING
if (mEventBit2 != 0x3ff && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2]) ||
mEventBit1 != 0x3ff && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1]))
{
return 0;
}
return 1;
}
/* ############################################################################################## */
/* 80BF56B4-80BF56B8 0000C8 0004+00 0/1 0/0 0/0 .rodata @3836 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3836 = 1000.0f;
COMPILER_STRIP_GATE(0x80BF56B4, &lit_3836);
#pragma pop
/* 80BF56B8-80BF56BC 0000CC 0004+00 0/1 0/0 0/0 .rodata @3837 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3837 = 250000.0f;
COMPILER_STRIP_GATE(0x80BF56B8, &lit_3837);
#pragma pop
/* 80BF56BC-80BF56C4 0000D0 0004+04 0/1 0/0 0/0 .rodata @3838 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3838[1 + 1 /* padding */] = {
60.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80BF56BC, &lit_3838);
#pragma pop
/* 80BF56C4-80BF56CC 0000D8 0008+00 0/1 0/0 0/0 .rodata @3840 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3840[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80BF56C4, &lit_3840);
#pragma pop
/* 80BF56CC-80BF56D4 0000E0 0008+00 0/1 0/0 0/0 .rodata @3842 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3842[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80BF56CC, &lit_3842);
#pragma pop
/* 80BF5168-80BF5530 0004E8 03C8+00 1/1 0/0 0/0 .text draw__12daObjGWall_cFv */
int daObjGWall_c::draw() {
// NONMATCHING
if (!checkDraw()) {
return 1;
}
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
mpBtkAnm->entry(mpModel->getModelData());
J3DModelData* model_data;
for (u16 i = 0;
model_data = mpModel->getModelData(), i < model_data->getMaterialTable().getMaterialNum();
i++)
{
J3DMaterial* mat = model_data->getMaterialTable().getMaterialNodePointer(i);
J3DFog* fog = mat->getPEBlock()->getFog();
if (fog != NULL) {
fog = mat->getPEBlock()->getFog();
fog->getFogInfo()->mColor.r = '\0';
fog->getFogInfo()->mColor.g = '\0';
fog->getFogInfo()->mColor.b = '\0';
fog->getFogInfo()->mStartZ = 1000.0f;
fog->getFogInfo()->mEndZ = 250000.0f;
}
}
int hour = dKy_getdaytime_hour();
float minute = dKy_getdaytime_minute();
J3DGXColor* mat_tev_k_color =
mpModel->mModelData->getMaterialTable().getMaterialNodePointer(mMatIdx)->getTevKColor(1);
int idx1 = l_idx[hour][0];
int idx2 = l_idx[hour][1];
mat_tev_k_color->r = (l_color[idx1].r +
(l_color[idx2].r - l_color[idx1].r) *
((minute + l_idx[hour][3] * 60.0f) / ((l_idx[hour][2] + 1) * 60.0f)));
mat_tev_k_color->g = (l_color[idx1].g +
(l_color[idx2].g - l_color[idx1].g) *
((minute + l_idx[hour][3] * 60.0f) / ((l_idx[hour][2] + 1) * 60.0f)));
mat_tev_k_color->b = (l_color[idx1].b +
(l_color[idx2].b - l_color[idx1].b) *
((minute + l_idx[hour][3] * 60.0f) / ((l_idx[hour][2] + 1) * 60.0f)));
mat_tev_k_color->a = (l_color[idx1].a +
(l_color[idx2].r - l_color[idx1].a) *
((minute + l_idx[hour][3] * 60.0f) / ((l_idx[hour][2] + 1) * 60.0f)));
mDoExt_modelUpdateDL(mpModel);
return 1;
}
/* 80BF5530-80BF5564 0008B0 0034+00 1/1 0/0 0/0 .text _delete__12daObjGWall_cFv */
int daObjGWall_c::_delete() {
// NONMATCHING
dComIfG_resDelete(&mPhaseReq, l_arcName);
return 1;
}
/* 80BF5564-80BF5584 0008E4 0020+00 1/0 0/0 0/0 .text daObjGWall_Draw__FP12daObjGWall_c
*/
static int daObjGWall_Draw(daObjGWall_c* i_this) {
// NONMATCHING
return i_this->draw();
}
/* 80BF5584-80BF55A4 000904 0020+00 1/0 0/0 0/0 .text daObjGWall_Execute__FP12daObjGWall_c */
static int daObjGWall_Execute(daObjGWall_c* i_this) {
// NONMATCHING
return i_this->execute();
}
/* 80BF55A4-80BF55C4 000924 0020+00 1/0 0/0 0/0 .text daObjGWall_Delete__FP12daObjGWall_c
*/
static int daObjGWall_Delete(daObjGWall_c* i_this) {
// NONMATCHING
return i_this->_delete();
}
/* 80BF55C4-80BF55E4 000944 0020+00 1/0 0/0 0/0 .text daObjGWall_Create__FP12daObjGWall_c
*/
static int daObjGWall_Create(daObjGWall_c* i_this) {
// NONMATCHING
return i_this->create();
}
/* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGWall_Method */
static actor_method_class l_daObjGWall_Method = {
(process_method_func)daObjGWall_Create, (process_method_func)daObjGWall_Delete,
(process_method_func)daObjGWall_Execute, 0,
(process_method_func)daObjGWall_Draw,
};
/* 80BF570C-80BF573C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GanonWall */
extern actor_process_profile_definition g_profile_Obj_GanonWall = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_GanonWall, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjGWall_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
570, // mPriority
&l_daObjGWall_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};