diff options
| author | Aetias <aetias@outlook.com> | 2024-04-30 17:36:52 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-04-30 17:36:52 +0200 |
| commit | a6896a0bc57ae2efa50f71ecd6fdc598969b7acb (patch) | |
| tree | bbbf38775b5598a672accfbfa241708fd4e23702 | |
| parent | d22083ba0a5c4844cb7cf1069532f11d1a5c7531 (diff) | |
Rename `ItemManager::GetNumKeys`
| -rw-r--r-- | asm/ov03.inc | 2 | ||||
| -rw-r--r-- | asm/ov03.s | 4 | ||||
| -rw-r--r-- | asm/ov14/ov14_0211f640.inc | 2 | ||||
| -rw-r--r-- | asm/ov14/ov14_0211f640.s | 4 | ||||
| -rw-r--r-- | include/Item/ItemManager.hpp | 6 | ||||
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 6 |
6 files changed, 13 insertions, 11 deletions
diff --git a/asm/ov03.inc b/asm/ov03.inc index 5f7fe179..826e9d78 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -56,7 +56,7 @@ .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager15GetEquippedItemEv .extern _ZNK11ItemManager16GetEquippedFairyEv -.extern _ZNK11ItemManager18func_ov00_020ae350Ev +.extern _ZNK11ItemManager10GetNumKeysEv .extern _ZNK11ItemManager7HasItemEi .extern __register_global_object .extern data_02050f54 @@ -12689,7 +12689,7 @@ func_ov03_020f63d4: ; 0x020f63d4 bl func_ov03_020f5d48 ldr r0, _020f6414 ; =gItemManager ldr r0, [r0] - blx _ZNK11ItemManager18func_ov00_020ae350Ev + blx _ZNK11ItemManager10GetNumKeysEv mov r1, #0x79 lsl r1, r1, #2 str r0, [r4, r1] @@ -13183,7 +13183,7 @@ func_ov03_020f6a88: ; 0x020f6a88 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _020f6b10 ; =gItemManager ldr r0, [r0] - bl _ZNK11ItemManager18func_ov00_020ae350Ev + bl _ZNK11ItemManager10GetNumKeysEv ldr r1, [r5, #0x1e4] mov r4, r0 subs r0, r4, r1 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 8f229369..40e9ab32 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -139,7 +139,7 @@ .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager15GetEquippedItemEv .extern _ZNK11ItemManager18func_ov00_020ad560Ei -.extern _ZNK11ItemManager18func_ov00_020ae350Ev +.extern _ZNK11ItemManager10GetNumKeysEv .extern _ZNK11ItemManager7HasItemEi .extern __register_global_object .extern data_02050f54 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 56e7282a..21002b8b 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -10454,7 +10454,7 @@ func_ov14_02127df4: ; 0x02127df4 ldmneia sp!, {r3, pc} ldr r0, _02127e24 ; =gItemManager ldr r0, [r0] - bl _ZNK11ItemManager18func_ov00_020ae350Ev + bl _ZNK11ItemManager10GetNumKeysEv cmp r0, #0 movgt r0, #1 movle r0, #0 @@ -10474,7 +10474,7 @@ func_ov14_02127e28: ; 0x02127e28 ldmneia sp!, {r4, pc} ldr r0, _02127eb4 ; =gItemManager ldr r0, [r0] - bl _ZNK11ItemManager18func_ov00_020ae350Ev + bl _ZNK11ItemManager10GetNumKeysEv cmp r0, #0 mvnle r0, #0 ldmleia sp!, {r4, pc} diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 8e4aa129..61d477f1 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -317,9 +317,11 @@ public: bool HasPurplePotion() const;
void UnequipPotion();
- // Unknown
- unk32 func_ov00_020ae350() const;
+ // Keys
+ unk32 GetNumKeys() const;
void GiveKeys(u32 amount);
+
+ // Unknown
void func_ov00_020ae4dc(unk32 param1); // sets mUnk_0ba
void func_ov00_020ae648(unk32 param1, unk32 param2, unk32 param3);
};
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index d483cf32..baf6e76b 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -1,4 +1,5 @@ #include "Item/ItemManager.hpp"
+#include "Map/MapManager.hpp"
extern u32 *data_027e0ce0[];
@@ -781,7 +782,6 @@ ARM void ItemManager::GiveRupees(s16 amount, bool param2) { mNumRupees = newRupees;
}
-extern "C" unk32 func_ov00_02084b14(void *param1);
-ARM unk32 ItemManager::func_ov00_020ae350() const {
- return func_ov00_02084b14(data_027e0e60);
+ARM unk32 ItemManager::GetNumKeys() const {
+ return gMapManager->GetNumKeys();
}
|