From 6e8ece6795d782299e6fe2c5a5ae758a4e4f4778 Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Mon, 26 Sep 2022 00:01:07 -0500
Subject: [PATCH] core2/code_59D40.c done

---
 README.md                   |  2 +-
 progress/progress_core2.svg |  4 ++--
 progress/progress_total.svg |  6 +++---
 src/core2/code_59D40.c      |  7 ++-----
 src/core2/code_5BEB0.c      | 10 +++++-----
 subyaml/core2.us.v10.yaml   |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 967ed6a2..7b8c2bdc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (87.7785%)
+# banjo (87.9186%)
 
 <img src="./progress/progress_total.svg">
 
diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg
index acba357c..a5a82079 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">87.4331%</text>
-        <text x="77.5" y="14">87.4331%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">87.6077%</text>
+        <text x="77.5" y="14">87.6077%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 1af74c61..75dc9af8 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="#37e000" d="M150 0h67v20H150z"/>
+        <path fill="#36e000" 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">87.7785%</text>
-        <text x="183.5" y="14">87.7785%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">87.9186%</text>
+        <text x="183.5" y="14">87.9186%</text>
     </g>
 </svg>
\ No newline at end of file
diff --git a/src/core2/code_59D40.c b/src/core2/code_59D40.c
index 9618832d..fc1daff3 100644
--- a/src/core2/code_59D40.c
+++ b/src/core2/code_59D40.c
@@ -157,10 +157,6 @@ f32 func_802E10F0(f32 arg0) {
     return arg0;
 }
 
-
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_59D40/func_802E1168.s")
-#else
 void func_802E1168(Actor *this) {
     f32 sp5C;
     ActorLocal_core2_59D40 *local;
@@ -262,6 +258,8 @@ void func_802E1168(Actor *this) {
                 func_802E0EC8();
             }
             break;
+        default:
+            break;
     }//L802E1630
 
     local = (ActorLocal_core2_59D40 *)&this->local;
@@ -293,7 +291,6 @@ void func_802E1168(Actor *this) {
     actor_setOpacity(this, local->unk4);
     this->unk124_9 = (255.0 == local->unk4) ? 1 : 2;
 }
-#endif
 
 extern f32 D_8037E624;
 void func_802E1790(void){
diff --git a/src/core2/code_5BEB0.c b/src/core2/code_5BEB0.c
index c39bfd8b..3bdc8433 100644
--- a/src/core2/code_5BEB0.c
+++ b/src/core2/code_5BEB0.c
@@ -47,25 +47,25 @@ void mapSavestate_defrag_all(void){
 #else
 void mapSavestate_save(enum map_e map){
     u32 wSize;
-    volatile u32 * sp38;
+    MapSavestate * sp38;
     s32 iBit;
     s32 bit_max;
     s32 reg_s4;
     u32* reg_v1;
     u32* valPtr;
+    s32 i;
 
       
     wSize = 4;
     if(D_8037E650[map])
         free(D_8037E650[map]);
       
-    D_8037E650[map] = (MapSavestate *) malloc(4*sizeof(u32));
-    sp38 =   D_8037E650[map];
+    D_8037E650[map] = sp38 = (MapSavestate *) malloc(4*sizeof(u32));
 
-    *sp38 = mapSpecificFlags_getAll();
+    sp38->flags = mapSpecificFlags_getAll();
     
     iBit = 0x20;
-    func_80308230(1, D_8037E650[map]);
+    func_80308230(1);
     func_803083B0(-1);
     
     for(reg_s4 = func_803083B0(-2); reg_s4 != -1; reg_s4 = func_803083B0(-2, valPtr)){
diff --git a/subyaml/core2.us.v10.yaml b/subyaml/core2.us.v10.yaml
index 303e7f3c..78e598da 100644
--- a/subyaml/core2.us.v10.yaml
+++ b/subyaml/core2.us.v10.yaml
@@ -226,7 +226,7 @@ segments:
   - [0x59780, c, code_59780] #DONE
   - [0x599E0, c, code_599E0] #DONE
   - [0x59A80, c, code_59A80] #DONE
-  - [0x59D40, c, code_59D40]
+  - [0x59D40, c, code_59D40] #DONE
   - [0x5AB30, c, ch/code_5AB30] #DONE
   - [0x5B6A0, c, code_5B6A0]
   - [0x5BD90, c, code_5BD90] #DONE