mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-29 07:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ntsc-1.2] Fix some data / disassembly / undefined_syms (#2103)

Browse Source 
* Fix some data splits

* Use real fault functions in cic6105.c

* Fix fault_n64.c data sizes

* Format
This commit is contained in:
cadmic
2024-08-29 09:05:50 -07:00
committed by GitHub
parent 7079005c83
commit 5e9704b464
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/cic6105.c
+10 -14
View File
@@ -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) {
src/code/fault_n64.c
+3 -1
View File
@@ -82,6 +82,7 @@ const char* sFpExceptionNames[] = {
};
u16 sFaultFontColor = GPACK_RGBA5551(255, 255, 255, 1);
s32 D_800FF9C4[7] = { 0 }; // Unused (file padding?)
Input sFaultInputs[MAXCONTROLLERS];
@@ -95,7 +96,8 @@ vs32 sFaultExit;
vs32 gFaultMsgId;
vs32 sFaultDisplayEnable;
OSThread* sFaultFaultedThread;
s32 B_80122570[0x10];
s32 B_80122570[16];
s32 B_801225B0[8]; // Unused (file padding?)
void Fault_SleepImpl(u32 ms) {
Sleep_Msec(ms);