diff options
Diffstat (limited to 'src/Main/Message')
| -rw-r--r-- | src/Main/Message/MessageManager.cpp | 10 | ||||
| -rw-r--r-- | src/Main/Message/func_0203c358.cpp | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 705b773b..bf1e30ca 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -1,6 +1,7 @@ #include "Message/MessageManager.hpp" #include "Actor/ActorManager.hpp" #include "DTCM/UnkStruct_027e0c54.hpp" +#include "DTCM/UnkStruct_027e0ffc.hpp" #include "Game/Game.hpp" #include "Player/TouchControl.hpp" #include "System/SysNew.hpp" @@ -15,11 +16,6 @@ extern UnkStruct_MsgProc_Base_unk_2C *data_02068e8c; extern u16 data_02056918[]; extern ActorTypeId data_0205691c[]; -struct UnkStruct_027e0ffc { - void func_ov000_020cec60(u16, Vec3p *, Actor *, unk32); -}; -extern UnkStruct_027e0ffc *data_027e0ffc; - // non-matching ARM void MessageManager::func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; @@ -327,7 +323,7 @@ ARM void MessageManager::func_0203690c(unk32 param_2) { pActor = gActorManager->GetActor(&actorRef); if (pActor != NULL) { - data_027e0ffc->func_ov000_020cec60(data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0); + data_027e0ffc.func_ov000_020cec60(data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0); } } } @@ -354,7 +350,7 @@ ARM void MessageManager::func_02036bbc(void) { } } -ARM void MessageManager::func_02036c50(unk32 param_2) { +ARM void MessageManager::func_02036c50(u16 *param_2) { s32 i; for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) { diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp index ee80f15e..52366f78 100644 --- a/src/Main/Message/func_0203c358.cpp +++ b/src/Main/Message/func_0203c358.cpp @@ -53,7 +53,7 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) { } } -ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) { +ARM void MsgProc_Type2::vfunc_3C(u16 *param_2) { if (this->mUnk_15c > 0 && this->mUnk_122 != 1) { if (this->func_0203de14(param_2) != 0) { this->vfunc_40(0, 0); |
