diff --git a/asm/non_matchings/unknown_001050/func_80001844.s b/asm/non_matchings/unknown_001050/func_80001844.s index d751d4cc..ed88001e 100644 --- a/asm/non_matchings/unknown_001050/func_80001844.s +++ b/asm/non_matchings/unknown_001050/func_80001844.s @@ -14,34 +14,4 @@ glabel func_80001844 /* 002470 80001870 03E00008 */ jr $ra /* 002474 80001874 00000000 */ nop -/* 002478 80001878 3C02800E */ lui $v0, %hi(D_800DC640) # $v0, 0x800e -/* 00247C 8000187C 2442C640 */ addiu $v0, %lo(D_800DC640) # addiu $v0, $v0, -0x39c0 -/* 002480 80001880 904F0000 */ lbu $t7, ($v0) -/* 002484 80001884 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 002488 80001888 308E00FF */ andi $t6, $a0, 0xff -/* 00248C 8000188C AFBF0014 */ sw $ra, 0x14($sp) -/* 002490 80001890 11EE000B */ beq $t7, $t6, .L800018C0 -/* 002494 80001894 AFA40018 */ sw $a0, 0x18($sp) -/* 002498 80001898 11C00007 */ beqz $t6, .L800018B8 -/* 00249C 8000189C A04E0000 */ sb $t6, ($v0) -/* 0024A0 800018A0 3C048011 */ lui $a0, %hi(D_80115D04) # $a0, 0x8011 -/* 0024A4 800018A4 90845D04 */ lbu $a0, %lo(D_80115D04)($a0) -/* 0024A8 800018A8 0C0002CD */ jal func_80000B34 -/* 0024AC 800018AC 00000000 */ nop -/* 0024B0 800018B0 10000004 */ b .L800018C4 -/* 0024B4 800018B4 8FBF0014 */ lw $ra, 0x14($sp) -.L800018B8: -/* 0024B8 800018B8 0C000611 */ jal func_80001844 -/* 0024BC 800018BC 00000000 */ nop -.L800018C0: -/* 0024C0 800018C0 8FBF0014 */ lw $ra, 0x14($sp) -.L800018C4: -/* 0024C4 800018C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0024C8 800018C8 03E00008 */ jr $ra -/* 0024CC 800018CC 00000000 */ nop - -/* 0024D0 800018D0 3C02800E */ lui $v0, %hi(D_800DC640) # $v0, 0x800e -/* 0024D4 800018D4 9042C640 */ lbu $v0, %lo(D_800DC640)($v0) -/* 0024D8 800018D8 03E00008 */ jr $ra -/* 0024DC 800018DC 00000000 */ nop diff --git a/asm/non_matchings/unknown_001050/func_80001878.s b/asm/non_matchings/unknown_001050/func_80001878.s new file mode 100644 index 00000000..7ca0d586 --- /dev/null +++ b/asm/non_matchings/unknown_001050/func_80001878.s @@ -0,0 +1,26 @@ +glabel func_80001878 +/* 002478 80001878 3C02800E */ lui $v0, %hi(D_800DC640) # $v0, 0x800e +/* 00247C 8000187C 2442C640 */ addiu $v0, %lo(D_800DC640) # addiu $v0, $v0, -0x39c0 +/* 002480 80001880 904F0000 */ lbu $t7, ($v0) +/* 002484 80001884 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 002488 80001888 308E00FF */ andi $t6, $a0, 0xff +/* 00248C 8000188C AFBF0014 */ sw $ra, 0x14($sp) +/* 002490 80001890 11EE000B */ beq $t7, $t6, .L800018C0 +/* 002494 80001894 AFA40018 */ sw $a0, 0x18($sp) +/* 002498 80001898 11C00007 */ beqz $t6, .L800018B8 +/* 00249C 8000189C A04E0000 */ sb $t6, ($v0) +/* 0024A0 800018A0 3C048011 */ lui $a0, %hi(D_80115D04) # $a0, 0x8011 +/* 0024A4 800018A4 90845D04 */ lbu $a0, %lo(D_80115D04)($a0) +/* 0024A8 800018A8 0C0002CD */ jal func_80000B34 +/* 0024AC 800018AC 00000000 */ nop +/* 0024B0 800018B0 10000004 */ b .L800018C4 +/* 0024B4 800018B4 8FBF0014 */ lw $ra, 0x14($sp) +.L800018B8: +/* 0024B8 800018B8 0C000611 */ jal func_80001844 +/* 0024BC 800018BC 00000000 */ nop +.L800018C0: +/* 0024C0 800018C0 8FBF0014 */ lw $ra, 0x14($sp) +.L800018C4: +/* 0024C4 800018C4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 0024C8 800018C8 03E00008 */ jr $ra +/* 0024CC 800018CC 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s b/lib/asm/non_matchings/unknown_0C85C0/alSeqpGetChlFXMix.s similarity index 94% rename from lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s rename to lib/asm/non_matchings/unknown_0C85C0/alSeqpGetChlFXMix.s index e3fbf4e9..c53c163d 100644 --- a/lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s +++ b/lib/asm/non_matchings/unknown_0C85C0/alSeqpGetChlFXMix.s @@ -1,4 +1,4 @@ -glabel func_800C79C0 +glabel alSeqpGetChlFXMix /* 0C85C0 800C79C0 AFA50004 */ sw $a1, 4($sp) /* 0C85C4 800C79C4 8C8F0060 */ lw $t7, 0x60($a0) /* 0C85C8 800C79C8 30AE00FF */ andi $t6, $a1, 0xff diff --git a/lib/src/unknown_0C85C0.c b/lib/src/unknown_0C85C0.c index 5b7e2e47..325344aa 100644 --- a/lib/src/unknown_0C85C0.c +++ b/lib/src/unknown_0C85C0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C85C0/alSeqpGetChlFXMix.s") diff --git a/src/unknown_001050.c b/src/unknown_001050.c index f03e6d58..51dfd962 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -342,13 +342,13 @@ void func_80001358(u8 arg0, u8 arg1, u32 arg2){ } #endif -u8 func_800C79C0(ALCSPlayer*, u8); +u8 alSeqpGetChlFXMix(ALCSPlayer*, u8); void func_80001440(u8 *arg0){ s32 s0 = 0; if(gMusicPlayer->maxChannels > 0){ do{ - arg0[s0] = func_800C79C0(gMusicPlayer, s0); + arg0[s0] = alSeqpGetChlFXMix(gMusicPlayer, s0); s0++; }while(s0 < gMusicPlayer->maxChannels); } @@ -373,12 +373,20 @@ u8 musicIsPlaying(void) { GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800015F8.s") +u32 func_80001C08(void); + GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001784.s") GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800017D4.s") GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001844.s") +GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001878.s") +//GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800018D0.s") + +u8 func_800018D0(void){ + return D_800DC640; +} void func_80002570(ALCSPlayer* arg0); -u32 func_80001C08(void); + void func_800018E0(void) { if (func_80001C08() == 0) {