diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index bc1cfb644..8c210391b 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -14425,7 +14425,7 @@ bool aiIfChrInjured(void) * @cmd 0166 */ GLOBAL_ASM( -glabel ai0166 +glabel aiIfAction /* f05c384: 3c03800a */ lui $v1,0x800a /* f05c388: 24639fc0 */ addiu $v1,$v1,-24640 /* f05c38c: 8c640434 */ lw $a0,0x434($v1) @@ -14454,6 +14454,20 @@ glabel ai0166 /* f05c3e4: 00000000 */ sll $zero,$zero,0x0 ); +// Mismatch due to different temporary registers +//bool aiIfAction(void) +//{ +// u8 *cmd = g_Vars.ailist + g_Vars.aioffset; +// +// if (g_Vars.chrdata->myaction == cmd[2]) { +// g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); +// } else { +// g_Vars.aioffset += 4; +// } +// +// return false; +//} + /** * @cmd 0167 */ diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 054d38235..15ac8a18d 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -335,7 +335,7 @@ /*0x015b*/ bool aiAudioPlayMusic(void); /*0x015c*/ bool aiAudioRestartMusic(void); /*0x0165*/ bool aiIfChrInjured(void); -/*0x0166*/ bool ai0166(void); +/*0x0166*/ bool aiIfAction(void); /*0x0167*/ bool ai0167(void); /*0x0168*/ bool ai0168(void); /*0x0169*/ bool ai0169(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 8a7e7f7f9..979273bc9 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14311,7 +14311,7 @@ bool (*command_pointers[])(void) = { /*0x0163*/ NULL, /*0x0164*/ NULL, /*0x0165*/ aiIfChrInjured, - /*0x0166*/ ai0166, + /*0x0166*/ aiIfAction, /*0x0167*/ ai0167, /*0x0168*/ ai0168, /*0x0169*/ ai0169,