From 2531ff94067c82654cc75a80e0e74e5e54d6e28e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 20 Oct 2019 13:22:55 +1000 Subject: [PATCH] Decompile aiAudioRestartSfx --- src/game/chr/chraicommands.c | 23 +++++++---------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index b27e5e462..aa480684f 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -10388,22 +10388,13 @@ bool aiAudioSetSfxTrack(void) /** * @cmd 0180 */ -GLOBAL_ASM( -glabel ai0180 -/* f0586bc: 3c02800a */ lui $v0,0x800a -/* f0586c0: 24429fc0 */ addiu $v0,$v0,-24640 -/* f0586c4: 8c4e0438 */ lw $t6,0x438($v0) -/* f0586c8: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0586cc: afbf0014 */ sw $ra,0x14($sp) -/* f0586d0: 25cf0002 */ addiu $t7,$t6,0x2 -/* f0586d4: 0fc5b80b */ jal func0f16e02c -/* f0586d8: ac4f0438 */ sw $t7,0x438($v0) -/* f0586dc: 8fbf0014 */ lw $ra,0x14($sp) -/* f0586e0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0586e4: 00001025 */ or $v0,$zero,$zero -/* f0586e8: 03e00008 */ jr $ra -/* f0586ec: 00000000 */ sll $zero,$zero,0x0 -); +bool aiAudioRestartSfx(void) +{ + g_Vars.aioffset += 2; + func0f16e02c(); + + return false; +} /** * @cmd 00fb diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 46031f220..61d73d34a 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -361,7 +361,7 @@ /*0x017d*/ bool aiAudioSetMusicTrack(void); /*0x017e*/ bool aiAudioRestartDefaultMusic(void); /*0x017f*/ bool aiAudioSetSfxTrack(void); -/*0x0180*/ bool ai0180(void); +/*0x0180*/ bool aiAudioRestartSfx(void); /*0x0181*/ bool ai0181(void); /*0x0182*/ bool ai0182(void); /*0x0183*/ bool ai0183(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 43dbc0256..c8035b82c 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14337,7 +14337,7 @@ bool (*command_pointers[])(void) = { /*0x017d*/ aiAudioSetMusicTrack, /*0x017e*/ aiAudioRestartDefaultMusic, /*0x017f*/ aiAudioSetSfxTrack, - /*0x0180*/ ai0180, + /*0x0180*/ aiAudioRestartSfx, /*0x0181*/ ai0181, /*0x0182*/ ai0182, /*0x0183*/ ai0183,