From 5819677622c005367e23e8e456b27d584fd916db Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 30 Apr 2024 19:19:04 +0200 Subject: [PATCH] Decomp `ItemManager::AddTreasurePriceShown` --- 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 044bbf47..a89633d1 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -1,31 +1,6 @@ .include "macros/function.inc" .include "ov00/Item/ItemManager.inc" - .text - - .global _ZN11ItemManager21AddTreasurePriceShownEj - thumb_func_start _ZN11ItemManager21AddTreasurePriceShownEj -_ZN11ItemManager21AddTreasurePriceShownEj: ; 0x020ae76c - push {r4, r5} - mov r2, #0x52 - lsl r2, r2, #2 - add r2, r0, r2 - lsr r0, r1, #5 - lsl r0, r0, #2 - mov r3, #0x1f - mov r4, #1 - and r1, r3 - add r3, r4, #0 - ldr r5, [r2, r0] - lsl r3, r1 - add r1, r5, #0 - orr r1, r3 - str r1, [r2, r0] - pop {r4, r5} - bx lr - .align 2, 0 - thumb_func_end _ZN11ItemManager21AddTreasurePriceShownEj - .rodata .data diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 23c5b080..418555ac 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -977,3 +977,7 @@ THUMB void ItemManager::AddShipPartPriceShown(ShipPart part, ShipType type) { THUMB bool ItemManager::HasTreasurePriceShown(Treasure treasure) const { return GET_FLAG(mTreasurePriceShownFlags, treasure); } + +THUMB void ItemManager::AddTreasurePriceShown(Treasure treasure) { + SET_FLAG(mTreasurePriceShownFlags, treasure); +}