From e95ab6e52d558fce0767ac3575c19ee00d85afe9 Mon Sep 17 00:00:00 2001 From: Mittenshugg Date: Sun, 9 Aug 2020 13:35:45 -0500 Subject: [PATCH] c: sfxSetPan --- .../unknown_001050/func_80001074.s | 47 ------------------- .../unknown_001050/func_80001B58.s | 29 ------------ .../unknown_005740/func_80008438.s | 2 +- src/unknown_001050.c | 11 ++++- 4 files changed, 10 insertions(+), 79 deletions(-) delete mode 100644 asm/non_matchings/unknown_001050/func_80001074.s delete mode 100644 asm/non_matchings/unknown_001050/func_80001B58.s diff --git a/asm/non_matchings/unknown_001050/func_80001074.s b/asm/non_matchings/unknown_001050/func_80001074.s deleted file mode 100644 index 20e5ce37..00000000 --- a/asm/non_matchings/unknown_001050/func_80001074.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80001074 -/* 001C74 80001074 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 001C78 80001078 3C0F800E */ lui $t7, %hi(D_800DC65C) # $t7, 0x800e -/* 001C7C 8000107C 91EFC65C */ lbu $t7, %lo(D_800DC65C)($t7) -/* 001C80 80001080 AFA40028 */ sw $a0, 0x28($sp) -/* 001C84 80001084 308EFFFF */ andi $t6, $a0, 0xffff -/* 001C88 80001088 01C02025 */ move $a0, $t6 -/* 001C8C 8000108C AFBF0024 */ sw $ra, 0x24($sp) -/* 001C90 80001090 AFB20020 */ sw $s2, 0x20($sp) -/* 001C94 80001094 AFB1001C */ sw $s1, 0x1c($sp) -/* 001C98 80001098 11E00004 */ beqz $t7, .L800010AC -/* 001C9C 8000109C AFB00018 */ sw $s0, 0x18($sp) -/* 001CA0 800010A0 3C018011 */ lui $at, %hi(D_80115F7C) # $at, 0x8011 -/* 001CA4 800010A4 10000015 */ b .L800010FC -/* 001CA8 800010A8 AC2E5F7C */ sw $t6, %lo(D_80115F7C)($at) -.L800010AC: -/* 001CAC 800010AC 3C18800E */ lui $t8, %hi(gMusicPlayer) # $t8, 0x800e -/* 001CB0 800010B0 8F18C630 */ lw $t8, %lo(gMusicPlayer)($t8) -/* 001CB4 800010B4 00008025 */ move $s0, $zero -/* 001CB8 800010B8 00808825 */ move $s1, $a0 -/* 001CBC 800010BC 24120010 */ li $s2, 16 -/* 001CC0 800010C0 A7040030 */ sh $a0, 0x30($t8) -/* 001CC4 800010C4 24190001 */ li $t9, 1 -.L800010C8: -/* 001CC8 800010C8 02194004 */ sllv $t0, $t9, $s0 -/* 001CCC 800010CC 02284824 */ and $t1, $s1, $t0 -/* 001CD0 800010D0 11200005 */ beqz $t1, .L800010E8 -/* 001CD4 800010D4 00000000 */ nop -/* 001CD8 800010D8 0C00045C */ jal func_80001170 -/* 001CDC 800010DC 320400FF */ andi $a0, $s0, 0xff -/* 001CE0 800010E0 10000004 */ b .L800010F4 -/* 001CE4 800010E4 26100001 */ addiu $s0, $s0, 1 -.L800010E8: -/* 001CE8 800010E8 0C000445 */ jal func_80001114 -/* 001CEC 800010EC 320400FF */ andi $a0, $s0, 0xff -/* 001CF0 800010F0 26100001 */ addiu $s0, $s0, 1 -.L800010F4: -/* 001CF4 800010F4 1612FFF4 */ bne $s0, $s2, .L800010C8 -/* 001CF8 800010F8 24190001 */ li $t9, 1 -.L800010FC: -/* 001CFC 800010FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 001D00 80001100 8FB00018 */ lw $s0, 0x18($sp) -/* 001D04 80001104 8FB1001C */ lw $s1, 0x1c($sp) -/* 001D08 80001108 8FB20020 */ lw $s2, 0x20($sp) -/* 001D0C 8000110C 03E00008 */ jr $ra -/* 001D10 80001110 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/unknown_001050/func_80001B58.s b/asm/non_matchings/unknown_001050/func_80001B58.s deleted file mode 100644 index 7ae4a33b..00000000 --- a/asm/non_matchings/unknown_001050/func_80001B58.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80001B58 -/* 002758 80001B58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 00275C 80001B5C AFB2001C */ sw $s2, 0x1c($sp) -/* 002760 80001B60 AFB30020 */ sw $s3, 0x20($sp) -/* 002764 80001B64 AFB10018 */ sw $s1, 0x18($sp) -/* 002768 80001B68 AFB00014 */ sw $s0, 0x14($sp) -/* 00276C 80001B6C 3C12800E */ lui $s2, %hi(gSndFxPlayer) # $s2, 0x800e -/* 002770 80001B70 309100FF */ andi $s1, $a0, 0xff -/* 002774 80001B74 AFBF0024 */ sw $ra, 0x24($sp) -/* 002778 80001B78 AFA40028 */ sw $a0, 0x28($sp) -/* 00277C 80001B7C 2652C634 */ addiu $s2, %lo(gSndFxPlayer) # addiu $s2, $s2, -0x39cc -/* 002780 80001B80 00008025 */ move $s0, $zero -/* 002784 80001B84 24130010 */ li $s3, 16 -.L80001B88: -/* 002788 80001B88 8E440000 */ lw $a0, ($s2) -/* 00278C 80001B8C 320500FF */ andi $a1, $s0, 0xff -/* 002790 80001B90 0C031E38 */ jal alCSPSetChlPan -/* 002794 80001B94 322600FF */ andi $a2, $s1, 0xff -/* 002798 80001B98 26100001 */ addiu $s0, $s0, 1 -/* 00279C 80001B9C 1613FFFA */ bne $s0, $s3, .L80001B88 -/* 0027A0 80001BA0 00000000 */ nop -/* 0027A4 80001BA4 8FBF0024 */ lw $ra, 0x24($sp) -/* 0027A8 80001BA8 8FB00014 */ lw $s0, 0x14($sp) -/* 0027AC 80001BAC 8FB10018 */ lw $s1, 0x18($sp) -/* 0027B0 80001BB0 8FB2001C */ lw $s2, 0x1c($sp) -/* 0027B4 80001BB4 8FB30020 */ lw $s3, 0x20($sp) -/* 0027B8 80001BB8 03E00008 */ jr $ra -/* 0027BC 80001BBC 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/unknown_005740/func_80008438.s b/asm/non_matchings/unknown_005740/func_80008438.s index c57f73f5..a4cb6510 100644 --- a/asm/non_matchings/unknown_005740/func_80008438.s +++ b/asm/non_matchings/unknown_005740/func_80008438.s @@ -820,7 +820,7 @@ glabel func_80008438 /* 009C28 80009028 0C0006C3 */ jal sfxSetRelativeVolume /* 009C2C 8000902C 00000000 */ nop /* 009C30 80009030 93A4024B */ lbu $a0, 0x24b($sp) -/* 009C34 80009034 0C0006D6 */ jal func_80001B58 +/* 009C34 80009034 0C0006D6 */ jal sfxSetPan /* 009C38 80009038 00000000 */ nop /* 009C3C 8000903C 10000004 */ b .L80009050 /* 009C40 80009040 8FA5026C */ lw $a1, 0x26c($sp) diff --git a/src/unknown_001050.c b/src/unknown_001050.c index d7354c51..441b625d 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -222,7 +222,8 @@ u16 musicGetChanMask(void) { } void func_80001114(u8 arg0); void func_80001170(u8 arg0); -//GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001074.s") + + void func_80001074(u16 arg0){ u32 s0; if(D_800DC65C){ @@ -375,7 +376,13 @@ void sfxSetRelativeVolume(u8 arg0) { alCSPSetVol(gSndFxPlayer, (s16) (sfxVolumeSliderPercentage() * D_800DC63C)); } -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001B58.s") +void sfxSetPan(ALPan pan){ + u32 iChan; + for(iChan = 0; iChan < 16; iChan++){ + alCSPSetChlPan(gSndFxPlayer, iChan, pan); + } + return; +} GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001BC0.s")