From fefa2b709358ea98f83e2a78e29096e8f4d5fbb3 Mon Sep 17 00:00:00 2001 From: Banjo Kazooie Date: Mon, 31 Oct 2022 17:31:15 -0500 Subject: [PATCH] core2/code_72B10.c done --- README.md | 2 +- progress/progress_core2.svg | 4 ++-- progress/progress_total.svg | 4 ++-- src/core2/code_72B10.c | 11 +++-------- subyaml/core2.us.v10.yaml | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d00b2752..1e1d9a19 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (92.4511%) +# banjo (92.5147%) diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index 2045dc6a..b4254b4b 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -17,7 +17,7 @@ core2 - 90.6170% - 90.6170% + 90.7278% + 90.7278% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index 3c905765..b9c32728 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 92.4511% - 92.4511% + 92.5147% + 92.5147% \ No newline at end of file diff --git a/src/core2/code_72B10.c b/src/core2/code_72B10.c index 1aefb1c9..43b7d02c 100644 --- a/src/core2/code_72B10.c +++ b/src/core2/code_72B10.c @@ -177,16 +177,12 @@ void func_802FA0B0(s32 arg0, s32 arg1){ } } -#ifndef NONMATCHING -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_72B10/func_802FA0F8.s") -#else void func_802FA0F8(void){ - //stack allocation too large - struct4Es *iPtr; + f32 tick; struct4Es *startPtr; struct4Es *endPtr; - f32 tick; f32 f20; + struct4Es *iPtr; tick = time_getDelta(); startPtr = vector_getBegin(D_803810A0); @@ -245,9 +241,8 @@ void func_802FA0F8(void){ sfxsource_setSampleRate(iPtr->unk0, (s32)iPtr->unk8); } }//L802FA4A0 - }//L802FA4B4 + }//L802FA4B4 } -#endif void func_802FA4E0(void){ D_803810A0 = vector_defrag(D_803810A0); diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml index 7df6c347..8b0ef67a 100644 --- a/subyaml/core2.us.v10.yaml +++ b/subyaml/core2.us.v10.yaml @@ -266,7 +266,7 @@ segments: - [0x70F20, c, code_70F20] #DONE - [0x71820, c, code_71820] #DONE - [0x72060, c, code_72060] - - [0x72B10, c, code_72B10] + - [0x72B10, c, code_72B10] #DONE - [0x73640, c, code_73640] #DONE - [0x74090, c, code_74090] #DONE - [0x74290, c, code_74290] #DONE