From 915a2c9ec92cb6453e1db4fbdff5de3a71cafa96 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Fri, 9 Dec 2022 17:47:29 -0600
Subject: [PATCH] func_80328508() match

---
 README.md                   |  2 +-
 progress/progress_core2.svg |  4 ++--
 progress/progress_total.svg |  4 ++--
 src/core2/code_94620.c      |  1 -
 src/core2/code_9E370.c      | 32 ++++++++++++++------------------
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 5317fb8b..9ca4874e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (95.3508%)
+# banjo (95.3650%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index 5279096b..4060ed52 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.7629%</text>
-        <text x="77.5" y="14">93.7629%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">93.7877%</text>
+        <text x="77.5" y="14">93.7877%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index f03ad3c4..72340c16 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">95.3508%</text>
-        <text x="183.5" y="14">95.3508%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">95.3650%</text>
+        <text x="183.5" y="14">95.3650%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_94620.c b/src/core2/code_94620.c
index d9e30d4a..9cb8747d 100644
--- a/src/core2/code_94620.c
+++ b/src/core2/code_94620.c
@@ -26,7 +26,6 @@ void func_8031B5C4(s32 arg0) {
     D_80383150 = 1;
 }
 
-// regalloc
 bool func_8031B604(char *arg0) {
     return (arg0[0] == 0xFD) && (arg0[1] == 0x6A);
 }
diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c
index 16e91fc2..09369443 100644
--- a/src/core2/code_9E370.c
+++ b/src/core2/code_9E370.c
@@ -1151,20 +1151,20 @@ void func_80328478(f32 arg0[3], f32 arg1, f32 arg2){
     arg0[2] += sp1C[2]; 
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_9E370/func_80328508.s")
-#else
-bool func_80328508(Actor * arg0, s32 arg1){
+bool func_80328508(Actor *arg0, s32 arg1)
+{
     ActorAnimationInfo *animInfo;
-
+    s32 index;
     arg0->state = arg1;
-    if(arg0->unk18 != NULL)
-        return 0;
+    if (arg0->unk18 == 0)
+        return FALSE;
     
-    animInfo = &arg0->unk18[arg1];
+    animInfo = arg0->unk18 + arg1;
+    index = animInfo->index;
+    if (1);
 
-    if(animInfo->index != NULL){
-        if(arg0->animctrl == NULL){
+    if (index != 0){
+        if (arg0->animctrl == NULL){
             arg0->animctrl = animctrl_new(0);
             animctrl_reset(arg0->animctrl);
         }
@@ -1172,16 +1172,12 @@ bool func_80328508(Actor * arg0, s32 arg1){
         animctrl_setDuration(arg0->animctrl, animInfo->duration);
         animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards);
     }
-    else {
-        if(arg0->animctrl){
-            animctrl_setPlaybackType(arg0->animctrl,  ANIMCTRL_STOPPED);
-            animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards);
-        }
+    else if (arg0->animctrl) {
+        animctrl_setPlaybackType(arg0->animctrl, ANIMCTRL_STOPPED);
+        animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards);
     }
-    return 1;
-
+    return TRUE;
 }
-#endif
 
 void func_803285E8(Actor *this, f32 arg1, int direction){
     func_8028774C(this->animctrl, arg1);