From cc8a6ffc7859931d857b839b243a8e6b4acb9f18 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Fri, 11 Nov 2022 13:11:27 -0600
Subject: [PATCH] core1/code_C4B0.c func_80293F0C() done

---
 README.md                   |  2 +-
 progress/progress_core2.svg |  4 ++--
 progress/progress_total.svg |  6 +++---
 src/core2/code_ABC00.c      | 21 +++++++++------------
 src/core2/code_C4B0.c       |  7 +------
 subyaml/core2.us.v10.yaml   |  2 +-
 6 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 8d07c22d..36b87c20 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (94.2875%)
+# banjo (94.3651%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index 44c5b667..63a54c9d 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">92.9949%</text>
-        <text x="77.5" y="14">92.9949%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">93.1301%</text>
+        <text x="77.5" y="14">93.1301%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 8fda2838..4283e05b 100644
--- a/progress/progress_total.svg
+++ b/progress/progress_total.svg
@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h150v20H0z"/>
-        <path fill="#1ae000" d="M150 0h67v20H150z"/>
+        <path fill="#19e000" d="M150 0h67v20H150z"/>
         <path fill="url(#b)" d="M0 0h217v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -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.2875%</text>
-        <text x="183.5" y="14">94.2875%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">94.3651%</text>
+        <text x="183.5" y="14">94.3651%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_ABC00.c b/src/core2/code_ABC00.c
index 5a48a15f..fd47820a 100644
--- a/src/core2/code_ABC00.c
+++ b/src/core2/code_ABC00.c
@@ -272,19 +272,16 @@ void func_80333270(enum jiggy_e jiggy_id, f32 position[3], void (*method)(Actor
     ptr->unk10.unk18 = other_marker;
 }
 
-#ifndef NONMATCHING
-void func_803332D0(Actor *);
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_ABC00/func_803332D0.s")
-#else
-void func_803332D0(Actor * arg0){
-    // s32 indx = func_802C8088(arg0) - 1;
-    // s32 size = 0x2C;
-    Struct_core2_ABC00_0 *ptr = D_8036E834 + (func_802C8088(arg0) - 1);
-    Struct81s *sp18 = &ptr->unk10;
-    ptr->unkC(sp18);
-    sp18->marker = NULL;
+void func_803332D0(Actor *arg0)
+{
+  s32 indx = func_802C8088(arg0) - 1;
+  Struct81s *sp18 = &D_8036E834[indx].unk10;
+  if (D_8036E834[indx].unkC)
+  {
+  }
+  D_8036E834[indx].unkC(sp18);
+  sp18->marker = 0;
 }
-#endif
 
 void func_80333334(enum jiggy_e jiggy_id) {
     Struct_core2_ABC00_0 *temp_v0;
diff --git a/src/core2/code_C4B0.c b/src/core2/code_C4B0.c
index f4b5a081..c5cd6f6c 100644
--- a/src/core2/code_C4B0.c
+++ b/src/core2/code_C4B0.c
@@ -303,9 +303,6 @@ f32 func_80293EAC(f32 arg0, f32 arg1, f32 arg2){
      return arg1;
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_C4B0/func_80293F0C.s")
-#else
 void func_80293F0C(void){
     f32 sp44[3];
     f32 sp38[3];
@@ -333,7 +330,7 @@ void func_80293F0C(void){
             _player_getPosition(D_8037C218);
             func_80298504(D_8037C228);
             ml_vec3f_diff_copy(D_8037C238, D_8037C218, D_8037C228);
-            if ((D_8037C274 == 3) && func_8031C594(D_8037C200) && ((func_8031C5E4(D_8037C200) - 70.0f) < D_8037C218[1])) {
+            if ((D_8037C274 == 3) && func_8031C594(D_8037C200) && (D_8037C218[1] > (func_8031C5E4(D_8037C200) - 70.0f))) {
                 D_8037C218[1] = func_8031C5E4(D_8037C200) - 70.0f;
                 D_8037C27E = 1;
                 player_setYVelocity(1.0f);
@@ -391,13 +388,11 @@ void func_80293F0C(void){
     func_80298504(sp2C);
     _player_getPosition(sp38);
     ml_vec3f_diff_copy(D_8037C268, sp38, sp2C);
-    // temp_a1 = D_8037C204;
     if (D_8037C204) {
         func_8024587C(&D_8037C208, D_8037C204);
         D_8037C204 = &D_8037C208;
     }
 }
-#endif
 
 void func_8029436C(s32 arg0){
      D_8037C27F = arg0;
diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml
index a91bc4d3..8b79d71a 100644
--- a/subyaml/core2.us.v10.yaml
+++ b/subyaml/core2.us.v10.yaml
@@ -324,7 +324,7 @@ segments:
   - [0x9E370, c, code_9E370]
   - [0xA4D00, c, code_A4D00] #DONE
   - [0xA5BC0, c, code_A5BC0]
-  - [0xABC00, c, code_ABC00]
+  - [0xABC00, c, code_ABC00] #DONE
   - [0xAC520, c, code_AC520] #DONE
   - [0xAD110, c, code_AD110] #DONE
   - [0xAD5B0, c, code_AD5B0] #DONE