From 0c92f891baadbf19012f48dae6d750f6f31ca4dc Mon Sep 17 00:00:00 2001
From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com>
Date: Wed, 30 Sep 2020 20:24:29 -0700
Subject: [PATCH] Match func_80A74398

---
 src/overlays/actors/ovl_En_Ik/z_en_ik.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 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 c829d49674..6b5c2245a0 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -143,7 +143,6 @@ void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) {
     this->actionFunc = actionFunc;
 }
 
-#ifdef NON_MATCHING
 void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
     EnIk* this = THIS;
     s32 pad;
@@ -162,11 +161,11 @@ void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
 
     this->actor.colChkInfo.damageTable = &D_80A78444;
     this->actor.colChkInfo.mass = 0xFE;
-    this->actor.colChkInfo.health = 30;
     this->unk_2FC = 0;
-    this->actor.params &= 0xFF;
-    this->switchFlags = (this->actor.params >> 8) & 0xFF;
+    this->actor.colChkInfo.health = 30;
     this->actor.gravity = -1.0f;
+    this->switchFlags = (thisx->params >> 8) & 0xFF;
+    this->actor.params &= 0xFF;
 
     if (thisx->params == 0) {
         this->actor.colChkInfo.health += 20;
@@ -201,9 +200,6 @@ void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
         Actor_Kill(&this->actor);
     }
 }
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s")
-#endif
 
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s")