diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 03a74b4c7..f54a0d7b6 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -1546,28 +1546,15 @@ bool aiRunToPad(void)
 /**
  * @cmd 0021
  */
-GLOBAL_ASM(
-glabel ai0021
-/*  f04fa34:	3c03800a */ 	lui	$v1,0x800a
-/*  f04fa38:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f04fa3c:	8c6e0434 */ 	lw	$t6,0x434($v1)
-/*  f04fa40:	8c6f0438 */ 	lw	$t7,0x438($v1)
-/*  f04fa44:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f04fa48:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f04fa4c:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f04fa50:	90450002 */ 	lbu	$a1,0x2($v0)
-/*  f04fa54:	0fc0ea57 */ 	jal	func0f03a95c
-/*  f04fa58:	8c640424 */ 	lw	$a0,0x424($v1)
-/*  f04fa5c:	3c03800a */ 	lui	$v1,0x800a
-/*  f04fa60:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f04fa64:	8c780438 */ 	lw	$t8,0x438($v1)
-/*  f04fa68:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f04fa6c:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f04fa70:	27190003 */ 	addiu	$t9,$t8,0x3
-/*  f04fa74:	ac790438 */ 	sw	$t9,0x438($v1)
-/*  f04fa78:	03e00008 */ 	jr	$ra
-/*  f04fa7c:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiSetPath(void)
+{
+	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
+
+	func0f03a95c(g_Vars.chrdata, cmd[2]);
+	g_Vars.aioffset += 3;
+
+	return false;
+}
 
 /**
  * @cmd 0022
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index 31620431d..0049c07ed 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -36,7 +36,7 @@
 /*0x001e*/ bool aiGoToPadPreset(void);
 /*0x001f*/ bool aiWalkToPad(void);
 /*0x0020*/ bool aiRunToPad(void);
-/*0x0021*/ bool ai0021(void);
+/*0x0021*/ bool aiSetPath(void);
 /*0x0022*/ bool ai0022(void);
 /*0x0023*/ bool ai0023(void);
 /*0x0024*/ bool aiSurrender(void);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index f960e2dd7..e18ef4661 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -13982,7 +13982,7 @@ bool (*command_pointers[])(void) = {
 	/*0x001e*/ aiGoToPadPreset,
 	/*0x001f*/ aiWalkToPad,
 	/*0x0020*/ aiRunToPad,
-	/*0x0021*/ ai0021,
+	/*0x0021*/ aiSetPath,
 	/*0x0022*/ ai0022,
 	/*0x0023*/ ai0023,
 	/*0x0024*/ aiSurrender,