diff options
| author | Yanis <35189056+Yanis002@users.noreply.github.com> | 2025-07-13 15:11:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-13 15:11:50 +0200 |
| commit | 0421d36979794e73793e40a92c55365e69f6944e (patch) | |
| tree | 9d02cf2999dfcfc6fbf1a7badee74d266002a221 /include/Item | |
| parent | 91e4cafc1906577aa792de2f072259e953ab60bf (diff) | |
Decompile overlay 8 (95%) (#115)
* started overlay 8
* progress
* progress
* progress
* more headers
* progress
* more progress
* symbols
* fix splits + new headers
* more progress
* func_ov008_02112ee0 & func_ov008_02112f28
* document fish in save item manager and unrelated things because precommit is mad
* SaveItemManager ctor
* progress?
* fix build issues
* split files to match data
* format
* format
* cleanup and match vfunc_08
* add reloc for overlay 0
* fix vtable symbol
* improve non-matching functions
---------
Co-authored-by: Aetias <144526980+AetiasHax@users.noreply.github.com>
Diffstat (limited to 'include/Item')
| -rw-r--r-- | include/Item/Item.hpp | 11 | ||||
| -rw-r--r-- | include/Item/ItemManager.hpp | 14 |
2 files changed, 18 insertions, 7 deletions
diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp index cea5c551..36f5a9ca 100644 --- a/include/Item/Item.hpp +++ b/include/Item/Item.hpp @@ -296,6 +296,17 @@ enum Potion_ { Potion_COUNT, }; +typedef u8 FishType; +enum FishType_ { + FishType_SkippyJack, + FishType_Toona, + FishType_Loovar, + FishType_RustySwordfish, + FishType_Neptoona, + FishType_Stowfish, + FishType_COUNT +}; + struct ItemFlags { /* 00 */ u32 flags[CEIL_DIV(ItemFlag_COUNT, 32)]; /* 10 */ diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 5931165b..10a64427 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -66,8 +66,8 @@ public: /* 028 */ ShipType mEquippedShipParts[ShipPart_COUNT];
/* 048 */ s8 mShipParts[ShipPart_COUNT][ShipType_COUNT];
/* 090 */ s8 mTreasure[Treasure_COUNT];
- /* 098 */ u8 mUnk_098[6]; // max 99
- /* 09e */ u16 mUnk_09e[6]; // max 9999, corresponds with mUnk_098
+ /* 098 */ FishType mFishCount[FishType_COUNT];
+ /* 09e */ u16 mFishSize[FishType_COUNT];
/* 0aa */ unk16 mUnk_0aa; // padding?
/* 0ac */ EquipItem *(*mEquipItems)[ItemFlag_EQUIP_COUNT];
/* 0b0 */ u16 (*mAmmo)[ItemFlag_EQUIP_COUNT];
@@ -176,11 +176,11 @@ public: void SetTreasureSalvaged(u32 index);
u8 GetMaxTreasureCount() const;
- // mUnk_098, mUnk_09e
- u8 GetUnk_098(u32 index) const;
- u16 GetUnk_09e(u32 index) const;
- s32 GetUnk_09e_Divided(u32 index) const;
- void SetUnk_09e(u32 index, u16 value); // also increments the corresponding mUnk_098 value
+ // mFishCount, mFishSize
+ u8 GetCollectedFishCount(u32 index) const;
+ u16 GetFishSize(u32 index) const;
+ s32 GetFishSize_Divided(u32 index) const;
+ void SetFishSize(u32 index, u16 value); // also increments the corresponding mFishCount value
// Item
bool HasItem(ItemFlag item) const;
|