core2/code_72060.c done

README.md

@@ -1,4 +1,4 @@
-# banjo (93.7175%)
+# banjo (93.7918%)
 
 <img src="./progress/progress_total.svg">
 

progress/progress_core2.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#23e000" d="M44 0h67v20H44z"/>
+        <path fill="#22e000" d="M44 0h67v20H44z"/>
         <path fill="url(#b)" d="M0 0h111v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
         <text x="22.0" y="14">core2</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">92.2473%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">92.3767%</text>
-        <text x="77.5" y="14">92.2473%</text>
+        <text x="77.5" y="14">92.3767%</text>
     </g>
 </svg>

progress/progress_total.svg

@@ -17,7 +17,7 @@
         <text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.7175%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.7918%</text>
-        <text x="183.5" y="14">93.7175%</text>
+        <text x="183.5" y="14">93.7918%</text>
     </g>
 </svg>

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;

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