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

Update ItemManager::GiveItem params

Browse Source
This commit is contained in:
Aetias
2024-04-14 14:39:15 +02:00
parent 905175763e
commit c323a0cda8
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Item/ItemManager.s
+4 -4
View File
@@ -3,9 +3,9 @@
.text
.global _ZN11ItemManager8GiveItemEjjj
thumb_func_start _ZN11ItemManager8GiveItemEjjj
_ZN11ItemManager8GiveItemEjjj: ; 0x020adcdc
.global _ZN11ItemManager8GiveItemEi
thumb_func_start _ZN11ItemManager8GiveItemEi
_ZN11ItemManager8GiveItemEi: ; 0x020adcdc
push {r3, r4, r5, lr}
cmp r1, #0x76
bgt _020addd2
@@ -182,7 +182,7 @@ _020addfc:
_020addfe:
cmp r1, #0x7b
bne _020ade04
thumb_func_end _ZN11ItemManager8GiveItemEjjj
thumb_func_end _ZN11ItemManager8GiveItemEi
_020ade02:
b _020ae198
_020ade04:
asm/ov05.inc
+1 -1
View File
@@ -4,7 +4,7 @@
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager15LoadFanfareItemEi
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase12ApplyImpulseEii
.extern _ZN13LinkStateBase12GetEquipItemEi
asm/ov05.s
+1 -1
View File
@@ -10646,7 +10646,7 @@ _0210989c:
ldr r0, _021099cc ; =gItemManager
ldr r1, [r5, #0x74]
ldr r0, [r0]
blx _ZN11ItemManager8GiveItemEjjj
blx _ZN11ItemManager8GiveItemEi
_021098bc:
mov r0, r4
blx _ZN4Item18func_ov00_020ad020Ei
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -12,7 +12,7 @@
.extern _ZN11ItemManager17EquipPreviousItemEv
.extern _ZN11ItemManager18EquipItem_vfunc_38Ei
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN11ItemManager9SetPotionEjj
.extern _ZN13PlayerControl20UpdateUsingEquipItemEv
.extern _ZN15LinkStateDamage18func_ov00_020aca94Ev
asm/ov14/ov14_0213b778.s
+2 -2
View File
@@ -26937,7 +26937,7 @@ _021506e6:
ldr r0, _02150764 ; =gItemManager
add r1, r4, #0
ldr r0, [r0]
bl _ZN11ItemManager8GiveItemEjjj
bl _ZN11ItemManager8GiveItemEi
ldr r2, _02150760 ; =data_027e1058
add r0, r5, #0
ldr r2, [r2]
@@ -26978,7 +26978,7 @@ _02150742:
ldr r0, _02150764 ; =gItemManager
add r1, r4, #0
ldr r0, [r0]
bl _ZN11ItemManager8GiveItemEjjj
bl _ZN11ItemManager8GiveItemEi
_0215074c:
ldr r0, _02150764 ; =gItemManager
add r1, r4, #0
asm/ov15.inc
+1 -1
View File
@@ -15,7 +15,7 @@
.extern _ZN11ItemManager18func_ov00_020ad528Ev
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern _ZN11ItemManager19SetTreasureSalvagedEj
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN13PlayerControl11IsTappedNowEv
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN13PlayerControl13StopFollowingEv
asm/ov15.s
+3 -3
View File
@@ -44538,7 +44538,7 @@ _0214531c:
ldr r0, _0214581c ; =gItemManager
mov r1, r5
ldr r0, [r0]
blx _ZN11ItemManager8GiveItemEjjj
blx _ZN11ItemManager8GiveItemEi
_02145334:
ldr r0, _0214581c ; =gItemManager
mov r1, r5
@@ -44602,7 +44602,7 @@ _021453f8:
ldr r0, _0214581c ; =gItemManager
mov r1, #0x26
ldr r0, [r0]
blx _ZN11ItemManager8GiveItemEjjj
blx _ZN11ItemManager8GiveItemEi
_0214541c:
bl func_ov15_021465e8
_02145420:
@@ -88238,7 +88238,7 @@ _0216a8e8:
ldr r0, _0216a95c ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx _ZN11ItemManager8GiveItemEjjj
blx _ZN11ItemManager8GiveItemEi
_0216a8f8:
bl func_ov15_02146578
mov r1, r0
asm/ov40.inc
+1 -1
View File
@@ -2,7 +2,7 @@
.extern Divide
.extern FastDivide
.extern _ZN11ItemManager7AddItemEi
.extern _ZN11ItemManager8GiveItemEjjj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
asm/ov40.s
+1 -1
View File
@@ -4428,7 +4428,7 @@ _0217f5a4:
mov r1, r1, lsl #0x8
ldr r0, [r0]
mov r1, r1, lsr #0x10
blx _ZN11ItemManager8GiveItemEjjj
blx _ZN11ItemManager8GiveItemEi
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f5c4:
include/Item/ItemManager.hpp
+1 -1
View File
@@ -300,7 +300,7 @@ public:
bool HasItem(ItemFlag item) const;
void AddItem(ItemFlag item);
void RemoveItem(ItemFlag item);
void GiveItem(ItemId id, unk32 param2, unk32 param3);
void GiveItem(ItemId id);
void GiveEquipItem(ItemFlag item, u16 ammo);
// Rupees