From d2dc803e44d76c0b15aafa3a80bd184ed8507939 Mon Sep 17 00:00:00 2001
From: Donkey Kong <dk64.decomp@gmail.com>
Date: Mon, 17 Jul 2023 19:29:35 +0930
Subject: [PATCH] 30.7699%

---
 progress/progress.menu.csv   |  2 +-
 progress/progress.total.csv  |  2 +-
 progress/progress_menu.svg   |  6 +++---
 progress/progress_total.svg  |  4 ++--
 src/global_asm/code_114270.c |  1 +
 src/menu/code_3E10.c         | 14 ++++----------
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/progress/progress.menu.csv b/progress/progress.menu.csv
index 3e63331..cf0954d 100644
--- a/progress/progress.menu.csv
+++ b/progress/progress.menu.csv
@@ -43,7 +43,7 @@ us,.code,func_800241E8,60,yes
 us,.code,func_80027F34,12,yes
 us,.code,func_8002F6C8,148,yes
 us,.code,func_80026684,108,yes
-us,.code,func_800317E8,408,no
+us,.code,func_800317E8,408,yes
 us,.code,func_80027E10,80,yes
 us,.code,func_8002DEE8,192,yes
 us,.code,func_8002FE08,180,yes
diff --git a/progress/progress.total.csv b/progress/progress.total.csv
index 9dc8392..38b2a33 100644
--- a/progress/progress.total.csv
+++ b/progress/progress.total.csv
@@ -3329,7 +3329,7 @@ us,.code,func_800241E8,60,yes
 us,.code,func_80027F34,12,yes
 us,.code,func_8002F6C8,148,yes
 us,.code,func_80026684,108,yes
-us,.code,func_800317E8,408,no
+us,.code,func_800317E8,408,yes
 us,.code,func_80027E10,80,yes
 us,.code,func_8002DEE8,192,yes
 us,.code,func_8002FE08,180,yes
diff --git a/progress/progress_menu.svg b/progress/progress_menu.svg
index 8da30f2..570c94d 100644
--- a/progress/progress_menu.svg
+++ b/progress/progress_menu.svg
@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h41v20H0z"/>
-        <path fill="#c04b00" d="M41 0h67v20H41z"/>
+        <path fill="#c04e00" d="M41 0h67v20H41z"/>
         <path fill="url(#b)" d="M0 0h108v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
         <text x="20.5" y="14">menu</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="75.5" y="15" fill="#010101" fill-opacity=".3">19.5221%</text>
-        <text x="74.5" y="14">19.5221%</text>
+        <text x="75.5" y="15" fill="#010101" fill-opacity=".3">20.1880%</text>
+        <text x="74.5" y="14">20.1880%</text>
     </g>
 </svg>
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index 60608a8..02f82ae 100644
--- a/progress/progress_total.svg
+++ b/progress/progress_total.svg
@@ -17,7 +17,7 @@
         <text x="66.0" y="14">Donkey Kong 64 (US)</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">30.7452%</text>
-        <text x="165.5" y="14">30.7452%</text>
+        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">30.7699%</text>
+        <text x="165.5" y="14">30.7699%</text>
     </g>
 </svg>
diff --git a/src/global_asm/code_114270.c b/src/global_asm/code_114270.c
index c8bb714..2aed92a 100644
--- a/src/global_asm/code_114270.c
+++ b/src/global_asm/code_114270.c
@@ -240,6 +240,7 @@ u8 func_807103E0(Struct807103E0 *arg0) {
     arg0->unk8 = arg0->unk4;
     arg0->unkC += (1.0 + func_80612794(arg0->unk22)) * (f32)(1.0 + (arg0->unk20 * D_8075E4F8));
     arg0->unk22 += 0x64;
+    // Problem is here, end of the line
     arg0->unk24 = (func_80612794(arg0->unk22 * 0.5) * 0.5 + 0.5) * ((arg0->unkB3 * 4) - (arg0->unkB3 * -4)) + (arg0->unkB3 * -4);
     if (((ABS(arg0->unk10)) * 140.0f) < arg0->unkC) {
         if (arg0->unkB1 >= 0xA) {
diff --git a/src/menu/code_3E10.c b/src/menu/code_3E10.c
index 038e31a..70b6d46 100644
--- a/src/menu/code_3E10.c
+++ b/src/menu/code_3E10.c
@@ -1142,14 +1142,9 @@ void func_80030A90(Struct80717D84 *arg0, s32 arg1) {
 
 #pragma GLOBAL_ASM("asm/nonmatchings/menu/code_3E10/func_8003155C.s")
 
-// regalloc
-#pragma GLOBAL_ASM("asm/nonmatchings/menu/code_3E10/func_800317E8.s")
-
 f32 func_8000AC60(f32, f32);
 
-/*
 s32 func_800317E8(Struct800317E8 *arg0, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4, s32 arg5, s8 arg6, f32 arg7) {
-    f32 temp_f0_2;
     f32 var_f0;
     f32 var_f18;
     s32 var_v1;
@@ -1181,13 +1176,12 @@ s32 func_800317E8(Struct800317E8 *arg0, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4
     if (var_f0 < 0.0f) {
         var_f0 = 0.0f;
     }
-    temp_f0_2 = ((100.0f / var_f18) * var_f0 * arg7) + 1.0f;
-    *arg3 = (arg1 * temp_f0_2) + 160.0f;
-    *arg4 = (arg2 * temp_f0_2) + 120.0f;
-    *arg4 = (arg2 * temp_f0_2) + 120.0f + arg0->unkC;
+    var_f0 = ((100.0f / var_f18) * var_f0 * arg7) + 1.0f;
+    *arg3 = (arg1 * var_f0) + 160.0f;
+    *arg4 = (arg2 * var_f0) + 120.0f;
+    *arg4 = (arg2 * var_f0) + 120.0f + arg0->unkC;
     return var_v1;
 }
-*/
 
 #pragma GLOBAL_ASM("asm/nonmatchings/menu/code_3E10/func_80031980.s")