From 8b7361a30096d49e041f748c470f220693815af2 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 18 Feb 2024 12:35:27 +0100 Subject: [PATCH] Decomp `ItemManager::GetMaxTreasureCount` --- asm/ov00/ItemManager/ItemManager.s | 9 +-------- src/ItemManager.cpp | 4 ++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 63eccee2..49f07520 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,13 +3,6 @@ .text - .global _ZNK11ItemManager19GetMaxTreasureCountEv - thumb_func_start _ZNK11ItemManager19GetMaxTreasureCountEv -_ZNK11ItemManager19GetMaxTreasureCountEv: ; 0x020ad9e4 - mov r0, #0x63 - bx lr - thumb_func_end _ZNK11ItemManager19GetMaxTreasureCountEv - .global _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj arm_func_start _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj: ; 0x020ad9e8 @@ -1333,7 +1326,7 @@ _ZN11ItemManager17EquipPreviousItemEv: ; 0x020ae3c0 bx ip .align 2, 0 arm_func_end _ZN11ItemManager17EquipPreviousItemEv -_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEj - 1 +_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEj .global _ZN11ItemManager13ForceEquipItemEj thumb_func_start _ZN11ItemManager13ForceEquipItemEj diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 296c99db..f6109c79 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -338,3 +338,7 @@ THUMB u16 ItemManager::GetMaxAmmo(ItemFlag equipId) const { THUMB u8 ItemManager::GetMaxShipPartCount() const { return 99; } + +THUMB u8 ItemManager::GetMaxTreasureCount() const { + return 99; +}