diff options
| author | cadmic <cadmic24@gmail.com> | 2024-08-29 09:05:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-29 12:05:50 -0400 |
| commit | 5e9704b464cce82b33fc54fdabb584a287154e90 (patch) | |
| tree | a7485679ba8f304cfe2572d26ed7a1876617ea76 /src/boot | |
| parent | 7079005c83218e2a0e071dd3b2a7a9e0e8254fd2 (diff) | |
[ntsc-1.2] Fix some data / disassembly / undefined_syms (#2103)
* Fix some data splits
* Use real fault functions in cic6105.c
* Fix fault_n64.c data sizes
* Format
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/cic6105.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c index 9cb5c3e39..1f6469b56 100644 --- a/src/boot/cic6105.c +++ b/src/boot/cic6105.c @@ -2,10 +2,6 @@ #include "cic6105.h" #include "fault.h" -// TODO N64 fault.c functions -void func_800AE1E0_unknown(s32, s32); -void func_800AE258_unknown(const char*, ...); - s32 func_80001714(void); extern u64 cic6105ucodeTextStart[]; @@ -32,19 +28,19 @@ void CIC6105_FaultClient(void) { s32 spStatus; spStatus = IO_READ(SP_STATUS_REG); - func_800AE1E0_unknown(48, 200); + Fault_SetCursor(48, 200); if (spStatus & SP_STATUS_SIG7) { - func_800AE258_unknown("OCARINA %08x %08x", B_80008EF8, B_80008EFC); + Fault_Printf("OCARINA %08x %08x", B_80008EF8, B_80008EFC); } else { - func_800AE258_unknown("LEGEND %08x %08x", B_80008EF8, B_80008EFC); + Fault_Printf("LEGEND %08x %08x", B_80008EF8, B_80008EFC); } - func_800AE1E0_unknown(40, 184); - func_800AE258_unknown("ROM_F"); - func_800AE258_unknown(" [Creator:%s]", gBuildTeam); - func_800AE1E0_unknown(56, 192); - func_800AE258_unknown("[Date:%s]", gBuildDate); - func_800AE1E0_unknown(96, 32); - func_800AE258_unknown("I LOVE YOU %08x", func_80001714()); + Fault_SetCursor(40, 184); + Fault_Printf("ROM_F"); + Fault_Printf(" [Creator:%s]", gBuildTeam); + Fault_SetCursor(56, 192); + Fault_Printf("[Date:%s]", gBuildDate); + Fault_SetCursor(96, 32); + Fault_Printf("I LOVE YOU %08x", func_80001714()); } void CIC6105_AddFaultClient(void) { |