core2/code_76D90.c done

README.md

@@ -1,4 +1,4 @@
-# banjo (93.7918%)
+# banjo (93.9446%)
 
 <img src="./progress/progress_total.svg">
 

progress/progress_core2.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#22e000" d="M44 0h67v20H44z"/>
+        <path fill="#21e000" 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">92.3767%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">92.6430%</text>
-        <text x="77.5" y="14">92.3767%</text>
+        <text x="77.5" y="14">92.6430%</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="#1ce000" d="M150 0h67v20H150z"/>
+        <path fill="#1be000" 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">93.7918%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.9446%</text>
-        <text x="183.5" y="14">93.7918%</text>
+        <text x="183.5" y="14">93.9446%</text>
     </g>
 </svg>

src/core2/code_76D90.c

@@ -93,12 +93,8 @@ f32 func_802FDE60(f32 arg0) {
     return arg0;
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_76D90/func_802FDEE0.s")
-#else
 void func_802FDEE0(s32 arg0, struct8s *arg1, Gfx **arg2, Mtx **arg3, Vtx **arg4){
-    s32 var_v0;
+    f64 var_f24;
-    s32 var_v1;
     s32 sp13C;
     s32 sp138;
     s32 sp134;
@@ -106,18 +102,19 @@ void func_802FDEE0(s32 arg0, struct8s *arg1, Gfx **arg2, Mtx **arg3, Vtx **arg4)
     f32 sp12C;
     f32 sp128;
     f32 sp124;
-    f64 var_f24;
+    s32 var_v0;
+    s32 var_v1;
     u32 sp118;
+    f32 pad;
+
     f32 sp110;
 
-
-
     sp118 = D_803815C0 == 2;
     if (D_8036A010 != 0) {
         func_80347FC0(arg2, (sp118 ) ? (D_8036A014 != 0) ? D_8036A014 : D_8036A010 : D_8036A010, 0, 0, 0, 0, 0, 2, 2, &sp13C, &sp138);
         func_8024C7B8(arg2, arg3);
         gSPDisplayList((*arg2)++, D_8036A030);
-        for(sp134 = 0; sp134 < (sp118) ? (D_8036A014 != 0) ? 2 : 1 : 6; sp134++){
+        for(sp134 = 0; sp134 < ((sp118)? ((D_8036A014 != 0) ? 2 : 1) : 6); sp134++){
             sp110 = D_8036A018[sp134] * -0x3C;
             gDPPipeSync((*arg2)++);
             if (sp118) {
@@ -143,14 +140,10 @@ void func_802FDEE0(s32 arg0, struct8s *arg1, Gfx **arg2, Mtx **arg3, Vtx **arg4)
             sp124 = func_802FB0E4(arg1) + ((f32) D_8027658C / 2) - 246.0f;
             guTranslate(*arg3, sp128 * 4.0f, sp124 * 4.0f, 0.0f);
             gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-
-            
             guRotate(*arg3, func_802FDE60(D_803815D8 + D_803815DC), 0.0f, 0.0f, 1.0f);
             gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-
             guScale(*arg3, D_803815E0, D_803815E0, D_803815E0);
             gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-            
             guTranslate(*arg3, -sp128 * 4.0f, -sp124 * 4.0f, 0.0f);
             gSPMatrix((*arg2)++, OS_K0_TO_PHYSICAL((*arg3)++), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
             var_f24 = MIN(1.0, MAX(0.0, D_803815C8));
@@ -176,7 +169,6 @@ void func_802FDEE0(s32 arg0, struct8s *arg1, Gfx **arg2, Mtx **arg3, Vtx **arg4)
         func_8024C904(arg2, arg3);
     }
 }
-#endif
 
 extern f64 D_803773E0;
 void func_802FE844(s32 arg0, struct8s *arg1){

subyaml/core2.us.v10.yaml

@@ -278,7 +278,7 @@ segments:
   - [0x75E90, c, code_75E90] #DONE
   - [0x76390, c, code_76390] #DONE
   - [0x763D0, c, code_763D0] #DONE
-  - [0x76D90, c, code_76D90]
+  - [0x76D90, c, code_76D90] #DONE
   - [0x77E50, c, code_77E50] #DONE
   - [0x78100, c, code_78100]
   - [0x78E50, c, code_78E50]