diff options
| author | mmb70 <mmb70@duke.edu> | 2020-07-21 14:24:21 -0700 |
|---|---|---|
| committer | Kenix3 <kenixwhisperwind@gmail.com> | 2020-07-24 19:26:37 -0400 |
| commit | 522ccdbb9571af5c37813219d3a649fc0fc490ea (patch) | |
| tree | 4fb41a1c88da10cefc73220e23ada1671ee55122 | |
| parent | 7b45043c97a77f33a80269d56d72dd7655ec15a9 (diff) | |
func_0x800968B0 PR review
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | src/boot_O2_g3/boot_0x800968B0.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/functions.h b/include/functions.h index d1e3cfd10..a38942722 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 -u32 func_800968B0(const u8* a0, const u8* a1); // func_800968B0 +s32 func_800968B0(const char* str1, const char* str2); // 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 ca313bdea..fb41b3911 100644 --- a/src/boot_O2_g3/boot_0x800968B0.c +++ b/src/boot_O2_g3/boot_0x800968B0.c @@ -1,12 +1,15 @@ #include <ultra64.h> #include <global.h> -u32 func_800968B0(const u8* a0, const u8* a1) { - u8 v0; - u8 v1; +/* + * Compare strings (strcmp). + */ +s32 func_800968B0(const char* str1, const char* str2) { + char v0; + char v1; do { - v0 = *a0++; - v1 = *a1++; + v0 = *str1++; + v1 = *str2++; if (v0 != v1) { return v0 - v1; } |