diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index f344faea..8ff3f982 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -1,26 +1,16 @@ #pragma once -.extern LoadTreasureItemFanfare .extern _ZN11ItemManager12GetEquipItemEi .extern _ZNK11ItemManager10GetMaxAmmoEi +.extern _ZNK11ItemManager12GetMaxRupeesEv .extern data_027e0e60 -.extern gAdventureFlags .extern data_027e0f78 -.extern gHealthManager .extern data_027e103c -.extern data_027e1058 -.extern data_027e105c .extern data_ov00_020eec68 .extern func_020196bc .extern func_020196fc -.extern strcat -.extern func_ov00_02079ffc .extern func_ov00_02084b08 .extern func_ov00_02084b14 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020cf374 .extern func_ov00_020d73bc .extern func_ov05_02104004 -.extern EquipLinebeckCannon -.extern GiveShipPart .extern gItemManager diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index 6edb34ce..24774096 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -3,15 +3,6 @@ .text - .global _ZNK11ItemManager12GetMaxRupeesEv - arm_func_start _ZNK11ItemManager12GetMaxRupeesEv -_ZNK11ItemManager12GetMaxRupeesEv: ; 0x020ae2d4 - ldr r0, _020ae2dc ; =0x0000270f - bx lr - .align 2, 0 - arm_func_end _ZNK11ItemManager12GetMaxRupeesEv -_020ae2dc: .word 0x0000270f - .global _ZN11ItemManager10GiveRupeesEsi arm_func_start _ZN11ItemManager10GiveRupeesEsi _ZN11ItemManager10GiveRupeesEsi: ; 0x020ae2e0 diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 6228e437..b1d04f10 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -756,3 +756,7 @@ THUMB void ItemManager::UnequipPotion() { } break; } } + +ARM u32 ItemManager::GetMaxRupees() const { + return 9999; +}