diff --git a/include/functions.h b/include/functions.h index ba66fafea8..ee30a9f530 100644 --- a/include/functions.h +++ b/include/functions.h @@ -48,9 +48,9 @@ void CIC6105_PrintRomInfo(void); // func_80081830 void CIC6105_AddRomInfoFaultPage(void); // func_8008189C void CIC6105_RemoveRomInfoFaultPage(void); // func_800818D0 void func_800818F4(void); // func_800818F4 -void Fault_Nop80081920(UNK_TYPE4 param_1, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4); // func_80081920 +void Fault_Nop80081920(UNK_TYPE4 param_1, ...); // func_80081920 void Fault_Log(char* str, ...); // func_8008193C -void Fault_Nop80081958(UNK_TYPE4 param_1, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4); // func_80081958 +void Fault_Nop80081958(UNK_TYPE4 param_1, ...); // func_80081958 void Fault_WaitMilliseconds2(u32 ms); // func_80081980 void Fault_AddClient(FaultClient* client, fault_client_func* func, void* arg1, void* arg2); // func_800819F0 void Fault_RemoveClient(FaultClient* client); // func_80081AD4 diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index e38e071d09..a91bf00598 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -12,7 +12,7 @@ SECTIONS build/asm/boot_0x80080E30.o(.text) build/asm/boot_0x80081250.o(.text) build/src/boot_O2_g3/CIC6105.o(.text) - build/asm/boot_0x80081920.o(.text) + build/src/boot_O2_g3/boot_0x80081920.o(.text) build/asm/boot_0x80081980.o(.text) build/asm/boot_0x80083EB0.o(.text) build/asm/loadfragment.o(.text) diff --git a/src/boot/boot_0x80081920.c b/src/boot/boot_0x80081920.c deleted file mode 100644 index 30047e6e7d..0000000000 --- a/src/boot/boot_0x80081920.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include - -// TODO what are these updating the sp even though they call no other functions? -void func_80081920(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3) {} -void func_8008193C(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3) {} -void func_80081958(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3) {} diff --git a/src/boot_O2_g3/boot_0x80081920.c b/src/boot_O2_g3/boot_0x80081920.c new file mode 100644 index 0000000000..b4e1661bfc --- /dev/null +++ b/src/boot_O2_g3/boot_0x80081920.c @@ -0,0 +1,8 @@ +#include +#include + +// This file contains print functions that are used by fault.c, so they are placed in the fault module + +void Fault_Nop80081920(UNK_TYPE4 param_1, ...) {} +void Fault_Log(char* str, ...) {} +void Fault_Nop80081958(UNK_TYPE4 param_1, ...) {} diff --git a/tables/functions.py b/tables/functions.py index 94bea3aaf8..a89b96baa0 100644 --- a/tables/functions.py +++ b/tables/functions.py @@ -45,9 +45,9 @@ 0x8008189C:("CIC6105_AddRomInfoFaultPage","void","void"), 0x800818D0:("CIC6105_RemoveRomInfoFaultPage","void","void"), 0x800818F4:("func_800818F4","void","void"), - 0x80081920:("Fault_Nop80081920","void","UNK_TYPE4 param_1, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4"), + 0x80081920:("Fault_Nop80081920","void","UNK_TYPE4 param_1, ..."), 0x8008193C:("Fault_Log","void","char* str, ..."), - 0x80081958:("Fault_Nop80081958","void","UNK_TYPE4 param_1, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4"), + 0x80081958:("Fault_Nop80081958","void","UNK_TYPE4 param_1, ..."), 0x80081980:("Fault_WaitMilliseconds2","void","u32 ms"), 0x800819F0:("Fault_AddClient","void","FaultClient* client, fault_client_func* func, void* arg1, void* arg2"), 0x80081AD4:("Fault_RemoveClient","void","FaultClient* client"),