mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-07 03:47:43 -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/boot_0x800805E0.c
+2 -7
View File
@@ -1,8 +1,7 @@
#include <ultra64.h>
#include <global.h>
#ifdef NONMATCHING
#ifdef NON_MATCHING
UNK_RET func_800805E0(UNK_TYPE a0) {
if (a0 != 0) {
switch (osTvType) {
@@ -49,12 +48,8 @@ UNK_RET func_800805E0(UNK_TYPE a0) {
D_80096B24 = a0;
}
#else
GLOBAL_ASM("./asm/nonmatching/boot_0x800805E0/func_800805E0.asm")
GLOBAL_ASM("./asm/non_matchings/boot_0x800805E0/func_800805E0.asm")
#endif
UNK_RET func_80080748(void) {
src/boot_O2_g3/boot_0x800968B0.c
+2 -6
View File
@@ -1,8 +1,7 @@
#include <ultra64.h>
#include <global.h>
#ifdef NONMATCHING
#ifdef NON_MATCHING
u32 func_800968B0(const u8* a0, const u8* a1) {
u8 v0;
u8 v1;
@@ -16,9 +15,6 @@ u32 func_800968B0(const u8* a0, const u8* a1) {
} while (v0 != 0);
return 0;
}
#else
GLOBAL_ASM("./asm/nonmatching/boot_0x800968B0/func_800968B0.asm")
GLOBAL_ASM("./asm/non_matchings/boot_0x800968B0/func_800968B0.asm")
#endif
src/boot_O2_g3/idle.c
+2 -2
View File
@@ -16,7 +16,7 @@ void Idle_InitFramebuffer(u32* ptr, u32 numBytes, u32 value) {
}
}
#else
GLOBAL_ASM("./asm/nonmatching/idle/Idle_InitFramebuffer.asm")
GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitFramebuffer.asm")
#endif
void Idle_InitScreen(void) {
@@ -58,7 +58,7 @@ void Idle_InitCodeAndMemory(void) {
Idle_ClearMemory(&code_bss_start, &code_bss_end);
}
#else
GLOBAL_ASM("./asm/nonmatching/idle/Idle_InitCodeAndMemory.asm")
GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitCodeAndMemory.asm")
#endif
void Idle_MainThreadEntry(void* arg) {
src/boot_O2_g3/z_std_dma.c
+2 -2
View File
@@ -139,7 +139,7 @@ void Dmamgr_HandleRequest(DmaRequest* a0) {
}
}
#else
GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_HandleRequest.asm")
GLOBAL_ASM("./asm/non_matchings/z_std_dma/Dmamgr_HandleRequest.asm")
#endif
void Dmamgr_ThreadEntry(void* a0) {
@@ -213,7 +213,7 @@ void Dmamgr_Start() {
osStartThread(&dmamgrOSThread);
}
#else
GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_Start.asm")
GLOBAL_ASM("./asm/non_matchings/z_std_dma/Dmamgr_Start.asm")
#endif
void Dmamgr_Stop() {