From 19861fda5145051be186942d19b13b176940bde6 Mon Sep 17 00:00:00 2001 From: Banjo Kazooie Date: Tue, 8 Nov 2022 16:25:54 -0600 Subject: [PATCH] core2/code_7AF80.c func_80305924() done --- README.md | 2 +- progress/progress_core2.svg | 4 ++-- progress/progress_total.svg | 4 ++-- src/core2/code_7AF80.c | 7 ++----- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index a4404f61..776c0bde 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (93.5398%) +# banjo (93.5467%) diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index 21c66237..abf110e9 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -17,7 +17,7 @@ core2 - 91.9376% - 91.9376% + 91.9495% + 91.9495% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index f8bc3880..25e462d5 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 93.5398% - 93.5398% + 93.5467% + 93.5467% \ No newline at end of file diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c index 12e916d2..70ce8ebf 100644 --- a/src/core2/code_7AF80.c +++ b/src/core2/code_7AF80.c @@ -1282,23 +1282,20 @@ s32 func_803058C0(f32 arg0) { return ((arg0 >= 0.0f) ? arg0 / 1000 : (arg0 / 1000) - 1.0f) - D_80381FA0.min[1]; } -#ifndef NONMATCHING -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_7AF80/func_80305924.s") -#else s16 *func_80305924(void) { + s16 *new_var; s32 var_v1; s16 *temp_a0; s16 *var_v0; temp_a0 = (s16*) malloc(D_8036ABA8 * sizeof(s16)); for(var_v1 = 0; var_v1 < D_8036ABA8; var_v1++){ - var_v0 = temp_a0 + var_v1; + var_v0 = (new_var = temp_a0) + var_v1; *var_v0 = 0; } return temp_a0; } -#endif void func_80305990(s32 arg0) { s32 sp1C[3];