mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-20 23:51:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make non-matchings consistent with oot

Browse Source
This commit is contained in:
rozlette
2020-02-20 16:29:22 -06:00
parent c7a60e9fd5
commit 581a97b561
16 changed files with 346 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot_O2_g3_trapuv/fault.c
+8 -8
View File
@@ -45,7 +45,7 @@ end:
}
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_AddClient.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddClient.asm")
#endif
void Fault_RemoveClient(FaultClient* client) {
@@ -119,7 +119,7 @@ end:
}
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_AddAddrConvClient.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddAddrConvClient.asm")
#endif
void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
@@ -233,7 +233,7 @@ s32 Fault_WaitForInputImpl() {
return 0;
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_WaitForInputImpl.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_WaitForInputImpl.asm")
#endif
void Fault_WaitForInput() {
@@ -289,7 +289,7 @@ void Fault_LogFReg(s32 idx, f32* value) {
}
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_LogFReg.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_LogFReg.asm")
#endif
void Fault_PrintFPCR(u32 value) {
@@ -574,7 +574,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
faultCtxt->faultActive = 1;
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_DrawMemDump.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_DrawMemDump.asm")
#endif
#ifdef NON_MATCHING
@@ -635,7 +635,7 @@ void Fault_FindNextStackCall(u32** sp, u32** pc, u32** ra) {
*ra = currentRa;
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_FindNextStackCall.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_FindNextStackCall.asm")
#endif
void Fault_DrawStackTrace(OSThread* t, u32 flags) {
@@ -733,7 +733,7 @@ void Fault_CommitFB() {
FaultDrawer_SetDrawerFB(fb, 0x140, 0xF0);
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_CommitFB.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_CommitFB.asm")
#endif
void Fault_ProcessClients(void) {
@@ -788,7 +788,7 @@ void Fault_SetOptionsFromController3(void) {
}
}
#else
GLOBAL_ASM("./asm/nonmatching/fault/Fault_SetOptionsFromController3.asm")
GLOBAL_ASM("./asm/non_matchings/fault/Fault_SetOptionsFromController3.asm")
#endif
void Fault_SetOptions(void) {
src/boot_O2_g3_trapuv/fault_drawer.c
+5 -5
View File
@@ -24,10 +24,10 @@ void FaultDrawer_DrawRecImpl(s32 xstart, s32 ystart, s32 xend, s32 yend, u16 col
}
}
#else
GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_DrawRecImpl.asm")
GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawRecImpl.asm")
#endif
GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_DrawChar.asm")
GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawChar.asm")
s32 FaultDrawer_ColorToPrintColor(u16 color) {
s32 i;
@@ -90,15 +90,15 @@ void FaultDrawer_FillScreen() {
FaultDrawer_SetCursor(faultDrawContext->xStart, faultDrawContext->yStart);
}
GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_FormatStringFunc.asm")
GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_FormatStringFunc.asm")
void FaultDrawer_VPrintf(char* str, char* args) { //va_list
_Printf((printf_func)FaultDrawer_FormatStringFunc, faultDrawContext, str, args);
}
GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_Printf.asm")
GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_Printf.asm")
GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_DrawText.asm")
GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawText.asm")
void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) {
faultDrawContext->fb = (u16*)fb;