From 422fb815fbd2d4900f7c7413a9fa72c7d7b44d77 Mon Sep 17 00:00:00 2001 From: Banjo Kazooie Date: Mon, 17 Oct 2022 13:59:23 -0500 Subject: [PATCH] core2/code_75E90.c done --- README.md | 2 +- progress/progress_core2.svg | 4 ++-- progress/progress_total.svg | 4 ++-- src/core2/code_75E90.c | 38 ++++++++++++++----------------------- subyaml/core2.us.v10.yaml | 2 +- 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 335cd354..bc588754 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (91.3263%) +# banjo (91.3398%) diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index db6df5de..c1e527af 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -17,7 +17,7 @@ core2 - 89.1135% - 89.1135% + 89.1369% + 89.1369% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index 0288e14c..d73fa615 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 91.3263% - 91.3263% + 91.3398% + 91.3398% \ No newline at end of file diff --git a/src/core2/code_75E90.c b/src/core2/code_75E90.c index 92f50a92..f0eb8fdb 100644 --- a/src/core2/code_75E90.c +++ b/src/core2/code_75E90.c @@ -34,38 +34,28 @@ void func_802FCE88(void){ } } -#ifndef NONMATCHING -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_75E90/func_802FCECC.s") -#else void func_802FCECC(struct8s *arg0) { - s32 temp_a1; - s32 temp_t9; - s32 var_v1; - struct8s **var_v0; - void **var_v0_2; - struct8s *temp_a0; - struct8s *sp18; + s32 var_v0; + struct8s *sp20; - for(var_v1 = 0; var_v1 < D_80369914; var_v1++){ - temp_a0 = D_80381590[var_v1]; - if (arg0 == temp_a0) { - sp18 = D_80381590[0]; - func_802FB020(temp_a0, 1); - sp18->unk10 = 3.0f; - if (sp18->unk18 == 0) { - sp18->unk1C = 0.0f; + for(var_v0 = 0; var_v0 < D_80369914; var_v0++){ + if (arg0 == D_80381590[var_v0]) { + sp20 = D_80381590[0]; + func_802FB020(D_80381590[var_v0], 1); + sp20->unk10 = 3.0f; + + if (sp20->unk18 == 0) { + sp20->unk1C = 0.0f; } - break; + return; } - } - var_v0 = D_80381590 + D_80369914; - for(var_v1 = 0; var_v1 < D_80369914; var_v1++){ - var_v0[-var_v1] = var_v0[-(var_v1 + 1)]; + } + for(var_v0 = D_80369914; var_v0> 0; var_v0--) { + D_80381590[var_v0] = D_80381590[var_v0-1]; } D_80381590[0] = arg0; D_80369914++; } -#endif void func_802FCFA0(s32 arg0, struct8s *arg1){ func_802FCECC(arg1); diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml index 7cab3fdd..d9748fb9 100644 --- a/subyaml/core2.us.v10.yaml +++ b/subyaml/core2.us.v10.yaml @@ -275,7 +275,7 @@ segments: - [0x74ED0, c, code_74ED0] #DONE - [0x75480, c, code_75480] #DONE - [0x75930, c, code_75930] #DONE - - [0x75E90, c, code_75E90] + - [0x75E90, c, code_75E90] #DONE - [0x76390, c, code_76390] #DONE - [0x763D0, c, code_763D0] #DONE - [0x76D90, c, code_76D90]