diff --git a/asm/non_matchings/unknown_001050/func_80001844.s b/asm/non_matchings/unknown_001050/func_80001844.s deleted file mode 100644 index ed88001e..00000000 --- a/asm/non_matchings/unknown_001050/func_80001844.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80001844 -/* 002444 80001844 3C0E800E */ lui $t6, %hi(D_800DC648) # $t6, 0x800e -/* 002448 80001848 8DCEC648 */ lw $t6, %lo(D_800DC648)($t6) -/* 00244C 8000184C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 002450 80001850 15C00005 */ bnez $t6, .L80001868 -/* 002454 80001854 AFBF0014 */ sw $ra, 0x14($sp) -/* 002458 80001858 3C04800E */ lui $a0, %hi(gMusicPlayer) # $a0, 0x800e -/* 00245C 8000185C 8C84C630 */ lw $a0, %lo(gMusicPlayer)($a0) -/* 002460 80001860 0C00095C */ jal func_80002570 -/* 002464 80001864 00000000 */ nop -.L80001868: -/* 002468 80001868 8FBF0014 */ lw $ra, 0x14($sp) -/* 00246C 8000186C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 002470 80001870 03E00008 */ jr $ra -/* 002474 80001874 00000000 */ nop - - diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 51dfd962..cd6fa8bb 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -377,15 +377,24 @@ 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_80001844.s") + +void func_80002570(ALCSPlayer* arg0); + +void func_80001844(void){ + if(!D_800DC648){ + func_80002570(gMusicPlayer); + } + return; +} + 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); + void func_800018E0(void) {