41.3706%

decompressed.us.yaml

@@ -330,8 +330,7 @@ segments:
       - [0x2137120, c, audio/code_137120]
       - [0x21371D0, c, audio/code_1371D0]
       - [0x2137630, c, audio/code_137630]
-      - [0x2137C10, c, audio/code_137C10]
-      - [0x2137E80, c, audio/csplayer]
+      - [0x2137C10, c, audio/csplayer]
       - [0x213A6A0, c, audio/code_13A6A0]
       - [0x213A750, c, audio/code_13A750]
       - [0x213A7A0, c, audio/code_13A7A0]

include/2.0L/PR/libaudio.h

@@ -678,6 +678,8 @@ typedef struct ALVoiceState_s {
     u8          tremelo;        /* current value of the tremelo */
     u8          flags;          /* bit 0 tremelo flag
                                    bit 1 vibrato flag           */
+    /* DK64 Stuff */
+    u8          unk38[8];       // Currently padding, has to be size 0x40
 } ALVoiceState;
 
 typedef struct {
@@ -806,6 +808,12 @@ typedef struct {
     ALOscInit           initOsc;
     ALOscUpdate         updateOsc;
     ALOscStop           stopOsc;
+    /* From here is custom variables for DK64 */
+    f32                 unk7C;
+    f32                 unk80;
+    s32                 unk84;
+    s8                  unk88;
+    s8                  unk89;
 } ALCSPlayer;
 
 /*

progress/progress.global_asm.csv

@@ -1443,7 +1443,7 @@ us,asm,func_global_asm_80673240,104,no
 us,asm,func_global_asm_806E9ECC,192,yes
 us,asm,func_global_asm_80619018,168,yes
 us,asm,func_global_asm_806A1AC4,1124,yes
-us,asm,func_global_asm_80732F10,624,no
+us,asm,func_global_asm_80732F10,624,yes
 us,asm,func_global_asm_80650998,108,yes
 us,asm,getFlagBlockAddress,340,no
 us,asm,func_global_asm_8070CBA4,120,yes

progress/progress.total.csv

@@ -1443,7 +1443,7 @@ us,asm,func_global_asm_80673240,104,no
 us,asm,func_global_asm_806E9ECC,192,yes
 us,asm,func_global_asm_80619018,168,yes
 us,asm,func_global_asm_806A1AC4,1124,yes
-us,asm,func_global_asm_80732F10,624,no
+us,asm,func_global_asm_80732F10,624,yes
 us,asm,func_global_asm_80650998,108,yes
 us,asm,getFlagBlockAddress,340,no
 us,asm,func_global_asm_8070CBA4,120,yes

progress/progress_global_asm.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h77v20H0z"/>
-        <path fill="#c09500" d="M77 0h67v20H77z"/>
+        <path fill="#c09600" d="M77 0h67v20H77z"/>
         <path fill="url(#b)" d="M0 0h144v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -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.8945%</text>
-        <text x="110.5" y="14">38.8945%</text>
+        <text x="111.5" y="15" fill="#010101" fill-opacity=".3">38.9452%</text>
+        <text x="110.5" y="14">38.9452%</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">41.3327%</text>
-        <text x="165.5" y="14">41.3327%</text>
+        <text x="166.5" y="15" fill="#010101" fill-opacity=".3">41.3706%</text>
+        <text x="165.5" y="14">41.3706%</text>
     </g>
 </svg>

src/global_asm/audio/code_137C10.c

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

src/global_asm/audio/csplayer.c

@@ -1,6 +1,61 @@
 #include <ultra64.h>
 #include "functions.h"
 
+ALEventListItem *func_global_asm_80732444(s32, s32, s32, u8, s32); /* extern */
+s32 func_global_asm_80733180(void *);
+void func_global_asm_80737F40(ALCSPlayer *);
+void func_global_asm_8073AA74(ALCSPlayer *);
+
+void func_global_asm_80732F10(ALCSPlayer *seqp, ALSeqpConfig *c) {
+    // alCSPNew
+    s32 i;
+    u8 pad[8];
+    ALEventListItem *items;
+    ALVoiceState *vs;
+    ALVoiceState *voices;
+
+    ALHeap *hp = c->heap;
+
+    seqp->bank = 0;
+    seqp->target = 0;
+    seqp->drvr = n_syn;
+    seqp->chanMask = 0xFFFF;
+    func_global_asm_80737F40(seqp);
+    seqp->uspt = 0x1E8;
+    seqp->nextDelta = 0;
+    seqp->state = AL_STOPPED;
+    seqp->vol = 0x7FFF;
+    seqp->debugFlags = c->debugFlags;
+    seqp->frameTime = AL_USEC_PER_FRAME;
+    seqp->curTime = 0;
+    seqp->initOsc = c->initOsc;
+    seqp->updateOsc = c->updateOsc;
+    seqp->stopOsc = c->stopOsc;
+    seqp->unk7C = 0.0f;
+    seqp->unk80 = 1.0f;
+    seqp->unk84 = 0;
+    seqp->unk89 = 0;
+    seqp->unk88 = c->maxVoices;
+    seqp->nextEvent.type = AL_SEQP_API_EVT;
+    seqp->maxChannels = c->maxChannels;
+    seqp->chanState = func_global_asm_80732444(0, 0, hp, c->maxChannels, 0x34);
+    func_global_asm_8073AA74(seqp);
+    voices = func_global_asm_80732444(0, 0, hp, c->maxVoices, sizeof(ALVoiceState));
+    seqp->vFreeList = NULL;
+    for (i = 0; i < c->maxVoices; i++) {
+        vs = &voices[i];
+        vs->next = seqp->vFreeList;
+        seqp->vFreeList = vs;
+    }
+    seqp->vAllocHead = 0;
+    seqp->vAllocTail = 0;
+    items = func_global_asm_80732444(0, 0, hp, c->maxEvents, 0x1C);
+    alEvtqNew(&seqp->evtq, items, c->maxEvents);
+    seqp->node.next = NULL;
+    seqp->node.handler = func_global_asm_80733180;
+    seqp->node.clientData = seqp;
+    func_global_asm_8073B640(seqp);
+}
 
 #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/csplayer/func_global_asm_80733180.s")