diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 332aaba49..d3ab143f9 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1158,23 +1158,13 @@ bool aiSurrender(void) /** * @cmd 0025 */ -GLOBAL_ASM( -glabel ai0025 -/* f04f1b4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f04f1b8: afbf0014 */ sw $ra,0x14($sp) -/* f04f1bc: 3c04800a */ lui $a0,0x800a -/* f04f1c0: 0fc0ea83 */ jal func0f03aa0c -/* f04f1c4: 8c84a3e4 */ lw $a0,-0x5c1c($a0) -/* f04f1c8: 3c03800a */ lui $v1,0x800a -/* f04f1cc: 24639fc0 */ addiu $v1,$v1,-24640 -/* f04f1d0: 8c6e0438 */ lw $t6,0x438($v1) -/* f04f1d4: 8fbf0014 */ lw $ra,0x14($sp) -/* f04f1d8: 27bd0018 */ addiu $sp,$sp,0x18 -/* f04f1dc: 25cf0002 */ addiu $t7,$t6,0x2 -/* f04f1e0: ac6f0438 */ sw $t7,0x438($v1) -/* f04f1e4: 03e00008 */ jr $ra -/* f04f1e8: 00001025 */ or $v0,$zero,$zero -); +bool aiFadeOut(void) +{ + func0f03aa0c(g_Vars.chrdata); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 0026 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index efde4872b..072d950a6 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -40,7 +40,7 @@ /*0x0022*/ bool ai0022(void); /*0x0023*/ bool ai0023(void); /*0x0024*/ bool aiSurrender(void); -/*0x0025*/ bool ai0025(void); +/*0x0025*/ bool aiFadeOut(void); /*0x0026*/ bool ai0026(void); /*0x0027*/ bool ai0027(void); /*0x0028*/ bool ai0028(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index b83b51c2d..e710b18e4 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -13986,7 +13986,7 @@ bool (*command_pointers[])(void) = { /*0x0022*/ ai0022, /*0x0023*/ ai0023, /*0x0024*/ aiSurrender, - /*0x0025*/ ai0025, + /*0x0025*/ aiFadeOut, /*0x0026*/ ai0026, /*0x0027*/ ai0027, /*0x0028*/ ai0028,