diff options
| author | cadmic <cadmic24@gmail.com> | 2024-08-28 18:30:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-28 21:30:36 -0400 |
| commit | 7079005c83218e2a0e071dd3b2a7a9e0e8254fd2 (patch) | |
| tree | d0ce8b921d13e8eac2c58da1ca961b9fa209d2ad /src/code | |
| parent | 6e8b8201840d905e38bb15fbc9301504748abf4f (diff) | |
[ntsc-1.2] Match N64 libultra (#2081)
* Match N64 libultra
* INITIALIZE_FUNC -> OSINITIALIZE_FUNC
* Document osGetIntMask
* Refer readers of osGetIntMask to osSetIntMask comment
* Whitelist new static functions in disasm unksyms check
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/mtxuty-cvt.c | 2 | ||||
| -rw-r--r-- | src/code/sys_matrix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/code/mtxuty-cvt.c b/src/code/mtxuty-cvt.c index 1cad0f909..10f88f782 100644 --- a/src/code/mtxuty-cvt.c +++ b/src/code/mtxuty-cvt.c @@ -20,5 +20,5 @@ void MtxConv_F2L(Mtx* m1, MtxF* m2) { void MtxConv_L2F(MtxF* m1, Mtx* m2) { LOG_UTILS_CHECK_NULL_POINTER("m1", m1, "../mtxuty-cvt.c", 55); LOG_UTILS_CHECK_NULL_POINTER("m2", m2, "../mtxuty-cvt.c", 56); - guMtxL2F(m1, m2); + guMtxL2F(m1->mf, m2); } diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index ce9846086..440e4c6d6 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -1020,7 +1020,7 @@ void Matrix_SetTranslateUniformScaleMtx(Mtx* mtx, f32 scale, f32 translateX, f32 MtxF mf; Matrix_SetTranslateUniformScaleMtxF(&mf, scale, translateX, translateY, translateZ); - guMtxF2L(&mf, mtx); + guMtxF2L(mf.mf, mtx); } void Matrix_SetTranslateUniformScaleMtx2(Mtx* mtx, f32 scale, f32 translateX, f32 translateY, f32 translateZ) { |