2 files changed, 6 insertions, 5 deletions
diff --git a/src/boot_O2_g3/CIC6105.c b/src/boot_O2_g3/CIC6105.c
index 5a51b22c8..4ab4ca4e8 100644
--- a/src/boot_O2_g3/CIC6105.c
+++ b/src/boot_O2_g3/CIC6105.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "prevent_bss_reordering.h"
 
 UNK_TYPE4 D_8009BE30;
 UNK_TYPE4 D_8009BE34;
@@ -17,7 +18,7 @@ void CIC6105_PrintRomInfo(void) {
 }
 
 void CIC6105_AddRomInfoFaultPage(void) {
-    Fault_AddClient(&romInfoFaultClient, (fault_client_func)CIC6105_PrintRomInfo, 0, 0);
+    Fault_AddClient(&romInfoFaultClient, CIC6105_PrintRomInfo, 0, 0);
 }
 
 void CIC6105_RemoveRomInfoFaultPage(void) {
diff --git a/src/boot_O2_g3/fault.c b/src/boot_O2_g3/fault.c
index 1851d21cb..b32b5aa98 100644
--- a/src/boot_O2_g3/fault.c
+++ b/src/boot_O2_g3/fault.c
@@ -33,7 +33,7 @@ void Fault_SleepImpl(u32 duration) {
     Sleep_Cycles(value);
 }
 
-void Fault_AddClient(FaultClient* client, fault_client_func callback, void* param0, void* param1) {
+void Fault_AddClient(FaultClient* client, void* callback, void* param0, void* param1) {
     OSIntMask mask;
     u32 alreadyExists = 0;
 
@@ -104,7 +104,7 @@ void Fault_RemoveClient(FaultClient* client) {
     }
 }
 
-void Fault_AddAddrConvClient(FaultAddrConvClient* client, FaultAddrConvFunc callback, void* param) {
+void Fault_AddAddrConvClient(FaultAddrConvClient* client, void* callback, void* param) {
     OSIntMask mask;
     u32 alreadyExists = 0;
 
@@ -910,8 +910,8 @@ void Fault_HangupFaultClient(const char* arg0, char* arg1) {
 
 void Fault_AddHungupAndCrashImpl(const char* arg0, char* arg1) {
     FaultClient client;
-    char padd[4];
-    Fault_AddClient(&client, (fault_client_func)Fault_HangupFaultClient, (void*)arg0, arg1);
+    u32 pad;
+    Fault_AddClient(&client, Fault_HangupFaultClient, (void*)arg0, arg1);
     *(u32*)0x11111111 = 0; // trigger an exception
 }