diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index c6aff478a..ceecb052c 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -17505,35 +17505,19 @@ bool aiSetObjPartVisible(void) /** * @cmd 01d2 */ -GLOBAL_ASM( -glabel ai01d2 -/* f05f58c: 3c03800a */ lui $v1,0x800a -/* f05f590: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05f594: 8c6e0434 */ lw $t6,0x434($v1) -/* f05f598: 8c6f0438 */ lw $t7,0x438($v1) -/* f05f59c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f05f5a0: afbf0014 */ sw $ra,0x14($sp) -/* f05f5a4: 01cf1021 */ addu $v0,$t6,$t7 -/* f05f5a8: 90450002 */ lbu $a1,0x2($v0) -/* f05f5ac: 0fc126d1 */ jal chrFindById -/* f05f5b0: 8c640424 */ lw $a0,0x424($v1) -/* f05f5b4: 3c03800a */ lui $v1,0x800a -/* f05f5b8: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05f5bc: 10400005 */ beqz $v0,.L0f05f5d4 -/* f05f5c0: 00402025 */ or $a0,$v0,$zero -/* f05f5c4: 0fc1352f */ jal func0f04d4bc -/* f05f5c8: 00000000 */ sll $zero,$zero,0x0 -/* f05f5cc: 3c03800a */ lui $v1,0x800a -/* f05f5d0: 24639fc0 */ addiu $v1,$v1,-24640 -.L0f05f5d4: -/* f05f5d4: 8c780438 */ lw $t8,0x438($v1) -/* f05f5d8: 8fbf0014 */ lw $ra,0x14($sp) -/* f05f5dc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f05f5e0: 27190003 */ addiu $t9,$t8,0x3 -/* f05f5e4: ac790438 */ sw $t9,0x438($v1) -/* f05f5e8: 03e00008 */ jr $ra -/* f05f5ec: 00001025 */ or $v0,$zero,$zero -); +bool aiChrEmitSparks(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + + if (chr) { + func0f04d4bc(chr); + } + + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 01d3 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index e4aa3af50..ca07e8de0 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -429,7 +429,7 @@ /*0x01cf*/ bool ai01cf(void); /*0x01d0*/ bool ai01d0(void); /*0x01d1*/ bool aiSetObjPartVisible(void); -/*0x01d2*/ bool ai01d2(void); +/*0x01d2*/ bool aiChrEmitSparks(void); /*0x01d3*/ bool ai01d3(void); /*0x01d4*/ bool ai01d4(void); /*0x01d5*/ bool ai01d5(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 1f7905234..50d3ee158 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14419,7 +14419,7 @@ bool (*command_pointers[])(void) = { /*0x01cf*/ ai01cf, /*0x01d0*/ ai01d0, /*0x01d1*/ aiSetObjPartVisible, - /*0x01d2*/ ai01d2, + /*0x01d2*/ aiChrEmitSparks, /*0x01d3*/ ai01d3, /*0x01d4*/ ai01d4, /*0x01d5*/ ai01d5,