From 1d406e182047d8b3a66737a0b8c740db29ea260f Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Mon, 2 Jan 2023 20:49:39 -0600
Subject: [PATCH] 97%, func_80241490() match

---
 README.md                   |  2 +-
 progress/progress_core1.svg |  6 +++---
 progress/progress_total.svg |  6 +++---
 src/core1/code_18210.c      |  2 +-
 src/core1/code_3A70.c       | 40 +++++++++++++++++++++++++++++++++++--
 5 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 32ca45cd..3cd45f4e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (96.8603%)
+# banjo (97.0502%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index 83a0e9b2..feec02bd 100644
--- a/progress/progress_core1.svg
+++ b/progress/progress_core1.svg
@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#18e000" d="M44 0h67v20H44z"/>
+        <path fill="#12e000" 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">94.7463%</text>
-        <text x="77.5" y="14">94.7463%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">96.0549%</text>
+        <text x="77.5" y="14">96.0549%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index d87b8f44..e87aa9ec 100644
--- a/progress/progress_total.svg
+++ b/progress/progress_total.svg
@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h150v20H0z"/>
-        <path fill="#0ee000" d="M150 0h67v20H150z"/>
+        <path fill="#0de000" d="M150 0h67v20H150z"/>
         <path fill="url(#b)" d="M0 0h217v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -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">96.8603%</text>
-        <text x="183.5" y="14">96.8603%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">97.0502%</text>
+        <text x="183.5" y="14">97.0502%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core1/code_18210.c b/src/core1/code_18210.c
index f94405dd..650109f4 100644
--- a/src/core1/code_18210.c
+++ b/src/core1/code_18210.c
@@ -11,7 +11,7 @@ s32 D_80283388;
 void func_80255C30(void) {
     D_80283384 = *(s32 *)0xA4000000 ^ -1;
     D_80283388 = (D_80283384) ? 1 :0;
-    D_80283380 = *(s32 *)0xA4001000 ^ 0x17D7;
+    D_80283380 = *(s32 *)0xA4001000 ^ 6103;
     D_80283388 |= (D_80283380) ? 2 :0;
     if (D_80283388 == 0) {
         func_802405F0(&D_80283280, 0xB0000B70, 0x100);
diff --git a/src/core1/code_3A70.c b/src/core1/code_3A70.c
index 88cae1f2..3060d667 100644
--- a/src/core1/code_3A70.c
+++ b/src/core1/code_3A70.c
@@ -2,6 +2,10 @@
 #include "functions.h"
 #include "variables.h"
 
+extern f32 ml_cos_deg(f32);
+extern f32 ml_sin_deg(f32);
+extern void func_8024C5F0(s32[3]);
+
 Gfx D_80275880[] = {
     gsSPClearGeometryMode(G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0060CD00),
     gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
@@ -22,7 +26,7 @@ void func_80241490(Gfx **gfx, Vtx **vtx, s32 *arg2[3], s32 arg3[3], s32 arg4[3],
     s32 sp78[3][4];
     s32 i;
 
-    func_8024C5F0(&spB4);
+    func_8024C5F0(spB4);
     gSPDisplayList((*gfx)++, D_80275880);
     if (arg6 != 0) {
         gSPSetGeometryMode((*gfx)++, G_ZBUFFER | G_CULL_BACK);
@@ -85,7 +89,39 @@ void func_80241490(Gfx **gfx, Vtx **vtx, s32 *arg2[3], s32 arg3[3], s32 arg4[3],
     gSP2Triangles((*gfx)++, 0, 1, 2, 0, 1, 3, 2, 0);
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_80241928.s")
+void func_80241928(Gfx** gfx, Vtx** vtx, s32 arg2[3], s32 arg3, s32 arg4[3]) {
+    s32 spB4[3];
+    f32 var_f26;
+    s32 var_fp;
+    s32 var_s0;
+
+    func_8024C5F0(spB4);
+    for(var_fp = 0; var_fp < 4; var_fp++){
+        gSPDisplayList((*gfx)++, D_80275880);
+        gSPSetGeometryMode((*gfx)++, G_ZBUFFER);
+        gSPVertex((*gfx)++, *vtx, 10, 0);
+        for(var_f26 = 0; var_f26 <= 90; var_f26 += 22.5){
+            for(var_s0 = -300; var_s0 < 900; var_s0 += 600){
+                (*vtx)->v.ob[0] = ((ml_sin_deg(var_fp*90 + var_f26) * arg3) + (f32) arg2[0]) - spB4[0];
+                (*vtx)->v.ob[1] = ((var_s0 / 2) + arg2[1]) - spB4[1];
+                (*vtx)->v.ob[2] = ((ml_cos_deg(var_fp*90 + var_f26) * arg3) + (f32) arg2[2]) - spB4[2];
+                (*vtx)->v.tc[0] = 0;
+                (*vtx)->v.tc[1] = 0;
+                (*vtx)->v.cn[0] = 0;
+                (*vtx)->v.cn[1] = 0;
+                (*vtx)->v.cn[2] = 0;
+                (*vtx)->v.cn[3] = 0;
+                (*vtx)++;
+            }
+        }
+        gDPPipeSync((*gfx)++);
+        
+        for(var_f26 = 0; var_f26 < 4; var_f26++){
+            gDPSetPrimColor((*gfx)++, 0, 0, arg4[0], arg4[1], arg4[2], 90.0f + (var_fp * 25.0f) + (var_f26 * 6.25f));
+            gSP2Triangles((*gfx)++, var_f26*2, var_f26*2 + 3, var_f26*2 + 1, var_f26*2, var_f26*2, var_f26*2 + 2, var_f26*2 + 3, var_f26*2);
+        }
+    }
+}
 
 void func_802424D4(Gfx **gfx, Mtx **mtx, Vtx **vtx, f32 arg3[3], f32 arg4[3], f32 arg5, s32 arg6[4]) {
     s32 var_a0;