diff --git a/asm/non_matchings/unknown_001050/func_800012E8.s b/asm/non_matchings/unknown_001050/func_80001358.s similarity index 75% rename from asm/non_matchings/unknown_001050/func_800012E8.s rename to asm/non_matchings/unknown_001050/func_80001358.s index daff0d9c..cb1fd762 100644 --- a/asm/non_matchings/unknown_001050/func_800012E8.s +++ b/asm/non_matchings/unknown_001050/func_80001358.s @@ -1,35 +1,4 @@ -glabel func_800012E8 -/* 001EE8 800012E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 001EEC 800012EC 3C0E800E */ lui $t6, %hi(D_800DC648) # $t6, 0x800e -/* 001EF0 800012F0 8DCEC648 */ lw $t6, %lo(D_800DC648)($t6) -/* 001EF4 800012F4 AFBF0024 */ sw $ra, 0x24($sp) -/* 001EF8 800012F8 AFB20020 */ sw $s2, 0x20($sp) -/* 001EFC 800012FC AFB1001C */ sw $s1, 0x1c($sp) -/* 001F00 80001300 15C0000F */ bnez $t6, .L80001340 -/* 001F04 80001304 AFB00018 */ sw $s0, 0x18($sp) -/* 001F08 80001308 00008025 */ move $s0, $zero -/* 001F0C 8000130C 24120010 */ li $s2, 16 -/* 001F10 80001310 321100FF */ andi $s1, $s0, 0xff -.L80001314: -/* 001F14 80001314 0C00045C */ jal func_80001170 -/* 001F18 80001318 322400FF */ andi $a0, $s1, 0xff -/* 001F1C 8000131C 322400FF */ andi $a0, $s1, 0xff -/* 001F20 80001320 0C00049A */ jal func_80001268 -/* 001F24 80001324 2405007F */ li $a1, 127 -/* 001F28 80001328 322400FF */ andi $a0, $s1, 0xff -/* 001F2C 8000132C 0C00047A */ jal musicSetChlVol -/* 001F30 80001330 2405007F */ li $a1, 127 -/* 001F34 80001334 26100001 */ addiu $s0, $s0, 1 -/* 001F38 80001338 1612FFF6 */ bne $s0, $s2, .L80001314 -/* 001F3C 8000133C 321100FF */ andi $s1, $s0, 0xff -.L80001340: -/* 001F40 80001340 8FBF0024 */ lw $ra, 0x24($sp) -/* 001F44 80001344 8FB00018 */ lw $s0, 0x18($sp) -/* 001F48 80001348 8FB1001C */ lw $s1, 0x1c($sp) -/* 001F4C 8000134C 8FB20020 */ lw $s2, 0x20($sp) -/* 001F50 80001350 03E00008 */ jr $ra -/* 001F54 80001354 27BD0028 */ addiu $sp, $sp, 0x28 - +glabel func_80001358 /* 001F58 80001358 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 001F5C 8000135C 308700FF */ andi $a3, $a0, 0xff /* 001F60 80001360 24010064 */ li $at, 100 @@ -127,5 +96,4 @@ glabel func_800012E8 /* 0020AC 800014AC 8FB2001C */ lw $s2, 0x1c($sp) /* 0020B0 800014B0 8FB30020 */ lw $s3, 0x20($sp) /* 0020B4 800014B4 03E00008 */ jr $ra -/* 0020B8 800014B8 27BD0028 */ addiu $sp, $sp, 0x28 - +/* 0020B8 800014B8 27BD0028 */ addiu $sp, $sp, 0x28 \ No newline at end of file diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 27eab0ab..3c331fd8 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -107,7 +107,7 @@ extern s32 D_80115F7C; GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000450.s") GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000890.s") - +void func_80004A60(u8, u16); void func_80000968(s32 arg0) { switch(arg0) { case 1: @@ -306,7 +306,19 @@ s32 func_800012A8(u8 arg0) { return func_80063C00(gMusicPlayer, arg0); } -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800012E8.s") +void func_800012E8(void){ + u32 s0; + if(!D_800DC648){ + for(s0 = 0; s0<16; s0++){ + func_80001170( s0 ); + func_80001268( s0, 127 ); + musicSetChlVol( s0, 127 ); + } + } + return; +} + +GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001358.s") s16 func_800015B8(void); @@ -396,7 +408,16 @@ u32 func_80001C08(void){ return 0; } +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001C5C.s") +#else +void func_80001C5C(u32 arg0){ + u32 s0; + for(s0 = 0; s0<64; s0++){ + func_80004A60(s0, arg0 << 8); + } +} +#endif u16 func_80001CB8(u16 arg0) { if (D_80115D20 < arg0) {