From 8cf48c90529aa8347b1ac457b4e0e642a458504b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 20 Oct 2019 13:04:09 +1000 Subject: [PATCH] Decompile aiAudioStopChannel --- src/game/chr/chraicommands.c | 27 ++++++++------------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 18eac0db5..6e23b61cf 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -10310,25 +10310,14 @@ bool aiAudioPlayXMusic(void) /** * @cmd 00fa */ -GLOBAL_ASM( -glabel ai00fa -/* f058504: 3c05800a */ lui $a1,0x800a -/* f058508: 24a59fc0 */ addiu $a1,$a1,-24640 -/* f05850c: 8ca20438 */ lw $v0,0x438($a1) -/* f058510: 8cae0434 */ lw $t6,0x434($a1) -/* f058514: 27bdffe8 */ addiu $sp,$sp,-24 -/* f058518: 244f0003 */ addiu $t7,$v0,0x3 -/* f05851c: afbf0014 */ sw $ra,0x14($sp) -/* f058520: acaf0438 */ sw $t7,0x438($a1) -/* f058524: 01c21821 */ addu $v1,$t6,$v0 -/* f058528: 0fc5b82d */ jal func0f16e0b4 -/* f05852c: 80640002 */ lb $a0,0x2($v1) -/* f058530: 8fbf0014 */ lw $ra,0x14($sp) -/* f058534: 27bd0018 */ addiu $sp,$sp,0x18 -/* f058538: 00001025 */ or $v0,$zero,$zero -/* f05853c: 03e00008 */ jr $ra -/* f058540: 00000000 */ sll $zero,$zero,0x0 -); +bool aiAudioStopChannel(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + g_Vars.aioffset += 3; + func0f16e0b4((s8)cmd[2]); + + return false; +} /** * @cmd 015b diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 5c31690ae..b63e44016 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -250,7 +250,7 @@ /*0x00f7*/ bool aiIfAllObjectivesComplete(void); /*0x00f8*/ bool ai00f8(void); /*0x00f9*/ bool aiAudioPlayXMusic(void); -/*0x00fa*/ bool ai00fa(void); +/*0x00fa*/ bool aiAudioStopChannel(void); /*0x00fb*/ bool ai00fb(void); /*0x00fc*/ bool ai00fc(void); /*0x00fd*/ bool ai00fd(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 96a35e074..67bb35bfc 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14203,7 +14203,7 @@ bool (*command_pointers[])(void) = { /*0x00f7*/ aiIfAllObjectivesComplete, /*0x00f8*/ ai00f8, /*0x00f9*/ aiAudioPlayXMusic, - /*0x00fa*/ ai00fa, + /*0x00fa*/ aiAudioStopChannel, /*0x00fb*/ ai00fb, /*0x00fc*/ ai00fc, /*0x00fd*/ ai00fd,