diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 68a826ec9..52e833915 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -74,7 +74,7 @@ build/ROMID/lib/naudio/n_sndplayer.o (section); \ build/ROMID/lib/speaker.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ - build/ROMID/lib/lib_37650.o (section); \ + build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ build/ROMID/lib/mp3.o (section); \ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 69c8265bb..ab45cc6a6 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -71,7 +71,7 @@ build/ROMID/lib/naudio/n_sndplayer.o (section); \ build/ROMID/lib/speaker.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ - build/ROMID/lib/lib_37650.o (section); \ + build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ build/ROMID/lib/mp3.o (section); \ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 9fa4f482a..172989469 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -71,7 +71,7 @@ build/ROMID/lib/naudio/n_sndplayer.o (section); \ build/ROMID/lib/speaker.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ - build/ROMID/lib/lib_37650.o (section); \ + build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ build/ROMID/lib/mp3.o (section); \ build/ROMID/lib/naudio/n_cspgetstate.o (section); \ diff --git a/src/include/lib/lib_37650.h b/src/include/lib/lib_37650.h deleted file mode 100644 index 397b1e99b..000000000 --- a/src/include/lib/lib_37650.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _IN_LIB_LIB_37650_H -#define _IN_LIB_LIB_37650_H -#include -#include "data.h" -#include "types.h" - -void func00037650(N_ALCSPlayer *seqp, ALBank *bank); - -#endif diff --git a/src/lib/lib_37650.c b/src/lib/lib_37650.c deleted file mode 100644 index 2a11c62af..000000000 --- a/src/lib/lib_37650.c +++ /dev/null @@ -1,31 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "lib/lib_37650.h" -#include "data.h" -#include "types.h" - -GLOBAL_ASM( -glabel func00037650 -/* 37650: 27bdffd8 */ addiu $sp,$sp,-40 -/* 37654: afbf0014 */ sw $ra,0x14($sp) -/* 37658: afa40028 */ sw $a0,0x28($sp) -/* 3765c: afa5002c */ sw $a1,0x2c($sp) -/* 37660: 240e000e */ addiu $t6,$zero,0xe -/* 37664: a7ae0018 */ sh $t6,0x18($sp) -/* 37668: 8faf002c */ lw $t7,0x2c($sp) -/* 3766c: afaf001c */ sw $t7,0x1c($sp) -/* 37670: 8fa40028 */ lw $a0,0x28($sp) -/* 37674: 27a50018 */ addiu $a1,$sp,0x18 -/* 37678: 00003025 */ or $a2,$zero,$zero -/* 3767c: 00003825 */ or $a3,$zero,$zero -/* 37680: 0c00f184 */ jal n_alEvtqPostEvent -/* 37684: 24840048 */ addiu $a0,$a0,0x48 -/* 37688: 10000001 */ b .L00037690 -/* 3768c: 00000000 */ nop -.L00037690: -/* 37690: 8fbf0014 */ lw $ra,0x14($sp) -/* 37694: 27bd0028 */ addiu $sp,$sp,0x28 -/* 37698: 03e00008 */ jr $ra -/* 3769c: 00000000 */ nop -); diff --git a/src/lib/naudio/n_cspsetbank.c b/src/lib/naudio/n_cspsetbank.c new file mode 100644 index 000000000..00f8d6b0f --- /dev/null +++ b/src/lib/naudio/n_cspsetbank.c @@ -0,0 +1,12 @@ +#include +#include "n_libaudio.h" + +void n_alCSPSetBank(N_ALCSPlayer *seqp, ALBank *b) +{ + N_ALEvent evt; + + evt.type = AL_SEQP_BANK_EVT; + evt.msg.spbank.bank = b; + + n_alEvtqPostEvent(&seqp->evtq, &evt, 0, 0); +} diff --git a/src/lib/snd.c b/src/lib/snd.c index ec706b368..0c65bdb1f 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -13,7 +13,6 @@ #include "lib/rng.h" #include "lib/lib_2fc60.h" #include "lib/lib_317f0.h" -#include "lib/lib_37650.h" #include "lib/mp3.h" #include "lib/lib_39c80.h" #include "data.h" @@ -2203,7 +2202,7 @@ void seqInit(struct seqinstance *seq) n_alCSPNew(seq->seqp, &config); - func00037650(seq->seqp, var80095204); + n_alCSPSetBank(seq->seqp, var80095204); } void snd0000f76c(void);