40.0711%

decompressed.us.yaml

@@ -331,6 +331,7 @@ segments:
       - [0x21371D0, c, audio/code_1371D0]
       - [0x2137630, c, audio/code_137630]
       - [0x2137C10, c, audio/code_137C10]
+      - [0x213A6A0, c, audio/code_13A6A0]
       - [0x213A750, c, audio/code_13A750]
       - [0x213A7A0, c, audio/code_13A7A0]
       - [0x213C920, c, audio/code_13C920]

progress/progress.global_asm.csv

@@ -2033,7 +2033,7 @@ us,asm,alEvtqFlushType,208,yes
 us,asm,func_global_asm_806998F0,36,yes
 us,asm,func_global_asm_80645C04,272,yes
 us,asm,func_global_asm_8062754C,352,no
-us,asm,func_global_asm_80735958,72,no
+us,asm,func_global_asm_80735958,72,yes
 us,asm,func_global_asm_8061C2C4,20,yes
 us,asm,func_global_asm_8073BA60,176,no
 us,asm,func_global_asm_8071BC80,388,yes

progress/progress.total.csv

@@ -2033,7 +2033,7 @@ us,asm,alEvtqFlushType,208,yes
 us,asm,func_global_asm_806998F0,36,yes
 us,asm,func_global_asm_80645C04,272,yes
 us,asm,func_global_asm_8062754C,352,no
-us,asm,func_global_asm_80735958,72,no
+us,asm,func_global_asm_80735958,72,yes
 us,asm,func_global_asm_8061C2C4,20,yes
 us,asm,func_global_asm_8073BA60,176,no
 us,asm,func_global_asm_8071BC80,388,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">38.2012%</text>
-        <text x="110.5" y="14">38.2012%</text>
+        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">38.2071%</text>
+        <text x="110.5" y="14">38.2071%</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.0668%</text>
-        <text x="165.5" y="14">40.0668%</text>
+        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">40.0711%</text>
+        <text x="165.5" y="14">40.0711%</text>
     </g>
 </svg>

src/global_asm/audio/code_137C10.c

@@ -19,9 +19,6 @@
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80735864.s")
 
-// regalloc
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80735958.s")
-
 typedef struct {
     s32 unk0;
     s32 unk4;
@@ -41,50 +38,11 @@ typedef struct {
     s32 unk24;
 } Struct80735958;
 
-/*
-void func_global_asm_80735958(Struct80735958 *arg0, f32 arg1) {
-    if (arg0->unk18 != NULL) {
-        arg0->unk24 = arg1 * arg0->unk18->unk8;
+void func_global_asm_80735958(ALCSPlayer *seqp, f32 tempo) {
+    // __setUsptFromTempo
+    if (seqp->target) {
+        seqp->uspt = ((f32)tempo * seqp->target->qnpt);
     } else {
-        arg0->unk24 = 0x1E8;
+        seqp->uspt = 0x1E8;
     }
-}
-*/
-
-typedef struct {
-    u8 unk0[0x18 - 0x0];
-    s32 unk18;
-    u8 unk1C[0x24 - 0x1C];
-    s32 unk24;
-    s32 unk28;
-    s32 unk2C;
-    u8 unk30[0x48 - 0x30];
-    s32 unk48;
-} Struct807359A0;
-
-void func_global_asm_807359A0(Struct807359A0 *arg0) {
-    s32 pad[3];
-    s16 pad2;
-    s16 sp20;
-    s32 sp1C;
-
-    if (!(arg0->unk2C == 1) || !arg0->unk18) {
-        return;
-    }
-
-    if (!func_global_asm_8073D060(arg0->unk18, &sp1C)) {
-        return;
-    }
-
-    sp20 = 0;
-    alEvtqPostEvent(&arg0->unk48, &sp20, arg0->unk24 * sp1C);
-}
-
-typedef struct {
-    u8 unk0[0x88 - 0x0];
-    u8 unk88;
-} Struct80735A34;
-
-void func_global_asm_80735A34(Struct80735A34 *arg0, u8 arg1) {
-    arg0->unk88 = arg1;
-}
+}

src/global_asm/audio/code_13A6A0.c

@@ -0,0 +1,40 @@
+#include <ultra64.h>
+#include "functions.h"
+
+typedef struct {
+    u8 unk0[0x18 - 0x0];
+    s32 unk18;
+    u8 unk1C[0x24 - 0x1C];
+    s32 unk24;
+    s32 unk28;
+    s32 unk2C;
+    u8 unk30[0x48 - 0x30];
+    s32 unk48;
+} Struct807359A0;
+
+void func_global_asm_807359A0(Struct807359A0 *arg0) {
+    s32 pad[3];
+    s16 pad2;
+    s16 sp20;
+    s32 sp1C;
+
+    if (!(arg0->unk2C == 1) || !arg0->unk18) {
+        return;
+    }
+
+    if (!func_global_asm_8073D060(arg0->unk18, &sp1C)) {
+        return;
+    }
+
+    sp20 = 0;
+    alEvtqPostEvent(&arg0->unk48, &sp20, arg0->unk24 * sp1C);
+}
+
+typedef struct {
+    u8 unk0[0x88 - 0x0];
+    u8 unk88;
+} Struct80735A34;
+
+void func_global_asm_80735A34(Struct80735A34 *arg0, u8 arg1) {
+    arg0->unk88 = arg1;
+}