From 64e4cae74837f6e1a035ada889fb06351859fbac Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Tue, 30 Apr 2024 19:16:05 +0200
Subject: [PATCH] Decomp `ItemManager::HasShipPartPriceShown`

---
 asm/ov00/Item/ItemManager.s      | 28 ----------------------------
 asm/ov02.inc                     |  2 +-
 asm/ov02.s                       |  2 +-
 asm/ov45.inc                     |  2 +-
 asm/ov45.s                       |  2 +-
 src/00_Core/Item/ItemManager.cpp |  4 ++++
 6 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s
index 281b8dab..eb5c998e 100644
--- a/asm/ov00/Item/ItemManager.s
+++ b/asm/ov00/Item/ItemManager.s
@@ -3,34 +3,6 @@
 
 	.text
 
-	.global _ZNK11ItemManager18IsTreasureSalvagedEjj
-	thumb_func_start _ZNK11ItemManager18IsTreasureSalvagedEjj
-_ZNK11ItemManager18IsTreasureSalvagedEjj: ; 0x020ae6f0
-	push {r3, r4}
-	lsl r3, r1, #3
-	add r1, r1, r3
-	add r4, r2, r1
-	mov r2, #1
-	mov r1, #0x1f
-	add r3, r4, #0
-	and r3, r1
-	add r1, r2, #0
-	lsl r1, r3
-	lsr r3, r4, #5
-	lsl r3, r3, #2
-	add r3, r0, r3
-	mov r0, #0x4f
-	lsl r0, r0, #2
-	ldr r0, [r3, r0]
-	tst r0, r1
-	bne _020ae716
-	mov r2, #0
-_020ae716:
-	add r0, r2, #0
-	pop {r3, r4}
-	bx lr
-	thumb_func_end _ZNK11ItemManager18IsTreasureSalvagedEjj
-
 	.global _ZN11ItemManager19SetTreasureSalvagedEjj
 	thumb_func_start _ZN11ItemManager19SetTreasureSalvagedEjj
 _ZN11ItemManager19SetTreasureSalvagedEjj: ; 0x020ae71c
diff --git a/asm/ov02.inc b/asm/ov02.inc
index d4c01ead..c341bb21 100644
--- a/asm/ov02.inc
+++ b/asm/ov02.inc
@@ -12,7 +12,7 @@
 .extern _ZNK11ItemManager13GetFairyLevelEi
 .extern _ZNK11ItemManager16GetShipPartCountEjj
 .extern _ZNK11ItemManager18GetUnk_09e_DividedEj
-.extern _ZNK11ItemManager18IsTreasureSalvagedEjj
+.extern _ZNK11ItemManager21HasShipPartPriceShownEjj
 .extern _ZNK11ItemManager19GetEquippedShipPartEj
 .extern _ZNK11ItemManager21HasTreasurePriceShownEj
 .extern _ZNK11ItemManager7HasItemEi
diff --git a/asm/ov02.s b/asm/ov02.s
index e379b0b8..ff23da1d 100644
--- a/asm/ov02.s
+++ b/asm/ov02.s
@@ -2883,7 +2883,7 @@ _020f1424:
 	mov r1, r0
 	ldr r2, [r5, #0x1c]
 	mov r0, r6
-	blx _ZNK11ItemManager18IsTreasureSalvagedEjj
+	blx _ZNK11ItemManager21HasShipPartPriceShownEjj
 	cmp r0, #0
 	beq _020f14f4
 	add ip, sp, #0x28
diff --git a/asm/ov45.inc b/asm/ov45.inc
index 26ab850f..7a5b1509 100644
--- a/asm/ov45.inc
+++ b/asm/ov45.inc
@@ -46,7 +46,7 @@
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZNK11ItemManager16GetShipPartCountEjj
 .extern _ZNK11ItemManager16GetTreasureCountEj
-.extern _ZNK11ItemManager18IsTreasureSalvagedEjj
+.extern _ZNK11ItemManager21HasShipPartPriceShownEjj
 .extern _ZNK11ItemManager21HasTreasurePriceShownEj
 .extern __register_global_object
 .extern data_020691a0
diff --git a/asm/ov45.s b/asm/ov45.s
index 16f4ab76..11d4e3c4 100644
--- a/asm/ov45.s
+++ b/asm/ov45.s
@@ -6012,7 +6012,7 @@ _0218de84:
 	mov r1, r0
 	ldr r2, [r5, #0x1c]
 	mov r0, r6
-	blx _ZNK11ItemManager18IsTreasureSalvagedEjj
+	blx _ZNK11ItemManager21HasShipPartPriceShownEjj
 	cmp r0, #0
 	beq _0218df54
 	add ip, sp, #0x28
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index f46fa040..e89587f9 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -965,3 +965,7 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
     }
     PlaySoundEffect(&data_ov00_020eec68, sfx);
 }
+
+THUMB bool ItemManager::HasShipPartPriceShown(ShipPart part, ShipType type) const {
+    return GET_FLAG(mShipPartPricesShown.flags, part * ShipType_COUNT + type);
+}