From e3e1ae50119e919452922e1c099f5c0e555d5e5f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 19 Oct 2019 16:15:34 +1000 Subject: [PATCH] Decompile aiAudioMuteChannel --- src/game/chr/chraicommands.c | 31 +++++++++------------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index ff91daf19..d39fcde7f 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -8223,27 +8223,16 @@ glabel ai017c /** * @cmd 00d3 */ -GLOBAL_ASM( -glabel ai00d3 -/* f0562dc: 3c03800a */ lui $v1,0x800a -/* f0562e0: 24639fc0 */ addiu $v1,$v1,-24640 -/* f0562e4: 8c6e0434 */ lw $t6,0x434($v1) -/* f0562e8: 8c6f0438 */ lw $t7,0x438($v1) -/* f0562ec: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0562f0: afbf0014 */ sw $ra,0x14($sp) -/* f0562f4: 01cf1021 */ addu $v0,$t6,$t7 -/* f0562f8: 0fc250b4 */ jal func0f0942d0 -/* f0562fc: 80440002 */ lb $a0,0x2($v0) -/* f056300: 3c03800a */ lui $v1,0x800a -/* f056304: 24639fc0 */ addiu $v1,$v1,-24640 -/* f056308: 8c780438 */ lw $t8,0x438($v1) -/* f05630c: 8fbf0014 */ lw $ra,0x14($sp) -/* f056310: 27bd0018 */ addiu $sp,$sp,0x18 -/* f056314: 27190003 */ addiu $t9,$t8,0x3 -/* f056318: ac790438 */ sw $t9,0x438($v1) -/* f05631c: 03e00008 */ jr $ra -/* f056320: 00001025 */ or $v0,$zero,$zero -); +bool aiAudioMuteChannel(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + s8 channel = (s8)cmd[2]; + + func0f0942d0(channel); + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 0138 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 479a09c2e..22713bfbc 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -213,7 +213,7 @@ /*0x00d0*/ bool ai00d0(void); /*0x00d1*/ bool ai00d1(void); /*0x00d2*/ bool ai00d2(void); -/*0x00d3*/ bool ai00d3(void); +/*0x00d3*/ bool aiAudioMuteChannel(void); /*0x00d4*/ bool ai00d4(void); /*0x00d5*/ bool ai00d5(void); /*0x00d6*/ bool ai00d6(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index a3213999e..94a69e4d0 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14164,7 +14164,7 @@ bool (*command_pointers[])(void) = { /*0x00d0*/ ai00d0, /*0x00d1*/ ai00d1, /*0x00d2*/ ai00d2, - /*0x00d3*/ ai00d3, + /*0x00d3*/ aiAudioMuteChannel, /*0x00d4*/ ai00d4, /*0x00d5*/ ai00d5, /*0x00d6*/ ai00d6,