diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index afa7b0a26..379b5d16e 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -80,6 +80,7 @@ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ + build/ROMID/lib/naudio/n_cspsetvol.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 0362415ba..f3a3e013e 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -77,6 +77,7 @@ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ + build/ROMID/lib/naudio/n_cspsetvol.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index eafe574a2..c99f178fa 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -77,6 +77,7 @@ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ + build/ROMID/lib/naudio/n_cspsetvol.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ diff --git a/src/include/lib/lib_39c80.h b/src/include/lib/lib_39c80.h index 2d5c23889..a509e996d 100644 --- a/src/include/lib/lib_39c80.h +++ b/src/include/lib/lib_39c80.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -void func00039c80(N_ALCSPlayer *seqp, s16 volume); void func00039cd0(ALCSPlayer *seqp); void func00039e5c(N_ALCSPlayer *seqp, s32 arg1, s32 arg2, u8 arg3); diff --git a/src/lib/lib_39c80.c b/src/lib/lib_39c80.c index 5646b50a6..715fa9009 100644 --- a/src/lib/lib_39c80.c +++ b/src/lib/lib_39c80.c @@ -5,31 +5,6 @@ #include "data.h" #include "types.h" -GLOBAL_ASM( -glabel func00039c80 -/* 39c80: 27bdffd8 */ addiu $sp,$sp,-40 -/* 39c84: afbf0014 */ sw $ra,0x14($sp) -/* 39c88: afa40028 */ sw $a0,0x28($sp) -/* 39c8c: afa5002c */ sw $a1,0x2c($sp) -/* 39c90: 240e000a */ addiu $t6,$zero,0xa -/* 39c94: a7ae0018 */ sh $t6,0x18($sp) -/* 39c98: 87af002e */ lh $t7,0x2e($sp) -/* 39c9c: a7af001c */ sh $t7,0x1c($sp) -/* 39ca0: 8fa40028 */ lw $a0,0x28($sp) -/* 39ca4: 27a50018 */ addiu $a1,$sp,0x18 -/* 39ca8: 00003025 */ or $a2,$zero,$zero -/* 39cac: 00003825 */ or $a3,$zero,$zero -/* 39cb0: 0c00f184 */ jal n_alEvtqPostEvent -/* 39cb4: 24840048 */ addiu $a0,$a0,0x48 -/* 39cb8: 10000001 */ b .L00039cc0 -/* 39cbc: 00000000 */ nop -.L00039cc0: -/* 39cc0: 8fbf0014 */ lw $ra,0x14($sp) -/* 39cc4: 27bd0028 */ addiu $sp,$sp,0x28 -/* 39cc8: 03e00008 */ jr $ra -/* 39ccc: 00000000 */ nop -); - GLOBAL_ASM( glabel func00039cd0 /* 39cd0: 27bdfff8 */ addiu $sp,$sp,-8 diff --git a/src/lib/naudio/n_cspsetvol.c b/src/lib/naudio/n_cspsetvol.c new file mode 100644 index 000000000..e0fe40bb0 --- /dev/null +++ b/src/lib/naudio/n_cspsetvol.c @@ -0,0 +1,12 @@ +#include +#include "n_libaudio.h" + +void n_alCSPSetVol(N_ALCSPlayer *seqp, s16 vol) +{ + N_ALEvent evt; + + evt.type = AL_SEQP_VOL_EVT; + evt.msg.spvol.vol = vol; + + n_alEvtqPostEvent(&seqp->evtq, &evt, 0, 0); +} diff --git a/src/lib/snd.c b/src/lib/snd.c index 2d72e24db..47a5664df 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -2695,7 +2695,7 @@ void sndSetMusicChannelVolume(struct var80094ed8 *arg0, u16 volume) tmp = 0x7fff; } - func00039c80(arg0->seqp, tmp); + n_alCSPSetVol(arg0->seqp, tmp); } }