From 39071f097a1f25c4939ac5f9eb34dabbf9c46661 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Sat, 30 Jul 2022 15:58:23 -0500
Subject: [PATCH] core2/code_C9F00.c done

---
 progress/progress_core2.svg |  6 +++---
 progress/progress_total.svg |  4 ++--
 src/core2/code_C9F00.c      | 39 +++++++++++++++----------------------
 subyaml/core2.us.v10.yaml   |  2 +-
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index 880622a1..0ec014ca 100644
--- a/progress/progress_core2.svg
+++ b/progress/progress_core2.svg
@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#6de000" d="M44 0h67v20H44z"/>
+        <path fill="#6ce000" 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">core2</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">75.7777%</text>
-        <text x="77.5" y="14">75.7777%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">75.7875%</text>
+        <text x="77.5" y="14">75.7875%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 9544e88b..3d80b6b1 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">80.8942%</text>
-        <text x="183.5" y="14">80.8942%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">80.8998%</text>
+        <text x="183.5" y="14">80.8998%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_C9F00.c b/src/core2/code_C9F00.c
index 752ad94b..d6486a40 100644
--- a/src/core2/code_C9F00.c
+++ b/src/core2/code_C9F00.c
@@ -20,12 +20,17 @@ typedef struct {
     u32 unk6_6:6;
     u32 pad6_4:1;
     u16 unk8;
-    u16 padA_15:10;
-    u16 unkA_5:1;
-    u16 unkA_4:1;
-    u16 padA_3:2;
-    u16 unkA_1:1;
-    u16 padA_0:1;
+    union{
+        struct{
+            u16 padA_15:10;
+            u16 unkA_5:1;
+            u16 unkA_4:1;
+            u16 padA_3:2;
+            u16 unkA_1:1;
+            u16 padA_0:1;
+        };
+        u16 unkA;
+    };
 }Struct_Core2_C9F00_2;
 
 typedef struct {
@@ -237,32 +242,20 @@ bool func_803515EC(Struct_Core2_C9F00_2 *arg0) {
     return TRUE;
 }
 
-#ifndef NONMATCHING
-bool func_80351700(Struct_Core2_C9F00_2 * arg0);
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_C9F00/func_80351700.s")
-#else
 bool func_80351700(Struct_Core2_C9F00_2 * arg0){
-    // if ((arg0->unkA << 0x1E) < 0) {
-    if (arg0->unkA_1) {
-        return 1;
+    if (((arg0->unkA << 0x1E) >> 0x1F)) {
+        return TRUE;
     }
-    return 1;
+    return TRUE;
 }
-#endif
 
-#ifndef NONMATCHING
-bool func_80351724(Struct_Core2_C9F00_2 * arg0);
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_C9F00/func_80351724.s")
-#else
 bool func_80351724(Struct_Core2_C9F00_2 * arg0){
-    // if (arg0->unkA_1 && arg0->unkA_5) {
-    if (((arg0->unkA << 0x1E) < 0) && ((arg0->unkA << 0x1A) < 0)) {
+    if (((arg0->unkA << 0x1E) >> 0x1F) && ((arg0->unkA << 0x1A) >> 0x1F)) {
         arg0->unkA_5 = FALSE;
         arg0->unkA_4 = TRUE;
     }
-    return 1;
+    return TRUE;
 }
-#endif
 
 s32 func_80351758(Struct68s *arg0){
     if(arg0->unk0 == 0){
diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml
index 1b39d0bf..4e7bd881 100644
--- a/subyaml/core2.us.v10.yaml
+++ b/subyaml/core2.us.v10.yaml
@@ -367,7 +367,7 @@ segments:
   - [0xC89C0, c, code_C89C0]
   - [0xC97F0, c, code_C97F0]
   - [0xC9E70, c, code_C9E70] #DONE
-  - [0xC9F00, c, code_C9F00]
+  - [0xC9F00, c, code_C9F00] #DONE
   - [0xCB050, c, code_CB050] #DONE
   - [0xCB610, c, code_CB610] #DONE
   - [0xCB8A0, c, code_CB8A0] #DONE