4 files changed, 5 insertions, 4 deletions
diff --git a/src/boot_O2/assert.c b/src/boot_O2/debug.c
index 04fcf87fe..3933b585e 100644
--- a/src/boot_O2/assert.c
+++ b/src/boot_O2/debug.c
@@ -1,11 +1,11 @@
 #include "global.h"
 #include "fault.h"
 
-void __assert(const char* file, u32 lineNum) {
+void _dbg_hungup(const char* file, int lineNum) {
     osGetThreadId(NULL);
     Fault_AddHungupAndCrash(file, lineNum);
 }
 
-void func_800862B4(void) {
+void Reset(void) {
     Fault_AddHungupAndCrash("Reset", 0);
 }
diff --git a/src/boot_O2/loadfragment.c b/src/boot_O2/loadfragment.c
index 517c82bbb..b22b1a692 100644
--- a/src/boot_O2/loadfragment.c
+++ b/src/boot_O2/loadfragment.c
@@ -9,6 +9,7 @@
  *  The main difference between them seems to be the lack of vramEnd arguments here.
  *  Instead they are calculated on the fly.
  */
+
 #include "global.h"
 #include "system_malloc.h"
 #include "loadfragment.h"
diff --git a/src/boot_O2/mtxuty-cvt.c b/src/boot_O2/mtxuty-cvt.c
index 2c1634392..a5da24522 100644
--- a/src/boot_O2/mtxuty-cvt.c
+++ b/src/boot_O2/mtxuty-cvt.c
@@ -15,5 +15,5 @@ void MtxConv_F2L(Mtx* mtx, MtxF* mf) {
 }
 
 void MtxConv_L2F(MtxF* mtx, Mtx* mf) {
-    guMtxL2F(mtx, mf);
+    guMtxL2F(mtx->mf, mf);
 }
diff --git a/src/boot_O2/padutils.c b/src/boot_O2/padutils.c
index accd09e11..1c6bbe868 100644
--- a/src/boot_O2/padutils.c
+++ b/src/boot_O2/padutils.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "padutils.h"
 
 void PadUtils_Init(Input* input) {
     bzero(input, sizeof(Input));