From 75f492f8c645385f27da12cc7f06708a8031f4d1 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 30 Apr 2024 19:18:07 +0200 Subject: [PATCH] Decomp `ItemManager::HasTreasurePriceShown` --- asm/ov00/Item/ItemManager.s | 25 ------------------------- src/00_Core/Item/ItemManager.cpp | 4 ++++ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index b6552725..044bbf47 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -2,31 +2,6 @@ .include "ov00/Item/ItemManager.inc" .text - .global _ZNK11ItemManager21HasTreasurePriceShownEj - thumb_func_start _ZNK11ItemManager21HasTreasurePriceShownEj -_ZNK11ItemManager21HasTreasurePriceShownEj: ; 0x020ae744 - push {r3, r4} - add r4, r1, #0 - lsr r1, r1, #5 - lsl r1, r1, #2 - mov r2, #0x1f - add r1, r0, r1 - mov r0, #0x52 - lsl r0, r0, #2 - mov r3, #1 - and r4, r2 - add r2, r3, #0 - lsl r2, r4 - ldr r0, [r1, r0] - tst r0, r2 - bne _020ae764 - mov r3, #0 -_020ae764: - add r0, r3, #0 - pop {r3, r4} - bx lr - .align 2, 0 - thumb_func_end _ZNK11ItemManager21HasTreasurePriceShownEj .global _ZN11ItemManager21AddTreasurePriceShownEj thumb_func_start _ZN11ItemManager21AddTreasurePriceShownEj diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index c0350104..23c5b080 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -973,3 +973,7 @@ THUMB bool ItemManager::HasShipPartPriceShown(ShipPart part, ShipType type) cons THUMB void ItemManager::AddShipPartPriceShown(ShipPart part, ShipType type) { SET_FLAG(mShipPartPricesShown.flags, part * ShipType_COUNT + type); } + +THUMB bool ItemManager::HasTreasurePriceShown(Treasure treasure) const { + return GET_FLAG(mTreasurePriceShownFlags, treasure); +}