From eaceb22e75e636ef3b15487c6db502802cbf5d04 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 4 Apr 2021 16:15:06 +1000 Subject: [PATCH] Rename some audio functions to their libnaudio names --- src/include/PR/libaudio.h | 10 +- src/include/PR/seqp.h | 12 +- src/include/data.h | 4 +- src/include/lib/lib_3a100.h | 2 +- src/include/lib/lib_3d280.h | 2 +- src/include/lib/lib_3e3e0.h | 2 +- src/lib/lib_2fba0.c | 18 +-- src/lib/lib_30ce0.c | 216 +++++++++++++-------------- src/lib/lib_317f0.c | 18 +-- src/lib/lib_37b00.c | 4 +- src/lib/lib_39fe0.c | 8 +- src/lib/lib_3a100.c | 34 ++--- src/lib/lib_3c430.c | 4 +- src/lib/lib_3c890.c | 64 ++++---- src/lib/lib_3ccf0.c | 4 +- src/lib/lib_3cdc0.c | 4 +- src/lib/lib_3cef0.c | 20 +-- src/lib/lib_3d280.c | 24 +-- src/lib/lib_3e3e0.c | 32 ++-- src/lib/lib_3e730.c | 4 +- src/lib/lib_446d0.c | 4 +- src/lib/lib_44bc0.c | 24 +-- src/lib/ultra/audio/csplayer.c | 66 ++++---- src/lib/ultra/audio/event.c | 6 +- src/lib/ultra/audio/syndelete.c | 2 +- src/lib/ultra/audio/synsetpriority.c | 2 +- 26 files changed, 295 insertions(+), 295 deletions(-) diff --git a/src/include/PR/libaudio.h b/src/include/PR/libaudio.h index 492099fe0..dc8826d77 100644 --- a/src/include/PR/libaudio.h +++ b/src/include/PR/libaudio.h @@ -347,7 +347,7 @@ void alSynSetVol(ALVoice *v, s16 vol, ALMicroTime delta); void alSynSetPitch(ALSynth *s, ALVoice *voice, f32 ratio); void alSynSetPan(ALSynth *s, ALVoice *voice, ALPan pan); void alSynSetFXMix(ALSynth *s, ALVoice *voice, u8 fxmix); -void alSynSetPriority(ALVoice *voice, s16 priority); +void n_alSynSetPriority(ALVoice *voice, s16 priority); s16 alSynGetPriority(ALSynth *s, ALVoice *voice); ALFxRef *alSynAllocFX(ALSynth *s, s16 bus, ALSynConfig *c, ALHeap *hp); @@ -362,7 +362,7 @@ typedef struct { ALSynth drvr; } ALGlobals; -extern ALGlobals *alGlobals; +extern ALGlobals *n_syn; void alInit(ALGlobals *glob, ALSynConfig *c); void alClose(ALGlobals *glob); @@ -594,13 +594,13 @@ typedef struct { s32 eventCount; } ALEventQueue; -void alEvtqNew(ALEventQueue *evtq, ALEventListItem *items, +void n_alEvtqNew(ALEventQueue *evtq, ALEventListItem *items, s32 itemCount); -ALMicroTime alEvtqNextEvent(ALEventQueue *evtq, ALEvent *evt); +ALMicroTime n_alEvtqNextEvent(ALEventQueue *evtq, ALEvent *evt); void alEvtqPostEvent(ALEventQueue *evtq, ALEvent *evt, ALMicroTime delta, s32 arg3); void alEvtqFlush(ALEventQueue *evtq); -void alEvtqFlushType(ALEventQueue *evtq, s16 type); +void n_alEvtqFlushType(ALEventQueue *evtq, s16 type); #define AL_PHASE_ATTACK 0 diff --git a/src/include/PR/seqp.h b/src/include/PR/seqp.h index c9ab02baa..9e5196370 100755 --- a/src/include/PR/seqp.h +++ b/src/include/PR/seqp.h @@ -12,26 +12,26 @@ ALVoiceState *__mapVoice(ALSeqPlayer *, u8, u8, u8); void __unmapVoice(ALSeqPlayer *seqp, ALVoice *voice); -char __voiceNeedsNoteKill(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime killTime); /* sct 1/5/96 */ +char __n_voiceNeedsNoteKill(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime killTime); /* sct 1/5/96 */ ALVoiceState *__lookupVoice(ALSeqPlayer *, u8, u8); ALSound *__lookupSound(ALSeqPlayer *, u8, u8, u8); ALSound *__lookupSoundQuick(ALSeqPlayer *, u8, u8, u8); s16 __vsVol(ALVoiceState *voice, ALSeqPlayer *seqp); -ALMicroTime __vsDelta(ALVoiceState *voice, ALMicroTime t); +ALMicroTime __n_vsDelta(ALVoiceState *voice, ALMicroTime t); ALPan __vsPan(ALVoiceState *voice, ALSeqPlayer *seqp); -void __initFromBank(ALSeqPlayer *seqp, ALBank *b); +void __n_initFromBank(ALSeqPlayer *seqp, ALBank *b); void __initChanState(ALSeqPlayer *seqp); -void __resetPerfChanState(ALSeqPlayer *seqp, s32 chan); -void __setInstChanState(ALSeqPlayer *seqp, ALInstrument *inst, s32 chan); +void __n_resetPerfChanState(ALSeqPlayer *seqp, s32 chan); +void __n_setInstChanState(ALSeqPlayer *seqp, ALInstrument *inst, s32 chan); void __seqpPrintVoices(ALSeqPlayer *); void __seqpReleaseVoice(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime deltaTime); -void __seqpStopOsc(ALSeqPlayer *seqp, ALVoiceState *vs); +void __n_seqpStopOsc(ALSeqPlayer *seqp, ALVoiceState *vs); void __postNextSeqEvent(ALSeqPlayer *seqp); /* sct 11/7/95 */ diff --git a/src/include/data.h b/src/include/data.h index 38d908652..12cc68917 100644 --- a/src/include/data.h +++ b/src/include/data.h @@ -83,8 +83,8 @@ extern u32 var8005f038; extern u16 *g_RdpOutBufferEnd; extern u16 *g_RdpOutBufferStart; extern struct rdptask *g_RdpCurTask; -extern ALGlobals *var8005f110; -extern ALGlobals *alGlobals; +extern ALGlobals *n_alGlobals; +extern ALGlobals *n_syn; extern u32 var8005f120; extern u32 var8005f124; extern u32 var8005f128; diff --git a/src/include/lib/lib_3a100.h b/src/include/lib/lib_3a100.h index 0edba7846..9085eb8c0 100644 --- a/src/include/lib/lib_3a100.h +++ b/src/include/lib/lib_3a100.h @@ -5,7 +5,7 @@ #include "types.h" u32 func0003a100(void); -u32 func0003a940(void); +u32 n_alFxParamHdl(void); u32 func0003ae60(void); u32 func0003b178(void); u32 func0003b370(void); diff --git a/src/include/lib/lib_3d280.h b/src/include/lib/lib_3d280.h index bc55a0b81..292867a4e 100644 --- a/src/include/lib/lib_3d280.h +++ b/src/include/lib/lib_3d280.h @@ -10,6 +10,6 @@ u32 func0003d69c(void); u32 func0003d72c(void); u32 func0003d8a4(void); u32 func0003d9cc(void); -void __resetPerfChanState(ALSeqPlayer *seqp, s32 chan); +void __n_resetPerfChanState(ALSeqPlayer *seqp, s32 chan); #endif diff --git a/src/include/lib/lib_3e3e0.h b/src/include/lib/lib_3e3e0.h index c461b99d2..275dd25e6 100644 --- a/src/include/lib/lib_3e3e0.h +++ b/src/include/lib/lib_3e3e0.h @@ -8,7 +8,7 @@ u32 func0003e3e0(void); u32 func0003e490(void); u32 func0003e540(void); u32 func0003e5b8(void); -u32 func0003e630(void); +u32 n_alSynSetFXParam(void); u32 func0003e674(void); #endif diff --git a/src/lib/lib_2fba0.c b/src/lib/lib_2fba0.c index 903371700..3fb7658c0 100644 --- a/src/lib/lib_2fba0.c +++ b/src/lib/lib_2fba0.c @@ -6,16 +6,16 @@ #include "data.h" #include "types.h" -ALGlobals *var8005f110 = NULL; -ALGlobals *alGlobals = NULL; +ALGlobals *n_alGlobals = NULL; +ALGlobals *n_syn = NULL; void n_alInit(ALGlobals *g, ALSynConfig *c) { - if (!var8005f110) { - var8005f110 = g; + if (!n_alGlobals) { + n_alGlobals = g; - if (!alGlobals) { - alGlobals = var8005f110; + if (!n_syn) { + n_syn = n_alGlobals; n_alSynNew(c); } } @@ -23,9 +23,9 @@ void n_alInit(ALGlobals *g, ALSynConfig *c) void n_alClose(ALGlobals *g) { - if (var8005f110) { + if (n_alGlobals) { n_alSynDelete(); - var8005f110 = NULL; - alGlobals = NULL; + n_alGlobals = NULL; + n_syn = NULL; } } diff --git a/src/lib/lib_30ce0.c b/src/lib/lib_30ce0.c index f5e84ab78..327c21d5c 100644 --- a/src/lib/lib_30ce0.c +++ b/src/lib/lib_30ce0.c @@ -17,39 +17,39 @@ glabel n_alSynNew /* 30cec: 8fae0040 */ lw $t6,0x40($sp) /* 30cf0: 8dcf0014 */ lw $t7,0x14($t6) /* 30cf4: afaf002c */ sw $t7,0x2c($sp) -/* 30cf8: 3c188006 */ lui $t8,%hi(alGlobals) -/* 30cfc: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 30cf8: 3c188006 */ lui $t8,%hi(n_syn) +/* 30cfc: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 30d00: af000000 */ sw $zero,0x0($t8) /* 30d04: 8fb90040 */ lw $t9,0x40($sp) -/* 30d08: 3c098006 */ lui $t1,%hi(alGlobals) -/* 30d0c: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 30d08: 3c098006 */ lui $t1,%hi(n_syn) +/* 30d0c: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 30d10: 8f280004 */ lw $t0,0x4($t9) /* 30d14: ad280038 */ sw $t0,0x38($t1) -/* 30d18: 3c0a8006 */ lui $t2,%hi(alGlobals) -/* 30d1c: 8d4af114 */ lw $t2,%lo(alGlobals)($t2) +/* 30d18: 3c0a8006 */ lui $t2,%hi(n_syn) +/* 30d1c: 8d4af114 */ lw $t2,%lo(n_syn)($t2) /* 30d20: ad400020 */ sw $zero,0x20($t2) -/* 30d24: 3c0b8006 */ lui $t3,%hi(alGlobals) -/* 30d28: 8d6bf114 */ lw $t3,%lo(alGlobals)($t3) +/* 30d24: 3c0b8006 */ lui $t3,%hi(n_syn) +/* 30d28: 8d6bf114 */ lw $t3,%lo(n_syn)($t3) /* 30d2c: ad60001c */ sw $zero,0x1c($t3) /* 30d30: 8fac0040 */ lw $t4,0x40($sp) -/* 30d34: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 30d38: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 30d34: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 30d38: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 30d3c: 8d8d0018 */ lw $t5,0x18($t4) /* 30d40: adcd0040 */ sw $t5,0x40($t6) -/* 30d44: 3c188006 */ lui $t8,%hi(alGlobals) -/* 30d48: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 30d44: 3c188006 */ lui $t8,%hi(n_syn) +/* 30d48: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 30d4c: 240f00b8 */ addiu $t7,$zero,0xb8 /* 30d50: af0f0044 */ sw $t7,0x44($t8) /* 30d54: 8fb90040 */ lw $t9,0x40($sp) -/* 30d58: 3c098006 */ lui $t1,%hi(alGlobals) -/* 30d5c: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 30d58: 3c098006 */ lui $t1,%hi(n_syn) +/* 30d5c: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 30d60: 8f280010 */ lw $t0,0x10($t9) /* 30d64: ad280024 */ sw $t0,0x24($t1) -/* 30d68: 3c0a8006 */ lui $t2,%hi(alGlobals) -/* 30d6c: 8d4af114 */ lw $t2,%lo(alGlobals)($t2) +/* 30d68: 3c0a8006 */ lui $t2,%hi(n_syn) +/* 30d6c: 8d4af114 */ lw $t2,%lo(n_syn)($t2) /* 30d70: ad400048 */ sw $zero,0x48($t2) -/* 30d74: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 30d78: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 30d74: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 30d78: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 30d7c: 240b0001 */ addiu $t3,$zero,0x1 /* 30d80: ad8b004c */ sw $t3,0x4c($t4) /* 30d84: 8fad0040 */ lw $t5,0x40($sp) @@ -57,8 +57,8 @@ glabel n_alSynNew /* 30d8c: 29c10003 */ slti $at,$t6,0x3 /* 30d90: 14200006 */ bnez $at,.L00030dac /* 30d94: 00000000 */ nop -/* 30d98: 3c188006 */ lui $t8,%hi(alGlobals) -/* 30d9c: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 30d98: 3c188006 */ lui $t8,%hi(n_syn) +/* 30d9c: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 30da0: 240f0002 */ addiu $t7,$zero,0x2 /* 30da4: 1000000f */ b .L00030de4 /* 30da8: af0f003c */ sw $t7,0x3c($t8) @@ -67,20 +67,20 @@ glabel n_alSynNew /* 30db0: 8f28000c */ lw $t0,0xc($t9) /* 30db4: 1d000006 */ bgtz $t0,.L00030dd0 /* 30db8: 00000000 */ nop -/* 30dbc: 3c0a8006 */ lui $t2,%hi(alGlobals) -/* 30dc0: 8d4af114 */ lw $t2,%lo(alGlobals)($t2) +/* 30dbc: 3c0a8006 */ lui $t2,%hi(n_syn) +/* 30dc0: 8d4af114 */ lw $t2,%lo(n_syn)($t2) /* 30dc4: 24090001 */ addiu $t1,$zero,0x1 /* 30dc8: 10000006 */ b .L00030de4 /* 30dcc: ad49003c */ sw $t1,0x3c($t2) .L00030dd0: /* 30dd0: 8fab0040 */ lw $t3,0x40($sp) -/* 30dd4: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 30dd8: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 30dd4: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 30dd8: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 30ddc: 8d6c000c */ lw $t4,0xc($t3) /* 30de0: adac003c */ sw $t4,0x3c($t5) .L00030de4: -/* 30de4: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 30de8: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 30de4: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 30de8: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 30dec: 240f0048 */ addiu $t7,$zero,0x48 /* 30df0: 00002025 */ or $a0,$zero,$zero /* 30df4: 8dc7003c */ lw $a3,0x3c($t6) @@ -88,18 +88,18 @@ glabel n_alSynNew /* 30dfc: 00002825 */ or $a1,$zero,$zero /* 30e00: 0c00bec5 */ jal alHeapDBAlloc /* 30e04: 8fa6002c */ lw $a2,0x2c($sp) -/* 30e08: 3c188006 */ lui $t8,%hi(alGlobals) -/* 30e0c: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 30e08: 3c188006 */ lui $t8,%hi(n_syn) +/* 30e0c: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 30e10: af020034 */ sw $v0,0x34($t8) -/* 30e14: 3c198006 */ lui $t9,%hi(alGlobals) -/* 30e18: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 30e14: 3c198006 */ lui $t9,%hi(n_syn) +/* 30e18: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 30e1c: afa0003c */ sw $zero,0x3c($sp) /* 30e20: 8f28003c */ lw $t0,0x3c($t9) /* 30e24: 19000088 */ blez $t0,.L00031048 /* 30e28: 00000000 */ nop .L00030e2c: -/* 30e2c: 3c098006 */ lui $t1,%hi(alGlobals) -/* 30e30: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 30e2c: 3c098006 */ lui $t1,%hi(n_syn) +/* 30e30: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 30e34: 8fab003c */ lw $t3,0x3c($sp) /* 30e38: 8d2a0034 */ lw $t2,0x34($t1) /* 30e3c: 000b60c0 */ sll $t4,$t3,0x3 @@ -107,8 +107,8 @@ glabel n_alSynNew /* 30e44: 000c60c0 */ sll $t4,$t4,0x3 /* 30e48: 014c6821 */ addu $t5,$t2,$t4 /* 30e4c: ada00014 */ sw $zero,0x14($t5) -/* 30e50: 3c188006 */ lui $t8,%hi(alGlobals) -/* 30e54: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 30e50: 3c188006 */ lui $t8,%hi(n_syn) +/* 30e54: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 30e58: 8fa8003c */ lw $t0,0x3c($sp) /* 30e5c: 8fae0040 */ lw $t6,0x40($sp) /* 30e60: 8f190034 */ lw $t9,0x34($t8) @@ -126,8 +126,8 @@ glabel n_alSynNew /* 30e90: 00002825 */ or $a1,$zero,$zero /* 30e94: 0c00bec5 */ jal alHeapDBAlloc /* 30e98: 8fa6002c */ lw $a2,0x2c($sp) -/* 30e9c: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 30ea0: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 30e9c: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 30ea0: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 30ea4: 8fb8003c */ lw $t8,0x3c($sp) /* 30ea8: 8dae0034 */ lw $t6,0x34($t5) /* 30eac: 001840c0 */ sll $t0,$t8,0x3 @@ -145,8 +145,8 @@ glabel n_alSynNew /* 30edc: 8fa50040 */ lw $a1,0x40($sp) /* 30ee0: 0c00e81c */ jal func0003a070 /* 30ee4: 8fa6002c */ lw $a2,0x2c($sp) -/* 30ee8: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 30eec: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 30ee8: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 30eec: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 30ef0: 8fb8003c */ lw $t8,0x3c($sp) /* 30ef4: 8d8d0034 */ lw $t5,0x34($t4) /* 30ef8: 001870c0 */ sll $t6,$t8,0x3 @@ -156,8 +156,8 @@ glabel n_alSynNew /* 30f08: 1000000a */ b .L00030f34 /* 30f0c: ad020020 */ sw $v0,0x20($t0) .L00030f10: -/* 30f10: 3c198006 */ lui $t9,%hi(alGlobals) -/* 30f14: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 30f10: 3c198006 */ lui $t9,%hi(n_syn) +/* 30f14: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 30f18: 8faf003c */ lw $t7,0x3c($sp) /* 30f1c: 8f290034 */ lw $t1,0x34($t9) /* 30f20: 000f58c0 */ sll $t3,$t7,0x3 @@ -173,8 +173,8 @@ glabel n_alSynNew /* 30f44: 8fa6002c */ lw $a2,0x2c($sp) /* 30f48: 0c00bec5 */ jal alHeapDBAlloc /* 30f4c: 24070001 */ addiu $a3,$zero,0x1 -/* 30f50: 3c188006 */ lui $t8,%hi(alGlobals) -/* 30f54: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 30f50: 3c188006 */ lui $t8,%hi(n_syn) +/* 30f54: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 30f58: 8fae003c */ lw $t6,0x3c($sp) /* 30f5c: 8f0d0034 */ lw $t5,0x34($t8) /* 30f60: 000e40c0 */ sll $t0,$t6,0x3 @@ -182,8 +182,8 @@ glabel n_alSynNew /* 30f68: 000840c0 */ sll $t0,$t0,0x3 /* 30f6c: 01a8c821 */ addu $t9,$t5,$t0 /* 30f70: af220044 */ sw $v0,0x44($t9) -/* 30f74: 3c0f8006 */ lui $t7,%hi(alGlobals) -/* 30f78: 8deff114 */ lw $t7,%lo(alGlobals)($t7) +/* 30f74: 3c0f8006 */ lui $t7,%hi(n_syn) +/* 30f78: 8deff114 */ lw $t7,%lo(n_syn)($t7) /* 30f7c: 8fab003c */ lw $t3,0x3c($sp) /* 30f80: 8de90034 */ lw $t1,0x34($t7) /* 30f84: 000b50c0 */ sll $t2,$t3,0x3 @@ -199,8 +199,8 @@ glabel n_alSynNew /* 30fac: 8fa6002c */ lw $a2,0x2c($sp) /* 30fb0: 0c00bec5 */ jal alHeapDBAlloc /* 30fb4: 24070001 */ addiu $a3,$zero,0x1 -/* 30fb8: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 30fbc: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 30fb8: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 30fbc: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 30fc0: 8fb9003c */ lw $t9,0x3c($sp) /* 30fc4: 8da80034 */ lw $t0,0x34($t5) /* 30fc8: 001978c0 */ sll $t7,$t9,0x3 @@ -216,8 +216,8 @@ glabel n_alSynNew /* 30ff0: 8fa6002c */ lw $a2,0x2c($sp) /* 30ff4: 0c00bec5 */ jal alHeapDBAlloc /* 30ff8: 24070001 */ addiu $a3,$zero,0x1 -/* 30ffc: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 31000: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 30ffc: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 31000: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 31004: 8fae003c */ lw $t6,0x3c($sp) /* 31008: 8d980034 */ lw $t8,0x34($t4) /* 3100c: 000e68c0 */ sll $t5,$t6,0x3 @@ -227,8 +227,8 @@ glabel n_alSynNew /* 3101c: 8f280044 */ lw $t0,0x44($t9) /* 31020: ad020030 */ sw $v0,0x30($t0) /* 31024: 8faf003c */ lw $t7,0x3c($sp) -/* 31028: 3c098006 */ lui $t1,%hi(alGlobals) -/* 3102c: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 31028: 3c098006 */ lui $t1,%hi(n_syn) +/* 3102c: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 31030: 25eb0001 */ addiu $t3,$t7,0x1 /* 31034: afab003c */ sw $t3,0x3c($sp) /* 31038: 8d2a003c */ lw $t2,0x3c($t1) @@ -243,32 +243,32 @@ glabel n_alSynNew /* 31058: 8fa6002c */ lw $a2,0x2c($sp) /* 3105c: 0c00bec5 */ jal alHeapDBAlloc /* 31060: 24070001 */ addiu $a3,$zero,0x1 -/* 31064: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 31068: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 31064: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 31068: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3106c: adc20030 */ sw $v0,0x30($t6) -/* 31070: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 31074: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 31070: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 31074: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 31078: 3c187004 */ lui $t8,%hi(func0003a100) /* 3107c: 2718a100 */ addiu $t8,$t8,%lo(func0003a100) /* 31080: 8db90030 */ lw $t9,0x30($t5) /* 31084: af380004 */ sw $t8,0x4($t9) -/* 31088: 3c088006 */ lui $t0,%hi(alGlobals) -/* 3108c: 8d08f114 */ lw $t0,%lo(alGlobals)($t0) +/* 31088: 3c088006 */ lui $t0,%hi(n_syn) +/* 3108c: 8d08f114 */ lw $t0,%lo(n_syn)($t0) /* 31090: ad000004 */ sw $zero,0x4($t0) -/* 31094: 3c0f8006 */ lui $t7,%hi(alGlobals) -/* 31098: 8deff114 */ lw $t7,%lo(alGlobals)($t7) +/* 31094: 3c0f8006 */ lui $t7,%hi(n_syn) +/* 31098: 8deff114 */ lw $t7,%lo(n_syn)($t7) /* 3109c: ade00008 */ sw $zero,0x8($t7) -/* 310a0: 3c098006 */ lui $t1,%hi(alGlobals) -/* 310a4: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 310a0: 3c098006 */ lui $t1,%hi(n_syn) +/* 310a4: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 310a8: ad200014 */ sw $zero,0x14($t1) -/* 310ac: 3c0b8006 */ lui $t3,%hi(alGlobals) -/* 310b0: 8d6bf114 */ lw $t3,%lo(alGlobals)($t3) +/* 310ac: 3c0b8006 */ lui $t3,%hi(n_syn) +/* 310b0: 8d6bf114 */ lw $t3,%lo(n_syn)($t3) /* 310b4: ad600018 */ sw $zero,0x18($t3) -/* 310b8: 3c0a8006 */ lui $t2,%hi(alGlobals) -/* 310bc: 8d4af114 */ lw $t2,%lo(alGlobals)($t2) +/* 310b8: 3c0a8006 */ lui $t2,%hi(n_syn) +/* 310bc: 8d4af114 */ lw $t2,%lo(n_syn)($t2) /* 310c0: ad40000c */ sw $zero,0xc($t2) -/* 310c4: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 310c8: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 310c4: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 310c8: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 310cc: ad800010 */ sw $zero,0x10($t4) /* 310d0: 8fae0040 */ lw $t6,0x40($sp) /* 310d4: 240d00c0 */ addiu $t5,$zero,0xc0 @@ -292,28 +292,28 @@ glabel n_alSynNew /* 31118: 000f7980 */ sll $t7,$t7,0x6 /* 3111c: 01e95821 */ addu $t3,$t7,$t1 /* 31120: afab0034 */ sw $t3,0x34($sp) -/* 31124: 3c058006 */ lui $a1,%hi(alGlobals) -/* 31128: 8ca5f114 */ lw $a1,%lo(alGlobals)($a1) +/* 31124: 3c058006 */ lui $a1,%hi(n_syn) +/* 31128: 8ca5f114 */ lw $a1,%lo(n_syn)($a1) /* 3112c: 8fa40034 */ lw $a0,0x34($sp) /* 31130: 0c00c5dc */ jal alLink /* 31134: 24a50004 */ addiu $a1,$a1,4 /* 31138: 8faa0034 */ lw $t2,0x34($sp) /* 3113c: ad400008 */ sw $zero,0x8($t2) -/* 31140: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 31144: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 31140: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 31144: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 31148: 8fa40034 */ lw $a0,0x34($sp) /* 3114c: 8fa6002c */ lw $a2,0x2c($sp) /* 31150: 0c00f085 */ jal func0003c214 /* 31154: 8d850024 */ lw $a1,0x24($t4) -/* 31158: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3115c: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 31158: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3115c: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 31160: afa00038 */ sw $zero,0x38($sp) /* 31164: 8dcd003c */ lw $t5,0x3c($t6) /* 31168: 19a00023 */ blez $t5,.L000311f8 /* 3116c: 00000000 */ nop .L00031170: -/* 31170: 3c198006 */ lui $t9,%hi(alGlobals) -/* 31174: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 31170: 3c198006 */ lui $t9,%hi(n_syn) +/* 31174: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 31178: 8faf0038 */ lw $t7,0x38($sp) /* 3117c: 8fb80034 */ lw $t8,0x34($sp) /* 31180: 8f280034 */ lw $t0,0x34($t9) @@ -323,12 +323,12 @@ glabel n_alSynNew /* 31190: 01095821 */ addu $t3,$t0,$t1 /* 31194: 8d6c0014 */ lw $t4,0x14($t3) /* 31198: 8d6a001c */ lw $t2,0x1c($t3) -/* 3119c: 3c198006 */ lui $t9,%hi(alGlobals) +/* 3119c: 3c198006 */ lui $t9,%hi(n_syn) /* 311a0: 000c7080 */ sll $t6,$t4,0x2 /* 311a4: 014e6821 */ addu $t5,$t2,$t6 /* 311a8: adb80000 */ sw $t8,0x0($t5) /* 311ac: 8fa80038 */ lw $t0,0x38($sp) -/* 311b0: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 311b0: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 311b4: 000848c0 */ sll $t1,$t0,0x3 /* 311b8: 8f2f0034 */ lw $t7,0x34($t9) /* 311bc: 01284821 */ addu $t1,$t1,$t0 @@ -338,8 +338,8 @@ glabel n_alSynNew /* 311cc: 258a0001 */ addiu $t2,$t4,0x1 /* 311d0: ad6a0014 */ sw $t2,0x14($t3) /* 311d4: 8fae0038 */ lw $t6,0x38($sp) -/* 311d8: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 311dc: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 311d8: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 311dc: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 311e0: 25d80001 */ addiu $t8,$t6,0x1 /* 311e4: afb80038 */ sw $t8,0x38($sp) /* 311e8: 8db9003c */ lw $t9,0x3c($t5) @@ -365,8 +365,8 @@ glabel n_alSynNew /* 31230: 0c00bec5 */ jal alHeapDBAlloc /* 31234: 8fa6002c */ lw $a2,0x2c($sp) /* 31238: afa20028 */ sw $v0,0x28($sp) -/* 3123c: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 31240: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3123c: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 31240: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 31244: adc0002c */ sw $zero,0x2c($t6) /* 31248: 8fad0040 */ lw $t5,0x40($sp) /* 3124c: afa0003c */ sw $zero,0x3c($sp) @@ -381,13 +381,13 @@ glabel n_alSynNew /* 3126c: 00084080 */ sll $t0,$t0,0x2 /* 31270: 01097821 */ addu $t7,$t0,$t1 /* 31274: afaf0024 */ sw $t7,0x24($sp) -/* 31278: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 3127c: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 31278: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 3127c: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 31280: 8fab0024 */ lw $t3,0x24($sp) /* 31284: 8d8a002c */ lw $t2,0x2c($t4) /* 31288: ad6a0000 */ sw $t2,0x0($t3) -/* 3128c: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 31290: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 3128c: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 31290: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 31294: 8fae0024 */ lw $t6,0x24($sp) /* 31298: adae002c */ sw $t6,0x2c($t5) /* 3129c: 8fb8003c */ lw $t8,0x3c($sp) @@ -399,8 +399,8 @@ glabel n_alSynNew /* 312b4: 1420ffe9 */ bnez $at,.L0003125c /* 312b8: 00000000 */ nop .L000312bc: -/* 312bc: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 312c0: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 312bc: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 312c0: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 312c4: 8faf002c */ lw $t7,0x2c($sp) /* 312c8: ad8f0028 */ sw $t7,0x28($t4) /* 312cc: 10000001 */ b .L000312d4 @@ -423,7 +423,7 @@ Acmd *alAudioFrame(Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen) s32 nOut; s16 *lOutBuf = outBuf; - if (alGlobals->drvr.head == 0) { + if (n_syn->drvr.head == 0) { *cmdLen = 0; return cmdList; /* nothing to do */ } @@ -445,10 +445,10 @@ Acmd *alAudioFrame(Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen) * during the client handler. */ - for (alGlobals->drvr.paramSamples = __nextSampleTime(&client); - alGlobals->drvr.paramSamples - alGlobals->drvr.curSamples < outLen; - alGlobals->drvr.paramSamples = __nextSampleTime(&client)) { - alGlobals->drvr.paramSamples &= ~0xf; + for (n_syn->drvr.paramSamples = __nextSampleTime(&client); + n_syn->drvr.paramSamples - n_syn->drvr.curSamples < outLen; + n_syn->drvr.paramSamples = __nextSampleTime(&client)) { + n_syn->drvr.paramSamples &= ~0xf; client->samplesLeft += _timeToSamplesNoRound((*client->handler)(client)); } @@ -457,22 +457,22 @@ Acmd *alAudioFrame(Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen) * routine (alSynAllocVoice) it will get timestamped with an aligned value and * will be processed immediately next audio frame. */ - alGlobals->drvr.paramSamples &= ~0xf; + n_syn->drvr.paramSamples &= ~0xf; /* * Now build the command list in small chunks */ while (outLen > 0) { - nOut = MIN(alGlobals->drvr.outputRate, outLen); + nOut = MIN(n_syn->drvr.outputRate, outLen); cmdPtr = cmdlEnd; - alGlobals->drvr.maxOutSamples = (s32)lOutBuf; + n_syn->drvr.maxOutSamples = (s32)lOutBuf; - cmdlEnd = func0003c430(alGlobals->drvr.curSamples, cmdPtr); + cmdlEnd = func0003c430(n_syn->drvr.curSamples, cmdPtr); outLen -= nOut; lOutBuf += nOut << 1; /* For Stereo */ - alGlobals->drvr.curSamples += nOut; + n_syn->drvr.curSamples += nOut; } *cmdLen = (s32) (cmdlEnd - cmdList); @@ -486,9 +486,9 @@ ALParam *__allocParam() { ALParam *update = NULL; - if (alGlobals->drvr.paramList) { - update = alGlobals->drvr.paramList; - alGlobals->drvr.paramList = alGlobals->drvr.paramList->next; + if (n_syn->drvr.paramList) { + update = n_syn->drvr.paramList; + n_syn->drvr.paramList = n_syn->drvr.paramList->next; update->next = 0; } @@ -497,17 +497,17 @@ ALParam *__allocParam() void __freeParam(ALParam *param) { - param->next = alGlobals->drvr.paramList; - alGlobals->drvr.paramList = param; + param->next = n_syn->drvr.paramList; + n_syn->drvr.paramList = param; } void _collectPVoices(void) { ALLink *dl; - while ((dl = alGlobals->drvr.pLameList.next) != 0) { + while ((dl = n_syn->drvr.pLameList.next) != 0) { alUnlink(dl); - alLink(dl, &alGlobals->drvr.pFreeList); + alLink(dl, &n_syn->drvr.pFreeList); } } @@ -517,13 +517,13 @@ void _freePVoice(PVoice *pvoice) * move the voice from the allocated list to the lame list */ alUnlink((ALLink *)pvoice); - alLink((ALLink *)pvoice, &alGlobals->drvr.pLameList); + alLink((ALLink *)pvoice, &n_syn->drvr.pLameList); } s32 _timeToSamplesNoRound(s32 micros) { // Should be outputRate but struct is not sized correctly - f32 tmp = ((f32)micros) * alGlobals->drvr.maxAuxBusses / 1000000.0f + 0.5f; + f32 tmp = ((f32)micros) * n_syn->drvr.maxAuxBusses / 1000000.0f + 0.5f; return (s32)tmp; } @@ -554,10 +554,10 @@ s32 __nextSampleTime(ALPlayer **client) *client = 0; - for (cl = alGlobals->drvr.head; cl != 0; cl = cl->next) { - if ((cl->samplesLeft - alGlobals->drvr.curSamples) < delta) { + for (cl = n_syn->drvr.head; cl != 0; cl = cl->next) { + if ((cl->samplesLeft - n_syn->drvr.curSamples) < delta) { *client = cl; - delta = cl->samplesLeft - alGlobals->drvr.curSamples; + delta = cl->samplesLeft - n_syn->drvr.curSamples; } } diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 624339cec..3e1270248 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -84,7 +84,7 @@ glabel func000317f0 /* 318ac: 8fa80040 */ lw $t0,0x40($sp) /* 318b0: 8fa50038 */ lw $a1,0x38($sp) /* 318b4: 24840014 */ addiu $a0,$a0,20 -/* 318b8: 0c00f134 */ jal alEvtqNew +/* 318b8: 0c00f134 */ jal n_alEvtqNew /* 318bc: 8d060004 */ lw $a2,0x4($t0) /* 318c0: 3c098006 */ lui $t1,%hi(var8005f12c) /* 318c4: 8d29f12c */ lw $t1,%lo(var8005f12c)($t1) @@ -185,7 +185,7 @@ glabel func000317f0 /* 31a30: 3c0d8006 */ lui $t5,%hi(var8005f12c) /* 31a34: 8dadf12c */ lw $t5,%lo(var8005f12c)($t5) /* 31a38: 25a40014 */ addiu $a0,$t5,0x14 -/* 31a3c: 0c00f15b */ jal alEvtqNextEvent +/* 31a3c: 0c00f15b */ jal n_alEvtqNextEvent /* 31a40: 25a50028 */ addiu $a1,$t5,0x28 /* 31a44: 3c0f8006 */ lui $t7,%hi(var8005f12c) /* 31a48: 8deff12c */ lw $t7,%lo(var8005f12c)($t7) @@ -251,7 +251,7 @@ glabel func000317f0 /* 318ac: 8fa80040 */ lw $t0,0x40($sp) /* 318b0: 8fa50038 */ lw $a1,0x38($sp) /* 318b4: 24840014 */ addiu $a0,$a0,20 -/* 318b8: 0c00f134 */ jal alEvtqNew +/* 318b8: 0c00f134 */ jal n_alEvtqNew /* 318bc: 8d060004 */ lw $a2,0x4($t0) /* 318c0: 3c098006 */ lui $t1,%hi(var8005f12c) /* 318c4: 8d29f12c */ lw $t1,%lo(var8005f12c)($t1) @@ -352,7 +352,7 @@ glabel func000317f0 /* 31a30: 3c0d8006 */ lui $t5,%hi(var8005f12c) /* 31a34: 8dadf12c */ lw $t5,%lo(var8005f12c)($t5) /* 31a38: 25a40014 */ addiu $a0,$t5,0x14 -/* 31a3c: 0c00f15b */ jal alEvtqNextEvent +/* 31a3c: 0c00f15b */ jal n_alEvtqNextEvent /* 31a40: 25a50028 */ addiu $a1,$t5,0x28 /* 31a44: 3c0f8006 */ lui $t7,%hi(var8005f12c) /* 31a48: 8deff12c */ lw $t7,%lo(var8005f12c)($t7) @@ -416,7 +416,7 @@ glabel func000317f0 /* 32ff4: 8fa80040 */ lw $t0,0x40($sp) /* 32ff8: 8fa50038 */ lw $a1,0x38($sp) /* 32ffc: 24840014 */ addiu $a0,$a0,0x14 -/* 33000: 0c00f628 */ jal alEvtqNew +/* 33000: 0c00f628 */ jal n_alEvtqNew /* 33004: 8d060004 */ lw $a2,0x4($t0) /* 33008: 3c098006 */ lui $t1,0x8006 /* 3300c: 8d29163c */ lw $t1,0x163c($t1) @@ -515,7 +515,7 @@ glabel func000317f0 /* 33170: 3c0d8006 */ lui $t5,0x8006 /* 33174: 8dad163c */ lw $t5,0x163c($t5) /* 33178: 25a40014 */ addiu $a0,$t5,0x14 -/* 3317c: 0c00f64f */ jal alEvtqNextEvent +/* 3317c: 0c00f64f */ jal n_alEvtqNextEvent /* 33180: 25a50028 */ addiu $a1,$t5,0x28 /* 33184: 3c0f8006 */ lui $t7,0x8006 /* 33188: 8def163c */ lw $t7,0x163c($t7) @@ -565,7 +565,7 @@ glabel func00031a68 .L00031ad4: /* 31ad4: 8fa9002c */ lw $t1,0x2c($sp) /* 31ad8: 25240014 */ addiu $a0,$t1,0x14 -/* 31adc: 0c00f15b */ jal alEvtqNextEvent +/* 31adc: 0c00f15b */ jal n_alEvtqNextEvent /* 31ae0: 25250028 */ addiu $a1,$t1,0x28 /* 31ae4: 8faa002c */ lw $t2,0x2c($sp) /* 31ae8: ad42004c */ sw $v0,0x4c($t2) @@ -1650,8 +1650,8 @@ glabel var7005477c /* 329e0: 8fa80060 */ lw $t0,0x60($sp) /* 329e4: 8d780008 */ lw $t8,0x8($t3) /* 329e8: a1180043 */ sb $t8,0x43($t0) -/* 329ec: 3c098006 */ lui $t1,%hi(alGlobals) -/* 329f0: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 329ec: 3c098006 */ lui $t1,%hi(n_syn) +/* 329f0: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 329f4: 8fac0060 */ lw $t4,0x60($sp) /* 329f8: 8d2e003c */ lw $t6,0x3c($t1) /* 329fc: 91990043 */ lbu $t9,0x43($t4) diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index 918b1d211..e06b728b3 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -830,7 +830,7 @@ s32 func00038ba8(s32 arg0, u8 *arg1, s32 arg2, s32 arg3) arg2 = g_Mp3Vars.var8009c3c0 - g_Mp3Vars.var8009c3c4; } - proc = alGlobals->drvr.dma(&sp1c); + proc = n_syn->drvr.dma(&sp1c); sp1c = OS_K0_TO_PHYSICAL(proc(g_Mp3Vars.var8009c390 + g_Mp3Vars.var8009c3c4, arg2, 0)); bcopy((u8 *)sp1c, arg1, arg2); @@ -845,7 +845,7 @@ void func00038cac(void) u32 state; ALDMAproc proc; - proc = alGlobals->drvr.dma(&state); + proc = n_syn->drvr.dma(&state); proc(g_Mp3Vars.var8009c390 + g_Mp3Vars.var8009c3c4, 0x400, 0); } diff --git a/src/lib/lib_39fe0.c b/src/lib/lib_39fe0.c index 569e14ff7..f92fb807e 100644 --- a/src/lib/lib_39fe0.c +++ b/src/lib/lib_39fe0.c @@ -63,8 +63,8 @@ glabel func0003a070 /* 3a078: afa40018 */ sw $a0,0x18($sp) /* 3a07c: afa5001c */ sw $a1,0x1c($sp) /* 3a080: afa60020 */ sw $a2,0x20($sp) -/* 3a084: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3a088: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3a084: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3a088: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3a08c: 87b8001a */ lh $t8,0x1a($sp) /* 3a090: 8fa5001c */ lw $a1,0x1c($sp) /* 3a094: 8dcf0034 */ lw $t7,0x34($t6) @@ -76,8 +76,8 @@ glabel func0003a070 /* 3a0ac: 8fa70020 */ lw $a3,0x20($sp) /* 3a0b0: 0c00ef14 */ jal func0003bc50 /* 3a0b4: 03003025 */ or $a2,$t8,$zero -/* 3a0b8: 3c088006 */ lui $t0,%hi(alGlobals) -/* 3a0bc: 8d08f114 */ lw $t0,%lo(alGlobals)($t0) +/* 3a0b8: 3c088006 */ lui $t0,%hi(n_syn) +/* 3a0bc: 8d08f114 */ lw $t0,%lo(n_syn)($t0) /* 3a0c0: 87aa001a */ lh $t2,0x1a($sp) /* 3a0c4: 8d090034 */ lw $t1,0x34($t0) /* 3a0c8: 000a58c0 */ sll $t3,$t2,0x3 diff --git a/src/lib/lib_3a100.c b/src/lib/lib_3a100.c index fc1d8ec7f..6ab807b6b 100644 --- a/src/lib/lib_3a100.c +++ b/src/lib/lib_3a100.c @@ -23,8 +23,8 @@ glabel var70054a90 /* 3a110: afa60088 */ sw $a2,0x88($sp) /* 3a114: 8fae0084 */ lw $t6,0x84($sp) /* 3a118: afae007c */ sw $t6,0x7c($sp) -/* 3a11c: 3c0f8006 */ lui $t7,%hi(alGlobals) -/* 3a120: 8deff114 */ lw $t7,%lo(alGlobals)($t7) +/* 3a11c: 3c0f8006 */ lui $t7,%hi(n_syn) +/* 3a120: 8deff114 */ lw $t7,%lo(n_syn)($t7) /* 3a124: 8fb90088 */ lw $t9,0x88($sp) /* 3a128: 8df80034 */ lw $t8,0x34($t7) /* 3a12c: 001940c0 */ sll $t0,$t9,0x3 @@ -570,24 +570,24 @@ glabel var70054a90 ); GLOBAL_ASM( -glabel func0003a940 +glabel n_alFxParamHdl .late_rodata glabel var70054a94 -.word func0003a940+0x88 +.word n_alFxParamHdl+0x88 glabel var70054a98 -.word func0003a940+0xe4 +.word n_alFxParamHdl+0xe4 glabel var70054a9c -.word func0003a940+0x140 +.word n_alFxParamHdl+0x140 glabel var70054aa0 -.word func0003a940+0x16c +.word n_alFxParamHdl+0x16c glabel var70054aa4 -.word func0003a940+0x198 +.word n_alFxParamHdl+0x198 glabel var70054aa8 -.word func0003a940+0x1c4 +.word n_alFxParamHdl+0x1c4 glabel var70054aac -.word func0003a940+0x228 +.word n_alFxParamHdl+0x228 glabel var70054ab0 -.word func0003a940+0x244 +.word n_alFxParamHdl+0x244 glabel var70054ab4 .word 0x482910da glabel var70054ab8 @@ -630,8 +630,8 @@ glabel var70054abc /* 3a9bc: 8c2e4a94 */ lw $t6,%lo(var70054a94)($at) /* 3a9c0: 01c00008 */ jr $t6 /* 3a9c4: 00000000 */ nop -/* 3a9c8: 3c188006 */ lui $t8,%hi(alGlobals) -/* 3a9cc: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 3a9c8: 3c188006 */ lui $t8,%hi(n_syn) +/* 3a9cc: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 3a9d0: 8faf0020 */ lw $t7,0x20($sp) /* 3a9d4: 240103e8 */ addiu $at,$zero,0x3e8 /* 3a9d8: 8f190040 */ lw $t9,0x40($t8) @@ -653,8 +653,8 @@ glabel var70054abc /* 3aa18: af0a0000 */ sw $t2,0x0($t8) /* 3aa1c: 10000078 */ b .L0003ac00 /* 3aa20: 00000000 */ nop -/* 3aa24: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3aa28: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3aa24: 3c198006 */ lui $t9,%hi(n_syn) +/* 3aa28: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3aa2c: 8faf0020 */ lw $t7,0x20($sp) /* 3aa30: 240103e8 */ addiu $at,$zero,0x3e8 /* 3aa34: 8f280040 */ lw $t0,0x40($t9) @@ -713,8 +713,8 @@ glabel var70054abc /* 3ab08: 3c01447a */ lui $at,0x447a /* 3ab0c: 44814000 */ mtc1 $at,$f8 /* 3ab10: 448d2000 */ mtc1 $t5,$f4 -/* 3ab14: 3c088006 */ lui $t0,%hi(alGlobals) -/* 3ab18: 8d08f114 */ lw $t0,%lo(alGlobals)($t0) +/* 3ab14: 3c088006 */ lui $t0,%hi(n_syn) +/* 3ab18: 8d08f114 */ lw $t0,%lo(n_syn)($t0) /* 3ab1c: 468021a0 */ cvt.s.w $f6,$f4 /* 3ab20: 3c014000 */ lui $at,0x4000 /* 3ab24: 8d0e0040 */ lw $t6,0x40($t0) diff --git a/src/lib/lib_3c430.c b/src/lib/lib_3c430.c index cf379a4a3..dbccf6ba9 100644 --- a/src/lib/lib_3c430.c +++ b/src/lib/lib_3c430.c @@ -31,8 +31,8 @@ glabel func0003c430 /* 3c484: 8fac001c */ lw $t4,0x1c($sp) /* 3c488: 3c0b062e */ lui $t3,0x62e /* 3c48c: ad8b0000 */ sw $t3,0x0($t4) -/* 3c490: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 3c494: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 3c490: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 3c494: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 3c498: 8faf001c */ lw $t7,0x1c($sp) /* 3c49c: 8dae0048 */ lw $t6,0x48($t5) /* 3c4a0: adee0004 */ sw $t6,0x4($t7) diff --git a/src/lib/lib_3c890.c b/src/lib/lib_3c890.c index de982eb98..7bc585a71 100644 --- a/src/lib/lib_3c890.c +++ b/src/lib/lib_3c890.c @@ -16,18 +16,18 @@ glabel func0003c890 /* 3c89c: 0c012194 */ jal osSetIntMask /* 3c8a0: 24040001 */ addiu $a0,$zero,0x1 /* 3c8a4: afa2001c */ sw $v0,0x1c($sp) -/* 3c8a8: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3c8ac: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3c8a8: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3c8ac: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3c8b0: 8fb80020 */ lw $t8,0x20($sp) /* 3c8b4: 8dcf0020 */ lw $t7,0x20($t6) /* 3c8b8: af0f0010 */ sw $t7,0x10($t8) -/* 3c8bc: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3c8c0: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3c8bc: 3c198006 */ lui $t9,%hi(n_syn) +/* 3c8c0: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3c8c4: 8fa90020 */ lw $t1,0x20($sp) /* 3c8c8: 8f280000 */ lw $t0,0x0($t9) /* 3c8cc: ad280000 */ sw $t0,0x0($t1) -/* 3c8d0: 3c0b8006 */ lui $t3,%hi(alGlobals) -/* 3c8d4: 8d6bf114 */ lw $t3,%lo(alGlobals)($t3) +/* 3c8d0: 3c0b8006 */ lui $t3,%hi(n_syn) +/* 3c8d4: 8d6bf114 */ lw $t3,%lo(n_syn)($t3) /* 3c8d8: 8faa0020 */ lw $t2,0x20($sp) /* 3c8dc: ad6a0000 */ sw $t2,0x0($t3) /* 3c8e0: 0c012194 */ jal osSetIntMask @@ -49,18 +49,18 @@ glabel func0003c900 /* 3c90c: 0c012194 */ jal osSetIntMask /* 3c910: 24040001 */ addiu $a0,$zero,0x1 /* 3c914: afa2001c */ sw $v0,0x1c($sp) -/* 3c918: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3c91c: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3c918: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3c91c: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3c920: 8fb80020 */ lw $t8,0x20($sp) /* 3c924: 8dcf0020 */ lw $t7,0x20($t6) /* 3c928: af0f0010 */ sw $t7,0x10($t8) -/* 3c92c: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3c930: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3c92c: 3c198006 */ lui $t9,%hi(n_syn) +/* 3c930: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3c934: 8fa90020 */ lw $t1,0x20($sp) /* 3c938: 8f280000 */ lw $t0,0x0($t9) /* 3c93c: ad280000 */ sw $t0,0x0($t1) -/* 3c940: 3c0b8006 */ lui $t3,%hi(alGlobals) -/* 3c944: 8d6bf114 */ lw $t3,%lo(alGlobals)($t3) +/* 3c940: 3c0b8006 */ lui $t3,%hi(n_syn) +/* 3c944: 8d6bf114 */ lw $t3,%lo(n_syn)($t3) /* 3c948: 8faa0020 */ lw $t2,0x20($sp) /* 3c94c: ad6a0000 */ sw $t2,0x0($t3) /* 3c950: 0c012194 */ jal osSetIntMask @@ -82,18 +82,18 @@ glabel func0003c970 /* 3c97c: 0c012194 */ jal osSetIntMask /* 3c980: 24040001 */ addiu $a0,$zero,0x1 /* 3c984: afa2001c */ sw $v0,0x1c($sp) -/* 3c988: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3c98c: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3c988: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3c98c: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3c990: 8fb80020 */ lw $t8,0x20($sp) /* 3c994: 8dcf0020 */ lw $t7,0x20($t6) /* 3c998: af0f0010 */ sw $t7,0x10($t8) -/* 3c99c: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3c9a0: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3c99c: 3c198006 */ lui $t9,%hi(n_syn) +/* 3c9a0: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3c9a4: 8fa90020 */ lw $t1,0x20($sp) /* 3c9a8: 8f280000 */ lw $t0,0x0($t9) /* 3c9ac: ad280000 */ sw $t0,0x0($t1) -/* 3c9b0: 3c0b8006 */ lui $t3,%hi(alGlobals) -/* 3c9b4: 8d6bf114 */ lw $t3,%lo(alGlobals)($t3) +/* 3c9b0: 3c0b8006 */ lui $t3,%hi(n_syn) +/* 3c9b4: 8d6bf114 */ lw $t3,%lo(n_syn)($t3) /* 3c9b8: 8faa0020 */ lw $t2,0x20($sp) /* 3c9bc: ad6a0000 */ sw $t2,0x0($t3) /* 3c9c0: 0c012194 */ jal osSetIntMask @@ -161,8 +161,8 @@ glabel func0003c9e0 /* 3caa4: 8fb90020 */ lw $t9,0x20($sp) /* 3caa8: 13200015 */ beqz $t9,.L0003cb00 /* 3caac: 00000000 */ nop -/* 3cab0: 3c088006 */ lui $t0,%hi(alGlobals) -/* 3cab4: 8d08f114 */ lw $t0,%lo(alGlobals)($t0) +/* 3cab0: 3c088006 */ lui $t0,%hi(n_syn) +/* 3cab4: 8d08f114 */ lw $t0,%lo(n_syn)($t0) /* 3cab8: 8faa0020 */ lw $t2,0x20($sp) /* 3cabc: 8d09001c */ lw $t1,0x1c($t0) /* 3cac0: ad490004 */ sw $t1,0x4($t2) @@ -188,8 +188,8 @@ glabel func0003c9e0 /* 3cb0c: 8fb90020 */ lw $t9,0x20($sp) /* 3cb10: 13200015 */ beqz $t9,.L0003cb68 /* 3cb14: 00000000 */ nop -/* 3cb18: 3c088006 */ lui $t0,%hi(alGlobals) -/* 3cb1c: 8d08f114 */ lw $t0,%lo(alGlobals)($t0) +/* 3cb18: 3c088006 */ lui $t0,%hi(n_syn) +/* 3cb1c: 8d08f114 */ lw $t0,%lo(n_syn)($t0) /* 3cb20: 8faa0024 */ lw $t2,0x24($sp) /* 3cb24: 8fad0020 */ lw $t5,0x20($sp) /* 3cb28: 8d09001c */ lw $t1,0x1c($t0) @@ -240,8 +240,8 @@ glabel func0003cbb4 /* 3cbbc: afa40028 */ sw $a0,0x28($sp) /* 3cbc0: afa5002c */ sw $a1,0x2c($sp) /* 3cbc4: afa0001c */ sw $zero,0x1c($sp) -/* 3cbc8: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3cbcc: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3cbc8: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3cbcc: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3cbd0: 8dcf0014 */ lw $t7,0x14($t6) /* 3cbd4: 11e0000d */ beqz $t7,.L0003cc0c /* 3cbd8: afaf0024 */ sw $t7,0x24($sp) @@ -250,16 +250,16 @@ glabel func0003cbb4 /* 3cbe4: af380000 */ sw $t8,0x0($t9) /* 3cbe8: 0c00c5e9 */ jal alUnlink /* 3cbec: 8fa40024 */ lw $a0,0x24($sp) -/* 3cbf0: 3c058006 */ lui $a1,%hi(alGlobals) -/* 3cbf4: 8ca5f114 */ lw $a1,%lo(alGlobals)($a1) +/* 3cbf0: 3c058006 */ lui $a1,%hi(n_syn) +/* 3cbf4: 8ca5f114 */ lw $a1,%lo(n_syn)($a1) /* 3cbf8: 8fa40024 */ lw $a0,0x24($sp) /* 3cbfc: 0c00c5dc */ jal alLink /* 3cc00: 24a5000c */ addiu $a1,$a1,12 /* 3cc04: 10000030 */ b .L0003ccc8 /* 3cc08: 00000000 */ nop .L0003cc0c: -/* 3cc0c: 3c088006 */ lui $t0,%hi(alGlobals) -/* 3cc10: 8d08f114 */ lw $t0,%lo(alGlobals)($t0) +/* 3cc0c: 3c088006 */ lui $t0,%hi(n_syn) +/* 3cc10: 8d08f114 */ lw $t0,%lo(n_syn)($t0) /* 3cc14: 8d090004 */ lw $t1,0x4($t0) /* 3cc18: 1120000d */ beqz $t1,.L0003cc50 /* 3cc1c: afa90024 */ sw $t1,0x24($sp) @@ -268,16 +268,16 @@ glabel func0003cbb4 /* 3cc28: ad6a0000 */ sw $t2,0x0($t3) /* 3cc2c: 0c00c5e9 */ jal alUnlink /* 3cc30: 8fa40024 */ lw $a0,0x24($sp) -/* 3cc34: 3c058006 */ lui $a1,%hi(alGlobals) -/* 3cc38: 8ca5f114 */ lw $a1,%lo(alGlobals)($a1) +/* 3cc34: 3c058006 */ lui $a1,%hi(n_syn) +/* 3cc38: 8ca5f114 */ lw $a1,%lo(n_syn)($a1) /* 3cc3c: 8fa40024 */ lw $a0,0x24($sp) /* 3cc40: 0c00c5dc */ jal alLink /* 3cc44: 24a5000c */ addiu $a1,$a1,12 /* 3cc48: 1000001f */ b .L0003ccc8 /* 3cc4c: 00000000 */ nop .L0003cc50: -/* 3cc50: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 3cc54: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 3cc50: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 3cc54: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 3cc58: 8d8d000c */ lw $t5,0xc($t4) /* 3cc5c: 11a0001a */ beqz $t5,.L0003ccc8 /* 3cc60: afad0024 */ sw $t5,0x24($sp) diff --git a/src/lib/lib_3ccf0.c b/src/lib/lib_3ccf0.c index b530ea8a8..943feae62 100644 --- a/src/lib/lib_3ccf0.c +++ b/src/lib/lib_3ccf0.c @@ -27,8 +27,8 @@ glabel alSynSetVol /* 3cd30: 00000000 */ nop .L0003cd34: /* 3cd34: 8fa90020 */ lw $t1,0x20($sp) -/* 3cd38: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3cd3c: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3cd38: 3c198006 */ lui $t9,%hi(n_syn) +/* 3cd3c: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3cd40: 8d2a0008 */ lw $t2,0x8($t1) /* 3cd44: 8fad001c */ lw $t5,0x1c($sp) /* 3cd48: 8f28001c */ lw $t0,0x1c($t9) diff --git a/src/lib/lib_3cdc0.c b/src/lib/lib_3cdc0.c index f36c16a32..f76835d35 100644 --- a/src/lib/lib_3cdc0.c +++ b/src/lib/lib_3cdc0.c @@ -28,8 +28,8 @@ glabel func0003cdc0 /* 3ce04: 00000000 */ nop .L0003ce08: /* 3ce08: 8fa90020 */ lw $t1,0x20($sp) -/* 3ce0c: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3ce10: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3ce0c: 3c198006 */ lui $t9,%hi(n_syn) +/* 3ce10: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3ce14: 8d2a0008 */ lw $t2,0x8($t1) /* 3ce18: 8fad001c */ lw $t5,0x1c($sp) /* 3ce1c: 8f28001c */ lw $t0,0x1c($t9) diff --git a/src/lib/lib_3cef0.c b/src/lib/lib_3cef0.c index db416e846..746cd96c0 100644 --- a/src/lib/lib_3cef0.c +++ b/src/lib/lib_3cef0.c @@ -26,8 +26,8 @@ glabel func0003cef0 /* 3cf2c: 00000000 */ nop .L0003cf30: /* 3cf30: 8fa90020 */ lw $t1,0x20($sp) -/* 3cf34: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3cf38: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3cf34: 3c198006 */ lui $t9,%hi(n_syn) +/* 3cf38: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3cf3c: 8d2a0008 */ lw $t2,0x8($t1) /* 3cf40: 8fad001c */ lw $t5,0x1c($sp) /* 3cf44: 8f28001c */ lw $t0,0x1c($t9) @@ -77,8 +77,8 @@ glabel func0003cfa0 /* 3cfdc: 00000000 */ nop .L0003cfe0: /* 3cfe0: 8fa90020 */ lw $t1,0x20($sp) -/* 3cfe4: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3cfe8: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3cfe4: 3c198006 */ lui $t9,%hi(n_syn) +/* 3cfe8: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3cfec: 8d2a0008 */ lw $t2,0x8($t1) /* 3cff0: 8fad001c */ lw $t5,0x1c($sp) /* 3cff4: 8f28001c */ lw $t0,0x1c($t9) @@ -128,8 +128,8 @@ glabel func0003d050 /* 3d08c: 00000000 */ nop .L0003d090: /* 3d090: 8fa90020 */ lw $t1,0x20($sp) -/* 3d094: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3d098: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3d094: 3c198006 */ lui $t9,%hi(n_syn) +/* 3d098: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3d09c: 8d2a0008 */ lw $t2,0x8($t1) /* 3d0a0: 8fad001c */ lw $t5,0x1c($sp) /* 3d0a4: 8f28001c */ lw $t0,0x1c($t9) @@ -178,8 +178,8 @@ glabel func0003d100 /* 3d138: 00000000 */ nop .L0003d13c: /* 3d13c: 8fa90020 */ lw $t1,0x20($sp) -/* 3d140: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3d144: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3d140: 3c198006 */ lui $t9,%hi(n_syn) +/* 3d144: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3d148: 8d2a0008 */ lw $t2,0x8($t1) /* 3d14c: 8fad001c */ lw $t5,0x1c($sp) /* 3d150: 8f28001c */ lw $t0,0x1c($t9) @@ -230,8 +230,8 @@ glabel func0003d1a0 /* 3d1ec: 00000000 */ nop .L0003d1f0: /* 3d1f0: 8fac0020 */ lw $t4,0x20($sp) -/* 3d1f4: 3c0a8006 */ lui $t2,%hi(alGlobals) -/* 3d1f8: 8d4af114 */ lw $t2,%lo(alGlobals)($t2) +/* 3d1f4: 3c0a8006 */ lui $t2,%hi(n_syn) +/* 3d1f8: 8d4af114 */ lw $t2,%lo(n_syn)($t2) /* 3d1fc: 8d8d0008 */ lw $t5,0x8($t4) /* 3d200: 8fb8001c */ lw $t8,0x1c($sp) /* 3d204: 8d4b001c */ lw $t3,0x1c($t2) diff --git a/src/lib/lib_3d280.c b/src/lib/lib_3d280.c index 506976a37..ec14f11de 100644 --- a/src/lib/lib_3d280.c +++ b/src/lib/lib_3d280.c @@ -111,7 +111,7 @@ void __seqpReleaseVoice(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime deltaTime vs->envGain = 0; vs->envEndTime = seqp->curTime + deltaTime; - alSynSetPriority(voice, 0); /* make candidate for stealing */ + n_alSynSetPriority(voice, 0); /* make candidate for stealing */ alSynSetVol(voice, 0, deltaTime); evt.type = AL_NOTE_END_EVT; @@ -122,7 +122,7 @@ void __seqpReleaseVoice(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime deltaTime alEvtqPostEvent(&seqp->evtq, &evt, deltaTime, 0); } -char __voiceNeedsNoteKill(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime killTime) +char __n_voiceNeedsNoteKill(ALSeqPlayer *seqp, ALVoice *voice, ALMicroTime killTime) { ALLink *thisNode; ALLink *nextNode; @@ -524,7 +524,7 @@ glabel func0003d9cc /* 3dacc: 27bd0018 */ addiu $sp,$sp,0x18 ); -ALMicroTime __vsDelta(ALVoiceState *vs, ALMicroTime t) +ALMicroTime __n_vsDelta(ALVoiceState *vs, ALMicroTime t) { /* * If we are interrupting a previously set envelope segment, we @@ -553,7 +553,7 @@ ALPan __vsPan(ALVoiceState *vs, ALSeqPlayer *seqp) return (ALPan) tmp; } -void __initFromBank(ALSeqPlayer *seqp, ALBank *b) +void __n_initFromBank(ALSeqPlayer *seqp, ALBank *b) { /* * init the chanState with the default instrument @@ -570,13 +570,13 @@ void __initFromBank(ALSeqPlayer *seqp, ALBank *b) /* There is some wasted effort here since both calls the same state vars */ /* but it's safer. */ for (i = 0; i < seqp->maxChannels; i++) { - __resetPerfChanState(seqp, i); - __setInstChanState(seqp, inst, i); + __n_resetPerfChanState(seqp, i); + __n_setInstChanState(seqp, inst, i); } if (b->percussion) { - __resetPerfChanState(seqp, i); - __setInstChanState(seqp, b->percussion, 9); + __n_resetPerfChanState(seqp, i); + __n_setInstChanState(seqp, b->percussion, 9); } } @@ -586,11 +586,11 @@ void __initChanState(ALSeqPlayer *seqp) for (i = 0; i < seqp->maxChannels; i++) { seqp->chanState[i].instrument = 0; - __resetPerfChanState (seqp, i); + __n_resetPerfChanState (seqp, i); } } -void __resetPerfChanState(ALSeqPlayer *seqp, s32 chan) +void __n_resetPerfChanState(ALSeqPlayer *seqp, s32 chan) { seqp->chanState[chan].fxId = AL_FX_NONE; seqp->chanState[chan].fxmix = AL_DEFAULT_FXMIX; @@ -612,7 +612,7 @@ void __resetPerfChanState(ALSeqPlayer *seqp, s32 chan) } GLOBAL_ASM( -glabel __setInstChanState +glabel __n_setInstChanState /* 3df64: 27bdfff8 */ addiu $sp,$sp,-8 /* 3df68: 00067880 */ sll $t7,$a2,0x2 /* 3df6c: 01e67823 */ subu $t7,$t7,$a2 @@ -824,7 +824,7 @@ glabel __setInstChanState /* 3e29c: 27bd0008 */ addiu $sp,$sp,0x8 ); -void __seqpStopOsc(ALSeqPlayer *seqp, ALVoiceState *vs) +void __n_seqpStopOsc(ALSeqPlayer *seqp, ALVoiceState *vs) { ALEventListItem *thisNode,*nextNode; s16 evtType; diff --git a/src/lib/lib_3e3e0.c b/src/lib/lib_3e3e0.c index c82708686..c724d39ce 100644 --- a/src/lib/lib_3e3e0.c +++ b/src/lib/lib_3e3e0.c @@ -32,8 +32,8 @@ glabel func0003e3e0 /* 3e41c: 00000000 */ nop .L0003e420: /* 3e420: 8fa90020 */ lw $t1,0x20($sp) -/* 3e424: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3e428: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3e424: 3c198006 */ lui $t9,%hi(n_syn) +/* 3e428: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3e42c: 8d2a0008 */ lw $t2,0x8($t1) /* 3e430: 8fad001c */ lw $t5,0x1c($sp) /* 3e434: 8f28001c */ lw $t0,0x1c($t9) @@ -83,8 +83,8 @@ glabel func0003e490 /* 3e4cc: 00000000 */ nop .L0003e4d0: /* 3e4d0: 8fa90020 */ lw $t1,0x20($sp) -/* 3e4d4: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3e4d8: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3e4d4: 3c198006 */ lui $t9,%hi(n_syn) +/* 3e4d8: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3e4dc: 8d2a0008 */ lw $t2,0x8($t1) /* 3e4e0: 8fad001c */ lw $t5,0x1c($sp) /* 3e4e4: 8f28001c */ lw $t0,0x1c($t9) @@ -119,8 +119,8 @@ glabel func0003e540 /* 3e540: 00042400 */ sll $a0,$a0,0x10 /* 3e544: 00042403 */ sra $a0,$a0,0x10 /* 3e548: 27bdfff8 */ addiu $sp,$sp,-8 -/* 3e54c: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3e550: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3e54c: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3e550: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3e554: 8dcf0030 */ lw $t7,0x30($t6) /* 3e558: afaf0004 */ sw $t7,0x4($sp) /* 3e55c: 8fb80004 */ lw $t8,0x4($sp) @@ -129,8 +129,8 @@ glabel func0003e540 /* 3e568: 8f190004 */ lw $t9,0x4($t8) /* 3e56c: 1728000c */ bne $t9,$t0,.L0003e5a0 /* 3e570: 00000000 */ nop -/* 3e574: 3c098006 */ lui $t1,%hi(alGlobals) -/* 3e578: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 3e574: 3c098006 */ lui $t1,%hi(n_syn) +/* 3e578: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 3e57c: 000458c0 */ sll $t3,$a0,0x3 /* 3e580: 01645821 */ addu $t3,$t3,$a0 /* 3e584: 8d2a0034 */ lw $t2,0x34($t1) @@ -156,8 +156,8 @@ glabel func0003e5b8 /* 3e5b8: 00042400 */ sll $a0,$a0,0x10 /* 3e5bc: 00042403 */ sra $a0,$a0,0x10 /* 3e5c0: 27bdfff8 */ addiu $sp,$sp,-8 -/* 3e5c4: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3e5c8: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3e5c4: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3e5c8: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3e5cc: 8dcf0030 */ lw $t7,0x30($t6) /* 3e5d0: afaf0004 */ sw $t7,0x4($sp) /* 3e5d4: 8fb80004 */ lw $t8,0x4($sp) @@ -166,8 +166,8 @@ glabel func0003e5b8 /* 3e5e0: 8f190004 */ lw $t9,0x4($t8) /* 3e5e4: 1728000c */ bne $t9,$t0,.L0003e618 /* 3e5e8: 00000000 */ nop -/* 3e5ec: 3c098006 */ lui $t1,%hi(alGlobals) -/* 3e5f0: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 3e5ec: 3c098006 */ lui $t1,%hi(n_syn) +/* 3e5f0: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 3e5f4: 000458c0 */ sll $t3,$a0,0x3 /* 3e5f8: 01645821 */ addu $t3,$t3,$a0 /* 3e5fc: 8d2a0034 */ lw $t2,0x34($t1) @@ -189,7 +189,7 @@ glabel func0003e5b8 ); GLOBAL_ASM( -glabel func0003e630 +glabel n_alSynSetFXParam /* 3e630: 27bdffe0 */ addiu $sp,$sp,-32 /* 3e634: afbf0014 */ sw $ra,0x14($sp) /* 3e638: afa40020 */ sw $a0,0x20($sp) @@ -199,7 +199,7 @@ glabel func0003e630 /* 3e648: afae001c */ sw $t6,0x1c($sp) /* 3e64c: 8fa4001c */ lw $a0,0x1c($sp) /* 3e650: 87a50026 */ lh $a1,0x26($sp) -/* 3e654: 0c00ea50 */ jal func0003a940 +/* 3e654: 0c00ea50 */ jal n_alFxParamHdl /* 3e658: 8fa60028 */ lw $a2,0x28($sp) /* 3e65c: 10000001 */ b .L0003e664 /* 3e660: 00000000 */ nop @@ -244,8 +244,8 @@ glabel func0003e674 /* 3e6e4: 8d6c0000 */ lw $t4,0x0($t3) /* 3e6e8: a5ac0000 */ sh $t4,0x0($t5) .L0003e6ec: -/* 3e6ec: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 3e6f0: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 3e6ec: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 3e6f0: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 3e6f4: 8fa40018 */ lw $a0,0x18($sp) /* 3e6f8: 8dcf0040 */ lw $t7,0x40($t6) /* 3e6fc: 448f9000 */ mtc1 $t7,$f18 diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index 1060c0ff2..db4c50b90 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -35,8 +35,8 @@ glabel func0003e730 /* 3e76c: 00000000 */ nop .L0003e770: /* 3e770: 8fa90020 */ lw $t1,0x20($sp) -/* 3e774: 3c198006 */ lui $t9,%hi(alGlobals) -/* 3e778: 8f39f114 */ lw $t9,%lo(alGlobals)($t9) +/* 3e774: 3c198006 */ lui $t9,%hi(n_syn) +/* 3e778: 8f39f114 */ lw $t9,%lo(n_syn)($t9) /* 3e77c: 8d2a0008 */ lw $t2,0x8($t1) /* 3e780: 8fad001c */ lw $t5,0x1c($sp) /* 3e784: 8f28001c */ lw $t0,0x1c($t9) diff --git a/src/lib/lib_446d0.c b/src/lib/lib_446d0.c index 7f3060230..445fd1fdc 100644 --- a/src/lib/lib_446d0.c +++ b/src/lib/lib_446d0.c @@ -17,8 +17,8 @@ glabel func000446d0 /* 446e4: afa70054 */ sw $a3,0x54($sp) /* 446e8: 8fae004c */ lw $t6,0x4c($sp) /* 446ec: afae0044 */ sw $t6,0x44($sp) -/* 446f0: 3c0f8006 */ lui $t7,%hi(alGlobals) -/* 446f4: 8deff114 */ lw $t7,%lo(alGlobals)($t7) +/* 446f0: 3c0f8006 */ lui $t7,%hi(n_syn) +/* 446f4: 8deff114 */ lw $t7,%lo(n_syn)($t7) /* 446f8: 8fb90050 */ lw $t9,0x50($sp) /* 446fc: 8df80034 */ lw $t8,0x34($t7) /* 44700: 001940c0 */ sll $t0,$t9,0x3 diff --git a/src/lib/lib_44bc0.c b/src/lib/lib_44bc0.c index 4155d9328..22635a6ba 100644 --- a/src/lib/lib_44bc0.c +++ b/src/lib/lib_44bc0.c @@ -31,15 +31,15 @@ glabel func00044bc0 /* 44c10: 240902e0 */ addiu $t1,$zero,0x2e0 /* 44c14: ad490004 */ sw $t1,0x4($t2) .L00044c18: -/* 44c18: 3c0b8006 */ lui $t3,%hi(alGlobals) -/* 44c1c: 8d6bf114 */ lw $t3,%lo(alGlobals)($t3) +/* 44c18: 3c0b8006 */ lui $t3,%hi(n_syn) +/* 44c1c: 8d6bf114 */ lw $t3,%lo(n_syn)($t3) /* 44c20: afa00040 */ sw $zero,0x40($sp) /* 44c24: 8d6c003c */ lw $t4,0x3c($t3) /* 44c28: 198000bd */ blez $t4,.L00044f20 /* 44c2c: 00000000 */ nop .L00044c30: -/* 44c30: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 44c34: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 44c30: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 44c34: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 44c38: 8fa40048 */ lw $a0,0x48($sp) /* 44c3c: 8fa50044 */ lw $a1,0x44($sp) /* 44c40: 8dae0030 */ lw $t6,0x30($t5) @@ -138,8 +138,8 @@ glabel func00044bc0 /* 44da0: 354a04e0 */ ori $t2,$t2,0x4e0 /* 44da4: ad6a0004 */ sw $t2,0x4($t3) .L00044da8: -/* 44da8: 3c0c8006 */ lui $t4,%hi(alGlobals) -/* 44dac: 8d8cf114 */ lw $t4,%lo(alGlobals)($t4) +/* 44da8: 3c0c8006 */ lui $t4,%hi(n_syn) +/* 44dac: 8d8cf114 */ lw $t4,%lo(n_syn)($t4) /* 44db0: 8fae0040 */ lw $t6,0x40($sp) /* 44db4: 8d8d0034 */ lw $t5,0x34($t4) /* 44db8: 000ec8c0 */ sll $t9,$t6,0x3 @@ -150,8 +150,8 @@ glabel func00044bc0 /* 44dcc: 87080002 */ lh $t0,0x2($t8) /* 44dd0: 1900004a */ blez $t0,.L00044efc /* 44dd4: 00000000 */ nop -/* 44dd8: 3c098006 */ lui $t1,%hi(alGlobals) -/* 44ddc: 8d29f114 */ lw $t1,%lo(alGlobals)($t1) +/* 44dd8: 3c098006 */ lui $t1,%hi(n_syn) +/* 44ddc: 8d29f114 */ lw $t1,%lo(n_syn)($t1) /* 44de0: 8fab0040 */ lw $t3,0x40($sp) /* 44de4: 8d2a0034 */ lw $t2,0x34($t1) /* 44de8: 000b60c0 */ sll $t4,$t3,0x3 @@ -164,8 +164,8 @@ glabel func00044bc0 /* 44e04: 8f2f0028 */ lw $t7,0x28($t9) /* 44e08: 11e0000b */ beqz $t7,.L00044e38 /* 44e0c: 00000000 */ nop -/* 44e10: 3c188006 */ lui $t8,%hi(alGlobals) -/* 44e14: 8f18f114 */ lw $t8,%lo(alGlobals)($t8) +/* 44e10: 3c188006 */ lui $t8,%hi(n_syn) +/* 44e14: 8f18f114 */ lw $t8,%lo(n_syn)($t8) /* 44e18: 8fa40024 */ lw $a0,0x24($sp) /* 44e1c: 8f080040 */ lw $t0,0x40($t8) /* 44e20: 44882000 */ mtc1 $t0,$f4 @@ -226,8 +226,8 @@ glabel func00044bc0 /* 44ef8: ad600028 */ sw $zero,0x28($t3) .L00044efc: /* 44efc: 8faa0040 */ lw $t2,0x40($sp) -/* 44f00: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 44f04: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) +/* 44f00: 3c0e8006 */ lui $t6,%hi(n_syn) +/* 44f04: 8dcef114 */ lw $t6,%lo(n_syn)($t6) /* 44f08: 254c0001 */ addiu $t4,$t2,0x1 /* 44f0c: afac0040 */ sw $t4,0x40($sp) /* 44f10: 8dcd003c */ lw $t5,0x3c($t6) diff --git a/src/lib/ultra/audio/csplayer.c b/src/lib/ultra/audio/csplayer.c index 71faa474e..e16402ecc 100644 --- a/src/lib/ultra/audio/csplayer.c +++ b/src/lib/ultra/audio/csplayer.c @@ -19,8 +19,8 @@ #include "data.h" #include "types.h" -void __CSPRepostEvent(ALEventQueue *evtq, ALEventListItem *item); -void __setUsptFromTempo(ALCSPlayer *seqp, f32 tempo); +void __n_CSPRepostEvent(ALEventQueue *evtq, ALEventListItem *item); +void __n_setUsptFromTempo(ALCSPlayer *seqp, f32 tempo); u32 var8009c350; u32 var8009c354; @@ -903,7 +903,7 @@ void alCSPNew(ALCSPlayer *seqp, ALSeqpConfig *c) */ seqp->bank = 0; seqp->target = NULL; - seqp->drvr = &alGlobals->drvr; + seqp->drvr = &n_syn->drvr; seqp->chanMask = 0xffff; func00039cd0(seqp); @@ -952,7 +952,7 @@ void alCSPNew(ALCSPlayer *seqp, ALSeqpConfig *c) * init the event queue */ items = alHeapAlloc(hp, c->maxEvents, sizeof(ALEventListItem)); - alEvtqNew(&seqp->evtq, items, c->maxEvents); + n_alEvtqNew(&seqp->evtq, items, c->maxEvents); /* @@ -1017,7 +1017,7 @@ glabel __CSPVoiceHandler /* 34568: 11c00004 */ beqz $t6,.L0003457c /* 3456c: 00000000 */ nop /* 34570: 8fa40074 */ lw $a0,0x74($sp) -/* 34574: 0c00f8a8 */ jal __seqpStopOsc +/* 34574: 0c00f8a8 */ jal __n_seqpStopOsc /* 34578: 8fa50058 */ lw $a1,0x58($sp) .L0003457c: /* 3457c: 8fa40074 */ lw $a0,0x74($sp) @@ -1124,7 +1124,7 @@ glabel __CSPVoiceHandler /* 34700: 00028400 */ sll $s0,$v0,0x10 /* 34704: 00108403 */ sra $s0,$s0,0x10 /* 34708: 8fa40058 */ lw $a0,0x58($sp) -/* 3470c: 0c00f6b4 */ jal __vsDelta +/* 3470c: 0c00f6b4 */ jal __n_vsDelta /* 34710: 8d65001c */ lw $a1,0x1c($t3) /* 34714: 8fa40058 */ lw $a0,0x58($sp) /* 34718: 00408825 */ or $s1,$v0,$zero @@ -1281,7 +1281,7 @@ glabel __CSPVoiceHandler /* 3496c: 00028400 */ sll $s0,$v0,0x10 /* 34970: 00108403 */ sra $s0,$s0,0x10 /* 34974: 8fa40058 */ lw $a0,0x58($sp) -/* 34978: 0c00f6b4 */ jal __vsDelta +/* 34978: 0c00f6b4 */ jal __n_vsDelta /* 3497c: 8d85001c */ lw $a1,0x1c($t4) /* 34980: 8fa40058 */ lw $a0,0x58($sp) /* 34984: 00408825 */ or $s1,$v0,$zero @@ -1341,7 +1341,7 @@ glabel __CSPVoiceHandler /* 34a50: 25260040 */ addiu $a2,$t1,0x40 /* 34a54: 000d58c0 */ sll $t3,$t5,0x3 /* 34a58: 31ca0007 */ andi $t2,$t6,0x7 -/* 34a5c: 0c00f98c */ jal func0003e630 +/* 34a5c: 0c00f98c */ jal n_alSynSetFXParam /* 34a60: 016a2825 */ or $a1,$t3,$t2 .L00034a64: /* 34a64: 1000000d */ b .L00034a9c @@ -1396,7 +1396,7 @@ glabel __CSPVoiceHandler /* 34b18: 11800004 */ beqz $t4,.L00034b2c /* 34b1c: 00000000 */ nop /* 34b20: 8fa40074 */ lw $a0,0x74($sp) -/* 34b24: 0c00f8a8 */ jal __seqpStopOsc +/* 34b24: 0c00f8a8 */ jal __n_seqpStopOsc /* 34b28: 8fa50058 */ lw $a1,0x58($sp) .L00034b2c: /* 34b2c: 8fa50058 */ lw $a1,0x58($sp) @@ -1420,15 +1420,15 @@ glabel __CSPVoiceHandler /* 34b6c: 00000000 */ nop /* 34b70: 8fa40074 */ lw $a0,0x74($sp) /* 34b74: 00002825 */ or $a1,$zero,$zero -/* 34b78: 0c00f1f0 */ jal alEvtqFlushType +/* 34b78: 0c00f1f0 */ jal n_alEvtqFlushType /* 34b7c: 24840048 */ addiu $a0,$a0,0x48 /* 34b80: 8fa40074 */ lw $a0,0x74($sp) /* 34b84: 24050015 */ addiu $a1,$zero,0x15 -/* 34b88: 0c00f1f0 */ jal alEvtqFlushType +/* 34b88: 0c00f1f0 */ jal n_alEvtqFlushType /* 34b8c: 24840048 */ addiu $a0,$a0,0x48 /* 34b90: 8fa40074 */ lw $a0,0x74($sp) /* 34b94: 24050002 */ addiu $a1,$zero,0x2 -/* 34b98: 0c00f1f0 */ jal alEvtqFlushType +/* 34b98: 0c00f1f0 */ jal n_alEvtqFlushType /* 34b9c: 24840048 */ addiu $a0,$a0,0x48 /* 34ba0: 8faa0074 */ lw $t2,0x74($sp) /* 34ba4: 8d490064 */ lw $t1,0x64($t2) @@ -1438,7 +1438,7 @@ glabel __CSPVoiceHandler /* 34bb0: 8fa50058 */ lw $a1,0x58($sp) /* 34bb4: 8fa40074 */ lw $a0,0x74($sp) /* 34bb8: 3406c350 */ dli $a2,0xc350 -/* 34bbc: 0c00f52e */ jal __voiceNeedsNoteKill +/* 34bbc: 0c00f52e */ jal __n_voiceNeedsNoteKill /* 34bc0: 24a50004 */ addiu $a1,$a1,0x4 /* 34bc4: 10400006 */ beqz $v0,.L00034be0 /* 34bc8: 00000000 */ nop @@ -1545,7 +1545,7 @@ glabel __CSPVoiceHandler /* 34d44: 00000000 */ nop /* 34d48: 8fad0074 */ lw $t5,0x74($sp) /* 34d4c: 01a02025 */ or $a0,$t5,$zero -/* 34d50: 0c00f6e8 */ jal __initFromBank +/* 34d50: 0c00f6e8 */ jal __n_initFromBank /* 34d54: 8da50020 */ lw $a1,0x20($t5) .L00034d58: /* 34d58: 1000000c */ b .L00034d8c @@ -1555,7 +1555,7 @@ glabel __CSPVoiceHandler /* 34d68: ad280020 */ sw $t0,0x20($t1) /* 34d6c: 8faf0074 */ lw $t7,0x74($sp) /* 34d70: 01e02025 */ or $a0,$t7,$zero -/* 34d74: 0c00f6e8 */ jal __initFromBank +/* 34d74: 0c00f6e8 */ jal __n_initFromBank /* 34d78: 8de50020 */ lw $a1,0x20($t7) /* 34d7c: 10000003 */ b .L00034d8c /* 34d80: 00000000 */ nop @@ -1564,7 +1564,7 @@ glabel __CSPVoiceHandler .L00034d8c: /* 34d8c: 8fb90074 */ lw $t9,0x74($sp) /* 34d90: 27240048 */ addiu $a0,$t9,0x48 -/* 34d94: 0c00f15b */ jal alEvtqNextEvent +/* 34d94: 0c00f15b */ jal n_alEvtqNextEvent /* 34d98: 27250038 */ addiu $a1,$t9,0x38 /* 34d9c: 8fae0074 */ lw $t6,0x74($sp) /* 34da0: adc20028 */ sw $v0,0x28($t6) @@ -1697,7 +1697,7 @@ glabel func00034f0c /* 34f60: a7a2002a */ sh $v0,0x2a($sp) /* 34f64: 8faa0030 */ lw $t2,0x30($sp) /* 34f68: 8fa4002c */ lw $a0,0x2c($sp) -/* 34f6c: 0c00f6b4 */ jal __vsDelta +/* 34f6c: 0c00f6b4 */ jal __n_vsDelta /* 34f70: 8d45001c */ lw $a1,0x1c($t2) /* 34f74: 8fa4002c */ lw $a0,0x2c($sp) /* 34f78: 00408025 */ or $s0,$v0,$zero @@ -2538,7 +2538,7 @@ glabel func00035110 /* 35bac: 00028c00 */ sll $s1,$v0,0x10 /* 35bb0: 00118c03 */ sra $s1,$s1,0x10 /* 35bb4: 8fa4009c */ lw $a0,0x9c($sp) -/* 35bb8: 0c00f6b4 */ jal __vsDelta +/* 35bb8: 0c00f6b4 */ jal __n_vsDelta /* 35bbc: 8d45001c */ lw $a1,0x1c($t2) /* 35bc0: 8fa4009c */ lw $a0,0x9c($sp) /* 35bc4: 00408025 */ or $s0,$v0,$zero @@ -2568,7 +2568,7 @@ glabel func00035110 /* 35c20: 00028c00 */ sll $s1,$v0,0x10 /* 35c24: 00118c03 */ sra $s1,$s1,0x10 /* 35c28: 8fa400c8 */ lw $a0,0xc8($sp) -/* 35c2c: 0c00f6b4 */ jal __vsDelta +/* 35c2c: 0c00f6b4 */ jal __n_vsDelta /* 35c30: 8de5001c */ lw $a1,0x1c($t7) /* 35c34: 8fa400c8 */ lw $a0,0xc8($sp) /* 35c38: 00408025 */ or $s0,$v0,$zero @@ -3077,7 +3077,7 @@ glabel func00035110 /* 36394: a7a200b6 */ sh $v0,0xb6($sp) /* 36398: 8faa00d0 */ lw $t2,0xd0($sp) /* 3639c: 8fa400c8 */ lw $a0,0xc8($sp) -/* 363a0: 0c00f6b4 */ jal __vsDelta +/* 363a0: 0c00f6b4 */ jal __n_vsDelta /* 363a4: 8d45001c */ lw $a1,0x1c($t2) /* 363a8: 8fa400c8 */ lw $a0,0xc8($sp) /* 363ac: 00408025 */ or $s0,$v0,$zero @@ -3306,8 +3306,8 @@ glabel func00035110 /* 366dc: 10000233 */ b .L00036fac /* 366e0: 00000000 */ nop .L000366e4: -/* 366e4: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 366e8: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 366e4: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 366e8: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 366ec: 93ab00bf */ lbu $t3,0xbf($sp) /* 366f0: 8dac003c */ lw $t4,0x3c($t5) /* 366f4: 016c082a */ slt $at,$t3,$t4 @@ -3908,7 +3908,7 @@ glabel func00035110 /* 37020: afaa0058 */ sw $t2,0x58($sp) /* 37024: 8fa400d0 */ lw $a0,0xd0($sp) /* 37028: 8fa50058 */ lw $a1,0x58($sp) -/* 3702c: 0c00f7d9 */ jal __setInstChanState +/* 3702c: 0c00f7d9 */ jal __n_setInstChanState /* 37030: 93a600c3 */ lbu $a2,0xc3($sp) /* 37034: 10000001 */ b .L0003703c /* 37038: 00000000 */ nop @@ -4765,7 +4765,7 @@ glabel func00035110 /* 35bac: 00028c00 */ sll $s1,$v0,0x10 /* 35bb0: 00118c03 */ sra $s1,$s1,0x10 /* 35bb4: 8fa4009c */ lw $a0,0x9c($sp) -/* 35bb8: 0c00f6b4 */ jal __vsDelta +/* 35bb8: 0c00f6b4 */ jal __n_vsDelta /* 35bbc: 8d45001c */ lw $a1,0x1c($t2) /* 35bc0: 8fa4009c */ lw $a0,0x9c($sp) /* 35bc4: 00408025 */ or $s0,$v0,$zero @@ -4795,7 +4795,7 @@ glabel func00035110 /* 35c20: 00028c00 */ sll $s1,$v0,0x10 /* 35c24: 00118c03 */ sra $s1,$s1,0x10 /* 35c28: 8fa400c8 */ lw $a0,0xc8($sp) -/* 35c2c: 0c00f6b4 */ jal __vsDelta +/* 35c2c: 0c00f6b4 */ jal __n_vsDelta /* 35c30: 8de5001c */ lw $a1,0x1c($t7) /* 35c34: 8fa400c8 */ lw $a0,0xc8($sp) /* 35c38: 00408025 */ or $s0,$v0,$zero @@ -5304,7 +5304,7 @@ glabel func00035110 /* 36394: a7a200b6 */ sh $v0,0xb6($sp) /* 36398: 8faa00d0 */ lw $t2,0xd0($sp) /* 3639c: 8fa400c8 */ lw $a0,0xc8($sp) -/* 363a0: 0c00f6b4 */ jal __vsDelta +/* 363a0: 0c00f6b4 */ jal __n_vsDelta /* 363a4: 8d45001c */ lw $a1,0x1c($t2) /* 363a8: 8fa400c8 */ lw $a0,0xc8($sp) /* 363ac: 00408025 */ or $s0,$v0,$zero @@ -5533,8 +5533,8 @@ glabel func00035110 /* 366dc: 10000233 */ b .L00036fac /* 366e0: 00000000 */ nop .L000366e4: -/* 366e4: 3c0d8006 */ lui $t5,%hi(alGlobals) -/* 366e8: 8dadf114 */ lw $t5,%lo(alGlobals)($t5) +/* 366e4: 3c0d8006 */ lui $t5,%hi(n_syn) +/* 366e8: 8dadf114 */ lw $t5,%lo(n_syn)($t5) /* 366ec: 93ab00bf */ lbu $t3,0xbf($sp) /* 366f0: 8dac003c */ lw $t4,0x3c($t5) /* 366f4: 016c082a */ slt $at,$t3,$t4 @@ -6135,7 +6135,7 @@ glabel func00035110 /* 37020: afaa0058 */ sw $t2,0x58($sp) /* 37024: 8fa400d0 */ lw $a0,0xd0($sp) /* 37028: 8fa50058 */ lw $a1,0x58($sp) -/* 3702c: 0c00f7d9 */ jal __setInstChanState +/* 3702c: 0c00f7d9 */ jal __n_setInstChanState /* 37030: 93a600c3 */ lbu $a2,0xc3($sp) /* 37034: 10000001 */ b .L0003703c /* 37038: 00000000 */ nop @@ -6284,7 +6284,7 @@ void __CSPHandleMetaMsg(ALCSPlayer *seqp, ALEvent *event) if (event->msg.tempo.type == AL_MIDI_META_TEMPO) { oldUspt = seqp->uspt; tempo = (tevt->byte1 << 16) | (tevt->byte2 << 8) | (tevt->byte3 << 0); - __setUsptFromTempo (seqp, (f32)tempo); + __n_setUsptFromTempo (seqp, (f32)tempo); thisNode = (ALEventListItem*)seqp->evtq.allocList.next; @@ -6322,14 +6322,14 @@ void __CSPHandleMetaMsg(ALCSPlayer *seqp, ALEvent *event) nextNode = (ALEventListItem*)thisNode->node.next; ticks = thisNode->delta/oldUspt; thisNode->delta = ticks * seqp->uspt; - __CSPRepostEvent(&seqp->evtq,thisNode); + __n_CSPRepostEvent(&seqp->evtq,thisNode); thisNode = nextNode; } } } } -void __CSPRepostEvent(ALEventQueue *evtq, ALEventListItem *item) +void __n_CSPRepostEvent(ALEventQueue *evtq, ALEventListItem *item) { OSIntMask mask; ALLink *node; @@ -6357,7 +6357,7 @@ void __CSPRepostEvent(ALEventQueue *evtq, ALEventListItem *item) osSetIntMask(mask); } -void __setUsptFromTempo(ALCSPlayer *seqp, f32 tempo) +void __n_setUsptFromTempo(ALCSPlayer *seqp, f32 tempo) { if (seqp->target) { seqp->uspt = (s32)((f32)tempo * seqp->target->qnpt); diff --git a/src/lib/ultra/audio/event.c b/src/lib/ultra/audio/event.c index 0f1025f4e..788060974 100644 --- a/src/lib/ultra/audio/event.c +++ b/src/lib/ultra/audio/event.c @@ -8,7 +8,7 @@ #include "data.h" #include "types.h" -void alEvtqNew(ALEventQueue *evtq, ALEventListItem *items, s32 itemCount) +void n_alEvtqNew(ALEventQueue *evtq, ALEventListItem *items, s32 itemCount) { s32 i; @@ -23,7 +23,7 @@ void alEvtqNew(ALEventQueue *evtq, ALEventListItem *items, s32 itemCount) } } -ALMicroTime alEvtqNextEvent(ALEventQueue *evtq, ALEvent *evt) +ALMicroTime n_alEvtqNextEvent(ALEventQueue *evtq, ALEvent *evt) { ALEventListItem *item; ALMicroTime delta; @@ -110,7 +110,7 @@ void alEvtqPostEvent(ALEventQueue *evtq, ALEvent *evt, ALMicroTime delta, s32 ar osSetIntMask(mask); } -void alEvtqFlushType(ALEventQueue *evtq, s16 type) +void n_alEvtqFlushType(ALEventQueue *evtq, s16 type) { ALLink *thisNode; ALLink *nextNode; diff --git a/src/lib/ultra/audio/syndelete.c b/src/lib/ultra/audio/syndelete.c index 266d16057..0dca408bc 100644 --- a/src/lib/ultra/audio/syndelete.c +++ b/src/lib/ultra/audio/syndelete.c @@ -6,5 +6,5 @@ void n_alSynDelete(void) { - alGlobals->drvr.head = NULL; + n_syn->drvr.head = NULL; } diff --git a/src/lib/ultra/audio/synsetpriority.c b/src/lib/ultra/audio/synsetpriority.c index 728521a58..0140afffb 100644 --- a/src/lib/ultra/audio/synsetpriority.c +++ b/src/lib/ultra/audio/synsetpriority.c @@ -6,7 +6,7 @@ #include "data.h" #include "types.h" -void alSynSetPriority(ALVoice *voice, s16 priority) +void n_alSynSetPriority(ALVoice *voice, s16 priority) { voice->priority = priority; }