diff --git a/asm/non_matching/leever/sub_0801FED4.inc b/asm/non_matching/leever/sub_0801FED4.inc
deleted file mode 100644
index 70d3ea26..00000000
--- a/asm/non_matching/leever/sub_0801FED4.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	bne _0801FEEA
-	adds r1, r4, #0
-	adds r1, #0x74
-	movs r0, #1
-	strh r0, [r1]
-_0801FEEA:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	movs r2, #0xf
-	adds r1, r2, #0
-	ands r1, r0
-	lsls r1, r1, #5
-	strh r1, [r4, #0x24]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0801FF28
-	ldrb r1, [r4, #0xf]
-	adds r0, r1, #1
-	strb r0, [r4, #0xf]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _0801FF4E
-	ldr r0, _0801FF24 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl sub_0800132C
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_08004596
-	b _0801FF4E
-	.align 2, 0
-_0801FF24: .4byte gUnk_020000B0
-_0801FF28:
-	adds r0, r1, #0
-	adds r0, #0x40
-	strh r0, [r4, #0x24]
-	ldrb r1, [r4, #0xf]
-	adds r0, r1, #1
-	strb r0, [r4, #0xf]
-	movs r0, #7
-	ands r0, r1
-	cmp r0, #0
-	bne _0801FF4E
-	ldr r0, _0801FF58 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl sub_0800132C
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_08004596
-_0801FF4E:
-	adds r0, r4, #0
-	bl sub_080AEF88
-	pop {r4, pc}
-	.align 2, 0
-_0801FF58: .4byte gUnk_020000B0
-.syntax divided
\ No newline at end of file
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index baefa4fd..93db5f00 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -22,115 +22,100 @@ extern Entity* gUnk_020000B0;
 extern u8 gUnk_080CA4C8[];
 extern u16 gUnk_080CA4CA[];
 extern s16 gSineTable[];
-void Leever(Entity *this)
-{
-  EnemyFunctionHandler(this, gUnk_080CA49C);
-  SetChildOffset(this, 0, 1, -0x10);
+void Leever(Entity* this) {
+    EnemyFunctionHandler(this, gUnk_080CA49C);
+    SetChildOffset(this, 0, 1, -0x10);
 }
 
-void sub_0801FC28(Entity *this)
-{
-  gUnk_080CA4B4[this->action](this);
+void sub_0801FC28(Entity* this) {
+    gUnk_080CA4B4[this->action](this);
 }
 
-void sub_0801FC40(Entity *this)
-{
-  if (this->bitfield == 0x80) {
-    if (this->action == 3) {
-      this->field_0x74 = 1;
+void sub_0801FC40(Entity* this) {
+    if (this->bitfield == 0x80) {
+        if (this->action == 3) {
+            this->field_0x74 = 1;
+        }
+    } else {
+        if (this->field_0x43 != 0) {
+            sub_0804A9FC(this, 0x1c);
+        }
     }
-  }
-  else {
-    if (this->field_0x43 != 0) {
-      sub_0804A9FC(this, 0x1c);
-    }
-  }
-  sub_0804AA30(this, gUnk_080CA49C);
+    sub_0804AA30(this, gUnk_080CA49C);
 }
 
-void sub_0801FC7C(Entity *this)
-{
-  if ((this->entityType).form == 0) {
-    sub_0804A7D4(this);
-  }
-  else {
-    CreateDeathFx(this, 0xf1, 0);
-  }
-}
-
-void sub_0801FC9C(Entity *this)
-{  
-  sub_0804A720(this);
-  this->action = 1;
-  this->actionDelay = Random();
-}
-
-void sub_0801FCB0(Entity *this)
-{
-  if (--this->actionDelay == 0) {
-    if (sub_0801FE68(this, Random() & 0x1f) != 0) {
-      this->action = 2;
-      this->spriteSettings.b.draw = TRUE;
-      this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA4C8[Random() & 1]) & 0x1f;
-      InitializeAnimation(this, 0);
-      UpdateSpriteForCollisionLayer(this);
-    }
-    else {
-      this->actionDelay = (Random() & 0x18) + 8;
-    }
-  }
-}
-
-void sub_0801FD2C(Entity *this)
-{
-  
-  GetNextFrame(this);
-
-  if (this->frames.b.f3 != 0) {
-    this->action = 3;
-    if (this->entityType.form == 0) {
-      this->field_0x74 = 0xb4;
-    }
-    else {
-      this->field_0x74 = 0x6e;
-    }
-    InitializeAnimation(this,2);
-  }
-  else if (this->frames.b.f0 != 0) {
-      this->frames.all &= 0xfe;
-      this->flags |= 0x80;
+void sub_0801FC7C(Entity* this) {
+    if ((this->entityType).form == 0) {
+        sub_0804A7D4(this);
+    } else {
+        CreateDeathFx(this, 0xf1, 0);
     }
 }
 
-void sub_0801FD80(Entity *this)
-{
-  
-  sub_0801FED4(this);
-  GetNextFrame(this);
-
-  if (--this->field_0x74 == 0) {
-    this->action = 4;
-    this->flags &= 0x7f;
-    InitializeAnimation(this, 1);
-  }
-}
-
-void sub_0801FDB4(Entity *this)
-{
-  sub_0801FED4(this);
-  GetNextFrame(this);
-  if ((this->frames.b.f3) != 0) {
+void sub_0801FC9C(Entity* this) {
+    sub_0804A720(this);
     this->action = 1;
-    this->actionDelay = 0xf0;
-    this->spriteSettings.b.draw = FALSE;
-  }
+    this->actionDelay = Random();
 }
 
-u32 sub_0801FDE4(Entity *ent, s32 x, s32 y)
-{
+void sub_0801FCB0(Entity* this) {
+    if (--this->actionDelay == 0) {
+        if (sub_0801FE68(this, Random() & 0x1f) != 0) {
+            this->action = 2;
+            this->spriteSettings.b.draw = TRUE;
+            this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA4C8[Random() & 1]) & 0x1f;
+            InitializeAnimation(this, 0);
+            UpdateSpriteForCollisionLayer(this);
+        } else {
+            this->actionDelay = (Random() & 0x18) + 8;
+        }
+    }
+}
+
+void sub_0801FD2C(Entity* this) {
+
+    GetNextFrame(this);
+
+    if (this->frames.b.f3 != 0) {
+        this->action = 3;
+        if (this->entityType.form == 0) {
+            this->field_0x74 = 0xb4;
+        } else {
+            this->field_0x74 = 0x6e;
+        }
+        InitializeAnimation(this, 2);
+    } else if (this->frames.b.f0 != 0) {
+        this->frames.all &= 0xfe;
+        this->flags |= 0x80;
+    }
+}
+
+void sub_0801FD80(Entity* this) {
+
+    sub_0801FED4(this);
+    GetNextFrame(this);
+
+    if (--this->field_0x74 == 0) {
+        this->action = 4;
+        this->flags &= 0x7f;
+        InitializeAnimation(this, 1);
+    }
+}
+
+void sub_0801FDB4(Entity* this) {
+    sub_0801FED4(this);
+    GetNextFrame(this);
+    if ((this->frames.b.f3) != 0) {
+        this->action = 1;
+        this->actionDelay = 0xf0;
+        this->spriteSettings.b.draw = FALSE;
+    }
+}
+
+u32 sub_0801FDE4(Entity* ent, s32 x, s32 y) {
     u32 uVar3;
-    u16 *puVar4;
-    
+    u16* puVar4;
+
     if (sub_080002D4(x, y, gUnk_020000B0->collisionLayer) != 0) {
         return 0;
     } else {
@@ -147,60 +132,48 @@ u32 sub_0801FDE4(Entity *ent, s32 x, s32 y)
     }
 }
 
-bool32 sub_0801FE68(Entity *ent, s32 arg2)
-{
-  s32 sin, cos;
-  s32 x, y;
-  u32 i;
+bool32 sub_0801FE68(Entity* ent, s32 arg2) {
+    s32 sin, cos;
+    s32 x, y;
+    u32 i;
 
-
-  if (sub_08049FDC(ent, 1) == 0) {
-    return 0;
-  }
-  else {
-    x = gUnk_020000B0->x.WORD;
-    y = gUnk_020000B0->y.WORD;
-    sin = gSineTable[arg2 * 8] << 11;
-    cos = gSineTable[arg2 * 8 + 0x40] << 11;
-    for (i = 0; i < 8; i++) {
-      x += sin;
-      y += -cos;
-      if (sub_0801FDE4(ent, x >> 0x10, y >> 0x10) == 0) {
-          return 0;
-      }
+    if (sub_08049FDC(ent, 1) == 0) {
+        return 0;
+    } else {
+        x = gUnk_020000B0->x.WORD;
+        y = gUnk_020000B0->y.WORD;
+        sin = gSineTable[arg2 * 8] << 11;
+        cos = gSineTable[arg2 * 8 + 0x40] << 11;
+        for (i = 0; i < 8; i++) {
+            x += sin;
+            y += -cos;
+            if (sub_0801FDE4(ent, x >> 0x10, y >> 0x10) == 0) {
+                return 0;
+            }
+        }
+        return 1;
     }
-    return 1;
-  }
 }
 
-#if NON_MATCHING
-void sub_0801FED4(Entity *this)
-{
-  s16 sVar2;
-  
-  if (sub_08049FDC(this, 1) == 0) {
-    this->field_0x74 = 1;
-  }
-  sVar2 = (this->frames.all & 0xf) * 0x20;
-  this->nonPlanarMovement = sVar2;
-  if (this->entityType.form == 0) {
-      this->field_0xf++;
-    if ((this->field_0xf & 0xf) == 0) {
-      sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
+extern u32 sub_0800132C(Entity*, Entity*);
+
+void sub_0801FED4(Entity* this) {
+    s16 sVar2;
+
+    if (sub_08049FDC(this, 1) == 0) {
+        this->field_0x74 = 1;
     }
-  }
-  else {
-    this->nonPlanarMovement = sVar2 + 0x40;
-    this->field_0xf++;
-    if ((this->field_0xf & 0x7) == 0) {
-      sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
+    sVar2 = (this->frames.all & 0xf) * 0x20;
+    this->nonPlanarMovement = sVar2;
+    if (this->entityType.form == 0) {
+        if ((this->field_0xf++ & 0xf) == 0) {
+            sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
+        }
+    } else {
+        this->nonPlanarMovement = sVar2 + 0x40;
+        if ((this->field_0xf++ & 0x7) == 0) {
+            sub_08004596(this, sub_0800132C(this, gUnk_020000B0));
+        }
     }
-  }
-  sub_080AEF88(this);
+    sub_080AEF88(this);
 }
-#else
-NAKED
-void sub_0801FED4(Entity *this) {
-    asm(".include \"asm/non_matching/leever/sub_0801FED4.inc\"");
-}
-#endif
\ No newline at end of file