decompile chuchu

9 files changed, 766 insertions, 8 deletions

diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index e3c3d9be..2d767f8a 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -13,7 +13,6 @@ extern u32 sub_080322A4(Entity*);
 void sub_080322E8(Entity*);
 extern void sub_08032338(Entity*);
 extern Entity* sub_08049DF4(u32);
-extern void sub_0804A9FC(Entity*, u32);
 extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
 extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
 extern u32 GetNextFunction(Entity*);
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
new file mode 100644
index 00000000..8dc5948c
--- /dev/null
+++ b/src/enemy/chuchu.c
@@ -0,0 +1,764 @@
+#include "enemy.h"
+#include "entity.h"
+#include "functions.h"
+
+extern s32 sub_080012DC(Entity*);
+extern void sub_08001318(Entity*);
+extern void sub_080043A8(Entity*);
+extern u32 sub_08049F1C(Entity*, Entity*, u32);
+extern u32 sub_08049F64(Entity*, u32, u32);
+extern void sub_0804AA1C(Entity*);
+extern void sub_080AF160(Entity*);
+
+extern Entity* gUnk_020000B0;
+
+void sub_0801F328(Entity*);
+void sub_0801F340(Entity*);
+void sub_0801F360(Entity*);
+void sub_0801F3AC(Entity*);
+void sub_0801F730(Entity*);
+void sub_0801F748(Entity*);
+void sub_0801F764(Entity*);
+void sub_0801FAE0(Entity*);
+void sub_0801FAF8(Entity*);
+void sub_0801FB14(Entity*);
+void sub_0801FB34(Entity*);
+void sub_0801FB68(Entity*);
+u32 sub_0801FBD0(Entity*);
+void sub_0801FBE4(Entity*);
+
+extern void (*const gUnk_080012C8[])(Entity*);
+extern void (*const gUnk_080CA21C[])(Entity*);
+extern void (*const gUnk_080CA234[])(Entity*);
+extern void (*const gUnk_080CA25C[])(Entity*);
+extern void (*const gUnk_080CA288[])(Entity*);
+
+extern const s8 gUnk_080CA2B4[];
+
+void Chuchu(Entity* this) {
+    int index;
+
+    index = sub_080012DC(this);
+    switch (index) {
+        default:
+            gUnk_080012C8[index](this);
+            return;
+        case 0:
+            /* ... */
+            break;
+        case 2:
+            this->field_0x3a &= 0xfe;
+            if (index != this->field_0x80.HALF.HI) {
+                switch (this->entityType.form) {
+                    case 0:
+                        if (this->flags & 0x80) {
+                            this->action = 6;
+                            this->flags &= ~0x80;
+                            this->nonPlanarMovement = 0x20;
+                            this->damageType = 0x5c;
+                            InitializeAnimation(this, 5);
+                        }
+                        break;
+                    case 1:
+                        /* ... */
+                        break;
+                    case 2:
+                        sub_080043A8(this);
+                        return;
+                }
+            }
+            break;
+    }
+    this->field_0x80.HALF.HI = index;
+    gUnk_080CA21C[GetNextFunction(this)](this);
+    if (*(char*)(*(int*)&this->field_0x68 + 10) == 0x1c) {
+        SetChildOffset(this, 0, 1, -0x10);
+    } else if (this->entityType.form == 2) {
+        sub_0801FB34(this);
+    }
+}
+
+void sub_0801EEE4(Entity* this) {
+    switch (this->entityType.form) {
+        case 0:
+            sub_0801F3AC(this);
+            gUnk_080CA234[this->action](this);
+            break;
+        case 1:
+            sub_0801F764(this);
+            gUnk_080CA25C[this->action](this);
+            break;
+        case 2:
+            gUnk_080CA288[this->action](this);
+            break;
+    }
+}
+
+void sub_0801EF40(Entity* this) {
+    u8 health;
+
+    if (this->entityType.form == 2) {
+        if (this->bitfield == 0x8e || this->bitfield == 0x95) {
+            this->flags &= ~0x80;
+            this->currentHealth = 0;
+        }
+    }
+
+    health = this->currentHealth;
+    if (health) {
+        if (this->bitfield == 0x94) {
+            sub_0801FB68(this);
+            sub_0804A9FC(this, 0x1c);
+            InitializeAnimation(this, 6);
+        } else if (this->field_0x80.HALF.LO != health) {
+            sub_0801FB68(this);
+            InitializeAnimation(this, 6);
+        }
+    } else {
+        sub_0804AA1C(this);
+        this->field_0x20 = 0;
+        InitializeAnimation(this, 9);
+    }
+    this->field_0x80.HALF.LO = this->currentHealth;
+    sub_0804AA30(this, gUnk_080CA21C);
+}
+
+void sub_0801EFD8(Entity* this) {
+    if (sub_0806F520(this) == 0 && this->field_0x43) {
+        sub_0804A9FC(this, 0x1c);
+        InitializeAnimation(this, 6);
+    } else {
+        if (this->animIndex != 8) {
+            sub_0801FB68(this);
+            InitializeAnimation(this, 8);
+        }
+        sub_08003FC4(this, 0x1800);
+        GetNextFrame(this);
+    }
+}
+
+void sub_0801F02C(Entity* this) {
+    if (this->animIndex == 6)
+        GetNextFrame(this);
+    sub_08001318(this);
+}
+
+void sub_0801F048(Entity* this) {
+    sub_08003FC4(this, 0x1800);
+    GetNextFrame(this);
+    if (this->entityType.form == 0) {
+        sub_0804A7D4(this);
+    } else if (this->entityType.form == 1) {
+        CreateDeathFx(this, 0xf2, 0);
+    } else {
+        CreateDeathFx(this, 0xf1, 0);
+    }
+}
+
+void sub_0801F084(Entity* this) {
+    if ((this->frames.all & 0x80) == 0)
+        GetNextFrame(this);
+    sub_08001242(this);
+}
+
+void sub_0801F0A4(Entity* this) {
+    sub_0804A720(this);
+    this->action = 1;
+    this->field_0x80.HALF.LO = this->currentHealth;
+    this->field_0x82.HALF.LO = 0;
+}
+
+void nullsub_4(Entity* this) {
+    (void)this;
+}
+
+void sub_0801F0C8(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 3;
+        this->actionDelay = (Random() & 3) + 0xc;
+        this->field_0xf = Random();
+        this->direction = sub_08049F84(this, 1);
+        this->flags |= 0x80;
+        this->spritePriority.b0 = 4;
+        this->spritePriority.b1 = 3;
+        InitializeAnimation(this, 2);
+    }
+}
+
+void sub_0801F12C(Entity* this) {
+    if (sub_0801FBD0(this)) {
+        sub_0801F328(this);
+    } else {
+        if ((this->field_0xf++ & 7) == 0) {
+            this->direction = sub_08049F84(this, 1);
+        }
+        sub_080AEF88(this);
+        GetNextFrame(this);
+        if (--this->actionDelay == 0) {
+            if (sub_08049F64(this, 1, 0x38)) {
+                this->action = 4;
+                sub_0801FBE4(this);
+            } else if (sub_08049F64(this, 1, 0x48)) {
+                this->actionDelay = (Random() & 3) + 0xc;
+            } else {
+                sub_0801F328(this);
+            }
+        }
+    }
+}
+
+void sub_0801F1B0(Entity* this) {
+    if (this->frames.all & 0x10) {
+        if (this->frames.all & 1) {
+            this->frames.all ^= 1;
+            this->damageType = 90;
+            sub_08004488(299);
+        }
+        sub_080AEFE0(this);
+        if (sub_08003FC4(this, 0x4000) == 0)
+            GetNextFrame(this);
+    } else {
+        GetNextFrame(this);
+    }
+
+    if (this->frames.all & 0x80) {
+        if (sub_0801FBD0(this)) {
+            sub_0801F328(this);
+        } else {
+            sub_0801F340(this);
+        }
+    }
+}
+
+void sub_0801F228(Entity* this) {
+    if (--this->actionDelay == 0) {
+        this->action = 3;
+        this->direction = sub_08049F84(this, 1);
+    }
+    GetNextFrame(this);
+}
+
+void sub_0801F250(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80)
+        sub_0801F360(this);
+}
+
+void sub_0801F270(Entity* this) {
+    if ((this->field_0xf++ & 7) == 0) {
+        this->direction = sub_08049F84(this, 1);
+    }
+
+    sub_080AF160(this);
+    GetNextFrame(this);
+    if (sub_0801FBD0(this))
+        return;
+
+    if (--this->actionDelay)
+        return;
+
+    if (this->field_0x80.HALF.HI == 0) {
+        this->action = 2;
+        InitializeAnimation(this, 4);
+    } else {
+        this->actionDelay = 8;
+    }
+}
+
+void sub_0801F2CC(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 1;
+        this->spriteSettings.b.draw = 0;
+        InitializeAnimation(this, 4);
+    }
+}
+
+void sub_0801F2F8(Entity* this) {
+    sub_08003FC4(this, 0x1800);
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        sub_0801F340(this);
+        sub_0804AA1C(this);
+    }
+}
+
+void sub_0801F328(Entity* this) {
+    this->action = 6;
+    this->flags &= ~0x80;
+    InitializeAnimation(this, 5);
+}
+
+void sub_0801F340(Entity* this) {
+    this->action = 5;
+    this->actionDelay = 60;
+    this->nonPlanarMovement = 0x20;
+    this->damageType = 92;
+    InitializeAnimation(this, 2);
+}
+
+void sub_0801F360(Entity* this) {
+    this->action = 7;
+    this->actionDelay = (Random() & 0x38) + 0xb4;
+    this->field_0xf = Random();
+    this->direction = sub_08049F84(this, 1);
+    this->spritePriority.b1 = 2;
+    this->spritePriority.b0 = 6;
+    InitializeAnimation(this, 1);
+}
+
+void sub_0801F3AC(Entity* this) {
+    if (this->action == 9 || this->action == 0)
+        return;
+
+    if (sub_08049FDC(this, 1)) {
+        if (this->field_0x82.HALF.LO || sub_08049F64(this, 1, 0x48)) {
+            if (this->action == 1) {
+                this->action = 2;
+                this->spriteSettings.b.draw = 1;
+                this->field_0x82.HALF.LO = 1;
+                InitializeAnimation(this, 0);
+            }
+        } else if (this->action == 3) {
+            sub_0801F328(this);
+        }
+    } else if (this->action == 3) {
+        sub_0801F328(this);
+    } else if (this->action == 7) {
+        this->action = 8;
+        InitializeAnimation(this, 7);
+    }
+}
+
+void sub_0801F428(Entity* this) {
+    sub_0804A720(this);
+    this->action = 1;
+    this->actionDelay = Random();
+    this->field_0x80.HALF.LO = this->currentHealth;
+    this->field_0x82.HALF.LO = 0;
+    if (this->entityType.parameter == 0)
+        return;
+
+    this->action = 3;
+    this->field_0xf = 30;
+    this->flags |= 0x80;
+    this->spritePriority.b1 = 3;
+    this->spriteSettings.b.draw = 1;
+    InitializeAnimation(this, 2);
+}
+
+void sub_0801F48C(Entity* this) {
+    GetNextFrame(this);
+}
+
+void sub_0801F494(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 3;
+        this->field_0xf = 30;
+        this->direction = sub_08049F84(this, 1);
+        this->flags |= 0x80;
+        this->spritePriority.b0 = 4;
+        this->spritePriority.b1 = 3;
+        InitializeAnimation(this, 2);
+    }
+}
+
+void sub_0801F4EC(Entity* this) {
+    GetNextFrame(this);
+    if (--this->field_0xf == 0)
+        this->action = 4;
+}
+
+void sub_0801F508(Entity* this) {
+    if (sub_0801FBD0(this)) {
+        this->field_0x82.HALF.HI = 0;
+        sub_0801F730(this);
+    } else {
+        u8 tmp = ++this->actionDelay & 7;
+        if (tmp == 0 && sub_08049F64(this, 1, 0x38)) {
+            if (Random() & 1) {
+                this->action = 5;
+                sub_0801FBE4(this);
+            } else {
+                this->field_0x82.HALF.HI = 120;
+                sub_0801F730(this);
+            }
+        } else {
+            if (tmp == 4) {
+                this->direction = sub_08049F84(this, 1);
+            }
+            sub_080AEF88(this);
+            GetNextFrame(this);
+        }
+    }
+}
+
+void sub_0801F584(Entity* this) {
+    if (this->frames.all & 0x10) {
+        if (this->frames.all & 0x1) {
+            this->frames.all ^= 1;
+            this->damageType = 91;
+            sub_08004488(299);
+        }
+        sub_080AEFE0(this);
+        if (sub_08003FC4(this, 0x4000) == 0)
+            GetNextFrame(this);
+
+    } else {
+        GetNextFrame(this);
+    }
+
+    if (this->frames.all & 0x80) {
+        if (sub_0801FBD0(this)) {
+            this->field_0x82.HALF.HI = 0;
+            sub_0801F730(this);
+        } else {
+            this->action = 6;
+            this->field_0xf = 60;
+            this->nonPlanarMovement = 0x20;
+            this->damageType = 92;
+            InitializeAnimation(this, 2);
+        }
+    }
+}
+
+void sub_0801F61C(Entity* this) {
+    if (--this->field_0xf == 0)
+        this->action = 4;
+    GetNextFrame(this);
+}
+
+void sub_0801F638(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 8;
+        this->field_0xf = 30;
+        this->direction = sub_08049F84(this, 1);
+        this->spritePriority.b1 = 2;
+        this->spritePriority.b0 = 6;
+        InitializeAnimation(this, 1);
+    }
+}
+
+void sub_0801F688(Entity* this) {
+    if (this->field_0x82.HALF.HI)
+        this->field_0x82.HALF.HI--;
+
+    if (sub_0801FBD0(this) || this->field_0x82.HALF.HI) {
+        this->direction = sub_08049F84(this, 1);
+        sub_080AF160(this);
+        GetNextFrame(this);
+    } else {
+        sub_0801F748(this);
+    }
+}
+
+void sub_0801F6CC(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 1;
+        this->spriteSettings.b.draw = 0;
+        InitializeAnimation(this, 4);
+    }
+}
+
+void sub_0801F6F8(Entity* this) {
+    sub_08003FC4(this, 0x1800);
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 4;
+        this->nonPlanarMovement = 0x20;
+        sub_0804AA1C(this);
+        InitializeAnimation(this, 2);
+    }
+}
+
+void sub_0801F730(Entity* this) {
+    this->action = 7;
+    this->flags &= ~0x80;
+    InitializeAnimation(this, 5);
+}
+
+void sub_0801F748(Entity* this) {
+    this->action = 2;
+    this->spriteSettings.b.draw = 1;
+    InitializeAnimation(this, 4);
+}
+
+void sub_0801F764(Entity* this) {
+    if (this->action == 10 || this->action == 0)
+        return;
+
+    if (sub_08049FDC(this, 1)) {
+        if (this->action == 1) {
+            if (this->field_0x82.HALF.LO || sub_08049F64(this, 1, 0x48)) {
+                this->action = 2;
+                this->spriteSettings.b.draw = 1;
+                this->field_0x82.HALF.LO = 1;
+                InitializeAnimation(this, 0);
+            }
+        }
+    } else if (this->action == 4) {
+        sub_0801F730(this);
+    } else if (this->action == 8) {
+        this->action = 9;
+        InitializeAnimation(this, 7);
+    }
+}
+
+void sub_0801F7D8(Entity* this) {
+    sub_0804A720(this);
+    this->action = 1;
+    this->actionDelay = Random();
+    this->field_0x80.HALF.LO = this->currentHealth;
+    this->field_0x82.HALF.LO = 0;
+}
+
+void sub_0801F7FC(Entity* this) {
+    if (sub_08049FDC(this, 1) == 0)
+        return;
+
+    if (this->field_0x82.HALF.LO || sub_08049F64(this, 1, 0x48)) {
+        this->action = 2;
+        this->spriteSettings.b.draw = 1;
+        this->field_0x82.HALF.LO = 1;
+        InitializeAnimation(this, 0);
+    }
+}
+
+void sub_0801F840(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        sub_0801FB14(this);
+        this->flags |= 0x80;
+        this->spritePriority.b0 = 4;
+        this->spritePriority.b1 = 3;
+    }
+}
+
+void sub_0801F884(Entity* this) {
+    GetNextFrame(this);
+    if (this->field_0xf) {
+        this->field_0xf--;
+    } else {
+        Entity* ent = sub_0804A9FC(this, 0x1b);
+        if (ent) {
+            ent->entityType.parameter = 64;
+            this->action = 4;
+            this->damageType = 165;
+            sub_08004488(0x193);
+        }
+    }
+}
+
+void sub_0801F8C0(Entity* this) {
+    if (sub_0801FBD0(this)) {
+        sub_0801FAE0(this);
+    } else if (sub_08049FDC(this, 1) == 0) {
+        sub_0801F730(this);
+    } else {
+        u8 tmp = ++this->actionDelay & 7;
+        if (tmp == 0 && sub_08049F1C(this, gUnk_020000B0, 0x38)) {
+            this->action = 5;
+            sub_0801FBE4(this);
+        } else {
+            if (tmp == 4) {
+                this->direction = GetFacingDirection(this, gUnk_020000B0);
+            }
+            sub_080AEF88(this);
+            GetNextFrame(this);
+        }
+    }
+}
+
+void sub_0801F940(Entity* this) {
+    if (this->frames.all & 0x10) {
+        if (this->frames.all & 1) {
+            this->frames.all ^= 1;
+            sub_08004488(299);
+        }
+        sub_080AEFE0(this);
+        if (sub_08003FC4(this, 0x4000) == 0)
+            GetNextFrame(this);
+    } else {
+        GetNextFrame(this);
+    }
+
+    if (this->frames.all & 0x80) {
+        if (sub_0801FBD0(this)) {
+            sub_0801FAE0(this);
+        } else {
+            this->action = 6;
+            this->field_0xf = 60;
+            this->nonPlanarMovement = 0x20;
+            InitializeAnimation(this, 2);
+        }
+    }
+}
+
+void sub_0801F9C4(Entity* this) {
+    if (--this->field_0xf == 0)
+        this->action = 4;
+    GetNextFrame(this);
+}
+
+void sub_0801F9E0(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 8;
+        this->field_0xf = 30;
+        this->direction = sub_08049F84(this, 1);
+        this->spritePriority.b1 = 2;
+        this->spritePriority.b0 = 6;
+        InitializeAnimation(this, 1);
+    }
+}
+
+void sub_0801FA30(Entity* this) {
+    if (sub_0801FBD0(this)) {
+        this->direction = sub_08049F84(this, 1);
+        sub_080AF160(this);
+        GetNextFrame(this);
+    } else if (sub_08049FDC(this, 1) == 0) {
+        this->action = 9;
+        InitializeAnimation(this, 7);
+    } else {
+        sub_0801FAF8(this);
+    }
+}
+
+void sub_0801FA78(Entity* this) {
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        this->action = 1;
+        this->spriteSettings.b.draw = 0;
+        InitializeAnimation(this, 4);
+        sub_0804AA1C(this);
+    }
+}
+
+void sub_0801FAAC(Entity* this) {
+    sub_08003FC4(this, 0x1800);
+    GetNextFrame(this);
+    if (this->frames.all & 0x80) {
+        sub_0801FB14(this);
+        this->nonPlanarMovement = 0x20;
+        sub_0804AA1C(this);
+    }
+}
+
+void sub_0801FAE0(Entity* this) {
+    this->action = 7;
+    this->flags &= ~0x80;
+    InitializeAnimation(this, 5);
+}
+
+void sub_0801FAF8(Entity* this) {
+    this->action = 2;
+    this->spriteSettings.b.draw = 1;
+    InitializeAnimation(this, 4);
+}
+
+void sub_0801FB14(Entity* this) {
+    this->action = 3;
+    this->field_0xf = 30;
+    this->direction = sub_08049F84(this, 1);
+    InitializeAnimation(this, 2);
+}
+
+void sub_0801FB34(Entity* this) {
+    if (*(Entity**)&this->field_0x68) {
+        sub_0806FA90(this, *(Entity**)&this->field_0x68, gUnk_080CA2B4[this->frames.all & 0xf], 1);
+        (*(Entity**)&this->field_0x68)->spriteOffsetY--;
+    }
+}
+
+void sub_0801FB68(Entity* this) {
+    switch (this->entityType.form) {
+        case 0:
+            this->action = 9;
+            break;
+        case 1:
+            this->action = 10;
+            this->flags |= 0x80;
+            this->spriteSettings.b.draw = 1;
+            this->spritePriority.b1 = 3;
+            break;
+        case 2:
+            this->action = 10;
+            this->damageType = 92;
+            sub_0804AA1C(this);
+            break;
+    }
+
+    this->field_0x20 = 0;
+}
+
+u32 sub_0801FBD0(Entity* this) {
+    if (sub_080002B8(this) == 0x10) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+void sub_0801FBE4(Entity* this) {
+    this->nonPlanarMovement = 0x180;
+    this->field_0x20 = 0x20000;
+    this->direction = sub_08049F84(this, 1);
+    InitializeAnimation(this, 3);
+}
+
+// clang-format off
+void (*const gUnk_080CA21C[])(Entity*) = {
+    sub_0801EEE4,
+    sub_0801EF40,
+    sub_0801F02C,
+    sub_0801F048,
+    sub_0801F084,
+    sub_0801EFD8,
+};
+
+void (*const gUnk_080CA234[])(Entity*) = {
+    sub_0801F0A4,
+    nullsub_4,
+    sub_0801F0C8,
+    sub_0801F12C,
+    sub_0801F1B0,
+    sub_0801F228,
+    sub_0801F250,
+    sub_0801F270,
+    sub_0801F2CC,
+    sub_0801F2F8,
+};
+
+void (*const gUnk_080CA25C[])(Entity*) = {
+    sub_0801F428,
+    sub_0801F48C,
+    sub_0801F494,
+    sub_0801F4EC,
+    sub_0801F508,
+    sub_0801F584,
+    sub_0801F61C,
+    sub_0801F638,
+    sub_0801F688,
+    sub_0801F6CC,
+    sub_0801F6F8,
+};
+
+void (*const gUnk_080CA288[])(Entity*) = {
+    sub_0801F7D8,
+    sub_0801F7FC,
+    sub_0801F840,
+    sub_0801F884,
+    sub_0801F8C0,
+    sub_0801F940,
+    sub_0801F9C4,
+    sub_0801F9E0,
+    sub_0801FA30,
+    sub_0801FA78,
+    sub_0801FAAC,
+};
+// clang-format on
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index 038f7ff7..585ec102 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -14,7 +14,6 @@ extern void sub_0803CAD0(Entity *);
 // sub_0803C784
 extern void sub_0803CBAC(Entity *); // Also used in sub_0803C86C
 extern Entity *CreateFx(Entity*, u32, u32);
-extern void sub_0804A9FC(Entity *, u32);
 extern void sub_0804AA30(Entity *, void (*const funcs[])(Entity *));
 
 // sub_0803C820
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index 5c06ce5f..914bddae 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -4,7 +4,6 @@
 #include "functions.h"
 
 extern void SetChildOffset(Entity*, s32, s32, s32);
-extern void sub_0804A9FC(Entity*, u32);
 extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
 extern void sub_0804A7D4(Entity*);
 extern Entity* CreateDeathFx(Entity*, u32, u32);
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index eac2e020..64c9c089 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -8,7 +8,6 @@ void sub_08045374(Entity*);
 extern u32 sub_0806FA04(u32, u32);
 extern void sub_0804A720();
 extern void sub_080452E4();
-extern void sub_0804A9FC();
 extern void sub_0804AA30();
 extern void ReplaceMonitoredEntity(Entity*, Entity*);
 extern void sub_0804A7D4(Entity*);
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 83dce4ed..e758887a 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -5,7 +5,6 @@
 extern void EnemyFunctionHandler();
 extern void SetChildOffset();
 extern void sub_0804AA30();
-extern void sub_0804A9FC();
 extern void sub_0804A7D4();
 extern void sub_0801ECFC();
 extern u32 sub_0806F520();
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 74343df7..91238ab9 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -16,7 +16,6 @@ typedef struct {
 void sub_08044FF8(Entity*);
 void sub_08045178(Entity*, Entity*, int, int);
 
-extern void sub_0804A9FC(Entity*, u32);
 extern void sub_0804A720(Entity*);
 extern u32 sub_0806FA04(u32, u32);
 extern u32 sub_08049FA0(Entity*);
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index 0cea604e..4aec209c 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -56,7 +56,7 @@ void nullsub_16(Entity* this) {
 }
 
 void sub_0802F1F0(Entity* this) {
-    sub_08001242();
+    sub_08001242(this);
     if (this->height.HALF.HI != 0) {
         sub_08003FC4(this, this->field_0x80.HWORD);
     }
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 32c3ba40..f46a65e3 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -56,7 +56,7 @@ void sub_08037F58(Entity* this) {
 }
 
 void sub_08037F84(Entity* this) {
-    sub_08001242();
+    sub_08001242(this);
     if (this->height.HALF.HI != 0) {
         sub_08003FC4(this, 0x3000);
     }