From 7de6e2e9695ed5eb3001a1000e07e8c62550c543 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 8 Oct 2019 22:27:49 +1000 Subject: [PATCH] Decompile ai004b --- src/game/chr/chraicommands.c | 42 ++++++++++-------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 4eb259920..ba8bd4d58 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1958,37 +1958,17 @@ bool ai004a(void) /** * @cmd 004b */ -GLOBAL_ASM( -glabel ai004b -/* f0504cc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0504d0: 3c03800a */ lui $v1,0x800a -/* f0504d4: 24639fc0 */ addiu $v1,$v1,-24640 -/* f0504d8: afbf0014 */ sw $ra,0x14($sp) -/* f0504dc: 0fc12839 */ jal func0f04a0e4 -/* f0504e0: 8c640424 */ lw $a0,0x424($v1) -/* f0504e4: 3c03800a */ lui $v1,0x800a -/* f0504e8: 1040000a */ beqz $v0,.L0f050514 -/* f0504ec: 24639fc0 */ addiu $v1,$v1,-24640 -/* f0504f0: 8c640434 */ lw $a0,0x434($v1) -/* f0504f4: 8c650438 */ lw $a1,0x438($v1) -/* f0504f8: 00851021 */ addu $v0,$a0,$a1 -/* f0504fc: 0fc13583 */ jal chraiGoToLabel -/* f050500: 90460002 */ lbu $a2,0x2($v0) -/* f050504: 3c03800a */ lui $v1,0x800a -/* f050508: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05050c: 10000004 */ beqz $zero,.L0f050520 -/* f050510: ac620438 */ sw $v0,0x438($v1) -.L0f050514: -/* f050514: 8c6e0438 */ lw $t6,0x438($v1) -/* f050518: 25cf0003 */ addiu $t7,$t6,0x3 -/* f05051c: ac6f0438 */ sw $t7,0x438($v1) -.L0f050520: -/* f050520: 8fbf0014 */ lw $ra,0x14($sp) -/* f050524: 27bd0018 */ addiu $sp,$sp,0x18 -/* f050528: 00001025 */ or $v0,$zero,$zero -/* f05052c: 03e00008 */ jr $ra -/* f050530: 00000000 */ sll $zero,$zero,0x0 -); +bool ai004b(void) +{ + if (func0f04a0e4(g_Vars.chrdata)) { + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + } else { + g_Vars.aioffset += 3; + } + + return false; +} /** * @cmd 004c