Decompile audioSetBgMusicForMenu

This commit is contained in:
Ryan Dwyer
2020-08-20 18:51:37 +10:00
parent ec016de0d8
commit 60f26e68b1
9 changed files with 19 additions and 28 deletions
+2 -2
View File
@@ -1314,7 +1314,7 @@ glabel var7f1a863c
.L0f01d00c:
/* f01d00c: 52000004 */ beqzl $s0,.L0f01d020
/* f01d010: 2419ffff */ addiu $t9,$zero,-1
/* f01d014: 0fc5b6c5 */ jal func0f16db14
/* f01d014: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* f01d018: 00000000 */ nop
.L0f01d01c:
/* f01d01c: 2419ffff */ addiu $t9,$zero,-1
@@ -2415,7 +2415,7 @@ glabel var7f1a863c
// }
//
// if (pass) {
// func0f16db14();
// audioSetBgMusicForMenu();
// }
// }
//
+1 -1
View File
@@ -5252,7 +5252,7 @@ glabel var7f1ad630
/* f0baea4: 55800016 */ bnezl $t4,.L0f0baf00
/* f0baea8: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0baeac:
/* f0baeac: 0fc5b6c5 */ jal func0f16db14
/* f0baeac: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* f0baeb0: 00000000 */ nop
/* f0baeb4: 10000012 */ b .L0f0baf00
/* f0baeb8: 8fbf0014 */ lw $ra,0x14($sp)
+3 -3
View File
@@ -9074,7 +9074,7 @@ glabel var7f1b29f8
/* f0f8538: 24040004 */ addiu $a0,$zero,0x4
/* f0f853c: 1000001e */ b .L0f0f85b8
/* f0f8540: 00000000 */ nop
/* f0f8544: 0fc5b6c5 */ jal func0f16db14
/* f0f8544: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* f0f8548: 00000000 */ nop
/* f0f854c: 3c03800a */ lui $v1,%hi(g_MenuData)
/* f0f8550: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData)
@@ -9098,7 +9098,7 @@ glabel var7f1b29f8
/* f0f8594: 24040001 */ addiu $a0,$zero,0x1
/* f0f8598: 10000007 */ b .L0f0f85b8
/* f0f859c: 00000000 */ nop
/* f0f85a0: 0fc5b6c5 */ jal func0f16db14
/* f0f85a0: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* f0f85a4: 00000000 */ nop
/* f0f85a8: 3c03800a */ lui $v1,%hi(g_MenuData)
/* f0f85ac: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData)
@@ -9121,7 +9121,7 @@ glabel var7f1b29f8
void func0f0f85e0(struct menudialog *dialog, s32 root)
{
if (dialog == &g_MainMenuMenuDialog) {
func0f16db14();
audioSetBgMusicForMenu();
}
menuPushRootDialog(dialog, root);
+1 -1
View File
@@ -4458,7 +4458,7 @@ glabel var7f1b5930
.L0f13af10:
/* f13af10: 0fc5b67c */ jal func0f16d9f0
/* f13af14: 2404005c */ addiu $a0,$zero,0x5c
/* f13af18: 0fc5b647 */ jal func0f16d91c
/* f13af18: 0fc5b647 */ jal audioSetBgMusic
/* f13af1c: 24040058 */ addiu $a0,$zero,0x58
/* f13af20: 3c04800a */ lui $a0,%hi(var800a416c)
/* f13af24: 3c06800a */ lui $a2,%hi(var800a416c)
+5 -14
View File
@@ -725,7 +725,7 @@ glabel func0f16d89c
);
GLOBAL_ASM(
glabel func0f16d91c
glabel audioSetBgMusic
/* f16d91c: 3c0f8008 */ lui $t7,%hi(var800840c0)
/* f16d920: 8def40c0 */ lw $t7,%lo(var800840c0)($t7)
/* f16d924: 27bdffe8 */ addiu $sp,$sp,-24
@@ -866,19 +866,10 @@ glabel func0f16daa4
/* f16db10: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f16db14
/* f16db14: 27bdffe8 */ addiu $sp,$sp,-24
/* f16db18: afbf0014 */ sw $ra,0x14($sp)
/* f16db1c: 0fc3f27d */ jal menuChooseMusic
/* f16db20: 00000000 */ nop
/* f16db24: 0fc5b647 */ jal func0f16d91c
/* f16db28: 00402025 */ or $a0,$v0,$zero
/* f16db2c: 8fbf0014 */ lw $ra,0x14($sp)
/* f16db30: 27bd0018 */ addiu $sp,$sp,0x18
/* f16db34: 03e00008 */ jr $ra
/* f16db38: 00000000 */ nop
);
void audioSetBgMusicForMenu(void)
{
audioSetBgMusic(menuChooseMusic());
}
GLOBAL_ASM(
glabel func0f16db3c
+1 -1
View File
@@ -4918,7 +4918,7 @@ glabel var7f1b8228
/* f17df04: 00001025 */ or $v0,$zero,$zero
/* f17df08: 0fc63088 */ jal mpGetTrackMusicNum
/* f17df0c: 00602025 */ or $a0,$v1,$zero
/* f17df10: 0fc5b647 */ jal func0f16d91c
/* f17df10: 0fc5b647 */ jal audioSetBgMusic
/* f17df14: 00402025 */ or $a0,$v0,$zero
/* f17df18: 10000012 */ b .L0f17df64
/* f17df1c: 00001025 */ or $v0,$zero,$zero
+1 -1
View File
@@ -4894,7 +4894,7 @@ glabel func0f18b9e4
/* f18ba60: 00444021 */ addu $t0,$v0,$a0
/* f18ba64: 01034821 */ addu $t1,$t0,$v1
/* f18ba68: 01259021 */ addu $s2,$t1,$a1
/* f18ba6c: 0fc5b6c5 */ jal func0f16db14
/* f18ba6c: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* f18ba70: 02409825 */ or $s3,$s2,$zero
/* f18ba74: 0fc625cb */ jal mpSetPaused
/* f18ba78: 24040002 */ addiu $a0,$zero,0x2
+2 -2
View File
@@ -18,13 +18,13 @@ void func0f16d4b8(f32 arg0);
void func0f16d548(f32 arg0);
u32 func0f16d6c0(void);
u32 func0f16d89c(void);
u32 func0f16d91c(void);
void audioSetBgMusic(s32 tracknum);
void func0f16d9a8(s32 stagenum);
void func0f16d9f0(s32 stagenum);
u32 func0f16d9fc(void);
u32 func0f16da2c(void);
u32 func0f16daa4(void);
void func0f16db14(void);
void audioSetBgMusicForMenu(void);
void func0f16db3c(void);
void func0f16dba4(void);
u32 func0f16dc78(void);
+3 -3
View File
@@ -1483,7 +1483,7 @@ glabel func0000e684
.L0000e7d0:
/* e7d0: 0fc4a24b */ jal setCurrentPlayerNum
/* e7d4: 8fa4002c */ lw $a0,0x2c($sp)
/* e7d8: 0fc5b6c5 */ jal func0f16db14
/* e7d8: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* e7dc: 00000000 */ nop
/* e7e0: 10000057 */ b .L0000e940
/* e7e4: 8fbf001c */ lw $ra,0x1c($sp)
@@ -1569,7 +1569,7 @@ glabel func0000e684
.L0000e8f8:
/* e8f8: 0fc4a24b */ jal setCurrentPlayerNum
/* e8fc: 8fa40024 */ lw $a0,0x24($sp)
/* e900: 0fc5b6c5 */ jal func0f16db14
/* e900: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* e904: 00000000 */ nop
/* e908: 1000000d */ b .L0000e940
/* e90c: 8fbf001c */ lw $ra,0x1c($sp)
@@ -1584,7 +1584,7 @@ glabel func0000e684
.L0000e92c:
/* e92c: 0fc43988 */ jal endscreenPrepare
/* e930: 00000000 */ nop
/* e934: 0fc5b6c5 */ jal func0f16db14
/* e934: 0fc5b6c5 */ jal audioSetBgMusicForMenu
/* e938: 00000000 */ nop
/* e93c: 8fbf001c */ lw $ra,0x1c($sp)
.L0000e940: