diff options
| author | Aetias <aetias@outlook.com> | 2025-05-24 12:28:04 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-05-24 12:28:04 +0200 |
| commit | 12674a6b83ee3b35acb72ffcef9f11f9805e2a74 (patch) | |
| tree | b0b8a128e659bbddc97a0a5fd66583deaefe1141 /src/00_Core/Actor/Actor.cpp | |
| parent | ef04313d458adf37d2e3eb83fd291e4eb9b30a7d (diff) | |
Fix build
Diffstat (limited to 'src/00_Core/Actor/Actor.cpp')
| -rw-r--r-- | src/00_Core/Actor/Actor.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index afa066fc..db721414 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -6,6 +6,7 @@ extern "C" { #include "Actor/ActorManager.hpp" #include "Actor/ActorPlayerDummy.hpp" #include "DTCM/UnkStruct_027e077c.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" #include "Item/ItemManager.hpp" #include "Map/MapManager.hpp" #include "Player/EquipSword.hpp" @@ -256,13 +257,9 @@ ARM bool Actor::func_ov00_020c195c() { return true; } -extern "C" bool func_ov05_02103f4c(s32 param1); -extern s32 data_027e103c; ARM bool Actor::func_ov00_020c198c() { - u32 unk1 = data_027e077c.mUnk_0; - u32 unk2 = data_027e077c.mUnk_4; - if (data_027e077c.mUnk_0 != data_027e077c.mUnk_4 || (data_02056be4[unk1] & 1) != 0 || (data_02056be4[unk2] & 4) != 0 || - func_ov05_02103f4c(data_027e103c) || gPlayer->mHealth <= 0) + if (data_027e077c.GetUnk0() != data_027e077c.GetUnk4() || (data_02056be4[data_027e077c.GetUnk0()] & 1) != 0 || + (data_02056be4[data_027e077c.GetUnk4()] & 4) != 0 || data_027e103c->func_ov005_02103f4c() || gPlayer->mHealth <= 0) { return false; } |