From c0bdcfbe455e50fd4ba4cb253085872c23de9c3a Mon Sep 17 00:00:00 2001
From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com>
Date: Wed, 30 Sep 2020 14:08:15 -0700
Subject: [PATCH] Fixes

---
 src/overlays/actors/ovl_En_Ik/z_en_ik.c | 11 +++++++++--
 src/overlays/actors/ovl_En_Ik/z_en_ik.h |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index e3f5ab534d..92d8b722d4 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -54,6 +54,13 @@ const ActorInit En_Ik_InitVars = {
 };
 */
 
+/*
+static ColliderTrisInit sTrisInit = {
+    { COLTYPE_METAL_SHIELD, 0x00, 0x0D, 0x00, 0x00, COLSHAPE_TRIS },
+    2, D_80A7836C,
+};
+*/
+
 void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     EnIk* this = THIS;
 
@@ -198,7 +205,7 @@ void func_80A7489C(EnIk* this) {
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s")
 
 // starts middle boss bgm
-void func_80A76BF4() {
+void func_80A76BF4(void) {
     // NA_BGM_MIDDLE_BOSS
     func_800F5ACC(0x38);
 }
@@ -304,7 +311,7 @@ void func_80A78160(EnIk* this, GlobalContext* globalCtx) {
     this->actor.draw = func_80A76798;
     this->actor.flags |= 5;
     gSaveContext.eventChkInf[3] |= 0x800;
-    Actor_SetScale(this, 0.012f);
+    Actor_SetScale(&this->actor, 0.012f);
     func_80A7489C(this);
 }
 
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
index 4da5d282b4..e7203bfed5 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
@@ -23,7 +23,7 @@ typedef struct EnIk {
     /* 0x0320 */ ColliderCylinder unk_320;
     /* 0x036C */ ColliderQuad unk_36C;
     /* 0x03EC */ ColliderTris unk_3EC;
-    /* 0x040C */ char unk_40C[0xB8];
+    /* 0x040C */ ColliderTrisItem unk_40C[2];
     /* 0x04C4 */ s32 blureIdx;
     /* 0x04C8 */ s32 action;
     /* 0x04CC */ s32 drawMode;