From 90c42ba87028b2b64cede2fdad2cf729b1482638 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 18 Feb 2024 11:37:33 +0100 Subject: [PATCH] Decomp `ItemManager::GetShipPartCount` --- asm/ov00/ItemManager/ItemManager.s | 13 ------------- src/ItemManager.cpp | 4 ++++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index ddf91092..71bd4462 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,19 +3,6 @@ .text - .global _ZNK11ItemManager16GetShipPartCountEjj - thumb_func_start _ZNK11ItemManager16GetShipPartCountEjj -_ZNK11ItemManager16GetShipPartCountEjj: ; 0x020ad8f0 - lsl r3, r1, #3 - add r1, r1, r3 - add r0, r0, r1 - add r1, r0, r2 - mov r0, #0x48 - ldrsb r0, [r1, r0] - bx lr - .align 2, 0 - thumb_func_end _ZNK11ItemManager16GetShipPartCountEjj - .global _ZN11ItemManager16SetShipPartCountEjjj thumb_func_start _ZN11ItemManager16SetShipPartCountEjjj _ZN11ItemManager16SetShipPartCountEjjj: ; 0x020ad900 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 4582686b..abca58d5 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -279,3 +279,7 @@ THUMB ShipType ItemManager::GetEquippedShipPart(ShipPart part) const { THUMB void ItemManager::EquipShipPart(ShipPart part, ShipType type) { this->mEquippedShipParts[part] = type; } + +THUMB s8 ItemManager::GetShipPartCount(ShipPart part, ShipType type) const { + return this->mShipParts[part][type]; +}