diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 613be8d88..fba96f6cf 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5168,29 +5168,14 @@ bool aiSetAlertness(void) /** * @cmd 008b */ -GLOBAL_ASM( -glabel ai008b -/* f053538: 3c03800a */ lui $v1,0x800a -/* f05353c: 24639fc0 */ addiu $v1,$v1,-24640 -/* f053540: 8c6e0434 */ lw $t6,0x434($v1) -/* f053544: 8c6f0438 */ lw $t7,0x438($v1) -/* f053548: 8c640424 */ lw $a0,0x424($v1) -/* f05354c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f053550: afbf0014 */ sw $ra,0x14($sp) -/* f053554: 01cf1021 */ addu $v0,$t6,$t7 -/* f053558: 90450002 */ lbu $a1,0x2($v0) -/* f05355c: 0fc1289f */ jal incrementByte -/* f053560: 24840113 */ addiu $a0,$a0,0x113 -/* f053564: 3c03800a */ lui $v1,0x800a -/* f053568: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05356c: 8c780438 */ lw $t8,0x438($v1) -/* f053570: 8fbf0014 */ lw $ra,0x14($sp) -/* f053574: 27bd0018 */ addiu $sp,$sp,0x18 -/* f053578: 27190003 */ addiu $t9,$t8,0x3 -/* f05357c: ac790438 */ sw $t9,0x438($v1) -/* f053580: 03e00008 */ jr $ra -/* f053584: 00001025 */ or $v0,$zero,$zero -); +bool aiAddAlertness(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + incrementByte(&g_Vars.chrdata->alertness, cmd[2]); + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 008c diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 4b669de02..c1cac769d 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -141,7 +141,7 @@ /*0x0088*/ bool aiIfMoraleLessThan(void); /*0x0089*/ bool aiIfMoraleLessThanRandom(void); /*0x008a*/ bool aiSetAlertness(void); -/*0x008b*/ bool ai008b(void); +/*0x008b*/ bool aiAddAlertness(void); /*0x008c*/ bool ai008c(void); /*0x008d*/ bool ai008d(void); /*0x008e*/ bool ai008e(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index ddfef7ceb..3736146f4 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14092,7 +14092,7 @@ bool (*command_pointers[])(void) = { /*0x0088*/ aiIfMoraleLessThan, /*0x0089*/ aiIfMoraleLessThanRandom, /*0x008a*/ aiSetAlertness, - /*0x008b*/ ai008b, + /*0x008b*/ aiAddAlertness, /*0x008c*/ ai008c, /*0x008d*/ ai008d, /*0x008e*/ ai008e,