From fadd3f69944c056b76d27b6717180652c2e79a1a Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Sun, 8 Jan 2023 21:12:18 -0600
Subject: [PATCH] core1/code_15770.c done, func_80253428() match

---
 README.md                   |  2 +-
 decompressed.us.v10.yaml    |  2 +-
 progress/progress_core1.svg |  4 ++--
 progress/progress_total.svg |  4 ++--
 src/core1/code_15770.c      | 25 ++++++++++++-------------
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index a40189a2..06414611 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (97.7837%)
+# banjo (97.7919%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml
index 3129b637..cbf61499 100644
--- a/decompressed.us.v10.yaml
+++ b/decompressed.us.v10.yaml
@@ -171,7 +171,7 @@ segments:
   - [0xF2CBE0, c, code_13990]
   - [0xF2E840, hasm, code_155F0] #DONE
   - [0xF2E880, c, code_15630] #DONE
-  - [0xF2E9C0, c, code_15770]
+  - [0xF2E9C0, c, code_15770] #DONE
   - [0xF2ED80, c, code_15B30] #DONE
   - [0xF2FCA0, c, memory]     #DONE
   - [0xF31360, c, code_18110] #DONE
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index d6bb42ec..94ce7dbc 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">96.7959%</text>
-        <text x="77.5" y="14">96.7959%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">96.8520%</text>
+        <text x="77.5" y="14">96.8520%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 9e63e2af..56815fde 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">97.7837%</text>
-        <text x="183.5" y="14">97.7837%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">97.7919%</text>
+        <text x="183.5" y="14">97.7919%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core1/code_15770.c b/src/core1/code_15770.c
index 7a32966f..f2d9b580 100644
--- a/src/core1/code_15770.c
+++ b/src/core1/code_15770.c
@@ -8,7 +8,7 @@ struct {
 } D_80282FE0;
 
 extern u8 D_8000E800;
-extern u8 D_803A5D00[2][0x1ecc0];
+extern u16 D_803A5D00[2][0xF660];
 
 void func_80253208(Gfx **gdl, s32 x, s32 y, s32 w, s32 h, void *color_buffer);
 
@@ -42,22 +42,21 @@ int func_8025340C(void){
 
 void func_80253420(void){}
 
-#ifdef NONMATCHING
-s32 func_80253428(int arg0){
-    if(arg0){
-        D_80282FE0.unk0 = &D_8000E800;
-        while((s32)D_80282FE0.unk0 % 0x40){
-            D_80282FE0.unk0 = (s32)D_80282FE0.unk0 + 2;
+void func_80253428(int arg0) {
+    u16 *var_v0;
+    int new_var;
+    if (arg0) {
+        var_v0 = (D_80282FE0.unk0 = &D_8000E800);
+        while (((s32) D_80282FE0.unk0) % 0x40) {\
+          var_v0 = (D_80282FE0.unk0 = var_v0 + 1);
         }
-    }else{//L80253494
-        D_80282FE0.unk0 = NULL;
         
-    }//L802534A0
+        do { } while ((&D_8000E800 && 1) * 0); //remove this
+    }else{
+        D_80282FE0.unk0 = 0;
+    }
     D_80282FE0.unk4 = 0;
 }
-#else
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_15770/func_80253428.s")
-#endif
 
 void func_802534A8(int arg0){
     D_80282FE0.unk4 = (D_80282FE0.unk0 != NULL && arg0);