From a59989f088aa5601b513eb8780f9a508c25848ce Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Wed, 30 Nov 2022 16:00:04 -0600
Subject: [PATCH] core2/code_1930.c done

---
 README.md                   |  2 +-
 decompressed.us.v10.yaml    |  2 +-
 progress/progress_core2.svg |  4 ++--
 progress/progress_total.svg |  4 ++--
 src/core2/code_1930.c       | 24 ++++++++++--------------
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 36f0cbda..274efcf4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (94.8573%)
+# banjo (94.8627%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml
index 8ab72e4e..93db89df 100644
--- a/decompressed.us.v10.yaml
+++ b/decompressed.us.v10.yaml
@@ -495,7 +495,7 @@ segments:
   - [0xF56430, c, code_AD0] #DONE
   - [0xF56A40, c, code_10E0] #DONE
   - [0xF56EB0, c, code_1550] #DONE
-  - [0xF57290, c, code_1930]
+  - [0xF57290, c, code_1930] #DONE
   - [0xF57BA0, c, code_2240] #DONE
   - [0xF581F0, c, code_2890] #DONE
   - [0xF58DE0, c, code_3480] #DONE
diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index 1275578f..5fd3316a 100644
--- a/progress/progress_core2.svg
+++ b/progress/progress_core2.svg
@@ -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">93.5683%</text>
-        <text x="77.5" y="14">93.5683%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">93.5776%</text>
+        <text x="77.5" y="14">93.5776%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index b90e3198..5f6e8c0a 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.8573%</text>
-        <text x="183.5" y="14">94.8573%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">94.8627%</text>
+        <text x="183.5" y="14">94.8627%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_1930.c b/src/core2/code_1930.c
index a394cc78..5cdf1cab 100644
--- a/src/core2/code_1930.c
+++ b/src/core2/code_1930.c
@@ -9,26 +9,22 @@ extern void func_80250E6C(f32, f32);
 extern void func_802BB360(s32, f32);
 extern void func_802BB378(s32, f32, f32);
 extern void func_802BB3AC(s32, f32);
-extern void func_8031B908(u8, u8, u8, f32);
+extern void func_8031B908(s32, s32, s32, f32);
 
 /* .bss */
 s32 D_8037BF10;
 
 /* .code */
-#ifndef NONMATCHING
-void func_802888C0(s32 arg0, s32 arg1);
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_1930/func_802888C0.s")
-#else
-void func_802888C0(s32 arg0, s32 arg1){
-    u8 sp1C[3];
-    f32 f0;
-    sp1C[0] = arg0 >> 16;\
-    sp1C[1] = arg0 >> 8;\
-    sp1C[2] = arg0 >> 0;\
-    f0 = reinterpret_cast(f32, arg1);\
-    func_8031B908(sp1C[0], sp1C[1], sp1C[2], f0);
+void func_802888C0(s32 arg0, s32 arg1)
+{
+  u8 sp1C[3];
+  f32 f0;
+  sp1C[0] = (arg0 >> 16) & 0xFF;
+  sp1C[1] = (arg0 >> 8) & 0xFF;
+  sp1C[2] = (arg0 >> 0) & 0xFF;
+  f0 = reinterpret_cast(f32, arg1);
+  func_8031B908(sp1C[0], sp1C[1], sp1C[2], f0);
 }
-#endif
 
 void func_80288914(s32 arg0, s32 arg1, s32 arg2){
     f32 f0 = reinterpret_cast(f32, arg1);