diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index e72dd06e3..94baadac9 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -13654,22 +13654,14 @@ glabel ai013a /** * @cmd 013b */ -GLOBAL_ASM( -glabel ai013b -/* f05b814: 3c04800a */ lui $a0,0x800a -/* f05b818: 24849fc0 */ addiu $a0,$a0,-24640 -/* f05b81c: 8c8e0434 */ lw $t6,0x434($a0) -/* f05b820: 8c8f0438 */ lw $t7,0x438($a0) -/* f05b824: 8c990424 */ lw $t9,0x424($a0) -/* f05b828: 00001025 */ or $v0,$zero,$zero -/* f05b82c: 01cf1821 */ addu $v1,$t6,$t7 -/* f05b830: 90780002 */ lbu $t8,0x2($v1) -/* f05b834: a33802a2 */ sb $t8,0x2a2($t9) -/* f05b838: 8c880438 */ lw $t0,0x438($a0) -/* f05b83c: 25090003 */ addiu $t1,$t0,0x3 -/* f05b840: 03e00008 */ jr $ra -/* f05b844: ac890438 */ sw $t1,0x438($a0) -); +bool aiSetSquadron(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + g_Vars.chrdata->squadron = cmd[2]; + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 013c diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index b99ed9f03..d4e6b974b 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -313,7 +313,7 @@ /*0x0138*/ bool aiIfChannelIdle(void); /*0x0139*/ bool ai0139(void); /*0x013a*/ bool ai013a(void); -/*0x013b*/ bool ai013b(void); +/*0x013b*/ bool aiSetSquadron(void); /*0x013c*/ bool ai013c(void); /*0x013d*/ bool ai013d(void); /*0x013e*/ bool ai013e(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 969c0567a..043bd7747 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14268,7 +14268,7 @@ bool (*command_pointers[])(void) = { /*0x0138*/ aiIfChannelIdle, /*0x0139*/ ai0139, /*0x013a*/ ai013a, - /*0x013b*/ ai013b, + /*0x013b*/ aiSetSquadron, /*0x013c*/ ai013c, /*0x013d*/ ai013d, /*0x013e*/ ai013e,