diff options
| author | rozlette <uberpanzermensch@gmail.com> | 2020-02-20 16:29:22 -0600 |
|---|---|---|
| committer | rozlette <uberpanzermensch@gmail.com> | 2020-02-20 16:29:22 -0600 |
| commit | 581a97b5610c1c280621870df2dd604c9bf12d8d (patch) | |
| tree | 9923b6d4f003b11449d082e1be877461d8a070e6 /src/boot_O2_g3 | |
| parent | c7a60e9fd51baa1ef9af6dfb170b585f2e69a303 (diff) | |
Make non-matchings consistent with oot
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/boot_0x800805E0.c | 9 | ||||
| -rw-r--r-- | src/boot_O2_g3/boot_0x800968B0.c | 8 | ||||
| -rw-r--r-- | src/boot_O2_g3/idle.c | 4 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 4 |
4 files changed, 8 insertions, 17 deletions
diff --git a/src/boot_O2_g3/boot_0x800805E0.c b/src/boot_O2_g3/boot_0x800805E0.c index 81c7e4361..06d9036f0 100644 --- a/src/boot_O2_g3/boot_0x800805E0.c +++ b/src/boot_O2_g3/boot_0x800805E0.c @@ -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) { diff --git a/src/boot_O2_g3/boot_0x800968B0.c b/src/boot_O2_g3/boot_0x800968B0.c index fd9202f46..29fdf5f7f 100644 --- a/src/boot_O2_g3/boot_0x800968B0.c +++ b/src/boot_O2_g3/boot_0x800968B0.c @@ -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
\ No newline at end of file diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index 8fe2cfe34..aa43b6cc3 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -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) { diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index 8b4ed863e..d2bd6cd8e 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -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() { |