From c2493c75c2e2425c419c8ccee6ad83cb3dc154d4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 20 Oct 2019 13:17:13 +1000 Subject: [PATCH] Decompile aiAudioRestartDefaultMusic --- 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 7fc589838..fbd4323e1 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -10365,22 +10365,13 @@ bool aiAudioSetMusicTrack(void) /** * @cmd 017e */ -GLOBAL_ASM( -glabel ai017e -/* f058640: 3c02800a */ lui $v0,0x800a -/* f058644: 24429fc0 */ addiu $v0,$v0,-24640 -/* f058648: 8c4e0438 */ lw $t6,0x438($v0) -/* f05864c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f058650: afbf0014 */ sw $ra,0x14($sp) -/* f058654: 25cf0002 */ addiu $t7,$t6,0x2 -/* f058658: 0fc5b7e1 */ jal func0f16df84 -/* f05865c: ac4f0438 */ sw $t7,0x438($v0) -/* f058660: 8fbf0014 */ lw $ra,0x14($sp) -/* f058664: 27bd0018 */ addiu $sp,$sp,0x18 -/* f058668: 00001025 */ or $v0,$zero,$zero -/* f05866c: 03e00008 */ jr $ra -/* f058670: 00000000 */ sll $zero,$zero,0x0 -); +bool aiAudioRestartDefaultMusic(void) +{ + g_Vars.aioffset += 2; + func0f16df84(); + + return false; +} /** * @cmd 017f diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index c1e029777..7fdf74806 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -359,7 +359,7 @@ /*0x017b*/ bool aiIfChrUnloaded(void); /*0x017c*/ bool ai017c(void); /*0x017d*/ bool aiAudioSetMusicTrack(void); -/*0x017e*/ bool ai017e(void); +/*0x017e*/ bool aiAudioRestartDefaultMusic(void); /*0x017f*/ bool ai017f(void); /*0x0180*/ bool ai0180(void); /*0x0181*/ bool ai0181(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 5a7696323..c1fa3c9e7 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14335,7 +14335,7 @@ bool (*command_pointers[])(void) = { /*0x017b*/ aiIfChrUnloaded, /*0x017c*/ ai017c, /*0x017d*/ aiAudioSetMusicTrack, - /*0x017e*/ ai017e, + /*0x017e*/ aiAudioRestartDefaultMusic, /*0x017f*/ ai017f, /*0x0180*/ ai0180, /*0x0181*/ ai0181,