diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index a19f7fe10..f40a8c175 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -14081,22 +14081,13 @@ bool aiRebuildTeams(void) /** * @cmd 0146 */ -GLOBAL_ASM( -glabel ai0146 -/* f05be6c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f05be70: afbf0014 */ sw $ra,0x14($sp) -/* f05be74: 0fc13341 */ jal func0f04cd04 -/* f05be78: 00000000 */ sll $zero,$zero,0x0 -/* f05be7c: 3c03800a */ lui $v1,0x800a -/* f05be80: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05be84: 8c6e0438 */ lw $t6,0x438($v1) -/* f05be88: 8fbf0014 */ lw $ra,0x14($sp) -/* f05be8c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f05be90: 25cf0002 */ addiu $t7,$t6,0x2 -/* f05be94: ac6f0438 */ sw $t7,0x438($v1) -/* f05be98: 03e00008 */ jr $ra -/* f05be9c: 00001025 */ or $v0,$zero,$zero -); +bool aiRebuildSquadrons(void) +{ + func0f04cd04(); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 0147 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index ca52e4ff5..2bdb54aa1 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -324,7 +324,7 @@ /*0x0143*/ bool ai0143(void); /*0x0144*/ bool ai0144(void); /*0x0145*/ bool aiRebuildTeams(void); -/*0x0146*/ bool ai0146(void); +/*0x0146*/ bool aiRebuildSquadrons(void); /*0x0147*/ bool ai0147(void); /*0x0148*/ bool ai0148(void); /*0x0149*/ bool ai0149(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 44970d938..fe450b226 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14279,7 +14279,7 @@ bool (*command_pointers[])(void) = { /*0x0143*/ ai0143, /*0x0144*/ ai0144, /*0x0145*/ aiRebuildTeams, - /*0x0146*/ ai0146, + /*0x0146*/ aiRebuildSquadrons, /*0x0147*/ ai0147, /*0x0148*/ ai0148, /*0x0149*/ ai0149,