From 5ffac795ab8e3cd6b1162e4e24b535af2bd5c52e Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 26 Apr 2025 08:42:04 +0200 Subject: Clean up ItemManager --- src/00_Core/Item/ItemManager.cpp | 147 ++++++++++++++++++--------------------- src/00_Core/Map/MapManager.cpp | 2 +- 2 files changed, 70 insertions(+), 79 deletions(-) (limited to 'src') diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 3344c74e..aef0ec94 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -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) { @@ -237,24 +237,22 @@ ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) { (*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 func_ov015_02136670(void *param1); +extern u8 data_ov022_0217a4ac[]; extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2); extern "C" bool _ZNK11ItemManager7HasItemEi(); extern "C" void _ZN11ItemManager12GetEquipItemEi(); 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; } 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)) { @@ -320,7 +318,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 +377,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 +389,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 +438,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; @@ -521,7 +515,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); } @@ -841,9 +835,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 +843,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 +985,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 +1034,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 { diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 9c23a95b..82de433f 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -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) {} -- cgit v1.2.3 From 09070e2242c46a567f0aea42bed9d96afc2d90e1 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Thu, 2 Jan 2025 22:48:00 -0500 Subject: Decomp `AdventureFlags::Exists` and `AdventureFlags::func_ov00_02097674` --- src/00_Core/Save/AdventureFlags.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 7ba5f7c6..98d5dc96 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -1,8 +1,17 @@ #include "Save/AdventureFlags.hpp" -bool AdventureFlags::Exists() {} +extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); + +bool AdventureFlags::Exists() { + return gAdventureFlags != NULL; +} + void AdventureFlags::CopyTo(unk32 *flags) {} -void AdventureFlags::func_ov00_02097674() {} + +void AdventureFlags::func_ov00_02097674() { + func_ov000_020980f8(this->mCutsceneHandler); +} + s32 AdventureFlags::func_ov00_02097684() {} void AdventureFlags::Load() {} void AdventureFlags::func_ov00_020976c8() {} -- cgit v1.2.3 From c4d19db62a63bf9f9ec95d7fc8ee56a9d1554129 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Thu, 2 Jan 2025 22:51:19 -0500 Subject: Decomp `AdventureFlags::func_ov00_02097684` --- src/00_Core/Save/AdventureFlags.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 98d5dc96..ac292f9e 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -1,6 +1,7 @@ #include "Save/AdventureFlags.hpp" extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); +extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler); bool AdventureFlags::Exists() { return gAdventureFlags != NULL; @@ -12,7 +13,10 @@ void AdventureFlags::func_ov00_02097674() { func_ov000_020980f8(this->mCutsceneHandler); } -s32 AdventureFlags::func_ov00_02097684() {} +s32 AdventureFlags::func_ov00_02097684() { + return func_ov000_020980fc(this->mCutsceneHandler); +} + void AdventureFlags::Load() {} void AdventureFlags::func_ov00_020976c8() {} void AdventureFlags::func_ov00_02097700() {} -- cgit v1.2.3 From ab3d161e60b147db20329dc235a906122a5337ae Mon Sep 17 00:00:00 2001 From: mike8699 Date: Mon, 6 Jan 2025 11:37:33 -0500 Subject: Decomp `AdventureFlags::Get_FlagsUnk_30_Flag` --- src/00_Core/Save/AdventureFlags.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index ac292f9e..4eb679e3 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -33,7 +33,13 @@ 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) {} + +bool AdventureFlags::Get_FlagsUnk_30_Flag(int index) { + unk32 unk30 = this->Get_FlagsUnk_30(index); + + return this->Get(unk30); +} + unk8 AdventureFlags::Get_FlagsUnk_49(int index) {} unk8 AdventureFlags::Get_FlagsUnk_48(int index) {} unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {} -- cgit v1.2.3 From a44372043a0f157195f0d3510dc70ca73f61bdcf Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 21:59:47 -0500 Subject: Decomp `AdventureFlags::Get_FlagsUnk_49` --- src/00_Core/Save/AdventureFlags.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 4eb679e3..932d1e40 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -2,6 +2,7 @@ extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler); +extern u8 data_ov000_020e3155[]; bool AdventureFlags::Exists() { return gAdventureFlags != NULL; @@ -40,7 +41,10 @@ bool AdventureFlags::Get_FlagsUnk_30_Flag(int index) { return this->Get(unk30); } -unk8 AdventureFlags::Get_FlagsUnk_49(int index) {} +u8 AdventureFlags::Get_FlagsUnk_49(s32 index) { + return data_ov000_020e3155[index * 0x4C]; +} + unk8 AdventureFlags::Get_FlagsUnk_48(int index) {} unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {} unk16 AdventureFlags::Get_FlagsUnk_42(int index) {} -- cgit v1.2.3 From 382f48a3f359407ccbd78761027c2ad7cff05a5a Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 22:01:50 -0500 Subject: Decomp `AdventureFlags::Get_FlagsUnk_48` --- src/00_Core/Save/AdventureFlags.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 932d1e40..2a8900c2 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -2,6 +2,7 @@ extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler); +extern u8 data_ov000_020e3154[]; extern u8 data_ov000_020e3155[]; bool AdventureFlags::Exists() { @@ -45,7 +46,10 @@ u8 AdventureFlags::Get_FlagsUnk_49(s32 index) { return data_ov000_020e3155[index * 0x4C]; } -unk8 AdventureFlags::Get_FlagsUnk_48(int index) {} +u8 AdventureFlags::Get_FlagsUnk_48(s32 index) { + return data_ov000_020e3154[index * 0x4C]; +} + unk8 AdventureFlags::Get_FlagsUnk_4a(int index) {} unk16 AdventureFlags::Get_FlagsUnk_42(int index) {} unk16 AdventureFlags::Get_FlagsUnk_40(int index) {} -- cgit v1.2.3 From ff133277c2f72480a45700f45b214dc088d7d4d1 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 22:03:46 -0500 Subject: AdventureFlags: update all `int` to `s32` --- src/00_Core/Save/AdventureFlags.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 2a8900c2..19849bf0 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -36,7 +36,7 @@ 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) { +bool AdventureFlags::Get_FlagsUnk_30_Flag(s32 index) { unk32 unk30 = this->Get_FlagsUnk_30(index); return this->Get(unk30); @@ -50,16 +50,16 @@ u8 AdventureFlags::Get_FlagsUnk_48(s32 index) { return data_ov000_020e3154[index * 0x4C]; } -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) {} +unk8 AdventureFlags::Get_FlagsUnk_4a(s32 index) {} +unk16 AdventureFlags::Get_FlagsUnk_42(s32 index) {} +unk16 AdventureFlags::Get_FlagsUnk_40(s32 index) {} +unk32 AdventureFlags::Get_FlagsUnk_38(s32 index) {} +unk32 AdventureFlags::Get_FlagsUnk_34(s32 index) {} +unk32 AdventureFlags::Get_FlagsUnk_44(s32 index) {} +unk32 AdventureFlags::Get_FlagsUnk_30(s32 index) {} +bool AdventureFlags::Get_FlagsUnk_00(s32 index, FlagsUnk2 *result) {} +bool AdventureFlags::Get_FlagsUnk_18(s32 index, FlagsUnk2 *result) {} +FlagsUnk *AdventureFlags::Get_FlagsUnk(s32 index) {} bool AdventureFlags::func_ov00_02097e6c() {} bool AdventureFlags::func_ov00_02097e7c() {} bool AdventureFlags::func_ov00_02097ea4() {} -- cgit v1.2.3 From cf82a39b0eb6fdfa8c113860e89dec1d2691920a Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 22:25:07 -0500 Subject: Decomp a bunch of `AdventureFlags::Get_Flags*` --- src/00_Core/Save/AdventureFlags.cpp | 49 +++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 19849bf0..737c190c 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -2,8 +2,16 @@ extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); extern unk32 func_ov000_020980fc(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; @@ -50,16 +58,41 @@ u8 AdventureFlags::Get_FlagsUnk_48(s32 index) { return data_ov000_020e3154[index * 0x4C]; } -unk8 AdventureFlags::Get_FlagsUnk_4a(s32 index) {} -unk16 AdventureFlags::Get_FlagsUnk_42(s32 index) {} -unk16 AdventureFlags::Get_FlagsUnk_40(s32 index) {} -unk32 AdventureFlags::Get_FlagsUnk_38(s32 index) {} -unk32 AdventureFlags::Get_FlagsUnk_34(s32 index) {} -unk32 AdventureFlags::Get_FlagsUnk_44(s32 index) {} -unk32 AdventureFlags::Get_FlagsUnk_30(s32 index) {} +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) {} + +FlagsUnk *AdventureFlags::Get_FlagsUnk(s32 index) { + return (FlagsUnk *) (data_ov000_020e310c + index * 0x4C); +} + bool AdventureFlags::func_ov00_02097e6c() {} bool AdventureFlags::func_ov00_02097e7c() {} bool AdventureFlags::func_ov00_02097ea4() {} -- cgit v1.2.3 From e34ab528d41080a8ac7e281f2b41f844e5c80f98 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 22:40:27 -0500 Subject: Decomp `AdventureFlags::func_ov00_02097e6c` --- src/00_Core/Save/AdventureFlags.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 737c190c..e4bacb50 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -2,6 +2,7 @@ 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[]; @@ -93,7 +94,10 @@ FlagsUnk *AdventureFlags::Get_FlagsUnk(s32 index) { return (FlagsUnk *) (data_ov000_020e310c + index * 0x4C); } -bool AdventureFlags::func_ov00_02097e6c() {} +bool AdventureFlags::func_ov00_02097e6c() { + return func_ov000_02098114(this->mCutsceneHandler); +} + bool AdventureFlags::func_ov00_02097e7c() {} bool AdventureFlags::func_ov00_02097ea4() {} unk32 AdventureFlags::func_ov00_02097ecc() {} -- cgit v1.2.3 From 30292ac3ff3b41e5473ce9305915165cba277ea5 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 22:51:29 -0500 Subject: Decomp `AdventureFlags::func_ov00_02097e7c` --- src/00_Core/Save/AdventureFlags.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index e4bacb50..a2caebbd 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -1,4 +1,5 @@ #include "Save/AdventureFlags.hpp" +#include "Cutscene/CutsceneHandler.hpp" extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler); @@ -98,7 +99,18 @@ bool AdventureFlags::func_ov00_02097e6c() { return func_ov000_02098114(this->mCutsceneHandler); } -bool AdventureFlags::func_ov00_02097e7c() {} +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() {} unk32 AdventureFlags::func_ov00_02097ecc() {} void *AdventureFlags::func_ov00_02097f8c() {} -- cgit v1.2.3 From d4a4be5dfcba3568ed18106ed02ca0c28df1e681 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Wed, 8 Jan 2025 22:53:28 -0500 Subject: Decomp `AdventureFlags::func_ov00_02097ea4` --- src/00_Core/Save/AdventureFlags.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index a2caebbd..012e9efa 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -111,7 +111,17 @@ bool AdventureFlags::func_ov00_02097e7c() { return false; } -bool AdventureFlags::func_ov00_02097ea4() {} +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() {} -- cgit v1.2.3 From 2eb989a4cf55fcf4de543f1ca89bfd391c664da5 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 10 May 2025 20:42:30 +0200 Subject: Match `LinkStateMove` --- src/00_Core/Player/LinkStateMove.cpp | 77 +++++++++++++++++++++++++++++++---- src/Main/Debug/DebugHierarchyBase.cpp | 5 ++- 2 files changed, 72 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/00_Core/Player/LinkStateMove.cpp b/src/00_Core/Player/LinkStateMove.cpp index 918a92fe..889b3743 100644 --- a/src/00_Core/Player/LinkStateMove.cpp +++ b/src/00_Core/Player/LinkStateMove.cpp @@ -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 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; +} diff --git a/src/Main/Debug/DebugHierarchyBase.cpp b/src/Main/Debug/DebugHierarchyBase.cpp index 75b2f444..e6bf24c1 100644 --- a/src/Main/Debug/DebugHierarchyBase.cpp +++ b/src/Main/Debug/DebugHierarchyBase.cpp @@ -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) {} -- cgit v1.2.3