mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-30 00:46:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle ItemManager function names

Browse Source
This commit is contained in:
Aetias
2024-01-07 15:05:12 +01:00
parent 7302784339
commit 193e184c0e
54 changed files with 699 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/global.inc
+62 -62
View File
@@ -264313,24 +264313,24 @@
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager13TickEquipItemEv
.extern func_ov00_020ad4b4
.extern func_ov00_020ad528
.extern func_ov00_020ad52c
.extern func_ov00_020ad538
.extern func_ov00_020ad560
.extern func_ov00_020ad588
.extern func_ov00_020ad594
.extern func_ov00_020ad5bc
.extern func_ov00_020ad5d8
.extern func_ov00_020ad5f4
.extern _ZN11ItemManager18func_ov00_020ad528Ev
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZNK11ItemManager18func_ov00_020ad538Ej
.extern _ZNK11ItemManager18func_ov00_020ad560Ej
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZNK11ItemManager18func_ov00_020ad594Ej
.extern _ZN11ItemManager13Sword_vfunc_38Ev
.extern _ZN11ItemManager14Shield_vfunc_38Ev
.extern _ZN11ItemManager17EquipItem_vfunc_38Ev
.extern func_ov00_020ad620
.extern func_ov00_020ad678
.extern _ZN11ItemManager18func_ov00_020ad678Ejjj
.extern func_ov00_020ad6d8
.extern func_ov00_020ad6ec
.extern func_ov00_020ad6f8
.extern func_ov00_020ad714
.extern func_ov00_020ad72c
.extern func_ov00_020ad73c
.extern func_ov00_020ad790
.extern _ZN11ItemManager17EquipItem_vfunc_2cEj
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZNK11ItemManager7GetAmmoEj
.extern _ZN11ItemManager8GiveAmmoEjj
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern func_ov00_020ad7c0
.extern func_ov00_020ad800
.extern func_ov00_020ad840
@@ -264338,39 +264338,39 @@
.extern func_ov00_020ad874
.extern func_ov00_020ad89c
.extern func_ov00_020ad8bc
.extern func_ov00_020ad8e0
.extern func_ov00_020ad8e8
.extern func_ov00_020ad8f0
.extern func_ov00_020ad900
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern _ZN11ItemManager13EquipShipPartEjj
.extern _ZNK11ItemManager16GetShipPartCountEjj
.extern _ZN11ItemManager16SetShipPartCountEjjj
.extern func_ov00_020ad908
.extern func_ov00_020ad918
.extern func_ov00_020ad920
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZN11ItemManager16SetTreasureCountEjj
.extern func_ov00_020ad926
.extern func_ov00_020ad930
.extern func_ov00_020ad938
.extern func_ov00_020ad944
.extern _ZNK11ItemManager10GetUnk_098Ej
.extern _ZNK11ItemManager10GetUnk_09eEj
.extern _ZNK11ItemManager18GetUnk_09e_DividedEj
.extern func_ov00_020ad964
.extern func_ov00_020ad96c
.extern _ZN11ItemManager10SetUnk_09eEjj
.extern func_ov00_020ad980
.extern func_ov00_020ad994
.extern func_ov00_020ad996
.extern func_ov00_020ad9a0
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern func_ov00_020ad9ae
.extern func_ov00_020ad9ba
.extern func_ov00_020ad9c6
.extern func_ov00_020ad9d2
.extern func_ov00_020ad9e0
.extern func_ov00_020ad9e4
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager19GetMaxShipPartCountEv
.extern _ZNK11ItemManager19GetMaxTreasureCountEv
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern func_ov00_020ada24
.extern func_ov00_020ada48
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
.extern _ZN11ItemManager7HasItemEj
.extern func_ov00_020ada98
.extern func_ov00_020adabc
.extern func_ov00_020adadc
.extern func_ov00_020adb00
.extern _ZN11ItemManager7AddItemEj
.extern _ZNK11ItemManager21HasShipPartPriceShownEj
.extern _ZN11ItemManager21AddShipPartPriceShownEj
.extern _ZN11ItemManager10RemoveItemEj
.extern func_ov00_020adb2c
.extern func_ov00_020adb30
.extern _ZN11ItemManager15LoadFanfareItemEj
.extern func_ov00_020adb4c
.extern func_ov00_020adb54
.extern func_ov00_020adb5c
@@ -264388,12 +264388,12 @@
.extern func_ov00_020adc22
.extern func_ov00_020adc2a
.extern func_ov00_020adc7c
.extern func_ov00_020adca8
.extern _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
.extern func_ov00_020adcbe
.extern func_ov00_020adcc4
.extern func_ov00_020adcc8
.extern func_ov00_020adcd4
.extern func_ov00_020adcdc
.extern _ZN11ItemManager8GiveItemEjjj
.extern func_ov00_020adce6
.extern func_ov00_020adcee
.extern func_ov00_020adcf6
@@ -264466,52 +264466,52 @@
.extern func_ov00_020ae222
.extern func_ov00_020ae258
.extern func_ov00_020ae270
.extern func_ov00_020ae278
.extern _ZN11ItemManager13GiveEquipItemEjj
.extern func_ov00_020ae2bc
.extern func_ov00_020ae2c0
.extern _ZN11ItemManager13UnequipPotionEv
.extern func_ov00_020ae2cc
.extern func_ov00_020ae2d0
.extern func_ov00_020ae2d4
.extern func_ov00_020ae2e0
.extern _ZNK11ItemManager12GetMaxRupeesEv
.extern _ZN11ItemManager10GiveRupeesEjj
.extern func_ov00_020ae310
.extern func_ov00_020ae318
.extern func_ov00_020ae344
.extern func_ov00_020ae350
.extern func_ov00_020ae368
.extern _ZNK11ItemManager18func_ov00_020ae350Ev
.extern _ZN11ItemManager8GiveKeysEj
.extern func_ov00_020ae37c
.extern func_ov00_020ae382
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern func_ov00_020ae3a8
.extern func_ov00_020ae3c0
.extern func_ov00_020ae3d0
.extern _ZN11ItemManager15SetEquippedItemEj
.extern _ZN11ItemManager17EquipPreviousItemEv
.extern _ZN11ItemManager13ForceEquipItemEj
.extern func_ov00_020ae3da
.extern func_ov00_020ae3ee
.extern func_ov00_020ae400
.extern _ZN11ItemManager20ClearForcedEquipItemEv
.extern func_ov00_020ae414
.extern func_ov00_020ae418
.extern func_ov00_020ae458
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN11ItemManager13UpgradeQuiverEv
.extern func_ov00_020ae472
.extern func_ov00_020ae484
.extern _ZN11ItemManager14UpgradeBombBagEv
.extern func_ov00_020ae49e
.extern func_ov00_020ae4b0
.extern _ZN11ItemManager17UpgradeBombchuBagEv
.extern func_ov00_020ae4ca
.extern func_ov00_020ae4dc
.extern func_ov00_020ae50c
.extern _ZN11ItemManager18func_ov00_020ae4dcEj
.extern _ZN11ItemManager9SetPotionEjj
.extern func_ov00_020ae544
.extern func_ov00_020ae564
.extern _ZNK11ItemManager9HasPotionEj
.extern func_ov00_020ae588
.extern func_ov00_020ae590
.extern func_ov00_020ae598
.extern _ZNK11ItemManager13HasAllPotionsEv
.extern func_ov00_020ae5a4
.extern func_ov00_020ae5d0
.extern _ZNK11ItemManager13HasBluePotionEv
.extern func_ov00_020ae5d4
.extern func_ov00_020ae5fc
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
.extern func_ov00_020ae604
.extern func_ov00_020ae61a
.extern func_ov00_020ae622
.extern func_ov00_020ae628
.extern func_ov00_020ae638
.extern func_ov00_020ae648
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern func_ov00_020ae65e
.extern func_ov00_020ae67e
.extern func_ov00_020ae684
@@ -264529,12 +264529,12 @@
.extern func_ov00_020ae6cc
.extern func_ov00_020ae6ce
.extern func_ov00_020ae6de
.extern func_ov00_020ae6f0
.extern _ZNK11ItemManager21HasShipPartPriceShownEjj
.extern func_ov00_020ae716
.extern func_ov00_020ae71c
.extern func_ov00_020ae744
.extern _ZN11ItemManager21AddShipPartPriceShownEjj
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern func_ov00_020ae764
.extern func_ov00_020ae76c
.extern _ZN11ItemManager21AddTreasurePriceShownEj
.extern func_ov00_020ae790
.extern func_ov00_020ae794
.extern func_ov00_020ae79c
asm/main.s
+3 -3
View File
@@ -76227,7 +76227,7 @@ _0203826c:
ldr r1, [r4, #4]
ldr r0, [r0]
mov r2, #1
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
@@ -76323,7 +76323,7 @@ _020383c0:
ldr r0, _02038590 ; =gItemManager
ldrsh r1, [r4, #6]
ldr r0, [r0]
blx func_ov00_020ae368
blx _ZN11ItemManager8GiveKeysEj
_020383dc:
add sp, sp, #0x18
mov r0, #2
@@ -76332,7 +76332,7 @@ _020383e8:
ldr r0, _02038590 ; =gItemManager
ldr r1, [r4, #4]
ldr r0, [r0]
blx func_ov00_020ada98
blx _ZN11ItemManager7AddItemEj
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
asm/ov00/ItemManager/ItemManager.s
+291 -291
View File
File diff suppressed because it is too large Load Diff
asm/ov00/include/ov00_0209bea0.inc
+1 -1
View File
@@ -43,7 +43,7 @@
.extern func_ov00_02083978
.extern data_027e0e60
.extern func_01ff9cec
.extern func_ov00_020ae5fc
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
.extern func_ov00_020c45c4
.extern func_ov00_020c4648
.extern func_ov00_02082638
asm/ov00/include/ov00_020a03e4.inc
+8 -8
View File
@@ -555,8 +555,8 @@
.extern func_01ffec34
.extern func_ov00_0208f030
.extern gItemManager
.extern func_ov00_020ad678
.extern func_ov00_020ad6f8
.extern _ZN11ItemManager18func_ov00_020ad678Ejjj
.extern _ZN11ItemManager17EquipItem_vfunc_2cEj
.extern gItemManager
.extern func_ov00_02083624
.extern data_027e0e60
@@ -587,10 +587,10 @@
.extern func_ov00_020bd364
.extern func_ov00_020bb544
.extern func_ov00_020bb594
.extern func_ov00_020ad714
.extern _ZN11ItemManager12GetEquipItemEj
.extern gItemManager
.extern gItemManager
.extern func_ov00_020ae418
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern func_ov05_02106980
.extern func_01fffcd8
.extern func_ov00_020bb810
@@ -671,10 +671,10 @@
.extern data_027e0fe4
.extern func_ov00_020c3674
.extern func_ov00_020bc71c
.extern func_ov00_020ad714
.extern _ZN11ItemManager12GetEquipItemEj
.extern gItemManager
.extern gItemManager
.extern func_ov00_020ad714
.extern _ZN11ItemManager12GetEquipItemEj
.extern data_027e0fd4
.extern data_027e0fcc
.extern func_ov00_020c0d68
@@ -1006,7 +1006,7 @@
.extern data_ov00_020e9360
.extern func_ov00_0207b89c
.extern data_ov00_020e9c88
.extern func_ov00_020ad714
.extern _ZN11ItemManager12GetEquipItemEj
.extern func_ov14_0213ec64
.extern func_01ffa0f4
.extern func_0202d95c
@@ -1019,6 +1019,6 @@
.extern data_027e0618
.extern gItemManager
.extern func_01ffa0f4
.extern func_ov00_020ae5d0
.extern _ZNK11ItemManager13HasBluePotionEv
.extern data_027e0618
.extern gItemManager
asm/ov00/include/ov00_020ae7a4.inc
+6 -6
View File
@@ -81,11 +81,11 @@
.extern func_ov00_020c3674
.extern func_ov00_02097738
.extern func_ov00_02078b40
.extern func_ov00_020ae564
.extern func_ov00_020ae564
.extern _ZNK11ItemManager9HasPotionEj
.extern _ZNK11ItemManager9HasPotionEj
.extern func_ov00_02078b40
.extern func_ov00_020ad790
.extern func_ov00_020ad790
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern _ZNK11ItemManager8GetFairyEj
.extern data_027e0f74
.extern data_027e0c68
@@ -128,7 +128,7 @@
.extern data_027e0e60
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_020ad714
.extern _ZN11ItemManager12GetEquipItemEj
.extern func_ov00_020c3674
.extern func_ov00_020c3674
.extern func_ov00_020c28ec
@@ -216,7 +216,7 @@
.extern func_01ffe468
.extern data_027e0f64
.extern data_02050f54
.extern func_ov00_020ad790
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern func_ov00_020cf330
.extern func_01ff9cec
asm/ov00/include/ov00_020b4940.inc
+15 -15
View File
@@ -50,7 +50,7 @@
.extern func_ov00_0209cbd4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_ov00_020ad714
.extern _ZN11ItemManager12GetEquipItemEj
.extern func_ov14_0213dfbc
.extern func_ov14_0213e144
.extern func_01ff9c2c
@@ -191,7 +191,7 @@
.extern func_020078d8
.extern _ZN11ItemManager4SaveEP15SaveItemManager
.extern gItemManager
.extern func_ov00_020ad8e0
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern gItemManager
.extern _ZN9SysObjectnwEmPjj
.extern func_ov04_02107aa0
@@ -398,7 +398,7 @@
.extern data_027e0f94
.extern data_027e0fd0
.extern data_027e0fd4
.extern func_ov00_020ae2c0
.extern _ZN11ItemManager13UnequipPotionEv
.extern data_027e0fcc
.extern gItemManager
.extern data_027e0fd0
@@ -469,7 +469,7 @@
.extern data_027e0fd4
.extern data_027e0fe4
.extern data_027e0fd0
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern func_ov00_020acb6c
.extern func_020385b8
.extern func_ov00_020ab614
@@ -481,7 +481,7 @@
.extern func_01fffcd8
.extern gItemManager
.extern func_ov00_02097bbc
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern func_02002c14
.extern func_ov00_020acb6c
.extern func_020385b8
@@ -647,7 +647,7 @@
.extern data_027e0f94
.extern data_027e0fac
.extern func_ov00_020c5a24
.extern func_ov00_020ae2e0
.extern _ZN11ItemManager10GiveRupeesEjj
.extern func_ov00_020c5924
.extern gItemManager
.extern data_027e0f94
@@ -727,9 +727,9 @@
.extern func_ov00_020d0b7c
.extern data_027e0f64
.extern data_02050f54
.extern func_ov00_020ad72c
.extern _ZNK11ItemManager7GetAmmoEj
.extern gItemManager
.extern func_ov00_020ad73c
.extern _ZN11ItemManager8GiveAmmoEjj
.extern gItemManager
.extern func_ov00_02093a1c
.extern data_027e0f6c
@@ -749,14 +749,14 @@
.extern data_027e0e58
.extern data_027e0ffc
.extern data_027e1038
.extern func_ov00_020ad52c
.extern func_ov00_020ad52c
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager12GetItemModelEj
.extern gItemManager
.extern func_ov00_0207c1f8
.extern func_ov00_0207c1f8
.extern data_027e0e58
.extern data_027e0d0c
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern gItemManager
.extern func_0202af4c
.extern func_01ff9bc4
@@ -783,7 +783,7 @@
.extern func_ov14_0213dfbc
.extern func_ov14_0213e144
.extern func_ov00_02081f4c
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern data_ov00_020eec9c
.extern gItemManager
.extern data_027e0e60
@@ -817,14 +817,14 @@
.extern data_02050f54
.extern data_027e0e58
.extern func_ov00_0207c444
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern gItemManager
.extern func_ov00_02081f4c
.extern _ZN9SysObjectdlEPv
.extern data_027e0fb8
.extern func_ov00_020ceacc
.extern data_027e0ffc
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern gItemManager
.extern func_0202e58c
.extern _ZN11ItemManager7HasItemEj
@@ -922,7 +922,7 @@
.extern func_ov00_02097738
.extern func_01ff9bf8
.extern func_ov00_020a7cfc
.extern func_ov00_020ad9e8
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern func_ov00_020a7cfc
.extern data_027e0f74
.extern data_027e0f94
asm/ov00/include/ov00_020c9a68.inc
+1 -1
View File
@@ -384,7 +384,7 @@
.extern func_ov03_020f7e0c
.extern func_ov03_020f7e18
.extern func_ov09_0211cc8c
.extern func_ov00_020ad790
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern data_027e0fb8
.extern gItemManager
.extern func_ov00_020a5e9c
asm/ov00/include/ov00_020d1870.inc
+1 -1
View File
@@ -233,7 +233,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectdlEPv
.extern func_020366c4
.extern func_ov00_020ae3a8
.extern _ZN11ItemManager15SetEquippedItemEj
.extern func_ov00_020cf9dc
.extern func_0203878c
.extern data_027e0c68
asm/ov00/ov00_0209bea0.s
+1 -1
View File
@@ -1075,7 +1075,7 @@ func_ov00_0209cc48: ; 0x0209cc48
ldr r1, _0209ccd8 ; =gItemManager
mov r4, r0
ldr r0, [r1]
blx func_ov00_020ae5fc
blx _ZN11ItemManager21LoadDungeonItemModelsEv
ldr r0, _0209ccdc ; =data_027e0fec
ldrh r1, [r4, #0x18]
ldr r0, [r0]
asm/ov00/ov00_020a03e4.s
+11 -11
View File
@@ -9646,13 +9646,13 @@ func_ov00_020a7c60: ; 0x020a7c60
arm_func_start func_ov00_020a7ce4
func_ov00_020a7ce4: ; 0x020a7ce4
ldr r0, _020a7cf4 ; =gItemManager
ldr ip, _020a7cf8 ; =func_ov00_020ad678
ldr ip, _020a7cf8 ; =_ZN11ItemManager18func_ov00_020ad678Ejjj
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov00_020a7ce4
_020a7cf4: .word gItemManager
_020a7cf8: .word func_ov00_020ad678
_020a7cf8: .word _ZN11ItemManager18func_ov00_020ad678Ejjj
.global func_ov00_020a7cfc
arm_func_start func_ov00_020a7cfc
@@ -9668,7 +9668,7 @@ func_ov00_020a7cfc: ; 0x020a7cfc
ldmeqia sp!, {r3, pc}
ldr r0, _020a7d30 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ad6f8
bl _ZN11ItemManager17EquipItem_vfunc_2cEj
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020a7cfc
@@ -10052,7 +10052,7 @@ func_ov00_020a8158: ; 0x020a8158
_020a8168:
ldr r0, [r4]
mov r1, r6
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
cmp r0, #0
beq _020a818c
ldr r2, [r0]
@@ -10072,13 +10072,13 @@ _020a819c: .word gItemManager
arm_func_start func_ov00_020a81a0
func_ov00_020a81a0: ; 0x020a81a0
ldr r0, _020a81b0 ; =gItemManager
ldr ip, _020a81b4 ; =func_ov00_020ae418
ldr ip, _020a81b4 ; =_ZN11ItemManager22UpdateSwordShieldInUseEv
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov00_020a81a0
_020a81b0: .word gItemManager
_020a81b4: .word func_ov00_020ae418
_020a81b4: .word _ZN11ItemManager22UpdateSwordShieldInUseEv
.global func_ov00_020a81b8
arm_func_start func_ov00_020a81b8
@@ -11145,7 +11145,7 @@ func_ov00_020a8cec: ; 0x020a8cec
stmdb sp!, {r3, lr}
ldr r0, _020a8d24 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
cmp r0, #0
beq _020a8d1c
ldr r1, [r0]
@@ -11165,13 +11165,13 @@ _020a8d24: .word gItemManager
arm_func_start func_ov00_020a8d28
func_ov00_020a8d28: ; 0x020a8d28
ldr r0, _020a8d38 ; =gItemManager
ldr ip, _020a8d3c ; =func_ov00_020ad714
ldr ip, _020a8d3c ; =_ZN11ItemManager12GetEquipItemEj
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov00_020a8d28
_020a8d38: .word gItemManager
_020a8d3c: .word func_ov00_020ad714
_020a8d3c: .word _ZN11ItemManager12GetEquipItemEj
.global func_ov00_020a8d40
arm_func_start func_ov00_020a8d40
@@ -16427,7 +16427,7 @@ func_ov00_020acb6c: ; 0x020acb6c
ldr r0, _020ace74 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
cmp r0, #0
beq _020acbb0
bl func_ov00_020abf50
@@ -16703,7 +16703,7 @@ func_ov00_020acf28: ; 0x020acf28
bgt _020acf98
ldr r0, _020acfe4 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae5d0
bl _ZNK11ItemManager13HasBluePotionEv
cmp r0, #0
movne r0, #0xe
moveq r0, #0xf
asm/ov00/ov00_020ae7a4.s
+6 -6
View File
@@ -778,7 +778,7 @@ _020af0d4:
cmp r4, #9
bne _020af104
mov r1, #0
bl func_ov00_020ae564
bl _ZNK11ItemManager9HasPotionEj
cmp r0, #0
beq _020af124
mov r0, #1
@@ -788,7 +788,7 @@ _020af104:
cmp r4, #0xa
bne _020af124
mov r1, #1
bl func_ov00_020ae564
bl _ZNK11ItemManager9HasPotionEj
cmp r0, #0
movne r0, #1
strneb r0, [r6, #0x79]
@@ -803,7 +803,7 @@ _020af124:
ldr r0, _020af288 ; =gItemManager
strb r1, [r6, #0x7b]
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
ldrb r1, [r6, #0x7b]
tst r1, r0
movne r0, #1
@@ -854,7 +854,7 @@ _020af1f8:
ldr r0, _020af288 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
ldrb r1, [r6, #0x7b]
tst r1, r0
movne r0, #1
@@ -1365,7 +1365,7 @@ _020af810:
beq _020af8b0
ldr r0, _020afac4 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
mov r5, r0
_020af8b0:
ldr r0, _020afac8 ; =data_027e0fc8
@@ -2720,7 +2720,7 @@ func_ov00_020b0b0c: ; 0x020b0b0c
ldr r0, _020b0de0 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
beq _020b0b80
ldr r0, _020b0de0 ; =gItemManager
asm/ov00/ov00_020b4940.s
+15 -15
View File
@@ -1360,7 +1360,7 @@ _020b5a04:
ldr r0, _020b5ca0 ; =gItemManager
mov r1, #6
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldrsh r1, [r6, #0x5a]
mov r4, r0
cmp r1, #5
@@ -4138,7 +4138,7 @@ _020b806c:
_020b8078:
ldr r0, [r6]
add r1, r5, #0
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
lsl r1, r0, #2
ldr r0, [r4, r1]
add r5, r5, #1
@@ -8459,7 +8459,7 @@ func_ov00_020bb50c: ; 0x020bb50c
ldr r0, _020bb540 ; =gItemManager
strh r1, [r4, #8]
ldr r0, [r0]
blx func_ov00_020ae2c0
blx _ZN11ItemManager13UnequipPotionEv
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020bb50c
@@ -9307,7 +9307,7 @@ func_ov00_020bbed4: ; 0x020bbed4
movgt r7, #0
bl func_ov00_020bc098
mov r1, #2
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #0
ble _020bbf34
cmp r7, r0
@@ -9450,7 +9450,7 @@ func_ov00_020bc0a8: ; 0x020bc0a8
ldmneia sp!, {r4, r5, r6, r7, r8, pc}
bl func_ov00_020bc098
mov r1, #2
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
mov r4, r0
cmp r4, #0
ble _020bc114
@@ -11124,7 +11124,7 @@ func_ov00_020bd510: ; 0x020bd510
ldmltia sp!, {r3, r4, r5, pc}
rsb r1, r2, #0
mov r2, #0
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
mvn lr, #0
mov r3, #0
str r3, [sp, #0xc]
@@ -12923,7 +12923,7 @@ func_ov00_020beb30: ; 0x020beb30
blx r2
mov r1, r0
mov r0, r4
bl func_ov00_020ad72c
bl _ZNK11ItemManager7GetAmmoEj
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov00_020beb30
@@ -12942,7 +12942,7 @@ func_ov00_020beb5c: ; 0x020beb5c
mov r1, r0
mov r0, r4
mov r2, r5
bl func_ov00_020ad73c
bl _ZN11ItemManager8GiveAmmoEjj
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020beb5c
@@ -13465,7 +13465,7 @@ func_ov00_020bf18c: ; 0x020bf18c
ldr r0, _020bf1bc ; =gItemManager
mov r1, #0
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r1, r0, #0
ldr r0, [r4, #0xc]
ldr r2, [r0]
@@ -13474,7 +13474,7 @@ func_ov00_020bf18c: ; 0x020bf18c
ldr r0, _020bf1bc ; =gItemManager
mov r1, #1
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r1, r0, #0
ldr r0, [r4, #0x10]
ldr r2, [r0]
@@ -13551,7 +13551,7 @@ func_ov00_020bf270: ; 0x020bf270
ldr r0, _020bf2d4 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
strh r0, [r4, #0x54]
ldrsh r0, [r4, #0x54]
cmp r0, #0
@@ -14286,7 +14286,7 @@ _020bfd18:
ldr r0, _020bff38 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
_020bfd40:
str r0, [r4, #0x50]
ldr r0, [r4, #0x1c]
@@ -14973,7 +14973,7 @@ func_ov00_020c0674: ; 0x020c0674
mov r4, r0
ldr r0, [r1]
mov r1, #1
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
ldr r2, [r4, #0x40]
mov r1, #0x18
mul r3, r2, r1
@@ -15087,7 +15087,7 @@ func_ov00_020c0770: ; 0x020c0770
ldr r0, _020c07f4 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
movge r1, #1
ldrb r0, [r4, #0xc]
@@ -17270,7 +17270,7 @@ _020c208c:
str ip, [sp, #0x34]
str r3, [sp, #0x38]
str r2, [sp, #0x3c]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
movge r0, #3
strge r0, [sp, #0x40]
asm/ov00/ov00_020c9a68.s
+1 -1
View File
@@ -7388,7 +7388,7 @@ func_ov00_020cf444: ; 0x020cf444
ldr r0, _020cf484 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, pc}
asm/ov00/ov00_020d1870.s
+1 -1
View File
@@ -2996,7 +2996,7 @@ _020d3f34:
ldr r0, _020d3f6c ; =gItemManager
ldr r1, [r5, #0x40]
ldr r0, [r0]
bl func_ov00_020ae3a8
bl _ZN11ItemManager15SetEquippedItemEj
ldr r0, _020d3f70 ; =data_027e103c
mov r1, #1
ldr r0, [r0]
asm/ov02.s
+17 -17
View File
@@ -1572,7 +1572,7 @@ _020f02e8:
ldr r0, _020f0720 ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
mov r1, r0
mov r3, #0x1e
add r0, sp, #4
@@ -1596,7 +1596,7 @@ _020f035c:
ldr r0, _020f0720 ; =gItemManager
mov r1, #4
ldr r0, [r0]
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
mov r1, r0
mov r3, #0x23
add r0, sp, #4
@@ -1620,7 +1620,7 @@ _020f03b8:
ldr r0, _020f0720 ; =gItemManager
mov r1, #7
ldr r0, [r0]
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
mov r1, r0
mov r3, #0x28
add r0, sp, #4
@@ -1992,7 +1992,7 @@ _020f0928:
bl func_ov02_020eed40
mov r1, r0
mov r0, r6
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #1
blt _020f0968
cmp r4, #2
@@ -2592,7 +2592,7 @@ func_ov02_020f0ffc: ; 0x020f0ffc
bl func_ov02_020eed40
mov r1, r0
mov r0, r7
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #0
addle sp, sp, #0x28
ldmleia sp!, {r3, r4, r5, r6, r7, pc}
@@ -2883,7 +2883,7 @@ _020f1424:
mov r1, r0
ldr r2, [r5, #0x1c]
mov r0, r6
blx func_ov00_020ae6f0
blx _ZNK11ItemManager21HasShipPartPriceShownEjj
cmp r0, #0
beq _020f14f4
add ip, sp, #0x28
@@ -3217,7 +3217,7 @@ _020f183c:
blt _020f18e8
ldr r0, _020f18f8 ; =gItemManager
ldr r0, [r0]
blx func_ov00_020ae744
blx _ZNK11ItemManager21HasTreasurePriceShownEj
cmp r0, #0
beq _020f18e8
add ip, sp, #0x2c
@@ -5014,7 +5014,7 @@ func_ov02_020f2e48: ; 0x020f2e48
mov r1, r0
ldr r2, [r5, #0x1c]
mov r0, r4
blx func_ov00_020ad8f0
blx _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
movgt r0, #1
movle r0, #0
@@ -5035,7 +5035,7 @@ func_ov02_020f2e84: ; 0x020f2e84
mov r1, r0
ldr r2, [r5, #0x1c]
mov r0, r4
blx func_ov00_020ad8e8
blx _ZN11ItemManager13EquipShipPartEjj
mov r0, r5
mvn r1, #0
blx func_ov09_02117bb4
@@ -5136,7 +5136,7 @@ func_ov02_020f2fd8: ; 0x020f2fd8
blx func_ov09_02118028
mov r1, r0
mov r0, r4
blx func_ov00_020ad8e0
blx _ZNK11ItemManager19GetEquippedShipPartEj
str r0, [r5, #0x1c]
ldr r1, [r5, #0x18]
mov r0, r5
@@ -6098,7 +6098,7 @@ _020f3b80:
ldr r0, _020f41ec ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
mov sb, r0
cmp sb, #0
ble _020f3d9c
@@ -6153,7 +6153,7 @@ _020f3c58:
ldr r0, _020f41ec ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx func_ov00_020ad944
blx _ZNK11ItemManager18GetUnk_09e_DividedEj
mov r1, #0xc
str r0, [sp, #0xc]
bl func_01ff9b4c
@@ -6191,7 +6191,7 @@ _020f3d00:
ldr r0, _020f41ec ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx func_ov00_020ad938
blx _ZNK11ItemManager10GetUnk_09eEj
mov r1, #0x64
str r0, [sp, #0x10]
bl func_01ff9b4c
@@ -6263,7 +6263,7 @@ _020f3dfc:
ldr r0, _020f41ec ; =gItemManager
add r1, r7, #3
ldr r0, [r0]
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
mov r4, r0
cmp r4, #0
ble _020f4020
@@ -6321,7 +6321,7 @@ _020f3edc:
ldr r0, _020f41ec ; =gItemManager
add r1, r7, #3
ldr r0, [r0]
blx func_ov00_020ad944
blx _ZNK11ItemManager18GetUnk_09e_DividedEj
mov r1, #0xc
str r0, [sp, #0x14]
bl func_01ff9b4c
@@ -6359,7 +6359,7 @@ _020f3f84:
ldr r0, _020f41ec ; =gItemManager
add r1, r7, #3
ldr r0, [r0]
blx func_ov00_020ad938
blx _ZNK11ItemManager10GetUnk_09eEj
mov r1, #0x64
str r0, [sp, #0x18]
bl func_01ff9b4c
@@ -6410,7 +6410,7 @@ _020f4020:
ldr r0, _020f41ec ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
mov r6, r0
cmp r6, #0
mov r3, #0
asm/ov03.s
+9 -9
View File
@@ -12679,7 +12679,7 @@ func_ov03_020f63d4: ; 0x020f63d4
bl func_ov03_020f5d48
ldr r0, _020f6414 ; =gItemManager
ldr r0, [r0]
blx func_ov00_020ae350
blx _ZNK11ItemManager18func_ov00_020ae350Ev
mov r1, #0x79
lsl r1, r1, #2
str r0, [r4, r1]
@@ -12983,7 +12983,7 @@ _020f680c:
ldr r0, _020f69c8 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
beq _020f68d8
ldr r0, _020f69b8 ; =data_027e0c68
@@ -13051,7 +13051,7 @@ _020f68d8:
ldr r0, _020f69c8 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
bne _020f693c
ldr r0, _020f69d0 ; =data_ov00_020eec9c
@@ -13067,7 +13067,7 @@ _020f693c:
ldr r0, _020f69c8 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r1, _020f69d4 ; =data_027e0f64
mov r4, r0
ldr r0, [r1]
@@ -13173,7 +13173,7 @@ func_ov03_020f6a88: ; 0x020f6a88
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _020f6b10 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae350
bl _ZNK11ItemManager18func_ov00_020ae350Ev
ldr r1, [r5, #0x1e4]
mov r4, r0
subs r0, r4, r1
@@ -13602,7 +13602,7 @@ _020f7068:
ldr r0, _020f70bc ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
beq _020f70ac
ldr r0, _020f70c0 ; =data_027e0fb8
@@ -13741,7 +13741,7 @@ _020f7240:
ldr r0, _020f72ac ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
addne sp, sp, #0x4c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc}
@@ -13855,7 +13855,7 @@ func_ov03_020f7398: ; 0x020f7398
ldr r0, _020f7410 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
beq _020f7404
mov r3, r5
@@ -13894,7 +13894,7 @@ func_ov03_020f7414: ; 0x020f7414
ldr r0, _020f74b4 ; =gItemManager
mov r1, r6
ldr r0, [r0]
bl func_ov00_020ad790
bl _ZN11ItemManager18func_ov00_020ad790Ej
cmp r0, #0
beq _020f747c
mov ip, r6
asm/ov04.s
+6 -6
View File
@@ -13880,7 +13880,7 @@ _021076b2:
func_ov04_021076bc: ; 0x021076bc
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl func_ov00_020ae2c0
bl _ZN11ItemManager13UnequipPotionEv
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -14382,7 +14382,7 @@ func_ov04_02107aa0: ; 0x02107aa0
str r0, [r4]
ldr r0, _02107b50 ; =gItemManager
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r1, r0, #0
mov r0, #0xa5
lsl r0, r0, #2
@@ -14391,7 +14391,7 @@ func_ov04_02107aa0: ; 0x02107aa0
ldr r0, _02107b50 ; =gItemManager
mov r1, #0xd
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
mov r1, #0x2f
lsl r1, r1, #4
add r2, r0, #0
@@ -14471,7 +14471,7 @@ func_ov04_02107b64: ; 0x02107b64
ldr r0, _02107bf4 ; =gItemManager
ldr r1, _02107bf8 ; =data_ov00_020dc7d0
ldr r0, [r0]
blx func_ov00_020ad538
blx _ZNK11ItemManager18func_ov00_020ad538Ej
add r1, r0, #0
mov r0, #0x2f
lsl r0, r0, #4
@@ -22709,7 +22709,7 @@ func_ov04_0210ba8c: ; 0x0210ba8c
ldr r0, _0210bc08 ; =gItemManager
mov r1, #2
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r4, r0, #0
ldr r0, _0210bc0c ; =data_027e0ce0
mov r2, #4
@@ -22725,7 +22725,7 @@ _0210bad0:
ldr r0, _0210bc08 ; =gItemManager
ldr r1, _0210bc10 ; =data_ov04_0210f940
ldr r0, [r0]
blx func_ov00_020ad538
blx _ZNK11ItemManager18func_ov00_020ad538Ej
add r6, r0, #0
ldr r0, _0210bc0c ; =data_027e0ce0
mov r2, #4
asm/ov05.s
+12 -12
View File
@@ -4644,7 +4644,7 @@ _02104694:
beq _0210471c
ldr r0, [r6]
and r1, sb, #0xff
bl func_ov00_020adabc
bl _ZNK11ItemManager21HasShipPartPriceShownEj
cmp r0, #0
bne _0210471c
ldr r0, [r5]
@@ -4793,7 +4793,7 @@ _021048a8:
ldr r0, _02104a38 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020adabc
bl _ZNK11ItemManager21HasShipPartPriceShownEj
cmp r0, #0
addne sp, sp, #0x34
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -9639,7 +9639,7 @@ _02108af4:
movne r5, #0
mov r1, #3
mov r2, #0
blx func_ov00_020ad8f0
blx _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
add r1, sp, #4
add r2, sp, #0
@@ -9686,7 +9686,7 @@ _02108b9c:
_02108bb4:
ldr r0, _02108cf0 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae598
bl _ZNK11ItemManager13HasAllPotionsEv
cmp r0, #0
movne r0, #9
strne r0, [r4, #0x74]
@@ -9694,7 +9694,7 @@ _02108bb4:
_02108bd0:
ldr r0, _02108cf0 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae598
bl _ZNK11ItemManager13HasAllPotionsEv
cmp r0, #0
movne r0, #0x1a
strne r0, [r4, #0x74]
@@ -9726,7 +9726,7 @@ _02108c34:
ldr r0, _02108cf0 ; =gItemManager
ldr r1, [r4, #0x74]
ldr r0, [r0]
blx func_ov00_020adb30
blx _ZN11ItemManager15LoadFanfareItemEj
ldr r0, [r4, #0x74]
mov r2, #1
cmp r0, #0x81
@@ -9884,7 +9884,7 @@ _02108e44:
ldr r0, _02108e88 ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx func_ov00_020adb30
blx _ZN11ItemManager15LoadFanfareItemEj
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_02108e08
@@ -10245,7 +10245,7 @@ _02109354:
cmp r0, #0
beq _02109380
ldr r0, [r5, #0x74]
blx func_ov00_020ae648
blx _ZN11ItemManager18func_ov00_020ae648Ejjj
_02109380:
mov r0, r5
bl func_ov00_020a8d50
@@ -10646,7 +10646,7 @@ _0210989c:
ldr r0, _021099cc ; =gItemManager
ldr r1, [r5, #0x74]
ldr r0, [r0]
blx func_ov00_020adcdc
blx _ZN11ItemManager8GiveItemEjjj
_021098bc:
mov r0, r4
blx func_ov00_020ad020
@@ -11291,7 +11291,7 @@ _0210a154:
ldr r0, _0210a4b4 ; =gItemManager
mov r1, #0xb
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, sp, #0x74
blx func_ov00_020a9588
@@ -11587,7 +11587,7 @@ func_ov05_0210a4e0: ; 0x0210a4e0
ldr r0, _0210a608 ; =gItemManager
add r1, sp, #0
ldr r0, [r0]
blx func_ov00_020adca8
blx _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
cmp r0, #0
mov r0, r5
beq _0210a5e4
@@ -17166,7 +17166,7 @@ _0210f244:
bgt _0210f298
ldr r0, _0210f6c4 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae5d0
bl _ZNK11ItemManager13HasBluePotionEv
cmp r0, #0
beq _0210f298
mov r0, r6
asm/ov09.s
+34 -34
View File
@@ -3803,7 +3803,7 @@ _02114a44:
ldr r0, _02114b14 ; =gItemManager
add r1, r6, #0
ldr r0, [r0]
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
add r1, r5, r4
add r6, r6, #1
add r4, r4, #4
@@ -3971,7 +3971,7 @@ _02114b9c:
ldr r0, _02114c6c ; =gItemManager
add r1, r6, #0
ldr r0, [r0]
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
add r1, r5, r4
add r6, r6, #1
add r4, r4, #4
@@ -7577,7 +7577,7 @@ _02117054:
bl func_ov09_02118028
add r1, r0, #0
add r0, r4, #0
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
str r0, [r5, #0x1c]
ldr r1, _02117120 ; =0x00001420
mov r0, #6
@@ -9096,7 +9096,7 @@ _02117c20:
add r1, r0, #0
ldr r0, [sp, #0x20]
add r2, r4, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
str r0, [sp, #0x24]
cmp r0, #0
blt _02117d2c
@@ -9153,7 +9153,7 @@ _02117caa:
bl func_ov09_02118028
add r1, r0, #0
ldr r0, [sp, #0x1c]
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
cmp r4, r0
bne _02117ccc
mov r1, #1
@@ -10968,7 +10968,7 @@ _02118a22:
ldr r0, _02118b10 ; =gItemManager
ldr r1, [sp, #0x18]
ldr r0, [r0]
bl func_ov00_020ad918
bl _ZNK11ItemManager16GetTreasureCountEj
str r0, [sp, #0x1c]
cmp r0, #0
bge _02118a78
@@ -16947,25 +16947,25 @@ _0211c6be:
beq _0211c6f2
ldr r0, [r4]
add r1, r5, #0
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
cmp r0, #0
bge _0211c6d8
ldr r0, [r4]
add r1, r5, #0
add r2, r6, #0
bl func_ov00_020ad8e8
bl _ZN11ItemManager13EquipShipPartEjj
_0211c6d8:
ldr r0, [r4]
add r1, r5, #0
add r2, r7, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
bge _0211c6f2
ldr r0, [r4]
add r1, r5, #0
mov r2, #0
mov r3, #1
bl func_ov00_020ad900
bl _ZN11ItemManager16SetShipPartCountEjjj
_0211c6f2:
add r5, r5, #1
cmp r5, #8
@@ -16982,14 +16982,14 @@ func_ov09_0211c700: ; 0x0211c700
ldr r0, _0211c720 ; =gItemManager
mov r1, #3
ldr r0, [r0]
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
cmp r0, #0
bge _0211c71c
ldr r0, _0211c720 ; =gItemManager
mov r1, #3
ldr r0, [r0]
mov r2, #0
bl func_ov00_020ad8e8
bl _ZN11ItemManager13EquipShipPartEjj
_0211c71c:
pop {r3, pc}
nop
@@ -17159,7 +17159,7 @@ _0211c84e:
ldr r0, [r6]
add r1, r4, #0
add r2, r5, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
blt _0211c860
mov r0, #1
@@ -17186,7 +17186,7 @@ func_ov09_0211c874: ; 0x0211c874
_0211c87a:
ldr r0, [r4]
add r1, r5, #0
bl func_ov00_020ad918
bl _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #0
blt _0211c88a
mov r0, #1
@@ -17210,7 +17210,7 @@ func_ov09_0211c898: ; 0x0211c898
_0211c89e:
ldr r0, [r4]
add r1, r5, #0
bl func_ov00_020ad930
bl _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
ble _0211c8ae
mov r0, #1
@@ -17234,14 +17234,14 @@ func_ov09_0211c8bc: ; 0x0211c8bc
add r4, r1, #0
ldr r0, [r0]
add r1, r5, #0
bl func_ov00_020ad8e0
bl _ZNK11ItemManager19GetEquippedShipPartEj
cmp r4, r0
bne _0211c8e4
ldr r0, _0211c8e8 ; =gItemManager
add r1, r5, #0
ldr r0, [r0]
add r2, r4, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #1
bgt _0211c8e4
mov r0, #1
@@ -17266,7 +17266,7 @@ _0211c8f6:
ldr r0, [r6]
add r1, r4, #0
add r2, r5, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
ble _0211c914
add r0, r4, #0
@@ -17298,7 +17298,7 @@ func_ov09_0211c928: ; 0x0211c928
_0211c92e:
ldr r0, [r4]
add r1, r5, #0
bl func_ov00_020ad918
bl _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #0
ble _0211c93e
mov r0, #1
@@ -17326,7 +17326,7 @@ _0211c956:
add r1, r6, #0
ldr r0, [r0]
add r2, r4, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
blt _0211c96a
mov r7, #1
@@ -17397,13 +17397,13 @@ func_ov09_0211c9a8: ; 0x0211c9a8
add r1, r0, #0
add r0, r6, #0
mov r2, #1
blx func_ov00_020ae2e0
blx _ZN11ItemManager10GiveRupeesEjj
ldr r0, _0211c9e4 ; =gItemManager
add r1, r5, #0
ldr r6, [r0]
add r2, r4, #0
add r0, r6, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
add r3, r0, #0
sub r3, r3, #1
lsl r3, r3, #0x18
@@ -17411,7 +17411,7 @@ func_ov09_0211c9a8: ; 0x0211c9a8
add r1, r5, #0
add r2, r4, #0
asr r3, r3, #0x18
bl func_ov00_020ad900
bl _ZN11ItemManager16SetShipPartCountEjjj
pop {r4, r5, r6, pc}
nop
thumb_func_end func_ov09_0211c9a8
@@ -17428,19 +17428,19 @@ func_ov09_0211c9e8: ; 0x0211c9e8
add r1, r0, #0
add r0, r4, #0
mov r2, #1
blx func_ov00_020ae2e0
blx _ZN11ItemManager10GiveRupeesEjj
ldr r0, _0211ca1c ; =gItemManager
add r1, r5, #0
ldr r4, [r0]
add r0, r4, #0
bl func_ov00_020ad918
bl _ZNK11ItemManager16GetTreasureCountEj
add r2, r0, #0
sub r2, r2, #1
lsl r2, r2, #0x18
add r0, r4, #0
add r1, r5, #0
asr r2, r2, #0x18
bl func_ov00_020ad920
bl _ZN11ItemManager16SetTreasureCountEjj
pop {r3, r4, r5, pc}
.align 2, 0
thumb_func_end func_ov09_0211c9e8
@@ -17471,7 +17471,7 @@ _0211ca3c:
add r1, r5, #0
ldr r0, [r0]
add r2, r4, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
bge _0211ca5c
ldr r0, _0211caa8 ; =gItemManager
@@ -17479,7 +17479,7 @@ _0211ca3c:
ldr r0, [r0]
add r2, r4, #0
mov r3, #1
bl func_ov00_020ad900
bl _ZN11ItemManager16SetShipPartCountEjjj
b _0211ca7c
_0211ca5c:
ldr r0, _0211caa8 ; =gItemManager
@@ -17487,7 +17487,7 @@ _0211ca5c:
ldr r6, [r0]
add r2, r4, #0
add r0, r6, #0
bl func_ov00_020ad8f0
bl _ZNK11ItemManager16GetShipPartCountEjj
add r3, r0, #0
add r3, r3, #1
lsl r3, r3, #0x18
@@ -17495,7 +17495,7 @@ _0211ca5c:
add r1, r5, #0
add r2, r4, #0
asr r3, r3, #0x18
bl func_ov00_020ad900
bl _ZN11ItemManager16SetShipPartCountEjjj
_0211ca7c:
ldr r0, _0211caac ; =data_ov09_0211f294
str r5, [r0]
@@ -17543,28 +17543,28 @@ _0211cacc:
ldr r0, _0211cb28 ; =gItemManager
add r1, r5, #0
ldr r0, [r0]
bl func_ov00_020ad918
bl _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #0
bge _0211cae8
ldr r0, _0211cb28 ; =gItemManager
add r1, r5, #0
ldr r0, [r0]
mov r2, #1
bl func_ov00_020ad920
bl _ZN11ItemManager16SetTreasureCountEjj
b _0211cb04
_0211cae8:
ldr r0, _0211cb28 ; =gItemManager
add r1, r5, #0
ldr r4, [r0]
add r0, r4, #0
bl func_ov00_020ad918
bl _ZNK11ItemManager16GetTreasureCountEj
add r2, r0, #0
add r2, r2, #1
lsl r2, r2, #0x18
add r0, r4, #0
add r1, r5, #0
asr r2, r2, #0x18
bl func_ov00_020ad920
bl _ZN11ItemManager16SetTreasureCountEjj
_0211cb04:
ldr r0, _0211cb2c ; =data_ov09_0211f308
str r5, [r0]
asm/ov12.s
+8 -8
View File
@@ -9019,13 +9019,13 @@ _0211a0a8: ; jump table
_0211a1e0:
ldr r0, _0211a3ec ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae418
bl _ZN11ItemManager22UpdateSwordShieldInUseEv
b _0211a230
_0211a1f0:
ldr r0, _0211a3ec ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x28]
@@ -9033,7 +9033,7 @@ _0211a1f0:
ldr r0, _0211a3ec ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x28]
@@ -10803,12 +10803,12 @@ func_ov12_0211b8bc: ; 0x0211b8bc
ldr r0, _0211b994 ; =gItemManager
mov r1, r4
ldr r0, [r0]
bl func_ov00_020ad5d8
bl _ZN11ItemManager14Shield_vfunc_38Ev
_0211b96c:
ldr r0, _0211b994 ; =gItemManager
mov r1, r4
ldr r0, [r0]
bl func_ov00_020ad5f4
bl _ZN11ItemManager17EquipItem_vfunc_38Ev
_0211b97c:
ldr r0, [r5, #0x230]
mov r1, #0
@@ -28445,14 +28445,14 @@ func_ov12_02129fb4: ; 0x02129fb4
str r1, [r4]
ldr r0, [r0]
mov r1, #0
bl func_ov00_020ad588
bl _ZN11ItemManager19GetDungeonItemModelEj
mov r1, r0
add r0, r4, #0x18c
blx func_ov00_020a9588
ldr r0, _0212a078 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad588
bl _ZN11ItemManager19GetDungeonItemModelEj
mov r2, r0
add r0, r4, #0x1e8
add r1, r4, #0x20c
@@ -28700,7 +28700,7 @@ func_ov12_0212a2cc: ; 0x0212a2cc
ldr r0, _0212a458 ; =gItemManager
ldr r1, _0212a45c ; =data_ov12_02134914
ldr r0, [r0]
bl func_ov00_020ad594
bl _ZNK11ItemManager18func_ov00_020ad594Ej
ldr r1, _0212a460 ; =data_027e0fc4
mov r5, r0
ldr r0, [r1]
asm/ov14.s
+31 -31
View File
@@ -267,7 +267,7 @@ func_ov14_0211f8d0: ; 0x0211f8d0
str r1, [r4]
ldr r0, [r0]
mov r1, #7
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
cmp r0, #0
beq _0211f968
ldr r1, [r0, #0x18]
@@ -329,7 +329,7 @@ func_ov14_0211f980: ; 0x0211f980
str r5, [sp, #8]
ldr r8, [r3]
ldr sb, [r2]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r1, [sp, #0xc]
mov sl, r0
cmp r1, #0
@@ -673,7 +673,7 @@ func_ov14_0211fda4: ; 0x0211fda4
str r1, [r4, #0x168]
ldr r0, [r0]
mov r1, #4
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r2, #0
mov r1, r0
mov r3, r2
@@ -682,7 +682,7 @@ func_ov14_0211fda4: ; 0x0211fda4
ldr r0, _0211fea0 ; =gItemManager
mov r1, #5
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, r4, #0x178
mov r2, #0
@@ -3024,12 +3024,12 @@ _02121da8:
ldr r0, _02121e9c ; =gItemManager
mov r1, #8
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
ldr r1, _02121e9c ; =gItemManager
mov r5, r0
ldr r0, [r1]
ldr r1, _02121ea0 ; =data_ov14_02153b84
bl func_ov00_020ad560
bl _ZNK11ItemManager18func_ov00_020ad560Ej
mov r6, r0
adds r0, r4, #0x15c
beq _02121de0
@@ -5696,7 +5696,7 @@ func_ov14_02124128: ; 0x02124128
str r1, [r4]
ldr r0, [r0]
mov r1, #9
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r2, #0
mov r1, r0
mov r3, r2
@@ -10425,7 +10425,7 @@ _02127da8:
ldr r0, _02127de8 ; =gItemManager
mvn r1, #0
ldr r0, [r0]
blx func_ov00_020ae368
blx _ZN11ItemManager8GiveKeysEj
_02127dc0:
ldr r1, [r4, #4]
ldr r0, _02127dec ; =data_027e0ffc
@@ -10454,7 +10454,7 @@ func_ov14_02127df4: ; 0x02127df4
ldmneia sp!, {r3, pc}
ldr r0, _02127e24 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae350
bl _ZNK11ItemManager18func_ov00_020ae350Ev
cmp r0, #0
movgt r0, #1
movle r0, #0
@@ -10474,7 +10474,7 @@ func_ov14_02127e28: ; 0x02127e28
ldmneia sp!, {r4, pc}
ldr r0, _02127eb4 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae350
bl _ZNK11ItemManager18func_ov00_020ae350Ev
cmp r0, #0
mvnle r0, #0
ldmleia sp!, {r4, pc}
@@ -26628,7 +26628,7 @@ _021351c4:
mov r1, r0
ldr r2, [r5, #0x158]
mov r0, r6
bl func_ov00_020ad73c
bl _ZN11ItemManager8GiveAmmoEjj
_021351ec:
ldr r0, _02135360 ; =data_ov00_020eec9c
mov r1, #0x100
@@ -34237,7 +34237,7 @@ _0213b2f8:
mov r1, r0
mov r0, r6
mov r2, #0
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
ldr r0, [r5, #0x158]
mvn r1, #0
cmp r0, #0
@@ -35462,7 +35462,7 @@ _0213c26c:
sub r8, r1, #9
ldr r0, [r0]
mov r1, r8
bl func_ov00_020ae564
bl _ZNK11ItemManager9HasPotionEj
cmp r0, #0
addeq sp, sp, #4
moveq r0, #1
@@ -35976,7 +35976,7 @@ _0213c7d4:
ldr r0, _0213c8e0 ; =gItemManager
mov r1, r5
ldr r0, [r0]
bl func_ov00_020ae3a8
bl _ZN11ItemManager15SetEquippedItemEj
mov r0, r4
strb r5, [r4, #0x14c]
ldr r2, [r0]
@@ -36359,7 +36359,7 @@ func_ov14_0213ccd8: ; 0x0213ccd8
_0213cd1c:
ldr r0, [r6]
mov r1, sb
bl func_ov00_020ae564
bl _ZNK11ItemManager9HasPotionEj
orrs r0, r5, r0
movne r5, r8
add sb, sb, #1
@@ -36702,7 +36702,7 @@ func_ov14_0213d078: ; 0x0213d078
ldr r0, _0213d094 ; =gItemManager
mov r1, #6
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r1, r0, #0
ldr r0, [r4, #0xc]
ldr r2, [r0]
@@ -37082,7 +37082,7 @@ func_ov14_0213d3a0: ; 0x0213d3a0
ldr r0, _0213d3c8 ; =gItemManager
mov r1, #0xe
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r4, #0x84
add r1, r0, #0
ldr r0, [r4]
@@ -39660,7 +39660,7 @@ _0213f2ec:
ldr r0, _0213f318 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
cmp r0, #0
beq _0213f30c
bl func_ov14_0212429c
@@ -39691,7 +39691,7 @@ func_ov14_0213f334: ; 0x0213f334
cmp r1, #7
ldmneia sp!, {r4, pc}
mov r1, #7
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r2, [r0]
@@ -39863,7 +39863,7 @@ _0213f516:
ldr r0, _0213f598 ; =gItemManager
mov r2, #0
ldr r0, [r0]
blx func_ov00_020ae50c
blx _ZN11ItemManager9SetPotionEjj
b _0213f534
_0213f52c:
add r1, r1, #1
@@ -39881,7 +39881,7 @@ _0213f534:
_0213f542:
ldr r0, _0213f598 ; =gItemManager
ldr r0, [r0]
blx func_ov00_020ae3c0
blx _ZN11ItemManager17EquipPreviousItemEv
_0213f54a:
ldr r1, _0213f59c ; =data_027e0fcc
add r0, r5, #0
@@ -42817,7 +42817,7 @@ func_ov14_021419d8: ; 0x021419d8
ldr r0, _02141a70 ; =gItemManager
ldrb r1, [r4, #0x4c0]
ldr r0, [r0]
bl func_ov00_020ad5f4
bl _ZN11ItemManager17EquipItem_vfunc_38Ev
ldrb r0, [r4, #0x4c0]
cmp r0, #0
ldmneia sp!, {r4, pc}
@@ -61520,7 +61520,7 @@ _021506e6:
ldr r0, _02150764 ; =gItemManager
add r1, r4, #0
ldr r0, [r0]
bl func_ov00_020adcdc
bl _ZN11ItemManager8GiveItemEjjj
ldr r2, _02150760 ; =data_027e1058
add r0, r5, #0
ldr r2, [r2]
@@ -61561,12 +61561,12 @@ _02150742:
ldr r0, _02150764 ; =gItemManager
add r1, r4, #0
ldr r0, [r0]
bl func_ov00_020adcdc
bl _ZN11ItemManager8GiveItemEjjj
_0215074c:
ldr r0, _02150764 ; =gItemManager
add r1, r4, #0
ldr r0, [r0]
bl func_ov00_020adb30
bl _ZN11ItemManager15LoadFanfareItemEj
add r0, r5, #0
mov r1, #0
bl func_ov14_02150848
@@ -61780,7 +61780,7 @@ _021508ce:
ldr r0, [r4, #8]
blx func_ov03_020fc10c
ldr r0, [r4, #8]
bl func_ov00_020ae648
bl _ZN11ItemManager18func_ov00_020ae648Ejjj
pop {r4, pc}
.align 2, 0
thumb_func_end func_ov14_021508b8
@@ -61865,7 +61865,7 @@ _02150952:
str r0, [r2]
ldr r0, _021509cc ; =gItemManager
ldr r0, [r0]
bl func_ov00_020adca8
bl _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
cmp r0, #0
beq _02150994
ldr r0, [sp, #0x48]
@@ -63012,7 +63012,7 @@ _02151648:
ldr r0, _02151688 ; =gItemManager
ldr r1, [r4, #0xc]
ldr r0, [r0]
bl func_ov00_020ae564
bl _ZNK11ItemManager9HasPotionEj
cmp r0, #3
addls pc, pc, r0, lsl #2
b _0215167c
@@ -65952,7 +65952,7 @@ _021539a8:
sub r4, r5, #9
ldr r0, [r0]
mov r1, r4
bl func_ov00_020ae564
bl _ZNK11ItemManager9HasPotionEj
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, r6, r7, pc}
@@ -66010,12 +66010,12 @@ func_ov14_02153a48: ; 0x02153a48
ldr r0, _02153b4c ; =gItemManager
mov r1, r8
ldr r0, [r0]
bl func_ov00_020ad72c
bl _ZNK11ItemManager7GetAmmoEj
ldr r1, _02153b4c ; =gItemManager
mov r4, r0
ldr r0, [r1]
mov r1, r8
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
mov r7, r0
_02153ab4:
cmp r4, #0
asm/ov15.s
+19 -19
View File
@@ -31483,7 +31483,7 @@ func_ov15_0213a184: ; 0x0213a184
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _0213a454 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ad528
bl _ZN11ItemManager18func_ov00_020ad528Ev
mov r1, #1
ldr r0, _0213a458 ; =data_027e077c
strb r1, [r5, #0x26e]
@@ -44538,12 +44538,12 @@ _0214531c:
ldr r0, _0214581c ; =gItemManager
mov r1, r5
ldr r0, [r0]
blx func_ov00_020adcdc
blx _ZN11ItemManager8GiveItemEjjj
_02145334:
ldr r0, _0214581c ; =gItemManager
mov r1, r5
ldr r0, [r0]
blx func_ov00_020adb30
blx _ZN11ItemManager15LoadFanfareItemEj
mov r0, r6
mov r1, #1
bl func_ov15_0216e168
@@ -44561,7 +44561,7 @@ _02145370:
mov r4, r0
bl func_ov03_020fc10c
mov r0, r4
blx func_ov00_020ae648
blx _ZN11ItemManager18func_ov00_020ae648Ejjj
mov r0, #0x10
strb r0, [sb, #0x34d]
b _02145420
@@ -44581,7 +44581,7 @@ _02145390:
bhs _021453d4
ldr r0, _0214581c ; =gItemManager
ldr r0, [r0]
blx func_ov00_020adadc
blx _ZN11ItemManager21AddShipPartPriceShownEj
b _021453f8
_021453d4:
sub r0, r1, #0x20
@@ -44602,7 +44602,7 @@ _021453f8:
ldr r0, _0214581c ; =gItemManager
mov r1, #0x26
ldr r0, [r0]
blx func_ov00_020adcdc
blx _ZN11ItemManager8GiveItemEjjj
_0214541c:
bl func_ov15_021465e8
_02145420:
@@ -45653,7 +45653,7 @@ func_ov15_021461b0: ; 0x021461b0
ldr r0, _021462c4 ; =gItemManager
ldrh r1, [r5, r4]
ldr r0, [r0]
bl func_ov00_020adabc
bl _ZNK11ItemManager21HasShipPartPriceShownEj
cmp r0, #0
beq _02146244
add sp, sp, #0x18
@@ -47023,7 +47023,7 @@ _021472c0:
strb r2, [r4, #0x43d]
ldr r1, [r4, #0x41c]
ldr r0, [r0]
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #3
blt _02147358
ldr r2, _02147540 ; =data_027e0764
@@ -48309,7 +48309,7 @@ _02148540:
ldr r0, [r0]
ldr r1, [r4, #0x41c]
mov r2, r2, lsr #0x10
blx func_ov00_020ad96c
blx _ZN11ItemManager10SetUnk_09eEjj
ldrb r0, [r4, #0x43d]
cmp r0, #0
beq _021485cc
@@ -48337,7 +48337,7 @@ _02148540:
mov r2, r1, lsr #0x10
mov r1, #5
str r3, [ip, #4]
blx func_ov00_020ad96c
blx _ZN11ItemManager10SetUnk_09eEjj
_021485cc:
mov r1, #0
str r1, [r4, #0x3fc]
@@ -54185,7 +54185,7 @@ func_ov15_0214d358: ; 0x0214d358
mov r1, r0
mov r0, r5
mov r2, #0
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
ldr r1, [r4, #0x158]
ldr r0, _0214d3dc ; =data_ov00_020eec9c
add r1, r1, #0xfa
@@ -61729,7 +61729,7 @@ _02153b28:
bl func_ov15_02153938
ldr r0, [r4, #0x41c]
add r0, r0, #0x46
blx func_ov00_020ae648
blx _ZN11ItemManager18func_ov00_020ae648Ejjj
mov r0, #5
strb r0, [r5, #0x436]
b _02153d74
@@ -62211,7 +62211,7 @@ _02154254:
bl func_ov15_02153938
ldr r0, [r5, #0x41c]
add r0, r0, #0x46
blx func_ov00_020ae648
blx _ZN11ItemManager18func_ov00_020ae648Ejjj
mov r0, #5
strb r0, [r4, #0x436]
b _02154304
@@ -88238,7 +88238,7 @@ _0216a8e8:
ldr r0, _0216a95c ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx func_ov00_020adcdc
blx _ZN11ItemManager8GiveItemEjjj
_0216a8f8:
bl func_ov15_02146578
mov r1, r0
@@ -88246,7 +88246,7 @@ _0216a8f8:
bhs _0216a918
ldr r0, _0216a95c ; =gItemManager
ldr r0, [r0]
blx func_ov00_020adadc
blx _ZN11ItemManager21AddShipPartPriceShownEj
b _0216a93c
_0216a918:
sub r0, r1, #0x20
@@ -88262,7 +88262,7 @@ _0216a93c:
ldr r0, _0216a95c ; =gItemManager
mov r1, r4
ldr r0, [r0]
blx func_ov00_020adb30
blx _ZN11ItemManager15LoadFanfareItemEj
mov r0, r5
bl func_ov15_0216a968
add sp, sp, #4
@@ -88405,7 +88405,7 @@ func_ov15_0216aadc: ; 0x0216aadc
ldr r0, _0216abe0 ; =gItemManager
add r1, sp, #0x3c
ldr r0, [r0]
blx func_ov00_020adca8
blx _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
cmp r0, #0
beq _0216ab80
ldr r2, [sp, #0x48]
@@ -92889,7 +92889,7 @@ func_ov15_0216e69c: ; 0x0216e69c
add r1, sp, #0x14
ldr r0, [r0]
ldr r6, [r0, #0x114]
blx func_ov00_020adca8
blx _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
cmp r0, #0
beq _0216e838
ldr r2, [r4, #8]
@@ -99853,7 +99853,7 @@ func_ov15_02174794: ; 0x02174794
mov r1, r0
mov r0, r5
mov r2, #0
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
ldr r1, [r4, #0x2c]
ldr r0, _02174878 ; =data_ov00_020eec9c
add r1, r1, #0xfa
asm/ov17.s
+6 -6
View File
@@ -2274,7 +2274,7 @@ func_ov17_0215cf24: ; 0x0215cf24
str r1, [r4]
ldr r0, [r0]
mov r1, #1
bl func_ov00_020ad588
bl _ZN11ItemManager19GetDungeonItemModelEj
mov r1, r0
add r0, r4, #0x188
blx func_ov00_020a9588
@@ -3652,14 +3652,14 @@ func_ov17_0215e1f0: ; 0x0215e1f0
str r1, [r4]
ldr r0, [r0]
mov r1, #0
bl func_ov00_020ad588
bl _ZN11ItemManager19GetDungeonItemModelEj
mov r1, r0
add r0, r4, #0x188
blx func_ov00_020a9588
ldr r0, _0215e29c ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad588
bl _ZN11ItemManager19GetDungeonItemModelEj
mov r2, r0
add r0, r4, #0x1e4
add r1, r4, #0x208
@@ -4153,7 +4153,7 @@ func_ov17_0215e8f4: ; 0x0215e8f4
ldr r0, _0215e9dc ; =gItemManager
ldr r1, _0215e9e0 ; =data_ov17_0216b0ac
ldr r0, [r0]
bl func_ov00_020ad594
bl _ZNK11ItemManager18func_ov00_020ad594Ej
ldr r1, _0215e9e4 ; =data_027e0fc4
mov r5, r0
ldr r0, [r1]
@@ -4803,7 +4803,7 @@ func_ov17_0215f16c: ; 0x0215f16c
ldr r0, _0215f2d0 ; =gItemManager
ldr r0, [r0]
ldr r1, [r3, r1, lsl #2]
bl func_ov00_020ad588
bl _ZN11ItemManager19GetDungeonItemModelEj
mov r1, r0
add r0, r4, #0x188
ldr r2, [r0]
@@ -11500,7 +11500,7 @@ func_ov17_02164538: ; 0x02164538
ldr r0, _021645fc ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, r4, #0x78
mov r2, #0
asm/ov19.s
+1 -1
View File
@@ -1546,7 +1546,7 @@ func_ov19_0216eacc: ; 0x0216eacc
ldr r0, _0216eb2c ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
blx func_ov00_020ada98
blx _ZN11ItemManager7AddItemEj
mov r4, #0
_0216eafc:
add r0, r5, r4, lsl #2
asm/ov20.s
+3 -3
View File
@@ -294,7 +294,7 @@ func_ov20_0216da64: ; 0x0216da64
ldr r0, _0216dac0 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
blx func_ov00_020ada98
blx _ZN11ItemManager7AddItemEj
mov r4, #0
_0216da98:
add r0, r5, r4, lsl #2
@@ -8616,7 +8616,7 @@ func_ov20_021749dc: ; 0x021749dc
mov r6, r0
ldr r0, [r1]
mov r1, #2
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
movge r5, #1
ldrb r0, [r6, #0x446]
@@ -8681,7 +8681,7 @@ _02174a20:
str r4, [sp, #0x20]
str r3, [sp, #0x24]
str r2, [sp, #0x28]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
movge r0, #3
strge r0, [sp, #0x2c]
asm/ov23.s
+1 -1
View File
@@ -8502,7 +8502,7 @@ func_ov23_02174684: ; 0x02174684
ldr r0, _02174714 ; =gItemManager
mov r1, #8
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, r4, #0x15c
ldr r2, [r0]
asm/ov24.s
+1 -1
View File
@@ -9737,7 +9737,7 @@ _02175624:
ldr r0, _02175ed0 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _021756e8
add r1, r4, #0x2a8
asm/ov25.s
+1 -1
View File
@@ -12901,7 +12901,7 @@ _021783b0:
ldr r0, _02178504 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _02178404
bl func_ov25_0217850c
asm/ov26.s
+3 -3
View File
@@ -4157,7 +4157,7 @@ func_ov26_02170894: ; 0x02170894
ldr r0, _02170934 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _021708e4
_021708dc:
@@ -7173,7 +7173,7 @@ _021731b8:
ldr r0, _021732bc ; =gItemManager
mov r1, #0x60
ldr r0, [r0]
blx func_ov00_020ada98
blx _ZN11ItemManager7AddItemEj
add r0, sp, #0xc
bl func_ov00_0209a4f4
mov r2, #0
@@ -13278,7 +13278,7 @@ func_ov26_021778e8: ; 0x021778e8
ldr r0, _021779cc ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020adabc
bl _ZNK11ItemManager21HasShipPartPriceShownEj
cmp r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r3, r4, r5, r6, pc}
asm/ov27.s
+6 -6
View File
@@ -8575,7 +8575,7 @@ _02174bf8:
_02174c04:
mov r0, r5
mov r1, r4
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
@@ -8589,7 +8589,7 @@ _02174c30:
mov r1, #4
ldr r4, [r0]
mov r0, r4
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02174c68
ldr r0, _02174d2c ; =data_027e0f74
@@ -8602,7 +8602,7 @@ _02174c30:
_02174c68:
mov r0, r4
mov r1, #3
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02174c98
ldr r0, _02174d2c ; =data_027e0f74
@@ -8615,7 +8615,7 @@ _02174c68:
_02174c98:
mov r0, r4
mov r1, #2
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02174cc8
ldr r0, _02174d2c ; =data_027e0f74
@@ -12976,10 +12976,10 @@ _02178760:
_02178774:
ldr sl, [r7]
mov r0, sl
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
mov sb, r0
mov r0, sl
blx func_ov00_020ad9e4
blx _ZNK11ItemManager19GetMaxTreasureCountEv
cmp sb, r0
ldrge r0, [sp]
orrge r0, r5, r8, lsl r0
asm/ov28.s
+16 -16
View File
@@ -2999,7 +2999,7 @@ _0216fe84:
_0216fe90:
mov r0, r5
mov r1, r4
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
@@ -3013,7 +3013,7 @@ _0216febc:
mov r1, #4
ldr r4, [r0]
mov r0, r4
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _0216fef4
ldr r0, _0216ffb8 ; =data_027e0f74
@@ -3026,7 +3026,7 @@ _0216febc:
_0216fef4:
mov r0, r4
mov r1, #3
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _0216ff24
ldr r0, _0216ffb8 ; =data_027e0f74
@@ -3039,7 +3039,7 @@ _0216fef4:
_0216ff24:
mov r0, r4
mov r1, #2
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _0216ff54
ldr r0, _0216ffb8 ; =data_027e0f74
@@ -3092,7 +3092,7 @@ func_ov28_0216ffc4: ; 0x0216ffc4
ldr r0, _02170004 ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -5121,7 +5121,7 @@ _021718f4:
_02171900:
mov r0, r5
mov r1, r4
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
@@ -5135,7 +5135,7 @@ _0217192c:
mov r1, #4
ldr r4, [r0]
mov r0, r4
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02171964
ldr r0, _02171a28 ; =data_027e0f74
@@ -5148,7 +5148,7 @@ _0217192c:
_02171964:
mov r0, r4
mov r1, #3
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _02171994
ldr r0, _02171a28 ; =data_027e0f74
@@ -5161,7 +5161,7 @@ _02171964:
_02171994:
mov r0, r4
mov r1, #2
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
beq _021719c4
ldr r0, _02171a28 ; =data_027e0f74
@@ -5231,7 +5231,7 @@ func_ov28_02171a60: ; 0x02171a60
ldr r0, _02171aa0 ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx func_ov00_020ad930
blx _ZNK11ItemManager10GetUnk_098Ej
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -6309,7 +6309,7 @@ func_ov28_0217280c: ; 0x0217280c
mov r1, #1
mov r8, r2
str r3, [sl, #0x20c]
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #0
beq _02172870
cmp r0, #1
@@ -6322,7 +6322,7 @@ _02172870:
_02172878:
mov r0, r7
mov r1, #2
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #0
beq _0217289c
cmp r0, #1
@@ -6335,7 +6335,7 @@ _0217289c:
_021728a4:
mov r0, r7
mov r1, #0
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #0
beq _021728c8
cmp r0, #1
@@ -6422,7 +6422,7 @@ _02172998:
ldr r0, [r0]
add r2, r0, r1
ldrb r4, [r2, #0x24]
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #0
beq _021729d0
cmp r0, #1
@@ -6451,7 +6451,7 @@ _021729f4:
ldrb r2, [r2, #0x24]
cmp r2, #0x14
bne _02172a2c
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #0
moveq r0, #2
movne r0, #1
@@ -6479,7 +6479,7 @@ func_ov28_02172a44: ; 0x02172a44
ldr r1, _02172a84 ; =data_ov28_021782e0
ldr r0, [r0]
ldr r1, [r1, r2, lsl #2]
bl func_ov00_020ada48
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
cmp r0, #2
movge r0, #1
ldmgeia sp!, {r3, pc}
asm/ov29.s
+1 -1
View File
@@ -755,7 +755,7 @@ _0216df70:
ldr r0, _0216e008 ; =gItemManager
mvn r1, #0
ldr r0, [r0]
bl func_ov00_020ae4dc
bl _ZN11ItemManager18func_ov00_020ae4dcEj
add r0, r6, r4
add r1, r7, r5
ldr r3, _0216e000 ; =data_027e0fc8
asm/ov30.s
+1 -1
View File
@@ -7002,7 +7002,7 @@ _0218146c:
ldr r0, _02181804 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _021814b4
mov r2, #5
asm/ov31.s
+15 -15
View File
@@ -1049,7 +1049,7 @@ _0217cae4:
ldr r0, [r0]
rsb r1, r1, #0
mov r2, #1
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
bl func_ov31_0217cf1c
ldr r0, [r0, #0x470]
cmp r0, #0
@@ -1147,7 +1147,7 @@ _0217cc28:
_0217cc50:
ldr r0, _0217cd00 ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae598
bl _ZNK11ItemManager13HasAllPotionsEv
cmp r0, #0
beq _0217cc80
bl func_ov31_0217cf1c
@@ -5339,7 +5339,7 @@ func_ov31_0217fe00: ; 0x0217fe00
ldr r0, [r1]
mov r1, #5
mov r2, #0xa
bl func_ov00_020ad73c
bl _ZN11ItemManager8GiveAmmoEjj
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
@@ -5373,7 +5373,7 @@ func_ov31_0217fe58: ; 0x0217fe58
ldr r0, [r1]
mov r1, #4
mov r2, #0xa
bl func_ov00_020ad73c
bl _ZN11ItemManager8GiveAmmoEjj
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
@@ -5407,7 +5407,7 @@ func_ov31_0217feb0: ; 0x0217feb0
ldr r0, [r1]
mov r1, #7
mov r2, #0xa
bl func_ov00_020ad73c
bl _ZN11ItemManager8GiveAmmoEjj
mov r0, r4
bl func_ov31_0217fd54
ldmia sp!, {r4, pc}
@@ -5791,11 +5791,11 @@ func_ov31_021802a8: ; 0x021802a8
mov r1, #5
ldr r5, [r0]
mov r0, r5
bl func_ov00_020ad72c
bl _ZNK11ItemManager7GetAmmoEj
mov r4, r0
mov r0, r5
mov r1, #5
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
cmp r4, r0
movge r0, #1
movlt r0, #0
@@ -5819,11 +5819,11 @@ func_ov31_021802ec: ; 0x021802ec
mov r1, #4
ldr r5, [r0]
mov r0, r5
bl func_ov00_020ad72c
bl _ZNK11ItemManager7GetAmmoEj
mov r4, r0
mov r0, r5
mov r1, #4
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
cmp r4, r0
movge r0, #1
movlt r0, #0
@@ -5847,11 +5847,11 @@ func_ov31_02180330: ; 0x02180330
mov r1, #7
ldr r5, [r0]
mov r0, r5
bl func_ov00_020ad72c
bl _ZNK11ItemManager7GetAmmoEj
mov r4, r0
mov r0, r5
mov r1, #7
blx func_ov00_020ad9a0
blx _ZNK11ItemManager10GetMaxAmmoEj
cmp r4, r0
movge r0, #1
movlt r0, #0
@@ -5881,10 +5881,10 @@ func_ov31_02180374: ; 0x02180374
mov r2, r0
mov r0, r5
mov r1, r4
blx func_ov00_020ad8f0
blx _ZNK11ItemManager16GetShipPartCountEjj
mov r4, r0
mov r0, r5
blx func_ov00_020ad9e0
blx _ZNK11ItemManager19GetMaxShipPartCountEv
cmp r4, r0
movge r0, #1
movlt r0, #0
@@ -5902,10 +5902,10 @@ func_ov31_021803c4: ; 0x021803c4
bl func_ov31_02180278
mov r1, r0
mov r0, r5
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
mov r4, r0
mov r0, r5
blx func_ov00_020ad9e4
blx _ZNK11ItemManager19GetMaxTreasureCountEv
cmp r4, r0
movge r0, #1
movlt r0, #0
asm/ov35.s
+2 -2
View File
@@ -3469,7 +3469,7 @@ func_ov35_0217ebb4: ; 0x0217ebb4
str r1, [r4, #0x3b4]
ldr r0, [r0]
mov r1, #4
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, r4, #0x3bc
blx func_ov00_020a9588
@@ -7758,7 +7758,7 @@ _021828f4:
ldr r0, _02182944 ; =gItemManager
mov r1, #0x1d
ldr r0, [r0]
blx func_ov00_020ada98
blx _ZN11ItemManager7AddItemEj
ldr r0, _02182938 ; =data_027e0f74
mov r1, #8
ldr r0, [r0]
asm/ov36.s
+4 -4
View File
@@ -9017,7 +9017,7 @@ _02183c50:
ldr r0, _02184090 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r2, [r0]
add r1, sp, #0x48
ldr r2, [r2, #0x3c]
@@ -9027,7 +9027,7 @@ _02183c74:
ldr r0, _02184090 ; =gItemManager
mov r1, #8
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r2, [r0]
add r1, sp, #0x48
ldr r2, [r2, #0x3c]
@@ -9037,7 +9037,7 @@ _02183c98:
ldr r0, _02184090 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r2, [r0]
add r1, sp, #0x48
ldr r2, [r2, #0x3c]
@@ -9474,7 +9474,7 @@ _021842d4:
ldr r0, _02184420 ; =gItemManager
mov r1, r4
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r2, [r0]
add r1, sp, #0x14
ldr r2, [r2, #0x3c]
asm/ov37.s
+2 -2
View File
@@ -9607,7 +9607,7 @@ func_ov37_021843d4: ; 0x021843d4
str r1, [r4]
ldr r0, [r0]
mov r1, #4
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r2, #0
mov r1, r0
mov r3, r2
@@ -9616,7 +9616,7 @@ func_ov37_021843d4: ; 0x021843d4
ldr r0, _02184478 ; =gItemManager
mov r1, #5
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, r4, #0x164
mov r2, #0
asm/ov40.s
+2 -2
View File
@@ -4428,7 +4428,7 @@ _0217f5a4:
mov r1, r1, lsl #0x8
ldr r0, [r0]
mov r1, r1, lsr #0x10
blx func_ov00_020adcdc
blx _ZN11ItemManager8GiveItemEjjj
add sp, sp, #8
ldmia sp!, {r3, pc}
_0217f5c4:
@@ -8538,7 +8538,7 @@ _021827e8:
ldr r0, _0218281c ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
blx func_ov00_020ada98
blx _ZN11ItemManager7AddItemEj
_02182804:
mvn r0, #1
str r0, [r4, #0x10]
asm/ov42.s
+2 -2
View File
@@ -326,7 +326,7 @@ _02189918:
ldr r0, _02189afc ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx func_ov00_020ae3d0
blx _ZN11ItemManager13ForceEquipItemEj
ldr r1, _02189b00 ; =data_027e0fc8
mov r0, r7
ldr r4, [r1]
@@ -533,7 +533,7 @@ _02189be4:
blt _02189be4
ldr r0, _02189cd0 ; =gItemManager
ldr r0, [r0]
blx func_ov00_020ae400
blx _ZN11ItemManager20ClearForcedEquipItemEv
bl func_ov42_02189ce8
mov r1, #0
ldr r2, _02189cd4 ; =data_027e0fb8
asm/ov44.s
+1 -1
View File
@@ -4886,7 +4886,7 @@ _0218d008:
ldr r0, _0218d078 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _0218d048
mov r0, r5
asm/ov45.s
+13 -13
View File
@@ -1214,7 +1214,7 @@ _0218a508:
blt _0218a5b4
ldr r0, _0218a5c4 ; =gItemManager
ldr r0, [r0]
blx func_ov00_020ae744
blx _ZNK11ItemManager21HasTreasurePriceShownEj
cmp r0, #0
beq _0218a5b4
add ip, sp, #0x2c
@@ -1280,7 +1280,7 @@ func_ov45_0218a5e0: ; 0x0218a5e0
mov r2, r0
ldr r0, [r1]
ldr r1, [r2, #0x1c]
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #0
movgt r0, #1
movle r0, #0
@@ -1367,13 +1367,13 @@ func_ov45_0218a6ac: ; 0x0218a6ac
strb r1, [r0, r3]
ldr r1, [r5, #0x1c]
mov r0, r4
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
sub r0, r0, #1
mov r2, r0, lsl #0x18
ldr r1, [r5, #0x1c]
mov r0, r4
mov r2, r2, asr #0x18
blx func_ov00_020ad920
blx _ZN11ItemManager16SetTreasureCountEjj
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov45_0218a6ac
@@ -4814,7 +4814,7 @@ _0218d10c:
mov r1, r0
ldr r2, [r4, #0x1c]
mov r0, r5
blx func_ov00_020ad8f0
blx _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
bgt _0218d16c
bl func_ov45_0218c5b4
@@ -5128,7 +5128,7 @@ func_ov45_0218d4d4: ; 0x0218d4d4
mov r1, r0
ldr r2, [r5, #0x1c]
mov r0, r4
blx func_ov00_020ae71c
blx _ZN11ItemManager21AddShipPartPriceShownEjj
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov45_0218d4d4
@@ -5372,7 +5372,7 @@ func_ov45_0218d714: ; 0x0218d714
ldr r0, _0218d7d0 ; =gItemManager
ldr r1, [r4, #0x1c]
ldr r0, [r0]
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #0
bgt _0218d764
bl func_ov45_0218c5b4
@@ -5425,13 +5425,13 @@ func_ov45_0218d7e4: ; 0x0218d7e4
ldr r1, _0218d7fc ; =gItemManager
mov r2, r0
ldr r0, [r1]
ldr ip, _0218d800 ; =func_ov00_020ae76c
ldr ip, _0218d800 ; =_ZN11ItemManager21AddTreasurePriceShownEj
ldr r1, [r2, #0x1c]
bx ip
.align 2, 0
arm_func_end func_ov45_0218d7e4
_0218d7fc: .word gItemManager
_0218d800: .word func_ov00_020ae76c
_0218d800: .word _ZN11ItemManager21AddTreasurePriceShownEj
.global func_ov45_0218d804
arm_func_start func_ov45_0218d804
@@ -5752,7 +5752,7 @@ func_ov45_0218db40: ; 0x0218db40
mov r1, r5
ldr r0, [r0]
mov r2, r4
blx func_ov00_020ad8f0
blx _ZNK11ItemManager16GetShipPartCountEjj
cmp r0, #0
movle r0, #0
ldmleia sp!, {r3, r4, r5, pc}
@@ -6012,7 +6012,7 @@ _0218de84:
mov r1, r0
ldr r2, [r5, #0x1c]
mov r0, r6
blx func_ov00_020ae6f0
blx _ZNK11ItemManager21HasShipPartPriceShownEjj
cmp r0, #0
beq _0218df54
add ip, sp, #0x28
@@ -6174,7 +6174,7 @@ func_ov45_0218e010: ; 0x0218e010
mov r1, r0
mov r0, r6
ldr r2, [r4, #0x1c]
blx func_ov00_020ad8f0
blx _ZNK11ItemManager16GetShipPartCountEjj
mov r1, r5
ldr r2, [r4, #0x1c]
mov r3, r0
@@ -6182,7 +6182,7 @@ func_ov45_0218e010: ; 0x0218e010
sub r3, r3, #1
mov r3, r3, lsl #0x18
mov r3, r3, asr #0x18
blx func_ov00_020ad900
blx _ZN11ItemManager16SetShipPartCountEjjj
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov45_0218e010
asm/ov46.s
+6 -6
View File
@@ -2965,7 +2965,7 @@ _0219267c:
ldr r0, [r0]
mov r1, r1, lsl #0x1c
mov r1, r1, lsr #0x1c
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
str r0, [r6, #0x490]
add r1, r6, #0x400
ldrh r2, [r1, #0x88]
@@ -3022,7 +3022,7 @@ _02192754:
mov r1, r1, lsl #0x1c
ldr r0, [r0]
mov r1, r1, lsr #0x1c
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
mov r4, r0
ldr r0, _021927d4 ; =data_027e0dbc
mov r1, #1
@@ -3035,7 +3035,7 @@ _02192754:
strb r2, [r5, #0x48b]
ldr r0, [r0]
mov r2, #1
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
ldrb r2, [r5, #0x48a]
ldr r0, _021927d0 ; =gItemManager
sub r1, r4, #1
@@ -3044,7 +3044,7 @@ _02192754:
ldr r0, [r0]
mov r1, r3, lsr #0x1c
mov r2, r2, asr #0x18
blx func_ov00_020ad920
blx _ZN11ItemManager16SetTreasureCountEjj
_021927c4:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
@@ -3074,7 +3074,7 @@ _021927f8:
mov r1, r1, lsl #0x1c
ldr r0, [r0]
mov r1, r1, lsr #0x1c
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #0
movle r0, #1
movgt r0, #0
@@ -3089,7 +3089,7 @@ _02192834:
mov r1, r1, lsl #0x1c
ldr r0, [r0]
mov r1, r1, lsr #0x1c
blx func_ov00_020ad918
blx _ZNK11ItemManager16GetTreasureCountEj
cmp r0, #1
mov r0, #1
streqb r0, [r4, #0x498]
asm/ov47.s
+1 -1
View File
@@ -4794,7 +4794,7 @@ func_ov47_02193f78: ; 0x02193f78
ldr r0, [r0]
mov r1, #2
str r2, [sp, #4]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _02194028
add r1, sp, #0
asm/ov48.s
+3 -3
View File
@@ -726,7 +726,7 @@ _02190838:
ldr r0, _021908a8 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _02190878
mov r0, r5
@@ -2058,7 +2058,7 @@ _021918a4:
mov r1, #2
ldr r0, [r0]
mov r5, #0
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _02191964
bl func_ov48_02191c50
@@ -3227,7 +3227,7 @@ _0219266c:
ldr r0, _02193160 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl func_ov00_020ad9e8
bl _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
cmp r0, #1
blt _02192714
mov r6, r5
asm/ov49.s
+3 -3
View File
@@ -862,7 +862,7 @@ func_ov49_02196008: ; 0x02196008
ldr r0, _021960f0 ; =gItemManager
mov r1, #1
ldr r0, [r0]
blx func_ov00_020adb00
blx _ZN11ItemManager10RemoveItemEj
ldrb r0, [r4, #0x5c9]
add r0, r0, #1
strb r0, [r4, #0x5c9]
@@ -894,7 +894,7 @@ _02196068:
mov r0, r5
rsb r1, r1, #0
mov r2, #0
bl func_ov00_020ae2e0
bl _ZN11ItemManager10GiveRupeesEjj
ldrb r1, [r4, #0x5c9]
ldr r0, _021960f0 ; =gItemManager
add r1, r1, #1
@@ -2466,7 +2466,7 @@ func_ov49_0219766c: ; 0x0219766c
str r1, [r4]
ldr r0, [r0]
mov r1, #2
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, r4, #0x16c
blx func_ov00_020a9588
asm/ov53.s
+1 -1
View File
@@ -1088,7 +1088,7 @@ func_ov53_02199ac8: ; 0x02199ac8
str r1, [r4]
ldr r0, [r0]
mov r1, #6
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r2, #0
mov r1, r0
mov r3, r2
asm/ov54.s
+1 -1
View File
@@ -10,7 +10,7 @@ func_ov54_02198d00: ; 0x02198d00
ldr r0, _02198d24 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
ldr r0, _02198d28 ; =data_ov54_02199a2c
bl func_ov00_020a9614
asm/ov55.s
+6 -6
View File
@@ -10,7 +10,7 @@ func_ov55_02198d00: ; 0x02198d00
ldr r0, _02198d24 ; =gItemManager
mov r1, #8
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
ldr r0, _02198d28 ; =data_ov55_021998ac
bl func_ov00_020a9614
@@ -432,10 +432,10 @@ _02199244:
ldr r1, [r4, #0xc]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020ae50c
bl _ZN11ItemManager9SetPotionEjj
ldr r0, _0219926c ; =gItemManager
ldr r0, [r0]
bl func_ov00_020ae3c0
bl _ZN11ItemManager17EquipPreviousItemEv
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov55_021991b0
@@ -472,7 +472,7 @@ func_ov55_02199278: ; 0x02199278
b _02199334
_021992c0:
mov r1, #0xa
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, sp, #4
bl func_ov00_020a9614
@@ -483,7 +483,7 @@ _021992c0:
b _02199334
_021992e8:
mov r1, #0xb
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, sp, #4
bl func_ov00_020a9614
@@ -494,7 +494,7 @@ _021992e8:
b _02199334
_02199310:
mov r1, #0xc
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
add r0, sp, #4
bl func_ov00_020a9614
asm/ov56.s
+2 -2
View File
@@ -10,14 +10,14 @@ func_ov56_02198d00: ; 0x02198d00
ldr r0, _02198d40 ; =gItemManager
mov r1, #3
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
ldr r0, _02198d44 ; =data_ov56_0219940c
bl func_ov00_020a9614
ldr r0, _02198d40 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r1, r0
ldr r0, _02198d48 ; =data_ov56_02199474
bl func_ov00_020a9614
asm/ov57.s
+1 -1
View File
@@ -1796,7 +1796,7 @@ func_ov57_0219a460: ; 0x0219a460
str r1, [r4]
ldr r0, [r0]
mov r1, #0xe
bl func_ov00_020ad52c
bl _ZN11ItemManager12GetItemModelEj
mov r2, #0
mov r1, r0
mov r3, r2
asm/ov58.s
+6 -6
View File
@@ -216,27 +216,27 @@ func_ov58_02198fc0: ; 0x02198fc0
ldr r0, _02199020 ; =gItemManager
mov r1, #9
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r1, r0, #0
ldr r0, _02199024 ; =data_ov58_0219afcc
blx func_ov00_020a9614
ldr r0, _02199020 ; =gItemManager
mov r1, #0xf
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
add r1, r0, #0
ldr r0, _02199028 ; =data_ov58_0219b034
blx func_ov00_020a9614
ldr r0, _02199020 ; =gItemManager
mov r1, #0xf
ldr r0, [r0]
blx func_ov00_020ad52c
blx _ZN11ItemManager12GetItemModelEj
ldr r1, _0219902c ; =data_ov58_0219b040
str r0, [r1, #0x68]
ldr r0, _02199020 ; =gItemManager
ldr r1, _02199030 ; =data_ov58_0219ad68
ldr r0, [r0]
blx func_ov00_020ad538
blx _ZNK11ItemManager18func_ov00_020ad538Ej
add r1, r0, #0
ldr r0, _02199034 ; =data_ov58_0219b0a0
blx func_ov00_020c0c44
@@ -2847,7 +2847,7 @@ _0219a92c:
ldr r0, _0219a994 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl func_ov00_020ad714
bl _ZN11ItemManager12GetEquipItemEj
ldr r0, [r0, #0x18]
cmp r0, #0
bgt _0219a954
@@ -3091,7 +3091,7 @@ _0219abb0:
cmp r2, r1
bhs _0219ac8e
mov r1, #7
blx func_ov00_020ad714
blx _ZN11ItemManager12GetEquipItemEj
add r4, r0, #0
beq _0219ac8e
ldr r0, _0219ac9c ; =data_027e0d78
asm/ov59.s
+4 -4
View File
@@ -576,7 +576,7 @@ _02199408:
ldr r0, _0219a068 ; =gItemManager
ldr r1, _0219a06c ; =data_ov59_0219b110
ldr r0, [r0]
bl func_ov00_020ad538
bl _ZNK11ItemManager18func_ov00_020ad538Ej
ldr r1, [r4, #0x2f4]
mov r5, r0
ldr r0, [r1, #8]
@@ -1439,7 +1439,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac
ldr r4, [r1, #8]
ldr r0, [r0]
ldr r1, _0219a9ec ; =data_ov59_0219b110
bl func_ov00_020ad538
bl _ZNK11ItemManager18func_ov00_020ad538Ej
cmp r4, r0
addeq sp, sp, #0x220
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -2346,7 +2346,7 @@ _0219ae8c:
ldr r0, _0219af08 ; =gItemManager
ldr r1, _0219af0c ; =data_ov00_020dc7d0
ldr r0, [r0]
bl func_ov00_020ad538
bl _ZNK11ItemManager18func_ov00_020ad538Ej
mov r1, r0
add r0, r5, #0x2f0
bl func_ov00_020c0c44
@@ -2361,7 +2361,7 @@ _0219aebc:
str r1, [r5, #0x348]
ldr r0, [r0]
ldr r1, _0219af10 ; =data_ov00_020dc7e4
bl func_ov00_020ad538
bl _ZNK11ItemManager18func_ov00_020ad538Ej
mov r1, r0
add r0, r5, #0x2f0
bl func_ov00_020c0c44
include/ItemManager.hpp
+25 -17
View File
@@ -235,14 +235,17 @@ public:
ItemManager();
~ItemManager();
void ClearPrevEquippedItem();
// Save/load
void Save(SaveItemManager *save);
void Load(const SaveItemManager *save);
// Fairy
FairyId GetEquippedFairy() const;
Navi* GetFairy(FairyId id) const;
unk32 func_ov00_020ad9e8(FairyId id) const;
unk32 _ZNK11ItemManager18func_ov00_020ad9e8Ej(FairyId id) const;
// Equip item
void ClearPrevEquippedItem();
void TickEquipItem();
ItemFlag GetEquippedItem() const;
void Sword_vfunc_38();
@@ -252,12 +255,13 @@ public:
void EquipItem_vfunc_2c(ItemFlag equipId);
EquipItem GetEquipItem(ItemFlag equipId);
unk32 func_ov00_020ad790(unk32 param1);
bool EquipItem(ItemFlag equipId);
bool SetEquippedItem(ItemFlag equipId);
void EquipPreviousItem();
void ForceEquipItem(ItemFlag equipId);
bool ClearForcedEquipItem();
void UpdateSwordShieldInUse();
// Ammo
u16 GetAmmo(ItemFlag equipId) const;
void GiveAmmo(ItemFlag equipId, u16 amount);
u16 GetMaxAmmo(ItemFlag equipId) const;
@@ -265,6 +269,7 @@ public:
void UpgradeBombBag();
void UpgradeBombchuBag();
// Item model
void func_ov00_020ad528();
ItemModel* GetItemModel(ItemModelId id);
void func_ov00_020ad538(unk32 param1) const;
@@ -275,6 +280,7 @@ public:
bool GetFanfareItemScale(Vec3p *pScale) const;
void LoadDungeonItemModels();
// Ship
ShipType GetEquippedShipPart(ShipPart part) const;
void EquipShipPart(ShipPart part, ShipType type);
u8 GetShipPartCount(ShipPart part, ShipType type) const;
@@ -283,43 +289,45 @@ public:
bool HasShipPartPriceShown(ShipPart part, ShipType type) const;
void AddShipPartPriceShown(u32 index);
void AddShipPartPriceShown(ShipPart part, ShipType type);
u8 GetMaxShipPartCount() const;
// Treasure
s8 GetTreasureCount(Treasure treasure) const;
void SetTreasureCount(Treasure treasure, s8 count);
bool HasTreasurePriceShown(Treasure treasure) const;
void AddTreasurePriceShown(Treasure treasure);
u8 GetMaxTreasureCount() const;
// mUnk_098, mUnk_09e
u8 GetUnk_098(u32 index) const;
u16 GetUnk_09e(u32 index) const;
u32 GetUnk_09e_Divided(u32 index) const; // gets mUnk_09e value divided by 2.54, rounded half up
void SetUnk_09e(u32 index, u16 value) const; // also increments the corresponding mUnk_098 value
void SetUnk_09e(u32 index, u16 value); // also increments the corresponding mUnk_098 value
u32 func_ov00_020ad9e0() const; // returns 99
u32 func_ov00_020ad9e4() const; // returns 99
unk32 func_ov00_020ada48(ItemFlag item) const;
// Item
unk32 func_ov00_020ad9a48(ItemFlag item) const;
bool HasItem(ItemFlag item) const;
void AddItem(ItemFlag item);
void RemoveItem(ItemFlag item);
void GiveItem(ItemId id, unk32 param2, unk32 param3);
void GiveEquipItem(ItemFlag item, u16 ammo);
void UnequipPotion();
// Rupees
u32 GetMaxRupees() const;
void GiveRupees(u16 amount, unk32 param2);
void func_ov00_020ae350() const;
void GiveKeys(u32 amount);
void func_ov00_020ae4dc(unk32 param1); // sets mUnk_0ba
// Potion
void SetPotion(u32 index, Potion potion);
bool HasPotion(u32 index) const;
bool HasAllPotions() const;
bool HasBluePotion();
bool HasBluePotion() const;
void UnequipPotion();
void func_ov00_020ae648(unk32 param1, unk32 param2, unk32 param3)
// Unknown
void func_ov00_020ae350() const;
void GiveKeys(u32 amount);
void func_ov00_020ae4dc(unk32 param1); // sets mUnk_0ba
void _ZN11ItemManager18func_ov00_020ae648Ejjj(unk32 param1, unk32 param2, unk32 param3)
};
extern ItemManager *gItemManager;