From 21f0a348abe2d70d8ab55d1266b948d8e9a965fb Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 18 Feb 2024 11:46:56 +0100 Subject: [PATCH] Decomp `ItemManager::GetUnk_098` --- 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 af3f79d1..7c81f5cd 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,15 +3,6 @@ .text - .global _ZNK11ItemManager10GetUnk_098Ej - thumb_func_start _ZNK11ItemManager10GetUnk_098Ej -_ZNK11ItemManager10GetUnk_098Ej: ; 0x020ad930 - add r0, r0, r1 - add r0, #0x98 - ldrb r0, [r0] - bx lr - thumb_func_end _ZNK11ItemManager10GetUnk_098Ej - .global _ZNK11ItemManager10GetUnk_09eEj thumb_func_start _ZNK11ItemManager10GetUnk_09eEj _ZNK11ItemManager10GetUnk_09eEj: ; 0x020ad938 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 1a4495f6..1618e75c 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -297,3 +297,7 @@ THUMB void ItemManager::SetTreasureCount(Treasure treasure, s8 count) { if (count > 99) count = 99; this->mTreasure[treasure] = count; } + +THUMB u8 ItemManager::GetUnk_098(u32 index) const { + return this->mUnk_098[index]; +}