From 8e5db49a8dd0e16d029fb5a07aee411adaf64ca6 Mon Sep 17 00:00:00 2001 From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com> Date: Wed, 30 Sep 2020 19:16:04 -0700 Subject: [PATCH] Work on func_80A74398 --- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 dfa7df9d34..4a0ffca179 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -167,7 +167,7 @@ void func_80A74398(EnIk* this, GlobalContext* globalCtx) { this->actor.gravity = -1.0f; if (this->actor.params == 0) { - this->actor.colChkInfo.health = 50; + this->actor.colChkInfo.health += 20; this->actor.naviEnemyId = 52; } else { Actor_SetScale(&this->actor, 0.012f); @@ -191,11 +191,9 @@ void func_80A74398(EnIk* this, GlobalContext* globalCtx) { Effect_Add(globalCtx, &this->blureIdx, EFFECT_BLURE1, 0, 0, &blureInit); func_80A74714(this); - if (this->switchFlags != 0xFF) { - if (Flags_GetSwitch(globalCtx, this->switchFlags)) { - Actor_Kill(&this->actor); - } - } else if ((this->actor.params != 0) && Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)) { + if (this->switchFlags != 0xFF && Flags_GetSwitch(globalCtx, this->switchFlags)) { + Actor_Kill(&this->actor); + } else if (this->actor.params != 0 && Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)) { Actor_Kill(&this->actor); } }