From 108951f30797672103770a0b0c02deba9f892e34 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 17 Feb 2024 13:44:37 +0100 Subject: [PATCH] Decomp `ItemManager::GetEquippedShipPart` --- asm/ov00/ItemManager/ItemManager.s | 9 --------- src/ItemManager.cpp | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 2e3c183b..40b19031 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,15 +3,6 @@ .text - .global _ZNK11ItemManager19GetEquippedShipPartEj - thumb_func_start _ZNK11ItemManager19GetEquippedShipPartEj -_ZNK11ItemManager19GetEquippedShipPartEj: ; 0x020ad8e0 - lsl r1, r1, #2 - add r0, r0, r1 - ldr r0, [r0, #0x28] - bx lr - thumb_func_end _ZNK11ItemManager19GetEquippedShipPartEj - .global _ZN11ItemManager13EquipShipPartEjj thumb_func_start _ZN11ItemManager13EquipShipPartEjj _ZN11ItemManager13EquipShipPartEjj: ; 0x020ad8e8 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index d8b71b76..25e5f9bf 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -304,3 +304,6 @@ ARM NONMATCH bool ItemManager::func_ov00_020ad790(unk32 param1) { #endif } +THUMB ShipType ItemManager::GetEquippedShipPart(ShipPart part) const { + return this->mEquippedShipParts[part]; +}