diff --git a/asm/non_matching/sub_0806FOA4.inc b/asm/non_matching/sub_0806FOA4.inc
deleted file mode 100644
index 18771681..00000000
--- a/asm/non_matching/sub_0806FOA4.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-    .syntax unified
-	push {r4, r5, r6, r7, lr}
-	sub sp, #4
-	ldr r7, _0806F114 @ =gEntityLists + 56
-	ldr r5, [r7, #4]
-	movs r0, #0
-	cmp r5, r7
-	beq _0806F0BA
-_0806F0B2:
-	adds r0, #1
-	ldr r5, [r5, #4]
-	cmp r5, r7
-	bne _0806F0B2
-_0806F0BA:
-	cmp r0, #1
-	bls _0806F10E
-	ldr r5, [r7, #4]
-	cmp r5, r7
-	beq _0806F10E
-	movs r2, #1
-_0806F0C6:
-	ldrb r1, [r5, #0x10]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _0806F108
-	ldrb r1, [r5, #0x17]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _0806F108
-	ldr r4, [r5, #4]
-	cmp r4, r7
-	beq _0806F108
-	movs r6, #1
-_0806F0E2:
-	ldrb r1, [r4, #0x10]
-	adds r0, r6, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _0806F102
-	ldrb r1, [r4, #0x17]
-	adds r0, r6, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _0806F102
-	adds r0, r5, #0
-	adds r1, r4, #0
-	str r2, [sp]
-	bl sub_08004484
-	ldr r2, [sp]
-_0806F102:
-	ldr r4, [r4, #4]
-	cmp r4, r7
-	bne _0806F0E2
-_0806F108:
-	ldr r5, [r5, #4]
-	cmp r5, r7
-	bne _0806F0C6
-_0806F10E:
-	add sp, #4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0806F114: .4byte gEntityLists + 56
-    .syntax divided
diff --git a/src/npcUtils.c b/src/npcUtils.c
index f1b97dd6..c0f4264b 100644
--- a/src/npcUtils.c
+++ b/src/npcUtils.c
@@ -275,7 +275,35 @@ s32 sub_0806F078(Entity* ent, s32 a2) {
     return 0;
 }
 
-ASM_FUNC("asm/non_matching/sub_0806FOA4.inc", void sub_0806F0A4(void));
+void sub_0806F0A4(void) {
+    LinkedList* entityList = gEntityLists + 7;
+    Entity* currentEntity;
+    u32 val;
+
+    for (currentEntity = entityList->first, val = 0; currentEntity != (Entity*)entityList;
+         currentEntity = currentEntity->next) {
+        val++;
+    }
+
+    if (val <= 1)
+        return;
+
+    for (currentEntity = entityList->first; currentEntity != (Entity*)entityList; currentEntity = currentEntity->next) {
+        Entity* nextEnt;
+        if ((currentEntity->flags & 1) == 0)
+            continue;
+        if ((currentEntity->field_0x17 & 1) == 0)
+            continue;
+
+        for (nextEnt = currentEntity->next; nextEnt != (Entity*)entityList; nextEnt = nextEnt->next) {
+            if ((nextEnt->flags & 1) == 0)
+                continue;
+            if ((nextEnt->field_0x17 & 1) == 0)
+                continue;
+            sub_08004484(currentEntity, nextEnt);
+        }
+    }
+}
 
 void sub_0806F118(Entity* ent) {
     u32 idx = sub_08002632(ent);