diff options
| author | Aetias <aetias@outlook.com> | 2024-04-19 16:36:22 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-04-19 16:36:22 +0200 |
| commit | 9a7bc06baa5dadd2632b550e3cf92a1aa13530a5 (patch) | |
| tree | 717c4adccef58930df40bc16346f40472acfbfb8 | |
| parent | 6f5483638ef2b70f53334e8987c6a57d24b93a51 (diff) | |
Decomp `ItemManager::func_ov00_020ae350`
| -rw-r--r-- | asm/ov00/Item/ItemManager.s | 14 | ||||
| -rw-r--r-- | include/Item/ItemManager.hpp | 2 | ||||
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 6 |
3 files changed, 7 insertions, 15 deletions
diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index 7ea818af..449141e9 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -3,18 +3,6 @@ .text - .global _ZNK11ItemManager18func_ov00_020ae350Ev - arm_func_start _ZNK11ItemManager18func_ov00_020ae350Ev -_ZNK11ItemManager18func_ov00_020ae350Ev: ; 0x020ae350 - ldr r0, _020ae360 ; =data_027e0e60 - ldr ip, _020ae364 ; =func_ov00_02084b14 - ldr r0, [r0] - bx ip - .align 2, 0 - arm_func_end _ZNK11ItemManager18func_ov00_020ae350Ev -_020ae360: .word data_027e0e60 -_020ae364: .word func_ov00_02084b14 - .global _ZN11ItemManager8GiveKeysEj thumb_func_start _ZN11ItemManager8GiveKeysEj _ZN11ItemManager8GiveKeysEj: ; 0x020ae368 @@ -70,7 +58,7 @@ _ZN11ItemManager17EquipPreviousItemEv: ; 0x020ae3c0 bx ip .align 2, 0 arm_func_end _ZN11ItemManager17EquipPreviousItemEv -_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEi +_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEi - 1 .global _ZN11ItemManager13ForceEquipItemEi thumb_func_start _ZN11ItemManager13ForceEquipItemEi diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 90e331ab..806672c3 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -317,7 +317,7 @@ public: void UnequipPotion();
// Unknown
- void func_ov00_020ae350() const;
+ unk32 func_ov00_020ae350() const;
void GiveKeys(u32 amount);
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 a8f6c5a2..fad8d3dd 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -761,7 +761,6 @@ ARM s32 ItemManager::GetMaxRupees() const { return 9999;
}
-
extern void *data_027e103c;
extern "C" s32 func_ov00_020cf374(void *param1, bool param2);
extern "C" void func_ov05_02104004(void *param1);
@@ -782,3 +781,8 @@ 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);
+}
|