diff --git a/src/include/lib/lib_3d280.h b/src/include/lib/lib_3d280.h index 3867acb32..c1af1f643 100644 --- a/src/include/lib/lib_3d280.h +++ b/src/include/lib/lib_3d280.h @@ -11,7 +11,6 @@ u32 func0003d69c(void); u32 func0003d72c(void); u32 func0003d8a4(void); u32 func0003d9cc(void); -u32 func0003db14(void); void __resetPerfChanState(ALSeqPlayer *seqp, s32 chan); u32 func0003e2a0(void); diff --git a/src/lib/lib_3d280.c b/src/lib/lib_3d280.c index 97ba3fe6a..c5cea25be 100644 --- a/src/lib/lib_3d280.c +++ b/src/lib/lib_3d280.c @@ -698,49 +698,16 @@ ALMicroTime __vsDelta(ALVoiceState *vs, ALMicroTime t) } } -GLOBAL_ASM( -glabel func0003db14 -/* 3db14: 27bdfff8 */ addiu $sp,$sp,-8 -/* 3db18: 908f0031 */ lbu $t7,0x31($a0) -/* 3db1c: 8cae0060 */ lw $t6,0x60($a1) -/* 3db20: 8c890020 */ lw $t1,0x20($a0) -/* 3db24: 000fc080 */ sll $t8,$t7,0x2 -/* 3db28: 030fc023 */ subu $t8,$t8,$t7 -/* 3db2c: 0018c080 */ sll $t8,$t8,0x2 -/* 3db30: 030fc021 */ addu $t8,$t8,$t7 -/* 3db34: 0018c080 */ sll $t8,$t8,0x2 -/* 3db38: 01d8c821 */ addu $t9,$t6,$t8 -/* 3db3c: 93280007 */ lbu $t0,0x7($t9) -/* 3db40: 912a000c */ lbu $t2,0xc($t1) -/* 3db44: 010a5821 */ addu $t3,$t0,$t2 -/* 3db48: 256cffc0 */ addiu $t4,$t3,-64 -/* 3db4c: afac0004 */ sw $t4,0x4($sp) -/* 3db50: 8fad0004 */ lw $t5,0x4($sp) -/* 3db54: 19a00003 */ blez $t5,.L0003db64 -/* 3db58: 00000000 */ nop -/* 3db5c: 10000002 */ b .L0003db68 -/* 3db60: 00000000 */ nop -.L0003db64: -/* 3db64: afa00004 */ sw $zero,0x4($sp) -.L0003db68: -/* 3db68: 8faf0004 */ lw $t7,0x4($sp) -/* 3db6c: 29e1007f */ slti $at,$t7,0x7f -/* 3db70: 10200003 */ beqz $at,.L0003db80 -/* 3db74: 00000000 */ nop -/* 3db78: 10000003 */ b .L0003db88 -/* 3db7c: 00000000 */ nop -.L0003db80: -/* 3db80: 240e007f */ addiu $t6,$zero,0x7f -/* 3db84: afae0004 */ sw $t6,0x4($sp) -.L0003db88: -/* 3db88: 10000003 */ b .L0003db98 -/* 3db8c: 93a20007 */ lbu $v0,0x7($sp) -/* 3db90: 10000001 */ b .L0003db98 -/* 3db94: 00000000 */ nop -.L0003db98: -/* 3db98: 03e00008 */ jr $ra -/* 3db9c: 27bd0008 */ addiu $sp,$sp,0x8 -); +ALPan __vsPan(ALVoiceState *vs, ALSeqPlayer *seqp) +{ + s32 tmp; + + tmp = seqp->chanState[vs->channel].pan - AL_PAN_CENTER + vs->sound->samplePan; + tmp = MAX(tmp, AL_PAN_LEFT); + tmp = MIN(tmp, AL_PAN_RIGHT); + + return (ALPan) tmp; +} void __initFromBank(ALSeqPlayer *seqp, ALBank *b) { diff --git a/src/lib/ultra/audio/csplayer.c b/src/lib/ultra/audio/csplayer.c index 9954c8d82..6e192ef37 100644 --- a/src/lib/ultra/audio/csplayer.c +++ b/src/lib/ultra/audio/csplayer.c @@ -2307,7 +2307,7 @@ glabel func00035110 /* 35848: e7a80070 */ swc1 $f8,0x70($sp) .L0003584c: /* 3584c: 8fa4009c */ lw $a0,0x9c($sp) -/* 35850: 0c00f6c5 */ jal func0003db14 +/* 35850: 0c00f6c5 */ jal __vsPan /* 35854: 8fa500d0 */ lw $a1,0xd0($sp) /* 35858: a3a2009b */ sb $v0,0x9b($sp) /* 3585c: 8fa4009c */ lw $a0,0x9c($sp) @@ -2665,7 +2665,7 @@ glabel func00035110 /* 35d88: 15680009 */ bne $t3,$t0,.L00035db0 /* 35d8c: 00000000 */ nop /* 35d90: 8fa400c8 */ lw $a0,0xc8($sp) -/* 35d94: 0c00f6c5 */ jal func0003db14 +/* 35d94: 0c00f6c5 */ jal __vsPan /* 35d98: 8fa500d0 */ lw $a1,0xd0($sp) /* 35d9c: a3a2009b */ sb $v0,0x9b($sp) /* 35da0: 8fa400c8 */ lw $a0,0xc8($sp) @@ -4534,7 +4534,7 @@ glabel func00035110 /* 35848: e7a80070 */ swc1 $f8,0x70($sp) .L0003584c: /* 3584c: 8fa4009c */ lw $a0,0x9c($sp) -/* 35850: 0c00f6c5 */ jal func0003db14 +/* 35850: 0c00f6c5 */ jal __vsPan /* 35854: 8fa500d0 */ lw $a1,0xd0($sp) /* 35858: a3a2009b */ sb $v0,0x9b($sp) /* 3585c: 8fa4009c */ lw $a0,0x9c($sp) @@ -4892,7 +4892,7 @@ glabel func00035110 /* 35d88: 15680009 */ bne $t3,$t0,.L00035db0 /* 35d8c: 00000000 */ nop /* 35d90: 8fa400c8 */ lw $a0,0xc8($sp) -/* 35d94: 0c00f6c5 */ jal func0003db14 +/* 35d94: 0c00f6c5 */ jal __vsPan /* 35d98: 8fa500d0 */ lw $a1,0xd0($sp) /* 35d9c: a3a2009b */ sb $v0,0x9b($sp) /* 35da0: 8fa400c8 */ lw $a0,0xc8($sp)