diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 8273424c7..68a826ec9 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -80,7 +80,7 @@ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ - build/ROMID/lib/lib_39be0.o (section); \ + build/ROMID/lib/naudio/n_cspplay.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); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 5fdbdc11f..69c8265bb 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -77,7 +77,7 @@ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ - build/ROMID/lib/lib_39be0.o (section); \ + build/ROMID/lib/naudio/n_cspplay.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); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 9df88bc08..9fa4f482a 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -77,7 +77,7 @@ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ - build/ROMID/lib/lib_39be0.o (section); \ + build/ROMID/lib/naudio/n_cspplay.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); \ diff --git a/src/include/lib/lib_39be0.h b/src/include/lib/lib_39be0.h deleted file mode 100644 index 1da26e583..000000000 --- a/src/include/lib/lib_39be0.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _IN_LIB_LIB_39BE0_H -#define _IN_LIB_LIB_39BE0_H -#include -#include "data.h" -#include "types.h" - -void func00039c30(N_ALCSPlayer *seqp); - -#endif diff --git a/src/lib/lib_39be0.c b/src/lib/lib_39be0.c deleted file mode 100644 index 9bea61678..000000000 --- a/src/lib/lib_39be0.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -GLOBAL_ASM( -glabel func00039c30 -/* 39c30: 27bdffd8 */ addiu $sp,$sp,-40 -/* 39c34: afbf0014 */ sw $ra,0x14($sp) -/* 39c38: afa40028 */ sw $a0,0x28($sp) -/* 39c3c: 240e000f */ addiu $t6,$zero,0xf -/* 39c40: a7ae0018 */ sh $t6,0x18($sp) -/* 39c44: 8fa40028 */ lw $a0,0x28($sp) -/* 39c48: 27a50018 */ addiu $a1,$sp,0x18 -/* 39c4c: 00003025 */ or $a2,$zero,$zero -/* 39c50: 00003825 */ or $a3,$zero,$zero -/* 39c54: 0c00f184 */ jal n_alEvtqPostEvent -/* 39c58: 24840048 */ addiu $a0,$a0,0x48 -/* 39c5c: 10000001 */ b .L00039c64 -/* 39c60: 00000000 */ nop -.L00039c64: -/* 39c64: 8fbf0014 */ lw $ra,0x14($sp) -/* 39c68: 27bd0028 */ addiu $sp,$sp,0x28 -/* 39c6c: 03e00008 */ jr $ra -/* 39c70: 00000000 */ nop -); diff --git a/src/lib/naudio/n_cspplay.c b/src/lib/naudio/n_cspplay.c new file mode 100644 index 000000000..c81a4384c --- /dev/null +++ b/src/lib/naudio/n_cspplay.c @@ -0,0 +1,11 @@ +#include +#include "n_libaudio.h" + +void n_alCSPPlay(N_ALCSPlayer *seqp) +{ + N_ALEvent evt; + + evt.type = AL_SEQP_PLAY_EVT; + + n_alEvtqPostEvent(&seqp->evtq, &evt, 0, 0); +} diff --git a/src/lib/snd.c b/src/lib/snd.c index 9ff935a9f..ec706b368 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -15,7 +15,6 @@ #include "lib/lib_317f0.h" #include "lib/lib_37650.h" #include "lib/mp3.h" -#include "lib/lib_39be0.h" #include "lib/lib_39c80.h" #include "data.h" #include "types.h" @@ -2480,7 +2479,7 @@ bool seqPlay(struct seqinstance *seq, s32 tracknum) n_alCSeqNew(&seq->seq, seq->data); n_alCSPSetSeq(seq->seqp, &seq->seq); seqSetVolume(seq, seqGetVolume(seq)); - func00039c30(seq->seqp); + n_alCSPPlay(seq->seqp); return true; } @@ -2608,7 +2607,7 @@ glabel seqPlay /* 10298: 02002025 */ or $a0,$s0,$zero /* 1029c: 0c0040bb */ jal seqSetVolume /* 102a0: 3045ffff */ andi $a1,$v0,0xffff -/* 102a4: 0c00ec00 */ jal func00039c30 +/* 102a4: 0c00ec00 */ jal n_alCSPPlay /* 102a8: 8e0400f8 */ lw $a0,0xf8($s0) /* 102ac: 24020001 */ addiu $v0,$zero,0x1 .NB000102b0: