From 82ff6d4886bfb9b2a1ffceb0021f8e0cca44c8ca Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Thu, 8 Dec 2022 19:12:18 -0600
Subject: [PATCH] func_802559A0() match

---
 README.md                   |  2 +-
 progress/progress_core1.svg |  4 ++--
 progress/progress_total.svg |  4 ++--
 src/core1/memory.c          | 20 ++------------------
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 6d0d46ad..5317fb8b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (95.3445%)
+# banjo (95.3508%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index 2db8d69e..3b5d325f 100644
--- a/progress/progress_core1.svg
+++ b/progress/progress_core1.svg
@@ -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">92.9087%</text>
-        <text x="77.5" y="14">92.9087%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">92.9525%</text>
+        <text x="77.5" y="14">92.9525%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 25c73111..f03ad3c4 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">95.3445%</text>
-        <text x="183.5" y="14">95.3445%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">95.3508%</text>
+        <text x="183.5" y="14">95.3508%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core1/memory.c b/src/core1/memory.c
index 1122c237..3f984e69 100644
--- a/src/core1/memory.c
+++ b/src/core1/memory.c
@@ -777,25 +777,9 @@ void func_80255980(void *arg0, int arg1){
     D_802765A4 = D_802765AC;
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/memory/func_802559A0.s")
-#else
-bool func_802559A0(){
-    s32 var_v0;
-    s32 var_v1;
-
-    var_v0 = FALSE;
-    if (D_80276598 == FALSE) {
-        var_v0 = NOT(D_80283220 < 0xF4240);
-        if (!var_v0) {
-            var_v1 =  (D_80276594 == TRUE) ? FALSE : TRUE;
-            var_v0 = var_v1 != 0;
-        }
-        return var_v0;
-    }
-    return var_v0;
+bool func_802559A0(void) {
+    return (D_80276598 == 0) ? (D_80283220 >= 0xF4240) || ((D_80276594 == 1) ? 0 : 1) : 0;
 }
-#endif
 
 void func_80255A04(void){
     D_80276594 = 1;