From e84beb8011dacebf2f70a992857f99168052046f Mon Sep 17 00:00:00 2001 From: Banjo Kazooie Date: Mon, 17 Oct 2022 13:45:03 -0500 Subject: [PATCH] core2/code_75480.c done --- README.md | 2 +- progress/progress_core2.svg | 4 ++-- progress/progress_total.svg | 4 ++-- src/core2/code_75480.c | 23 ++++++++++++++++++++++- subyaml/core2.us.v10.yaml | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f2653fd2..25f94841 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (91.2526%) +# banjo (91.2661%) diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index c35c9be3..428617b4 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -17,7 +17,7 @@ core2 - 88.9850% - 88.9850% + 89.0084% + 89.0084% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index fd3f8545..be23416b 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 91.2526% - 91.2526% + 91.2661% + 91.2661% \ No newline at end of file diff --git a/src/core2/code_75480.c b/src/core2/code_75480.c index 3e3321f3..5209edc5 100644 --- a/src/core2/code_75480.c +++ b/src/core2/code_75480.c @@ -33,7 +33,28 @@ void func_802FC468(void){ } } -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_75480/func_802FC4AC.s") +void func_802FC4AC(struct8s *arg0) { + s32 var_v0; + struct8s *sp20; + + for(var_v0 = 0; var_v0 < D_803698B4; var_v0++){ + if (arg0 == D_80381570[var_v0]) { + sp20 = D_80381570[0]; + func_802FB020(D_80381570[var_v0], 1); + sp20->unk10 = 3.0f; + + if (sp20->unk18 == 0) { + sp20->unk1C = 0.0f; + } + return; + } + } + for(var_v0 = D_803698B4; var_v0> 0; var_v0--) { + D_80381570[var_v0] = D_80381570[var_v0-1]; + } + D_80381570[0] = arg0; + D_803698B4++; +} void func_802FC580(s32 arg0, struct8s * arg1){ func_802FC4AC(arg1); diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml index 588eac94..bb2c7e01 100644 --- a/subyaml/core2.us.v10.yaml +++ b/subyaml/core2.us.v10.yaml @@ -273,7 +273,7 @@ segments: - [0x74420, c, code_74420] #DONE - [0x74910, c, code_74910] #DONE - [0x74ED0, c, code_74ED0] #DONE - - [0x75480, c, code_75480] + - [0x75480, c, code_75480] #DONE - [0x75930, c, code_75930] - [0x75E90, c, code_75E90] - [0x76390, c, code_76390] #DONE