From 113f40002edfe56cafe0de517d9d603d85e766dd Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Sat, 17 Dec 2022 14:35:07 -0600
Subject: [PATCH] func_8032F21C() match

---
 README.md                   | 2 +-
 progress/progress_core2.svg | 4 ++--
 progress/progress_total.svg | 4 ++--
 src/core2/code_A5BC0.c      | 6 +-----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 94494845..9c816644 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (96.5443%)
+# banjo (96.5722%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index c8611eee..41827a1c 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">95.7127%</text>
-        <text x="77.5" y="14">95.7127%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">95.7614%</text>
+        <text x="77.5" y="14">95.7614%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 746ffd0d..52d0a7ab 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">96.5443%</text>
-        <text x="183.5" y="14">96.5443%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">96.5722%</text>
+        <text x="183.5" y="14">96.5722%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c
index f70cf770..6581d2a0 100644
--- a/src/core2/code_A5BC0.c
+++ b/src/core2/code_A5BC0.c
@@ -951,9 +951,6 @@ void func_8032F194(ActorMarker *marker, s32 position[3], Cube *cube) {
 }
 #endif
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_A5BC0/func_8032F21C.s")
-#else
 void func_8032F21C(Cube *cube, s32 position[3], ActorMarker *marker, bool arg3) {
     ActorProp *sp1C;
 
@@ -967,7 +964,7 @@ void func_8032F21C(Cube *cube, s32 position[3], ActorMarker *marker, bool arg3)
     sp1C->unk8_15 = 0;
     sp1C->unk8_5 = FALSE;
 
-    sp1C->unk8_10 = (func_802E4A08(position)) ? 0xF : (u8)(randf() * 32);
+    sp1C->unk8_10 = (func_802E4A08()) ? 0xF : (u8)(randf() * 32);
     sp1C->unk8_3 = FALSE;
     sp1C->unk8_2 = FALSE;
     sp1C->unk8_4 = TRUE;
@@ -977,7 +974,6 @@ void func_8032F21C(Cube *cube, s32 position[3], ActorMarker *marker, bool arg3)
         func_80305CD8(func_803058C0((f32)position[1]), 1);
     }
 }
-#endif
 
 void func_8032F3D4(s32 arg0[3], ActorMarker *marker, s32 arg2){
     func_8032F21C((marker->unk40_23)? func_8030364C() : cube_atPosition_s32(arg0), arg0, marker, arg2);