diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index d71ed9258..7fb0d8d7d 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1777,37 +1777,17 @@ bool aiIfInLoadedRoom(void) /** * @cmd 0043 */ -GLOBAL_ASM( -glabel ai0043 -/* f0500a8: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0500ac: 3c03800a */ lui $v1,0x800a -/* f0500b0: 24639fc0 */ addiu $v1,$v1,-24640 -/* f0500b4: afbf0014 */ sw $ra,0x14($sp) -/* f0500b8: 0fc12285 */ jal func0f048a14 -/* f0500bc: 8c640424 */ lw $a0,0x424($v1) -/* f0500c0: 3c03800a */ lui $v1,0x800a -/* f0500c4: 1040000a */ beqz $v0,.L0f0500f0 -/* f0500c8: 24639fc0 */ addiu $v1,$v1,-24640 -/* f0500cc: 8c640434 */ lw $a0,0x434($v1) -/* f0500d0: 8c650438 */ lw $a1,0x438($v1) -/* f0500d4: 00851021 */ addu $v0,$a0,$a1 -/* f0500d8: 0fc13583 */ jal chraiGoToLabel -/* f0500dc: 90460002 */ lbu $a2,0x2($v0) -/* f0500e0: 3c03800a */ lui $v1,0x800a -/* f0500e4: 24639fc0 */ addiu $v1,$v1,-24640 -/* f0500e8: 10000004 */ beqz $zero,.L0f0500fc -/* f0500ec: ac620438 */ sw $v0,0x438($v1) -.L0f0500f0: -/* f0500f0: 8c6e0438 */ lw $t6,0x438($v1) -/* f0500f4: 25cf0003 */ addiu $t7,$t6,0x3 -/* f0500f8: ac6f0438 */ sw $t7,0x438($v1) -.L0f0500fc: -/* f0500fc: 8fbf0014 */ lw $ra,0x14($sp) -/* f050100: 27bd0018 */ addiu $sp,$sp,0x18 -/* f050104: 00001025 */ or $v0,$zero,$zero -/* f050108: 03e00008 */ jr $ra -/* f05010c: 00000000 */ sll $zero,$zero,0x0 -); +bool ai0043(void) +{ + if (func0f048a14(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 0044