diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index e1ce58e93..81abd895a 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1215,22 +1215,13 @@ bool aiActivateAlarm(void) /** * @cmd 0029 */ -GLOBAL_ASM( -glabel ai0029 -/* f04f314: 27bdffe8 */ addiu $sp,$sp,-24 -/* f04f318: afbf0014 */ sw $ra,0x14($sp) -/* f04f31c: 0fc24105 */ jal func0f090414 -/* f04f320: 00000000 */ sll $zero,$zero,0x0 -/* f04f324: 3c03800a */ lui $v1,0x800a -/* f04f328: 24639fc0 */ addiu $v1,$v1,-24640 -/* f04f32c: 8c6e0438 */ lw $t6,0x438($v1) -/* f04f330: 8fbf0014 */ lw $ra,0x14($sp) -/* f04f334: 27bd0018 */ addiu $sp,$sp,0x18 -/* f04f338: 25cf0002 */ addiu $t7,$t6,0x2 -/* f04f33c: ac6f0438 */ sw $t7,0x438($v1) -/* f04f340: 03e00008 */ jr $ra -/* f04f344: 00001025 */ or $v0,$zero,$zero -); +bool aiDeactivateAlarm(void) +{ + func0f090414(); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 002a diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index cb422a386..8da46e67c 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -44,7 +44,7 @@ /*0x0026*/ bool aiRemoveChr(void); /*0x0027*/ bool ai0027(void); /*0x0028*/ bool aiActivateAlarm(void); -/*0x0029*/ bool ai0029(void); +/*0x0029*/ bool aiDeactivateAlarm(void); /*0x002a*/ bool ai002a(void); /*0x002b*/ bool ai002b(void); /*0x002c*/ bool ai002c(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 3b0589dfe..502de7d82 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -13990,7 +13990,7 @@ bool (*command_pointers[])(void) = { /*0x0026*/ aiRemoveChr, /*0x0027*/ ai0027, /*0x0028*/ aiActivateAlarm, - /*0x0029*/ ai0029, + /*0x0029*/ aiDeactivateAlarm, /*0x002a*/ ai002a, /*0x002b*/ ai002b, /*0x002c*/ ai002c,