core2/code_79C80.c done

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">78.9639%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">79.1247%</text>
-        <text x="77.5" y="14">78.9639%</text>
+        <text x="77.5" y="14">79.1247%</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="#4de000" d="M150 0h67v20H150z"/>
+        <path fill="#4ce000" 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">82.9127%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">83.0050%</text>
-        <text x="183.5" y="14">82.9127%</text>
+        <text x="183.5" y="14">83.0050%</text>
     </g>
 </svg>

src/core2/code_79C80.c

@@ -2,6 +2,8 @@
 #include "functions.h"
 #include "variables.h"
 
+extern f32 func_802FB0E4(struct8s*);
+
 extern s32 D_80276588;
 extern s32 D_8027658C;
 
@@ -64,9 +66,6 @@ struct7s *func_80300CD8(enum item_e item_id){
     return &D_80381F30;
 }
 
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_79C80/func_80300D0C.s")
-#else
 void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx){
     int i; 
     int tmp_v1;
@@ -88,19 +87,14 @@ void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
     for(i = D_80381F00-1; i >= 0; i--){//L80300E40
         if(i != 0 && (i + 1 != D_80381F00 || D_80381F00 & 1)
         ){
-            if(i & 1){
+            s6 = (i & 1) ? i + 1 : i - 1;
-                s6 = i +1;
-            }
-            else{
-                s6 = i -1;
-            }
         }
         else{//L80300E84
             s6 = i;
         }
         gDPPipeSync((*gfx)++);
-        if(i < D_80381F04){
+        if(D_80381F04 > i){
-            if( 8.0f < i && i < D_80381F04 - 8.0f){
+            if((0 < D_80381F04 - 8.0f) &&  ((D_80381F04 - 8.0f) > i)){
                 if(!spD4){
                     func_80347FC0(gfx, D_8036A914, 0, 0, 0, 0, 0, 2, 2, &spEC, &spE8);
                     spD4 = TRUE;
@@ -111,22 +105,14 @@ void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
         else{//L80300F58
            gDPSetPrimColor((*gfx)++, 0, 0, 0xFF, 0xFF, 0xFF, 0x78); 
         }
-        f20 = i*0xd + (96.0f - (f32)D_80276588/2);
+        f20 = 96.0f - (f32)D_80276588/2 + (i*13);
-        f14 = (f32)D_8027658C/2 - func_802FB0E4(arg1);
+        f14 = (f32)D_8027658C/2 - func_802FB0E4(arg1) - D_80381F08[s6] - -48.0f;
-        f14 = (f14 - D_80381F08[s6]) - -48.0f;
         f14 = (i & 1) ? f14 + 5.75 : f14 - 5.75;
         gSPVertex((*gfx)++, *vtx, 4, 0);
         for(tmp_v1 = 0; tmp_v1 < 2; tmp_v1++){//L8030101C
             for(tmp_v0 = 0; tmp_v0 < 2; tmp_v0++){//L80301030
-                f18 = spEC * D_80381EFC*tmp_v0 - spEC * D_80381EFC/2;
+                (*vtx)->v.ob[0] = (((spEC * D_80381EFC)*tmp_v0 - (spEC * D_80381EFC)/2) + f20)*4.0f;
-                f18 += f20;
+                (*vtx)->v.ob[1] = (((spE8 * D_80381EFC)/2 - (spE8 * D_80381EFC)*tmp_v1) + f14) * 4.0f;
-                f18 *= 4.0f;
-                (*vtx)->v.ob[0] = f18;
-
-                f18 = spE8 * D_80381EFC/2 - spE8 * D_80381EFC*tmp_v1;
-                f18 += f14;
-                f18 *= 4.0f;
-                (*vtx)->v.ob[1] = f18;
                 (*vtx)->v.ob[2] = -0x14;
                 (*vtx)->v.tc[0] =  ((spEC - 1) *tmp_v0) << 6;
                 (*vtx)->v.tc[1] =  ((spE8 - 1) *tmp_v1) << 6;
@@ -140,7 +126,6 @@ void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
     gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
     func_8024C904(gfx, mtx);
 }
-#endif
 
 bool func_803012B8(f32 arg0, s32 arg1, s32 arg2){
     if(arg1 == 0)

src/core2/code_7A760.c

@@ -59,7 +59,6 @@ void func_803017D0(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
     s32 spD0;
     s32 var_s4;
     s32 var_s6;
-    s32 var_s7;
     s32 var_v0;
     s32 var_v1;
 
@@ -68,9 +67,8 @@ void func_803017D0(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
         func_80347FC0(gfx, D_8036A960, 0, 0, 0, 0, 0, 2, 2, &spD4, &spD0);
         func_8024C7B8(gfx, mtx);
         for(var_s4 = 0; var_s4 < 6; var_s4++){
-            var_s7 = var_s4 & 1;
             if ((var_s4 != 0) && (var_s4 != 5)) {
-                var_s6 = (var_s7) ? var_s4 + 1 : var_s4 - 1;
+                var_s6 = (var_s4 & 1) ? var_s4 + 1 : var_s4 - 1;
             } else {
                 var_s6 = var_s4;
             }
@@ -84,7 +82,7 @@ void func_803017D0(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
             temp_f16 = (-40.0f + temp_f16);
             var_f14 = (temp_f16 + D_80381F68[var_s6]) - ((f32) D_80276588 / 2);
             temp_f16 = (((var_s4 * 15.5) + 78.0) - ((f32) D_8027658C / 2));
-            var_f14 = (var_s7) ? var_f14 + 5.0f : var_f14 - 5.0f;
+            var_f14 = (var_s4 & 1) ? var_f14 + 5.0f : var_f14 - 5.0f;
             gSPVertex((*gfx)++, *vtx, 4, 0);
             for(var_v1 = 0; var_v1 < 2; var_v1++){
                 for(var_v0 = 0; var_v0 < 2; var_v0++){

subyaml/core2.us.v10.yaml

@@ -282,7 +282,7 @@ segments:
   - [0x78100, c, code_78100]
   - [0x78E50, c, code_78E50]
   - [0x79830, c, fxcommon3score] #DONE
-  - [0x79C80, c, code_79C80]
+  - [0x79C80, c, code_79C80] #DONE
   - [0x7A760, c, code_7A760] #DONE
   - [0x7AF80, c, code_7AF80]
   - [0x82000, c, code_82000]