diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 74ce8d567..f05a69adc 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5550,22 +5550,15 @@ bool aiSetReactionSpeed(void) /** * @cmd 0099 */ -GLOBAL_ASM( -glabel ai0099 -/* f053c08: 3c04800a */ lui $a0,0x800a -/* f053c0c: 24849fc0 */ addiu $a0,$a0,-24640 -/* f053c10: 8c8e0434 */ lw $t6,0x434($a0) -/* f053c14: 8c8f0438 */ lw $t7,0x438($a0) -/* f053c18: 8c990424 */ lw $t9,0x424($a0) -/* f053c1c: 00001025 */ or $v0,$zero,$zero -/* f053c20: 01cf1821 */ addu $v1,$t6,$t7 -/* f053c24: 80780002 */ lb $t8,0x2($v1) -/* f053c28: a338000d */ sb $t8,0xd($t9) -/* f053c2c: 8c880438 */ lw $t0,0x438($a0) -/* f053c30: 25090003 */ addiu $t1,$t0,0x3 -/* f053c34: 03e00008 */ jr $ra -/* f053c38: ac890438 */ sw $t1,0x438($a0) -); +bool aiSetRecoverySpeed(void) +{ + s8 *cmd = g_Vars.ailist + g_Vars.aioffset; + + g_Vars.chrdata->arghrating = cmd[2]; + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 009a diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index ddf5b439a..d68fb67c7 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -155,7 +155,7 @@ /*0x0096*/ bool ai0096(void); /*0x0097*/ bool ai0097(void); /*0x0098*/ bool aiSetReactionSpeed(void); -/*0x0099*/ bool ai0099(void); +/*0x0099*/ bool aiSetRecoverySpeed(void); /*0x009a*/ bool ai009a(void); /*0x009b*/ bool ai009b(void); /*0x009c*/ bool ai009c(void); diff --git a/src/include/types.h b/src/include/types.h index d7299b08c..18377235d 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -43,7 +43,7 @@ struct chrdata { /*0x00a*/ u8 numclosearghs; /*0x00b*/ u8 numarghs; /*0x00c*/ u8 fadealpha; - /*0x00d*/ u8 arghrating; + /*0x00d*/ s8 arghrating; /*0x00e*/ u8 aimendcount; /*0x00f*/ u8 grenadeprob; /*0x010*/ u16 bodynum; diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 27e918745..223600b94 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14106,7 +14106,7 @@ bool (*command_pointers[])(void) = { /*0x0096*/ ai0096, /*0x0097*/ ai0097, /*0x0098*/ aiSetReactionSpeed, - /*0x0099*/ ai0099, + /*0x0099*/ aiSetRecoverySpeed, /*0x009a*/ ai009a, /*0x009b*/ ai009b, /*0x009c*/ ai009c,