core2/code_B8080.c done, func_8033F3E8() match

README.md

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

decompressed.us.v10.yaml

@@ -818,7 +818,7 @@ segments:
   - [0x100D8A0, c, code_B7F40] #DONE
   - [0x100D980, c, code_B8020] #DONE
   - [0x100D9D0, c, code_B8070] #DONE
-  - [0x100D9E0, c, code_B8080]
+  - [0x100D9E0, c, code_B8080] #DONE
   - [0x100E1C0, c, code_B8860] #DONE
   - [0x100E9F0, c, code_B9090] #DONE
   - [0x100F0D0, c, code_B9770]

progress/progress_core2.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h44v20H0z"/>
-        <path fill="#0ee000" d="M44 0h67v20H44z"/>
+        <path fill="#0de000" 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">96.9627%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">97.0177%</text>
-        <text x="77.5" y="14">96.9627%</text>
+        <text x="77.5" y="14">97.0177%</text>
     </g>
 </svg>

progress/progress_total.svg

@@ -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">97.8257%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">97.8572%</text>
-        <text x="183.5" y="14">97.8257%</text>
+        <text x="183.5" y="14">97.8572%</text>
     </g>
 </svg>

src/core2/code_B8080.c

@@ -101,10 +101,7 @@ s32 func_8033F3C0(BKModel *model, f32 position[3]){
     return func_8033F3E8(model, position, 0, 100000);
 }
 
-#ifndef NONMATCHING
+s32 func_8033F3E8(BKModel *arg0, f32 position[3], s32 min_id, s32 max_id) {
-#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_B8080/func_8033F3E8.s")
-#else
-s32 func_8033F3E8(BKModel *model, f32 position[3], s32 min_id, s32 max_id) {
     int i;
     int j;
     int k;
@@ -115,31 +112,27 @@ s32 func_8033F3E8(BKModel *model, f32 position[3], s32 min_id, s32 max_id) {
     Vtx *vertex_pool;
     BKMesh *current_mesh;
     Vtx *current_vertex;
-    s32 mesh_cnt;
     s16 *vertex_index_list;
 
-    vertex_pool = vtxList_getVertices(model->vtxList_4);
+    vertex_pool = vtxList_getVertices(arg0->vtxList_4);
     position_s16[0] = (s16) position[0];
     position_s16[1] = (s16) position[1];
     position_s16[2] = (s16) position[2];
-    current_mesh = (BKMesh *)(model->meshList_0 + 1);
+    current_mesh = (BKMesh *)(arg0->meshList_0 + 1);
-    for(k = 0; k < model->meshList_0->meshCount_0; k++, current_mesh = ((s16 *)(current_mesh + 1)) + current_mesh->vtxCount_2){
+    for(k = 0; k < arg0->meshList_0->meshCount_0; k++, current_mesh = (BKMesh *)(((s16 *)(current_mesh + 1)) + current_mesh->vtxCount_2)){
         if ((min_id > current_mesh->uid_0 || current_mesh->uid_0 >= max_id))
             continue;
 
-        j = 0;
         vertex_index_list = ((s16*)(current_mesh + 1));
-        current_vertex = vertex_pool + vertex_index_list[j];
+        current_vertex = vertex_pool + vertex_index_list[0];
-        for(i = 0; &min[i] < &min[3]; i++){
+        for(j = 0; j < 3; j++){
-             temp_v1_3 = current_vertex->v.ob[i];
+            min[j] = max[j] = current_vertex->v.ob[j];
-            min[i] = temp_v1_3;
-            max[i] = temp_v1_3;
         };
 
         
         for(j = 1; j < current_mesh->vtxCount_2; j++){
             current_vertex = vertex_pool + vertex_index_list[j];
-            for(i = 0; i < 3; i++){
+            for(i = 0; i < 3; i++){\
                 temp_v1_3 = current_vertex->v.ob[i];
                 min[i] = MIN(temp_v1_3, min[i]);
                 max[i] = MAX(temp_v1_3, max[i]);
@@ -155,8 +148,6 @@ s32 func_8033F3E8(BKModel *model, f32 position[3], s32 min_id, s32 max_id) {
     return 0;
 }
 
-#endif
-
 void model_free(BKModel *model){
     free(model);
 }