diff options
| author | Aetias <aetias@outlook.com> | 2024-04-30 19:17:11 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-04-30 19:17:11 +0200 |
| commit | 5d7c46a975366a8b871ed77b1f5d677cca03a590 (patch) | |
| tree | e71b9053aaee029359088e2ba2a34870d7f58bbf | |
| parent | 64e4cae74837f6e1a035ada889fb06351859fbac (diff) | |
Decomp `ItemManager::AddShipPartPriceShown`
| -rw-r--r-- | asm/ov00/Item/ItemManager.s | 26 | ||||
| -rw-r--r-- | asm/ov45.inc | 2 | ||||
| -rw-r--r-- | asm/ov45.s | 2 | ||||
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 4 |
4 files changed, 6 insertions, 28 deletions
diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index eb5c998e..b6552725 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -2,32 +2,6 @@ .include "ov00/Item/ItemManager.inc" .text - - .global _ZN11ItemManager19SetTreasureSalvagedEjj - thumb_func_start _ZN11ItemManager19SetTreasureSalvagedEjj -_ZN11ItemManager19SetTreasureSalvagedEjj: ; 0x020ae71c - push {r4, r5} - lsl r3, r1, #3 - add r1, r1, r3 - add r2, r2, r1 - mov r1, #0x4f - lsl r1, r1, #2 - add r1, r0, r1 - lsr r0, r2, #5 - lsl r0, r0, #2 - mov r3, #0x1f - mov r4, #1 - and r2, r3 - add r3, r4, #0 - ldr r5, [r1, r0] - lsl r3, r2 - add r2, r5, #0 - orr r2, r3 - str r2, [r1, r0] - pop {r4, r5} - bx lr - thumb_func_end _ZN11ItemManager19SetTreasureSalvagedEjj - .global _ZNK11ItemManager21HasTreasurePriceShownEj thumb_func_start _ZNK11ItemManager21HasTreasurePriceShownEj _ZNK11ItemManager21HasTreasurePriceShownEj: ; 0x020ae744 diff --git a/asm/ov45.inc b/asm/ov45.inc index 7a5b1509..c49e3b9e 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -1,7 +1,7 @@ #pragma once .extern _ZN11ItemManager16SetShipPartCountEjjc .extern _ZN11ItemManager16SetTreasureCountEjc -.extern _ZN11ItemManager19SetTreasureSalvagedEjj +.extern _ZN11ItemManager21AddShipPartPriceShownEjj .extern _ZN11ItemManager21AddTreasurePriceShownEj .extern _ZN14AdventureFlags3GetEj .extern _ZN5Actor10SetUnk_11bEv @@ -5128,7 +5128,7 @@ func_ov45_0218d4d4: ; 0x0218d4d4 mov r1, r0 ldr r2, [r5, #0x1c] mov r0, r4 - blx _ZN11ItemManager19SetTreasureSalvagedEjj + blx _ZN11ItemManager21AddShipPartPriceShownEjj ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov45_0218d4d4 diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index e89587f9..c0350104 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -969,3 +969,7 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) { THUMB bool ItemManager::HasShipPartPriceShown(ShipPart part, ShipType type) const {
return GET_FLAG(mShipPartPricesShown.flags, part * ShipType_COUNT + type);
}
+
+THUMB void ItemManager::AddShipPartPriceShown(ShipPart part, ShipType type) {
+ SET_FLAG(mShipPartPricesShown.flags, part * ShipType_COUNT + type);
+}
|