mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-08-27 16:16:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl

Browse Source
This commit is contained in:
Aetias
2025-05-22 22:05:31 +02:00
parent 4a764f9d58 3f6a81d03d
commit 0ae9b8c149
225 changed files with 3752 additions and 2384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/00_Core/Actor/Actor.cpp
+2 -2
View File
@@ -312,8 +312,8 @@ ARM void Actor::SetTransform(Transform *transform) {
ARM void Actor::vfunc_a8() {}
ARM void Actor::func_Ov00_020c1bfc(s32 param1) {
gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]);
ARM bool Actor::func_ov00_020c1bfc(s32 param1) {
return gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]);
}
ARM void Actor::func_ov00_020c1c20(s32 param1, unk32 param2) {
src/00_Core/Actor/Dungeon/ActorActionObject.cpp
+85
View File
@@ -0,0 +1,85 @@
#include "Actor/Dungeon/ActorActionObject.hpp"
#include "Map/MapManager.hpp"
#include "Player/LinkStateBase.hpp"
#include "Player/PlayerLinkBase.hpp"
#include "Save/AdventureFlags.hpp"
#pragma section sbss begin
ActorType ActorActionObject::gType = ActorType(ActorTypeId_ActionObject, (ActorCreateFunc) ActorActionObject::Create, NULL);
#pragma section sbss end
extern u32 **data_027e0fe0[];
ARM ActorActionObject *ActorActionObject::Create() {
return new(*data_027e0fe0[0], 4) ActorActionObject();
}
ARM ActorActionObject::ActorActionObject() {}
ARM ActorActionObject::~ActorActionObject() {}
// non-matching
ARM bool ActorActionObject::vfunc_08() {
mGravity = 0;
mHitbox.pos = gVec3p_ZERO;
mHitbox.size = -1;
mUnk_08c.pos = mHitbox.pos;
mUnk_08c.size = mHitbox.size;
mUnk_0a4.mUnk_04 = gVec3p_ZERO;
mUnk_0a4.mUnk_10 = -1;
mVisible = false;
mUnk_130 = 0;
return true;
}
ARM void ActorActionObject::vfunc_14(u32 param1) {
if (!this->func_ov00_020c313c(param1)) {
return;
}
u32 flag = mUnk_020.mUnk_00[2];
bool bVar3;
switch (mUnk_020.mUnk_00[0]) {
case 0: bVar3 = true; break;
case 1:
if (gPlayerLink->mGrabActor.id != -1 && gPlayerLink->GetStateId() == LinkStateId_Move) {
bVar3 = true;
} else {
bVar3 = false;
}
break;
case 2:
if (gPlayerLink->mGrabActor.id == -1 && gPlayerLink->GetStateId() == LinkStateId_Move) {
bVar3 = true;
} else {
bVar3 = false;
}
break;
default: bVar3 = false; break;
}
if (!bVar3) {
return;
}
if (!gMapManager->func_ov00_020836dc((u32) mUnk_020.mUnk_00[1], 0)) {
return;
}
if (mUnk_020.mUnk_0a[0] != 0 && !this->func_ov00_020c1bfc(0)) {
return;
}
if (flag != 0 && !gAdventureFlags->Get(flag)) {
return;
}
PlayerLinkBase *link = gPlayerLink;
if (link != NULL && link->vfunc_18(7)) {
if (mUnk_020.mUnk_00[3] == 1) {
link->func_ov000_020bcf50(&mPos, 0x800);
}
this->func_ov00_020c1c20(1, 1);
this->Kill();
}
}
ARM void ActorActionObject::vfunc_18(u32 param1) {
this->func_ov00_020c313c(param1);
}
src/00_Core/Actor/Dungeon/ActorEventIcon.cpp
+1 -1
View File
@@ -8,6 +8,6 @@ bool ActorEventIcon::vfunc_08() {}
void ActorEventIcon::vfunc_14(u32 param1) {}
void ActorEventIcon::vfunc_18(u32 param1) {}
u32 ActorEventIcon::func_ov000_02090648(u32 param1) {}
bool func_ov000_02090774(u32 param1) {}
bool ActorEventIcon::func_ov000_02090774(u32 param1) {}
void ActorEventIcon::vfunc_1c(u16 *param1) {}
ActorEventIcon::~ActorEventIcon() {}
src/00_Core/Actor/Navi/ActorForceNavi.cpp
+14
View File
@@ -0,0 +1,14 @@
#include "Actor/Navi/ActorForceNavi.hpp"
#pragma section sbss begin
ActorType ActorForceNavi::gType = ActorType(ActorTypeId_ForceNavi, (ActorCreateFunc) ActorForceNavi::Create, NULL);
#pragma section sbss end
extern u32 **data_027e0fe0[];
ActorForceNavi *ActorForceNavi::Create() {
return new(*data_027e0fe0[0], 4) ActorForceNavi();
}
ARM FairyId ActorForceNavi::GetFairyId() {
return FairyId_Power;
}
src/00_Core/Actor/Navi/ActorNavi.cpp
+32
View File
@@ -0,0 +1,32 @@
#include "Actor/Navi/ActorNavi.hpp"
#include "Player/EquipHammer.hpp"
ActorType ActorNavi::gType = ActorType(ActorTypeId_Navi, (ActorCreateFunc) ActorNavi::Create, NULL);
UnkStruct_ov000_020b8110 data_ov000_020ee1cc;
ActorNavi *ActorNavi::Create() {}
UnkStruct_ov000_020b8110::UnkStruct_ov000_020b8110() :
UnkStruct_ov000_020beba8(7) {}
UnkStruct_ov000_020b8110::~UnkStruct_ov000_020b8110() {}
void UnkStruct_ov000_020b8110::vfunc_08(unk16 *param1) {}
void UnkStruct_ov000_020b8110::vfunc_18(s32 *param1) {}
void UnkStruct_ov000_020b8110::vfunc_14(u16 *param1) {}
void ActorNavi::func_ov000_020b8200() {}
void ActorNavi::vfunc_c4() {}
void ActorNavi::vfunc_c8() {}
FairyId ActorNavi::GetFairyId() {}
s32 ActorNavi::vfunc_b8() {}
void ActorNavi::vfunc_d4() {}
void ActorNavi::vfunc_d0() {}
void ActorNavi::SetActive(bool active) {}
void ActorNavi::vfunc_e0() {}
void ActorNavi::vfunc_d8() {}
void ActorNavi::vfunc_20(bool param1) {}
bool ActorNavi::vfunc_cc(unk32 *param1) {}
bool ActorNavi::vfunc_c0(Vec3p *param1) {}
void ActorNavi::vfunc_e8() {}
bool ActorNavi::vfunc_8c() {}
void ActorNavi::vfunc_ec() {}
EquipHammer *GetEquipHammer() {}
void ActorNavi::func_ov000_020b853c() {}
ActorNavi::~ActorNavi() {}
src/00_Core/Actor/Navi/ActorWisdomNavi.cpp
+14
View File
@@ -0,0 +1,14 @@
#include "Actor/Navi/ActorWisdomNavi.hpp"
#pragma section sbss begin
ActorType ActorWisdomNavi::gType = ActorType(ActorTypeId_WisdomNavi, (ActorCreateFunc) ActorWisdomNavi::Create, NULL);
#pragma section sbss end
extern u32 **data_027e0fe0[];
ARM ActorWisdomNavi *ActorWisdomNavi::Create() {
return new(*data_027e0fe0[0], 4) ActorWisdomNavi();
}
ARM FairyId ActorWisdomNavi::GetFairyId() {
return FairyId_Wisdom;
}
src/00_Core/Item/ItemManager.cpp
+68 -76
View File
@@ -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) {
@@ -238,19 +238,18 @@ ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) {
}
extern void *data_027e10a4;
extern "C" bool func_ov15_02136670(void *param1);
extern unk8 data_ov29_0217a4ac[];
extern "C" bool func_ov015_02136670(void *param1);
extern u8 data_ov022_0217a4ac[];
ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {
unk32 unk1 = data_027e0d38->func_ov000_02078b40();
if (unk1 == 2) return func_ov15_02136670(data_027e10a4);
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;
}
ItemFlag equipId = mForcedItem;
bool unk2 = !gMapManager->func_ov00_020849f8(equipId);
bool unk2 = !gMapManager->func_ov00_020849f8();
if (mEquippedItem != ItemFlag_None && (unk2 || (u32) mEquippedItem - 9 <= 1) &&
(gPlayerLink == 0 || gPlayerLink->func_ov000_020bbd80(param1)) && this->HasItem(mEquippedItem))
{
@@ -316,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) {
@@ -375,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] = {
@@ -387,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,
@@ -436,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_Unk_128 - 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;
@@ -517,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);
}
@@ -837,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()) {
@@ -848,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;
@@ -990,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) {
@@ -1039,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 {
src/00_Core/Map/MapManager.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ unk8 MapManager::GetMapData_Unk_07() {}
unk8 MapManager::func_ov00_0208499c() {}
unk8 MapManager::func_ov00_020849c0() {}
unk8 MapManager::func_ov00_020849dc() {}
bool MapManager::func_ov00_020849f8(unk32 param_1) {}
bool MapManager::func_ov00_020849f8() {}
unk8 MapManager::func_ov00_02084a50() {}
void MapManager::SpawnNPC(Vec3p *param_2, unk32 param_3, unk32 param_4) {}
bool MapManager::func_ov00_02084ac4(u32 actorId) {}
src/00_Core/Player/LinkStateBase.cpp
+3 -3
View File
@@ -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) {}
src/00_Core/Player/LinkStateMove.cpp
+69 -8
View File
@@ -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;
}
src/00_Core/Player/PlayerLinkBase.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ bool PlayerLinkBase::func_ov000_020bba00() {}
bool PlayerLinkBase::func_ov000_020bba14() {}
bool PlayerLinkBase::func_ov000_020bba28() {}
void PlayerLinkBase::func_ov000_020bba48() {}
void PlayerLinkBase::vfunc_18(s32 param1) {}
bool PlayerLinkBase::vfunc_18(s32 param1) {}
bool PlayerLinkBase::CanMove() {}
bool PlayerLinkBase::vfunc_58() {}
bool PlayerLinkBase::vfunc_5c() {}
src/00_Core/Player/TouchControl.cpp
+31 -3
View File
@@ -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() {}
src/00_Core/Save/AdventureFlags.cpp
+105 -19
View File
@@ -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() {}