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

Decomp ItemManager::HasPurplePotion

Browse Source
This commit is contained in:
Aetias
2024-04-30 18:24:27 +02:00
parent 028207d6a8
commit 102fc098fa
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Item/ItemManager.s
-16
View File
@@ -2,22 +2,6 @@
.include "ov00/Item/ItemManager.inc"
.text
.global _ZNK11ItemManager15HasPurplePotionEv
arm_func_start _ZNK11ItemManager15HasPurplePotionEv
_ZNK11ItemManager15HasPurplePotionEv: ; 0x020ae5d0
mov r2, #0
_020ae5d4:
add r1, r0, r2
ldrb r1, [r1, #0xbc]
cmp r1, #2
moveq r0, #1
bxeq lr
add r2, r2, #1
cmp r2, #2
blt _020ae5d4
mov r0, #0
bx lr
arm_func_end _ZNK11ItemManager15HasPurplePotionEv
.global _ZN11ItemManager21LoadDungeonItemModelsEv
thumb_func_start _ZN11ItemManager21LoadDungeonItemModelsEv
src/00_Core/Item/ItemManager.cpp
+7
View File
@@ -882,3 +882,10 @@ ARM bool ItemManager::HasAllPotions() const {
}
return true;
}
ARM bool ItemManager::HasPurplePotion() const {
for (s32 i = 0; i < MAX_POTIONS; ++i) {
if (mPotions[i] == Potion_Purple) return true;
}
return false;
}