From 433a16c543d707592b01b222ae24aa80d30615f7 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Sun, 16 Oct 2022 17:50:01 -0500
Subject: [PATCH] 91%

---
 README.md                   |  2 +-
 progress/progress_core1.svg |  6 ++---
 progress/progress_total.svg |  4 +--
 src/core1/code_EAF0.c       | 52 +++++++++++++++++++++----------------
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 1eea9686..6e858f5b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (90.9653%)
+# banjo (91.0021%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index 1638b9e9..503a1016 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="#49e000" d="M44 0h67v20H44z"/>
+        <path fill="#48e000" 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">83.6434%</text>
-        <text x="77.5" y="14">83.6434%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">83.8974%</text>
+        <text x="77.5" y="14">83.8974%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 7428843a..90a93d09 100644
--- a/progress/progress_total.svg
+++ b/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">90.9653%</text>
-        <text x="183.5" y="14">90.9653%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">91.0021%</text>
+        <text x="183.5" y="14">91.0021%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core1/code_EAF0.c b/src/core1/code_EAF0.c
index dd5c57a7..ec6d1713 100644
--- a/src/core1/code_EAF0.c
+++ b/src/core1/code_EAF0.c
@@ -146,6 +146,7 @@ void func_8024C964(Gfx **gfx, Mtx **mtx, f32 near, f32 far){
         near = 750.0f;
         far = 1250.0f;
     }
+    
 
     guPerspective(*mtx, &sp5e, D_80275D20, D_80275D24, near, far, 0.5f);
     gSPPerspNormalize((*gfx)++, sp5e);
@@ -283,34 +284,41 @@ void func_8024CFD4(void){
     func_8025235C(D_80280EA0, D_80280EA0);
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024D1EC.s")
-#else
 void func_8024D1EC(f32 arg0[4], f32 arg1[4], f32 arg2[4], f32 arg3[4]){
-    arg0[0] = D_80280ED0[0][0];
-    arg1[0] = D_80280ED0[1][0];
-    arg2[0] = D_80280ED0[2][0];
-    arg3[0] = D_80280ED0[3][0];
-    arg0[1] = D_80280ED0[0][1];
-    arg1[1] = D_80280ED0[1][1];
-    arg2[1] = D_80280ED0[2][1];
-    arg3[1] = D_80280ED0[3][1];
-    arg0[2] = D_80280ED0[0][2];
-    arg1[2] = D_80280ED0[1][2];
-    arg2[2] = D_80280ED0[2][2];
-    arg3[2] = D_80280ED0[3][2];
-    arg0[3] = D_80280ED0[0][3];
-    arg1[3] = D_80280ED0[1][3];
-    arg2[3] = D_80280ED0[2][3];
-    arg3[3] = D_80280ED0[3][3];
+    s32 i;
+    for(i = 0; i < 4; i++){
+        arg0[i] = D_80280ED0[0][i];
+        arg1[i] = D_80280ED0[1][i];
+        arg2[i] = D_80280ED0[2][i];
+        arg3[i] = D_80280ED0[3][i];
+    }
 }
-#endif
 
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024D2B0.s")
+void func_8024D2B0(f32 arg0[4], f32 arg1[4], f32 arg2[4], f32 arg3[4]){
+    s32 i;
+    for(i = 0; i < 4; i++){
+        D_80280ED0[0][i] = arg0[i];
+        D_80280ED0[1][i] = arg1[i];
+        D_80280ED0[2][i] = arg2[i];
+        D_80280ED0[3][i] = arg3[i];
+    }
+}
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024D374.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024D8F4.s")
+void func_8024D8F4(Cube *cube) {
+    f32 sp24[3];
+    f32 sp18[3];
+
+    sp24[0] = (f32) ((cube->x * 1000) - 150);
+    sp24[1] = (f32) ((cube->y * 1000) - 150);
+    sp24[2] = (f32) ((cube->z * 1000) - 150);
+    sp18[0] = sp24[0] + 1300.0f;
+    sp18[1] = sp24[1] + 1300.0f;
+    sp18[2] = sp24[2] + 1300.0f;
+    func_8024D374(sp24, sp18);
+}
+
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024D9B0.s")