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

Various small matches (#2879)

Browse Source 
* Misc debug matches

* Fix JASBasicWaveBank weak func order

* Remove more dol2asm stuff, fix missing includes

* Some data fixes

* Update comments

* d_file_sel_warning is already OK

* Fix Z2 splits

* Fix movebox namespace

* Fix inlining issue in m_Do_ext

* Fix Z2 splits for P and J
This commit is contained in:
LagoLunatic
2025-11-28 00:34:18 -05:00
committed by GitHub
parent 6dfe0b6731
commit 832d38999e
34 changed files with 250 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_ext.cpp
+25 -11
View File
@@ -402,6 +402,21 @@ void mDoExt_brkAnmRemove(J3DModelData* i_modelData) {
// this needs a lot of work still
static void dummy2() {
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
FORCE_DONT_INLINE;
J3DGXColor gxColor;
J3DColorChan colorChan;
J3DTexCoord texCoord;
@@ -1261,7 +1276,6 @@ void mDoExt_McaMorf::calc() {
u16 jntNo = getJoint()->getJntNo();
j3dSys.setCurrentMtxCalc(this);
Mtx sp68;
J3DTransformInfo sp48;
J3DTransformInfo sp28;
J3DTransformInfo* var_r29;
@@ -1313,6 +1327,7 @@ void mDoExt_McaMorf::calc() {
JMAEulerToQuat(sp28.mRotation.x, sp28.mRotation.y, sp28.mRotation.z, &sp8);
JMAQuatLerp(var_r27, &sp8, var_f31, var_r27);
Mtx sp68;
mDoMtx_quat(sp68, var_r27);
var_r29->mTranslate.x = var_r29->mTranslate.x * var_f30 + sp28.mTranslate.x * var_f31;
@@ -1342,7 +1357,7 @@ void mDoExt_McaMorf::setAnm(J3DAnmTransform* param_0, int param_1, f32 param_2,
mFrameCtrl.init(mpAnm->getFrameMax());
}
} else {
mFrameCtrl.init(param_5);
mFrameCtrl.init((s16)param_5);
}
if (param_0 && param_1 < 0) {
param_1 = param_0->getAttribute();
@@ -1623,7 +1638,7 @@ void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f3
mFrameCtrl.init(mpAnm->getFrameMax());
}
} else {
mFrameCtrl.init(i_end);
mFrameCtrl.init((s16)i_end);
}
if (i_anm != NULL && i_attr < 0) {
@@ -1636,7 +1651,7 @@ void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f3
if (i_rate >= 0.0f) {
setFrame(i_start);
} else {
setFrame(mFrameCtrl.getEnd());
setFrame(getEndFrame());
}
setLoopFrame(getFrame());
@@ -2015,7 +2030,7 @@ void mDoExt_McaMorf2::setAnm(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
mFrameCtrl.init(mpAnm->getFrameMax());
}
} else {
mFrameCtrl.init(i_end);
mFrameCtrl.init((s16)i_end);
}
if (i_attr < 0) {
@@ -2028,7 +2043,7 @@ void mDoExt_McaMorf2::setAnm(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
if (i_speed >= 0.0f) {
setFrame(i_start);
} else {
setFrame(mFrameCtrl.getEnd());
setFrame(getEndFrame());
}
setLoopFrame(getFrame());
@@ -2305,7 +2320,7 @@ void mDoExt_3DlineMat0_c::setMaterial() {
dKy_GxFog_set();
GXCallDisplayList(l_matDL, 0x80);
GXLoadPosMtxImm(j3dSys.getViewMtx(), GX_PNMTX0);
GXLoadNrmMtxImm(g_mDoMtx_identity, GX_PNMTX0);
GXLoadNrmMtxImm(cMtx_getIdentity(), GX_PNMTX0);
}
/* 80012774-80012874 00D0B4 0100+00 1/0 0/0 0/0 .text draw__19mDoExt_3DlineMat0_cFv */
@@ -2324,13 +2339,12 @@ void mDoExt_3DlineMat0_c::draw() {
GXSetArray(GX_VA_NRM, ((mDoExt_3Dline_c*)((int)var_r28 + field_0x16 * 4))->field_0x10, 3);
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, var_r26);
for (u16 j = 0; j < (u16)var_r26;) {
for (u16 j = 0; j < (u16)var_r26; j++) {
GXPosition1x16(j);
GXNormal1x16(j);
j++;
GXPosition1x16(j);
GXNormal1x16(j++);
GXPosition1x16(++j);
GXNormal1x16(j);
}
GXEnd();
var_r28++;