diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index c79e5d41d..74ce8d567 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5537,22 +5537,15 @@ glabel ai010e /** * @cmd 0098 */ -GLOBAL_ASM( -glabel ai0098 -/* f053bd4: 3c04800a */ lui $a0,0x800a -/* f053bd8: 24849fc0 */ addiu $a0,$a0,-24640 -/* f053bdc: 8c8e0434 */ lw $t6,0x434($a0) -/* f053be0: 8c8f0438 */ lw $t7,0x438($a0) -/* f053be4: 8c990424 */ lw $t9,0x424($a0) -/* f053be8: 00001025 */ or $v0,$zero,$zero -/* f053bec: 01cf1821 */ addu $v1,$t6,$t7 -/* f053bf0: 80780002 */ lb $t8,0x2($v1) -/* f053bf4: a3380003 */ sb $t8,0x3($t9) -/* f053bf8: 8c880438 */ lw $t0,0x438($a0) -/* f053bfc: 25090003 */ addiu $t1,$t0,0x3 -/* f053c00: 03e00008 */ jr $ra -/* f053c04: ac890438 */ sw $t1,0x438($a0) -); +bool aiSetReactionSpeed(void) +{ + s8 *cmd = g_Vars.ailist + g_Vars.aioffset; + + g_Vars.chrdata->speedrating = cmd[2]; + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 0099 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 9c34f5c0f..ddf5b439a 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -154,7 +154,7 @@ /*0x0095*/ bool aiSetChrNum(void); /*0x0096*/ bool ai0096(void); /*0x0097*/ bool ai0097(void); -/*0x0098*/ bool ai0098(void); +/*0x0098*/ bool aiSetReactionSpeed(void); /*0x0099*/ bool ai0099(void); /*0x009a*/ bool ai009a(void); /*0x009b*/ bool ai009b(void); diff --git a/src/include/types.h b/src/include/types.h index 6d672f296..d7299b08c 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -34,7 +34,7 @@ struct bitfielddata { struct chrdata { /*0x000*/ s16 chrnum; /*0x002*/ u8 accuracyrating; - /*0x003*/ u8 speedrating; + /*0x003*/ s8 speedrating; /*0x004*/ u16 firecount; /*0x006*/ u8 headnum; /*0x007*/ s8 actiontype; diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 09077784d..27e918745 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14105,7 +14105,7 @@ bool (*command_pointers[])(void) = { /*0x0095*/ aiSetChrNum, /*0x0096*/ ai0096, /*0x0097*/ ai0097, - /*0x0098*/ ai0098, + /*0x0098*/ aiSetReactionSpeed, /*0x0099*/ ai0099, /*0x009a*/ ai009a, /*0x009b*/ ai009b,