From d9ef3648caba5999582e07e171027e943d778aa9 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Wed, 9 Nov 2022 15:29:21 -0600
Subject: [PATCH] 94%, core1/memory.c _heap_sortEmptyBlock() done

---
 README.md                   |  2 +-
 progress/progress_core1.svg |  4 ++--
 progress/progress_total.svg |  4 ++--
 src/core1/memory.c          | 10 +++-------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4c4c60df..2844d4a4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (93.9924%)
+# banjo (94.0107%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index 63d4f030..b284e866 100644
--- a/progress/progress_core1.svg
+++ b/progress/progress_core1.svg
@@ -17,7 +17,7 @@
         <text x="22.0" y="14">core1</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">88.5362%</text>
-        <text x="77.5" y="14">88.5362%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">88.6623%</text>
+        <text x="77.5" y="14">88.6623%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index ca5fa56b..ad110aa5 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">93.9924%</text>
-        <text x="183.5" y="14">93.9924%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">94.0107%</text>
+        <text x="183.5" y="14">94.0107%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core1/memory.c b/src/core1/memory.c
index 278d7368..9ca222f5 100644
--- a/src/core1/memory.c
+++ b/src/core1/memory.c
@@ -430,17 +430,13 @@ void func_80254F90(void){
     }
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/memory/_heap_sortEmptyBlock.s")
-#else
-//moves empty block (arg0) to keep empty block list sorted by size
 void _heap_sortEmptyBlock(EmptyHeapBlock * arg0){
     EmptyHeapBlock *v0 = arg0;
     EmptyHeapBlock *v1;
     EmptyHeapBlock *a2 = &D_8002D500[LAST_HEAP_BLOCK];
 
     //move arg0 back while larger than next
-    while( arg0->next_free < a2
+    while( arg0->next_free < &D_8002D500[LAST_HEAP_BLOCK]
         && (s32)chunkSize(&v0->next_free->hdr) + 0x10 < (s32)chunkSize(&v0->hdr) + 0x10
     ){  
         v1 = arg0->next_free;
@@ -453,10 +449,11 @@ void _heap_sortEmptyBlock(EmptyHeapBlock * arg0){
     }
     
     //move arg0 foward while smaller prev
-    while( ( arg0->prev_free >= (EmptyHeapBlock *)((u8*)D_8002D500 + 1))
+    while( ( (v1 = arg0->prev_free) > &D_8002D500[0])
         && (s32)chunkSize(&v0->hdr) + 0x10 < (s32)chunkSize(&v0->prev_free->hdr) + 0x10
     ){
         a2 = arg0->prev_free;
+
         arg0->next_free->prev_free = a2;
         a2->next_free = arg0->next_free;
         arg0->next_free = a2;
@@ -465,7 +462,6 @@ void _heap_sortEmptyBlock(EmptyHeapBlock * arg0){
         a2->prev_free = arg0;
     }
 }
-#endif
 
 void free(void * ptr){
     HeapHeader *sPtr; //stack_ptr