PlayerControl: Decomp 27%

This commit is contained in:
Aetias
2025-02-09 09:38:23 +01:00
parent bbc7382bdf
commit 57de079397
14 changed files with 366 additions and 50 deletions
+278 -14
View File
@@ -5,9 +5,13 @@
#include "DTCM/UnkStruct_027e077c.hpp"
#include "DTCM/UnkStruct_027e0c68.hpp"
#include "DTCM/UnkStruct_027e0d38.hpp"
#include "DTCM/UnkStruct_027e0e2c.hpp"
#include "DTCM/UnkStruct_027e0ffc.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
#include "Item/ItemManager.hpp"
#include "Map/MapManager.hpp"
#include "Player/PlayerBase.hpp"
#include "Player/PlayerLinkBase.hpp"
#include "Save/AdventureFlags.hpp"
ARM bool PlayerControl::func_ov00_020aeeac() {
@@ -60,10 +64,9 @@ ARM Actor *PlayerControl::GetFollowActor() {
return gActorManager->GetActor(&mFollowRef);
}
ARM bool PlayerControl::func_ov00_020af01c(unk8 *param1) {
ARM bool PlayerControl::func_ov00_020af01c(Vec2b *param1) {
if (mFollowing) {
param1[0] = mUnk_9c;
param1[1] = mUnk_9d;
*param1 = mUnk_9c;
return true;
}
return false;
@@ -185,19 +188,280 @@ bool PlayerControl::func_ov00_020af2d4(u32 param1, bool param2) {
}
}
bool PlayerControl::CheckTouchedNow(u32 param1) {}
bool PlayerControl::CheckUntouchedNow(u32 param1) {}
bool PlayerControl::CheckTouching(u32 param1) {}
bool PlayerControl::CheckTouchFast(u32 param1) {}
bool PlayerControl::func_ov00_020af4a4() {}
void PlayerControl::func_ov00_020af538() {}
void PlayerControl::func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4) {}
bool PlayerControl::func_ov00_020af778() {}
bool PlayerControl::func_ov00_020afad8(Vec3p *param1) {}
void PlayerControl::func_ov00_020afb6c() {}
ARM bool PlayerControl::CheckTouchedNow(u32 param1) {
bool result = false;
if (this->func_ov00_020af2d4(param1, true)) {
result = (mFlags & TouchFlag_TouchedNow) != 0;
}
return result;
}
ARM bool PlayerControl::CheckUntouchedNow(u32 param1) {
bool result = false;
if (this->func_ov00_020af2d4(param1, true)) {
result = (mFlags & TouchFlag_UntouchedNow) != 0;
}
return result;
}
ARM bool PlayerControl::CheckTouching(u32 param1) {
return this->func_ov00_020af2d4(param1, true) && mTouch;
}
ARM bool PlayerControl::CheckTouchFast(u32 param1) {
if (this->func_ov00_020af2d4(param1, true)) {
if (mTouchSpeed > FLOAT_TO_Q20(0.5) && mTouchFastTime > 0) {
if (mTouchFastTime <= mTouchDuration) {
if (mTouchDuration < mTouchFastTime + 15) {
return true;
}
}
}
}
return false;
}
ARM bool PlayerControl::func_ov00_020af4a4() {
if (!data_027e0d38->mUnk_28->mUnk_34 && data_027e0e2c.mUnk_04 == -1 && !data_027e103c->func_ov005_02103f4c()) {
if (this->func_ov00_020aeeac()) {
return true;
}
switch (data_027e077c.mUnk_0) {
case 0x1a:
case 0x1b:
case 0x1c: return true;
default: return false;
}
}
return false;
}
ARM void PlayerControl::func_ov00_020af538(bool param1, u8 param2) {
mUnk_7c = param1;
mUnk_7e = param2;
mUnk_7d = param1;
if (mUnk_78) {
bool unk = gAdventureFlags->func_ov00_02097738() || data_027e0c68->mUnk_04 ? false : true;
if (unk) {
if (!this->func_ov00_020af4a4()) {
mUnk_7c = false;
}
}
if (!unk && this->func_ov00_020aeef8()) {
mUnk_7d = false;
}
}
this->func_ov000_020b7924(mUnk_7c);
if (mUnk_7c) {
if (mTouchDuration == 0) {
if (this->GetFollowActor() != NULL || mFollowing) {
data_027e0ffc.func_ov000_020cebcc(0x10a, gPlayerAngle, 0);
this->StopFollowing();
}
Vec3p vec;
s32 unk = gMapManager->func_ov00_02085108(&vec);
mUnk_82 = unk == 0x3 || unk == 0x7;
}
}
bool usingEquipBefore = mUsingEquipItem;
this->func_ov00_020af06c();
if (usingEquipBefore && !mUsingEquipItem) {
data_027e103c->func_ov000_020cf20c();
}
for (s32 i = 0; i < 2; ++i) {
if (mTouchGesture[i] != NULL) {
mTouchGesture[i]->Update(this);
}
}
mUnk_7f = false;
mUnk_83 = data_027e05f8.mUnk_0 & 0x300;
}
ARM void PlayerControl::func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4) {
if (param4 == 4) {
return;
}
if (param3 > 0) {
q20 distance = Vec3p_Distance(&gPlayerPos, param1);
if (distance >= param3) {
return;
}
mFollowRef.Reset();
}
Vec2b unk;
MapManager::func_ov00_02083a1c(&unk, gMapManager, param1);
mUnk_9c = unk;
mFollowing = true;
mUnk_80 = false;
mFollowStuckTimer = 15;
}
ARM bool PlayerControl::func_ov00_020af778() {
if (!mUnk_78 || gAdventureFlags->func_ov00_02097738() || gAdventureFlags->func_ov00_02097750()) {
mCutsceneEndTimer = 15;
return false;
}
if (mCutsceneEndTimer > 0) {
mCutsceneEndTimer -= 1;
return false;
}
if (!this->func_ov00_020aeef8()) {
mNextFollowRef.Reset();
return false;
}
bool bVar1 = false;
EquipItem *equipItem;
if ((mFlags & TouchFlag_UntouchedNow) != 0 && mTouchDuration < 21) {
s32 dx = mTouchLastX - mTouchFastX;
s32 dy = mTouchLastY - mTouchFastY;
if (dx * dx + dy * dy < 100) {
bVar1 = !this->func_ov00_020af2d4(7, true);
if (!bVar1 && mUsingEquipItem) {
ItemFlag equipId = gPlayer->GetEquipId();
if (equipId != ItemFlag_None) {
equipItem = gItemManager->GetEquipItem(equipId);
}
}
}
}
bool isGrabbing = gPlayerLink != NULL && gActorManager->GetActor(&gPlayerLink->mGrabActor) != NULL;
q20 followDistance = 0;
if (bVar1) {
Actor *nextFollowActor = gActorManager->GetActor(&mNextFollowRef);
unk32 uVar4 = 0;
if (nextFollowActor != NULL) {
uVar4 = nextFollowActor->mUnk_12c;
if (this->func_ov00_020afe88(uVar4, isGrabbing) && (equipItem == NULL || equipItem->vfunc_44(uVar4))) {
mFollowRef = mNextFollowRef;
mNextFollowRef.Reset();
mUnk_80 = false;
mFollowStuckTimer = 15;
followDistance = nextFollowActor->XzDistanceToLink();
}
}
Vec3p vec;
s32 iVar4 = gMapManager->func_ov00_02085108(&vec);
vec.y = gPlayerPos.y;
if (equipItem == NULL) {
if (iVar4 != 0 && this->func_ov00_020afeec(iVar4, isGrabbing)) {
this->func_ov00_020af6e4(&vec, followDistance, uVar4);
return true;
}
} else {
if (equipItem->vfunc_48()) {
this->func_ov00_020af6e4(&vec, followDistance, uVar4);
return true;
}
if (followDistance == 0 && equipItem->vfunc_40()) {
this->ApplyTouchWorld(&vec, 0);
this->func_ov00_020af6e4(&vec, 0, uVar4);
return true;
}
}
} else {
ActorRef ref;
ActorManager::func_ov00_020c3484(&ref, gActorManager, 0);
mNextFollowRef = ref;
if (mTouchDuration == 0) {
mLastFollowRef = mNextFollowRef;
}
}
return followDistance > 0;
}
ARM bool PlayerControl::func_ov00_020afad8(Vec3p *param1) {
if (param1->y >= gPlayerPos.y) {
return false;
}
if (mUsingEquipItem) {
if (gPlayer->GetEquipId() == ItemFlag_Shovel) {
Vec3p vec;
return gMapManager->func_ov00_02085594(&vec);
}
return false;
}
return false;
}
ARM void PlayerControl::func_ov00_020afb6c() {
bool iVar1 = this->func_ov00_020af778();
Actor *followActor = gActorManager->GetActor(&mFollowRef);
FairyId fairyId = gItemManager->GetEquippedFairy();
ActorNaviBase *fairy = gItemManager->GetFairy(fairyId);
if (followActor == NULL && fairy != NULL) {
fairy->func_ov000_020bad18();
}
q20 followDist = mFollowDist;
if (followActor == NULL) {
mFollowRef.Reset();
} else {
followDist = Vec3p_Distance(&gPlayerPos, &followActor->mPos);
Cylinder followHitbox;
followActor->GetHitbox(&followHitbox);
followHitbox.pos.y += FLOAT_TO_Q20(0.4);
s32 iVar8 = 0;
u32 uVar9 = 3;
switch (followActor->mUnk_12c) {
case 0: mFollowRef.Reset(); break;
case 1: iVar8 = 1; break;
case 2:
iVar8 = 3;
followHitbox.pos.y += followHitbox.size;
uVar9 = 0;
break;
case 3:
case 4:
iVar8 = 2;
followHitbox.pos.y += followHitbox.size;
uVar9 = 2;
break;
case 5:
iVar8 = 2;
uVar9 = 1;
followHitbox.pos.y += followActor->mYOffset;
break;
}
if (iVar8 != 0 && gPlayerLink->GetCurrentCharacter() == PlayerCharacter_Link) {
this->func_ov00_020aff90(&followHitbox, iVar8);
if (iVar1) {
data_027e0ffc.func_ov000_020ced64(&followHitbox, followActor->mRef.id);
}
}
}
if (!mFollowing) {
mFollowActor = NULL;
} else {
mFollowActor = (void *) gMapManager->MapData_vfunc_78();
Vec3p local_3c;
s32 iVar2;
s32 iVar7;
if (mFollowActor == NULL) {
local_3c.y = gPlayerPos.y;
Vec2b local_44 = mUnk_9c;
gMapManager->func_ov00_02083c7c(&local_3c, local_44);
iVar2 = 2;
iVar7 = 3;
} else {
}
}
}
bool PlayerControl::func_ov00_020afe88(s32 param1, bool param2) {}
bool PlayerControl::func_ov00_020afeec(unk32 param1, bool param2) {}
void PlayerControl::func_ov00_020aff90(unk32 param1, unk32 param2) {}
void PlayerControl::func_ov00_020aff90(Cylinder *param1, unk32 param2) {}
void PlayerControl::func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4) {}
void PlayerControl::func_ov00_020b014c() {}
void PlayerControl::SetAim() {}