From b1d57f791f427c683acc5c39056b93b609f7ee2d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 19 Oct 2019 15:24:11 +1000 Subject: [PATCH] Decompile aiSetChrPreset --- src/game/chr/chraicommands.c | 30 ++++++++-------------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 35df8b027..dd9481226 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -6847,28 +6847,14 @@ glabel ai011a /** * @cmd 00b0 */ -GLOBAL_ASM( -glabel ai00b0 -/* f054cd0: 3c03800a */ lui $v1,0x800a -/* f054cd4: 24639fc0 */ addiu $v1,$v1,-24640 -/* f054cd8: 8c6e0434 */ lw $t6,0x434($v1) -/* f054cdc: 8c6f0438 */ lw $t7,0x438($v1) -/* f054ce0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f054ce4: afbf0014 */ sw $ra,0x14($sp) -/* f054ce8: 01cf1021 */ addu $v0,$t6,$t7 -/* f054cec: 90450002 */ lbu $a1,0x2($v0) -/* f054cf0: 0fc12b0e */ jal chrSetChrPreset -/* f054cf4: 8c640424 */ lw $a0,0x424($v1) -/* f054cf8: 3c03800a */ lui $v1,0x800a -/* f054cfc: 24639fc0 */ addiu $v1,$v1,-24640 -/* f054d00: 8c780438 */ lw $t8,0x438($v1) -/* f054d04: 8fbf0014 */ lw $ra,0x14($sp) -/* f054d08: 27bd0018 */ addiu $sp,$sp,0x18 -/* f054d0c: 27190003 */ addiu $t9,$t8,0x3 -/* f054d10: ac790438 */ sw $t9,0x438($v1) -/* f054d14: 03e00008 */ jr $ra -/* f054d18: 00001025 */ or $v0,$zero,$zero -); +bool aiSetChrPreset(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + chrSetChrPreset(g_Vars.chrdata, cmd[2]); + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 00b1 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index ff6dd3c48..5309e7b01 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -178,7 +178,7 @@ /*0x00ad*/ bool ai00ad(void); /*0x00ae*/ bool ai00ae(void); /*0x00af*/ bool ai00af(void); -/*0x00b0*/ bool ai00b0(void); +/*0x00b0*/ bool aiSetChrPreset(void); /*0x00b1*/ bool ai00b1(void); /*0x00b2*/ bool ai00b2(void); /*0x00b3*/ bool ai00b3(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index a1891c744..4cd51635d 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14129,7 +14129,7 @@ bool (*command_pointers[])(void) = { /*0x00ad*/ ai00ad, /*0x00ae*/ ai00ae, /*0x00af*/ ai00af, - /*0x00b0*/ ai00b0, + /*0x00b0*/ aiSetChrPreset, /*0x00b1*/ ai00b1, /*0x00b2*/ ai00b2, /*0x00b3*/ ai00b3,