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

d_a_npc_kn OK (#2966) 

* d_a_npc_kn OK

* Remove nonmatching comment
This commit is contained in:
LagoLunatic 2025-12-18 16:37:50 -05:00 committed by GitHub
parent 93067110f6
commit 21ce84ae43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -2274,7 +2274,7 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_kasi_kyu"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_kasi_mich"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_npc_kdk"),
ActorRel(NonMatching, "d_a_npc_kn"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_kn"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_knj"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_kolinb"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_ks"),

2
include/d/actor/d_a_npc_kn.h
View File

@ -416,7 +416,7 @@ public:
static dCcD_SrcSph mCcDSph;
static s16 mSrchName;
static fopAc_ac_c* mFindActorPtrs[50];
static u8 mFindCount[4];
static int mFindCount;
private:
/* 0x0E44 */ J3DModel* mpPodModel;

59
src/d/actor/d_a_npc_kn.cpp
View File

@ -16,6 +16,46 @@
#include "d/d_debug_viewer.h"
#endif
dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = {
mCcDObjData,
{{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f},
};
dCcD_SrcSph daNpc_Kn_c::mCcDSph = {
mCcDObjData,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSphCc
},
};
s16 daNpc_Kn_c::mSrchName;
fopAc_ac_c* daNpc_Kn_c::mFindActorPtrs[50];
int daNpc_Kn_c::mFindCount;
void* dummy_srchActor(void* i_actor1, void* i_actor2) {
// Fake function (though a similar one likely existed and got stripped out).
// daNpc_Kn_c::setSwordChargePtcl has issues where the ...rodata and ...bss pools are loaded in
// reverse order, which in turn also causes regalloc in that function.
// Fixing this requires a function early on in this TU to also use ...bss pooling, which for
// some reason fixes later pool loads.
// The unused member bss variables mSrchName/mFindActorPtrs/mFindCount existing in the maps
// indicates that a function using them originally existed, but was stripped out.
// Additionally, the bss members must be defined above this function for bss pooling to be used.
fopAc_ac_c* actor2 = (fopAc_ac_c*)i_actor2;
void* foundActor = NULL;
if (daNpc_Kn_c::mFindCount < 50 && fopAcM_IsActor(i_actor1) && i_actor1 != i_actor2) {
if (daNpc_Kn_c::mSrchName == fopAcM_GetName((fopAc_ac_c*)i_actor1)) {
foundActor = (fopAc_ac_c*)i_actor1;
daNpc_Kn_c::mFindActorPtrs[daNpc_Kn_c::mFindCount] = (fopAc_ac_c*)foundActor;
daNpc_Kn_c::mFindCount++;
}
}
return NULL;
}
const dCcD_SrcGObjInf daNpc_Kn_c::mCcDObjData = {
{0, {{0, 0, 0}, {0, 0}, {0x79}}},
{dCcD_SE_NONE, 0, 0, 0, 0},
@ -157,18 +197,6 @@ void daNpc_Kn_HIO_c::genMessage(JORMContext* ctext) {
}
#endif
dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = {
mCcDObjData,
{{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f},
};
dCcD_SrcSph daNpc_Kn_c::mCcDSph = {
mCcDObjData,
{
{{0.0f, 0.0f, 0.0f}, 0.0f} // mSphCc
},
};
static int l_bmdData[3][2] = {
{47, 1},
{48, 1},
@ -485,12 +513,6 @@ daNpc_Kn_c::cutFunc daNpc_Kn_c::mCutList[21] = {
&daNpc_Kn_c::ECut_seventhSkillGet,
};
s16 daNpc_Kn_c::mSrchName;
fopAc_ac_c* daNpc_Kn_c::mFindActorPtrs[50];
u8 daNpc_Kn_c::mFindCount[4];
static NPC_KN_HIO_CLASS l_HIO;
daNpc_Kn_c::~daNpc_Kn_c() {
@ -5020,7 +5042,6 @@ void daNpc_Kn_c::calcMagicBallPos() {
}
}
// NONMATCHING - reg alloc
void daNpc_Kn_c::setSwordChargePtcl() {
JPABaseEmitter* emitter;