core2/code_94780.c done

progress/progress_core2.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#66e000" d="M44 0h67v20H44z"/>
+        <path fill="#65e000" d="M44 0h67v20H44z"/>
         <path fill="url(#b)" d="M0 0h111v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -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">77.3371%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">77.4315%</text>
-        <text x="77.5" y="14">77.3371%</text>
+        <text x="77.5" y="14">77.4315%</text>
     </g>
 </svg>

progress/progress_total.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h150v20H0z"/>
-        <path fill="#52e000" d="M150 0h67v20H150z"/>
+        <path fill="#51e000" 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">81.7889%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">81.8431%</text>
-        <text x="183.5" y="14">81.7889%</text>
+        <text x="183.5" y="14">81.8431%</text>
     </g>
 </svg>

src/core2/code_94780.c

@@ -0,0 +1,69 @@
+#include <ultra64.h>
+#include "functions.h"
+#include "variables.h"
+
+/* .bss */
+struct {
+    f32 unk0;
+    f32 unk4;
+    u8 rgb[3];
+    u8 unkB[3];
+    u8 unkE[3];
+    u8 unk11;
+}D_80383170;
+
+/* .code */
+void func_8031B710(void){}
+
+void func_8031B718(void){
+    D_80383170.unk11 = 0;
+    D_80383170.unk0 = D_80383170.unk4 = 0.0f;
+    D_80383170.unkE[0] = D_80383170.unkE[1] = D_80383170.unkE[2] = 0xFF;
+    D_80383170.unkB[0] = D_80383170.unkB[1] = D_80383170.unkB[2] = 0xFF;
+    D_80383170.rgb[0] = D_80383170.rgb[1] = D_80383170.rgb[2] = 0xFF;
+}
+
+void func_8031B760(void){
+    func_8030A280(D_80383170.rgb[0], D_80383170.rgb[1], D_80383170.rgb[2]);
+}
+
+void func_8031B790(void) {
+    s32 i;
+
+    if (D_80383170.unk11 != 0) {
+        D_80383170.unk0 = max_f(0.0f, D_80383170.unk0 - time_getDelta());
+        for(i = 0; i < 3; i++){
+            D_80383170.rgb[i] = ml_map_f(D_80383170.unk0, D_80383170.unk4, 0.0f,D_80383170.unkE[i], D_80383170.unkB[i]);
+        }
+        func_8031B760();
+        if (D_80383170.unk0 == 0.0f) {
+            D_80383170.unk11 = 0;
+        }
+    }
+}
+
+void func_8031B908(s32 red, s32 blue, s32 green, f32 arg3) {
+    if (arg3 != 0.0f) {
+        D_80383170.unk11 = 1;
+        D_80383170.unk0 = arg3;
+        D_80383170.unk4 = arg3;
+        D_80383170.unkB[0] = red;
+        D_80383170.unkB[1] = blue;
+        D_80383170.unkB[2] = green;
+        D_80383170.unkE[0] = D_80383170.rgb[0];
+        D_80383170.unkE[1] = D_80383170.rgb[1];
+        D_80383170.unkE[2] = D_80383170.rgb[2];
+        return;
+    }
+    else{
+        D_80383170.unk11 = 0;
+        D_80383170.rgb[0] = red;
+        D_80383170.rgb[1] = blue;
+        D_80383170.rgb[2] = green;
+        func_8031B760();
+    }
+}
+
+void func_8031B990(s32 red, s32 blue, s32 green) {
+    func_8031B908(red, blue, green, 0.0f);
+}

src/core2/levelspecificflags.c

@@ -6,9 +6,9 @@ void levelSpecificFlags_set(arg0, arg1);
 
 
 //levelSpecificFlags
-extern u8  D_80383328[];
 extern u32 D_80383320;
 extern u32 D_80383324;
+extern u8  D_80383328[];
 
 #pragma GLOBAL_ASM("asm/nonmatchings/core2/levelspecificflags/_levelSpecificFlags_calcCRC1.s")
 

subyaml/core2.us.v10.yaml

@@ -288,7 +288,7 @@ segments:
   - [0x82000, c, code_82000]
   - [0x83340, c, code_83340]
   - [0x83D70, c, code_83D70]
-  - [0x840D0, c, code_840D0]
+  - [0x840D0, c, code_840D0] #DONE
   - [0x84470, c, gc/transition] #DONE
   - [0x851D0, c, code_851D0]
   - [0x857B0, c, code_857B0] #DONE
@@ -300,7 +300,9 @@ segments:
   - [0x91E10, c, code_91E10]
   - [0x935F0, c, code_935F0]
   - [0x93C10, c, code_93C10]
-  - [0x94620, c, code_94620]
+  - [0x94620, c, code_94620] #DONE
+  - [0x94780, c, code_94780] #DONE
+  - [0x94A20, c, code_94A20]
   - [0x99860, c, code_99860] #DONE
   - [0x999A0, c, code_999A0] #DONE
   - [0x99F80, c, jiggyscore] #DONE
@@ -1014,5 +1016,6 @@ segments:
   - [0xf2c00, .bss, code_91E10]
   - [0xf2c00, .bss, code_93C10]
   - [0xf2c00, .bss, code_94620]
+  - [0xf2c00, .bss, code_94780]
   # - [0xf2c00, .bss, code_CD6E0] # D_803863E0
 - [0xf2c00] # core2 end