40.1365%

decompressed.us.yaml

@@ -330,7 +330,8 @@ segments:
       - [0x2137120, c, audio/code_137120]
       - [0x21371D0, c, audio/code_1371D0]
       - [0x2137630, c, audio/code_137630]
-      - [0x2137C10, c, audio/code_137C10]
+      - [0x2137C10, c, code_137C10]
+      - [0x2137E80, c, audio/csplayer]
       - [0x213A6A0, c, audio/code_13A6A0]
       - [0x213A750, c, audio/code_13A750]
       - [0x213A7A0, c, audio/code_13A7A0]
@@ -469,7 +470,7 @@ segments:
       - [0x2164C50, .rodata, code_133A90]
       - [0x2164CF0, .rodata, code_136820]
       - [0x2164E90, .rodata, audio/code_137630]
-      - [0x2164EA0, .rodata, audio/code_137C10]
+      - [0x2164EA0, .rodata, audio/csplayer]
       - [0x2165150, .rodata, audio/code_13A7A0]
       - [0x2165190, .rodata, audio/synthesizer]
       - [0x21651A0, .rodata, audio/code_13ECE0]

include/functions.h

@@ -3836,7 +3836,7 @@ void func_global_asm_8073239C(void);
 f32 func_global_asm_80732DAC(f32 arg0);
 // TODO: func_global_asm_80732DEC has no documented signature but has been matched
 
-// global_asm/audio/code_137C10.c
+// global_asm/audio/csplayer.c
 // TODO: func_global_asm_80732F10 has no documented signature
 // TODO: func_global_asm_80733180 has no documented signature
 // TODO: func_global_asm_80733A88 has no documented signature

progress/progress.global_asm.csv

@@ -1681,7 +1681,7 @@ us,asm,func_global_asm_806DA89C,176,yes
 us,asm,func_global_asm_80687400,116,yes
 us,asm,func_global_asm_80709890,572,no
 us,asm,func_global_asm_80616850,148,yes
-us,asm,func_global_asm_80733A88,256,no
+us,asm,func_global_asm_80733A88,256,yes
 us,asm,func_global_asm_80714464,84,yes
 us,asm,func_global_asm_8063C784,64,yes
 us,asm,func_global_asm_806725E4,76,yes

progress/progress.total.csv

@@ -1681,7 +1681,7 @@ us,asm,func_global_asm_806DA89C,176,yes
 us,asm,func_global_asm_80687400,116,yes
 us,asm,func_global_asm_80709890,572,no
 us,asm,func_global_asm_80616850,148,yes
-us,asm,func_global_asm_80733A88,256,no
+us,asm,func_global_asm_80733A88,256,yes
 us,asm,func_global_asm_80714464,84,yes
 us,asm,func_global_asm_8063C784,64,yes
 us,asm,func_global_asm_806725E4,76,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.2737%</text>
-        <text x="110.5" y="14">38.2737%</text>
+        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">38.2945%</text>
+        <text x="110.5" y="14">38.2945%</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.1209%</text>
-        <text x="165.5" y="14">40.1209%</text>
+        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">40.1365%</text>
+        <text x="165.5" y="14">40.1365%</text>
     </g>
 </svg>

src/global_asm/audio/csplayer.c

@@ -2,18 +2,56 @@
 #include "functions.h"
 
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80732F10.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/csplayer/func_global_asm_80733180.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80733180.s")
+extern void func_global_asm_80733D8C(ALCSPlayer *, ALEvent *);
+extern void func_global_asm_807359A0(ALCSPlayer *);
+extern void func_global_asm_80735624(ALCSPlayer *, ALEvent *);
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80733A88.s")
+void func_global_asm_80733A88(ALCSPlayer *seqp) {
+    // __CSPHandleNextSeqEvent
+    ALEvent	evt;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80733B88.s")
+    /* sct 1/5/96 - Do nothing if we don't have a target sequence. */
+    if (seqp->target == NULL)
+	return;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80733C34.s")
+    func_global_asm_807385F0(seqp->target, &evt, 1);
+
+    switch (evt.type)
+    {
+      case AL_SEQ_MIDI_EVT:
+          func_global_asm_80733D8C(seqp, &evt);
+	  func_global_asm_807359A0(seqp);
+	  break;
+
+      case AL_TEMPO_EVT:
+          func_global_asm_80735624(seqp, &evt);
+	  func_global_asm_807359A0(seqp);
+	  break;
+
+      case AL_SEQ_END_EVT:
+	  seqp->state = AL_STOPPING;      
+	  evt.type    = AL_SEQP_STOP_EVT;
+	  alEvtqPostEvent(&seqp->evtq, &evt, AL_EVTQ_END);
+	  break;
+
+      case AL_TRACK_END:
+      case AL_CSP_LOOPSTART:
+      case AL_CSP_LOOPEND:
+	  func_global_asm_807359A0(seqp);
+	  break;
+      default:
+      break;
+    }
+}
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/csplayer/func_global_asm_80733B88.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/csplayer/func_global_asm_80733C34.s")
 
 // Jumptable
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_global_asm_80733D8C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/csplayer/func_global_asm_80733D8C.s")
 
 extern void func_global_asm_80735958(ALCSPlayer *, f32);
 extern void  func_global_asm_80735864(ALEventQueue *, ALEventListItem *);

src/global_asm/code_137C10.c

@@ -0,0 +1,5 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_global_asm_80732F10.s")