diff --git a/asm/non_matching/moldworm/Moldworm.inc b/asm/non_matching/moldworm/Moldworm.inc
deleted file mode 100644
index 55289bb4..00000000
--- a/asm/non_matching/moldworm/Moldworm.inc
+++ /dev/null
@@ -1,83 +0,0 @@
-
-	.syntax unified
-
-	.text
-
-
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldrh r5, [r4, #0x2e]
-	ldrh r6, [r4, #0x32]
-	ldrb r1, [r4, #0xa]
-	cmp r1, #0
-	bne _0802306C
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	beq _08023052
-	adds r0, r4, #0
-	bl sub_0802390C
-_08023052:
-	adds r0, r4, #0
-	adds r0, #0x7c
-	ldrb r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x7d
-	strb r0, [r1]
-	ldr r1, _08023068 @ =Moldworm_Functions
-	adds r0, r4, #0
-	bl EnemyFunctionHandler
-	b _08023090
-	.align 2, 0
-_08023068: .4byte Moldworm_Functions
-_0802306C:
-	ldr r0, [r4, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	beq _08023088
-	cmp r1, #8
-	beq _08023080
-	adds r0, r4, #0
-	bl sub_080235BC
-	b _08023090
-_08023080:
-	adds r0, r4, #0
-	bl sub_08023730
-	b _08023090
-_08023088:
-	adds r0, r4, #0
-	bl DeleteEntity
-	b _080230CA
-_08023090:
-	ldr r0, [r4, #0x50]
-	adds r2, r0, #0
-	adds r2, #0x7c
-	adds r0, #0x7d
-	ldrb r1, [r2]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _080230CA
-	ldr r1, [r4, #0x54]
-	cmp r1, #0
-	beq _080230CA
-	ldrb r2, [r2]
-	subs r2, #1
-	movs r0, #0xf
-	ands r2, r0
-	adds r2, #0x78
-	adds r2, r1, r2
-	ldrh r1, [r4, #0x2e]
-	subs r1, r1, r5
-	adds r1, #8
-	movs r3, #0xf
-	ands r1, r3
-	lsls r1, r1, #4
-	ldrh r0, [r4, #0x32]
-	subs r0, r0, r6
-	adds r0, #8
-	ands r0, r3
-	orrs r1, r0
-	strb r1, [r2]
-_080230CA:
-	pop {r4, r5, r6, pc}
-
-	.syntax divided
diff --git a/asm/non_matching/moldworm/sub_080239F0.inc b/asm/non_matching/moldworm/sub_080239F0.inc
deleted file mode 100644
index 93034e9e..00000000
--- a/asm/non_matching/moldworm/sub_080239F0.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-
-	.syntax unified
-
-	.text
-
-	adds r2, r0, #0
-	adds r1, r2, #0
-	adds r1, #0x78
-	movs r0, #0x88
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	adds r1, #1
-	strb r0, [r1]
-	bx lr
-
-	.syntax divided
diff --git a/asm/non_matching/moldworm/sub_08023B38.inc b/asm/non_matching/moldworm/sub_08023B38.inc
deleted file mode 100644
index 98faa12a..00000000
--- a/asm/non_matching/moldworm/sub_08023B38.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-
-	.syntax unified
-
-	.text
-
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	bl sub_08049DF4
-	adds r5, r0, #0
-	cmp r5, #0
-	bne _08023B4C
-	movs r0, #0
-	b _08023B8E
-_08023B4C:
-	movs r0, #0x2e
-	ldrsh r2, [r4, r0]
-	ldr r3, _08023B90 @ =gUnk_080CBCB8
-	ldrb r0, [r4, #0x14]
-	lsls r0, r0, #1
-	adds r1, r0, r3
-	ldrb r1, [r1]
-	lsls r1, r1, #0x18
-	asrs r1, r1, #0x18
-	adds r2, r2, r1
-	movs r6, #0x32
-	ldrsh r1, [r4, r6]
-	adds r0, #1
-	adds r0, r0, r3
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	adds r1, r1, r0
-	movs r3, #0
-	movs r4, #0x2e
-	ldrsh r0, [r5, r4]
-	subs r0, r0, r2
-	adds r0, #0x14
-	cmp r0, #0x28
-	bhi _08023B8C
-	movs r6, #0x32
-	ldrsh r0, [r5, r6]
-	subs r0, r0, r1
-	adds r0, #0x14
-	cmp r0, #0x28
-	bhi _08023B8C
-	movs r3, #1
-_08023B8C:
-	adds r0, r3, #0
-_08023B8E:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08023B90: .4byte gUnk_080CBCB8
-
-	.syntax divided
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index 8ae79c29..d9d9c6ae 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -31,7 +31,7 @@ extern void (*const gUnk_080CBC98[])(Entity*);
 extern void (*const gUnk_080CBCA8[])(Entity*);
 extern const s8 gUnk_080CBCB8[];
 
-NONMATCH("asm/non_matching/moldworm/Moldworm.inc", void Moldworm(Entity* this)) {
+void Moldworm(Entity* this) {
     u16 prevX = this->x.HALF.HI;
     u16 prevY = this->y.HALF.HI;
 
@@ -55,11 +55,11 @@ NONMATCH("asm/non_matching/moldworm/Moldworm.inc", void Moldworm(Entity* this))
     }
 
     if (this->parent->field_0x7c.BYTES.byte0 != this->parent->field_0x7c.BYTES.byte1 && this->child) {
-        ((u8*)&this->child->field_0x78)[(this->parent->field_0x7c.BYTES.byte0 - 1) & 0xf] =
-            (((this->x.HALF.HI - prevX + 8) & 0xf) << 4) | ((this->y.HALF.HI - prevY + 8U) & 0xf);
+        u32 temp = (this->parent->field_0x7c.BYTES.byte0 - 1) & 0xf;
+        u8* ptr = (u8*)&this->child->field_0x78 + temp;
+        *ptr = (((this->x.HALF.HI - prevX + 8) & 0xf) << 4) | ((this->y.HALF.HI - prevY + 8U) & 0xf);
     }
 }
-END_NONMATCH
 
 void Moldworm_OnTick(Entity* this) {
     gUnk_080CBC50[this->action](this);
@@ -469,8 +469,24 @@ void sub_08023990(Entity* this, u32 param_2, u32 param_3) {
     } while (ent = ent->child, ent != NULL);
 }
 
-/* TODO: fix struct */
-ASM_FUNC("asm/non_matching/moldworm/sub_080239F0.inc", void sub_080239F0(Entity* this))
+void sub_080239F0(Entity* this) {
+    *(u8*)&this->field_0x78 = 0x88;
+    *(u8*)((int)&this->field_0x78 + 1) = 0x88;
+    *(u8*)&this->field_0x7a = 0x88;
+    *(u8*)((int)&this->field_0x7a + 1) = 0x88;
+    *(u8*)&this->field_0x7c = 0x88;
+    *(u8*)((int)&this->field_0x7c + 1) = 0x88;
+    *(u8*)((int)&this->field_0x7c + 2) = 0x88;
+    *(u8*)((int)&this->field_0x7c + 3) = 0x88;
+    *(u8*)&this->field_0x80 = 0x88;
+    *(u8*)((int)&this->field_0x80 + 1) = 0x88;
+    *(u8*)&this->field_0x82 = 0x88;
+    *(u8*)((int)&this->field_0x82 + 1) = 0x88;
+    *(u8*)&this->cutsceneBeh = 0x88;
+    *(u8*)((int)&this->cutsceneBeh + 1) = 0x88;
+    *(u8*)&this->field_0x86 = 0x88;
+    *(u8*)((int)&this->field_0x86 + 1) = 0x88;
+}
 
 bool32 sub_08023A38(u32 unk) {
     if (unk == 0x1a || unk == 0x29) {
@@ -517,7 +533,27 @@ void sub_08023AB0(Entity* this) {
     }
 }
 
-ASM_FUNC("asm/non_matching/moldworm/sub_08023B38.inc", bool32 sub_08023B38(Entity* this))
+bool32 sub_08023B38(Entity* this) {
+    Entity* entity;
+    bool32 result;
+    s32 iVar2;
+    const s8* ptr;
+    u32 tmp1;
+    u32 tmp2;
+
+    entity = sub_08049DF4(1);
+    if (entity == NULL) {
+        return FALSE;
+    } else {
+        tmp1 = (this->x.HALF.HI + (gUnk_080CBCB8[this->animationState * 2 + 0]));
+        tmp2 = (this->y.HALF.HI + (gUnk_080CBCB8[this->animationState * 2 + 1]));
+        result = FALSE;
+        if ((entity->x.HALF.HI - tmp1 + 0x14U < 0x29) && (entity->y.HALF.HI - tmp2 + 0x14U < 0x29)) {
+            result = TRUE;
+        }
+        return result;
+    }
+}
 
 // clang-format off
 void (*const Moldworm_Functions[])(Entity*) = {