From 983495b906968fc9560f3e46f9d3d768a9a08c95 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 30 Apr 2024 17:55:02 +0200 Subject: [PATCH] Decomp `ItemManager::EquipPreviousItem` --- asm/ov00/Item/ItemManager.s | 10 ---------- src/00_Core/Item/ItemManager.cpp | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index 302226a6..9ddbf7e2 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -3,16 +3,6 @@ .text - .global _ZN11ItemManager17EquipPreviousItemEv - arm_func_start _ZN11ItemManager17EquipPreviousItemEv -_ZN11ItemManager17EquipPreviousItemEv: ; 0x020ae3c0 - ldr ip, _020ae3cc ; =_ZN11ItemManager15SetEquippedItemEi - ldr r1, [r0, #4] - bx ip - .align 2, 0 - arm_func_end _ZN11ItemManager17EquipPreviousItemEv -_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEi - .global _ZN11ItemManager13ForceEquipItemEi thumb_func_start _ZN11ItemManager13ForceEquipItemEi _ZN11ItemManager13ForceEquipItemEi: ; 0x020ae3d0 diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 7c5c64b2..b283c01a 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -803,3 +803,7 @@ ARM bool ItemManager::SetEquippedItem(ItemFlag equipId) { mEquipLoadTimer = 2; return true; } + +ARM void ItemManager::EquipPreviousItem() { + this->SetEquippedItem(mPrevEquippedItem); +}