From e71e29de5fac9e0806f1eb529e4de5ee557fe68d Mon Sep 17 00:00:00 2001 From: bomba1749 <58524643+bomba1749@users.noreply.github.com> Date: Tue, 13 Jun 2023 16:45:58 -0400 Subject: [PATCH] AirOctaFlyUp::leave OK --- src/Game/AI/AI/aiAirOctaFlyUp.cpp | 7 ++++++- src/Game/AI/AI/aiAirOctaFlyUp.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Game/AI/AI/aiAirOctaFlyUp.cpp b/src/Game/AI/AI/aiAirOctaFlyUp.cpp index 03d12752..5c16d715 100644 --- a/src/Game/AI/AI/aiAirOctaFlyUp.cpp +++ b/src/Game/AI/AI/aiAirOctaFlyUp.cpp @@ -45,8 +45,13 @@ void AirOctaFlyUp::enter_(ksys::act::ai::InlineParamPack* params) { } void AirOctaFlyUp::leave_() { - ksys::act::ai::Ai::leave_(); + if (auto* data_mgr = sead::DynamicCast((AirOctaDataMgr*)*mAirOctaDataMgr_a)){ + data_mgr->unk_118 = *mTargetDistance_d + data_mgr->unk_118; + data_mgr->unk_114 = 0; + return data_mgr->sub_71002FB17C(); + } } + float sub_71002FB17C(); void AirOctaFlyUp::loadParams_() { diff --git a/src/Game/AI/AI/aiAirOctaFlyUp.h b/src/Game/AI/AI/aiAirOctaFlyUp.h index 2fcaec55..99fbe6c5 100644 --- a/src/Game/AI/AI/aiAirOctaFlyUp.h +++ b/src/Game/AI/AI/aiAirOctaFlyUp.h @@ -14,6 +14,7 @@ public: /* 0x18 */ ksys::act::BaseProcLink mBaseProcLink; char placeFiller[0xEC]; /*0x114 */ u32 unk_114; + /*0x118 */ float unk_118; }; class AirOctaFlyUp : public ksys::act::ai::Ai {