From 47fa1f8f4e9f9ca527ea9c2b4032263f228a6972 Mon Sep 17 00:00:00 2001 From: inspectredc Date: Wed, 1 Nov 2023 22:06:08 +0000 Subject: [PATCH] func_8086EF14 --- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index ca0145ff2..f3a3464a3 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -27,6 +27,7 @@ void func_8086E948(EnOkuta* this, PlayState* play); void func_8086EAE0(EnOkuta* this, PlayState* play); void func_8086EC00(EnOkuta* this, PlayState* play); void func_8086EF14(EnOkuta* this, PlayState* play); +void func_8086EF90(EnOkuta* this); void func_8086EFE8(EnOkuta* this, PlayState* play); void func_8086F434(EnOkuta* this, PlayState* play); void func_8086F4B0(EnOkuta* this, PlayState* play); @@ -435,7 +436,17 @@ void func_8086EE8C(EnOkuta* this) { this->actionFunc = func_8086EF14; } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Okuta/func_8086EF14.s") +void func_8086EF14(EnOkuta* this, PlayState* play) { + if (SkelAnime_Update(&this->skelAnime) != 0) { + if (this->actor.colChkInfo.health == 0) { + func_8086EF90(this); + } else { + this->collider.base.acFlags |= 1; + func_8086E8E8(this); + } + } + Math_ApproachF(&this->actor.world.pos.y, this->actor.home.pos.y, 0.5f, 5.0f); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Okuta/func_8086EF90.s")