2 files changed, 9 insertions, 8 deletions
diff --git a/src/boot_O2/boot_80086760.c b/src/boot_O2/boot_80086760.c
index 3c75bcd3f..398a1e41a 100644
--- a/src/boot_O2/boot_80086760.c
+++ b/src/boot_O2/boot_80086760.c
@@ -14,11 +14,11 @@ extern f32 func_80086D18(f32 x);
 s32 gUseAtanContFrac;
 
 /**
- * Tangent function computed using libultra __sinf and __cosf
+ * Tangent function computed using libultra sinf and cosf
  */
 // Math_FTanF
 f32 func_80086760(f32 x) {
-    return __sinf(x) / __cosf(x);
+    return sinf(x) / cosf(x);
 }
 
 // Unused
diff --git a/src/boot_O2/mtxuty-cvt.c b/src/boot_O2/mtxuty-cvt.c
index 221dbf554..2c1634392 100644
--- a/src/boot_O2/mtxuty-cvt.c
+++ b/src/boot_O2/mtxuty-cvt.c
@@ -1,18 +1,19 @@
 #include "global.h"
 
-void MtxConv_F2L(MatrixInternal* m1, MtxF* m2) {
+void MtxConv_F2L(Mtx* mtx, MtxF* mf) {
     s32 i;
     s32 j;
 
     for (i = 0; i < 4; i++) {
         for (j = 0; j < 4; j++) {
-            s32 value = (m2->mf[i][j] * 0x10000);
-            m1->intPart[i][j] = value >> 16;
-            m1->fracPart[i][j] = value;
+            s32 value = (mf->mf[i][j] * 0x10000);
+
+            mtx->intPart[i][j] = value >> 16;
+            mtx->fracPart[i][j] = value;
         }
     }
 }
 
-void MtxConv_L2F(MtxF* m1, MatrixInternal* m2) {
-    guMtxL2F(m1, (Mtx*)m2);
+void MtxConv_L2F(MtxF* mtx, Mtx* mf) {
+    guMtxL2F(mtx, mf);
 }