From b4d50c81aeca7e35220b91ac32ef5802797af458 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Mon, 2 Jan 2023 13:58:47 -0600
Subject: [PATCH] func_8030A850() match

---
 README.md                   |  2 +-
 progress/progress_core2.svg |  4 ++--
 progress/progress_total.svg |  4 ++--
 src/core2/code_83340.c      | 35 +++++++++--------------------------
 symbol_addrs.us.v10.txt     |  1 -
 5 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 735d5a10..ca1ad3d0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (96.6549%)
+# banjo (96.6892%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index f3894939..f4c8474b 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.7968%</text>
-        <text x="77.5" y="14">95.7968%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">95.8567%</text>
+        <text x="77.5" y="14">95.8567%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index fd09b0f6..6d686432 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.6549%</text>
-        <text x="183.5" y="14">96.6549%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">96.6892%</text>
+        <text x="183.5" y="14">96.6892%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_83340.c b/src/core2/code_83340.c
index d1b99c45..a2dec832 100644
--- a/src/core2/code_83340.c
+++ b/src/core2/code_83340.c
@@ -22,8 +22,6 @@ BKModelBin *func_8030A428(s32 arg0);
 
 /* .data */
 s32 D_8036B800 = 0;
-s32 D_8036B804 = 0;
-s32 D_8036B808 = 0;
 
 /* .bss */
 struct_7AF80_0 *D_80382390; //prop models ???
@@ -152,42 +150,28 @@ void func_8030A78C(void){//init
     }
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_83340/func_8030A850.s")
-#else
 void func_8030A850(s32 arg0) {
-    struct_7AF80_0 *sp3C;
-    struct_7AF80_1 *temp_a0_2;
-    s32 sp34;
-    s32 sp30;
-    s32 temp_a0;
+    static s32 D_8036B804 = 0;
+    static s32 D_8036B808 = 0;
     s32 temp_s3;
     s32 var_s0;
-    s32 var_s0_2;
-    s32 var_v1;
-    s32 var_v1_2;
-    s32 var_v1_3;
-    s32 var_v1_4;
-    void *temp_v1;
+    struct_7AF80_0 *sp3C;
+    struct_7AF80_1 *temp_a0_2;
 
-    sp34 = func_8023DB5C();
-    sp30 = func_80255B08(arg0);
-    temp_s3 = sp34 - sp30;
-    for(var_s0 = 0; (D_80382390 != 0) && (var_s0 < ((arg0 == 1) ? 0x28 : 0x2A1)); var_s0++){
-        sp3C = &D_80382390[D_8036B804];
+    temp_s3 = func_8023DB5C() - func_80255B08(arg0);
+    for(var_s0 = 0; (D_80382390 != NULL) && (var_s0 < ((arg0 == 1) ? 0x28 : 0x2A1)); var_s0++, D_8036B804 = (D_8036B804 >= 0x2A1)? 0: D_8036B804 + 1){
+        sp3C = (struct_7AF80_0*)((u32)D_80382390 + sizeof(struct_7AF80_0)*D_8036B804);
         if ((sp3C->unk0 != 0) && ((sp3C->unk4 < temp_s3) || (arg0 == 3))){
             assetcache_release(sp3C->unk0);
             sp3C->unk0 = 0;
             if( (arg0 != 1) && (func_80254BC4(1))){
                 return;
             }
-            D_8036B804++;
-            D_8036B804 %= 0x2A1;
         }
     }
 
-    for(var_s0 = 0; (D_80382394 != 0) && (var_s0 < ((arg0 == 1) ? 0x28 : 0x167)); var_s0++){
-        temp_a0_2 = &D_80382394[D_8036B808];
+    for(var_s0 = 0; (D_80382394 != NULL) && (var_s0 < ((arg0 == 1) ? 0x28 : 0x167)); var_s0++, D_8036B808 = (D_8036B808 >= 0x167)? 0: D_8036B808 + 1){
+        temp_a0_2 = (struct_7AF80_1*)((u32)D_80382394 + sizeof(struct_7AF80_1)*D_8036B808);
         if ((temp_a0_2->unk0 != 0) && ((temp_a0_2->unk8 < temp_s3) || (arg0 == 3))){
             func_8033B338(&temp_a0_2->unk0, &temp_a0_2->unk4);
             if( (arg0 != 1) && (func_80254BC4(1))){
@@ -196,7 +180,6 @@ void func_8030A850(s32 arg0) {
         }
     }
 }
-#endif
 
 void func_8030AA6C(void) {
     BKModelBin *temp_a0;
diff --git a/symbol_addrs.us.v10.txt b/symbol_addrs.us.v10.txt
index 5fb2689c..82da8612 100644
--- a/symbol_addrs.us.v10.txt
+++ b/symbol_addrs.us.v10.txt
@@ -37,7 +37,6 @@ spriteGetFrameCount = 0x802510C0;
 spriteGetFramePtr = 0x802510C8;
 get_loaded_overlay_id = 0x80251230;
 is_overlay_loaded = 0x8025123C;
-load_overlay = 0x80251250;
 mlMtxApply        = 0x80251494;
 mlMtxPop          = 0x802516C8;
 mlMtxIdent        = 0x80251B0C;