diff options
| author | Aetias <aetias@outlook.com> | 2024-04-30 18:24:27 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-04-30 18:24:27 +0200 |
| commit | 102fc098fa59af662c5b21bac49157cfaa23a0dc (patch) | |
| tree | 9efda16c1c4a6fdd4d8201df6eca80d724afa0f4 | |
| parent | 028207d6a8cc7bd88afb51cefd8bdd749993b00d (diff) | |
Decomp `ItemManager::HasPurplePotion`
| -rw-r--r-- | asm/ov00/Item/ItemManager.s | 16 | ||||
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 7 |
2 files changed, 7 insertions, 16 deletions
diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index 7135f5cb..74b706e5 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -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 diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index ea9d1f34..03cc2f19 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -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;
+}
|