diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 9fb1995f4..6d3ba6838 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -14484,7 +14484,7 @@ bool aiHovercopterFireRocket(void) * @cmd 0169 */ GLOBAL_ASM( -glabel ai0169 +glabel aiIfNaturalAnim /* f05c434: 3c03800a */ lui $v1,0x800a /* f05c438: 24639fc0 */ addiu $v1,$v1,-24640 /* f05c43c: 8c640434 */ lw $a0,0x434($v1) @@ -14513,6 +14513,20 @@ glabel ai0169 /* f05c494: 00000000 */ sll $zero,$zero,0x0 ); +// Mismatch due to different temporary registers +//bool aiIfNaturalAnim(void) +//{ +// u8 *cmd = g_Vars.ailist + g_Vars.aioffset; +// +// if (g_Vars.chrdata->naturalanim == cmd[2]) { +// g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); +// } else { +// g_Vars.aioffset += 4; +// } +// +// return false; +//} + /** * @cmd 016a */ diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index abf16cc59..37e51d65a 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -338,7 +338,7 @@ /*0x0166*/ bool aiIfAction(void); /*0x0167*/ bool aiHovercopterFireRocket(void); /*0x0168*/ bool ai0168(void); -/*0x0169*/ bool ai0169(void); +/*0x0169*/ bool aiIfNaturalAnim(void); /*0x016a*/ bool ai016a(void); /*0x016b*/ bool ai016b(void); /*0x016c*/ bool ai016c(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 846d335df..414c0f839 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14314,7 +14314,7 @@ bool (*command_pointers[])(void) = { /*0x0166*/ aiIfAction, /*0x0167*/ aiHovercopterFireRocket, /*0x0168*/ ai0168, - /*0x0169*/ ai0169, + /*0x0169*/ aiIfNaturalAnim, /*0x016a*/ ai016a, /*0x016b*/ ai016b, /*0x016c*/ ai016c,