From c09f1fa4fbd659e0f948dda7da2d198303563b71 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 8 Oct 2019 08:07:41 +1000 Subject: [PATCH] Decompile aiStartPath --- src/game/chr/chraicommands.c | 24 +++++++----------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index f54a0d7b6..94d10b81e 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1559,23 +1559,13 @@ bool aiSetPath(void) /** * @cmd 0022 */ -GLOBAL_ASM( -glabel ai0022 -/* f04fa80: 27bdffe8 */ addiu $sp,$sp,-24 -/* f04fa84: afbf0014 */ sw $ra,0x14($sp) -/* f04fa88: 3c04800a */ lui $a0,0x800a -/* f04fa8c: 0fc0ea5a */ jal func0f03a968 -/* f04fa90: 8c84a3e4 */ lw $a0,-0x5c1c($a0) -/* f04fa94: 3c03800a */ lui $v1,0x800a -/* f04fa98: 24639fc0 */ addiu $v1,$v1,-24640 -/* f04fa9c: 8c6e0438 */ lw $t6,0x438($v1) -/* f04faa0: 8fbf0014 */ lw $ra,0x14($sp) -/* f04faa4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f04faa8: 25cf0002 */ addiu $t7,$t6,0x2 -/* f04faac: ac6f0438 */ sw $t7,0x438($v1) -/* f04fab0: 03e00008 */ jr $ra -/* f04fab4: 00001025 */ or $v0,$zero,$zero -); +bool aiStartPath(void) +{ + func0f03a968(g_Vars.chrdata); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 0039 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 0049c07ed..d95b7076e 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -37,7 +37,7 @@ /*0x001f*/ bool aiWalkToPad(void); /*0x0020*/ bool aiRunToPad(void); /*0x0021*/ bool aiSetPath(void); -/*0x0022*/ bool ai0022(void); +/*0x0022*/ bool aiStartPath(void); /*0x0023*/ bool ai0023(void); /*0x0024*/ bool aiSurrender(void); /*0x0025*/ bool aiFadeOut(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index e18ef4661..00e471271 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -13983,7 +13983,7 @@ bool (*command_pointers[])(void) = { /*0x001f*/ aiWalkToPad, /*0x0020*/ aiRunToPad, /*0x0021*/ aiSetPath, - /*0x0022*/ ai0022, + /*0x0022*/ aiStartPath, /*0x0023*/ ai0023, /*0x0024*/ aiSurrender, /*0x0025*/ aiFadeOut,