From e1d2f0b168ebd698d7a69dbb53fe15cc7fa548aa Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 19 Jan 2025 11:58:47 +0100 Subject: Move ov000 documentation from Ghidra --- src/00_Core/DTCM/UnkStruct_027e0d38.cpp | 5 +++++ src/00_Core/Item/ItemManager.cpp | 11 ++++++++--- src/00_Core/Map/MapManager.cpp | 2 +- src/00_Core/Physics/AABB.cpp | 15 +++++++++++++++ src/00_Core/Save/SaveItemManager.cpp | 3 +++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/00_Core/DTCM/UnkStruct_027e0d38.cpp create mode 100644 src/00_Core/Physics/AABB.cpp create mode 100644 src/00_Core/Save/SaveItemManager.cpp (limited to 'src') diff --git a/src/00_Core/DTCM/UnkStruct_027e0d38.cpp b/src/00_Core/DTCM/UnkStruct_027e0d38.cpp new file mode 100644 index 00000000..c9d66183 --- /dev/null +++ b/src/00_Core/DTCM/UnkStruct_027e0d38.cpp @@ -0,0 +1,5 @@ +#include "DTCM/UnkStruct_027e0d38.hpp" + +unk32 UnkStruct_027e0d38::func_ov000_02078b40() {} +unk8 UnkStruct_027e0d38::func_ov000_02078b64() {} +bool UnkStruct_027e0d38::func_ov000_02078b88() {} diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index c9088647..8b7ddde1 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -1,5 +1,11 @@ #include "Item/ItemManager.hpp" +#include "DTCM/UnkStruct_027e0d38.hpp" +#include "DTCM/UnkStruct_027e0f78.hpp" +#include "Map/MapManager.hpp" +#include "Player/HealthManager.hpp" #include "Player/PlayerLinkBase.hpp" +#include "Save/AdventureFlags.hpp" +#include "System/OverlayManager.hpp" static const char *sShipPartTypes[] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"}; @@ -21,7 +27,7 @@ THUMB void ItemManager::ClearPrevEquippedItem() { THUMB void ItemManager::Save(SaveItemManager *save) { save->itemFlags = mItemFlags; save->numRupees = mNumRupees; - for (s32 i = 0; i < NUM_POTIONS; ++i) { + for (s32 i = 0; i < MAX_POTIONS; ++i) { save->potions[i] = mPotions[i]; } save->numBombs = (u8) (*mAmmo)[ItemFlag_BombBag]; @@ -71,7 +77,7 @@ THUMB void ItemManager::Load(const SaveItemManager *save) { (*mAmmo)[ItemFlag_BombBag] = save->numBombs; (*mAmmo)[ItemFlag_BombchuBag] = save->numBombchus; (*mAmmo)[ItemFlag_Bow] = save->numArrows; - for (s32 i = 0; i < NUM_POTIONS; ++i) { + for (s32 i = 0; i < MAX_POTIONS; ++i) { mPotions[i] = save->potions[i]; } mEquippedItem = save->equippedItem; @@ -124,7 +130,6 @@ ARM ActorNavi *ItemManager::GetFairy(FairyId id) const { return mFairies[id]; } -extern UnkStruct_027e0d38 *data_027e0d38; extern unk32 gPlayerAnimHandler; extern "C" void LoadEquipItemModel(unk32 param1, ItemFlag param2); extern "C" void _ZNK11ItemManager15GetEquippedItemEv(); diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 69be3117..9c23a95b 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -132,7 +132,7 @@ void MapManager::func_ov00_02083f44(Vec3p *param_2) {} unk8 MapManager::MapData_vfunc_6c() {} unk8 MapManager::MapData_vfunc_70() {} unk8 MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3) {} -void MapManager::func_ov00_02084024(unk32 param_2, AABB *param_3) {} +void MapManager::GetTileWorldBounds(Vec2b *tile, AABB *tileBounds) {} unk8 MapManager::MapData_vfunc_54() {} unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) {} unk8 MapManager::MapData_vfunc_78() {} diff --git a/src/00_Core/Physics/AABB.cpp b/src/00_Core/Physics/AABB.cpp new file mode 100644 index 00000000..c3d6b2e0 --- /dev/null +++ b/src/00_Core/Physics/AABB.cpp @@ -0,0 +1,15 @@ +#include "Physics/AABB.hpp" + +bool AABB::func_ov000_0208e680() {} +void AABB::GetCenter(Vec3p *center) {} +q20 AABB::GetSizeX() {} +q20 AABB::GetSizeZ() {} +q20 AABB::GetSizeY() {} +bool AABB::Contains(Vec3p *vec) {} +bool AABB::ContainsInXZ(Vec3p *vec) {} +bool AABB::ContainsInXY(Vec3p *vec) {} +bool AABB::IntersectsCube(Cube *cube) {} +bool AABB::func_ov000_0208e87c(Cube *cube, Vec3p *vec, u32 *out) {} +void AABB::GrowToPoint(Vec3p *point) {} +void AABB::Grow(Vec3p *dimensions) {} +void AABB::GrowScalar(q20 amount) {} diff --git a/src/00_Core/Save/SaveItemManager.cpp b/src/00_Core/Save/SaveItemManager.cpp new file mode 100644 index 00000000..8fdf2cef --- /dev/null +++ b/src/00_Core/Save/SaveItemManager.cpp @@ -0,0 +1,3 @@ +#include "Save/SaveItemManager.hpp" + +SaveItemManager::SaveItemManager() {} -- cgit v1.2.3