From 64aea4ed325147a4d66b95b1eb514aad08c3e734 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 18 Feb 2024 11:41:18 +0100 Subject: [PATCH] Decomp `ItemManager::GetTreasureCount` --- asm/ov00/ItemManager/ItemManager.s | 9 --------- src/ItemManager.cpp | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 3b2d0902..67e344b3 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,15 +3,6 @@ .text - .global _ZNK11ItemManager16GetTreasureCountEj - thumb_func_start _ZNK11ItemManager16GetTreasureCountEj -_ZNK11ItemManager16GetTreasureCountEj: ; 0x020ad918 - add r1, r0, r1 - mov r0, #0x90 - ldrsb r0, [r1, r0] - bx lr - thumb_func_end _ZNK11ItemManager16GetTreasureCountEj - .global _ZN11ItemManager16SetTreasureCountEjj thumb_func_start _ZN11ItemManager16SetTreasureCountEjj _ZN11ItemManager16SetTreasureCountEjj: ; 0x020ad920 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 2d37ca5d..480e96cd 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -288,3 +288,7 @@ THUMB void ItemManager::SetShipPartCount(ShipPart part, ShipType type, s8 count) if (count > 99) count = 99; this->mShipParts[part][type] = count; } + +THUMB s8 ItemManager::GetTreasureCount(Treasure treasure) const { + return this->mTreasure[treasure]; +}