From 10f67c57fe843cdd19175e7dc700a1156b92e404 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 19 Oct 2019 13:54:06 +1000 Subject: [PATCH] Decompile aiSetAlertness --- src/game/chr/chraicommands.c | 24 ++++++++---------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 9855a5207..613be8d88 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5156,22 +5156,14 @@ bool aiIfMoraleLessThanRandom(void) /** * @cmd 008a */ -GLOBAL_ASM( -glabel ai008a -/* f053504: 3c04800a */ lui $a0,0x800a -/* f053508: 24849fc0 */ addiu $a0,$a0,-24640 -/* f05350c: 8c8e0434 */ lw $t6,0x434($a0) -/* f053510: 8c8f0438 */ lw $t7,0x438($a0) -/* f053514: 8c990424 */ lw $t9,0x424($a0) -/* f053518: 00001025 */ or $v0,$zero,$zero -/* f05351c: 01cf1821 */ addu $v1,$t6,$t7 -/* f053520: 90780002 */ lbu $t8,0x2($v1) -/* f053524: a3380113 */ sb $t8,0x113($t9) -/* f053528: 8c880438 */ lw $t0,0x438($a0) -/* f05352c: 25090003 */ addiu $t1,$t0,0x3 -/* f053530: 03e00008 */ jr $ra -/* f053534: ac890438 */ sw $t1,0x438($a0) -); +bool aiSetAlertness(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + g_Vars.chrdata->alertness = cmd[2]; + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 008b diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 05f016724..4b669de02 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -140,7 +140,7 @@ /*0x0087*/ bool aiSubtractMorale(void); /*0x0088*/ bool aiIfMoraleLessThan(void); /*0x0089*/ bool aiIfMoraleLessThanRandom(void); -/*0x008a*/ bool ai008a(void); +/*0x008a*/ bool aiSetAlertness(void); /*0x008b*/ bool ai008b(void); /*0x008c*/ bool ai008c(void); /*0x008d*/ bool ai008d(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 9a6105322..ddfef7ceb 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14091,7 +14091,7 @@ bool (*command_pointers[])(void) = { /*0x0087*/ aiSubtractMorale, /*0x0088*/ aiIfMoraleLessThan, /*0x0089*/ aiIfMoraleLessThanRandom, - /*0x008a*/ ai008a, + /*0x008a*/ aiSetAlertness, /*0x008b*/ ai008b, /*0x008c*/ ai008c, /*0x008d*/ ai008d,