From 2a0b731b89b8085c81109b65c8dec28b24fa8cd7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 19 Oct 2019 15:26:36 +1000 Subject: [PATCH] Decompile aiSetChrTarget --- src/game/chr/chraicommands.c | 31 +++++++--------------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index dd9481226..b07b493a9 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -6859,29 +6859,14 @@ bool aiSetChrPreset(void) /** * @cmd 00b1 */ -GLOBAL_ASM( -glabel ai00b1 -/* f054d1c: 3c03800a */ lui $v1,0x800a -/* f054d20: 24639fc0 */ addiu $v1,$v1,-24640 -/* f054d24: 8c6e0434 */ lw $t6,0x434($v1) -/* f054d28: 8c6f0438 */ lw $t7,0x438($v1) -/* f054d2c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f054d30: afbf0014 */ sw $ra,0x14($sp) -/* f054d34: 01cf1021 */ addu $v0,$t6,$t7 -/* f054d38: 90450002 */ lbu $a1,0x2($v0) -/* f054d3c: 90460003 */ lbu $a2,0x3($v0) -/* f054d40: 0fc12b18 */ jal func0f04ac60 -/* f054d44: 8c640424 */ lw $a0,0x424($v1) -/* f054d48: 3c03800a */ lui $v1,0x800a -/* f054d4c: 24639fc0 */ addiu $v1,$v1,-24640 -/* f054d50: 8c780438 */ lw $t8,0x438($v1) -/* f054d54: 8fbf0014 */ lw $ra,0x14($sp) -/* f054d58: 27bd0018 */ addiu $sp,$sp,0x18 -/* f054d5c: 27190004 */ addiu $t9,$t8,0x4 -/* f054d60: ac790438 */ sw $t9,0x438($v1) -/* f054d64: 03e00008 */ jr $ra -/* f054d68: 00001025 */ or $v0,$zero,$zero -); +bool aiSetChrTarget(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + func0f04ac60(g_Vars.chrdata, cmd[2], cmd[3]); + g_Vars.aioffset += 4; + + return false; +} /** * @cmd 00b2 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 5309e7b01..4abb0a2dd 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -179,7 +179,7 @@ /*0x00ae*/ bool ai00ae(void); /*0x00af*/ bool ai00af(void); /*0x00b0*/ bool aiSetChrPreset(void); -/*0x00b1*/ bool ai00b1(void); +/*0x00b1*/ bool aiSetChrTarget(void); /*0x00b2*/ bool ai00b2(void); /*0x00b3*/ bool ai00b3(void); /*0x00b4*/ bool ai00b4(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 4cd51635d..882e9beef 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14130,7 +14130,7 @@ bool (*command_pointers[])(void) = { /*0x00ae*/ ai00ae, /*0x00af*/ ai00af, /*0x00b0*/ aiSetChrPreset, - /*0x00b1*/ ai00b1, + /*0x00b1*/ aiSetChrTarget, /*0x00b2*/ ai00b2, /*0x00b3*/ ai00b3, /*0x00b4*/ ai00b4,