mirror of
https://github.com/zeldaret/ph
synced 2026-09-02 01:42:57 -04:00
Merge remote-tracking branch 'zeldaret/main' into decomp/MapManager
This commit is contained in:
@@ -5,6 +5,8 @@ extern "C" {
|
||||
#include "Actor/Actor.hpp"
|
||||
#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"
|
||||
@@ -46,8 +48,7 @@ ARM Actor::Actor() :
|
||||
mUnk_010(0),
|
||||
mUnk_011(0),
|
||||
mUnk_012(0),
|
||||
mUnk_034(-1),
|
||||
mUnk_038(-1),
|
||||
mUnk_034(-1, -1),
|
||||
mUnk_03c(-1),
|
||||
mUnk_040(-1, -1),
|
||||
mGravity(FLOAT_TO_Q20(0.0498)),
|
||||
@@ -111,11 +112,11 @@ ARM Actor::Actor() :
|
||||
|
||||
ARM Actor::~Actor() {}
|
||||
|
||||
ARM bool Actor::vfunc_08() {
|
||||
ARM bool Actor::Init() {
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM void Actor::vfunc_0c() {}
|
||||
ARM bool Actor::vfunc_0c() {}
|
||||
ARM void Actor::vfunc_10(u32 param1) {}
|
||||
ARM void Actor::vfunc_24() {}
|
||||
ARM void Actor::vfunc_28() {}
|
||||
@@ -255,20 +256,9 @@ ARM bool Actor::func_ov00_020c195c() {
|
||||
return true;
|
||||
}
|
||||
|
||||
struct UnkStruct2 {
|
||||
/* 0 */ u32 mUnk_0;
|
||||
/* 4 */ u32 mUnk_4;
|
||||
/* 8 */
|
||||
};
|
||||
extern UnkStruct2 data_027e077c;
|
||||
extern u8 data_02056be4[];
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -155,7 +154,7 @@ ARM Actor *ActorManager::GetActor(ActorRef *ref) {
|
||||
|
||||
ARM bool FilterActor::Filter(Actor *actor) {
|
||||
if (mType != actor->mType) return false;
|
||||
if (mUnk_08 != -1 && mUnk_08 != actor->mUnk_034) return false;
|
||||
if (mUnk_08 != -1 && mUnk_08 != actor->mUnk_034.id) return false;
|
||||
if (mExcludeRefs != NULL) {
|
||||
for (s32 i = 0; mExcludeRefs[i].id != -1; ++i) {
|
||||
ActorRef *ref = &mExcludeRefs[i];
|
||||
@@ -313,7 +312,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) {
|
||||
if (param2 != NULL) *param2 = 0;
|
||||
|
||||
AABB boxes[8];
|
||||
s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes));
|
||||
s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes));
|
||||
if (numBoxes <= 0) return 0;
|
||||
|
||||
s32 i;
|
||||
@@ -350,7 +349,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) {
|
||||
|
||||
ARM void ActorManager::func_ov00_020c3ce8(unk32 param1, bool param2) {
|
||||
AABB boxes[8];
|
||||
s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes));
|
||||
s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes));
|
||||
if (numBoxes <= 0) return;
|
||||
|
||||
s32 i;
|
||||
|
||||
@@ -1,10 +1,98 @@
|
||||
#include "Actor/ActorSpawner.hpp"
|
||||
#include "Actor/ActorManager.hpp"
|
||||
#include "Map/MapManager.hpp"
|
||||
|
||||
ActorSpawner *ActorSpawner::Create() {}
|
||||
void ActorSpawner::Destroy() {}
|
||||
ActorSpawner::ActorSpawner() {}
|
||||
ActorSpawner::~ActorSpawner() {}
|
||||
void ActorSpawner::func_ov000_020c4014() {}
|
||||
void ActorSpawner::func_ov000_020c4018() {}
|
||||
Actor *ActorSpawner::CreateActor(ActorTypeId type) {}
|
||||
s32 ActorSpawner::Spawn(ActorTypeId type, Vec3p *pos, void *param3, ActorRef *ref) {}
|
||||
extern u32 *data_027e0ce0[];
|
||||
ARM ActorSpawner *ActorSpawner::Create() {
|
||||
gActorSpawner = new(data_027e0ce0[1], 4) ActorSpawner();
|
||||
}
|
||||
|
||||
ARM void ActorSpawner::Destroy() {
|
||||
delete gActorSpawner;
|
||||
gActorSpawner = NULL;
|
||||
}
|
||||
|
||||
ARM ActorSpawner::ActorSpawner() {}
|
||||
|
||||
ARM ActorSpawner::~ActorSpawner() {}
|
||||
|
||||
ARM void ActorSpawner::func_ov000_020c4014() {}
|
||||
|
||||
ARM void ActorSpawner::func_ov000_020c4018() {}
|
||||
|
||||
ARM Actor *ActorSpawner::CreateActor(ActorTypeId typeId) {
|
||||
Actor *actor = NULL;
|
||||
ActorType *type = ActorType::Find(typeId);
|
||||
if (type != NULL) {
|
||||
actor = type->create();
|
||||
}
|
||||
return actor;
|
||||
}
|
||||
|
||||
extern "C" unk32 GetCardinal(s16 angle);
|
||||
ARM s32 ActorSpawner::Spawn(ActorTypeId type, Vec3p *pos, ActorSpawnOptions *options, ActorRef *ref) {
|
||||
ActorManager *actorManager = gActorManager;
|
||||
u16 maxActors = actorManager->mMaxActors;
|
||||
s32 id = -1;
|
||||
s32 index;
|
||||
Actor **actorSlot = actorManager->mActorTable;
|
||||
for (index = 0; index < maxActors; index++, actorSlot++) {
|
||||
if (*actorSlot != NULL) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Actor *actor = this->CreateActor(type);
|
||||
*actorSlot = actor;
|
||||
if (actor == NULL) {
|
||||
if (ref != NULL) {
|
||||
ref->Reset();
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
actor->mType = type;
|
||||
(*actorSlot)->mRef.id = actorManager->mNextActorId;
|
||||
(*actorSlot)->mRef.index = index;
|
||||
(*actorSlot)->mUnk_014 = *pos;
|
||||
(*actorSlot)->mUnk_020 = options->mUnk_00;
|
||||
(*actorSlot)->mAngle = options->mAngle;
|
||||
(*actorSlot)->mUnk_012 = options->mAngle;
|
||||
(*actorSlot)->mUnk_074 = GetCardinal(options->mAngle);
|
||||
if (options->mUnk_18 >= 0xffff) {
|
||||
(*actorSlot)->mUnk_03c = -1;
|
||||
} else {
|
||||
(*actorSlot)->mUnk_03c = options->mUnk_18;
|
||||
}
|
||||
(*actorSlot)->mUnk_034 = options->mUnk_1c;
|
||||
(*actorSlot)->mUnk_140 = options->mUnk_24;
|
||||
(*actorSlot)->mUnk_144 = options->mUnk_28;
|
||||
Actor *actor2 = *actorSlot;
|
||||
actor2->mPos = *pos;
|
||||
actor2->mPrevPos = *pos;
|
||||
(*actorSlot)->mUnk_010 = gMapManager->GetCourseData_Unk_1c();
|
||||
(*actorSlot)->mUnk_011 = gMapManager->GetCourseData_Unk_1d();
|
||||
u16 nextIndex = index + 1;
|
||||
if (actorManager->mMaxActorIndex < nextIndex) {
|
||||
actorManager->mMaxActorIndex = nextIndex;
|
||||
}
|
||||
actorManager->mCacheEmptyActorIndex = index;
|
||||
|
||||
id = actorManager->mNextActorId;
|
||||
if (ref != NULL) {
|
||||
*ref = ActorRef(id, index);
|
||||
}
|
||||
actorManager->mNextActorId += 1;
|
||||
actorManager->mNumActors += 1;
|
||||
if (!(*actorSlot)->Init()) {
|
||||
(*actorSlot)->mAlive = false;
|
||||
if (ref != NULL) {
|
||||
ref->Reset();
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if ((id == -1) && (ref != NULL)) {
|
||||
ref->Reset();
|
||||
}
|
||||
return id;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ ARM ActorActionObject::ActorActionObject() {}
|
||||
ARM ActorActionObject::~ActorActionObject() {}
|
||||
|
||||
// non-matching
|
||||
ARM bool ActorActionObject::vfunc_08() {
|
||||
ARM bool ActorActionObject::Init() {
|
||||
mGravity = 0;
|
||||
mHitbox.pos = gVec3p_ZERO;
|
||||
mHitbox.size = -1;
|
||||
|
||||
@@ -4,7 +4,7 @@ ActorType ActorEventIcon::gType = ActorType(ActorTypeId_EventIcon, (ActorCreateF
|
||||
|
||||
ActorEventIcon *ActorEventIcon::Create() {}
|
||||
ActorEventIcon::ActorEventIcon() {}
|
||||
bool ActorEventIcon::vfunc_08() {}
|
||||
bool ActorEventIcon::Init() {}
|
||||
void ActorEventIcon::vfunc_14(u32 param1) {}
|
||||
void ActorEventIcon::vfunc_18(u32 param1) {}
|
||||
u32 ActorEventIcon::func_ov000_02090648(u32 param1) {}
|
||||
|
||||
@@ -1,15 +1,110 @@
|
||||
#include "Actor/Dungeon/ActorSwitchObject.hpp"
|
||||
#include "Map/MapManager.hpp"
|
||||
|
||||
ActorType ActorSwitchObject::gType = ActorType(ActorTypeId_SwitchObject, (ActorCreateFunc) ActorSwitchObject::Create, NULL);
|
||||
|
||||
ActorSwitchObject *ActorSwitchObject::Create() {}
|
||||
bool ActorSwitchObject::vfunc_08() {}
|
||||
void ActorSwitchObject::vfunc_0c() {}
|
||||
void ActorSwitchObject::vfunc_14(u32 param1) {}
|
||||
void ActorSwitchObject::vfunc_18(u32 param1) {}
|
||||
bool ActorSwitchObject::func_ov000_0208fc10(s32 param1) {}
|
||||
void ActorSwitchObject::func_ov000_0208fc7c() {}
|
||||
|
||||
bool ActorSwitchObject::Init() {
|
||||
Actor::Init();
|
||||
this->func_ov000_0208fc7c();
|
||||
this->mUnk_130 = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ActorSwitchObject::vfunc_0c() {
|
||||
return this->func_ov00_020c1bfc(0) ? this->func_ov000_0208fc10(1) : this->func_ov000_0208fc10(0);
|
||||
}
|
||||
|
||||
void ActorSwitchObject::vfunc_14(u32 param1) {
|
||||
bool bVar1;
|
||||
u32 uVar2;
|
||||
u32 uVar3;
|
||||
s32 iVar4;
|
||||
s32 iVar5;
|
||||
|
||||
bVar1 = this->func_ov00_020c313c(param1);
|
||||
if (bVar1 == NULL) {
|
||||
return;
|
||||
}
|
||||
uVar2 = this->mUnk_130;
|
||||
switch (uVar2) {
|
||||
default:
|
||||
if (uVar2 == 2) {
|
||||
break;
|
||||
}
|
||||
return;
|
||||
case 0:
|
||||
uVar3 = this->func_ov000_0208fcb4();
|
||||
switch (uVar3) {
|
||||
case 1: this->func_ov000_0208fc10(1); return;
|
||||
case 2: this->func_ov000_0208fc10(2); return;
|
||||
default: return;
|
||||
}
|
||||
bVar1 = this->func_ov000_0208fc10(2);
|
||||
return;
|
||||
case 1:
|
||||
iVar4 = this->func_ov000_0208fcb4();
|
||||
if (iVar4 == 1) {
|
||||
return;
|
||||
}
|
||||
bVar1 = this->func_ov000_0208fc10(0);
|
||||
return;
|
||||
}
|
||||
|
||||
iVar5 = this->mActiveFrames + 1;
|
||||
this->mActiveFrames = iVar5;
|
||||
if (iVar5 < 0x1e) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->func_ov000_0209032c();
|
||||
bVar1 = this->func_ov000_0208fc10(0);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void ActorSwitchObject::vfunc_18(u32 param1) {
|
||||
this->vfunc_14(param1);
|
||||
}
|
||||
|
||||
bool ActorSwitchObject::func_ov000_0208fc10(s32 param1) {
|
||||
this->mUnk_130 = param1;
|
||||
|
||||
switch (param1) {
|
||||
case 0: this->func_ov00_020c1c20(0, 0); break;
|
||||
case 1:
|
||||
this->func_ov00_020c1c20(0, 1);
|
||||
if (this->mUnk_158 == 0) {
|
||||
this->mAlive = false;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
this->func_ov000_0208fef8();
|
||||
this->mActiveFrames = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ActorSwitchObject::func_ov000_0208fc7c() {
|
||||
this->mUnk_158 = this->mUnk_020.mUnk_00[1];
|
||||
this->mUnk_15c = this->mUnk_020.mUnk_00[2];
|
||||
this->mUnk_164 = this->mUnk_020.mUnk_0a[1];
|
||||
this->mUnk_168 = this->mUnk_164 + this->mUnk_020.mUnk_00[0];
|
||||
this->mUnk_16c = this->mUnk_020.mUnk_08[1];
|
||||
this->mUnk_160 = this->mUnk_164;
|
||||
}
|
||||
|
||||
bool ActorSwitchObject::func_ov000_0208fcb4() {}
|
||||
void ActorSwitchObject::func_ov000_0208fef8() {}
|
||||
void ActorSwitchObject::func_ov000_0209032c() {}
|
||||
|
||||
void ActorSwitchObject::func_ov000_0209032c() {
|
||||
unk32 i;
|
||||
for (i = this->mUnk_164; i < this->mUnk_168; i++) {
|
||||
gMapManager->func_ov00_02084b38(i, this->mUnk_16c, 0);
|
||||
}
|
||||
}
|
||||
|
||||
ActorSwitchObject::~ActorSwitchObject() {}
|
||||
|
||||
@@ -36,7 +36,7 @@ void UnkStruct_027e103c::func_ov000_020cf3dc() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cf3f0() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cf404() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cf414() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cf42c() {}
|
||||
bool UnkStruct_027e103c::func_ov000_020cf42c() {}
|
||||
bool UnkStruct_027e103c::func_ov000_020cf444() {}
|
||||
bool UnkStruct_027e103c::func_ov000_020cf488() {}
|
||||
bool UnkStruct_027e103c::func_ov000_020cf4bc() {}
|
||||
@@ -59,7 +59,7 @@ void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {}
|
||||
unk8 UnkStruct_027e103c::func_ov000_020cfab0() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfb20(unk32 param1) {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfb20(void *param1) {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfb38() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfb48() {}
|
||||
void UnkStruct_027e103c::func_ov000_020cfb58() {}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "DTCM/UnkStruct_027e0d38.hpp"
|
||||
#include "DTCM/UnkStruct_027e0f78.hpp"
|
||||
#include "DTCM/UnkStruct_027e103c.hpp"
|
||||
#include "Item/ItemModelLoader.hpp"
|
||||
#include "Map/MapManager.hpp"
|
||||
#include "Player/PlayerLinkBase.hpp"
|
||||
#include "Player/PlayerManager.hpp"
|
||||
@@ -158,17 +160,15 @@ ARM ItemModel *ItemManager::GetItemModel(ItemModelId id) {
|
||||
return mItemModels[id];
|
||||
}
|
||||
|
||||
extern unk32 gItemModelLoader;
|
||||
extern "C" void *func_ov00_020bb3a8(unk32 param1, u32 index);
|
||||
extern "C" void func_ov00_020c0bdc(void *param1, unk32 param2);
|
||||
extern "C" void func_ov000_020c0bdc(unk32 param1, unk32 param2);
|
||||
ARM void ItemManager::func_ov00_020ad538(unk32 param1) const {
|
||||
void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 6);
|
||||
func_ov00_020c0bdc(unk1, param1);
|
||||
unk32 unk1 = gItemModelLoader->func_ov000_020bb3a8(6);
|
||||
func_ov000_020c0bdc(unk1, param1);
|
||||
}
|
||||
|
||||
ARM void ItemManager::func_ov00_020ad560(unk32 param1) const {
|
||||
void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 7);
|
||||
func_ov00_020c0bdc(unk1, param1);
|
||||
unk32 unk1 = gItemModelLoader->func_ov000_020bb3a8(7);
|
||||
func_ov000_020c0bdc(unk1, param1);
|
||||
}
|
||||
|
||||
ARM ItemModel *ItemManager::GetDungeonItemModel(u32 index) {
|
||||
@@ -176,8 +176,8 @@ ARM ItemModel *ItemManager::GetDungeonItemModel(u32 index) {
|
||||
}
|
||||
|
||||
ARM void ItemManager::func_ov00_020ad594(unk32 param1) const {
|
||||
void *unk1 = func_ov00_020bb3a8(gItemModelLoader, 11);
|
||||
func_ov00_020c0bdc(unk1, param1);
|
||||
unk32 unk1 = gItemModelLoader->func_ov000_020bb3a8(11);
|
||||
func_ov000_020c0bdc(unk1, param1);
|
||||
}
|
||||
|
||||
ARM void ItemManager::Sword_vfunc_38(unk32 param1) {
|
||||
@@ -231,25 +231,20 @@ ARM u16 ItemManager::GetAmmo(ItemFlag equipId) const {
|
||||
return (*mAmmo)[equipId];
|
||||
}
|
||||
|
||||
ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) {
|
||||
ARM void ItemManager::GiveAmmo(ItemFlag equipId, u32 amount) {
|
||||
(*mAmmo)[equipId] += amount;
|
||||
if ((*mAmmo)[equipId] <= this->GetMaxAmmo(equipId)) return;
|
||||
(*mAmmo)[equipId] = this->GetMaxAmmo(equipId);
|
||||
}
|
||||
|
||||
extern "C" unk32 func_ov00_02078b40(UnkStruct_027e0d38 *param1);
|
||||
extern void *data_027e10a4;
|
||||
extern "C" bool func_ov15_02136670(void *param1);
|
||||
extern unk8 data_ov29_0217a4ac[];
|
||||
extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);
|
||||
extern "C" bool _ZNK11ItemManager7HasItemEi();
|
||||
extern "C" void _ZN11ItemManager12GetEquipItemEi();
|
||||
extern "C" bool func_ov015_02136670(void *param1);
|
||||
extern u8 data_ov022_0217a4ac[];
|
||||
ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {
|
||||
unk32 unk1 = func_ov00_02078b40(data_027e0d38);
|
||||
if (unk1 == 2) return func_ov15_02136670(data_027e10a4);
|
||||
unk32 unk1 = data_027e0d38->func_ov000_02078b40();
|
||||
if (unk1 == 2) return func_ov015_02136670(data_027e10a4);
|
||||
if (data_027e0d38->mUnk_14 == 1) return false;
|
||||
// NONMATCH: OverlayId_29 should be in constant pool
|
||||
if (gOverlayManager.mLoadedOverlays[OverlayIndex_6] == OverlayId_29 && data_ov29_0217a4ac[0x54] != 0) {
|
||||
if (gOverlayManager.mLoadedOverlays[OverlayIndex_6] == OverlayId_29 && data_ov022_0217a4ac[0x54] != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -320,7 +315,7 @@ THUMB void ItemManager::SetUnk_09e(u32 index, u16 value) {
|
||||
}
|
||||
|
||||
const u16 sQuiverSizes[] = {20, 20, 30, 50};
|
||||
const u16 sBombBagSizes[] = {10, 20, 30};
|
||||
const u16 sBombBagSizes[] = {10, 20, 30, 0};
|
||||
|
||||
THUMB u16 ItemManager::GetMaxAmmo(ItemFlag equipId) const {
|
||||
switch (equipId) {
|
||||
@@ -379,8 +374,8 @@ THUMB void ItemManager::RemoveItem(ItemFlag item) {
|
||||
|
||||
extern ItemModel **data_027e1058;
|
||||
extern ItemModel **data_027e105c;
|
||||
extern "C" ItemModel *func_ov00_02079ffc(void *, const char *modelName, const char *textureName, unk32 param4, unk8 param5,
|
||||
unk8 param6, bool param7);
|
||||
extern "C" ItemModel *LoadNsbTexturedModel(void *, const char *modelName, const char *textureName, unk32 param4, unk8 param5,
|
||||
unk8 param6, bool param7);
|
||||
extern "C" ItemModel *LoadTreasureItemFanfare(ItemModel **, s32 treasureType, bool, bool);
|
||||
static char *sDefaultItemModel = "key";
|
||||
static char *sItemModelNames[70] = {
|
||||
@@ -391,47 +386,47 @@ static char *sItemModelNames[70] = {
|
||||
[ItemId_WoodenShield] = "shA",
|
||||
[ItemId_Unk_5] = NULL,
|
||||
[ItemId_Unk_6] = "force_y",
|
||||
[ItemId_BombBag] = "bomb\0\0\0",
|
||||
[ItemId_BombBag] = "bomb",
|
||||
[ItemId_Bow] = "bow",
|
||||
[ItemId_BigGreenRupee] = "rupee_g",
|
||||
[ItemId_HeartContainer] = "heart_utu\0\0",
|
||||
[ItemId_HeartContainer] = "heart_utu",
|
||||
[ItemId_Unk_11] = NULL,
|
||||
[ItemId_Boomerang] = "boomerang\0\0",
|
||||
[ItemId_Boomerang] = "boomerang",
|
||||
[ItemId_Scoop] = "scp",
|
||||
[ItemId_BombchuBag] = "bomchu\0",
|
||||
[ItemId_BombchuBag] = "bomchu",
|
||||
[ItemId_BossKey] = "bosskey",
|
||||
[ItemId_Unk_16] = "rev_bin",
|
||||
[ItemId_Unk_17] = NULL,
|
||||
[ItemId_PhantomHourglass] = NULL,
|
||||
[ItemId_SWSeaChart] = "mapSea\0",
|
||||
[ItemId_NWSeaChart] = "mapSea\0",
|
||||
[ItemId_SESeaChart] = "mapSea\0",
|
||||
[ItemId_NESeaChart] = "mapSea\0",
|
||||
[ItemId_SWSeaChart] = "mapSea",
|
||||
[ItemId_NWSeaChart] = "mapSea",
|
||||
[ItemId_SESeaChart] = "mapSea",
|
||||
[ItemId_NESeaChart] = "mapSea",
|
||||
[ItemId_Unk_23] = NULL,
|
||||
[ItemId_BlueRupee] = "rupee_b",
|
||||
[ItemId_RedRupee] = "rupee_r",
|
||||
[ItemId_BigRedRupee] = "rupee_r",
|
||||
[ItemId_GoldRupee] = "rupee_go\0\0\0",
|
||||
[ItemId_GoldRupee] = "rupee_go",
|
||||
[ItemId_Unk_28] = "force_y",
|
||||
[ItemId_Unk_29] = "force_r",
|
||||
[ItemId_Unk_30] = "force_b",
|
||||
[ItemId_Hammer] = "ham",
|
||||
[ItemId_Rope] = "rope\0\0\0",
|
||||
[ItemId_SquareCrystal] = "cstl_c\0",
|
||||
[ItemId_RoundCrystal] = "cstl_s\0",
|
||||
[ItemId_TriangleCrystal] = "cstl_t\0",
|
||||
[ItemId_FishingRod] = "fp\0",
|
||||
[ItemId_Rope] = "rope",
|
||||
[ItemId_SquareCrystal] = "cstl_c",
|
||||
[ItemId_RoundCrystal] = "cstl_s",
|
||||
[ItemId_TriangleCrystal] = "cstl_t",
|
||||
[ItemId_FishingRod] = "fp",
|
||||
[ItemId_Cannon] = NULL,
|
||||
[ItemId_SunKey] = "key_su\0",
|
||||
[ItemId_SunKey] = "key_su",
|
||||
[ItemId_Unk_39] = NULL,
|
||||
[ItemId_Quiver] = "arrowpod\0\0\0",
|
||||
[ItemId_BigBombBag] = "bmbagM\0",
|
||||
[ItemId_BigBombchuBag] = "bcbagM\0",
|
||||
[ItemId_Quiver] = "arrowpod",
|
||||
[ItemId_BigBombBag] = "bmbagM",
|
||||
[ItemId_BigBombchuBag] = "bcbagM",
|
||||
[ItemId_Unk_43] = NULL,
|
||||
[ItemId_KingsKey] = "key_ki\0",
|
||||
[ItemId_PowerGem] = "minaP\0\0",
|
||||
[ItemId_WisdomGem] = "minaC\0\0",
|
||||
[ItemId_CourageGem] = "minaY\0\0",
|
||||
[ItemId_KingsKey] = "key_ki",
|
||||
[ItemId_PowerGem] = "minaP",
|
||||
[ItemId_WisdomGem] = "minaC",
|
||||
[ItemId_CourageGem] = "minaY",
|
||||
[ItemId_PinkCoral] = NULL,
|
||||
[ItemId_WhitePearlLoop] = NULL,
|
||||
[ItemId_DarkPearlLoop] = NULL,
|
||||
@@ -440,44 +435,40 @@ static char *sItemModelNames[70] = {
|
||||
[ItemId_RutoCrown] = NULL,
|
||||
[ItemId_HelmarocPlume] = NULL,
|
||||
[ItemId_RegalRing] = NULL,
|
||||
[ItemId_GhostKey] = "key_gh\0",
|
||||
[ItemId_FreebieCard] = "tic_tada\0\0\0",
|
||||
[ItemId_ComplimentCard] = "tic_ohome\0\0",
|
||||
[ItemId_ComplimentaryCard] = "tic_rare\0\0\0",
|
||||
[ItemId_RegalNecklace] = "neckl\0\0",
|
||||
[ItemId_SalvageArm] = "slvarm\0",
|
||||
[ItemId_GhostKey] = "key_gh",
|
||||
[ItemId_FreebieCard] = "tic_tada",
|
||||
[ItemId_ComplimentCard] = "tic_ohome",
|
||||
[ItemId_ComplimentaryCard] = "tic_rare",
|
||||
[ItemId_RegalNecklace] = "neckl",
|
||||
[ItemId_SalvageArm] = "slvarm",
|
||||
[ItemId_HerosNewClothes] = NULL,
|
||||
[ItemId_Kaleidoscope] = "telescope\0\0",
|
||||
[ItemId_GuardNotebook] = "notebook\0\0\0",
|
||||
[ItemId_JolenesLetter] = "letter\0",
|
||||
[ItemId_PrizePostcard] = "card\0\0\0",
|
||||
[ItemId_WoodHeart] = "marron\0",
|
||||
[ItemId_Kaleidoscope] = "telescope",
|
||||
[ItemId_GuardNotebook] = "notebook",
|
||||
[ItemId_JolenesLetter] = "letter",
|
||||
[ItemId_PrizePostcard] = "card",
|
||||
[ItemId_WoodHeart] = "marron",
|
||||
[ItemId_PhantomSwordBlade] = "swBedge",
|
||||
[ItemId_PhantomSword] = NULL,
|
||||
};
|
||||
static char *sItemModelNames2[8] = {
|
||||
[ItemId_SwordsmanScroll - ItemId_SwordsmanScroll] = "makimono\0\0\0",
|
||||
[ItemId_Crimsonine - ItemId_SwordsmanScroll] = "hagaH\0\0",
|
||||
[ItemId_Azurine - ItemId_SwordsmanScroll] = "hagaK\0\0",
|
||||
[ItemId_Aquanine - ItemId_SwordsmanScroll] = "hagaS\0\0",
|
||||
[ItemId_SwordsmanScroll - ItemId_SwordsmanScroll] = "makimono",
|
||||
[ItemId_Crimsonine - ItemId_SwordsmanScroll] = "hagaH",
|
||||
[ItemId_Azurine - ItemId_SwordsmanScroll] = "hagaK",
|
||||
[ItemId_Aquanine - ItemId_SwordsmanScroll] = "hagaS",
|
||||
[ItemId_RedPotion - ItemId_SwordsmanScroll] = "rev_bin",
|
||||
[ItemId_PurplePotion - ItemId_SwordsmanScroll] = "rev_binP\0\0\0",
|
||||
[ItemId_YellowPotion - ItemId_SwordsmanScroll] = "rev_binY\0\0\0",
|
||||
[ItemId_SandOfHours - ItemId_SwordsmanScroll] = "sand_m\0",
|
||||
[ItemId_PurplePotion - ItemId_SwordsmanScroll] = "rev_binP",
|
||||
[ItemId_YellowPotion - ItemId_SwordsmanScroll] = "rev_binY",
|
||||
[ItemId_SandOfHours - ItemId_SwordsmanScroll] = "sand_m",
|
||||
};
|
||||
static char *sItemModelNames3[9] = {
|
||||
[ItemId_CycloneSlate - ItemId_CycloneSlate] = "compass",
|
||||
[ItemId_Unk_128 - ItemId_CycloneSlate] = "lure\0\0\0",
|
||||
[ItemId_Rupoor10 - ItemId_CycloneSlate] = "rupee_bb\0\0\0",
|
||||
[ItemId_Rupoor50 - ItemId_CycloneSlate] = "rupee_bb\0\0\0",
|
||||
[ItemId_Unk_131 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_Unk_132 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_Unk_133 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_Unk_134 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_Unk_135 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_CycloneSlate - ItemId_CycloneSlate] = "compass", [ItemId_BigCatchLure - ItemId_CycloneSlate] = "lure",
|
||||
[ItemId_Rupoor10 - ItemId_CycloneSlate] = "rupee_bb", [ItemId_Rupoor50 - ItemId_CycloneSlate] = "rupee_bb",
|
||||
[ItemId_Unk_131 - ItemId_CycloneSlate] = NULL, [ItemId_Unk_132 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_Unk_133 - ItemId_CycloneSlate] = NULL, [ItemId_Unk_134 - ItemId_CycloneSlate] = NULL,
|
||||
[ItemId_Unk_135 - ItemId_CycloneSlate] = NULL,
|
||||
};
|
||||
char *sSpecialItemModelNames[7] = {
|
||||
"mapTakara\0\0", "arrowpodL\0\0", "bmbagL\0", "bcbagL\0", "Player/get/gd_\0", ".nsbmd\0", ".nsbtx\0",
|
||||
"mapTakara", "arrowpodL", "bmbagL", "bcbagL", "Player/get/gd_", ".nsbmd", ".nsbtx",
|
||||
};
|
||||
THUMB void ItemManager::LoadFanfareItem(ItemId id) {
|
||||
mFanfareItem = id;
|
||||
@@ -521,7 +512,7 @@ THUMB void ItemManager::LoadFanfareItem(ItemId id) {
|
||||
strcat(textureName, sSpecialItemModelNames[4]);
|
||||
strcat(textureName, itemName);
|
||||
strcat(textureName, sSpecialItemModelNames[6]);
|
||||
model = func_ov00_02079ffc(mFanfareItemModel, modelName, textureName, 0, 0, 0, true);
|
||||
model = LoadNsbTexturedModel(mFanfareItemModel, modelName, textureName, 0, 0, 0, true);
|
||||
}
|
||||
mUnk_114->vfunc_0c(model);
|
||||
}
|
||||
@@ -787,8 +778,8 @@ THUMB void ItemManager::GiveItem(ItemId id) {
|
||||
SET_FLAG(mItemFlags.flags, ItemFlag_CycloneSlate);
|
||||
} break;
|
||||
|
||||
case ItemId_Unk_128: {
|
||||
SET_FLAG(mItemFlags.flags, ItemFlag_Unk_47);
|
||||
case ItemId_BigCatchLure: {
|
||||
SET_FLAG(mItemFlags.flags, ItemFlag_BigCatchLure);
|
||||
} break;
|
||||
|
||||
case ItemId_Rupoor10: {
|
||||
@@ -841,9 +832,6 @@ ARM s32 ItemManager::GetMaxRupees() const {
|
||||
return 9999;
|
||||
}
|
||||
|
||||
extern void *data_027e103c;
|
||||
extern "C" s32 func_ov00_020cf374(void *param1, bool param2);
|
||||
extern "C" void func_ov05_02104004(void *param1);
|
||||
ARM void ItemManager::GiveRupees(s32 amount, bool param2) {
|
||||
s32 newRupees = mNumRupees + amount;
|
||||
if (newRupees > this->GetMaxRupees()) {
|
||||
@@ -852,11 +840,11 @@ ARM void ItemManager::GiveRupees(s32 amount, bool param2) {
|
||||
newRupees = 0;
|
||||
}
|
||||
|
||||
s32 currRupees = func_ov00_020cf374(data_027e103c, true);
|
||||
s32 currRupees = data_027e103c->func_ov000_020cf374(true);
|
||||
if (param2) {
|
||||
currRupees = mNumRupees;
|
||||
if (currRupees != newRupees) {
|
||||
func_ov05_02104004(data_027e103c);
|
||||
data_027e103c->WalletFull();
|
||||
}
|
||||
}
|
||||
mNumRupees = newRupees;
|
||||
@@ -994,7 +982,7 @@ THUMB void ItemManager::LoadDungeonItemModels() {
|
||||
}
|
||||
}
|
||||
|
||||
extern unk32 data_ov00_020eec68;
|
||||
extern unk32 data_ov000_020eec68;
|
||||
extern "C" void PlaySoundEffect(void *param1, SfxId sfx);
|
||||
THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
|
||||
if (gItemManager->mMuteNextFanfare == true) {
|
||||
@@ -1043,7 +1031,7 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
|
||||
|
||||
gItemManager->mFanfareSfx = SfxId_None;
|
||||
}
|
||||
PlaySoundEffect(&data_ov00_020eec68, sfx);
|
||||
PlaySoundEffect(&data_ov000_020eec68, sfx);
|
||||
}
|
||||
|
||||
THUMB bool ItemManager::HasShipPartPriceShown(ShipPart part, ShipType type) const {
|
||||
|
||||
@@ -16,7 +16,7 @@ void LinkStateBase::UpdateSwordShieldInUse() {}
|
||||
void LinkStateBase::func_ov00_020a81b8(unk32 param1, unk32 param2) {}
|
||||
LinkStateItem *LinkStateBase::GetLinkItemState() {}
|
||||
void LinkStateBase::LookAt(Vec3p *target) {}
|
||||
void LinkStateBase::func_ov00_020a81fc() {}
|
||||
void LinkStateBase::func_ov00_020a81fc(Vec3p *param1, unk32 param2) {}
|
||||
void LinkStateBase::AddHealth(s16 amount) {}
|
||||
void LinkStateBase::func_ov00_020a8224(unk32 param1) {}
|
||||
void LinkStateBase::TurnTo(s16 angle, unk32 param2, unk32 speed) {}
|
||||
@@ -38,7 +38,7 @@ bool LinkStateBase::func_ov00_020a8638(unk32 param1) {}
|
||||
void LinkStateBase::Clear_PlayerLinkBase_Unk48(u16 flags) {}
|
||||
void LinkStateBase::func_ov00_020a8680(unk32 param1, unk16 param2, bool param3) {}
|
||||
void LinkStateBase::PlayerLinkBase_func_ov00_020bccc8() {}
|
||||
bool LinkStateBase::PlayerLinkBase_vfunc_58() {}
|
||||
bool LinkStateBase::PlayerLinkBase_vfunc_58(unk32 param1, ActorRef *param2) {}
|
||||
bool LinkStateBase::func_ov00_020a8704(s16 *pAngle) {}
|
||||
bool LinkStateBase::func_ov00_020a8774(Vec3p *param1, s32 angle) {}
|
||||
void LinkStateBase::func_ov00_020a8844(Vec3p *param1, bool param2, bool param3) {}
|
||||
@@ -46,7 +46,7 @@ void LinkStateBase::func_ov00_020a8954(bool param1, unk32 *param2) {}
|
||||
void LinkStateBase::func_ov00_020a8994() {}
|
||||
void LinkStateBase::func_ov00_020a89bc(unk32 param1, unk32 param2) {}
|
||||
void LinkStateBase::func_ov00_020a8a08(unk32 param1) {}
|
||||
void LinkStateBase::func_ov00_020a8a4c(unk32 param1, unk32 param2) {}
|
||||
void LinkStateBase::func_ov00_020a8a4c(const void *param1, unk32 param2) {}
|
||||
void LinkStateBase::func_ov00_020a8a90(unk32 param1) {}
|
||||
void LinkStateBase::func_ov00_020a8ab0(unk32 param1) {}
|
||||
void LinkStateBase::func_ov00_020a8ad0(unk32 param1) {}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "Player/LinkStateItem.hpp"
|
||||
#include "DTCM/UnkStruct_027e103c.hpp"
|
||||
#include "DTCM/UnkStruct_027e1098.hpp"
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "Player/EquipBomb.hpp"
|
||||
#include "Player/EquipHammer.hpp"
|
||||
@@ -8,13 +9,8 @@
|
||||
#include "Player/PlayerControl.hpp"
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
|
||||
extern void func_ov000_020cf9dc(s32 param1, s32 param2, s32 param3);
|
||||
extern void func_ov014_0213ec64(s32 param1);
|
||||
extern void func_ov014_0211fd04(s32 *param1);
|
||||
extern void func_ov000_020b7e6c(s32 *param1);
|
||||
|
||||
extern s32 *data_027e1098;
|
||||
|
||||
THUMB void LinkStateItem::vfunc_00() {}
|
||||
|
||||
ARM LinkStateId LinkStateItem::GetId() {
|
||||
@@ -42,7 +38,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) {
|
||||
if (*(u8 *) (iVar3 + 0xe0) == '\0') {
|
||||
GetEquipBombchu()->func_ov014_0213ec64();
|
||||
}
|
||||
func_ov014_0211fd04(data_027e1098);
|
||||
data_027e1098->func_ov014_0211fd04();
|
||||
break;
|
||||
case ItemFlag_OshusSword: break;
|
||||
case ItemFlag_WoodenShield: break;
|
||||
|
||||
@@ -1,10 +1,71 @@
|
||||
#include "Player/LinkStateMove.hpp"
|
||||
|
||||
void LinkStateMove::vfunc_00() {}
|
||||
LinkStateId LinkStateMove::GetId() {}
|
||||
void LinkStateMove::CreateDebugHierarchy() {}
|
||||
void LinkStateMove::OnStateEnter() {}
|
||||
void LinkStateMove::OnStateLeave(s32 param1) {}
|
||||
bool LinkStateMove::vfunc_24(s32 param1) {}
|
||||
bool LinkStateMove::func_ov00_020a8f2c() {}
|
||||
bool LinkStateMove::func_ov00_020a8f4c() {}
|
||||
unk32 LinkStateMove::data_ov000_020e56f0 = 0x800;
|
||||
|
||||
THUMB void LinkStateMove::vfunc_00() {}
|
||||
|
||||
ARM LinkStateId LinkStateMove::GetId() {
|
||||
return LinkStateId_Move;
|
||||
}
|
||||
|
||||
THUMB void LinkStateMove::CreateDebugHierarchy() {
|
||||
unk32 id = 'LMOV';
|
||||
// Breath volume decay rate "息吹きボリューム低下率"
|
||||
const char *description = "\x91\xa7\x90\x81\x82\xab\x83{\x83\x8a\x83\x85\x81[\x83\x80\x92\xe1\x89\xba\x97\xa6";
|
||||
|
||||
DebugHierarchy *debugHierarchy = this->GetDebugHierarchy0();
|
||||
debugHierarchy->vfunc_3c(id, &data_ov000_020e56f0);
|
||||
|
||||
debugHierarchy->GetChildNode(1, description, id, &data_ov000_020e56f0, 8, 0, 0x1000, 0);
|
||||
}
|
||||
|
||||
extern u32 data_ov000_020eec9c;
|
||||
extern "C" void func_ov000_020d77e4(void *param1, s32 param2);
|
||||
|
||||
ARM void LinkStateMove::OnStateEnter() {
|
||||
this->mUnk_0c = 0;
|
||||
this->mUnk_10 = 0;
|
||||
this->mUnk_12 = 0;
|
||||
if (this->mUnk_14 == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
EquipItem *sword = this->GetEquipItem(ItemFlag_OshusSword);
|
||||
sword->UpdateInUse(1);
|
||||
EquipItem *shield = this->GetEquipItem(ItemFlag_WoodenShield);
|
||||
shield->UpdateInUse(1);
|
||||
|
||||
PlayerBase::GetEquipSword()->func_ov000_020c06b0(-1);
|
||||
func_ov000_020d77e4(&data_ov000_020eec9c, 0xD);
|
||||
}
|
||||
|
||||
ARM void LinkStateMove::OnStateLeave(s32 param1) {
|
||||
LinkStateBase::OnStateLeave(param1);
|
||||
this->mUnk_14 = 0;
|
||||
this->mUnk_15 = 0;
|
||||
this->mUnk_16 = 0;
|
||||
}
|
||||
|
||||
ARM bool LinkStateMove::vfunc_24(s32 param1) {
|
||||
if (this->GetHealth() > 0) {
|
||||
return LinkStateBase::vfunc_24(param1);
|
||||
}
|
||||
switch (param1) {
|
||||
case 2: return true;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
ARM bool LinkStateMove::func_ov00_020a8f2c() {
|
||||
static unk32 data_ov000_020e56f4 = 0x100;
|
||||
return this->mUnk_0c > data_ov000_020e56f4;
|
||||
}
|
||||
|
||||
ARM bool LinkStateMove::func_ov00_020a8f4c() {
|
||||
if (this->mUnk_15) {
|
||||
return false;
|
||||
}
|
||||
this->mUnk_15 = true;
|
||||
this->mUnk_16 = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -18,8 +18,8 @@ void PlayerControlData::vfunc_2c() {}
|
||||
void PlayerControlData::vfunc_30() {}
|
||||
void PlayerControlData::vfunc_34() {}
|
||||
unk32 PlayerControlData::vfunc_7c() {}
|
||||
unk32 PlayerControlData::vfunc_74() {}
|
||||
unk32 PlayerControlData::vfunc_78() {}
|
||||
unk32 PlayerControlData::vfunc_74(s32 param1) {}
|
||||
unk32 PlayerControlData::vfunc_78(s32 param1) {}
|
||||
void PlayerControlData::func_ov000_020b484c(s32 param1, s32 param2, s32 param3) {}
|
||||
void PlayerControlData::vfunc_6c(s32 param1, Vec3p *param2) {}
|
||||
void PlayerControlData::vfunc_5c() {}
|
||||
|
||||
@@ -1,11 +1,39 @@
|
||||
#include "Player/TouchControl.hpp"
|
||||
|
||||
TouchControl::TouchControl() {}
|
||||
void TouchControl::IncreaseSpeed(s16 increase) {}
|
||||
|
||||
void TouchControl::IncreaseSpeed(s16 increase) {
|
||||
this->mFlags = 0;
|
||||
this->mSpeed += increase;
|
||||
}
|
||||
|
||||
void TouchControl::UpdateFlags(u16 speed) {}
|
||||
void TouchControl::UpdateWithStateFlags(TouchStateFlags *state, u16 speed) {}
|
||||
void TouchControl::Update(TouchState *state, u16 speed) {}
|
||||
bool TouchControl::func_ov00_0207aeac() {}
|
||||
bool TouchControl::func_ov00_0207aeac() {
|
||||
return ((*data_0207aecc & 0x8000) >> 15) == 1;
|
||||
}
|
||||
void TouchControl::UpdateConditionally(TouchState *state, u16 speed) {}
|
||||
void TouchControl::func_ov00_0207af38(u16 speed, bool param2) {}
|
||||
|
||||
void TouchControl::func_ov00_0207af38(u16 speedIncrease, bool shouldIncrease) {
|
||||
TouchStateFlags touchState;
|
||||
|
||||
if (shouldIncrease) {
|
||||
IncreaseSpeed(speedIncrease); /* TODO: IncreaseSpeed expects an s16 variable,
|
||||
while speedIncrease is a u16. As a result, the function
|
||||
performs a conversion that is not present in the binary. */
|
||||
return;
|
||||
}
|
||||
|
||||
u32 result = TouchControl::func_ov00_0207aeac();
|
||||
if (result != 0) {
|
||||
Fill16(0, &touchState.touchX, 8);
|
||||
} else {
|
||||
|
||||
GetTouchStateFlags(&touchState);
|
||||
}
|
||||
|
||||
UpdateWithStateFlags(&touchState, speedIncrease);
|
||||
}
|
||||
|
||||
TouchControl::~TouchControl() {}
|
||||
|
||||
@@ -1,9 +1,34 @@
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
#include "Cutscene/CutsceneHandler.hpp"
|
||||
|
||||
extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler);
|
||||
extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler);
|
||||
extern bool func_ov000_02098114(CutsceneHandler *cutsceneHandler);
|
||||
extern u8 data_ov000_020e310c[];
|
||||
extern u8 data_ov000_020e313c[];
|
||||
extern u8 data_ov000_020e3140[];
|
||||
extern u8 data_ov000_020e3144[];
|
||||
extern u8 data_ov000_020e314c[];
|
||||
extern u8 data_ov000_020e314e[];
|
||||
extern u8 data_ov000_020e3150[];
|
||||
extern u8 data_ov000_020e3154[];
|
||||
extern u8 data_ov000_020e3155[];
|
||||
extern u8 data_ov000_020e3156[];
|
||||
|
||||
bool AdventureFlags::Exists() {
|
||||
return gAdventureFlags != NULL;
|
||||
}
|
||||
|
||||
bool AdventureFlags::Exists() {}
|
||||
void AdventureFlags::CopyTo(unk32 *flags) {}
|
||||
void AdventureFlags::func_ov00_02097674() {}
|
||||
s32 AdventureFlags::func_ov00_02097684() {}
|
||||
|
||||
void AdventureFlags::func_ov00_02097674() {
|
||||
func_ov000_020980f8(this->mCutsceneHandler);
|
||||
}
|
||||
|
||||
s32 AdventureFlags::func_ov00_02097684() {
|
||||
return func_ov000_020980fc(this->mCutsceneHandler);
|
||||
}
|
||||
|
||||
void AdventureFlags::Load() {}
|
||||
void AdventureFlags::func_ov00_020976c8() {}
|
||||
void AdventureFlags::func_ov00_02097700() {}
|
||||
@@ -20,22 +45,83 @@ bool AdventureFlags::func_ov00_02097bbc() {}
|
||||
bool AdventureFlags::func_ov00_02097bcc() {}
|
||||
bool AdventureFlags::func_ov00_02097bcc(s32 param2) {}
|
||||
s32 AdventureFlags::func_ov00_02097c08() {}
|
||||
bool AdventureFlags::Get_FlagsUnk_30_Flag(int index) {}
|
||||
unk8 AdventureFlags::Get_FlagsUnk_49(int index) {}
|
||||
unk8 AdventureFlags::Get_FlagsUnk_48(int index) {}
|
||||
unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {}
|
||||
unk16 AdventureFlags::Get_FlagsUnk_42(int index) {}
|
||||
unk16 AdventureFlags::Get_FlagsUnk_40(int index) {}
|
||||
unk32 AdventureFlags::Get_FlagsUnk_38(int index) {}
|
||||
unk32 AdventureFlags::Get_FlagsUnk_34(int index) {}
|
||||
unk32 AdventureFlags::Get_FlagsUnk_44(int index) {}
|
||||
unk32 AdventureFlags::Get_FlagsUnk_30(int index) {}
|
||||
bool AdventureFlags::Get_FlagsUnk_00(int index, FlagsUnk2 *result) {}
|
||||
bool AdventureFlags::Get_FlagsUnk_18(int index, FlagsUnk2 *result) {}
|
||||
FlagsUnk *AdventureFlags::Get_FlagsUnk(int index) {}
|
||||
bool AdventureFlags::func_ov00_02097e6c() {}
|
||||
bool AdventureFlags::func_ov00_02097e7c() {}
|
||||
bool AdventureFlags::func_ov00_02097ea4() {}
|
||||
|
||||
bool AdventureFlags::Get_FlagsUnk_30_Flag(s32 index) {
|
||||
unk32 unk30 = this->Get_FlagsUnk_30(index);
|
||||
|
||||
return this->Get(unk30);
|
||||
}
|
||||
|
||||
u8 AdventureFlags::Get_FlagsUnk_49(s32 index) {
|
||||
return data_ov000_020e3155[index * 0x4C];
|
||||
}
|
||||
|
||||
u8 AdventureFlags::Get_FlagsUnk_48(s32 index) {
|
||||
return data_ov000_020e3154[index * 0x4C];
|
||||
}
|
||||
|
||||
u8 AdventureFlags::Get_FlagsUnk_4a(s32 index) {
|
||||
return data_ov000_020e3156[index * 0x4C];
|
||||
}
|
||||
|
||||
u16 AdventureFlags::Get_FlagsUnk_42(s32 index) {
|
||||
return *(u16 *) (data_ov000_020e314e + index * 0x4C);
|
||||
}
|
||||
|
||||
u16 AdventureFlags::Get_FlagsUnk_40(s32 index) {
|
||||
return *(unk16 *) (data_ov000_020e314c + index * 0x4C);
|
||||
}
|
||||
|
||||
unk32 AdventureFlags::Get_FlagsUnk_38(s32 index) {
|
||||
return *(unk32 *) (data_ov000_020e3144 + index * 0x4C);
|
||||
}
|
||||
|
||||
unk32 AdventureFlags::Get_FlagsUnk_34(s32 index) {
|
||||
return *(unk32 *) (data_ov000_020e3140 + index * 0x4C);
|
||||
}
|
||||
|
||||
unk32 AdventureFlags::Get_FlagsUnk_44(s32 index) {
|
||||
return *(unk32 *) (data_ov000_020e3150 + index * 0x4C);
|
||||
}
|
||||
|
||||
unk32 AdventureFlags::Get_FlagsUnk_30(s32 index) {
|
||||
return *(unk32 *) (data_ov000_020e313c + index * 0x4C);
|
||||
}
|
||||
|
||||
bool AdventureFlags::Get_FlagsUnk_00(s32 index, FlagsUnk2 *result) {}
|
||||
bool AdventureFlags::Get_FlagsUnk_18(s32 index, FlagsUnk2 *result) {}
|
||||
|
||||
FlagsUnk *AdventureFlags::Get_FlagsUnk(s32 index) {
|
||||
return (FlagsUnk *) (data_ov000_020e310c + index * 0x4C);
|
||||
}
|
||||
|
||||
bool AdventureFlags::func_ov00_02097e6c() {
|
||||
return func_ov000_02098114(this->mCutsceneHandler);
|
||||
}
|
||||
|
||||
bool AdventureFlags::func_ov00_02097e7c() {
|
||||
bool bVar1;
|
||||
|
||||
bVar1 = this->func_ov00_02097e6c();
|
||||
if (bVar1) {
|
||||
bVar1 = this->mCutsceneHandler->SkipCutscene(0);
|
||||
return bVar1;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool AdventureFlags::func_ov00_02097ea4() {
|
||||
bool bVar1;
|
||||
|
||||
bVar1 = this->func_ov00_02097e6c();
|
||||
if (bVar1) {
|
||||
bVar1 = this->mCutsceneHandler->SkipCutscene(1);
|
||||
return bVar1;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
unk32 AdventureFlags::func_ov00_02097ecc() {}
|
||||
void *AdventureFlags::func_ov00_02097f8c() {}
|
||||
void *AdventureFlags::func_ov00_02097fac() {}
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
ActorNaviBase::ActorNaviBase() {}
|
||||
ActorNaviBase::~ActorNaviBase() {}
|
||||
void func_ov004_021079d4(unk32 *param1) {}
|
||||
bool ActorNaviBase::vfunc_08() {}
|
||||
bool ActorNaviBase::Init() {}
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
#include "Player/LinkStateMove.hpp"
|
||||
|
||||
LinkStateMove::LinkStateMove(PlayerLinkBase *link) :
|
||||
LinkStateBase(link) {}
|
||||
LinkStateMove::~LinkStateMove() {}
|
||||
THUMB LinkStateMove::LinkStateMove(PlayerLinkBase *link) :
|
||||
LinkStateBase(link),
|
||||
mUnk_0c(0),
|
||||
mUnk_14(false),
|
||||
mUnk_15(false),
|
||||
mUnk_16(false) {}
|
||||
|
||||
THUMB LinkStateMove::~LinkStateMove() {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "Player/LinkStateCutscene.hpp"
|
||||
|
||||
unk32 UnkStruct_ov004_0210abb8::vfunc_2c(s32 param1) {}
|
||||
void UnkStruct_ov004_0210abb8::vfunc_24(unk32 param1) {}
|
||||
bool UnkStruct_ov004_0210abb8::vfunc_24(unk32 param1) {}
|
||||
void LinkStateCutscene::func_ov005_021089c0() {}
|
||||
void LinkStateCutscene::func_ov005_021089f4() {}
|
||||
void LinkStateCutscene::func_ov005_02108d08() {}
|
||||
|
||||
@@ -1,5 +1,247 @@
|
||||
#include "Player/LinkStateMove.hpp"
|
||||
#include "DTCM/UnkStruct_027e0d38.hpp"
|
||||
#include "Player/LinkStateDamage.hpp"
|
||||
#include "Player/LinkStateFollow.hpp"
|
||||
#include "Player/LinkStateInteract.hpp"
|
||||
#include "Player/LinkStateItem.hpp"
|
||||
#include "Player/LinkStateRoll.hpp"
|
||||
#include "Player/PlayerControl.hpp"
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
#include "Unknown/UnkStruct_02037750.hpp"
|
||||
|
||||
void LinkStateMove::func_ov005_021113d0() {}
|
||||
void LinkStateMove::vfunc_1c() {}
|
||||
bool LinkStateMove::vfunc_3c() {}
|
||||
class UnkFilterActor : public FilterActorBase {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 04 */ Actor *mActor;
|
||||
/* 08 */ q20 mUnk_08;
|
||||
/* 0c */ Vec3p mPos;
|
||||
/* 18 */ s16 mAngle;
|
||||
/* 1a */
|
||||
|
||||
/* 0 */ virtual bool Filter(Actor *actor) override;
|
||||
/* 4 */
|
||||
};
|
||||
|
||||
struct UnkStruct_ov005_021123ac {
|
||||
/* 00 */ unk32 mUnk_00;
|
||||
/* 04 */ unk32 mUnk_04;
|
||||
/* 08 */ unk32 mUnk_08;
|
||||
/* 0c */ unk32 mUnk_0c;
|
||||
/* 10 */
|
||||
};
|
||||
|
||||
ARM void LinkStateMove::func_ov005_021113d0() {
|
||||
mUnk_12 = 10;
|
||||
}
|
||||
|
||||
static q4 data_ov005_02112be4 = FLOAT_TO_Q20(16 / 15.0);
|
||||
static q20 data_ov005_02112be8 = FLOAT_TO_Q20(1 / 64.0);
|
||||
static q20 data_ov005_02112bec = FLOAT_TO_Q20(1 / 3.0);
|
||||
static const Vec3p data_ov005_021123ac = {
|
||||
FLOAT_TO_Q20(0.0122),
|
||||
FLOAT_TO_Q20(1.0),
|
||||
FLOAT_TO_Q20(0.0),
|
||||
};
|
||||
static Vec3p data_ov005_02112bf0 = {
|
||||
FLOAT_TO_Q20(0.3),
|
||||
FLOAT_TO_Q20(0.25),
|
||||
FLOAT_TO_Q20(0.01),
|
||||
};
|
||||
static const volatile q20 data_ov005_021123b8 = FLOAT_TO_Q20(15.0);
|
||||
|
||||
extern LinkStateFollow *GetLinkStateFollow();
|
||||
extern unk32 data_027e0618;
|
||||
extern "C" bool Lerp(s32 *pValue, s32 dest, s32 factor, unk32 param4, u32 step);
|
||||
extern unk32 data_027e0ffc;
|
||||
extern "C" void func_ov000_020ceacc(unk32 *param1, unk32 param2, Vec3p *param3, unk32 param4);
|
||||
ARM void LinkStateMove::vfunc_1c() {
|
||||
Actor *grabActor = this->GetGrabActor();
|
||||
Vec3p sp4C;
|
||||
s32 temp_r7 = GetLinkStateFollow()->func_ov00_020a9180(&sp4C);
|
||||
s32 temp_r0 = UnkStruct_02037750::GetLinkStateInteract()->func_ov00_020ab770(&sp4C);
|
||||
bool var_r9;
|
||||
if ((temp_r0 == 0) && (temp_r7 == 0)) {
|
||||
var_r9 = false;
|
||||
} else {
|
||||
var_r9 = true;
|
||||
}
|
||||
LinkStateDamage *damage = (LinkStateDamage *) GetLinkState(LinkStateId_Damage);
|
||||
if (damage->vfunc_20(var_r9) != 0) {
|
||||
this->ChangeLinkState(LinkStateId_Damage);
|
||||
return;
|
||||
}
|
||||
if ((gAdventureFlags->func_ov00_02097738() == 0) && (data_027e0d38->mUnk_14 != 1)) {
|
||||
LinkStateInteract *interact = (LinkStateInteract *) GetLinkState(LinkStateId_Interact);
|
||||
if (interact->vfunc_20(var_r9) != 0) {
|
||||
this->ChangeLinkState(LinkStateId_Interact);
|
||||
return;
|
||||
}
|
||||
LinkStateFollow *follow = (LinkStateFollow *) GetLinkState(LinkStateId_Follow);
|
||||
if (follow->vfunc_20(var_r9) != 0) {
|
||||
this->ChangeLinkState(LinkStateId_Follow);
|
||||
return;
|
||||
}
|
||||
LinkStateRoll *roll = (LinkStateRoll *) GetLinkState(LinkStateId_Roll);
|
||||
if (roll->vfunc_20(var_r9) != 0) {
|
||||
this->ChangeLinkState(LinkStateId_Roll);
|
||||
return;
|
||||
}
|
||||
LinkStateItem *item = (LinkStateItem *) GetLinkState(LinkStateId_Item);
|
||||
if (item->vfunc_20(var_r9) != 0) {
|
||||
this->ChangeLinkState(LinkStateId_Item);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if ((temp_r0 == 2) || (temp_r7 == 8)) {
|
||||
this->UpdateSwordShieldInUse();
|
||||
} else {
|
||||
if ((temp_r0 == 3) || (temp_r0 == 4) || (temp_r0 == 5) || (temp_r7 == 3) || (temp_r7 == 4) || (temp_r7 == 5) ||
|
||||
(temp_r7 == 9) || ((temp_r7 - 0xD) <= 1U))
|
||||
{
|
||||
this->EquipItem_vfunc_28();
|
||||
}
|
||||
}
|
||||
if (data_027e0618 != 6) {
|
||||
s32 temp_r7_2 = gPlayerControl->func_ov00_020b0418();
|
||||
if ((this->func_ov00_020a8f2c() == 0) && (temp_r7_2 > 0)) {
|
||||
mUnk_0c = temp_r7_2;
|
||||
}
|
||||
if (mUnk_0c > 0) {
|
||||
|
||||
q4 temp_r8 = data_ov005_02112be4;
|
||||
s16 temp_r1 = *this->GetPlayerAngle() + this->Get_PlayerControlData_Unk32();
|
||||
this->TurnTo(temp_r1, temp_r1, temp_r8);
|
||||
s32 temp_r1_2 = mUnk_0c;
|
||||
if (temp_r7_2 > temp_r1_2) {
|
||||
temp_r1_2 = temp_r7_2 - temp_r1_2;
|
||||
Lerp(&mUnk_0c, temp_r7_2 + temp_r1_2, data_ov005_02112bec, MUL_Q20(data_ov005_02112be8, data_ov005_02112bec),
|
||||
0x7FFFFFFF);
|
||||
if (mUnk_0c > FLOAT_TO_Q20(1.0)) {
|
||||
mUnk_0c = FLOAT_TO_Q20(1.0);
|
||||
}
|
||||
} else {
|
||||
Lerp(&mUnk_0c, temp_r7_2, data_ov000_020e56f0, MUL_Q20(data_ov005_02112be8, data_ov000_020e56f0), 0x7FFFFFFF);
|
||||
}
|
||||
}
|
||||
}
|
||||
s32 var_r4;
|
||||
if (mUnk_16 != 1) {
|
||||
if (var_r9 != 0) {
|
||||
Vec3p sp40 = {0, 0, 0};
|
||||
sp40.x = sp4C.x - this->GetPlayerPos()->x;
|
||||
sp40.z = sp4C.z - this->GetPlayerPos()->z;
|
||||
if (Vec3p_Length(&sp40) > FLOAT_TO_Q20(0.2)) {
|
||||
var_r4 = this->func_ov005_0210f808(FLOAT_TO_Q20(1.0), &sp4C, grabActor != NULL);
|
||||
} else {
|
||||
gPlayerControl->StopFollowing();
|
||||
}
|
||||
} else {
|
||||
s32 temp_r1_3 = gPlayerControl->func_ov00_020b034c();
|
||||
var_r4 = this->func_ov005_0210f808(temp_r1_3, NULL, grabActor != NULL);
|
||||
if (gAdventureFlags->func_ov00_02097750() == 0) {
|
||||
UnkFilterActor filter;
|
||||
filter.mActor = NULL;
|
||||
filter.mUnk_08 = FLOAT_TO_Q20(4.0);
|
||||
Vec3p pos = *this->GetPlayerPos();
|
||||
filter.mPos = pos;
|
||||
filter.mAngle = *this->GetPlayerAngle();
|
||||
if (gActorManager->FilterActors(&filter, NULL) > 0) {
|
||||
q20 temp_r1_4 = FLOAT_TO_Q20(4.0) - filter.mUnk_08;
|
||||
Vec3p spC = filter.mActor->mPos;
|
||||
spC.y += filter.mActor->mYOffset;
|
||||
q20 var_r2 = MUL_Q20(temp_r1_4, FLOAT_TO_Q20(0.25)) + FLOAT_TO_Q20(0.1);
|
||||
if (var_r2 >= FLOAT_TO_Q20(1.0)) {
|
||||
var_r2 = FLOAT_TO_Q20(1.0);
|
||||
}
|
||||
this->func_ov00_020a81fc(&spC, var_r2);
|
||||
this->func_ov005_021113d0();
|
||||
}
|
||||
}
|
||||
if (mUnk_12 > 0) {
|
||||
this->func_ov005_021107fc();
|
||||
mUnk_12 -= 1;
|
||||
} else if ((this->Get_PlayerLinkBase_Unk5e() != 0) && (var_r4 == 0)) {
|
||||
this->func_ov00_020a8294(0, FLOAT_TO_Q20(0.2));
|
||||
this->func_ov00_020a827c(0, FLOAT_TO_Q20(0.2));
|
||||
}
|
||||
if ((grabActor != NULL) && (grabActor->mType == ActorTypeId_Cucco)) {
|
||||
if (this->func_ov00_020a8b80() != 0) {
|
||||
mUnk_10 = 0x19;
|
||||
} else if (mUnk_10 > 0) {
|
||||
*(unk16 *) ((u32) this->func_ov00_020a8d40() + 0xa8) = 0x4CD;
|
||||
if (mUnk_10 == 0x19) {
|
||||
func_ov000_020ceacc(&data_027e0ffc, 0x23D, this->GetPlayerPos(), 0);
|
||||
}
|
||||
mUnk_10 -= 1;
|
||||
} else {
|
||||
LinkStateInteract *interact = UnkStruct_02037750::GetLinkStateInteract();
|
||||
interact->SetGrabActorVelocity(this->GetPlayerVel());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (this->GetGrabActor() == NULL) {
|
||||
if (var_r4 <= data_ov005_02112bf0.x) {
|
||||
this->func_ov005_021112ec();
|
||||
}
|
||||
if (mUnk_15) {
|
||||
if (!mUnk_16) {
|
||||
this->func_ov00_020a8a4c(&data_ov005_021123ac, 0);
|
||||
this->func_ov00_020a8ad0(0);
|
||||
mUnk_16 = true;
|
||||
} else if (mUnk_0c > 0) {
|
||||
q20 temp_r4 = data_ov005_021123b8;
|
||||
if (this->func_ov00_020a8d6c() >= temp_r4) {
|
||||
this->func_ov00_020a8ad0(this->func_ov00_020a8d6c() - (temp_r4 - FLOAT_TO_Q20(7.0)));
|
||||
}
|
||||
} else {
|
||||
mUnk_15 = false;
|
||||
mUnk_16 = false;
|
||||
}
|
||||
}
|
||||
ActorRef sp4;
|
||||
sp4.Reset();
|
||||
this->PlayerLinkBase_vfunc_58(0, &sp4);
|
||||
return;
|
||||
}
|
||||
this->PlayerLinkBase_vfunc_58(1, this->GetGrabActorRef());
|
||||
}
|
||||
|
||||
ARM bool LinkStateMove::vfunc_3c() {
|
||||
if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowObject == NULL) &&
|
||||
(this->Get_PlayerControlData_Unk120() != 2) && (this->Get_PlayerControlData_Unk120() != 3))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
ARM bool UnkFilterActor::Filter(Actor *actor) {
|
||||
if (!actor->mVisible) {
|
||||
return false;
|
||||
}
|
||||
|
||||
s32 temp_r0 = actor->mUnk_12c;
|
||||
if ((temp_r0 != 2) && (temp_r0 != 5)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Vec3p sp0;
|
||||
Vec3p_Sub(&actor->mPos, &mPos, &sp0);
|
||||
s16 angle2 = mAngle;
|
||||
s16 angle1 = (s16) Atan2(sp0.x, sp0.z);
|
||||
s32 var_r6 = (s16) (angle1 - angle2) >> 3;
|
||||
if (var_r6 < 0) {
|
||||
var_r6 = -var_r6;
|
||||
}
|
||||
|
||||
q20 length = Vec3p_Length(&sp0);
|
||||
s32 temp_r2 = length + MUL_Q20(var_r6, FLOAT_TO_Q20(4.0));
|
||||
if (temp_r2 < mUnk_08) {
|
||||
mActor = actor;
|
||||
mUnk_08 = temp_r2;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include "System/Random.hpp"
|
||||
|
||||
extern "C" {
|
||||
void func_ov000_0207a1c8(bool *param_1, unk32 param_2, Vec3p *param_3);
|
||||
void func_0202bc38(unk32 param_1, Vec3p *param_2, u32 param_3, Actor_UnkStruct_012 *param_4, bool);
|
||||
void func_ov005_02102c2c(u32 *param_1, int param_2, Vec3p *param_3, int param_4, int param_5, u32 param_6, int param_7,
|
||||
char param_8, char param_9, char param_10);
|
||||
@@ -37,7 +36,7 @@ ActorRupee::ActorRupee() {
|
||||
}
|
||||
|
||||
// https://decomp.me/scratch/1qjCc
|
||||
bool ActorRupee::vfunc_08() {
|
||||
bool ActorRupee::Init() {
|
||||
u32 dVar5;
|
||||
u32 iVar7;
|
||||
|
||||
@@ -71,9 +70,9 @@ bool ActorRupee::vfunc_08() {
|
||||
func_ov14_0213b204(0);
|
||||
break;
|
||||
case 1:
|
||||
q20 x = gRandom->Next(FLOAT_TO_Q20(0.1335));
|
||||
q20 y = gRandom->Next(FLOAT_TO_Q20(0.2));
|
||||
q20 z = gRandom->Next(FLOAT_TO_Q20(0.1335));
|
||||
q20 x = gRandom.Next(FLOAT_TO_Q20(0.1335));
|
||||
q20 y = gRandom.Next(FLOAT_TO_Q20(0.2));
|
||||
q20 z = gRandom.Next(FLOAT_TO_Q20(0.1335));
|
||||
|
||||
mVel.x = x - FLOAT_TO_Q20(0.0666);
|
||||
mVel.y = y + FLOAT_TO_Q20(0.3333);
|
||||
@@ -263,14 +262,14 @@ void ActorRupee::vfunc_14(u32 param1) {
|
||||
if (func_ov00_020c313c(param1)) {
|
||||
Update(false);
|
||||
}
|
||||
func_ov000_0207a1c8(&mUnk_0a4.mUnk_00, param1, &mPos);
|
||||
mUnk_0a4.func_ov000_0207a1c8(param1, &mPos);
|
||||
}
|
||||
|
||||
void ActorRupee::vfunc_18(u32 param1) {
|
||||
if (func_ov00_020c313c(param1)) {
|
||||
Update(true);
|
||||
}
|
||||
func_ov000_0207a1c8(&mUnk_0a4.mUnk_00, param1, &mPos);
|
||||
mUnk_0a4.func_ov000_0207a1c8(param1, &mPos);
|
||||
}
|
||||
|
||||
#define VFUNC20_COND (param1 ? mUnk_0a4.mUnk_01 : mUnk_0a4.mUnk_00)
|
||||
|
||||
@@ -11,7 +11,7 @@ void ActorArrow::func_ov014_0211fd80(unk32 param1) {}
|
||||
void ActorArrow::func_ov014_0211fd90() {}
|
||||
ActorArrow::ActorArrow() {}
|
||||
ActorArrow::~ActorArrow() {}
|
||||
bool ActorArrow::vfunc_08() {}
|
||||
bool ActorArrow::Init() {}
|
||||
bool ActorArrow::CollidesWith(Actor *other) {}
|
||||
void ActorArrow::func_ov014_021200d4() {}
|
||||
void ActorArrow::func_ov014_02120118() {}
|
||||
|
||||
@@ -6,7 +6,7 @@ ActorBlast *ActorBlast::Create() {}
|
||||
void ActorBlast_Unk1::vfunc_10(s32 *param1) {}
|
||||
ActorBlast::ActorBlast() {}
|
||||
ActorBlast::~ActorBlast() {}
|
||||
bool ActorBlast::vfunc_08() {}
|
||||
bool ActorBlast::Init() {}
|
||||
void ActorBlast::vfunc_14(u32 param1) {}
|
||||
ActorBlast_Unk1::~ActorBlast_Unk1() {}
|
||||
void ActorBlast::vfunc_18(u32 param1) {}
|
||||
|
||||
@@ -9,7 +9,7 @@ ActorBomb::ActorBomb() {}
|
||||
ActorBomb_Unk2::~ActorBomb_Unk2() {}
|
||||
ActorBomb::~ActorBomb() {}
|
||||
ActorBomb_Unk2::ActorBomb_Unk2() {}
|
||||
bool ActorBomb::vfunc_08() {}
|
||||
bool ActorBomb::Init() {}
|
||||
void ActorBomb::vfunc_14(u32 param1) {}
|
||||
ActorBomb_Unk1::~ActorBomb_Unk1() {}
|
||||
void ActorBomb::vfunc_18(u32 param1) {}
|
||||
|
||||
@@ -0,0 +1,340 @@
|
||||
#include "Actor/Player/ActorRefill.hpp"
|
||||
#include "DTCM/UnkStruct_027e0d38.hpp"
|
||||
#include "DTCM/UnkStruct_027e103c.hpp"
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "System/Random.hpp"
|
||||
|
||||
static char *sShipTypes[8] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"};
|
||||
|
||||
extern u32 **data_027e0fe0[];
|
||||
ARM ActorRefillBombs *ActorRefillBombs::Create() {
|
||||
return new(*data_027e0fe0[0], 4) ActorRefillBombs();
|
||||
}
|
||||
ActorType ActorRefillBombs::gType = ActorType(ActorTypeId_RefillBombs, (ActorCreateFunc) ActorRefillBombs::Create, NULL);
|
||||
|
||||
ARM ActorRefillBombchus *ActorRefillBombchus::Create() {
|
||||
return new(*data_027e0fe0[0], 4) ActorRefillBombchus();
|
||||
}
|
||||
ActorType ActorRefillBombchus::gType =
|
||||
ActorType(ActorTypeId_RefillBombchus, (ActorCreateFunc) ActorRefillBombchus::Create, NULL);
|
||||
|
||||
ARM ActorRefillArrows *ActorRefillArrows::Create() {
|
||||
return new(*data_027e0fe0[0], 4) ActorRefillArrows();
|
||||
}
|
||||
ActorType ActorRefillArrows::gType = ActorType(ActorTypeId_RefillArrows, (ActorCreateFunc) ActorRefillArrows::Create, NULL);
|
||||
|
||||
ARM ActorRefillTime *ActorRefillTime::Create() {
|
||||
return new(*data_027e0fe0[0], 4) ActorRefillTime();
|
||||
}
|
||||
ActorType ActorRefillTime::gType = ActorType(ActorTypeId_RefillTime, (ActorCreateFunc) ActorRefillTime::Create, NULL);
|
||||
|
||||
ARM ActorLSTM *ActorLSTM::Create() {
|
||||
return new(*data_027e0fe0[0], 4) ActorLSTM();
|
||||
}
|
||||
ActorType ActorLSTM::gType = ActorType(ActorTypeId_LSTM, (ActorCreateFunc) ActorLSTM::Create, NULL);
|
||||
|
||||
ARM ActorRefill::ActorRefill(unk32 param1) :
|
||||
mUnk_158(0),
|
||||
mUnk_15c(0x56),
|
||||
mUnk_160(param1),
|
||||
mUnk_164(0x1f) {}
|
||||
|
||||
ARM ActorRefill::~ActorRefill() {}
|
||||
|
||||
ARM bool ActorRefill::Init() {
|
||||
ItemManager *itemManager;
|
||||
|
||||
if (this->GetAmmoItem() == ItemFlag_None) {
|
||||
if (data_027e0d38->func_ov000_02078b40() != 3) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
ItemManager *itemManager = gItemManager;
|
||||
ItemFlag item = this->GetAmmoItem();
|
||||
if (!itemManager->HasItem(item)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
mHitbox.pos.x = 0;
|
||||
mHitbox.pos.y = FLOAT_TO_Q20(0.3);
|
||||
mHitbox.pos.z = 0;
|
||||
mHitbox.size = FLOAT_TO_Q20(0.3);
|
||||
mUnk_08c.pos.x = mHitbox.pos.x;
|
||||
mUnk_08c.pos.y = mHitbox.pos.y;
|
||||
mUnk_08c.pos.z = mHitbox.pos.z;
|
||||
mUnk_08c.size = mHitbox.size;
|
||||
mUnk_0a4.mUnk_04.x = 0;
|
||||
mUnk_0a4.mUnk_04.y = FLOAT_TO_Q20(0.3);
|
||||
mUnk_0a4.mUnk_04.z = 0;
|
||||
mUnk_0a4.mUnk_10 = FLOAT_TO_Q20(1.3);
|
||||
mUnk_09c.mUnk_0 &= ~0xa4;
|
||||
mUnk_09c.mUnk_3 = 1;
|
||||
mMaxFall = mUnk_08c.size + -1;
|
||||
this->func_ov014_02135364(0);
|
||||
return true;
|
||||
}
|
||||
|
||||
extern unk32 data_ov000_020eec9c;
|
||||
extern "C" void func_ov000_020d7ad4(unk32 *param1, unk32 param2);
|
||||
ARM void ActorRefill::vfunc_14(u32 param1) {
|
||||
s32 temp_r0_4;
|
||||
s32 temp_r6;
|
||||
s8 var_r0;
|
||||
u32 temp_r0;
|
||||
u32 temp_r0_3;
|
||||
u32 temp_r1;
|
||||
Vec3p *temp_r0_2;
|
||||
|
||||
if (this->func_ov00_020c313c(param1) != 0) {
|
||||
this->IncreaseActiveFrames();
|
||||
temp_r0 = mUnk_130;
|
||||
switch (temp_r0) {
|
||||
case 0:
|
||||
this->ApplyGravity();
|
||||
temp_r0_2 = &mPos;
|
||||
Vec3p_Add(temp_r0_2, &mVel, temp_r0_2);
|
||||
this->func_01fffd04(0);
|
||||
if (mUnk_110 || mUnk_112 || mUnk_113) {
|
||||
mVel.x = 0;
|
||||
mVel.z = 0;
|
||||
}
|
||||
if (mUnk_111) {
|
||||
this->func_ov014_02135364(1);
|
||||
} else if (this->func_ov00_020c2c0c()) {
|
||||
this->func_ov014_02135364(4);
|
||||
} else if (this->func_ov00_020c2d54()) {
|
||||
this->func_ov014_02135364(5);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
case 4:
|
||||
case 5:
|
||||
if (this->CollidesWithPlayer(PlayerCollide_PickupFlags) != 0) {
|
||||
if (this->GetAmmoItem() == -1) {
|
||||
data_027e103c->func_ov000_020cfbf0(mUnk_158 * 60, 1, 0);
|
||||
} else {
|
||||
ItemManager *itemManager = gItemManager;
|
||||
itemManager->GiveAmmo(this->GetAmmoItem(), mUnk_158);
|
||||
}
|
||||
func_ov000_020d7ad4(&data_ov000_020eec9c, 0x100);
|
||||
this->func_ov014_02135364(3);
|
||||
} else {
|
||||
temp_r0_3 = mUnk_130;
|
||||
switch (temp_r0_3) {
|
||||
case 0:
|
||||
case 3: break;
|
||||
case 1:
|
||||
if (this->func_ov00_020c2c0c()) {
|
||||
this->func_ov014_02135364(4);
|
||||
} else if (this->func_ov00_020c2d54()) {
|
||||
this->func_ov014_02135364(5);
|
||||
} else if (mActiveFrames >= 180) {
|
||||
this->func_ov014_02135364(2);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (mActiveFrames % 8 < 4) {
|
||||
mUnk_164 = 0;
|
||||
} else {
|
||||
mUnk_164 = 31;
|
||||
}
|
||||
if (this->func_ov00_020c2c0c()) {
|
||||
this->func_ov014_02135364(4);
|
||||
} else if (this->func_ov00_020c2d54()) {
|
||||
this->func_ov014_02135364(5);
|
||||
} else if (mActiveFrames >= 60) {
|
||||
this->func_ov014_02135364(3);
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
if (!this->func_ov00_020c2c70()) {
|
||||
this->func_ov014_02135364(1);
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
if (!this->func_ov00_020c2de4()) {
|
||||
this->func_ov014_02135364(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
this->KillInBounds();
|
||||
}
|
||||
mUnk_0a4.func_ov000_0207a1c8(param1, &mPos);
|
||||
}
|
||||
|
||||
ARM bool ActorRefill::func_ov014_02135364(unk32 param1) {
|
||||
mUnk_130 = param1;
|
||||
mUnk_164 = 31;
|
||||
mActiveFrames = 0;
|
||||
switch (mUnk_130) {
|
||||
case 0:
|
||||
case 2: break;
|
||||
case 1:
|
||||
mVel.x = 0;
|
||||
mVel.y = 0;
|
||||
mVel.z = 0;
|
||||
break;
|
||||
case 3: this->Kill(); break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
extern "C" void func_0202bc38(bool param1, Vec3p *pos, unk32 param2, Actor_UnkStruct_012 *param3, unk32 param4);
|
||||
extern u32 data_ov000_020e9370[];
|
||||
extern "C" void func_ov005_02102c2c(u32 *param_1, int param_2, Vec3p *param_3, int param_4, int param_5, u32 param_6,
|
||||
int param_7, char param_8, char param_9, char param_10);
|
||||
ARM void ActorRefill::vfunc_20(bool param1) {
|
||||
bool var_r0;
|
||||
|
||||
if (param1) {
|
||||
var_r0 = mUnk_0a4.mUnk_01;
|
||||
} else {
|
||||
var_r0 = mUnk_0a4.mUnk_00;
|
||||
}
|
||||
if (var_r0 && mUnk_164 != 0) {
|
||||
Actor_UnkStruct_012 sp18;
|
||||
sp18.mUnk_04 = 5;
|
||||
sp18.mUnk_08 = 2;
|
||||
sp18.mUnk_0c = 2;
|
||||
sp18.mUnk_14 = 0x800;
|
||||
sp18.mUnk_18 = 0x1000;
|
||||
sp18.mUnk_02 = mUnk_164;
|
||||
func_0202bc38(param1, &mPos, mUnk_15c, &sp18, 0);
|
||||
func_ov005_02102c2c(&data_ov000_020e9370[0], 0, &mPos, 0x400, 0x400, 0, mUnk_164, 0, 0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
extern unk32 *data_027e0e58;
|
||||
extern "C" void func_ov000_0207c1b0(unk32 *param1, unk32 param2, Vec3p *param3, unk32 param4, unk32 param5, unk32 param6);
|
||||
ARM void ActorRefill::func_ov014_02135474() {
|
||||
s32 iVar1 = mUnk_130;
|
||||
if (iVar1 != 4 && iVar1 != 5) {
|
||||
func_ov000_0207c1b0(data_027e0e58, 0x241, &mPos, 2, 0, 0);
|
||||
func_ov000_0207c1b0(data_027e0e58, 0x242, &mPos, 2, 0, 0);
|
||||
mAlive = false;
|
||||
}
|
||||
}
|
||||
|
||||
ARM ActorRefillBombs::ActorRefillBombs() :
|
||||
ActorRefill(0) {
|
||||
mUnk_158 = 3;
|
||||
mUnk_15c = 0x2e;
|
||||
}
|
||||
|
||||
ARM ActorRefillBombs::~ActorRefillBombs() {}
|
||||
|
||||
ARM ItemFlag ActorRefillBombs::GetAmmoItem() {
|
||||
return ItemFlag_BombBag;
|
||||
}
|
||||
|
||||
ARM ActorRefillBombchus::ActorRefillBombchus() :
|
||||
ActorRefill(1) {
|
||||
mUnk_158 = 3;
|
||||
mUnk_15c = 0x2f;
|
||||
}
|
||||
|
||||
ARM ActorRefillBombchus::~ActorRefillBombchus() {}
|
||||
|
||||
ARM ItemFlag ActorRefillBombchus::GetAmmoItem() {
|
||||
return ItemFlag_BombchuBag;
|
||||
}
|
||||
|
||||
ARM ActorRefillArrows::ActorRefillArrows() :
|
||||
ActorRefill(2) {
|
||||
mUnk_158 = 5;
|
||||
mUnk_15c = 0x2d;
|
||||
}
|
||||
|
||||
ARM ActorRefillArrows::~ActorRefillArrows() {}
|
||||
|
||||
ARM ItemFlag ActorRefillArrows::GetAmmoItem() {
|
||||
return ItemFlag_Bow;
|
||||
}
|
||||
|
||||
ARM ActorRefillTime::ActorRefillTime() :
|
||||
ActorRefill(3) {
|
||||
mUnk_158 = 5;
|
||||
mUnk_15c = 0x44;
|
||||
}
|
||||
|
||||
ARM ActorRefillTime::~ActorRefillTime() {}
|
||||
|
||||
ARM bool ActorRefillTime::Init() {
|
||||
if (!ActorRefill::Init()) {
|
||||
return false;
|
||||
}
|
||||
switch (mUnk_020.mUnk_00[0]) {
|
||||
case 2: mUnk_158 = 5; break;
|
||||
case 4: mUnk_158 = 15; break;
|
||||
case 5: mUnk_158 = 30; break;
|
||||
default:
|
||||
case 0:
|
||||
case 1:
|
||||
case 3:
|
||||
s32 temp_ip = gRandom.Next(10);
|
||||
if (temp_ip >= 9) {
|
||||
mUnk_158 = 30;
|
||||
} else if (temp_ip >= 6) {
|
||||
mUnk_158 = 15;
|
||||
} else {
|
||||
mUnk_158 = 5;
|
||||
}
|
||||
break;
|
||||
}
|
||||
switch (mUnk_158) {
|
||||
case 15: mUnk_15c = 0x45; break;
|
||||
case 30: mUnk_15c = 0x46; break;
|
||||
default: mUnk_15c = 0x44; break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM ItemFlag ActorRefillTime::GetAmmoItem() {
|
||||
return ItemFlag_None;
|
||||
}
|
||||
|
||||
ARM ActorLSTM::ActorLSTM() :
|
||||
ActorRefill(3) {
|
||||
mUnk_158 = -5;
|
||||
mUnk_15c = 0x47;
|
||||
}
|
||||
|
||||
ARM ActorLSTM::~ActorLSTM() {}
|
||||
|
||||
ARM bool ActorLSTM::Init() {
|
||||
if (!ActorRefill::Init()) {
|
||||
return false;
|
||||
}
|
||||
switch (mUnk_020.mUnk_00[0]) {
|
||||
case 2: mUnk_158 = -5; break;
|
||||
case 4: mUnk_158 = -15; break;
|
||||
case 5: mUnk_158 = -30; break;
|
||||
default:
|
||||
case 0:
|
||||
case 1:
|
||||
case 3:
|
||||
s32 temp_ip = gRandom.Next(10);
|
||||
if (temp_ip >= 9) {
|
||||
mUnk_158 = -30;
|
||||
} else if (temp_ip >= 6) {
|
||||
mUnk_158 = -15;
|
||||
} else {
|
||||
mUnk_158 = -5;
|
||||
}
|
||||
break;
|
||||
}
|
||||
switch (mUnk_158) {
|
||||
case -15: mUnk_15c = 0x48; break;
|
||||
case -30: mUnk_15c = 0x49; break;
|
||||
default: mUnk_15c = 0x47; break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM ItemFlag ActorLSTM::GetAmmoItem() {
|
||||
return ItemFlag_None;
|
||||
}
|
||||
@@ -5,7 +5,7 @@ ActorRope_Unk_0219a3b0 gUnk_0219a3b0;
|
||||
void ActorRope_Unk_0219a3b0::vfunc_08(unk16 *param1) {}
|
||||
void ActorRope_Unk_0219a3b0::vfunc_10(s32 *param1) {}
|
||||
ActorRope::ActorRope() {}
|
||||
bool ActorRope::vfunc_08() {}
|
||||
bool ActorRope::Init() {}
|
||||
q20 ActorRope::func_ov057_0219a5ac() {}
|
||||
void ActorRope::func_ov057_0219a6b8() {}
|
||||
void ActorRope::func_ov057_0219a850() {}
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
DebugHierarchyBase::DebugHierarchyBase() {}
|
||||
DebugHierarchyBase::~DebugHierarchyBase() {}
|
||||
DebugHierarchyNode *DebugHierarchyBase::FindNode(u32 id) {}
|
||||
bool DebugHierarchyBase::GetChildNode(unk32 param1, const char *description, u32 parent, s32 *param4) {}
|
||||
bool DebugHierarchyBase::GetChildNode(unk32 param1, const char *description, u32 parent, s32 *param4, unk32 param5,
|
||||
unk32 param6, unk32 param7, unk32 param8) {}
|
||||
void DebugHierarchyBase::vfunc_08() {}
|
||||
void DebugHierarchyBase::vfunc_0c() {}
|
||||
void DebugHierarchyBase::vfunc_10() {}
|
||||
void DebugHierarchyBase::vfunc_14() {}
|
||||
void DebugHierarchyBase::vfunc_18() {}
|
||||
void DebugHierarchyBase::vfunc_1c() {}
|
||||
void DebugHierarchyBase::vfunc_20() {}
|
||||
void DebugHierarchyBase::vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6) {}
|
||||
void DebugHierarchyBase::vfunc_24() {}
|
||||
void DebugHierarchyBase::vfunc_28() {}
|
||||
void DebugHierarchyBase::vfunc_2c() {}
|
||||
void DebugHierarchyBase::vfunc_30() {}
|
||||
void DebugHierarchyBase::vfunc_38() {}
|
||||
void DebugHierarchyBase::vfunc_3c() {}
|
||||
void DebugHierarchyBase::vfunc_3c(unk32 param1, void *param2) {}
|
||||
|
||||
@@ -0,0 +1,211 @@
|
||||
extern "C" {
|
||||
#include <string.h>
|
||||
}
|
||||
#include "Message/BMG.hpp"
|
||||
|
||||
char *func_0202ab38(u32 *lang);
|
||||
u32 *func_0202d550(int, u32 *, char *path, int, int, int);
|
||||
void func_0202d590(BMGHeader *);
|
||||
|
||||
extern u32 *data_027e0ce0[];
|
||||
extern u32 data_027e05f4; // language
|
||||
extern u32 *data_ov002_0210016c;
|
||||
|
||||
static char *sBMGFileNames[BMG_FILE_INDEX_MAX] = {
|
||||
"system", // BMG_FILE_INDEX_SYSTEM
|
||||
"regular", // BMG_FILE_INDEX_REGULAR
|
||||
"battle", // BMG_FILE_INDEX_BATTLE
|
||||
"test", // BMG_FILE_INDEX_TEST
|
||||
"default", // BMG_FILE_INDEX_DEFAULT
|
||||
"sea", // BMG_FILE_INDEX_SEA
|
||||
"kaitei", // BMG_FILE_INDEX_KAITEI
|
||||
"main_isl", // BMG_FILE_INDEX_MAIN_ISL
|
||||
"brave", // BMG_FILE_INDEX_BRAVE
|
||||
"flame", // BMG_FILE_INDEX_FLAME
|
||||
"wind", // BMG_FILE_INDEX_WIND
|
||||
"frost", // BMG_FILE_INDEX_FROST
|
||||
"power", // BMG_FILE_INDEX_POWER
|
||||
"wisdom", // BMG_FILE_INDEX_WISDOM
|
||||
"ghost", // BMG_FILE_INDEX_GHOST
|
||||
"hidari", // BMG_FILE_INDEX_HIDARI
|
||||
"sennin", // BMG_FILE_INDEX_SENNIN
|
||||
"ship", // BMG_FILE_INDEX_SHIP
|
||||
"collect", // BMG_FILE_INDEX_COLLECT
|
||||
"mainselect", // BMG_FILE_INDEX_MAINSELECT
|
||||
"field", // BMG_FILE_INDEX_FIELD
|
||||
"wisdom_dngn", // BMG_FILE_INDEX_WISDOM_DNGN
|
||||
"demo", // BMG_FILE_INDEX_DEMO
|
||||
"battleCommon", // BMG_FILE_INDEX_BATTLECOMMON
|
||||
"bossLast1", // BMG_FILE_INDEX_BOSSLAST1
|
||||
"bossLast3", // BMG_FILE_INDEX_BOSSLAST3
|
||||
"torii", // BMG_FILE_INDEX_TORII
|
||||
"myou", // BMG_FILE_INDEX_MYOU
|
||||
"kojima1", // BMG_FILE_INDEX_KOJIMA1
|
||||
"kojima2", // BMG_FILE_INDEX_KOJIMA2
|
||||
"kojima5", // BMG_FILE_INDEX_KOJIMA5
|
||||
"kojima3", // BMG_FILE_INDEX_KOJIMA3
|
||||
"staff", // BMG_FILE_INDEX_STAFF
|
||||
"kaitei_F", // BMG_FILE_INDEX_KAITEI_F
|
||||
};
|
||||
|
||||
THUMB void BMGFileInfo::func_020371b4() {
|
||||
this->pHeader = NULL;
|
||||
this->pINF1 = NULL;
|
||||
this->pFLW1 = NULL;
|
||||
this->pFLI1 = NULL;
|
||||
this->pDAT1 = NULL;
|
||||
this->mUnk_14 = NULL;
|
||||
this->mUnk_18 = 0;
|
||||
}
|
||||
|
||||
// non-matching (equivalent)
|
||||
THUMB u16 BMGFileInfo::func_020371c8(u32 *pFile, s16 unk_18) {
|
||||
SectionBase *pSection;
|
||||
u16 groupId;
|
||||
u32 i;
|
||||
BMGHeader *pHeader = (BMGHeader *) pFile;
|
||||
|
||||
groupId = -1;
|
||||
this->mUnk_14 = pHeader;
|
||||
this->mUnk_18 = unk_18;
|
||||
this->pHeader = pHeader;
|
||||
pSection = (SectionBase *) ((u8 *) pFile + sizeof(BMGHeader));
|
||||
|
||||
for (i = 0; i < this->mUnk_14->numSections; i++) {
|
||||
switch (pSection->tag) {
|
||||
case BMG_TAG_MID1:
|
||||
// unused
|
||||
break;
|
||||
case BMG_TAG_STR1:
|
||||
// unused
|
||||
break;
|
||||
case BMG_TAG_INF1:
|
||||
this->pINF1 = (SectionINF1 *) pSection;
|
||||
groupId = this->pINF1->groupId;
|
||||
break;
|
||||
case BMG_TAG_DAT1:
|
||||
//! TODO: fake?
|
||||
this->pDAT1 = (SectionDAT1 *) (pSection + 1);
|
||||
break;
|
||||
case BMG_TAG_FLW1: this->pFLW1 = (SectionFLW1 *) pSection; break;
|
||||
case BMG_TAG_FLI1: this->pFLI1 = (SectionFLI1 *) pSection; break;
|
||||
}
|
||||
|
||||
pSection = (SectionBase *) ((u8 *) pSection + pSection->size);
|
||||
}
|
||||
|
||||
return groupId;
|
||||
}
|
||||
|
||||
ARM EntryINF1 *BMGFileInfo::func_02037258(u16 param_2) {
|
||||
if (this->pINF1 != NULL) {
|
||||
if (param_2 < this->pINF1->numEntries) {
|
||||
return (EntryINF1 *) ((u32) & this->pINF1->entries + this->pINF1->entrySize * param_2);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM u16 BMGFileInfo::func_0203728c(unk32 param_2) {
|
||||
SectionFLI1 *pFLI1;
|
||||
EntryFLI1 *entry;
|
||||
u32 i;
|
||||
u16 j;
|
||||
|
||||
pFLI1 = this->pFLI1;
|
||||
|
||||
if (pFLI1 == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
do {
|
||||
entry = &pFLI1->entries[i];
|
||||
|
||||
if (param_2 > entry->msgFlowID) {
|
||||
return entry->msgFlowNodeIndex;
|
||||
}
|
||||
|
||||
// i++;
|
||||
j = i + 1;
|
||||
i = j & 0xFFFF;
|
||||
} while (j < pFLI1->numEntries);
|
||||
|
||||
// for (i = 0; (u16)i < pFLI1->numEntries; i++) {
|
||||
// if (param_2 == pFLI1->entries[i].msgFlowID) {
|
||||
// return pFLI1->entries[i].msgFlowNodeIndex;
|
||||
// }
|
||||
// }
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
THUMB void BMGGroups::func_020372f0(BMGFileIndex eIndex, s16 unk_18) {
|
||||
char bmgPath[64];
|
||||
BMGFileInfo bmgFile;
|
||||
u32 *pFile;
|
||||
u16 groupId;
|
||||
|
||||
// path to the bmg file for the current language (i.e.: "English/Message/battle.bmg")
|
||||
strcpy(bmgPath, func_0202ab38(&data_027e05f4));
|
||||
strcat(bmgPath, "/Message/");
|
||||
strcat(bmgPath, sBMGFileNames[eIndex]);
|
||||
strcat(bmgPath, ".bmg");
|
||||
|
||||
pFile = data_027e0ce0[1];
|
||||
|
||||
if (unk_18 != 1) {
|
||||
if (unk_18 != 4) {
|
||||
pFile = data_027e0ce0[0];
|
||||
} else {
|
||||
pFile = data_ov002_0210016c;
|
||||
}
|
||||
} else {
|
||||
// pFile = data_027e0ce0[0];
|
||||
}
|
||||
|
||||
// get file data
|
||||
pFile = func_0202d550(0xC4, pFile, bmgPath, 0, 0x10, 0);
|
||||
|
||||
// initialize file info
|
||||
bmgFile.groupId = 0;
|
||||
bmgFile.func_020371b4();
|
||||
|
||||
// assign sections and set the file info in the groups entries
|
||||
groupId = bmgFile.func_020371c8(pFile, unk_18);
|
||||
this->entries[groupId] = bmgFile;
|
||||
this->entries[groupId].groupId = groupId;
|
||||
}
|
||||
|
||||
THUMB void BMGGroups::func_020373b4(s16 unk_18) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < this->numEntries; i++) {
|
||||
if (this->entries[i].mUnk_18 == unk_18) {
|
||||
func_0202d590(this->entries[i].mUnk_14);
|
||||
this->entries[i].func_020371b4();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM u32 BMGGroups::func_020373ec(unk32 param_2) {
|
||||
u16 dVar1;
|
||||
u16 uVar2;
|
||||
s32 i;
|
||||
|
||||
dVar1 = -1;
|
||||
|
||||
for (i = 0; i < this->numEntries; i++) {
|
||||
uVar2 = this->entries[i].func_0203728c(param_2);
|
||||
|
||||
if (uVar2 != dVar1) {
|
||||
return uVar2 | i << 0x10;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
extern "C" {
|
||||
#include <string.h>
|
||||
}
|
||||
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
THUMB void func_0202d3bc(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6, int param_7,
|
||||
int param_8) {
|
||||
// bool bVar1;
|
||||
// dword dVar2;
|
||||
// int iVar3;
|
||||
// dword *pdVar4;
|
||||
// uint uVar5;
|
||||
// dword local_64;
|
||||
// astruct_3 aStack_60;
|
||||
// dword *pdStack_18;
|
||||
|
||||
// pdVar4 = (dword *)(uint)param_4;
|
||||
// *(char **)PTR_DWORD_0202d46c = path;
|
||||
// local_64 = DWORD_0202d470;
|
||||
// if (pdVar4 != (dword *)0x0) {
|
||||
// *pdVar4 = DWORD_0202d470;
|
||||
// }
|
||||
// pdStack_18 = pdVar4;
|
||||
// astruct_3(&aStack_60);
|
||||
// bVar1 = FUN_02041e7c(&aStack_60,path);
|
||||
// if (bVar1) {
|
||||
// uVar5 = aStack_60._40_4_ - aStack_60._36_4_;
|
||||
// if (uVar5 != 0) {
|
||||
// if (param_6) {
|
||||
// local_64 = FUN_0202d23c(&aStack_60,param_1,param_2,param_5,0,uVar5,pdVar4,param_7,param_8);
|
||||
// }
|
||||
// else {
|
||||
// if (param_7 == 0) {
|
||||
// dVar2 = FUN_0202d1c4(param_1,param_2,uVar5,param_5);
|
||||
// }
|
||||
// else {
|
||||
// dVar2 = 0;
|
||||
// if (uVar5 <= param_8) {
|
||||
// dVar2 = param_7;
|
||||
// }
|
||||
// }
|
||||
// if (dVar2 != 0) {
|
||||
// iVar3 = astruct_3::FUN_02041fa4(&aStack_60,dVar2,uVar5);
|
||||
// if (iVar3 == -1) {
|
||||
// if (param_7 == 0) {
|
||||
// FUN_0202d21c(dVar2);
|
||||
// }
|
||||
// }
|
||||
// else {
|
||||
// local_64 = dVar2;
|
||||
// if (pdVar4 != (dword *)0x0) {
|
||||
// *pdVar4 = uVar5;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// astruct_3::FUN_02041ea8(&aStack_60);
|
||||
// }
|
||||
|
||||
// return local_64;
|
||||
}
|
||||
|
||||
THUMB void func_0202d550(int param_1, unsigned int *param_2, char *path, int param_4, int param_5, bool param_6) {
|
||||
func_0202d3bc(param_1, param_2, path, param_4, param_5, param_6, 0, 0);
|
||||
}
|
||||
@@ -0,0 +1,576 @@
|
||||
#include "Message/MessageManager.hpp"
|
||||
#include "Actor/ActorManager.hpp"
|
||||
#include "Player/TouchControl.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
|
||||
extern ARM unk32 func_ov000_020d7f18(u32 *, unk32);
|
||||
extern ARM unk32 func_02037628(u8 *);
|
||||
|
||||
extern u32 *data_027e0ce0[];
|
||||
extern u32 data_02056924[];
|
||||
extern UnkStruct_MsgProc_Base_unk_2C *data_02068e6c;
|
||||
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;
|
||||
|
||||
extern u32 data_027e0618[];
|
||||
|
||||
// non-matching
|
||||
ARM void MessageManager::func_0203643c(u32 *param_1, MessageManager *param_2, u32 param_3) {
|
||||
BMGGroups *pBVar2 = param_2->pGroups;
|
||||
|
||||
*param_1 = ((u32) pBVar2->entries[param_3 >> 0x10].pDAT1 +
|
||||
(pBVar2->entries[param_3 >> 0x10].func_02037258(param_3 & 0xFFFF)->offset & ~1));
|
||||
}
|
||||
|
||||
// non-matching
|
||||
THUMB void MessageManager::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) {
|
||||
this->mUnk_03 = 0;
|
||||
this->mUnk_0c = 0;
|
||||
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2);
|
||||
|
||||
switch (*data_027e0618) {
|
||||
case 3:
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2);
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2);
|
||||
break;
|
||||
case 5:
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2);
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2);
|
||||
break;
|
||||
case 6:
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLE, 2);
|
||||
this->pGroups->func_020372f0(BMG_FILE_INDEX_BATTLECOMMON, 2);
|
||||
break;
|
||||
case 7: this->pGroups->func_020372f0(BMG_FILE_INDEX_MAINSELECT, 2); break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
|
||||
this->mUnk_18[i] = NULL;
|
||||
}
|
||||
|
||||
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
this->mUnk_28[i] = NULL;
|
||||
}
|
||||
|
||||
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
|
||||
this->mUnk_18[i] = new(data_027e0ce0[1], 4) UnkStruct_020386d8();
|
||||
}
|
||||
|
||||
this->mUnk_18[0]->mUnk_39 = 0;
|
||||
this->mUnk_18[1]->mUnk_39 = 1;
|
||||
|
||||
if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) {
|
||||
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
switch (data_02056924[i + 1]) {
|
||||
case 0:
|
||||
if (*data_027e0618 != 2) {
|
||||
this->mUnk_28[i] = new(data_027e0ce0[1], 4) UnkStruct_020397f8();
|
||||
this->mUnk_28[i]->func_0203dc74(0xE0, 0x40);
|
||||
this->mUnk_28[i]->mUnk_2c = &data_02068e6c;
|
||||
this->mUnk_28[i]->mUnk_50 = i != 0;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type3();
|
||||
this->mUnk_28[i]->func_0203dc74(0x50, 0x60);
|
||||
this->mUnk_28[i]->mUnk_2c = &data_02068e6c;
|
||||
break;
|
||||
case 2: this->mUnk_28[i] = NULL; break;
|
||||
case 3:
|
||||
if (func_0202ab48() == 0) {
|
||||
this->mUnk_28[i] = new(data_027e0ce0[1], 4) MsgProc_Type2();
|
||||
this->mUnk_28[i]->func_0203dc74(0xC0, 0x20);
|
||||
this->mUnk_28[i]->mUnk_2c = &data_02068e8c;
|
||||
} else {
|
||||
this->mUnk_28[i] = NULL;
|
||||
}
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
if (this->mUnk_28[i] != NULL) {
|
||||
this->mUnk_28[i]->vfunc_4C();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
THUMB void MessageManager::func_0203665c(void) {
|
||||
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
if (this->mUnk_28[i] != NULL) {
|
||||
delete this->mUnk_28[i];
|
||||
|
||||
this->mUnk_28[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
|
||||
if (this->mUnk_18[i] != NULL) {
|
||||
delete this->mUnk_18[i];
|
||||
|
||||
this->mUnk_18[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
this->pGroups->func_020373b4(2);
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM UnkStruct_020397f8 *MessageManager::func_020366c4(void) {
|
||||
if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) {
|
||||
return (UnkStruct_020397f8 *) this->mUnk_28[2];
|
||||
}
|
||||
|
||||
return (UnkStruct_020397f8 *) this->mUnk_28[0];
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM UnkStruct_020397f8 *MessageManager::func_02036700(void) {
|
||||
if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) {
|
||||
return (UnkStruct_020397f8 *) this->mUnk_28[0];
|
||||
}
|
||||
|
||||
return (UnkStruct_020397f8 *) this->mUnk_28[2];
|
||||
}
|
||||
|
||||
ARM UnkStruct_020386d8 *MessageManager::func_0203673c(void) {
|
||||
bool iVar1 = this->func_02036824();
|
||||
bool iVar2 = this->func_02036850();
|
||||
|
||||
if (iVar1) {
|
||||
return this->mUnk_18[0];
|
||||
}
|
||||
|
||||
if (iVar2) {
|
||||
return this->mUnk_18[1];
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_02036770(u32 param_2) {
|
||||
return (this->mUnk_18[param_2]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10);
|
||||
}
|
||||
|
||||
ARM unk32 MessageManager::func_02036798(void) {
|
||||
unk32 uVar2 = 1;
|
||||
|
||||
if (this->mUnk_04 == 0) {
|
||||
bool bVar1 = false;
|
||||
|
||||
if (this->mUnk_18[1] != NULL && (this->mUnk_18[1]->mUnk_18 & 0xFFFF0000) != (1 << 24)) {
|
||||
bVar1 = true;
|
||||
}
|
||||
|
||||
if (!bVar1) {
|
||||
uVar2 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return uVar2;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_020367dc(int param_2) {
|
||||
return param_2 == 0;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_020367ec(void) {
|
||||
return ((UnkStruct_020397f8 *) this->mUnk_28[0])->mUnk_15c > 0;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_02036808(void) {
|
||||
return ((UnkStruct_020397f8 *) this->mUnk_28[2])->mUnk_15c > 0;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_02036824(void) {
|
||||
switch (data_027e077c.mUnk_0) {
|
||||
case 0x01:
|
||||
case 0x37:
|
||||
case 0x3B: return true;
|
||||
default: break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM bool MessageManager::func_02036850(void) {
|
||||
return !(data_02056be4[data_027e077c.mUnk_0] & 2) && (data_02056be4[data_027e077c.mUnk_0] & 1);
|
||||
}
|
||||
|
||||
ARM void MessageManager::func_02036888(UnkStruct_020386d8 *param_2) {
|
||||
if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) {
|
||||
UnkStruct_020397f8 *iVar1 = this->func_020366c4();
|
||||
|
||||
if (iVar1->mUnk_15c <= 0) {
|
||||
param_2->vfunc_10();
|
||||
} else {
|
||||
param_2->vfunc_0c(this->func_020366c4());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_020368f4(UnkStruct_02037750 *param_2) {
|
||||
if (this->mUnk_20[1] != NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
this->mUnk_20[1] = param_2;
|
||||
return true;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void MessageManager::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) {
|
||||
UnkStruct_020397f8 *unk_28_0;
|
||||
UnkStruct_020397f8 *unk_28_2;
|
||||
UnkStruct_02038aa0 *pSVar4;
|
||||
ActorRef actorRef;
|
||||
Actor *pActor;
|
||||
bool iVar1;
|
||||
bool iVar2;
|
||||
s32 i;
|
||||
|
||||
if (!this->func_020367dc(param_2)) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->mUnk_40[1] = this->mUnk_40[0];
|
||||
|
||||
unk_28_0 = (UnkStruct_020397f8 *) this->mUnk_28[0];
|
||||
|
||||
if (unk_28_0 != NULL && unk_28_0->mUnk_15c > 0) {
|
||||
unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2];
|
||||
|
||||
if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) {
|
||||
this->mUnk_40[0] = this->func_020366c4();
|
||||
} else {
|
||||
this->mUnk_40[0] = unk_28_2;
|
||||
}
|
||||
} else {
|
||||
unk_28_2 = (UnkStruct_020397f8 *) this->mUnk_28[2];
|
||||
|
||||
if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) {
|
||||
this->mUnk_40[0] = unk_28_0;
|
||||
} else {
|
||||
this->mUnk_40[0] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
iVar1 = this->func_02036824();
|
||||
iVar2 = this->func_02036850();
|
||||
|
||||
if (this->mUnk_20[1] != NULL && ((this->mUnk_20[1]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) {
|
||||
this->mUnk_20[1]->vfunc_10();
|
||||
this->mUnk_20[1] = NULL;
|
||||
}
|
||||
|
||||
if (iVar1) {
|
||||
this->func_02036888(this->mUnk_18[0]);
|
||||
} else if (iVar2) {
|
||||
this->func_02036888(this->mUnk_18[1]);
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
if (this->mUnk_28[i] != NULL) {
|
||||
this->mUnk_28[i]->vfunc_2C();
|
||||
}
|
||||
}
|
||||
|
||||
this->mUnk_04 = 0;
|
||||
|
||||
if (this->mUnk_20[0] != NULL) {
|
||||
if ((this->mUnk_20[0]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10)) {
|
||||
this->mUnk_20[0] = NULL;
|
||||
} else {
|
||||
this->mUnk_04 = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if ((this->mUnk_18[0] != NULL) && ((this->mUnk_18[0]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) {
|
||||
this->mUnk_04 = 1;
|
||||
|
||||
//! TODO: fake?
|
||||
pSVar4 = this->func_02037178((UnkSubClass1_02256FF8 *) this->mUnk_18[0]);
|
||||
|
||||
if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) {
|
||||
this->mUnk_04 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (this->mUnk_08 != NULL && this->mUnk_08->mUnk_15c > 0) {
|
||||
this->mUnk_04 = 1;
|
||||
} else {
|
||||
this->mUnk_08 = NULL;
|
||||
}
|
||||
|
||||
this->func_02036bbc();
|
||||
|
||||
if (this->mUnk_10 != 0) {
|
||||
ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->mUnk_10]);
|
||||
pActor = gActorManager->GetActor(&actorRef);
|
||||
|
||||
if (pActor != NULL) {
|
||||
data_027e0ffc->func_ov000_020cec60(data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM void MessageManager::func_02036bbc(void) {
|
||||
UnkStruct_02038aa0 *pSVar3;
|
||||
bool bVar2;
|
||||
bool bVar4;
|
||||
s32 i;
|
||||
|
||||
if (data_027e0d04.mUnk_00 > 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
bVar2 = this->func_02036824();
|
||||
bVar4 = this->func_02036850();
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
pSVar3 = this->mUnk_28[i];
|
||||
|
||||
if (pSVar3 != NULL && ((bVar2 && pSVar3->mUnk_50 == 0) || (bVar4 && pSVar3->mUnk_50 != 0))) {
|
||||
pSVar3->vfunc_44(gTouchControl.mTouchLastX, gTouchControl.mTouchLastY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM void MessageManager::func_02036c50(unk32 param_2) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->func_0203de14(param_2) != 0) {
|
||||
this->mUnk_28[i]->vfunc_28();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM void MessageManager::func_02036ca4(unk32 param_2) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
UnkStruct_02038aa0 *pSVar1 = this->mUnk_28[i];
|
||||
|
||||
if (pSVar1 != NULL) {
|
||||
pSVar1->vfunc_3C(param_2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3) {
|
||||
u32 uVar1;
|
||||
|
||||
if (param_3 == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
uVar1 = this->pGroups->func_020373ec(param_3);
|
||||
|
||||
if (uVar1 != -1) {
|
||||
param_2->vfunc_08(uVar1);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_02036d30(UnkStruct_02037750 *param_2) {
|
||||
if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) {
|
||||
return false;
|
||||
}
|
||||
|
||||
this->mUnk_20[0] = param_2;
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM bool MessageManager::func_02036d4c(UnkStruct_02037750 *param_2) {
|
||||
if (this->mUnk_20[0] == param_2) {
|
||||
this->mUnk_20[0] = NULL;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
ARM void MessageManager::func_02036d6c(void) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
if (func_0202ab48() == 0 || i != 5) {
|
||||
this->mUnk_28[i]->UnkStruct_02038aa0::vfunc_10();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM UnkStruct_02038aa0 *MessageManager::func_02036da8(u32 param_2, s16 *param_3) {
|
||||
EntryINF1 *pEVar1;
|
||||
EntryINF1 *pEVar2;
|
||||
UnkStruct_02038aa0 *pSVar4;
|
||||
BMGGroups *pBVar5;
|
||||
bool bVar6;
|
||||
s16 iStack_38;
|
||||
int iStack_34;
|
||||
int iStack_30;
|
||||
|
||||
pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xFFFF);
|
||||
|
||||
if (pEVar1 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) {
|
||||
pSVar4 = this->mUnk_28[4];
|
||||
func_02037628((u8 *) &iStack_38);
|
||||
|
||||
// ???
|
||||
bVar6 = (data_02056be4[data_027e077c.mUnk_0] & 1) == 0;
|
||||
if (bVar6) {
|
||||
data_02056be4[0] = 1;
|
||||
}
|
||||
if (!bVar6) {
|
||||
data_02056be4[0] = 0;
|
||||
}
|
||||
|
||||
iStack_38 = *param_3;
|
||||
// iStack_34 = param_3[1];
|
||||
// iStack_30 = param_3[2];
|
||||
pBVar5 = this->pGroups;
|
||||
// pSVar4->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(pBVar5, param_2), (s16*)&iStack_38, 1);
|
||||
BMGFileInfo *entry = &(pBVar5)->entries[(param_2) >> 0x10];
|
||||
// pSVar4->vfunc_50(pEVar1,
|
||||
// ((u32)entry->pDAT1 + (((entry.func_02037258((((param_2))) & 0xFFFF))->offset) & ~1)),
|
||||
// // BMG_GET_MSG_ADDR(pBVar5, param_2),
|
||||
// (s16*)&iStack_38, 1);
|
||||
|
||||
data_ov000_020eec9c.func_ov000_020d77e4(0x1C);
|
||||
return pSVar4;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void MessageManager::func_02036edc(u32 param_2, u8 param_3) {
|
||||
UnkStruct_020397f8 *pSVar1;
|
||||
u8 auStack_28[24];
|
||||
u8 local_13;
|
||||
|
||||
func_02037628(auStack_28);
|
||||
local_13 = 0;
|
||||
|
||||
if ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0 && (data_02056be4[data_027e077c.mUnk_0] & 2) == 0) {
|
||||
local_13 = 1;
|
||||
}
|
||||
|
||||
auStack_28[21] = local_13;
|
||||
auStack_28[20] = param_3;
|
||||
pSVar1 = this->func_02036f68(param_2, auStack_28);
|
||||
|
||||
if (pSVar1 != NULL) {
|
||||
if (this->mUnk_04 == 0) {
|
||||
this->mUnk_08 = pSVar1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM UnkStruct_020397f8 *MessageManager::func_02036f68(u32 param_2, u8 *param_3) {
|
||||
EntryINF1 *pEVar1;
|
||||
UnkStruct_02038aa0 *pSVar2;
|
||||
EntryINF1 *pEVar3;
|
||||
int iVar4;
|
||||
UnkStruct_020397f8 *pSVar5;
|
||||
|
||||
pEVar1 = this->pGroups->entries[param_2 >> 0x10].func_02037258(param_2 & 0xffff);
|
||||
|
||||
if (pEVar1 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (param_3[21] != 0) {
|
||||
pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[2];
|
||||
pSVar2 = this->mUnk_28[3];
|
||||
} else {
|
||||
pSVar5 = (UnkStruct_020397f8 *) this->mUnk_28[0];
|
||||
pSVar2 = this->mUnk_28[1];
|
||||
}
|
||||
|
||||
//! TODO: fake?
|
||||
pSVar5->mUnk_164 = (UnkStruct_020397f8 *) pSVar2;
|
||||
pSVar5->mUnk_418 = this->mUnk_28[5];
|
||||
|
||||
pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32 *) param_3, 0);
|
||||
|
||||
if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 &&
|
||||
data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 &&
|
||||
data_ov000_020eec9c.func_ov000_020d7f18(0x1A) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x1B) == 0 &&
|
||||
(param_3[12]) != 7)
|
||||
{
|
||||
data_ov000_020eec9c.func_ov000_020d77e4(0x1C);
|
||||
}
|
||||
|
||||
return pSVar5;
|
||||
}
|
||||
|
||||
ARM UnkStruct_020386d8 *MessageManager::func_020370d0(unk32 param_2, unk32 param_3) {
|
||||
return this->func_020370e8(param_2, -1, -1, param_3);
|
||||
}
|
||||
|
||||
ARM UnkStruct_020386d8 *MessageManager::func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) {
|
||||
UnkStruct_020386d8 *puVar2;
|
||||
|
||||
if (this->func_02036824()) {
|
||||
puVar2 = this->mUnk_18[0];
|
||||
} else {
|
||||
if (this->func_02036850()) {
|
||||
puVar2 = this->mUnk_18[1];
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
puVar2->mUnk_30 = param_5;
|
||||
puVar2->mUnk_34 = param_3;
|
||||
puVar2->mUnk_36 = param_4;
|
||||
|
||||
if (this->func_02036ce4(puVar2, param_2)) {
|
||||
return puVar2;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ARM void MessageManager::func_02037158(UnkSubClass1_02256FF8 *param_2) {
|
||||
UnkStruct_02038aa0 *pSVar1;
|
||||
|
||||
pSVar1 = this->func_02037178(param_2);
|
||||
|
||||
if (pSVar1 != NULL) {
|
||||
pSVar1->vfunc_58();
|
||||
}
|
||||
}
|
||||
|
||||
ARM UnkStruct_02038aa0 *MessageManager::func_02037178(UnkSubClass1_02256FF8 *param_2) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
|
||||
if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->mUnk_08 == param_2) {
|
||||
return this->mUnk_28[i];
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ARM MessageManager::~MessageManager() {}
|
||||
@@ -0,0 +1,76 @@
|
||||
#include "DTCM/UnkStruct_027e103c.hpp"
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "Message/MessageManager.hpp"
|
||||
#include "Message/MsgProc.hpp"
|
||||
#include "Player/TouchControl.hpp"
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
#include "global.h"
|
||||
|
||||
extern "C" void func_0203fc78(unk32 *, unk32 *);
|
||||
|
||||
THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) :
|
||||
UnkStruct_02038aa0(0, 0) {
|
||||
this->mUnk_162 = 4;
|
||||
this->mUnk_164 = 1;
|
||||
this->mUnk_166 = 0;
|
||||
this->mUnk_168 = -1;
|
||||
this->mUnk_16a = 0;
|
||||
this->mUnk_16c = 1;
|
||||
this->mUnk_16e = 0;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) {
|
||||
u16 uVar1;
|
||||
unk32 uVar2;
|
||||
s16 uVar3;
|
||||
s32 iVar4;
|
||||
s32 local_20;
|
||||
s32 local_1c[2];
|
||||
|
||||
this->func_02038b28();
|
||||
uVar3 = 0;
|
||||
|
||||
for (iVar4 = 0; iVar4 < 2; iVar4++) {
|
||||
local_1c[0] = 0xC0;
|
||||
local_20 = 0x10;
|
||||
|
||||
if (iVar4 != 0) {
|
||||
func_0203fc78(local_1c, &local_20);
|
||||
}
|
||||
|
||||
uVar1 = this->func_0203d318((s32) (local_1c[0] + 7 + ((u32) (local_1c[0] + 7 >> 2) >> 0x1D)) >> 3,
|
||||
(s32) (local_20 + 7 + ((u32) (local_20 + 7 >> 2) >> 0x1D)) >> 3);
|
||||
|
||||
if (uVar3 < uVar1) {
|
||||
uVar3 = uVar1;
|
||||
}
|
||||
}
|
||||
|
||||
if (this->mUnk_114->vfunc_08(this) != 0) {
|
||||
this->mUnk_10 = this->mUnk_114->func_0203d1b4();
|
||||
}
|
||||
}
|
||||
|
||||
ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) {
|
||||
if (this->mUnk_15c > 0 && this->mUnk_122 != 1) {
|
||||
if (this->func_0203de14(param_2) != 0) {
|
||||
this->vfunc_40(0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) {
|
||||
param_2 += this->mUnk_166;
|
||||
param_3 += this->mUnk_168;
|
||||
|
||||
this->func_0203c4ac(param_2 + this->mUnk_16a, param_3 + this->mUnk_16c);
|
||||
this->UnkStruct_02038aa0::vfunc_30(param_2, param_3);
|
||||
}
|
||||
|
||||
ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) {
|
||||
return this->UnkStruct_0203dae0::vfunc_14(param_2 + this->mUnk_162, param_3);
|
||||
}
|
||||
|
||||
ARM MsgProc_Type2::~MsgProc_Type2() {}
|
||||
@@ -0,0 +1,36 @@
|
||||
#include "DTCM/UnkStruct_027e103c.hpp"
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "Message/MessageManager.hpp"
|
||||
#include "Message/MsgProc.hpp"
|
||||
#include "Player/TouchControl.hpp"
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
#include "global.h"
|
||||
|
||||
extern "C" void func_0204f614(UnkClass_func_ov000_020d0644 *, unk32, unk32, void *, void *);
|
||||
|
||||
// non-matching
|
||||
ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
|
||||
UnkStruct_02038aa0(1, 0) {
|
||||
this->mUnk_162 = 1;
|
||||
this->mUnk_164 = 0x1A;
|
||||
this->mUnk_166 = 0xA6;
|
||||
this->mUnk_168 = 0x1D;
|
||||
this->mUnk_16a = 0;
|
||||
this->mUnk_16c = 1;
|
||||
this->mUnk_170 = -1;
|
||||
this->mUnk_172 = -1;
|
||||
this->mUnk_174 = -1;
|
||||
|
||||
func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644),
|
||||
UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
|
||||
|
||||
this->mUnk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0);
|
||||
this->mUnk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0);
|
||||
this->mUnk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0);
|
||||
this->mUnk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0);
|
||||
}
|
||||
|
||||
ARM void MsgProc_Type3::func_0203c83c(void) {}
|
||||
|
||||
ARM MsgProc_Type3::~MsgProc_Type3() {}
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "Player/LinkStateBase.hpp"
|
||||
|
||||
LinkStateBase *GetLinkState(s32 index) {
|
||||
LinkStateBase *GetLinkState(LinkStateId index) {
|
||||
return gLinkStates[index];
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "System/OverlayManager.hpp"
|
||||
#include "global.h"
|
||||
#include "nds/Overlay.h"
|
||||
#include "nds/overlay.h"
|
||||
|
||||
struct UnkStruct_020ee698 {
|
||||
/* 00 */ unk8 mUnk_00[0x2C];
|
||||
|
||||
@@ -1,34 +1,109 @@
|
||||
#include "Unknown/UnkStruct_02032f0c.hpp"
|
||||
#include "Unknown/UnkStruct_02035064.hpp"
|
||||
|
||||
UnkStruct_02032e7c::UnkStruct_02032e7c() {}
|
||||
UnkStruct_02032f0c::UnkStruct_02032f0c() {}
|
||||
UnkStruct_02032f0c::~UnkStruct_02032f0c() {}
|
||||
void UnkStruct_02032f0c::func_02032f94() {}
|
||||
u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) {}
|
||||
u8 UnkStruct_02032f0c::func_02032fa4() {}
|
||||
s32 UnkStruct_02032f0c::func_02032fb4() {}
|
||||
bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) {}
|
||||
void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
|
||||
void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) {}
|
||||
void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {}
|
||||
void UnkStruct_02032f0c::func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5) {}
|
||||
unk32 UnkStruct_02032f0c::vfunc_18(s32 param1) {}
|
||||
unk32 UnkStruct_02032f0c::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {}
|
||||
unk32 UnkStruct_02032f0c::vfunc_20(s32 param1, s32 *param2) {}
|
||||
void UnkStruct_02032f0c::func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4) {}
|
||||
void UnkStruct_02032f0c::func_02033628(unk32 param1, u16 *param2) {}
|
||||
u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {}
|
||||
void UnkStruct_02032f0c::func_02033780(s32 param1) {}
|
||||
s32 UnkStruct_02032f0c::func_020337d8(s32 param1) {}
|
||||
s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {}
|
||||
void UnkStruct_02032f0c::func_020338a8(s32 param1, unk32 param2) {}
|
||||
void UnkStruct_02032f0c::func_020338d0(unk32 *param1, unk32 param2) {}
|
||||
s32 UnkStruct_02032f0c::func_02033904(unk32 param1, unk32 param2) {}
|
||||
s32 UnkStruct_02032f0c::func_02033938(unk32 param1) {}
|
||||
s32 UnkStruct_02032f0c::func_0203396c(u16 *param1) {}
|
||||
bool UnkStruct_02032f0c::vfunc_24(s16 **param1) {}
|
||||
u16 *UnkStruct_02032f0c::func_02033b0c(s32 param1) {}
|
||||
bool UnkStruct_02032f0c::func_02033c6c() {}
|
||||
unk32 UnkStruct_02032f0c::func_02033c88(u32 param1) {}
|
||||
s32 UnkStruct_02032f0c::func_02033cbc(s16 *param1) {}
|
||||
UnkStruct_02032e7c::~UnkStruct_02032e7c() {}
|
||||
extern "C" void Fill32(unk32, void *, unk32);
|
||||
extern "C" void Fill16(unk32, void *, unk32);
|
||||
extern "C" void func_020296e0(unk32 **, UnkStruct_MsgProc_Base_unk_2C **, unk32, unk32, unk32, unk32);
|
||||
extern THUMB unk32 func_0202ab48(void);
|
||||
|
||||
ARM UnkStruct_02032e7c::UnkStruct_02032e7c() {
|
||||
this->mUnk_04 = NULL;
|
||||
this->mUnk_08 = 0;
|
||||
this->mUnk_0a = 0;
|
||||
this->mUnk_0c = 0;
|
||||
this->mUnk_0e = 0;
|
||||
|
||||
if (func_0202ab48() == 0) {
|
||||
this->mUnk_10 = 2;
|
||||
} else {
|
||||
this->mUnk_10 = 3;
|
||||
}
|
||||
}
|
||||
|
||||
THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() {
|
||||
this->mUnk_04 = 0;
|
||||
this->mUnk_08 = 0;
|
||||
this->mUnk_0c = NULL;
|
||||
this->mUnk_38 = 0;
|
||||
this->mUnk_3c = 0;
|
||||
this->mUnk_4a = 0;
|
||||
this->mUnk_4c = 0;
|
||||
this->mUnk_4d = 0;
|
||||
this->mUnk_4e = 0;
|
||||
this->mUnk_4f = 0;
|
||||
this->mUnk_50 = 0;
|
||||
this->mUnk_51 = 0;
|
||||
Fill32(0, &this->mUnk_10, 0x18);
|
||||
Fill32(0, &this->mUnk_28, 0x10);
|
||||
Fill16(0, &this->mUnk_3e, 0xC);
|
||||
this->mUnk_10 = NULL;
|
||||
this->mUnk_2c = NULL;
|
||||
this->mUnk_30 = 2;
|
||||
this->mUnk_34 = 3;
|
||||
}
|
||||
|
||||
THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {}
|
||||
|
||||
ARM void UnkStruct_02032f0c::func_02032f94() {}
|
||||
|
||||
ARM u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) {
|
||||
this->mUnk_0c = value;
|
||||
return &this->mUnk_0c;
|
||||
}
|
||||
|
||||
ARM u8 UnkStruct_02032f0c::func_02032fa4() {
|
||||
return UnkStruct_02035064::func_02035428(this->mUnk_50);
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02032f0c::func_02032fb4() {
|
||||
return this->mUnk_2c[0]->mUnk_01 + this->mUnk_34;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) {
|
||||
s16 iVar1;
|
||||
s16 iVar2;
|
||||
|
||||
iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D))) * 0x8;
|
||||
iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D))) * 0x8;
|
||||
this->mUnk_4a = param1;
|
||||
this->mUnk_4c = param2;
|
||||
this->mUnk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10;
|
||||
this->mUnk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
|
||||
|
||||
ARM void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) {
|
||||
func_020296e0(&this->mUnk_10, this->mUnk_2c, param1, param2, param4, param3);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {}
|
||||
ARM void UnkStruct_02032f0c::func_02033214(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5) {}
|
||||
ARM unk32 UnkStruct_02032f0c::vfunc_18(s32 param1) {}
|
||||
ARM unk32 UnkStruct_02032f0c::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {}
|
||||
ARM unk32 UnkStruct_02032f0c::vfunc_20(s32 param1, s32 *param2) {}
|
||||
ARM void UnkStruct_02032f0c::func_020334b4(u32 param1, s32 param2, s32 param3, s32 param4) {}
|
||||
ARM void UnkStruct_02032f0c::func_02033628(unk32 param1, u16 *param2) {}
|
||||
ARM u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {}
|
||||
ARM void UnkStruct_02032f0c::func_02033780(s32 param1) {}
|
||||
|
||||
ARM s32 UnkStruct_02032f0c::func_020337d8(s32 param1) {
|
||||
return this->mUnk_2c[0]->mUnk_08[1] * param1 + (param1 - 1) * this->mUnk_34;
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {}
|
||||
ARM void UnkStruct_02032f0c::func_020338a8(s32 param1, unk32 param2) {}
|
||||
ARM void UnkStruct_02032f0c::func_020338d0(unk32 *param1, unk32 param2) {}
|
||||
ARM s32 UnkStruct_02032f0c::func_02033904(unk32 param1, unk32 param2) {}
|
||||
ARM s32 UnkStruct_02032f0c::func_02033938(unk32 param1) {}
|
||||
ARM s32 UnkStruct_02032f0c::func_0203396c(u16 *param1) {}
|
||||
ARM bool UnkStruct_02032f0c::vfunc_24(s16 **param1) {}
|
||||
ARM u16 *UnkStruct_02032f0c::func_02033b0c(s32 param1) {}
|
||||
ARM bool UnkStruct_02032f0c::func_02033c6c() {}
|
||||
ARM unk32 UnkStruct_02032f0c::func_02033c88(u32 param1) {}
|
||||
ARM s32 UnkStruct_02032f0c::func_02033cbc(s16 *param1) {}
|
||||
|
||||
ARM UnkStruct_02032e7c::~UnkStruct_02032e7c() {}
|
||||
|
||||
@@ -1,11 +1,40 @@
|
||||
#include "Unknown/UnkStruct_02035064.hpp"
|
||||
|
||||
UnkStruct_02035064::UnkStruct_02035064() {}
|
||||
UnkStruct_02035064::~UnkStruct_02035064() {}
|
||||
void UnkStruct_02035064::func_020350b0() {}
|
||||
void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {}
|
||||
void UnkStruct_02035064::func_0203516c() {}
|
||||
s32 UnkStruct_02035064::vfunc_0() {}
|
||||
s32 UnkStruct_02035064::vfunc_4() {}
|
||||
void UnkStruct_02035064::func_020351b8(bool param1, bool param2, bool param3, bool param4) {}
|
||||
void UnkStruct_02035064::func_020352d8() {}
|
||||
ARM UnkStruct_02035064::UnkStruct_02035064() {
|
||||
this->mUnk_74 = NULL;
|
||||
this->mUnk_78 = NULL;
|
||||
this->mUnk_7c = 0;
|
||||
this->mUnk_80 = 0;
|
||||
this->mUnk_82 = 0;
|
||||
this->mUnk_84 = 0;
|
||||
this->mUnk_86 = 0;
|
||||
this->mUnk_87 = 0;
|
||||
}
|
||||
|
||||
ARM UnkStruct_02035064::~UnkStruct_02035064() {}
|
||||
|
||||
ARM void UnkStruct_02035064::func_020350b0() {}
|
||||
|
||||
ARM void UnkStruct_02035064::func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5) {}
|
||||
|
||||
ARM void UnkStruct_02035064::func_0203516c() {
|
||||
if (this->mUnk_78 != 0x0) {
|
||||
if (this->mUnk_86 == false) {
|
||||
this->mUnk_5c.func_0202e1e8();
|
||||
this->func_020352d8();
|
||||
} else {
|
||||
this->mUnk_86 = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02035064::vfunc_00() {
|
||||
return this->mUnk_4c;
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02035064::vfunc_04() {
|
||||
return this->mUnk_4e;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02035064::func_020351b8(bool param1, bool param2, bool param3, bool param4) {}
|
||||
ARM void UnkStruct_02035064::func_020352d8() {}
|
||||
|
||||
@@ -1,25 +1,224 @@
|
||||
#include "Unknown/UnkStruct_02037750.hpp"
|
||||
#include "Actor/ActorManager.hpp"
|
||||
#include "Item/ItemManager.hpp"
|
||||
#include "Message/MessageManager.hpp"
|
||||
#include "Save/AdventureFlags.hpp"
|
||||
#include "System/Random.hpp"
|
||||
|
||||
UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) {}
|
||||
UnkStruct_02037750::~UnkStruct_02037750() {}
|
||||
void UnkStruct_02037750::vfunc_08(unk32 param1) {}
|
||||
void UnkStruct_02037750::vfunc_0c(s32 param1) {}
|
||||
void UnkStruct_02037750::vfunc_10() {}
|
||||
void UnkStruct_02037750::vfunc_24(unk32 param1) {}
|
||||
void UnkStruct_02037750::vfunc_28(s32 param1) {}
|
||||
unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {}
|
||||
LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() {}
|
||||
unk32 UnkStruct_02037750::vfunc_30() {}
|
||||
void UnkStruct_02037750::func_020385d0(s32 param1, unk32 *param2) {}
|
||||
void UnkStruct_02037750::vfunc_14() {}
|
||||
void UnkStruct_02037750::vfunc_18() {}
|
||||
unk32 UnkStruct_02037750::vfunc_1c() {}
|
||||
void UnkStruct_02037750::vfunc_20() {}
|
||||
extern "C" ARM unk32 func_02037628(u8 *);
|
||||
extern u8 *data_027e0d54;
|
||||
extern unk32 *data_027e0cb4;
|
||||
|
||||
UnkStruct_020386d8::UnkStruct_020386d8() :
|
||||
UnkStruct_02037750(0x1000000, 0) {}
|
||||
void UnkStruct_020386d8::vfunc_08(unk32 param1) {}
|
||||
void UnkStruct_020386d8::vfunc_24(unk32 param1) {}
|
||||
void UnkStruct_020386d8::vfunc_28() {}
|
||||
unk32 UnkStruct_020386d8::vfunc_30() {}
|
||||
UnkStruct_020386d8::~UnkStruct_020386d8() {}
|
||||
ARM UnkStruct_02037750::UnkStruct_02037750(unk32 param1, unk32 param2) {
|
||||
s32 i;
|
||||
|
||||
this->mUnk_14 = param2;
|
||||
this->mUnk_18 = param1;
|
||||
this->mUnk_1c = 0;
|
||||
this->mUnk_1d = 0xFF;
|
||||
this->mUnk_1e = 0;
|
||||
|
||||
for (i = 0; i < ARRAY_LEN(this->mUnk_04); i++) {
|
||||
this->mUnk_04[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
ARM UnkStruct_02037750::~UnkStruct_02037750() {
|
||||
if (gMessageManager.mUnk_20[0] == this) {
|
||||
gMessageManager.func_02036d4c(this);
|
||||
}
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02037750::vfunc_08(u32 param1) {
|
||||
this->mUnk_18 = param1;
|
||||
this->mUnk_1c = 0;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02037750::vfunc_0c(UnkStruct_020397f8 *param1) {}
|
||||
ARM void UnkStruct_02037750::vfunc_10() {}
|
||||
|
||||
ARM bool UnkStruct_02037750::vfunc_24(unk32 param1) {
|
||||
u8 auStack_28[0x18];
|
||||
|
||||
func_02037628(auStack_28);
|
||||
return this->func_020385d0(param1, auStack_28) != 0;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) {
|
||||
u16 uVar1;
|
||||
s64 lVar2;
|
||||
char cVar4;
|
||||
u16 uVar5;
|
||||
int iVar6;
|
||||
u32 uVar7;
|
||||
UnkStruct_02037750_Callback1 pcVar8;
|
||||
int iVar9;
|
||||
u32 uVar10;
|
||||
u32 uVar11;
|
||||
bool bVar12;
|
||||
|
||||
uVar7 = (u32) * (u16 *) (param1 + 0x2);
|
||||
|
||||
if (uVar7 >= 0xF && uVar7 <= 0x2E) {
|
||||
pcVar8 = this->mUnk_04[((uVar7 - 0xF) << 0x1E) >> 0x1C];
|
||||
iVar9 = 0;
|
||||
|
||||
if (pcVar8 != NULL) {
|
||||
iVar9 = pcVar8(this->mUnk_14);
|
||||
}
|
||||
|
||||
return iVar9;
|
||||
}
|
||||
|
||||
if ((s32) uVar7 <= 0) {
|
||||
switch (uVar7) {
|
||||
case 0x0:
|
||||
case 0x2f: break;
|
||||
case 0x7:
|
||||
if (data_027e0d54[0xd] != 0) {
|
||||
return -0x1;
|
||||
}
|
||||
|
||||
return (data_027e0d54[0xf] != 0);
|
||||
case 0x1:
|
||||
case 0x2:
|
||||
case 0x3:
|
||||
UnkStruct_020397f8 *ret_3 = gMessageManager.func_020366c4();
|
||||
|
||||
if (0x0 < ret_3->mUnk_15c) {
|
||||
return -0x1;
|
||||
}
|
||||
|
||||
uVar7 = (param1 + 0x1);
|
||||
|
||||
if (ret_3->mUnk_576 < uVar7) {
|
||||
return ret_3->mUnk_576;
|
||||
}
|
||||
|
||||
if (uVar7 == 0x0) {
|
||||
uVar10 = 0x0;
|
||||
} else {
|
||||
lVar2 = gRandom.mRandomValue * gRandom.mFactor;
|
||||
uVar10 = gRandom.Next(lVar2);
|
||||
// uVar10 = *(int *)((int)&gRandom.mAddend + 0x4) +
|
||||
// *(int *)((int)&gRandom.mFactor + 0x4) *
|
||||
// *(uint *)&gRandom.mRandomValue + *(uint *)&gRandom.mFactor *
|
||||
// *(int *)((int)&gRandom.mRandomValue + 0x4) +
|
||||
// (lVar2 >> 0x20) + (gRandom.mAddend << uVar11); // CARRY4
|
||||
|
||||
// part of the inline?
|
||||
// *(uint *)&gRandom.mRandomValue = *(uint *)&gRandom.mAddend + uVar11;
|
||||
// *(uint *)((int)&gRandom.mRandomValue + 0x4) = uVar10;
|
||||
|
||||
if (uVar7 != 0x0) {
|
||||
uVar10 = (uVar7 * uVar10 >> 0x20);
|
||||
}
|
||||
}
|
||||
|
||||
return uVar10;
|
||||
case 0x4: return gAdventureFlags->Get(param1 + 0x4) != false;
|
||||
case 0x5: return gActorManager->func_ov00_020c3b2c(NULL) != 0;
|
||||
case 0x6: break;
|
||||
case 0x8: return (((data_027e0cb4[(param1 + 0x4) >> 5]) & 1) << ((param1 + 0x4) & 0x1f)) == 0x0;
|
||||
case 0x9: break;
|
||||
case 0xa: break;
|
||||
case 0xb:
|
||||
lVar2 = gRandom.mRandomValue * gRandom.mFactor;
|
||||
uVar7 = lVar2;
|
||||
uVar10 = gRandom.Next(uVar7);
|
||||
|
||||
return (int) (uVar10 * 0x64 >> 0x20) < (param1 + 0x4);
|
||||
case 0xc:
|
||||
uVar7 = (param1 + 0x1);
|
||||
if (uVar7 == 0x0) {
|
||||
uVar10 = 0x0;
|
||||
} else {
|
||||
lVar2 = gRandom.mRandomValue * gRandom.mFactor;
|
||||
uVar11 = lVar2;
|
||||
uVar10 = gRandom.Next(uVar11);
|
||||
|
||||
if (uVar7 != 0x0) {
|
||||
uVar10 = (uVar7 * uVar10 >> 0x20);
|
||||
}
|
||||
}
|
||||
return (int) (char) uVar10;
|
||||
case 0xd: return gItemManager->GetNumRupees() != 0;
|
||||
case 0xe: return gItemManager->HasItem(param1 + 0x4) != 0;
|
||||
default:
|
||||
if (uVar7 == 0x2f) {
|
||||
return gItemManager->HasItem((param1 + 0x4) + 0x60) != 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
uVar7 = (param1 + 0x1);
|
||||
if (uVar7 == 0x0) {
|
||||
uVar10 = 0x0;
|
||||
} else {
|
||||
lVar2 = gRandom.mRandomValue * gRandom.mFactor;
|
||||
uVar11 = lVar2;
|
||||
uVar10 = gRandom.Next(uVar11);
|
||||
|
||||
if (uVar7 != 0x0) {
|
||||
uVar10 = (uVar7 * uVar10 >> 0x20);
|
||||
}
|
||||
}
|
||||
|
||||
return (int) (char) uVar10;
|
||||
}
|
||||
|
||||
ARM unk32 UnkStruct_02037750::vfunc_2c(s32 param1) {}
|
||||
|
||||
ARM LinkStateInteract *UnkStruct_02037750::GetLinkStateInteract() {
|
||||
return (LinkStateInteract *) GetLinkState(2);
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_02037750::vfunc_30() {
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM unk32 UnkStruct_02037750::func_020385d0(s32 param1, u8 *param2) {}
|
||||
|
||||
ARM void UnkStruct_02037750::vfunc_14() {}
|
||||
|
||||
// non-matching
|
||||
ARM void UnkStruct_02037750::vfunc_18(unk32 *param1) {
|
||||
param1[0] = 0;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_02037750::vfunc_1c() {
|
||||
return false;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02037750::vfunc_20() {
|
||||
this->mUnk_18 = 1 << 24;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM UnkStruct_020386d8::UnkStruct_020386d8() :
|
||||
UnkStruct_02037750(1 << 24, 0) {
|
||||
this->mUnk_20 = -1;
|
||||
this->mUnk_24.func_020376c0(&gVec3p_ZERO);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_020386d8::vfunc_08(u32 param1) {
|
||||
this->UnkStruct_02037750::vfunc_08(param1);
|
||||
this->mUnk_20 = 0xff;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_020386d8::vfunc_24(unk32 param1) {
|
||||
return this->func_020385d0(param1, &this->mUnk_24.mUnk_00) != 0;
|
||||
}
|
||||
|
||||
ARM unk32 UnkStruct_020386d8::vfunc_28(s32 param1) {
|
||||
this->mUnk_20 = this->UnkStruct_02037750::vfunc_28(param1);
|
||||
return this->mUnk_20;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_020386d8::vfunc_30() {
|
||||
return gMessageManager.func_020366c4()->mUnk_15c <= 0;
|
||||
}
|
||||
|
||||
ARM UnkStruct_020386d8::~UnkStruct_020386d8() {}
|
||||
|
||||
@@ -1,42 +1,234 @@
|
||||
#include "Unknown/UnkStruct_02038aa0.hpp"
|
||||
#include "DTCM/UnkStruct_027e103c.hpp"
|
||||
#include "Message/MessageManager.hpp"
|
||||
|
||||
UnkStruct_0203881c::UnkStruct_0203881c() {}
|
||||
void UnkStruct_0203881c::func_02038858(unk32 param1) {}
|
||||
void UnkStruct_0203881c::func_02038888() {}
|
||||
void UnkStruct_0203881c::func_02038950(UnkStruct_02038aa0 *param1, s32 param2) {}
|
||||
void UnkStruct_0203881c::func_02038a80(s32 param1) {}
|
||||
UnkStruct_0203881c::~UnkStruct_0203881c() {}
|
||||
extern u32 data_027e0618[];
|
||||
|
||||
UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) :
|
||||
UnkStruct_0203dae0(param1) {}
|
||||
UnkStruct_02038aa0::~UnkStruct_02038aa0() {}
|
||||
void UnkStruct_02038aa0::vfunc_4c() {}
|
||||
void UnkStruct_02038aa0::vfunc_10(unk32 param1) {}
|
||||
void UnkStruct_02038aa0::func_02038b40() {}
|
||||
void UnkStruct_02038aa0::vfunc_48() {}
|
||||
bool UnkStruct_02038aa0::func_02038b78() {}
|
||||
unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {}
|
||||
s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {}
|
||||
s32 UnkStruct_02038aa0::func_02038cf4() {}
|
||||
s32 UnkStruct_02038aa0::func_02038d10() {}
|
||||
void UnkStruct_02038aa0::vfunc_2c() {}
|
||||
void UnkStruct_02038aa0::vfunc_30() {}
|
||||
bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) {}
|
||||
void UnkStruct_02038aa0::vfunc_44() {}
|
||||
void UnkStruct_02038aa0::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) {}
|
||||
void UnkStruct_02038aa0::vfunc_5c() {}
|
||||
unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {}
|
||||
unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {}
|
||||
void UnkStruct_02038aa0::func_02039208(unk16 param1) {}
|
||||
void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
|
||||
unk32 UnkStruct_02038aa0::func_02039250() {}
|
||||
void UnkStruct_02038aa0::vfunc_54() {}
|
||||
void UnkStruct_02038aa0::vfunc_58() {}
|
||||
void UnkStruct_02038aa0::vfunc_60() {}
|
||||
void UnkStruct_02038aa0::vfunc_64() {}
|
||||
s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) {}
|
||||
void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {}
|
||||
void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {}
|
||||
void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) {}
|
||||
bool UnkStruct_02038aa0::func_0203951c() {}
|
||||
unk32 UnkStruct_02038aa0::vfunc_38() {}
|
||||
ARM UnkStruct_0203881c::UnkStruct_0203881c() {
|
||||
this->mUnk_14 = 0x1000;
|
||||
this->mUnk_18 = 0;
|
||||
this->mUnk_1c = 0;
|
||||
this->mUnk_20 = 0;
|
||||
this->mUnk_24 = 0;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_0203881c::func_02038858(unk32 param1) {}
|
||||
ARM void UnkStruct_0203881c::func_02038888() {}
|
||||
ARM void UnkStruct_0203881c::func_02038950(UnkStruct_02038aa0 *param1, s32 param2) {}
|
||||
ARM void UnkStruct_0203881c::func_02038a80(s32 param1) {}
|
||||
ARM UnkStruct_0203881c::~UnkStruct_0203881c() {}
|
||||
|
||||
THUMB UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) :
|
||||
UnkStruct_0203dae0(param1),
|
||||
mUnk_124(0) {
|
||||
this->func_020387e0(this->mUnk_150);
|
||||
this->pInfoEntry = 0;
|
||||
this->mUnk_158.y = 0;
|
||||
this->mUnk_15c = 0;
|
||||
this->mUnk_15e = 0xFF;
|
||||
this->mUnk_15f = 0xFF;
|
||||
this->mUnk_160 = 1;
|
||||
this->mUnk_11e = param2;
|
||||
}
|
||||
|
||||
THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() {}
|
||||
|
||||
THUMB void UnkStruct_02038aa0::func_02038b28(void) {
|
||||
this->mUnk_114->mUnk_04 = NULL;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) {
|
||||
this->UnkStruct_0203dae0::vfunc_10(param1, param2);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_10() {}
|
||||
|
||||
ARM void UnkStruct_02038aa0::func_02038b40() {
|
||||
this->mUnk_15c = -1;
|
||||
this->mUnk_128.mUnk_04 = NULL;
|
||||
this->func_0203dc10(0);
|
||||
this->vfunc_48();
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_48() {}
|
||||
|
||||
ARM void UnkStruct_02038aa0::func_02038b74(void) {}
|
||||
|
||||
// non-matching
|
||||
ARM bool UnkStruct_02038aa0::func_02038b78() {
|
||||
if (data_027e0c54 == 0) {
|
||||
if ((this->mUnk_50 != 0 && gMessageManager.func_02036850() != 0) ||
|
||||
(this->mUnk_50 == 0 && gMessageManager.func_02036824() != 0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
} else {
|
||||
bool ret = CHECK_UNK_FLAGS(1);
|
||||
|
||||
if ((this->mUnk_50 == 0 || ret)) {
|
||||
return (this->mUnk_50 != 0 && ret);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {
|
||||
s16 iVar1;
|
||||
unk32 iVar2;
|
||||
unk32 iVar3;
|
||||
unk32 uVar4;
|
||||
|
||||
iVar2 = this->func_02038cf4();
|
||||
iVar3 = this->func_02038d10();
|
||||
iVar1 = ((this->mUnk_158.y - (this->mUnk_18 << 3) / 2));
|
||||
|
||||
if ((param1 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param1)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
iVar3 = this->mUnk_34;
|
||||
uVar4 = this->func_02032fb4();
|
||||
iVar2 = (param1 - iVar1) - iVar2;
|
||||
|
||||
return func_01ff9b4c(iVar2 + iVar3 / 2, uVar4);
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {
|
||||
u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1];
|
||||
unk32 iVar2 = this->func_02038cf4();
|
||||
unk32 iVar1 = this->func_020337d8(param1 + 1);
|
||||
return iVar2 + iVar1 - bVar1;
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02038aa0::func_02038cf4() {
|
||||
unk32 iVar1;
|
||||
unk32 iVar2;
|
||||
|
||||
iVar2 = this->mUnk_18;
|
||||
iVar1 = this->func_02038d10();
|
||||
return (iVar2 * 8 - iVar1) / 2;
|
||||
}
|
||||
|
||||
ARM s32 UnkStruct_02038aa0::func_02038d10() {
|
||||
return this->func_020337d8(this->mUnk_150[0]);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_2c() {}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_30(unk32 param_2, unk32 param_3) {
|
||||
if (this->mUnk_15c > 0) {
|
||||
this->func_0203e090();
|
||||
} else {
|
||||
this->mUnk_118 = -1;
|
||||
}
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) {
|
||||
unk32 local_14;
|
||||
unk32 local_18;
|
||||
|
||||
this->vfunc_70(&local_14, &local_18);
|
||||
this->func_0203e1b0(local_14 + param1, local_18 + param2, 0);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02038aa0::func_02038f40(void) {}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_44(s32 touchLastX, s32 touchLastY) {}
|
||||
|
||||
// non-matching
|
||||
ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4) {
|
||||
int iVar1;
|
||||
|
||||
this->pInfoEntry = param1;
|
||||
this->mUnk_08 = param4;
|
||||
this->mUnk_15f = -1;
|
||||
this->mUnk_15c = 0x78;
|
||||
this->mUnk_15e = param4->mUnk_0c;
|
||||
this->func_0203dcfc(0, 0, this->mUnk_11e, 2);
|
||||
this->mUnk_128.func_02038858(param2);
|
||||
this->mUnk_30 = this->mUnk_150[4] + 5;
|
||||
|
||||
this->vfunc_54();
|
||||
// this->vfunc_60(0, 0, (unk32)param3);
|
||||
// this->vfunc_64(param3);
|
||||
|
||||
if (*(unk32 *) data_027e0618 == 2) {
|
||||
if (this->func_02032fa4() == 0) {
|
||||
data_027e103c->func_ov000_020cfc9c(1, 0);
|
||||
} else {
|
||||
data_027e103c->func_ov000_020cfc9c(0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
this->vfunc_5C();
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void UnkStruct_02038aa0::vfunc_5c(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) {
|
||||
u16 sVar1;
|
||||
bool bVar5;
|
||||
|
||||
sVar1 = param_2[0];
|
||||
bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000;
|
||||
|
||||
if (bVar5 && this->mUnk_150[2] != 0) {
|
||||
this->mUnk_150[2] = 1;
|
||||
} else {
|
||||
this->mUnk_150[2] = 0;
|
||||
}
|
||||
|
||||
// this->mUnk_150[2] = bVar5;
|
||||
|
||||
// return?
|
||||
this->func_02033360();
|
||||
}
|
||||
|
||||
ARM unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {}
|
||||
ARM unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {}
|
||||
ARM void UnkStruct_02038aa0::func_02039208(unk16 param1) {}
|
||||
|
||||
// non-matching
|
||||
ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4) {
|
||||
this->mUnk_15c = 10;
|
||||
this->mUnk_150[2] = 1;
|
||||
this->func_0203e2ac(param2);
|
||||
}
|
||||
|
||||
ARM unk32 UnkStruct_02038aa0::func_02039250() {}
|
||||
ARM void UnkStruct_02038aa0::vfunc_54() {}
|
||||
ARM void UnkStruct_02038aa0::vfunc_58() {}
|
||||
ARM void UnkStruct_02038aa0::vfunc_60() {}
|
||||
ARM void UnkStruct_02038aa0::vfunc_64() {}
|
||||
|
||||
ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) {
|
||||
switch (param1) {
|
||||
case 0: break;
|
||||
case 1: this->mUnk_34 = 4; break;
|
||||
case 2: this->mUnk_34 = 6; break;
|
||||
case 3: this->mUnk_34 = 1; break;
|
||||
case 4: this->mUnk_34 = 0; break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
return ((this->mUnk_18 << 3) - this->func_020337d8(param1)) / 2;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {}
|
||||
ARM void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) {
|
||||
this->vfunc_6C(param1, param2);
|
||||
*param1 += this->mUnk_158.x;
|
||||
*param2 += this->mUnk_158.y;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_02038aa0::func_0203951c() {}
|
||||
ARM bool UnkStruct_02038aa0::vfunc_38() {}
|
||||
|
||||
ARM void UnkStruct_02038aa0::vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) {
|
||||
this->func_0203dc10(1, param_3);
|
||||
this->func_02033190(param_2, param_3, param_4, param_5);
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,25 +1,192 @@
|
||||
#include "Unknown/UnkStruct_0203dae0.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
|
||||
UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {}
|
||||
UnkStruct_0203dae0::~UnkStruct_0203dae0() {}
|
||||
void UnkStruct_0203dae0::func_0203dc10(s32 param1) {}
|
||||
bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {}
|
||||
bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {}
|
||||
void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {}
|
||||
void UnkStruct_0203dae0::func_0203ddec() {}
|
||||
void UnkStruct_0203dae0::func_0203ddfc() {}
|
||||
void UnkStruct_0203dae0::func_0203de14() {}
|
||||
s32 UnkStruct_0203dae0::func_0203de24() {}
|
||||
bool UnkStruct_0203dae0::func_0203de58(s32 param1) {}
|
||||
void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {}
|
||||
void UnkStruct_0203dae0::vfunc_30() {}
|
||||
bool UnkStruct_0203dae0::vfunc_28() {}
|
||||
bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {}
|
||||
void UnkStruct_0203dae0::vfunc_2c() {}
|
||||
bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {}
|
||||
unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {}
|
||||
void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
|
||||
void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {}
|
||||
void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {}
|
||||
void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {}
|
||||
bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {}
|
||||
extern u32 *data_027e0ce0[];
|
||||
extern "C" void Fill256(unk32, unk16 *, unk32, unk32);
|
||||
extern "C" void func_0203fc78(u8, unk32 *, unk32 *);
|
||||
extern "C" u16 func_0203d318(unk32, unk32);
|
||||
extern "C" void func_020298b8(unk32 *, unk32, unk32, unk32, unk32);
|
||||
extern "C" void func_02029830(unk32 *, unk32, unk32, unk32, unk32);
|
||||
extern "C" unk32 func_0203d400(u8);
|
||||
extern "C" void func_02035440(u8);
|
||||
|
||||
class UnkStruct_02075dac {
|
||||
public:
|
||||
unk32 func_0203f9b8(void *);
|
||||
};
|
||||
extern UnkStruct_02075dac data_02075dac;
|
||||
|
||||
// non-matching
|
||||
THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {
|
||||
this->mUnk_114 = NULL;
|
||||
this->mUnk_118 = -1;
|
||||
this->mUnk_11c = 0;
|
||||
this->mUnk_11e = 0;
|
||||
this->mUnk_11f = 0;
|
||||
this->mUnk_120 = 1;
|
||||
this->mUnk_121 = param1;
|
||||
this->mUnk_122 = 0;
|
||||
|
||||
Fill256(0, &this->mUnk_54, 0xC0, 1);
|
||||
|
||||
if (this->mUnk_121 == 0) {
|
||||
this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114();
|
||||
} else {
|
||||
this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114();
|
||||
}
|
||||
}
|
||||
|
||||
THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() {
|
||||
if (this->mUnk_114 != NULL) {
|
||||
delete this->mUnk_114;
|
||||
this->mUnk_114 = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
// non-matching (regalloc)
|
||||
ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) {
|
||||
if (param1 != 0) {
|
||||
if (this->mUnk_11c == 0x0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this->mUnk_114->vfunc_08(this) != 0) {
|
||||
this->mUnk_10 = this->mUnk_114->func_0203d1b4();
|
||||
}
|
||||
} else {
|
||||
this->mUnk_114->vfunc_0c();
|
||||
}
|
||||
|
||||
this->mUnk_122 = param1;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {
|
||||
this->func_0203ddfc();
|
||||
this->vfunc_14(param1, param2);
|
||||
this->mUnk_11c = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {
|
||||
unk32 local_c;
|
||||
unk32 local_10;
|
||||
|
||||
local_c = param1;
|
||||
local_10 = param2;
|
||||
|
||||
func_0203fc78(this->func_02032fa4(), &local_c, &local_10);
|
||||
this->UnkStruct_02032f0c::vfunc_14(local_c, local_10);
|
||||
this->mUnk_10 = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {
|
||||
unk32 *uVar5;
|
||||
|
||||
this->mUnk_50 = param1;
|
||||
this->vfunc_14(this->mUnk_4a, this->mUnk_4c);
|
||||
this->mUnk_11c = func_0203d318(this->mUnk_10[0x1], this->mUnk_10[0x2]);
|
||||
this->func_0203dc10(1);
|
||||
|
||||
if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) != 0x0) {
|
||||
uVar5 = this->func_0203ddec();
|
||||
func_020298b8(this->mUnk_10, *uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4);
|
||||
} else {
|
||||
uVar5 = this->func_0203ddec();
|
||||
func_02029830(this->mUnk_10, *uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4);
|
||||
}
|
||||
|
||||
this->mUnk_28 = this->mUnk_10;
|
||||
this->mUnk_2c = this->mUnk_2c; // this->mUnk_2c = &(UnkStruct_MsgProc_Base_unk_2C*)this->mUnk_10;
|
||||
this->mUnk_30 = param4;
|
||||
this->mUnk_34 = 3;
|
||||
this->vfunc_10(param3, 3);
|
||||
|
||||
this->func_0203de58(param2);
|
||||
}
|
||||
|
||||
ARM unk32 *UnkStruct_0203dae0::func_0203ddec() {
|
||||
return this->mUnk_114->func_0203d1b4();
|
||||
}
|
||||
|
||||
ARM void UnkStruct_0203dae0::func_0203ddfc() {
|
||||
this->mUnk_114->mUnk_04 = 0;
|
||||
this->mUnk_11c = 0;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_0203dae0::func_0203de14() {
|
||||
//! TODO: class?
|
||||
func_02035440(this->mUnk_50);
|
||||
}
|
||||
|
||||
// non-matching
|
||||
ARM s32 UnkStruct_0203dae0::func_0203de24() {
|
||||
if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) == 0x0) {
|
||||
return this->mUnk_10[5] * this->mUnk_10[6] * 0x20;
|
||||
}
|
||||
|
||||
return this->mUnk_10[6] << 0xa;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_0203dae0::func_0203de58(s32 param1) {}
|
||||
|
||||
ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {
|
||||
this->func_0203dc10(1, param2);
|
||||
this->mUnk_11e = param1;
|
||||
this->mUnk_118 = -1;
|
||||
this->UnkStruct_02032f0c::vfunc_10(param1, -1);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_0203dae0::vfunc_30() {
|
||||
unk32 iVar2;
|
||||
|
||||
iVar2 = this->mUnk_118;
|
||||
this->mUnk_118 = data_02075dac.func_0203f9b8(this);
|
||||
|
||||
if (this->mUnk_118 == iVar2) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->func_0203dc10(1);
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_0203dae0::vfunc_28() {
|
||||
if (this->mUnk_122 != 0) {
|
||||
this->func_0203e0f8();
|
||||
this->func_0203dc10(0);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_0203dae0::func_0203e0f8() {}
|
||||
|
||||
ARM void UnkStruct_0203dae0::vfunc_2c() {
|
||||
this->vfunc_30();
|
||||
}
|
||||
|
||||
ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {}
|
||||
|
||||
ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {
|
||||
unk32 iVar1;
|
||||
|
||||
iVar1 = this->UnkStruct_02032f0c::vfunc_18(param1);
|
||||
|
||||
if (iVar1 != 0) {
|
||||
this->func_0203dc10(1);
|
||||
}
|
||||
|
||||
return iVar1;
|
||||
}
|
||||
|
||||
ARM void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {
|
||||
this->func_0203dc10(1);
|
||||
this->UnkStruct_02032f0c::vfunc_08(param1, param2, param3, param4);
|
||||
}
|
||||
|
||||
ARM void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {}
|
||||
ARM void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {}
|
||||
ARM void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {}
|
||||
ARM bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {}
|
||||
|
||||
Reference in New Issue
Block a user