From 3aa4568342cc53c148dd258a852274cbcd510a90 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Wed, 23 Nov 2022 14:38:38 -0600
Subject: [PATCH] func_8024C7B8() done

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

diff --git a/README.md b/README.md
index 459fa51e..d9529fe0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (94.5848%)
+# banjo (94.6059%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index 35b38a90..00281d74 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="#2ce000" d="M44 0h67v20H44z"/>
+        <path fill="#2be000" 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">90.1759%</text>
-        <text x="77.5" y="14">90.1759%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">90.3213%</text>
+        <text x="77.5" y="14">90.3213%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index d9fd2ab0..5e28afee 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">94.5848%</text>
-        <text x="183.5" y="14">94.5848%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">94.6059%</text>
+        <text x="183.5" y="14">94.6059%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core1/code_EAF0.c b/src/core1/code_EAF0.c
index f8a068b1..b9559901 100644
--- a/src/core1/code_EAF0.c
+++ b/src/core1/code_EAF0.c
@@ -107,25 +107,15 @@ void func_8024C794(f32 *arg0, f32 *arg1, f32 *arg2){
     *arg2 = D_80280EC0[2];
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024C7B8.s")
-#else
 void func_8024C7B8(Gfx **gfx, Mtx **mtx){
-    f32 tmp_f0;
-    f32 tmp_f16;
-    f32 tmp_f2;
-    f32 tmp_f18;
     gSPViewport((*gfx)++, &D_80280F10[D_80281018]);
 
-    tmp_f0 = D_80276588;
-    tmp_f2 = D_8027658C;
-    guOrtho(*mtx, -(2*tmp_f0), (2*tmp_f0), -(2*tmp_f2), (2*tmp_f2), 1.0f, 20.0f, 1.0f);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
+    guOrtho(*mtx, -(2*(f32)D_80276588), (2*(f32)D_80276588), -(2*(f32)D_8027658C), (2*(f32)D_8027658C), 1.0f, 20.0f, 1.0f);
+    gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     
     guTranslate(*mtx, 0.0f, 0.0f, 0.0f);
-    gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix((*gfx)++, OS_K0_TO_PHYSICAL((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 }
-#endif
 
 void func_8024C904(Gfx **gfx, Mtx **mtx){
     gSPViewport((*gfx)++, &D_80280F10[D_80281018]);