core2/code_C89C0.c done

README.md

@@ -1,4 +1,4 @@
-# banjo (93.5467%)
+# banjo (93.6207%)
 
 <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="#24e000" d="M44 0h67v20H44z"/>
+        <path fill="#23e000" 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">91.9495%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">92.0785%</text>
-        <text x="77.5" y="14">91.9495%</text>
+        <text x="77.5" y="14">92.0785%</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.5467%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.6207%</text>
-        <text x="183.5" y="14">93.5467%</text>
+        <text x="183.5" y="14">93.6207%</text>
     </g>
 </svg>

src/core2/code_C89C0.c

@@ -224,16 +224,15 @@ void func_80350174(void) {
     }
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_C89C0/func_80350250.s")
-#else
 void func_80350250(void) {
     f32 sp7C[3];
     f32 sp70[3];
     f32 temp_f22;
+
     Struct_core2_C89C0_1 *var_s0;
     Struct_core2_C89C0_0 *var_s0_2;
 
+    
     temp_f22 = time_getDelta();
     if ((D_80386150.unk0 != NULL) && (func_80334904() == 2)) {
         player_getPosition(sp7C);
@@ -274,11 +273,12 @@ void func_80350250(void) {
         }
 
         for(var_s0_2 = D_80386150.unk14; var_s0_2 < D_80386150.unk18; var_s0_2++) {
+            if(1);
             if (var_s0_2->unk4->unk4 != 0) {
                 func_8034F950(var_s0_2);
-                var_s0_2->unk1C += var_s0_2->unk34 * (3.0f - var_s0_2->unk18) * 100.0f * temp_f22;
+                var_s0_2->unk1C += var_s0_2->unk34 *  (3 - var_s0_2->unk18) * 100.0f * temp_f22;
-                var_s0_2->unk20 += var_s0_2->unk38 * (3.0f - var_s0_2->unk18) * 20.0f * temp_f22;
+                var_s0_2->unk20 += var_s0_2->unk38 *  (3 - var_s0_2->unk18) * 20.0f * temp_f22;
-                var_s0_2->unk14 += var_s0_2->unk30 * (3.0f - var_s0_2->unk18) * 180.0f * temp_f22;
+                var_s0_2->unk14 += var_s0_2->unk30 *  (3 - var_s0_2->unk18) * 180.0f * temp_f22;
                 if (var_s0_2->unk1C > 0.0f) {
                     var_s0_2->unk1C -= var_s0_2->unk1C * temp_f22;
                     if (var_s0_2->unk1C < 0.0f) {
@@ -286,8 +286,8 @@ void func_80350250(void) {
                     }
                 }
                 var_s0_2->unk20 -= var_s0_2->unk20 * temp_f22;
-                sp70[0] = -var_s0_2->unk1C * temp_f22;
+                sp70[0] = -var_s0_2->unk1C * temp_f22;\
-                sp70[1] = 0.0f;
+                sp70[1] = 0.0f;\
                 sp70[2] = 0.0f;
                 ml_vec3f_yaw_rotate_copy(&sp70, &sp70, var_s0_2->unk14);
                 var_s0_2->unk8[0] = var_s0_2->unk8[0] + sp70[0];
@@ -299,7 +299,6 @@ void func_80350250(void) {
         }
     }
 }
-#endif
 
 void func_803506DC(void){
     s32 sp1C = D_80386150.unk8;

subyaml/core2.us.v10.yaml

@@ -377,7 +377,7 @@ segments:
   - [0xC8360, c, code_C8360] #DONE
   - [0xC8490, c, code_C8490] #DONE
   - [0xC8760, c, code_C8760] #DONE
-  - [0xC89C0, c, code_C89C0]
+  - [0xC89C0, c, code_C89C0] #DONE
   - [0xC97F0, c, code_C97F0] #DONE
   - [0xC9E70, c, code_C9E70] #DONE
   - [0xC9F00, c, code_C9F00] #DONE