From 85c6d524aa700021bd9bbd1addb02c15656b505d Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 18 Feb 2024 12:33:58 +0100 Subject: [PATCH] Decomp `ItemManager::GetMaxShipPartCount` --- asm/ov00/ItemManager/ItemManager.s | 7 ------- src/ItemManager.cpp | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 5cdda1ca..63eccee2 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,13 +3,6 @@ .text - .global _ZNK11ItemManager19GetMaxShipPartCountEv - thumb_func_start _ZNK11ItemManager19GetMaxShipPartCountEv -_ZNK11ItemManager19GetMaxShipPartCountEv: ; 0x020ad9e0 - mov r0, #0x63 - bx lr - thumb_func_end _ZNK11ItemManager19GetMaxShipPartCountEv - .global _ZNK11ItemManager19GetMaxTreasureCountEv thumb_func_start _ZNK11ItemManager19GetMaxTreasureCountEv _ZNK11ItemManager19GetMaxTreasureCountEv: ; 0x020ad9e4 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 582e8644..296c99db 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -334,3 +334,7 @@ THUMB u16 ItemManager::GetMaxAmmo(ItemFlag equipId) const { default: return 1; } } + +THUMB u8 ItemManager::GetMaxShipPartCount() const { + return 99; +}