diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 228afbc9a..12dfce426 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -7763,18 +7763,13 @@ bool aiRestartTimer(void) /** * @cmd 00b7 */ -GLOBAL_ASM( -glabel ai00b7 -/* f054f94: 3c03800a */ lui $v1,0x800a -/* f054f98: 24639fc0 */ addiu $v1,$v1,-24640 -/* f054f9c: 8c6e0424 */ lw $t6,0x424($v1) -/* f054fa0: 00001025 */ or $v0,$zero,$zero -/* f054fa4: adc0011c */ sw $zero,0x11c($t6) -/* f054fa8: 8c6f0438 */ lw $t7,0x438($v1) -/* f054fac: 25f80002 */ addiu $t8,$t7,0x2 -/* f054fb0: 03e00008 */ jr $ra -/* f054fb4: ac780438 */ sw $t8,0x438($v1) -); +bool aiResetTimer(void) +{ + g_Vars.chrdata->timer60 = 0; + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 00b8 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index cdc9cce7f..51e2a816d 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -185,7 +185,7 @@ /*0x00b4*/ bool ai00b4(void); /*0x00b5*/ bool ai00b5(void); /*0x00b6*/ bool aiRestartTimer(void); -/*0x00b7*/ bool ai00b7(void); +/*0x00b7*/ bool aiResetTimer(void); /*0x00b8*/ bool ai00b8(void); /*0x00b9*/ bool ai00b9(void); /*0x00ba*/ bool ai00ba(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 6a2a73ac0..a528f1c0c 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14132,7 +14132,7 @@ bool (*command_pointers[])(void) = { /*0x00b4*/ ai00b4, /*0x00b5*/ ai00b5, /*0x00b6*/ aiRestartTimer, - /*0x00b7*/ ai00b7, + /*0x00b7*/ aiResetTimer, /*0x00b8*/ ai00b8, /*0x00b9*/ ai00b9, /*0x00ba*/ ai00ba,