diff options
| author | Aetias <aetias@outlook.com> | 2025-05-22 22:05:31 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-05-22 22:05:31 +0200 |
| commit | 0ae9b8c14902a59341ec84730d417eabe595f2de (patch) | |
| tree | 03ce8d268435e7165017374eaee15fbc37b1ace6 /include/Item | |
| parent | 4a764f9d58cb16343c02afb3592aad7aabf66d6d (diff) | |
| parent | 3f6a81d03dec2bd7c8394b508dbe4f017a5244b9 (diff) | |
Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl
Diffstat (limited to 'include/Item')
| -rw-r--r-- | include/Item/ItemManager.hpp | 9 | ||||
| -rw-r--r-- | include/Item/ItemModelLoader.hpp | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 00a9e52e..37f22457 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -20,15 +20,6 @@ extern "C" { #define MAX_AMMO_UPGRADE 2
#define MAX_UNK_0BA 9
-typedef s32 FairyId;
-enum FairyId_ {
- FairyId_None = -1,
- FairyId_Courage = 0,
- FairyId_Power = 1,
- FairyId_Wisdom = 2,
- FairyId_COUNT = 3,
-};
-
typedef u32 ItemModelId;
enum ItemModelId_ {
ItemModelId_OshusSword, // swA
diff --git a/include/Item/ItemModelLoader.hpp b/include/Item/ItemModelLoader.hpp index 6b06893a..3eb3e157 100644 --- a/include/Item/ItemModelLoader.hpp +++ b/include/Item/ItemModelLoader.hpp @@ -27,3 +27,5 @@ public: static void Create(); static void Destroy(); }; + +extern ItemModelLoader *gItemModelLoader; |