mirror of
https://github.com/zeldaret/ph
synced 2026-07-08 13:46:28 -04:00
Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl
This commit is contained in:
Aetias
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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() {}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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() {}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
@@ -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) {}
|
||||
|
||||
@@ -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,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;
|
||||
}
|
||||
|
||||
@@ -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() {}
|
||||
|
||||
@@ -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() {}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#include "Actor/Navi/ActorNavi.hpp"
|
||||
|
||||
ActorNavi::ActorNavi() {}
|
||||
@@ -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,5 +1,246 @@
|
||||
#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;
|
||||
this->PlayerLinkBase_vfunc_58(0, &sp4);
|
||||
return;
|
||||
}
|
||||
this->PlayerLinkBase_vfunc_58(1, this->GetGrabActorRef());
|
||||
}
|
||||
|
||||
ARM bool LinkStateMove::vfunc_3c() {
|
||||
if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowActor == 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;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
#include "Map/MapOverworld.hpp"
|
||||
|
||||
MapOverworld::MapOverworld(u32 width, u32 height) :
|
||||
MapBase(width, height) {}
|
||||
MapOverworld::~MapOverworld() {}
|
||||
void MapOverworld::vfunc_08(u32 param_2, u32 param_3, Course *param_4) {}
|
||||
void MapOverworld::vfunc_14() {}
|
||||
void MapOverworld::vfunc_1c(bool param_2) {}
|
||||
void MapOverworld::func_ov018_0215bfc8() {}
|
||||
void MapOverworld::vfunc_20(s32 param_2) {}
|
||||
void MapOverworld::vfunc_2c() {}
|
||||
void MapOverworld::vfunc_94() {}
|
||||
unk32 MapOverworld::vfunc_a4() {}
|
||||
unk32 MapOverworld::vfunc_54() {}
|
||||
unk32 MapOverworld::vfunc_58() {}
|
||||
unk32 MapOverworld::vfunc_5c() {}
|
||||
unk32 MapOverworld::vfunc_60() {}
|
||||
unk32 MapOverworld::vfunc_64() {}
|
||||
u32 MapOverworld::func_ov018_0215c34c() {}
|
||||
u32 MapOverworld::func_ov018_0215c368() {}
|
||||
s32 MapOverworld::func_ov018_0215c380(u8 *param1) {}
|
||||
void MapOverworld::vfunc_bc() {}
|
||||
void MapOverworld::vfunc_98() {}
|
||||
void MapOverworld::vfunc_c0() {}
|
||||
unk32 MapOverworld::vfunc_78() {}
|
||||
unk32 MapOverworld::vfunc_7c() {}
|
||||
unk32 MapOverworld::vfunc_80() {}
|
||||
unk8 MapOverworld::vfunc_b0(unk32 param_2, unk32 param_3) {}
|
||||
void MapOverworld::func_ov018_0215c650() {}
|
||||
void MapOverworld::func_ov018_0215c6ac() {}
|
||||
void MapOverworld::func_ov018_0215c6d0() {}
|
||||
MapOverworld_Unk1::MapOverworld_Unk1(u32 param1, u8 *param2, unk32 param3) :
|
||||
UnkStruct_ov000_020c0c08(0, param2) {}
|
||||
void MapOverworld::func_ov018_0215c9ac() {}
|
||||
void func_ov018_0215ca24(s32 param1) {}
|
||||
void func_ov018_0215ca3c(s32 param1, s32 param2, unk32 param3, unk32 param4) {}
|
||||
void func_ov018_0215ca8c(s32 param1) {}
|
||||
void MapOverworld::vfunc_4c() {}
|
||||
@@ -3,7 +3,8 @@
|
||||
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() {}
|
||||
@@ -16,4 +17,4 @@ 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) {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "Player/LinkStateBase.hpp"
|
||||
|
||||
LinkStateBase *GetLinkState(s32 index) {
|
||||
LinkStateBase *GetLinkState(LinkStateId index) {
|
||||
return gLinkStates[index];
|
||||
}
|
||||
|
||||
@@ -1,7 +1,88 @@
|
||||
#include "System/OverlayManager.hpp"
|
||||
#include "global.h"
|
||||
#include "nds/overlay.h"
|
||||
|
||||
void OverlayManager::Load(OverlayIndex index, OverlayId id) {}
|
||||
void OverlayManager::LoadIfNotLoaded(OverlayIndex index, OverlayId id) {}
|
||||
void OverlayManager::Unload(OverlayIndex index) {}
|
||||
void OverlayManager::LoadOverlaySetup(s32 index) {}
|
||||
void OverlayManager::UnloadOverlaySetup() {}
|
||||
struct UnkStruct_020ee698 {
|
||||
/* 00 */ unk8 mUnk_00[0x2C];
|
||||
/* 2c */ unk32 mUnk_2c;
|
||||
/* 30 */
|
||||
};
|
||||
extern UnkStruct_020ee698 data_ov000_020ee698;
|
||||
|
||||
struct OverlaySetup {
|
||||
/* 00 */ unk8 mUnk_00;
|
||||
/* 01 */ unk8 mUnk_01;
|
||||
/* 02 */ unk8 mUnk_02;
|
||||
/* 03 */ unk8 mUnk_03;
|
||||
/* 04 */ OverlayId slot1Overlay;
|
||||
/* 08 */ OverlayId slot2Overlay;
|
||||
/* 0c */ OverlayId slot3Overlay;
|
||||
/* 10 */ OverlayId slot12Overlay;
|
||||
/* 14 */ void *mUnk_14;
|
||||
/* 18 */ void *mUnk_18;
|
||||
/* 1c */
|
||||
};
|
||||
extern OverlaySetup gOverlaySetups[];
|
||||
|
||||
extern u32 *data_027e0ce0[];
|
||||
extern "C" void func_ov007_02102850(u32 **);
|
||||
extern "C" void func_ov007_021028a0(u32 **);
|
||||
|
||||
THUMB void OverlayManager::Load(OverlayIndex index, OverlayId id) {
|
||||
if (id != OverlayId_None) {
|
||||
Overlay_Load(NULL, id);
|
||||
}
|
||||
|
||||
this->mLoadedOverlays[index] = id;
|
||||
}
|
||||
|
||||
THUMB void OverlayManager::LoadIfNotLoaded(OverlayIndex index, OverlayId id) {
|
||||
OverlayId loadedId = this->mLoadedOverlays[index];
|
||||
|
||||
if (loadedId != id) {
|
||||
this->Unload(index);
|
||||
this->Load(index, id);
|
||||
}
|
||||
}
|
||||
|
||||
THUMB void OverlayManager::Unload(OverlayIndex index) {
|
||||
if (this->mLoadedOverlays[index] != OverlayId_None) {
|
||||
Overlay_Unload(NULL, this->mLoadedOverlays[index]);
|
||||
this->mLoadedOverlays[index] = OverlayId_None;
|
||||
}
|
||||
}
|
||||
|
||||
//! TODO: solve the .word issue with the overlay IDs
|
||||
//! both functions should match otherwise
|
||||
THUMB void OverlayManager::LoadOverlaySetup(s32 index) {
|
||||
OverlayId overlayId;
|
||||
OverlaySetup *pSetup;
|
||||
|
||||
pSetup = &gOverlaySetups[index];
|
||||
|
||||
this->LoadIfNotLoaded(OverlayIndex_1, pSetup->slot1Overlay);
|
||||
this->LoadIfNotLoaded(OverlayIndex_2, pSetup->slot2Overlay);
|
||||
|
||||
if (index == 5) {
|
||||
func_ov007_02102850(data_027e0ce0);
|
||||
} else {
|
||||
overlayId = pSetup->slot12Overlay;
|
||||
|
||||
if (index == 6 && data_ov000_020ee698.mUnk_2c == 2) {
|
||||
overlayId = OverlayId_61;
|
||||
}
|
||||
|
||||
this->Load(OverlayIndex_3, pSetup->slot3Overlay);
|
||||
this->Load(OverlayIndex_12, overlayId);
|
||||
}
|
||||
}
|
||||
|
||||
THUMB void OverlayManager::UnloadOverlaySetup() {
|
||||
this->Unload(OverlayIndex_12);
|
||||
this->Unload(OverlayIndex_3);
|
||||
|
||||
if (this->mLoadedOverlays[2] == OverlayId_07) {
|
||||
func_ov007_021028a0(data_027e0ce0);
|
||||
this->Unload(OverlayIndex_2);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user