summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/boot_0x800968B0.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/boot_O2_g3/boot_0x800968B0.c b/src/boot_O2_g3/boot_0x800968B0.c
index 29fdf5f7f..ca313bdea 100644
--- a/src/boot_O2_g3/boot_0x800968B0.c
+++ b/src/boot_O2_g3/boot_0x800968B0.c
@@ -1,7 +1,6 @@
#include <ultra64.h>
#include <global.h>
-#ifdef NON_MATCHING
u32 func_800968B0(const u8* a0, const u8* a1) {
u8 v0;
u8 v1;
@@ -9,12 +8,8 @@ u32 func_800968B0(const u8* a0, const u8* a1) {
v0 = *a0++;
v1 = *a1++;
if (v0 != v1) {
- // TODO this uses v0 instead of a3
- return v0 - v1;
+ return v0 - v1;
}
- } while (v0 != 0);
+ } while (v0);
return 0;
}
-#else
-GLOBAL_ASM("./asm/non_matchings/boot_0x800968B0/func_800968B0.asm")
-#endif \ No newline at end of file