mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename ItemManager::GetNumKeys

Browse Source
This commit is contained in:
Aetias
2024-04-30 17:36:52 +02:00
parent d22083ba0a
commit a6896a0bc5
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov03.inc
+1 -1
View File
@@ -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
asm/ov03.s
+2 -2
View File
@@ -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
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -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
asm/ov14/ov14_0211f640.s
+2 -2
View File
@@ -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}
include/Item/ItemManager.hpp
+4 -2
View File
@@ -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);
};
src/00_Core/Item/ItemManager.cpp
+3 -3
View File
@@ -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();
}