mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-25 06:06:05 +00:00
Code Issues Projects Releases Wiki Activity

Work on func_80A74398

Browse source
This commit is contained in:
Sirius902 2020-09-30 19:16:04 -07:00
parent 7ebec4cae0
commit 8e5db49a8d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -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);
}
}