93% match Inventory::Load

This commit is contained in:
Aetias
2023-12-31 14:26:42 +01:00
parent f31bbc26fb
commit 0ab53a2adf
30 changed files with 480 additions and 405 deletions
+6
View File
@@ -5,12 +5,15 @@
#include "Player/EquipItem.hpp"
#include "Actors/Navi/Navi.hpp"
#define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
typedef u32 FairyId;
enum FairyId_ {
FairyId_None = -1,
FairyId_Courage = 0,
FairyId_Power = 1,
FairyId_Wisdom = 2,
FairyId_COUNT = 3,
};
enum Gem {
@@ -213,6 +216,9 @@ public:
void ClearPrevEquippedItem();
void Save(SaveInventory *save);
void Load(const SaveInventory *save);
bool HasItem(ItemFlag item);
};
extern Inventory *gInventory;
+2
View File
@@ -1,6 +1,8 @@
#ifndef PH_GLOBAL_H
#define PH_GLOBAL_H
#define GET_FLAG(arr, pos) (((1 << ((pos) & 0x1f)) & (arr)[pos >> 5]) != 0)
#ifdef NONMATCHING
#define NONMATCH
#else