diff --git a/README.md b/README.md index 25539835..e78df060 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (93.7175%) +# banjo (93.7918%) diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index b250ad65..f36bd0ff 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ core2 - 92.2473% - 92.2473% + 92.3767% + 92.3767% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index 0f111bd7..b647eaee 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 93.7175% - 93.7175% + 93.7918% + 93.7918% \ No newline at end of file diff --git a/src/core2/code_72060.c b/src/core2/code_72060.c index f0cc9ee0..27e996df 100644 --- a/src/core2/code_72060.c +++ b/src/core2/code_72060.c @@ -81,9 +81,6 @@ void func_802F9134(s32 gfx){ } } -#ifndef NONMATCHING -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_72060/func_802F919C.s") -#else void func_802F919C(void) { f32 temp_f20; s32 sp68; @@ -119,12 +116,14 @@ void func_802F919C(void) { for(var_v1 = 0; var_v1 < 3; var_v1++){ sp5C->unk0[var_v1] += sp5C->unkC[var_v1] * temp_f20; } + sp5C->unkC[sp60] += ((randf() * 30.0) - 15.0); } D_8036928C++; if (D_8036928C < D_80369284) { - if (ml_vec3f_distance(D_80369280[0].unk1C[D_8036928C].unk0, D_80381040) > 1300.0f) { + sp5C = &D_80369280[0].unk1C[D_8036928C]; + if (ml_vec3f_distance((*sp5C).unk0, D_80381040) > 1300.0f) { func_802F9134(D_8036928C); } } else { @@ -162,7 +161,6 @@ void func_802F919C(void) { } } } -#endif void func_802F962C(Gfx **gfx, Mtx **mtx, Vtx **vtx) { u32 temp_s0_3; diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml index 607f176e..c749c998 100644 --- a/subyaml/core2.us.v10.yaml +++ b/subyaml/core2.us.v10.yaml @@ -265,7 +265,7 @@ segments: - [0x70C30, c, code_70C30] #DONE - [0x70F20, c, code_70F20] #DONE - [0x71820, c, code_71820] #DONE - - [0x72060, c, code_72060] + - [0x72060, c, code_72060] #DONE - [0x72B10, c, code_72B10] #DONE - [0x73640, c, code_73640] #DONE - [0x74090, c, code_74090] #DONE