mirror of
https://github.com/zeldaret/ph
synced 2026-06-10 20:58:33 -04:00
Decomp ItemManager::AddShipPartPriceShown
This commit is contained in:
@@ -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
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
.extern _ZN11ItemManager16SetShipPartCountEjjc
|
||||
.extern _ZN11ItemManager16SetTreasureCountEjc
|
||||
.extern _ZN11ItemManager19SetTreasureSalvagedEjj
|
||||
.extern _ZN11ItemManager21AddShipPartPriceShownEjj
|
||||
.extern _ZN11ItemManager21AddTreasurePriceShownEj
|
||||
.extern _ZN14AdventureFlags3GetEj
|
||||
.extern _ZN5Actor10SetUnk_11bEv
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user