diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-05-26 21:35:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-26 21:35:20 +0200 |
| commit | 59a5cc5da29bd84680ceeaf2c2eeabe9effb6b6d (patch) | |
| tree | 3b4316c804d44cd46bf12d27f3c76d89abe2c97d /src/00_Core/Actor/ActorManager.cpp | |
| parent | 3f6a81d03dec2bd7c8394b508dbe4f017a5244b9 (diff) | |
| parent | 8f6142e4fdd1195541e3f1ecc08ddf961f3b046c (diff) | |
Merge pull request #71 from AetiasHax/decomp-PlayerControl
Decomp `src/00_Core/Player/PlayerControl.cpp` (99%)
Diffstat (limited to 'src/00_Core/Actor/ActorManager.cpp')
| -rw-r--r-- | src/00_Core/Actor/ActorManager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index 73ab6bbb..fed1075e 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -1,4 +1,5 @@ #include "Actor/ActorManager.hpp" +#include "DTCM/UnkStruct_027e077c.hpp" #include "DTCM/UnkStruct_027e103c.hpp" #include "Map/MapManager.hpp" @@ -8,8 +9,6 @@ extern "C" Cylinder *func_ov000_020c3ef0(void *, u32 index); extern "C" bool func_ov000_020c3f08(void *, u32 index); extern "C" void func_ov000_020c3f3c(void *, u32 index, Cylinder *cylinder); extern "C" void func_ov000_020c3f54(void *, u32 param2); -extern s32 data_027e077c; -extern u8 data_02056be4[]; ARM void ActorManager::DeleteActor(u32 index, bool param2) { if (!param2) { @@ -52,7 +51,7 @@ ARM void ActorManager::func_ov00_020c3484(ActorRef *ref, ActorManager *actorMgr, q20 minDistance = 0x7fffffff; Actor **actorIter = actorMgr->mActorTable; - u8 unkByte = data_02056be4[data_027e077c]; + u8 unkByte = data_02056be4[data_027e077c.GetUnk0()]; bool unk1 = (unkByte & 1) != 0; Actor **actorTableEnd = actorIter + actorMgr->mMaxActorIndex; |