From aefcf5bf217b239b33fbb3097ecfc06bb806c36c Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 17 Feb 2024 13:45:21 +0100 Subject: [PATCH] Decomp `ItemManager::EquipShipPart` --- 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 40b19031..871478bf 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,15 +3,6 @@ .text - .global _ZN11ItemManager13EquipShipPartEjj - thumb_func_start _ZN11ItemManager13EquipShipPartEjj -_ZN11ItemManager13EquipShipPartEjj: ; 0x020ad8e8 - lsl r1, r1, #2 - add r0, r0, r1 - str r2, [r0, #0x28] - bx lr - thumb_func_end _ZN11ItemManager13EquipShipPartEjj - .global _ZNK11ItemManager16GetShipPartCountEjj thumb_func_start _ZNK11ItemManager16GetShipPartCountEjj _ZNK11ItemManager16GetShipPartCountEjj: ; 0x020ad8f0 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 25e5f9bf..f21a763c 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -307,3 +307,7 @@ ARM NONMATCH bool ItemManager::func_ov00_020ad790(unk32 param1) { THUMB ShipType ItemManager::GetEquippedShipPart(ShipPart part) const { return this->mEquippedShipParts[part]; } + +THUMB void ItemManager::EquipShipPart(ShipPart part, ShipType type) { + this->mEquippedShipParts[part] = type; +}