diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index d244d8458..75ba8a6b6 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -18294,41 +18294,18 @@ bool aiIfEepromSet(void) /** * @cmd 0193 */ -GLOBAL_ASM( -glabel ai0193 -/* f05d8a4: 3c03800a */ lui $v1,0x800a -/* f05d8a8: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05d8ac: 8c6e0434 */ lw $t6,0x434($v1) -/* f05d8b0: 8c6f0438 */ lw $t7,0x438($v1) -/* f05d8b4: 27bdffe0 */ addiu $sp,$sp,-32 -/* f05d8b8: afbf0014 */ sw $ra,0x14($sp) -/* f05d8bc: 01cf3821 */ addu $a3,$t6,$t7 -/* f05d8c0: 90e40002 */ lbu $a0,0x2($a3) -/* f05d8c4: 0fc43c63 */ jal func0f10f18c -/* f05d8c8: afa7001c */ sw $a3,0x1c($sp) -/* f05d8cc: 3c03800a */ lui $v1,0x800a -/* f05d8d0: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05d8d4: 14400009 */ bnez $v0,.L0f05d8fc -/* f05d8d8: 8fa7001c */ lw $a3,0x1c($sp) -/* f05d8dc: 8c640434 */ lw $a0,0x434($v1) -/* f05d8e0: 8c650438 */ lw $a1,0x438($v1) -/* f05d8e4: 0fc13583 */ jal chraiGoToLabel -/* f05d8e8: 90e60003 */ lbu $a2,0x3($a3) -/* f05d8ec: 3c03800a */ lui $v1,0x800a -/* f05d8f0: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05d8f4: 10000004 */ beqz $zero,.L0f05d908 -/* f05d8f8: ac620438 */ sw $v0,0x438($v1) -.L0f05d8fc: -/* f05d8fc: 8c780438 */ lw $t8,0x438($v1) -/* f05d900: 27190004 */ addiu $t9,$t8,0x4 -/* f05d904: ac790438 */ sw $t9,0x438($v1) -.L0f05d908: -/* f05d908: 8fbf0014 */ lw $ra,0x14($sp) -/* f05d90c: 27bd0020 */ addiu $sp,$sp,0x20 -/* f05d910: 00001025 */ or $v0,$zero,$zero -/* f05d914: 03e00008 */ jr $ra -/* f05d918: 00000000 */ sll $zero,$zero,0x0 -); +bool aiIfEepromUnset(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + + if (!func0f10f18c(cmd[2])) { + g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + } else { + g_Vars.aioffset += 4; + } + + return false; +} /** * @cmd 019e diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index d8862f8b8..fd191fcdd 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -380,7 +380,7 @@ /*0x0190*/ bool aiEepromSet(void); /*0x0191*/ bool aiEepromUnset(void); /*0x0192*/ bool aiIfEepromSet(void); -/*0x0193*/ bool ai0193(void); +/*0x0193*/ bool aiIfEepromUnset(void); /*0x019e*/ bool ai019e(void); /*0x019f*/ bool ai019f(void); /*0x01a0*/ bool ai01a0(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index b64cb449f..dd1deac11 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14352,7 +14352,7 @@ bool (*command_pointers[])(void) = { /*0x0190*/ aiEepromSet, /*0x0191*/ aiEepromUnset, /*0x0192*/ aiIfEepromSet, - /*0x0193*/ ai0193, + /*0x0193*/ aiIfEepromUnset, /*0x0194*/ NULL, /*0x0195*/ NULL, /*0x0196*/ NULL,