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

Link d_a_npc and d_a_npc_cd2 (#3019)

This commit is contained in:
Max Roncace 2026-01-05 06:58:09 -05:00 committed by GitHub
parent 22dc7a37db
commit e15ba03caa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 79 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.py
View File

@ -755,9 +755,9 @@ config.libs = [
Object(Equivalent, "d/actor/d_a_alink.cpp"), # weak func order, vtable order
Object(MatchingFor(ALL_GCN), "d/actor/d_a_itembase.cpp"),
Object(MatchingFor(ALL_GCN), "d/actor/d_a_no_chg_room.cpp"),
Object(Equivalent, "d/actor/d_a_npc.cpp"), # weak func order (daNpcF_MoveBgActor_c::Delete)
Object(MatchingFor(ALL_GCN), "d/actor/d_a_npc.cpp"),
Object(MatchingFor(ALL_GCN), "d/actor/d_a_npc_cd.cpp"),
Object(NonMatching, "d/actor/d_a_npc_cd2.cpp"), # stripped vtable order
Object(MatchingFor(ALL_GCN), "d/actor/d_a_npc_cd2.cpp"),
Object(MatchingFor(ALL_GCN), "d/actor/d_a_obj_item.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_insect.cpp"),
Object(MatchingFor(ALL_GCN), "d/actor/d_a_obj_ss_base.cpp"),

9
include/d/actor/d_a_npc4.h
View File

@ -409,6 +409,15 @@ public:
class daNpcF_MoveBgActor_c : public daNpcF_c {
private:
public:
// these functions are inferred based on daBaseNpc_moveBgActor_c -
// defining them in this order fixes weak function order for this class in d_a_npc
// (otherwise Delete is placed under Draw instead of under Create)
int MoveBGCreateHeap();
int MoveBGCreate();
int MoveBGDelete();
int MoveBGExecute();
int MoveBGDraw();
virtual bool CreateHeap() { return true; }
virtual bool Create() { return true; }
virtual bool Execute(Mtx**) { return true; }

21
src/d/actor/d_a_npc4.cpp
View File

@ -2137,6 +2137,27 @@ static void dummyVirtual() {
daNpcF_MoveBgActor_c dummy;
}
// see note in header, this fixes weak function order for daNpcF_MoveBgActor_c functions
int daNpcF_MoveBgActor_c::MoveBGCreateHeap() {
return CreateHeap();
}
int daNpcF_MoveBgActor_c::MoveBGCreate() {
return Create();
}
int daNpcF_MoveBgActor_c::MoveBGDelete() {
return Delete();
}
int daNpcF_MoveBgActor_c::MoveBGExecute() {
return Execute((Mtx**)NULL);
}
int daNpcF_MoveBgActor_c::MoveBGDraw() {
return Draw();
}
dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = {
{0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},

94
src/d/actor/d_a_npc_cd2.cpp
View File

@ -195,6 +195,53 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
}
};
static char* const* l_resNameTbl[30] = {
l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa,
l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2,
l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2,
l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2,
};
static anmTblPrm const l_bmdTbl[30] = {
l_resMANa[0], 3, l_resMADa[0], 3, l_resMCNa[0], 4, l_resMONa[0], 4, l_resMANb[0], 3,
l_resMANc[0], 4, l_resMASa[0], 4, l_resMBNa[0], 4, l_resMANa2[0], 4, l_resMADa2[0], 4,
l_resMCNa2[0], 4, l_resMONa2[0], 4, l_resMANb2[0], 3, l_resMANc2[0], 4, l_resMASa2[0], 4,
l_resMBNa2[0], 4, l_resWANa[0], 4, l_resWADa[0], 4, l_resMATa[0], 3, l_resWCNa[0], 4,
l_resWONa[0], 4, l_resWGNa[0], 4, l_resWANb[0], 4, l_resWANa2[0], 4, l_resWADa2[0], 4,
l_resMATa2[0], 3, l_resWCNa2[0], 4, l_resWONa2[0], 4, l_resWGNa2[0], 4, l_resWANb2[0], 4,
};
static anmTblPrm const l_bmdTWTbl[30] = {
l_resMANa[1], 3, l_resMADa[1], 3, l_resMCNa[1], 4, l_resMONa[1], 4, l_resMANb[1], 3,
l_resMANc[1], 4, l_resMASa[1], 4, l_resMBNa[1], 4, l_resMANa2[1], 4, l_resMADa2[1], 3,
l_resMCNa2[1], 4, l_resMONa2[1], 4, l_resMANb2[1], 3, l_resMANc2[1], 4, l_resMASa2[1], 4,
l_resMBNa2[1], 4, l_resWANa[1], 4, l_resWADa[1], 4, l_resMATa[1], 3, l_resWCNa[1], 4,
l_resWONa[1], 4, l_resWGNa[1], 4, l_resWANb[1], 4, l_resWANa2[1], 4, l_resWADa2[1], 4,
l_resMATa2[1], 3, l_resWCNa2[1], 4, l_resWONa2[1], 4, l_resWGNa2[1], 4, l_resWANb2[1], 4,
};
static anmTblPrm const l_btpTbl[30] = {
l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], 7, l_resMONa[0], 7, l_resMANb[0], -1,
l_resMANc[0], 7, l_resMASa[0], 7, l_resMBNa[0], 7, l_resMANa2[0], 7, l_resMADa2[0], 7,
l_resMCNa2[0], 7, l_resMONa2[0], 7, l_resMANb2[0], -1, l_resMANc2[0], 7, l_resMASa2[0], 7,
l_resMBNa2[0], 7, l_resWANa[0], 7, l_resWADa[0], 7, l_resMATa[0], -1, l_resWCNa[0], 7,
l_resWONa[0], 7, l_resWGNa[0], 7, l_resWANb[0], 7, l_resWANa2[0], 7, l_resWADa2[0], 7,
l_resMATa2[0], -1, l_resWCNa2[0], 7, l_resWONa2[0], 7, l_resWGNa2[0], 7, l_resWANb2[0], 7,
};
static anmTblPrm const l_btpTWTbl[30] = {
l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], 7, l_resMONa[1], 7, l_resMANb[1], -1,
l_resMANc[1], 7, l_resMASa[1], 7, l_resMBNa[1], 7, l_resMANa2[1], 7, l_resMADa2[1], -1,
l_resMCNa2[1], 7, l_resMONa2[1], 7, l_resMANb2[1], -1, l_resMANc2[1], 7, l_resMASa2[1], 7,
l_resMBNa2[1], 7, l_resWANa[1], 7, l_resWADa[1], 7, l_resMATa[1], -1, l_resWCNa[1], 7,
l_resWONa[1], 7, l_resWGNa[1], 7, l_resWANb[1], 7, l_resWANa2[1], 7, l_resWADa2[1], 7,
l_resMATa2[1], -1, l_resWCNa2[1], 7, l_resWONa2[1], 7, l_resWGNa2[1], 7, l_resWANb2[1], 7,
};
#include "d/actor/d_a_npc_cd2_HIO.inc"
daNpcCd2_HIO_c l_Cd2_HIO;
int daNpcCd2_c::NpcCreate(int param_1) {
J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1);
JUT_ASSERT(590, NULL != a_mdlData_p);
@ -292,51 +339,6 @@ bool daNpcCd2_c::isM_() {
return a_jntNum == JntM_NUM_e;
}
static char* const* l_resNameTbl[30] = {
l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa,
l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2,
l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2,
l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2,
};
static anmTblPrm const l_bmdTbl[30] = {
l_resMANa[0], 3, l_resMADa[0], 3, l_resMCNa[0], 4, l_resMONa[0], 4, l_resMANb[0], 3,
l_resMANc[0], 4, l_resMASa[0], 4, l_resMBNa[0], 4, l_resMANa2[0], 4, l_resMADa2[0], 4,
l_resMCNa2[0], 4, l_resMONa2[0], 4, l_resMANb2[0], 3, l_resMANc2[0], 4, l_resMASa2[0], 4,
l_resMBNa2[0], 4, l_resWANa[0], 4, l_resWADa[0], 4, l_resMATa[0], 3, l_resWCNa[0], 4,
l_resWONa[0], 4, l_resWGNa[0], 4, l_resWANb[0], 4, l_resWANa2[0], 4, l_resWADa2[0], 4,
l_resMATa2[0], 3, l_resWCNa2[0], 4, l_resWONa2[0], 4, l_resWGNa2[0], 4, l_resWANb2[0], 4,
};
static anmTblPrm const l_bmdTWTbl[30] = {
l_resMANa[1], 3, l_resMADa[1], 3, l_resMCNa[1], 4, l_resMONa[1], 4, l_resMANb[1], 3,
l_resMANc[1], 4, l_resMASa[1], 4, l_resMBNa[1], 4, l_resMANa2[1], 4, l_resMADa2[1], 3,
l_resMCNa2[1], 4, l_resMONa2[1], 4, l_resMANb2[1], 3, l_resMANc2[1], 4, l_resMASa2[1], 4,
l_resMBNa2[1], 4, l_resWANa[1], 4, l_resWADa[1], 4, l_resMATa[1], 3, l_resWCNa[1], 4,
l_resWONa[1], 4, l_resWGNa[1], 4, l_resWANb[1], 4, l_resWANa2[1], 4, l_resWADa2[1], 4,
l_resMATa2[1], 3, l_resWCNa2[1], 4, l_resWONa2[1], 4, l_resWGNa2[1], 4, l_resWANb2[1], 4,
};
static anmTblPrm const l_btpTbl[30] = {
l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], 7, l_resMONa[0], 7, l_resMANb[0], -1,
l_resMANc[0], 7, l_resMASa[0], 7, l_resMBNa[0], 7, l_resMANa2[0], 7, l_resMADa2[0], 7,
l_resMCNa2[0], 7, l_resMONa2[0], 7, l_resMANb2[0], -1, l_resMANc2[0], 7, l_resMASa2[0], 7,
l_resMBNa2[0], 7, l_resWANa[0], 7, l_resWADa[0], 7, l_resMATa[0], -1, l_resWCNa[0], 7,
l_resWONa[0], 7, l_resWGNa[0], 7, l_resWANb[0], 7, l_resWANa2[0], 7, l_resWADa2[0], 7,
l_resMATa2[0], -1, l_resWCNa2[0], 7, l_resWONa2[0], 7, l_resWGNa2[0], 7, l_resWANb2[0], 7,
};
static anmTblPrm const l_btpTWTbl[30] = {
l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], 7, l_resMONa[1], 7, l_resMANb[1], -1,
l_resMANc[1], 7, l_resMASa[1], 7, l_resMBNa[1], 7, l_resMANa2[1], 7, l_resMADa2[1], -1,
l_resMCNa2[1], 7, l_resMONa2[1], 7, l_resMANb2[1], -1, l_resMANc2[1], 7, l_resMASa2[1], 7,
l_resMBNa2[1], 7, l_resWANa[1], 7, l_resWADa[1], 7, l_resMATa[1], -1, l_resWCNa[1], 7,
l_resWONa[1], 7, l_resWGNa[1], 7, l_resWANb[1], 7, l_resWANa2[1], 7, l_resWADa2[1], 7,
l_resMATa2[1], -1, l_resWCNa2[1], 7, l_resWONa2[1], 7, l_resWGNa2[1], 7, l_resWANb2[1], 7,
};
#include "d/actor/d_a_npc_cd2_HIO.inc"
J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) {
int a_anmNum = param_1;
switch (a_anmNum) {
@ -597,8 +599,6 @@ J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) {
return (J3DAnmTransform*)dComIfG_getObjectRes(name, index);
}
daNpcCd2_HIO_c l_Cd2_HIO;
int daNpcCd2_c::setAttention(int param_1) {
static cXyz a_eyeOfsTbl[30] = {
cXyz(0.0f, 10.0f, 0.0f),