Decomp ItemManager::GetAmmo

2026-05-23 23:05:17 -04:00 · 2024-02-17 00:45:59 +01:00
parent de3c2636d7
commit ef2226c84d
2 changed files with 4 additions and 9 deletions
@@ -3,15 +3,6 @@

 	.text

-	.global _ZNK11ItemManager7GetAmmoEj
-	arm_func_start _ZNK11ItemManager7GetAmmoEj
-_ZNK11ItemManager7GetAmmoEj: ; 0x020ad72c
-	ldr r2, [r0, #0xb0]
-	mov r0, r1, lsl #0x1
-	ldrh r0, [r2, r0]
-	bx lr
-	arm_func_end _ZNK11ItemManager7GetAmmoEj
-
 	.global _ZN11ItemManager8GiveAmmoEjj
 	arm_func_start _ZN11ItemManager8GiveAmmoEjj
 _ZN11ItemManager8GiveAmmoEjj: ; 0x020ad73c
@@ -262,4 +262,8 @@ EquipItem* ItemManager::GetEquipItem(ItemFlag equipId) {
        return (*this->mEquipItems)[equipId];
    }
 }
+
+u16 ItemManager::GetAmmo(ItemFlag equipId) const {
+    return (*this->mAmmo)[equipId];
+}
 #pragma interworking off