diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index b9c6a08ab..b7dff420c 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -12096,61 +12096,28 @@ bool aiIfSoundTimer(void)
 /**
  * @cmd 0187
  */
-GLOBAL_ASM(
-glabel ai0187
-/*  f05d0fc:	27bdffd8 */ 	addiu	$sp,$sp,-40
-/*  f05d100:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f05d104:	3c10800a */ 	lui	$s0,%hi(g_Vars)
-/*  f05d108:	26109fc0 */ 	addiu	$s0,$s0,%lo(g_Vars)
-/*  f05d10c:	8e020438 */ 	lw	$v0,0x438($s0)
-/*  f05d110:	8e0e0434 */ 	lw	$t6,0x434($s0)
-/*  f05d114:	8e040424 */ 	lw	$a0,0x424($s0)
-/*  f05d118:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f05d11c:	01c27821 */ 	addu	$t7,$t6,$v0
-/*  f05d120:	afaf0024 */ 	sw	$t7,0x24($sp)
-/*  f05d124:	8498017e */ 	lh	$t8,0x17e($a0)
-/*  f05d128:	a7b80022 */ 	sh	$t8,0x22($sp)
-/*  f05d12c:	9499032e */ 	lhu	$t9,0x32e($a0)
-/*  f05d130:	00194382 */ 	srl	$t0,$t9,0xe
-/*  f05d134:	00084880 */ 	sll	$t1,$t0,0x2
-/*  f05d138:	02095021 */ 	addu	$t2,$s0,$t1
-/*  f05d13c:	8d4b0064 */ 	lw	$t3,0x64($t2)
-/*  f05d140:	24490003 */ 	addiu	$t1,$v0,0x3
-/*  f05d144:	8d630480 */ 	lw	$v1,0x480($t3)
-/*  f05d148:	50600019 */ 	beqzl	$v1,.L0f05d1b0
-/*  f05d14c:	ae090438 */ 	sw	$t1,0x438($s0)
-/*  f05d150:	8c6c0000 */ 	lw	$t4,0x0($v1)
-/*  f05d154:	8d820004 */ 	lw	$v0,0x4($t4)
-/*  f05d158:	0fc12705 */ 	jal	propGetIndexByChrId
-/*  f05d15c:	84450000 */ 	lh	$a1,0x0($v0)
-/*  f05d160:	8e0d0424 */ 	lw	$t5,0x424($s0)
-/*  f05d164:	a5a2017e */ 	sh	$v0,0x17e($t5)
-/*  f05d168:	0fc0e5e3 */ 	jal	func0f03978c
-/*  f05d16c:	8e040424 */ 	lw	$a0,0x424($s0)
-/*  f05d170:	10400007 */ 	beqz	$v0,.L0f05d190
-/*  f05d174:	8fae0024 */ 	lw	$t6,0x24($sp)
-/*  f05d178:	8e040434 */ 	lw	$a0,0x434($s0)
-/*  f05d17c:	8e050438 */ 	lw	$a1,0x438($s0)
-/*  f05d180:	0fc13583 */ 	jal	chraiGoToLabel
-/*  f05d184:	91c60002 */ 	lbu	$a2,0x2($t6)
-/*  f05d188:	10000009 */ 	beqz	$zero,.L0f05d1b0
-/*  f05d18c:	ae020438 */ 	sw	$v0,0x438($s0)
-.L0f05d190:
-/*  f05d190:	8e0f0438 */ 	lw	$t7,0x438($s0)
-/*  f05d194:	87b90022 */ 	lh	$t9,0x22($sp)
-/*  f05d198:	8e080424 */ 	lw	$t0,0x424($s0)
-/*  f05d19c:	25f80003 */ 	addiu	$t8,$t7,0x3
-/*  f05d1a0:	ae180438 */ 	sw	$t8,0x438($s0)
-/*  f05d1a4:	10000002 */ 	beqz	$zero,.L0f05d1b0
-/*  f05d1a8:	a519017e */ 	sh	$t9,0x17e($t0)
-/*  f05d1ac:	ae090438 */ 	sw	$t1,0x438($s0)
-.L0f05d1b0:
-/*  f05d1b0:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f05d1b4:	8fb00018 */ 	lw	$s0,0x18($sp)
-/*  f05d1b8:	27bd0028 */ 	addiu	$sp,$sp,0x28
-/*  f05d1bc:	03e00008 */ 	jr	$ra
-/*  f05d1c0:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiSetTargetToEyespyIfInSight(void)
+{
+	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
+	s16 prevtarget = g_Vars.chrdata->target;
+	struct eyespy *eyespy = g_Vars.players[g_Vars.chrdata->p1p2]->eyespy;
+
+	if (eyespy) {
+		struct chrdata *chr = eyespy->prop->chr;
+		g_Vars.chrdata->target = propGetIndexByChrId(g_Vars.chrdata, chr->chrnum);
+
+		if (func0f03978c(g_Vars.chrdata)) {
+			g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
+		} else {
+			g_Vars.aioffset += 3;
+			g_Vars.chrdata->target = prevtarget;
+		}
+	} else {
+		g_Vars.aioffset += 3;
+	}
+
+	return false;
+}
 
 /**
  * @cmd 0188
diff --git a/src/game/data/ailists.c b/src/game/data/ailists.c
index 5d80d2f16..ea0f88c08 100644
--- a/src/game/data/ailists.c
+++ b/src/game/data/ailists.c
@@ -211,7 +211,7 @@ u8 func0006_unalerted[] = {
 
 	// Check if can see camspy
 	label(0x16)
-	if_chr_sees_camspy_maybe(/*goto*/ 0x16)
+	set_target_to_camspy_if_in_sight(/*goto*/ 0x16)
 	dprint 'E','S',' ','N','O','V','I','S','\n',0,
 	goto_next(0x13)
 
diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c
index ea9869a81..4d3c83dd3 100644
--- a/src/game/data/data_0083d0.c
+++ b/src/game/data/data_0083d0.c
@@ -6610,7 +6610,7 @@ bool (*g_CommandPointers[])(void) = {
 	/*0x0184*/ ai0184,
 	/*0x0185*/ ai0185,
 	/*0x0186*/ aiIfSoundTimer,
-	/*0x0187*/ ai0187,
+	/*0x0187*/ aiSetTargetToEyespyIfInSight,
 	/*0x0188*/ aiIfLiftStationary,
 	/*0x0189*/ aiLiftGoToStop,
 	/*0x018a*/ aiIfLiftAtStop,
diff --git a/src/include/commands.h b/src/include/commands.h
index 71338f4b3..48a5b6687 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -3138,7 +3138,14 @@
 	operator, \
 	label,
 
-#define if_chr_sees_camspy_maybe(label) \
+/**
+ * Checks if the current chr can see the player's camspy. If they can, their
+ * target is changed to the camspy and the label will be followed.
+ *
+ * This command respects the chr's p1p2 property, meaning in coop mode this must
+ * be set to the player whose camspy should be checked.
+ */
+#define set_target_to_camspy_if_in_sight(label) \
 	mkshort(0x0187), \
 	label,
 
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index 94f4e6b65..881691dea 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -368,7 +368,7 @@
 /*0x0184*/ bool ai0184(void);
 /*0x0185*/ bool ai0185(void);
 /*0x0186*/ bool aiIfSoundTimer(void);
-/*0x0187*/ bool ai0187(void);
+/*0x0187*/ bool aiSetTargetToEyespyIfInSight(void);
 /*0x0188*/ bool aiIfLiftStationary(void);
 /*0x0189*/ bool aiLiftGoToStop(void);
 /*0x018a*/ bool aiIfLiftAtStop(void);