diff --git a/include/PR/n_libaudio.h b/include/PR/n_libaudio.h index 758eb8a9a..4fdb02149 100644 --- a/include/PR/n_libaudio.h +++ b/include/PR/n_libaudio.h @@ -323,6 +323,7 @@ void n_alSeqpSetTempo(N_ALSeqPlayer *seqp, s32 tempo); void n_alSeqpSetVol(N_ALSeqPlayer *seqp, s16 vol); void n_alSeqpStop(N_ALSeqPlayer *seqp); void n_alSeqpLoop(N_ALSeqPlayer *seqp, ALSeqMarker *start, ALSeqMarker *end, s32 count); +void n_alSeqpSetFilter11(N_ALSeqPlayer *seqp); /* diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 41e35bfc3..4eb6e6c49 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -80,7 +80,7 @@ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ - build/ROMID/lib/lib_39f70.o (section); \ + build/ROMID/lib/naudio/n_seqpsetfilter11.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ build/ROMID/lib/naudio/n_synallocfx.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index ca0c458dd..afe3b364c 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -77,7 +77,7 @@ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ - build/ROMID/lib/lib_39f70.o (section); \ + build/ROMID/lib/naudio/n_seqpsetfilter11.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ build/ROMID/lib/naudio/n_synallocfx.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 9379d068f..f360fb492 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -77,7 +77,7 @@ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ - build/ROMID/lib/lib_39f70.o (section); \ + build/ROMID/lib/naudio/n_seqpsetfilter11.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ build/ROMID/lib/naudio/n_synallocfx.o (section); \ diff --git a/src/include/lib/lib_39f70.h b/src/include/lib/lib_39f70.h deleted file mode 100644 index 0ea270e05..000000000 --- a/src/include/lib/lib_39f70.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _IN_LIB_LIB_39F70_H -#define _IN_LIB_LIB_39F70_H -#include -#include "data.h" -#include "types.h" - -u32 func00039f70(void); - -#endif diff --git a/src/lib/lib_39f70.c b/src/lib/lib_39f70.c deleted file mode 100644 index 10bb5d89b..000000000 --- a/src/lib/lib_39f70.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -GLOBAL_ASM( -glabel func00039f70 -/* 39f70: 27bdffd8 */ addiu $sp,$sp,-40 -/* 39f74: afbf0014 */ sw $ra,0x14($sp) -/* 39f78: afa40028 */ sw $a0,0x28($sp) -/* 39f7c: 240e0011 */ addiu $t6,$zero,0x11 -/* 39f80: a7ae0018 */ sh $t6,0x18($sp) -/* 39f84: 8fa40028 */ lw $a0,0x28($sp) -/* 39f88: 27a50018 */ addiu $a1,$sp,0x18 -/* 39f8c: 00003025 */ or $a2,$zero,$zero -/* 39f90: 00003825 */ or $a3,$zero,$zero -/* 39f94: 0c00f184 */ jal n_alEvtqPostEvent -/* 39f98: 24840048 */ addiu $a0,$a0,0x48 -/* 39f9c: 10000001 */ b .L00039fa4 -/* 39fa0: 00000000 */ nop -.L00039fa4: -/* 39fa4: 8fbf0014 */ lw $ra,0x14($sp) -/* 39fa8: 27bd0028 */ addiu $sp,$sp,0x28 -/* 39fac: 03e00008 */ jr $ra -/* 39fb0: 00000000 */ nop -); diff --git a/src/lib/music.c b/src/lib/music.c index 02a1c232c..8faf0014d 100644 --- a/src/lib/music.c +++ b/src/lib/music.c @@ -1,4 +1,5 @@ #include +#include #include "constants.h" #include "game/music.h" #include "game/game_176080.h" @@ -7,7 +8,6 @@ #include "lib/music.h" #include "lib/lib_38d10.h" #include "lib/lib_39c80.h" -#include "lib/lib_39f70.h" #include "data.h" #include "types.h" @@ -231,7 +231,7 @@ glabel var70053fd8 /* 1167c: 02340019 */ multu $s1,$s4 /* 11680: 00007812 */ mflo $t7 /* 11684: 026fc021 */ addu $t8,$s3,$t7 -/* 11688: 0c00e7dc */ jal func00039f70 +/* 11688: 0c00e7dc */ jal n_alSeqpSetFilter11 /* 1168c: 8f0400f8 */ lw $a0,0xf8($t8) /* 11690: 3c08800b */ lui $t0,%hi(var800aaa38) /* 11694: 2508aa38 */ addiu $t0,$t0,%lo(var800aaa38) @@ -284,7 +284,7 @@ glabel music00011700 /* 11734: 3c048009 */ lui $a0,%hi(var80094ed8+0xf8) /* 11738: 008f2021 */ addu $a0,$a0,$t7 /* 1173c: 8c844fd0 */ lw $a0,%lo(var80094ed8+0xf8)($a0) -/* 11740: 0c00e7dc */ jal func00039f70 +/* 11740: 0c00e7dc */ jal n_alSeqpSetFilter11 /* 11744: afa2001c */ sw $v0,0x1c($sp) /* 11748: 8fa2001c */ lw $v0,0x1c($sp) /* 1174c: ac400000 */ sw $zero,0x0($v0) @@ -392,7 +392,7 @@ glabel music00011884 /* 118ac: 26314ed8 */ addiu $s1,$s1,%lo(var80094ed8) /* 118b0: 2610aa38 */ addiu $s0,$s0,%lo(var800aaa38) .L000118b4: -/* 118b4: 0c00e7dc */ jal func00039f70 +/* 118b4: 0c00e7dc */ jal n_alSeqpSetFilter11 /* 118b8: 8e2400f8 */ lw $a0,0xf8($s1) /* 118bc: 26100010 */ addiu $s0,$s0,0x10 /* 118c0: 26310108 */ addiu $s1,$s1,0x108 @@ -476,7 +476,7 @@ glabel var70053fec /* 11998: 01c2082a */ slt $at,$t6,$v0 /* 1199c: 54200009 */ bnezl $at,.L000119c4 /* 119a0: 8e0f000c */ lw $t7,0xc($s0) -/* 119a4: 0c00e7dc */ jal func00039f70 +/* 119a4: 0c00e7dc */ jal n_alSeqpSetFilter11 /* 119a8: 00000000 */ nop /* 119ac: ae000000 */ sw $zero,0x0($s0) /* 119b0: ae000004 */ sw $zero,0x4($s0) @@ -487,7 +487,7 @@ glabel var70053fec .L000119c4: /* 119c4: 544f0008 */ bnel $v0,$t7,.L000119e8 /* 119c8: 26310001 */ addiu $s1,$s1,0x1 -/* 119cc: 0c00e7dc */ jal func00039f70 +/* 119cc: 0c00e7dc */ jal n_alSeqpSetFilter11 /* 119d0: 00000000 */ nop /* 119d4: ae000000 */ sw $zero,0x0($s0) /* 119d8: ae000004 */ sw $zero,0x4($s0) @@ -801,7 +801,7 @@ glabel music0001190c /* 11d54: 0142082a */ slt $at,$t2,$v0 /* 11d58: 54200009 */ bnezl $at,.NB00011d80 /* 11d5c: 8e0b000c */ lw $t3,0xc($s0) -/* 11d60: 0c00ecd0 */ jal func00039f70 +/* 11d60: 0c00ecd0 */ jal n_alSeqpSetFilter11 /* 11d64: 00000000 */ sll $zero,$zero,0x0 /* 11d68: ae000000 */ sw $zero,0x0($s0) /* 11d6c: ae000004 */ sw $zero,0x4($s0) @@ -812,7 +812,7 @@ glabel music0001190c .NB00011d80: /* 11d80: 544b0008 */ bnel $v0,$t3,.NB00011da4 /* 11d84: 26310001 */ addiu $s1,$s1,0x1 -/* 11d88: 0c00ecd0 */ jal func00039f70 +/* 11d88: 0c00ecd0 */ jal n_alSeqpSetFilter11 /* 11d8c: 00000000 */ sll $zero,$zero,0x0 /* 11d90: ae000000 */ sw $zero,0x0($s0) /* 11d94: ae000004 */ sw $zero,0x4($s0) diff --git a/src/lib/naudio/n_seqpsetfilter11.c b/src/lib/naudio/n_seqpsetfilter11.c new file mode 100644 index 000000000..027cd038c --- /dev/null +++ b/src/lib/naudio/n_seqpsetfilter11.c @@ -0,0 +1,11 @@ +#include +#include "synthInternals.h" + +void n_alSeqpSetFilter11(N_ALSeqPlayer *seqp) +{ + N_ALEvent evt; + + evt.type = AL_FILTER_11; + + n_alEvtqPostEvent(&seqp->evtq, &evt, 0, 0); +}