core2/code_379B0.c done

README.md

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

decompressed.us.v10.yaml

@@ -622,7 +622,7 @@ segments:
   - [0xF8A0F0, c, code_34790] #DONE
   - [0xF8AE80, c, code_35520] #DONE
   - [0xF8B010, c, code_356B0] #DONE
-  - [0xF8D310, c, code_379B0]
+  - [0xF8D310, c, code_379B0] #DONE
   - [0xF8D630, c, code_37CD0] #DONE
   - [0xF8D7B0, c, code_37E50] #DONE
   - [0xF8DAB0, c, code_38150] #DONE

progress/progress_core2.svg

@@ -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">94.6580%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">94.6877%</text>
-        <text x="77.5" y="14">94.6580%</text>
+        <text x="77.5" y="14">94.6877%</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">95.9391%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">95.9562%</text>
-        <text x="183.5" y="14">95.9391%</text>
+        <text x="183.5" y="14">95.9562%</text>
     </g>
 </svg>

src/core2/code_379B0.c

@@ -10,45 +10,37 @@ f32 D_8037DA30[3];
 f32 D_8037DA40[3];
 
 /* .code */
-#ifndef NONMATCHING
+void func_802BE940(void)
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_379B0/func_802BE940.s")
+{
-#else
+  f32 sp3C[3];
-void func_802BE940(void) {
+  f32 sp30[2];
-    f32 sp3C[3];
+  f32 new_var;
-    f32 sp38;
+  f32 sp24[3];
-    f32 sp34;
-    f32 sp30;
-    f32 sp24[3];
-    f32 sp1C;
 
-    sp3C[0] = sp3C[1] = sp3C[2] = 0.0f;
+  sp3C[0] = (sp3C[1] = (sp3C[2] = 0.0f));
-    sp3C[1] = -1.0f;
+  sp3C[1] = -1.0f;
-    ml_vec3f_pitch_rotate_copy(sp24, sp3C, 68.0f);
+  ml_vec3f_pitch_rotate_copy(sp24, sp3C, 68.0f);
-    sp1C = 0.0f;
+  sp30[0] = sp24[1] * ((f32) framebuffer_width / framebuffer_height);
-    sp34 = sp24[1] * ((f32) framebuffer_width / (f32) framebuffer_height);
+  sp30[1] = 0;
-    D_8037DA40[0] = sp24[0];
+    
-    D_8037DA40[1] = sp24[1];
+  D_8037DA40[1] = sp24[1];
-    D_8037DA40[2] = sp24[2];
+  D_8037DA40[2] = sp24[2];
+  D_8037DA40[0] = sp24[0];
 
-    D_8037DA00[0] = (f32) (sp24[0] + sp34);
+  D_8037DA00[0] = (sp30[0] + sp24[0]);
-    D_8037DA00[1] = (f32) (sp24[1] + sp1C);
+  D_8037DA00[1] = (sp30[1] + sp24[1]);
-    D_8037DA00[2] = sp24[2];
+  D_8037DA00[2] = sp24[2];
-
+  D_8037DA10[0] = (sp30[0] -sp24[0]);
-    D_8037DA10[0] = (f32) (sp34 - sp24[0]);
+  D_8037DA10[1] = (sp30[1] -sp24[1]);
-    D_8037DA10[1] = (f32) (sp1C - sp24[1]);
+  D_8037DA10[2] = sp24[2];
-    D_8037DA10[2] = sp24[2];
+  new_var = -sp30[0];
-
+  D_8037DA20[0] = (new_var -sp24[0]);
-    sp30 = -sp34;
+  D_8037DA20[1] = (-sp30[1] -sp24[1]);
-    sp38 = -0.0f;
+  D_8037DA20[2] = sp24[2];
-    D_8037DA20[0] = (f32) (sp30 - sp24[0]);
+  D_8037DA30[0] = (new_var + sp24[0]);
-    D_8037DA20[1] = (f32) (sp38 - sp24[1]);
+  D_8037DA30[1] = (-sp30[1] + sp24[1]);
-    D_8037DA20[2] = sp24[2];
+  D_8037DA30[2] = sp24[2];
-
-    D_8037DA30[0] = (f32) (sp24[0] + sp30);
-    D_8037DA30[1] = (f32) (sp24[1] + sp38);
-    D_8037DA30[2] = sp24[2];
 }
-#endif
 
 void func_802BEA4C(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3]) {
     f32 sp24[3];