core1/code_9D30.c func_8024A564() done

README.md

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

progress/progress_core1.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#36e000" d="M44 0h67v20H44z"/>
+        <path fill="#35e000" 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">core1</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">87.9020%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">88.1315%</text>
-        <text x="77.5" y="14">87.9020%</text>
+        <text x="77.5" y="14">88.1315%</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.4956%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.5289%</text>
-        <text x="183.5" y="14">93.4956%</text>
+        <text x="183.5" y="14">93.5289%</text>
     </g>
 </svg>

src/core1/code_9D30.c

@@ -920,43 +920,49 @@ void func_8024A490(s32 x, s32 y, s32 w, s32 h) {
     }
 }
 
-#ifndef NONMATCHING
+void func_8024A564(s32 x, s32 y, u16 *arg2, s32 arg3, s32 arg4, f32 arg5, f32 arg6)
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_9D30/func_8024A564.s")
+{
-#else
+  s32 temp_a2;
-void func_8024A564(s32 x, s32 y, u16 *arg2, s32 arg3, s32 arg4, f32 arg5, f32 arg6) {
+  s32 temp_a2_2;
-    s32 temp_a2;
+  s32 temp_a2_3;
-    s32 temp_a2_2;
+  s32 temp_f6;
-    s32 temp_a2_3;
+  s32 temp_f6_2;
-    s32 temp_f6;
+  s32 temp_lo;
-    s32 temp_f6_2;
+  s32 temp_t5;
-    s32 temp_lo;
+  s32 var_a0;
-    s32 temp_t5;
+  s32 var_a2;
-    s32 var_a0;
+  s32 new_var;
-    s32 var_a2;
+  f32 new_var3;
-    s32 var_t1;
+  s32 new_var2;
-    s32 var_t3;
+  s32 var_t1;
-    s32 var_v0;
+  s32 var_t3;
-    s32 var_v1;
+  s32 var_v0;
-    u16 temp_t8;
+  s32 var_v1;
-    s16 *var_t0;
+  u16 temp_t8;
-    s16 *var_t2;
+  s16 *var_t0;
-
+  s16 *var_t2;
-    var_v0 = 0;
+  var_v0 = 0;
-    var_v1 = D_80276588;
+  var_v1 = D_80276588;
-    var_t0 = &D_803A5D00[D_802806EC][x + y * D_80276588];
+  var_t0 = &D_803A5D00[D_802806EC][x + (y * D_80276588)];
-    for( var_t1 = (arg4 * arg6) + 0.5; var_t1 != 0; var_t1--){
+  new_var = (s32) (((f64) (256.0f / (new_var3 = arg6))) + 0.5);
-        var_a2 = ((var_v0 >> 8) * arg3) << 8;
+  new_var2 = (s32) (((f64) (256.0f / arg5)) + 0.5);
-        var_t2 = var_t0;
+  for (var_t1 = (arg4 * arg6) + 0.5; var_t1 != 0; var_t1--)
-        var_v0 += (s32) ((f64) (256.0f / arg6) + 0.5);
+  {
-        for(var_t3 = (arg3 * arg5) + 0.5; var_t3 != 0; var_t3--){
+    temp_lo = (arg3 * arg5) + 0.5;
-            *var_t2 = arg2[var_a2 >> 8];
+    var_a2 = ((var_v0 >> 8) * arg3) << 8;
-            var_a2 += (s32) ((f64) (256.0f / arg5) + 0.5);
+    var_t2 = var_t0;
-            var_t2++;
+    for (var_t3 = temp_lo; var_t3 != 0; var_t3--)
-        }
+    {
-        var_t0 += D_80276588;
+      *var_t2 = arg2[var_a2 >> 8];
+      var_a2 += new_var2;
+      var_t2++;
     }
+
+    var_t0 += D_80276588;
+    var_v0 += new_var;
+  }
+
 }
-#endif
 
 //fills in rectangle in frame buffer with D_802806E0 color
 void draw_prim_rect(s32 x, s32 y, s32 w, s32 h) {