diff --git a/include/functions.h b/include/functions.h index 70a45c2e8f..d1e3cfd103 100644 --- a/include/functions.h +++ b/include/functions.h @@ -493,7 +493,7 @@ u32 __osGetWatchLo(void); // func_80096810 void __osSetWatchLo(u32 value); // func_80096820 f32 func_80096830(f32 param_1, f32 param_2); // func_80096830 void* func_80096880(void* param_1, u8 param_2, s32 param_3); // func_80096880 -void func_800968B0(void); // func_800968B0 +u32 func_800968B0(const u8* a0, const u8* a1); // func_800968B0 char* func_800968f0(char* param_1, char* param_2); // func_800968F0 void func_80096930(void); // func_80096930 void EnAObj_Init(ActorEnAObj* this, GlobalContext* ctxt); // func_800A5AC0 diff --git a/src/boot_O2_g3/boot_0x800968B0.c b/src/boot_O2_g3/boot_0x800968B0.c index 29fdf5f7fb..ca313bdeab 100644 --- a/src/boot_O2_g3/boot_0x800968B0.c +++ b/src/boot_O2_g3/boot_0x800968B0.c @@ -1,7 +1,6 @@ #include #include -#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