diff --git a/mm/src/code/sys_matrix.c b/mm/src/code/sys_matrix.c index c0700fba8..6981dfc3c 100644 --- a/mm/src/code/sys_matrix.c +++ b/mm/src/code/sys_matrix.c @@ -1169,6 +1169,7 @@ void Matrix_SetTranslateRotateYXZ(f32 x, f32 y, f32 z, Vec3s* rot) { * @remark original name: "_MtxF_to_Mtx" */ Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest) { + // #Region 2S2H [Port] For compatibility with modern systems this has been changed to use guMtxF2L guMtxF2L(src, dest); return dest; } diff --git a/mm/src/code/z_skin_matrix.c b/mm/src/code/z_skin_matrix.c index 9b30a3c0b..20a3d5363 100644 --- a/mm/src/code/z_skin_matrix.c +++ b/mm/src/code/z_skin_matrix.c @@ -506,73 +506,8 @@ void SkinMatrix_Vec3sToVec3f(Vec3s* src, Vec3f* dest) { } void SkinMatrix_MtxFToMtx(MtxF* src, Mtx* dest) { - s32 temp; - u16* m1 = (u16*)&dest->m[0][0]; - u16* m2 = (u16*)&dest->m[2][0]; - - temp = src->xx * 0x10000; - m1[0] = (temp >> 0x10); - m1[16 + 0] = temp & 0xFFFF; - - temp = src->yx * 0x10000; - m1[1] = (temp >> 0x10); - m1[16 + 1] = temp & 0xFFFF; - - temp = src->zx * 0x10000; - m1[2] = (temp >> 0x10); - m1[16 + 2] = temp & 0xFFFF; - - temp = src->wx * 0x10000; - m1[3] = (temp >> 0x10); - m1[16 + 3] = temp & 0xFFFF; - - temp = src->xy * 0x10000; - m1[4] = (temp >> 0x10); - m1[16 + 4] = temp & 0xFFFF; - - temp = src->yy * 0x10000; - m1[5] = (temp >> 0x10); - m1[16 + 5] = temp & 0xFFFF; - - temp = src->zy * 0x10000; - m1[6] = (temp >> 0x10); - m1[16 + 6] = temp & 0xFFFF; - - temp = src->wy * 0x10000; - m1[7] = (temp >> 0x10); - m1[16 + 7] = temp & 0xFFFF; - - temp = src->xz * 0x10000; - m1[8] = (temp >> 0x10); - m1[16 + 8] = temp & 0xFFFF; - - temp = src->yz * 0x10000; - m1[9] = (temp >> 0x10); - m2[9] = temp & 0xFFFF; - - temp = src->zz * 0x10000; - m1[10] = (temp >> 0x10); - m2[10] = temp & 0xFFFF; - - temp = src->wz * 0x10000; - m1[11] = (temp >> 0x10); - m2[11] = temp & 0xFFFF; - - temp = src->xw * 0x10000; - m1[12] = (temp >> 0x10); - m2[12] = temp & 0xFFFF; - - temp = src->yw * 0x10000; - m1[13] = (temp >> 0x10); - m2[13] = temp & 0xFFFF; - - temp = src->zw * 0x10000; - m1[14] = (temp >> 0x10); - m2[14] = temp & 0xFFFF; - - temp = src->ww * 0x10000; - m1[15] = (temp >> 0x10); - m2[15] = temp & 0xFFFF; + // #Region 2S2H [Port] For compatibility with modern systems this has been changed to use guMtxF2L + guMtxF2L(src, dest); } Mtx* SkinMatrix_MtxFToNewMtx(GraphicsContext* gfxCtx, MtxF* src) {