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

Decomp ItemManager::UnequipPotion

Browse Source
This commit is contained in:
Aetias
2024-04-18 19:54:58 +02:00
parent 711cfc7da2
commit b60ce0d48d
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Item/ItemManager.s
+1 -17
View File
@@ -3,22 +3,6 @@
.text
.global _ZN11ItemManager13UnequipPotionEv
thumb_func_start _ZN11ItemManager13UnequipPotionEv
_ZN11ItemManager13UnequipPotionEv: ; 0x020ae2c0
push {r3, lr}
ldr r1, [r0]
cmp r1, #9
beq _020ae2cc
cmp r1, #0xa
bne _020ae2d0
_020ae2cc:
blx _ZN11ItemManager17EquipPreviousItemEv
_020ae2d0:
pop {r3, pc}
.align 2, 0
thumb_func_end _ZN11ItemManager13UnequipPotionEv
.global _ZNK11ItemManager12GetMaxRupeesEv
arm_func_start _ZNK11ItemManager12GetMaxRupeesEv
_ZNK11ItemManager12GetMaxRupeesEv: ; 0x020ae2d4
@@ -132,7 +116,7 @@ _ZN11ItemManager17EquipPreviousItemEv: ; 0x020ae3c0
bx ip
.align 2, 0
arm_func_end _ZN11ItemManager17EquipPreviousItemEv
_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEi - 1
_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEi
.global _ZN11ItemManager13ForceEquipItemEi
thumb_func_start _ZN11ItemManager13ForceEquipItemEi
src/00_Core/Item/ItemManager.cpp
+9
View File
@@ -747,3 +747,12 @@ THUMB void ItemManager::GiveEquipItem(ItemFlag item, u16 ammo) {
this->mEquipLoadTimer = 1;
}
}
THUMB void ItemManager::UnequipPotion() {
switch (mEquippedItem) {
case ItemFlag_PotionA:
case ItemFlag_PotionB: {
this->EquipPreviousItem();
} break;
}
}