40.6944%

progress/progress.global_asm.csv

@@ -3175,7 +3175,7 @@ us,asm,func_global_asm_8060F854,212,no
 us,asm,func_global_asm_80676260,32,yes
 us,asm,func_global_asm_8060B110,36,yes
 us,asm,func_global_asm_80605044,720,no
-us,asm,func_global_asm_8063D638,540,no
+us,asm,func_global_asm_8063D638,540,yes
 us,asm,func_global_asm_8060F54C,484,no
 us,asm,func_global_asm_8063DE68,104,yes
 us,asm,func_global_asm_806EE02C,64,yes

progress/progress.total.csv

@@ -3175,7 +3175,7 @@ us,asm,func_global_asm_8060F854,212,no
 us,asm,func_global_asm_80676260,32,yes
 us,asm,func_global_asm_8060B110,36,yes
 us,asm,func_global_asm_80605044,720,no
-us,asm,func_global_asm_8063D638,540,no
+us,asm,func_global_asm_8063D638,540,yes
 us,asm,func_global_asm_8060F54C,484,no
 us,asm,func_global_asm_8063DE68,104,yes
 us,asm,func_global_asm_806EE02C,64,yes

progress/progress_global_asm.svg

@@ -17,7 +17,7 @@
         <text x="38.5" y="14">global_asm</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">40.1443%</text>
-        <text x="110.5" y="14">40.1443%</text>
+        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">40.1882%</text>
+        <text x="110.5" y="14">40.1882%</text>
     </g>
 </svg>

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">40.6616%</text>
-        <text x="165.5" y="14">40.6616%</text>
+        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">40.6944%</text>
+        <text x="165.5" y="14">40.6944%</text>
     </g>
 </svg>

src/global_asm/code_36880.c

@@ -1997,8 +1997,42 @@ void func_global_asm_8063D608(void) {
     D_global_asm_807F619C = getPointerTableFile(0x19, 0x1765, 1, 0); // Texture
 }
 
-// Displaylist stuff, doable
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063D638.s")
+extern f32 D_global_asm_807F61A0;
+
+Gfx *func_global_asm_8063D638(Gfx *dl) {
+    s32 alpha;
+
+    gDPPipeSync(dl++);
+    gDPSetCycleType(dl++, G_CYC_2CYCLE);
+    gDPSetTextureLOD(dl++, G_TL_LOD);
+    gSPClearGeometryMode(dl++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0040F9FA);
+    gSPSetGeometryMode(dl++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
+    gSPTexture(dl++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
+    gDPSetRenderMode(dl++, G_RM_PASS, G_RM_ZB_XLU_SURF2);
+    gDPSetCombineMode(dl++, G_CC_MODULATEIA, G_CC_MODULATEIA_PRIM2);
+    
+    switch (current_map) {
+        case MAP_DK_ISLES_OVERWORLD:
+        case MAP_CASTLE_BARREL_BLAST:
+            alpha = 0xFF;
+            break;
+        case MAP_GALLEON_BARREL_BLAST:
+        case MAP_FUNGI_BARREL_BLAST:
+            alpha = 0x96;
+            break;
+        default:
+            alpha = 0x50;
+            break;
+    }
+
+    gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, alpha);
+    // TODO: Better match for this
+    gDPLoadTextureBlock(dl++, (s32)D_global_asm_807F619C + 0x80000000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
+    gDPSetTileSize(dl++, G_TX_RENDERTILE, 0, (s32)D_global_asm_807F61A0, 0x007C, 0x007C);
+    gDPSetTile(dl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD);
+
+    return dl;
+}
 
 void func_global_asm_8063D854(void) {
     switch (current_map) {

src/jetpac/code_1460.c

@@ -236,37 +236,33 @@ void func_jetpac_800255D4(Gfx **arg0) {
 
 #pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_1460/func_jetpac_80025700.s")
 
-// Displaylist stuff, regalloc, doable
+// Displaylist stuff, doable, close
 #pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_1460/func_jetpac_80025904.s")
+
 /*
 void func_jetpac_80025904(Gfx **arg0) {
     JetpacStruct1 *s3;
-    s32 s4;
-    s32 s7;
-    Gfx *sp50;
-    s32 s1;
-    s16 tmp_a1;
-    s16 tmp_a2;
-
+    s32 j, i;
+    Gfx *dl;
+    s32 k;
 
     s3 = &D_jetpac_8002F3D0[0][0];
-    sp50 = *arg0;
-    for (s7 = 0; s7 < 0x18; s7++) {
-        for (s4 = 0; s4 < 0x20; s4++) {
+    dl = *arg0;
+    for (i = 0; i < 0x18; i++) {
+        for (j = 0; j < 0x20; j++) {
             if (s3->unk60) {
-                gDPSetPrimColor(sp50++, 0, 0, s3->unk64, s3->unk65, s3->unk66, 0xff);
+                // TODO: Problem is here, colors are loaded and shifted in the wrong order
+                gDPSetPrimColor(dl++, 0, 0, s3->unk64, s3->unk65, s3->unk66, 0xFF);
             }
-            for (s1 = 0; s1 < s3->unk60; s1++) {
-                func_global_asm_8070E8F0(&sp50, s3->unk0[s1].unkC);
-                func_global_asm_8070F2C8(0x400, 0x400, s3->unk0[s1].unkB, 0);
-                tmp_a1 = (s3->unk0[s1].unk0 + 0x20);
-                tmp_a2 = (s3->unk0[s1].unk4 + 0x18);
-                func_global_asm_8070F2FC(&sp50, 4*tmp_a1, 4*tmp_a2);
+            for (k = 0; k < s3->unk60; k++) {
+                func_global_asm_8070E8F0(&dl, s3->unk0[k].unkC);
+                func_global_asm_8070F2C8(0x400, 0x400, s3->unk0[k].unk8, 0);
+                func_global_asm_8070F2FC(&dl, (s3->unk0[k].unk0 + 0x20) << 2, (s3->unk0[k].unk4 + 0x18) << 2);
             }
-        s3++;
+            s3++;
         }
     }
-    *arg0 = sp50;
+    *arg0 = dl;
 }
 */