Decomp ItemManager::HasShipPartPriceShown

This commit is contained in:
Aetias
2024-04-30 19:16:05 +02:00
parent 5fed1c8b09
commit 64e4cae748
6 changed files with 8 additions and 32 deletions
-28
View File
@@ -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
+1 -1
View File
@@ -12,7 +12,7 @@
.extern _ZNK11ItemManager13GetFairyLevelEi
.extern _ZNK11ItemManager16GetShipPartCountEjj
.extern _ZNK11ItemManager18GetUnk_09e_DividedEj
.extern _ZNK11ItemManager18IsTreasureSalvagedEjj
.extern _ZNK11ItemManager21HasShipPartPriceShownEjj
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern _ZNK11ItemManager7HasItemEi
+1 -1
View File
@@ -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
+1 -1
View File
@@ -46,7 +46,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetShipPartCountEjj
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager18IsTreasureSalvagedEjj
.extern _ZNK11ItemManager21HasShipPartPriceShownEjj
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern __register_global_object
.extern data_020691a0
+1 -1
View File
@@ -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
+4
View File
@@ -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);
}