Decomp ItemManager::UpgradeQuiver

This commit is contained in:
Aetias
2024-04-30 18:05:13 +02:00
parent 458ede60df
commit 4f44cc2f93
3 changed files with 6 additions and 27 deletions
-27
View File
@@ -3,33 +3,6 @@
.text
.global _ZN11ItemManager13UpgradeQuiverEv
thumb_func_start _ZN11ItemManager13UpgradeQuiverEv
_ZN11ItemManager13UpgradeQuiverEv: ; 0x020ae458
push {r4, lr}
add r4, r0, #0
add r0, #0xb4
ldrh r0, [r0]
cmp r0, #2
bhs _020ae472
add r0, r4, #0
add r0, #0xb4
ldrh r0, [r0]
add r1, r0, #1
add r0, r4, #0
add r0, #0xb4
strh r1, [r0]
_020ae472:
add r0, r4, #0
mov r1, #5
bl _ZNK11ItemManager10GetMaxAmmoEi
add r4, #0xb0
ldr r1, [r4]
strh r0, [r1, #0xa]
pop {r4, pc}
.align 2, 0
thumb_func_end _ZN11ItemManager13UpgradeQuiverEv
.global _ZN11ItemManager14UpgradeBombBagEv
thumb_func_start _ZN11ItemManager14UpgradeBombBagEv
_ZN11ItemManager14UpgradeBombBagEv: ; 0x020ae484
+1
View File
@@ -19,6 +19,7 @@ extern "C" {
#include "Render/ModelRender.hpp"
#define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
#define MAX_AMMO_UPGRADE 2
typedef s32 FairyId;
enum FairyId_ {
+5
View File
@@ -827,3 +827,8 @@ ARM void ItemManager::UpdateSwordShieldInUse() {
this->GetEquipItem(ItemFlag_OshusSword)->UpdateInUse(1);
this->GetEquipItem(ItemFlag_WoodenShield)->UpdateInUse(1);
}
THUMB void ItemManager::UpgradeQuiver() {
if (mQuiverSize < MAX_AMMO_UPGRADE) mQuiverSize += 1;
(*mAmmo)[ItemFlag_Bow] = this->GetMaxAmmo(ItemFlag_Bow);
}