mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-02 10:10:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update ItemFlag type to be s32

Browse Source
This commit is contained in:
Aetias
2024-02-18 15:10:27 +01:00
parent f3d0b29b42
commit 6b4a258ff5
61 changed files with 393 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/main.inc
+3 -3
View File
@@ -792,9 +792,9 @@
.extern data_ov00_020eec9c
.extern data_027e0c68
.extern func_ov00_02097760
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020c3b2c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0d54
.extern data_027e0c68
.extern data_027e0764
@@ -815,7 +815,7 @@
.extern func_ov05_02100ae0
.extern func_ov00_020ab6c8
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN11ItemManager7AddItemEj
.extern _ZN11ItemManager7AddItemEi
.extern func_ov00_02087d98
.extern func_ov00_02087d98
.extern func_ov00_020d70a4
asm/include/ov02.inc
+31 -31
View File
@@ -38,16 +38,16 @@
.extern func_02007984
.extern func_02007984
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern func_ov09_02113c20
.extern func_ov09_02113c20
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern func_ov00_02097760
.extern func_ov09_02113c20
@@ -63,12 +63,12 @@
.extern func_ov09_02113c20
.extern func_ov00_02097760
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern func_ov00_02097760
.extern func_ov09_02113c20
@@ -79,13 +79,13 @@
.extern func_ov09_02113c20
.extern func_ov00_02097760
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern func_ov09_021144d0
.extern gItemManager
@@ -118,7 +118,7 @@
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_0203493c
.extern func_0203493c
@@ -126,26 +126,26 @@
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_0203493c
.extern func_0203493c
.extern func_01ff9b4c
.extern func_0203493c
.extern func_01ff9b88
.extern func_0203493c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_0203493c
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_0203493c
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_0203493c
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern func_ov09_02113868
.extern func_0203493c
.extern func_ov00_02097760
@@ -169,9 +169,9 @@
.extern data_027e0f74
.extern data_027e0fbc
.extern func_ov09_02113cfc
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113cfc
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113cfc
.extern func_ov09_02113cfc
.extern func_ov09_02113ce4
@@ -186,13 +186,13 @@
.extern func_02034698
.extern func_ov09_02113f40
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern func_ov00_02097760
@@ -225,7 +225,7 @@
.extern func_020350b4
.extern func_02035370
.extern func_020351b8
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov09_02113c20
.extern gItemManager
.extern func_ov09_02113a88
@@ -237,7 +237,7 @@
.extern _ZNK11ItemManager13GetFairyLevelEi
.extern func_020349cc
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_020352d8
.extern gItemManager
.extern func_020350ac
@@ -567,7 +567,7 @@
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_0203493c
.extern func_0203493c
.extern gItemManager
asm/include/ov03.inc
+14 -14
View File
@@ -246,7 +246,7 @@
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e103c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020cf750
.extern func_02034698
.extern func_02034984
@@ -764,7 +764,7 @@
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern func_ov00_020d77e4
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020d77e4
.extern func_ov14_0213ec64
.extern func_ov00_020d77e4
@@ -1057,20 +1057,20 @@
.extern data_027e077c
.extern func_ov00_0209d8d8
.extern func_ov00_020a3fc0
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020a3fe4
.extern func_ov00_020a5e9c
.extern func_ov00_020d77e4
.extern func_ov00_0209d748
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0d78
.extern gItemManager
.extern data_027e0f7c
@@ -1103,10 +1103,10 @@
.extern Divide
.extern func_02007984
.extern func_ov00_020d00c4
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_0209d8d8
.extern func_ov00_020a3fe4
.extern func_ov00_02079680
asm/include/ov05.inc
+4 -4
View File
@@ -317,7 +317,7 @@
.extern func_01ffbe34
.extern func_ov00_0209d90c
.extern func_02034a1c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager18IsTreasureSalvagedEj
.extern func_ov00_0209d90c
.extern func_ov00_02079680
@@ -334,13 +334,13 @@
.extern data_027e0d3c
.extern func_01ffbe34
.extern func_ov00_02097760
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern _ZNK11ItemManager18IsTreasureSalvagedEj
.extern func_ov00_0209d90c
.extern func_ov00_02079680
.extern func_02034984
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_02034698
.extern func_ov00_02079680
@@ -577,7 +577,7 @@
.extern func_ov00_020a8c78
.extern func_ov00_020b0b0c
.extern func_ov00_020a8d40
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0fb8
.extern gItemManager
.extern func_ov00_020a8d6c
asm/include/ov12.inc
+2 -2
View File
@@ -536,8 +536,8 @@
.extern func_ov00_020d7a84
.extern func_ov00_020d8024
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020b8610
.extern func_ov00_020b8610
.extern func_ov00_0207c474
asm/include/ov14.inc
+20 -20
View File
@@ -30,12 +30,12 @@
.extern data_027e103c
.extern data_027e080c
.extern data_027e0fb8
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020c3674
.extern gItemManager
.extern data_027e0fe4
.extern func_ov00_02079b78
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_02083c50
.extern func_ov00_02083c24
.extern func_ov00_020791dc
@@ -2004,7 +2004,7 @@
.extern _ZN9SysObjectdlEPv
.extern func_ov00_020c1730
.extern func_ov00_02078b40
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0d38
.extern gItemManager
.extern func_ov00_020c313c
@@ -2016,7 +2016,7 @@
.extern func_ov00_020c2d54
.extern func_ov00_020c22b8
.extern func_ov00_020cfbf0
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
.extern func_ov00_020d7ad4
.extern func_ov00_020c2c0c
.extern func_ov00_020c2d54
@@ -2273,7 +2273,7 @@
.extern func_ov00_020c1c20
.extern func_ov00_020c3180
.extern func_ov00_020c1bfc
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020c1bfc
.extern gItemManager
.extern func_ov00_020c1730
@@ -2640,19 +2640,19 @@
.extern data_027e0c68
.extern func_ov00_0208b930
.extern func_ov00_020cfed0
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020ceffc
.extern func_02034698
.extern func_02034698
.extern gItemManager
.extern data_027e103c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_02034698
.extern func_02034698
.extern func_ov03_020fc030
.extern gItemManager
.extern data_027e0c38
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager9HasPotionEj
.extern func_ov00_020d77e4
.extern func_ov00_020d0670
@@ -2689,7 +2689,7 @@
.extern func_ov00_020d77e4
.extern func_ov00_020d77e4
.extern func_ov00_020d77e4
.extern _ZN11ItemManager15SetEquippedItemEj
.extern _ZN11ItemManager15SetEquippedItemEi
.extern data_027e0d78
.extern data_027e103c
.extern data_027e077c
@@ -2950,7 +2950,7 @@
.extern func_ov00_020a5e9c
.extern func_ov00_020bc46c
.extern func_ov23_02177e90
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern gItemManager
.extern data_027e0fd4
.extern data_027e0fcc
@@ -2959,7 +2959,7 @@
.extern data_027e0f94
.extern data_027e0d38
.extern func_ov05_0210e8b4
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern gItemManager
.extern func_ov00_02084984
.extern func_ov00_02097738
@@ -3029,7 +3029,7 @@
.extern func_ov00_020b510c
.extern func_ov00_020b50f8
.extern func_ov00_020d77e4
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020bc4ac
.extern func_ov00_020d7b20
.extern data_027e0fd4
@@ -3234,8 +3234,8 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020a9e28
.extern func_ov00_020aca94
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020aa124
.extern func_020197fc
.extern func_020197fc
@@ -3996,7 +3996,7 @@
.extern data_027e0e60
.extern Divide
.extern func_ov00_020cecd8
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_0208b930
.extern data_027e0ffc
.extern gItemManager
@@ -4021,9 +4021,9 @@
.extern data_027e0f74
.extern data_027e0e58
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_0208b930
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern func_ov00_020a956c
.extern data_027e0d0c
@@ -4708,8 +4708,8 @@
.extern data_027e0c50
.extern func_ov00_020cf4f4
.extern func_02034984
.extern _ZNK11ItemManager7GetAmmoEj
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern func_02034bc8
.extern func_0203e784
.extern func_ov00_020bebc0
@@ -7950,4 +7950,4 @@
.extern func_ov00_0208ba50
.extern func_ov00_0208c38c
.extern func_ov00_0208c39c
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
asm/include/ov15.inc
+24 -24
View File
@@ -168,10 +168,10 @@
.extern func_ov00_020d02bc
.extern func_ov00_020d00c4
.extern func_ov00_020d00c4
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02082d08
.extern func_02034b0c
.extern func_02034b0c
@@ -866,10 +866,10 @@
.extern data_ov00_020e2dd8
.extern data_027e0f6c
.extern func_ov00_020a5e9c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0d38
.extern gItemManager
.extern func_ov04_0210bfa8
@@ -2914,7 +2914,7 @@
.extern data_027e0ce0
.extern func_ov00_02097bcc
.extern data_027e0f74
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern func_0203673c
.extern func_02036ce4
@@ -3173,7 +3173,7 @@
.extern func_ov00_020a5e9c
.extern func_ov00_020c1734
.extern data_027e0d38
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager18IsTreasureSalvagedEj
.extern gItemManager
.extern data_027e0fe4
@@ -3610,8 +3610,8 @@
.extern data_027e10a4
.extern data_02050f54
.extern func_02019570
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_020079d8
.extern func_01ff88b0
.extern func_01ff9bc4
@@ -4155,7 +4155,7 @@
.extern data_027e0fe4
.extern data_ov00_020e72f0
.extern data_027e1060
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020c3674
.extern gItemManager
.extern data_027e0fe4
@@ -4183,7 +4183,7 @@
.extern func_ov00_020888e8
.extern data_027e0f64
.extern func_ov00_02097760
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_ov00_020c1500
.extern func_ov00_020c3348
@@ -6507,8 +6507,8 @@
.extern data_027e071c
.extern data_027e0764
.extern func_02019570
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern func_01ff88b0
.extern func_01ff9bc4
@@ -7906,7 +7906,7 @@
.extern func_ov09_0211bcfc
.extern func_0203493c
.extern func_0203493c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020d00c4
.extern data_027e0cbc
.extern gItemManager
@@ -7916,27 +7916,27 @@
.extern data_027e0cbc
.extern func_ov00_020d77e4
.extern func_ov00_020cf330
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020d77e4
.extern func_ov00_020d77e4
.extern func_ov00_020cf330
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020d77e4
.extern func_ov00_020d77e4
.extern func_ov05_021040c8
.extern func_ov00_020cf330
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020d77e4
.extern func_ov03_020f25a4
.extern data_ov00_020eec9c
.extern data_027e10a4
.extern data_027e103c
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_020349cc
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_020349cc
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_020349cc
.extern gItemManager
.extern func_ov03_020f1f0c
@@ -7947,7 +7947,7 @@
.extern func_ov03_020f3f94
.extern func_ov00_020a5e9c
.extern func_ov00_02078ffc
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern data_027e0f74
asm/include/ov19.inc
+1 -1
View File
@@ -79,7 +79,7 @@
.extern data_027e0fc8
.extern data_ov00_020eec68
.extern func_ov00_0209779c
.extern _ZN11ItemManager7AddItemEj
.extern _ZN11ItemManager7AddItemEi
.extern data_027e0f74
.extern gItemManager
.extern data_027e0ffc
asm/include/ov20.inc
+1 -1
View File
@@ -26,7 +26,7 @@
.extern data_02050f54
.extern func_ov00_020c3180
.extern func_ov00_0209779c
.extern _ZN11ItemManager7AddItemEj
.extern _ZN11ItemManager7AddItemEi
.extern func_ov00_020c3180
.extern data_027e0f74
.extern gItemManager
asm/include/ov21.inc
+2 -2
View File
@@ -8,13 +8,13 @@
.extern func_ov14_0212680c
.extern _ZN9SysObjectdlEPv
.extern func_ov14_02126b04
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern func_ov14_02127188
.extern func_ov00_020ceacc
.extern data_027e0ffc
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_0207c1f8
.extern func_ov00_0207c1f8
.extern data_027e0e58
asm/include/ov26.inc
+6 -6
View File
@@ -124,7 +124,7 @@
.extern _ZN9SysObjectdlEPv
.extern func_ov14_02143fc0
.extern func_ov14_02144650
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov03_020f4b7c
.extern gItemManager
.extern data_027e077c
@@ -145,13 +145,13 @@
.extern func_ov03_020fc014
.extern func_020350b4
.extern func_020351b8
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020a5e9c
.extern gItemManager
.extern data_027e0d38
.extern data_027e0fbc
.extern func_020350ac
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_01ff9b4c
.extern func_ov00_020d77e4
.extern func_ov03_020fc078
@@ -335,7 +335,7 @@
.extern func_ov00_020cc168
.extern func_ov00_020cadb0
.extern func_ov00_020cadb0
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern func_ov00_020cb60c
.extern func_ov00_020cadb0
@@ -468,7 +468,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e04
.extern func_ov14_02126b04
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0ffc
.extern gItemManager
.extern func_ov14_02127188
@@ -614,7 +614,7 @@
.extern func_ov00_020875f8
.extern func_0200b974
.extern func_ov00_0209779c
.extern _ZN11ItemManager7AddItemEj
.extern _ZN11ItemManager7AddItemEi
.extern func_ov00_0209a4f4
.extern func_ov00_02097810
.extern func_ov00_0209a508
asm/include/ov28.inc
+1 -1
View File
@@ -1037,7 +1037,7 @@
.extern func_01ff8aa0
.extern func_01ff8e84
.extern func_ov00_020b3ee8
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern data_02050f54
.extern data_02051154
.extern data_02051f54
asm/include/ov30.inc
+1 -1
View File
@@ -572,7 +572,7 @@
.extern func_ov00_020c5d74
.extern func_01ffa0f4
.extern func_ov00_020cc22c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020cb60c
.extern func_ov00_020cadb0
.extern func_ov00_020cadb0
asm/include/ov31.inc
+17 -17
View File
@@ -62,9 +62,9 @@
.extern func_ov00_020d77e4
.extern gItemManager
.extern data_ov00_020eec9c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager13HasAllPotionsEv
.extern gItemManager
.extern data_027e0fe4
@@ -85,9 +85,9 @@
.extern func_ov14_02145e48
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov03_020f3d5c
.extern func_ov03_020f3d5c
.extern func_ov03_020f3d5c
@@ -285,15 +285,15 @@
.extern func_ov00_0209779c
.extern func_ov00_0209779c
.extern data_027e0f74
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
.extern gItemManager
.extern func_ov00_0209779c
.extern data_027e0f74
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
.extern gItemManager
.extern func_ov00_0209779c
.extern data_027e0f74
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
.extern gItemManager
.extern func_ov00_0209779c
.extern data_027e0f74
@@ -323,14 +323,14 @@
.extern data_027e0d78
.extern func_02034b90
.extern data_027e0d78
.extern _ZNK11ItemManager7GetAmmoEj
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern gItemManager
.extern _ZNK11ItemManager7GetAmmoEj
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern gItemManager
.extern _ZNK11ItemManager7GetAmmoEj
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager10GetMaxAmmoEi
.extern gItemManager
.extern _ZNK11ItemManager16GetShipPartCountEjj
.extern _ZNK11ItemManager19GetMaxShipPartCountEv
@@ -365,7 +365,7 @@
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern data_027e0f74
.extern gItemManager
.extern func_ov18_02160a54
@@ -1481,4 +1481,4 @@
.extern func_ov14_021448f4
.extern func_ov14_021458cc
.extern func_ov14_02145900
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
asm/include/ov35.inc
+1 -1
View File
@@ -625,7 +625,7 @@
.extern func_ov00_02097b9c
.extern func_ov00_02097bcc
.extern func_ov00_0209779c
.extern _ZN11ItemManager7AddItemEj
.extern _ZN11ItemManager7AddItemEi
.extern func_ov00_02097968
.extern data_027e0f74
.extern data_027e0e58
asm/include/ov36.inc
+4 -4
View File
@@ -654,9 +654,9 @@
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0764
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020ce2f0
.extern func_01ff9bf8
.extern func_01ffa0f4
@@ -685,7 +685,7 @@
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_ov14_02120998
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020c71fc
.extern func_ov00_02088000
.extern func_ov00_020ceacc
asm/include/ov40.inc
+4 -4
View File
@@ -56,7 +56,7 @@
.extern func_ov00_020a95a4
.extern func_ov00_020c1730
.extern data_027e0f6c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020c4588
.extern func_ov00_020c42d8
.extern func_020196fc
@@ -350,7 +350,7 @@
.extern data_027e0e60
.extern func_ov00_02097cf8
.extern func_ov00_0209779c
.extern _ZN11ItemManager7AddItemEj
.extern _ZN11ItemManager7AddItemEi
.extern data_027e0f74
.extern gItemManager
.extern func_ov05_02112268
@@ -431,8 +431,8 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020a9dc0
.extern func_ov00_020a9dc0
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020aa0f0
.extern func_ov00_020aa0f0
.extern func_ov00_020aa0f0
asm/include/ov41.inc
+1 -1
View File
@@ -226,7 +226,7 @@
.extern func_ov00_020d70a4
.extern func_ov14_021452b0
.extern func_ov14_02145318
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_ov00_020d70a4
.extern func_ov14_02145318
asm/include/ov42.inc
+1 -1
View File
@@ -17,7 +17,7 @@
.extern func_ov00_02087400
.extern func_ov00_02083918
.extern func_ov00_02087400
.extern _ZN11ItemManager13ForceEquipItemEj
.extern _ZN11ItemManager13ForceEquipItemEi
.extern func_020385b8
.extern func_ov00_020ab6c8
.extern func_ov00_020bcf50
asm/include/ov49.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern func_ov00_020bbc68
.extern data_027e0fc8
.extern func_01fffcd8
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZN11ItemManager10RemoveItemEi
.extern func_ov00_020d7ad4
.extern func_ov00_020c5a24
asm/include/ov58.inc
+2 -2
View File
@@ -179,7 +179,7 @@
.extern data_027e1098
.extern func_0203516c
.extern func_ov00_0207914c
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020d0594
.extern func_ov00_020d054c
.extern func_ov00_020d0594
@@ -206,7 +206,7 @@
.extern func_ov00_02078fd4
.extern func_ov00_02078fac
.extern func_0202e740
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020d61b0
.extern func_ov00_020792a0
.extern func_ov00_020791dc
asm/main.s
+3 -3
View File
@@ -76437,7 +76437,7 @@ _02037d64:
ldr r0, _02037f50 ; =gItemManager
ldr r0, [r0]
add r1, r1, #0x60
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r0, #0
moveq r0, #1
@@ -76524,7 +76524,7 @@ _02037eac:
ldr r0, _02037f50 ; =gItemManager
ldrh r1, [r4, #4]
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r0, #0
moveq r0, #1
@@ -76903,7 +76903,7 @@ _020383e8:
ldr r0, _02038590 ; =gItemManager
ldr r1, [r4, #4]
ldr r0, [r0]
blx _ZN11ItemManager7AddItemEj
blx _ZN11ItemManager7AddItemEi
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
asm/ov00/ItemManager/ItemManager.s
+30 -30
View File
@@ -495,7 +495,7 @@ _020ade7c:
orr r1, r3
str r1, [r0, r2]
mov r1, #0
blx _ZN11ItemManager12GetEquipItemEj
blx _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x20]
@@ -509,7 +509,7 @@ _020ade98:
orr r1, r3
str r1, [r0, r2]
mov r1, #1
blx _ZN11ItemManager12GetEquipItemEj
blx _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x20]
@@ -518,37 +518,37 @@ _020ade98:
_020adeb4:
mov r1, #4
mov r2, #0xa
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020adebe:
mov r1, #7
mov r2, #0xa
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020adec8:
mov r1, #5
mov r2, #0x14
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020aded2:
mov r1, #2
mov r2, #1
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020adedc:
mov r1, #3
mov r2, #1
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020adee6:
mov r1, #8
mov r2, #1
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020adef0:
mov r1, #6
mov r2, #1
bl _ZN11ItemManager13GiveEquipItemEjj
bl _ZN11ItemManager13GiveEquipItemEij
b _020ae222
_020adefa:
mov r1, #0x4b
@@ -1007,9 +1007,9 @@ _020ae270:
nop
_020ae274: .word data_027e0f74
.global _ZN11ItemManager13GiveEquipItemEjj
thumb_func_start _ZN11ItemManager13GiveEquipItemEjj
_ZN11ItemManager13GiveEquipItemEjj: ; 0x020ae278
.global _ZN11ItemManager13GiveEquipItemEij
thumb_func_start _ZN11ItemManager13GiveEquipItemEij
_ZN11ItemManager13GiveEquipItemEij: ; 0x020ae278
push {r3, r4, r5, r6, r7, lr}
add r6, r1, #0
str r2, [sp]
@@ -1030,7 +1030,7 @@ _ZN11ItemManager13GiveEquipItemEjj: ; 0x020ae278
mov r5, ip
orr r3, r5
str r3, [r2, r7]
blx _ZN11ItemManager12GetEquipItemEj
blx _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
ldr r1, [sp]
ldr r2, [r2, #0x20]
@@ -1046,7 +1046,7 @@ _ZN11ItemManager13GiveEquipItemEjj: ; 0x020ae278
_020ae2bc:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end _ZN11ItemManager13GiveEquipItemEjj
thumb_func_end _ZN11ItemManager13GiveEquipItemEij
.global _ZN11ItemManager13UnequipPotionEv
thumb_func_start _ZN11ItemManager13UnequipPotionEv
@@ -1158,30 +1158,30 @@ _ZNK11ItemManager15GetEquippedItemEv: ; 0x020ae390
bx lr
arm_func_end _ZNK11ItemManager15GetEquippedItemEv
.global _ZN11ItemManager15SetEquippedItemEj
arm_func_start _ZN11ItemManager15SetEquippedItemEj
_ZN11ItemManager15SetEquippedItemEj: ; 0x020ae3a8
.global _ZN11ItemManager15SetEquippedItemEi
arm_func_start _ZN11ItemManager15SetEquippedItemEi
_ZN11ItemManager15SetEquippedItemEi: ; 0x020ae3a8
ldr r3, [r0]
mov r2, #2
stmia r0, {r1, r3}
strh r2, [r0, #0x20]
mov r0, #1
bx lr
arm_func_end _ZN11ItemManager15SetEquippedItemEj
arm_func_end _ZN11ItemManager15SetEquippedItemEi
.global _ZN11ItemManager17EquipPreviousItemEv
arm_func_start _ZN11ItemManager17EquipPreviousItemEv
_ZN11ItemManager17EquipPreviousItemEv: ; 0x020ae3c0
ldr ip, _020ae3cc ; =_ZN11ItemManager15SetEquippedItemEj
ldr ip, _020ae3cc ; =_ZN11ItemManager15SetEquippedItemEi
ldr r1, [r0, #4]
bx ip
.align 2, 0
arm_func_end _ZN11ItemManager17EquipPreviousItemEv
_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEj - 1
_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEi - 1
.global _ZN11ItemManager13ForceEquipItemEj
thumb_func_start _ZN11ItemManager13ForceEquipItemEj
_ZN11ItemManager13ForceEquipItemEj: ; 0x020ae3d0
.global _ZN11ItemManager13ForceEquipItemEi
thumb_func_start _ZN11ItemManager13ForceEquipItemEi
_ZN11ItemManager13ForceEquipItemEi: ; 0x020ae3d0
push {r3, r4, r5, r6, r7, lr}
mov r4, #0
add r6, r0, #0
@@ -1208,7 +1208,7 @@ _020ae3ee:
strh r0, [r6, #0x20]
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end _ZN11ItemManager13ForceEquipItemEj
thumb_func_end _ZN11ItemManager13ForceEquipItemEi
.global _ZN11ItemManager20ClearForcedEquipItemEv
thumb_func_start _ZN11ItemManager20ClearForcedEquipItemEv
@@ -1220,7 +1220,7 @@ _ZN11ItemManager20ClearForcedEquipItemEv: ; 0x020ae400
ldr r1, [r0]
cmp r1, r2
beq _020ae414
blx _ZN11ItemManager15SetEquippedItemEj
blx _ZN11ItemManager15SetEquippedItemEi
pop {r3, pc}
_020ae414:
mov r0, #0
@@ -1233,14 +1233,14 @@ _ZN11ItemManager22UpdateSwordShieldInUseEv: ; 0x020ae418
stmdb sp!, {r4, lr}
mov r1, #0
mov r4, r0
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x28]
blx r2
mov r0, r4
mov r1, #1
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x28]
@@ -1267,7 +1267,7 @@ _ZN11ItemManager13UpgradeQuiverEv: ; 0x020ae458
_020ae472:
add r0, r4, #0
mov r1, #5
bl _ZNK11ItemManager10GetMaxAmmoEj
bl _ZNK11ItemManager10GetMaxAmmoEi
add r4, #0xb0
ldr r1, [r4]
strh r0, [r1, #0xa]
@@ -1294,7 +1294,7 @@ _ZN11ItemManager14UpgradeBombBagEv: ; 0x020ae484
_020ae49e:
add r0, r4, #0
mov r1, #4
bl _ZNK11ItemManager10GetMaxAmmoEj
bl _ZNK11ItemManager10GetMaxAmmoEi
add r4, #0xb0
ldr r1, [r4]
strh r0, [r1, #8]
@@ -1321,7 +1321,7 @@ _ZN11ItemManager17UpgradeBombchuBagEv: ; 0x020ae4b0
_020ae4ca:
add r0, r4, #0
mov r1, #7
bl _ZNK11ItemManager10GetMaxAmmoEj
bl _ZNK11ItemManager10GetMaxAmmoEi
add r4, #0xb0
ldr r1, [r4]
strh r0, [r1, #0xe]
asm/ov00/ItemManager/ItemManager_func_ov00_020ad790.inc
+2 -2
View File
@@ -57,7 +57,7 @@ _020ad840:
_020ad860:
ldr r1, [r6]
mov r0, r6
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
ldrne r4, [r6]
_020ad874:
@@ -74,7 +74,7 @@ _020ad874:
_020ad89c:
mov r0, r6
mov r1, r4
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, r5
ldr r2, [r2, #0x14]
asm/ov00/ItemManager/include/ItemManager.inc
+2 -2
View File
@@ -81,5 +81,5 @@
.extern data_ov00_020eec68
.extern _ZN11ItemManager14Sword_vfunc_38Ej
.extern _ZN11ItemManager15Shield_vfunc_38Ej
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZNK11ItemManager10GetMaxAmmoEi
asm/ov00/include/ov00_02079d28.inc
+1 -1
View File
@@ -171,7 +171,7 @@
.extern func_ov00_020a5e9c
.extern func_ov00_020a5e9c
.extern func_ov00_0209d738
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov26_02173b7c
.extern func_ov00_020a5e9c
.extern func_ov00_020a5e9c
asm/ov00/include/ov00_020a03e4.inc
+7 -7
View File
@@ -555,8 +555,8 @@
.extern func_01ffec34
.extern func_ov00_0208f030
.extern gItemManager
.extern _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj
.extern _ZN11ItemManager18EquipItem_vfunc_2cEj
.extern _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
.extern _ZN11ItemManager18EquipItem_vfunc_2cEi
.extern gItemManager
.extern func_ov00_02083624
.extern data_027e0e60
@@ -587,7 +587,7 @@
.extern func_ov00_020bd364
.extern func_ov00_020bb544
.extern func_ov00_020bb594
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern gItemManager
.extern gItemManager
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
@@ -671,10 +671,10 @@
.extern data_027e0fe4
.extern func_ov00_020c3674
.extern func_ov00_020bc71c
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern gItemManager
.extern gItemManager
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern data_027e0fd4
.extern data_027e0fcc
.extern func_ov00_020c0d68
@@ -988,7 +988,7 @@
.extern func_ov00_020b7e6c
.extern func_ov00_020b7e6c
.extern func_ov05_021113c4
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern data_027e0e58
@@ -1006,7 +1006,7 @@
.extern data_ov00_020e9360
.extern func_ov00_0207b89c
.extern data_ov00_020e9c88
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov14_0213ec64
.extern func_01ffa0f4
.extern func_0202d95c
asm/ov00/include/ov00_020ae7a4.inc
+1 -1
View File
@@ -128,7 +128,7 @@
.extern data_027e0e60
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov00_020c3674
.extern func_ov00_020c3674
.extern func_ov00_020c28ec
asm/ov00/include/ov00_020b4940.inc
+17 -17
View File
@@ -50,7 +50,7 @@
.extern func_ov00_0209cbd4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern _ZN11ItemManager12GetEquipItemEj
.extern _ZN11ItemManager12GetEquipItemEi
.extern func_ov14_0213dfbc
.extern func_ov14_0213e144
.extern func_01ff9c2c
@@ -232,9 +232,9 @@
.extern func_ov00_020c45b0
.extern data_027e0fec
.extern func_ov00_020b1d3c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern gItemManager
.extern func_020193f0
.extern func_020193f0
@@ -319,24 +319,24 @@
.extern data_027e0fac
.extern func_0202af4c
.extern data_027e0fac
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern func_ov00_02097bbc
@@ -727,9 +727,9 @@
.extern func_ov00_020d0b7c
.extern data_027e0f64
.extern data_02050f54
.extern _ZNK11ItemManager7GetAmmoEj
.extern _ZNK11ItemManager7GetAmmoEi
.extern gItemManager
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
.extern gItemManager
.extern func_ov00_02093a1c
.extern data_027e0f6c
@@ -767,7 +767,7 @@
.extern data_027e0e58
.extern func_ov00_020d7cd4
.extern func_ov00_020d7a84
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov00_020d7a84
.extern func_ov00_020d7a84
.extern func_01ffbf5c
@@ -799,7 +799,7 @@
.extern func_01ff9158
.extern func_02018450
.extern func_01ff9158
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_020197fc
.extern func_020197fc
.extern func_ov00_020b41c4
@@ -827,7 +827,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern gItemManager
.extern func_0202e58c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_01ffa9fc
.extern func_01ffa9fc
.extern func_01ff8230
@@ -1071,4 +1071,4 @@
.extern func_ov04_0210bc28
.extern func_ov04_0210bc94
.extern func_ov04_021079dc
.extern _ZN11ItemManager8GiveAmmoEjt
.extern _ZN11ItemManager8GiveAmmoEit
asm/ov00/include/ov00_020c9a68.inc
+1 -1
View File
@@ -399,7 +399,7 @@
.extern data_027e077c
.extern data_02056be4
.extern data_027e103c
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEi
.extern func_ov14_02152220
.extern gItemManager
.extern data_027e0618
asm/ov00/include/ov00_020d1870.inc
+1 -1
View File
@@ -230,7 +230,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectdlEPv
.extern func_020366c4
.extern _ZN11ItemManager15SetEquippedItemEj
.extern _ZN11ItemManager15SetEquippedItemEi
.extern func_ov00_020cf9dc
.extern func_0203878c
.extern data_027e0c68
asm/ov00/ov00_02079d28.s
+1 -1
View File
@@ -2910,7 +2910,7 @@ _0207b688:
ldr r0, _0207b818 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
blx _ZNK11ItemManager7HasItemEj
blx _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0207b6cc
ldrb r0, [r4, #0x12]
asm/ov00/ov00_020a03e4.s
+9 -9
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 ; =_ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj
ldr ip, _020a7cf8 ; =_ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov00_020a7ce4
_020a7cf4: .word gItemManager
_020a7cf8: .word _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj
_020a7cf8: .word _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
.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 _ZN11ItemManager18EquipItem_vfunc_2cEj
bl _ZN11ItemManager18EquipItem_vfunc_2cEi
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 _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
cmp r0, #0
beq _020a818c
ldr r2, [r0]
@@ -11145,7 +11145,7 @@ func_ov00_020a8cec: ; 0x020a8cec
stmdb sp!, {r3, lr}
ldr r0, _020a8d24 ; =gItemManager
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
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 ; =_ZN11ItemManager12GetEquipItemEj
ldr ip, _020a8d3c ; =_ZN11ItemManager12GetEquipItemEi
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov00_020a8d28
_020a8d38: .word gItemManager
_020a8d3c: .word _ZN11ItemManager12GetEquipItemEj
_020a8d3c: .word _ZN11ItemManager12GetEquipItemEi
.global func_ov00_020a8d40
arm_func_start func_ov00_020a8d40
@@ -16262,7 +16262,7 @@ _020ac930:
ldr r0, _020ac9dc ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020ac9bc
ldr r0, _020ac9e0 ; =data_027e0f74
@@ -16427,7 +16427,7 @@ func_ov00_020acb6c: ; 0x020acb6c
ldr r0, _020ace74 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
cmp r0, #0
beq _020acbb0
bl func_ov00_020abf50
asm/ov00/ov00_020ae7a4.s
+1 -1
View File
@@ -1365,7 +1365,7 @@ _020af810:
beq _020af8b0
ldr r0, _020afac4 ; =gItemManager
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
mov r5, r0
_020af8b0:
ldr r0, _020afac8 ; =data_027e0fc8
asm/ov00/ov00_020b4940.s
+16 -16
View File
@@ -1360,7 +1360,7 @@ _020b5a04:
ldr r0, _020b5ca0 ; =gItemManager
mov r1, #6
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldrsh r1, [r6, #0x5a]
mov r4, r0
cmp r1, #5
@@ -4887,7 +4887,7 @@ func_ov00_020b8790: ; 0x020b8790
ldr r0, _020b87c4 ; =gItemManager
mov r1, #0x14
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r4, #3
_020b87b4:
@@ -4909,7 +4909,7 @@ func_ov00_020b87cc: ; 0x020b87cc
ldr r0, _020b8800 ; =gItemManager
mov r1, #0x14
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r4, #3
_020b87f0:
@@ -7170,7 +7170,7 @@ _020ba618:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba650
ldr r0, _020ba870 ; =gItemManager
@@ -7185,7 +7185,7 @@ _020ba650:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba688
ldr r0, _020ba870 ; =gItemManager
@@ -7211,7 +7211,7 @@ _020ba6b0:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba6e8
ldr r0, _020ba870 ; =gItemManager
@@ -7229,7 +7229,7 @@ _020ba6f0:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba728
ldr r0, _020ba870 ; =gItemManager
@@ -7247,7 +7247,7 @@ _020ba730:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba768
ldr r0, _020ba870 ; =gItemManager
@@ -7273,7 +7273,7 @@ _020ba790:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba7c8
ldr r0, _020ba870 ; =gItemManager
@@ -7299,7 +7299,7 @@ _020ba7f0:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba828
ldr r0, _020ba870 ; =gItemManager
@@ -7314,7 +7314,7 @@ _020ba828:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ba860
ldr r0, _020ba870 ; =gItemManager
@@ -12923,7 +12923,7 @@ func_ov00_020beb30: ; 0x020beb30
blx r2
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager7GetAmmoEj
bl _ZNK11ItemManager7GetAmmoEi
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 _ZN11ItemManager8GiveAmmoEjt
bl _ZN11ItemManager8GiveAmmoEit
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020beb5c
@@ -13866,7 +13866,7 @@ _020bf6d4:
ldr r0, _020bff38 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
add r2, sp, #0xe4
beq _020bf700
@@ -14498,7 +14498,7 @@ func_ov00_020bff94: ; 0x020bff94
ldr r0, _020c01d4 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
ldrsh r5, [r4, #0x5c]
beq _020c0064
@@ -15164,7 +15164,7 @@ func_ov00_020c086c: ; 0x020c086c
ldr r0, _020c0a70 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
ldrneb r0, [r4, #0xd]
cmpne r0, #0
asm/ov00/ov00_020c9a68.s
+1 -1
View File
@@ -7647,7 +7647,7 @@ func_ov00_020cf750: ; 0x020cf750
mov r4, r0
ldr r0, [r1]
mov r1, #0x21
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
asm/ov00/ov00_020d1870.s
+1 -1
View File
@@ -3001,7 +3001,7 @@ _020d3f34:
ldr r0, _020d3f6c ; =gItemManager
ldr r1, [r5, #0x40]
ldr r0, [r0]
bl _ZN11ItemManager15SetEquippedItemEj
bl _ZN11ItemManager15SetEquippedItemEi
ldr r0, _020d3f70 ; =data_027e103c
mov r1, #1
ldr r0, [r0]
asm/ov02.s
+31 -31
View File
@@ -286,7 +286,7 @@ _020ef0c0:
_020ef0d0:
ldr r0, [r6]
mov r1, r7
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
ldrne r0, [r5, #0xd04]
add r7, r7, #1
@@ -395,7 +395,7 @@ _020ef270:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x2a
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef2c0
mov r2, #0x28
@@ -416,7 +416,7 @@ _020ef2c0:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x26
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef310
mov r2, #0x26
@@ -437,7 +437,7 @@ _020ef310:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x2b
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef360
mov r2, #0x27
@@ -620,7 +620,7 @@ _020ef5c8:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef614
add r3, r4, #0x2b
@@ -640,13 +640,13 @@ _020ef614:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef67c
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r6, #0x13
moveq r6, #0x12
@@ -667,7 +667,7 @@ _020ef67c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef6d0
mvn r3, #0
@@ -780,7 +780,7 @@ _020ef82c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef87c
mov r2, #0x1b
@@ -801,7 +801,7 @@ _020ef87c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #5
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef8cc
mov r2, #0x1d
@@ -822,7 +822,7 @@ _020ef8cc:
ldr r0, _020ef998 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef91c
mov r2, #0x22
@@ -843,7 +843,7 @@ _020ef91c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020ef96c
mov r2, #0x27
@@ -1376,7 +1376,7 @@ _020f0000:
ldr r0, _020f0720 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f008c
ldr r0, _020f0724 ; =data_027e0f74
@@ -1427,7 +1427,7 @@ _020f008c:
ldr r0, _020f0720 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f01e4
mov r2, r4
@@ -1487,7 +1487,7 @@ _020f01e4:
ldr r0, _020f0720 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f02e8
add r6, sp, #0x28
@@ -1559,7 +1559,7 @@ _020f02e8:
str r6, [sp, #0x2c]
str r3, [sp, #4]
str r2, [sp, #0xc]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f035c
add r6, sp, #0x28
@@ -1572,7 +1572,7 @@ _020f02e8:
ldr r0, _020f0720 ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
mov r1, r0
mov r3, #0x1e
add r0, sp, #4
@@ -1583,7 +1583,7 @@ _020f035c:
ldr r0, _020f0720 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f03b8
add r6, sp, #0x28
@@ -1596,7 +1596,7 @@ _020f035c:
ldr r0, _020f0720 ; =gItemManager
mov r1, #4
ldr r0, [r0]
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
mov r1, r0
mov r3, #0x23
add r0, sp, #4
@@ -1607,7 +1607,7 @@ _020f03b8:
ldr r0, _020f0720 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f0414
add r6, sp, #0x28
@@ -1620,7 +1620,7 @@ _020f03b8:
ldr r0, _020f0720 ; =gItemManager
mov r1, #7
ldr r0, [r0]
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
mov r1, r0
mov r3, #0x28
add r0, sp, #4
@@ -1869,7 +1869,7 @@ _020f0774:
ldr r0, _020f08a8 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f07a4
ldr r1, _020f08ac ; =0x0012009a
@@ -1882,7 +1882,7 @@ _020f07a4:
ldr r0, _020f08a8 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f07d4
ldr r1, _020f08b0 ; =0x0012009b
@@ -2082,13 +2082,13 @@ func_ov02_020f0a54: ; 0x020f0a54
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x14
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f0aa0
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x1d
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f0aa8
_020f0aa0:
@@ -2101,13 +2101,13 @@ _020f0ab0:
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r3, pc}
_020f0ac4:
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r3, pc}
_020f0ad8:
mov r0, #0
@@ -2156,7 +2156,7 @@ func_ov02_020f0b3c: ; 0x020f0b3c
mov r1, #0x2d
ldr r0, [r0]
mvn r4, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r4, #0x2f
bne _020f0bcc
@@ -2500,7 +2500,7 @@ func_ov02_020f0f14: ; 0x020f0f14
ldr r0, _020f0fd4 ; =gItemManager
mov r1, #0x14
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #4
streqb r0, [r4, #0xec]
@@ -2623,7 +2623,7 @@ func_ov02_020f10f8: ; 0x020f10f8
ldr r0, _020f114c ; =gItemManager
mov r1, #0x14
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
_020f1128:
@@ -6496,7 +6496,7 @@ _020f40fc:
ldr r0, _020f41ec ; =gItemManager
mov r1, #0x2f
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x6c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
asm/ov03.s
+18 -18
View File
@@ -5781,7 +5781,7 @@ _020f23e8:
ldr r0, _020f2518 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x18
moveq r0, #1
@@ -13077,7 +13077,7 @@ _020f693c:
ldr r0, _020f69c8 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r1, _020f69d4 ; =data_027e0f64
mov r4, r0
ldr r0, [r1]
@@ -16321,28 +16321,28 @@ _020f8fec: ; jump table
_020f8ffc:
ldr r0, [sl]
mov r1, #0x21
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f9058
b _020f91c0
_020f9014:
ldr r0, [sl]
mov r1, #0x23
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f9058
b _020f91c0
_020f902c:
ldr r0, [sl]
mov r1, #0x22
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f9058
b _020f91c0
_020f9044:
ldr r0, [sl]
mov r1, #0x24
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f91c0
_020f9058:
@@ -16467,7 +16467,7 @@ _020f91f4: ; jump table
_020f9204:
ldr r0, [r4]
mov r1, #0x21
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f92c8
ldr r0, [sl]
@@ -16484,21 +16484,21 @@ _020f9204:
_020f9244:
ldr r0, [r4]
mov r1, #0x23
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f9288
b _020f92c8
_020f925c:
ldr r0, [r4]
mov r1, #0x22
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _020f9288
b _020f92c8
_020f9274:
ldr r0, [r4]
mov r1, #0x24
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _020f92c8
_020f9288:
@@ -16890,22 +16890,22 @@ _020f97b4:
ldr r0, _020f9a74 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _020f9a74 ; =gItemManager
strb r0, [sp, #0x44]
ldr r0, [r1]
mov r1, #0x22
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _020f9a74 ; =gItemManager
strb r0, [sp, #0x45]
ldr r0, [r1]
mov r1, #0x23
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _020f9a74 ; =gItemManager
strb r0, [sp, #0x46]
ldr r0, [r1]
mov r1, #0x24
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
strb r0, [sp, #0x47]
ldr r0, [sp, #0x10]
mov r5, #4
@@ -18486,9 +18486,9 @@ _020faaaa:
pop {r3, r4, r5, pc}
thumb_func_end func_ov03_020faaa4
.global _ZN14OverlayManager13LoadEquipItemEj
thumb_func_start _ZN14OverlayManager13LoadEquipItemEj
_ZN14OverlayManager13LoadEquipItemEj: ; 0x020faab8
.global _ZN14OverlayManager13LoadEquipItemEi
thumb_func_start _ZN14OverlayManager13LoadEquipItemEi
_ZN14OverlayManager13LoadEquipItemEi: ; 0x020faab8
mov r2, #0
mvn r2, r2
cmp r1, #0xa
@@ -18539,7 +18539,7 @@ _020fab00:
mov r1, #0xb
bx r3
nop
thumb_func_end _ZN14OverlayManager13LoadEquipItemEj
thumb_func_end _ZN14OverlayManager13LoadEquipItemEi
_020fab08: .word 0x00000035
_020fab0c: .word 0x00000036
_020fab10: .word 0x00000037
asm/ov05.s
+4 -4
View File
@@ -4639,7 +4639,7 @@ _02104694:
beq _0210471c
ldr r0, [r6]
add r1, sb, #0x60
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0210471c
ldr r0, [r6]
@@ -4772,7 +4772,7 @@ _0210485c:
ldr r0, _02104a38 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _021048a8
mov r2, #0
@@ -4832,7 +4832,7 @@ _0210493c:
ldr r0, _02104a38 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addne sp, sp, #0x34
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -7074,7 +7074,7 @@ _02106810:
ldr r0, _02106890 ; =gItemManager
mov r1, #0x2d
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _02106874
ldr r0, [r6, #0x1c]
asm/ov12.s
+2 -2
View File
@@ -9020,7 +9020,7 @@ _0211a1f0:
ldr r0, _0211a3ec ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x28]
@@ -9028,7 +9028,7 @@ _0211a1f0:
ldr r0, _0211a3ec ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x28]
asm/ov14.s
+22 -22
View File
@@ -267,7 +267,7 @@ func_ov14_0211f8d0: ; 0x0211f8d0
str r1, [r4]
ldr r0, [r0]
mov r1, #7
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
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 _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r1, [sp, #0xc]
mov sl, r0
cmp r1, #0
@@ -26520,7 +26520,7 @@ _02134fd4:
blx r2
mov r1, r0
mov r0, r5
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -26658,7 +26658,7 @@ _021351c4:
mov r1, r0
ldr r2, [r5, #0x158]
mov r0, r6
bl _ZN11ItemManager8GiveAmmoEjt
bl _ZN11ItemManager8GiveAmmoEit
_021351ec:
ldr r0, _02135360 ; =data_ov00_020eec9c
mov r1, #0x100
@@ -30529,7 +30529,7 @@ func_ov14_021383e0: ; 0x021383e0
ldr r0, _02138418 ; =gItemManager
add r1, r1, #0x15
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r3, pc}
_0213840c:
mov r1, #1
@@ -35316,7 +35316,7 @@ _0213c004:
ldr r0, _0213c0f4 ; =gItemManager
mov r1, sb
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
@@ -35390,7 +35390,7 @@ func_ov14_0213c0fc: ; 0x0213c0fc
ldr r1, [r8, #0x18]
mov r6, r2
mov r5, r3
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0213c208
ldr r0, _0213c218 ; =data_027e0c38
@@ -35474,7 +35474,7 @@ func_ov14_0213c220: ; 0x0213c220
ldr r1, [r7, #0x18]
mov r5, r2
mov r4, r3
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0213c34c
ldr r1, [r7, #0x18]
@@ -36006,7 +36006,7 @@ _0213c7d4:
ldr r0, _0213c8e0 ; =gItemManager
mov r1, r5
ldr r0, [r0]
bl _ZN11ItemManager15SetEquippedItemEj
bl _ZN11ItemManager15SetEquippedItemEi
mov r0, r4
strb r5, [r4, #0x14c]
ldr r2, [r0]
@@ -39690,7 +39690,7 @@ _0213f2ec:
ldr r0, _0213f318 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
cmp r0, #0
beq _0213f30c
bl func_ov14_0212429c
@@ -39721,7 +39721,7 @@ func_ov14_0213f334: ; 0x0213f334
cmp r1, #7
ldmneia sp!, {r4, pc}
mov r1, #7
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r2, [r0]
@@ -40178,7 +40178,7 @@ _0213f874:
str r1, [r5, #0x70]
ldr r0, [r0]
mov r1, #0x20
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _0213f8c0
ldr r4, [r5, #0x70]
@@ -42317,13 +42317,13 @@ _021412a8:
mov r1, #0x25
ldrsh fp, [r3, r5]
ldrsh r5, [r3, r2]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
mov r7, #0
ldr r1, _021415bc ; =gItemManager
mov r6, r0
ldr r0, [r1]
mov r1, r7
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _02141308
cmp r6, #0
@@ -53592,7 +53592,7 @@ _02149fc8:
ldr r1, _0214a05c ; =data_ov14_02153f1c
ldr r0, [r0]
ldr r1, [r1, r2, lsl #2]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0214a040
ldr r0, [r4, #0x74]
@@ -53893,14 +53893,14 @@ func_ov14_0214a3dc: ; 0x0214a3dc
ldr r3, [r0, #0x74]
ldr r2, _0214a3fc ; =data_ov14_02153f1c
ldr r0, [r1]
ldr ip, _0214a400 ; =_ZNK11ItemManager7HasItemEj
ldr ip, _0214a400 ; =_ZNK11ItemManager7HasItemEi
ldr r1, [r2, r3, lsl #2]
bx ip
.align 2, 0
arm_func_end func_ov14_0214a3dc
_0214a3f8: .word gItemManager
_0214a3fc: .word data_ov14_02153f1c
_0214a400: .word _ZNK11ItemManager7HasItemEj
_0214a400: .word _ZNK11ItemManager7HasItemEi
.global func_ov14_0214a404
arm_func_start func_ov14_0214a404
@@ -53924,7 +53924,7 @@ func_ov14_0214a404: ; 0x0214a404
mov r5, r0
ldr r0, [r1]
ldr r1, [r2, r3, lsl #2]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0214a480
ldr r0, _0214a4b4 ; =0x00003555
@@ -63347,7 +63347,7 @@ _021519d0:
bne _021519ec
ldr r0, [r4]
mov r1, r6
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _02151a08
_021519ec:
@@ -65950,7 +65950,7 @@ func_ov14_02153924: ; 0x02153924
ldr r0, _02153a3c ; =gItemManager
mov r1, r5
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r4, #1
_02153964:
@@ -66040,12 +66040,12 @@ func_ov14_02153a48: ; 0x02153a48
ldr r0, _02153b4c ; =gItemManager
mov r1, r8
ldr r0, [r0]
bl _ZNK11ItemManager7GetAmmoEj
bl _ZNK11ItemManager7GetAmmoEi
ldr r1, _02153b4c ; =gItemManager
mov r4, r0
ldr r0, [r1]
mov r1, r8
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
mov r7, r0
_02153ab4:
cmp r4, #0
asm/ov15.s
+29 -29
View File
@@ -2296,22 +2296,22 @@ _02121550:
ldr r0, _021216f8 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _021216f8 ; =gItemManager
str r0, [sp, #0x10]
ldr r0, [r1]
mov r1, #0x23
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _021216f8 ; =gItemManager
mov fp, r0
ldr r0, [r1]
mov r1, #0x22
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _021216f8 ; =gItemManager
mov sl, r0
ldr r0, [r1]
mov r1, #0x24
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
mov r5, #0
ldr r1, _021216fc ; =data_027e0e60
mov r4, r0
@@ -12152,25 +12152,25 @@ _02129714:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r4, pc}
_02129728:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x22
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r4, pc}
_0212973c:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x23
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r4, pc}
_02129750:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x24
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldmia sp!, {r4, pc}
_02129764:
mov r0, #1
@@ -41551,7 +41551,7 @@ func_ov15_021428f0: ; 0x021428f0
mov r4, r0
ldr r0, [r1]
mov r1, #0x2c
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -45645,7 +45645,7 @@ func_ov15_021461b0: ; 0x021461b0
ldrh r1, [r5, r4]
ldr r0, [r0]
add r1, r1, #0x60
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x18
moveq r0, #0
@@ -51996,12 +51996,12 @@ func_ov15_0214b86c: ; 0x0214b86c
ldr r0, _0214bb88 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _0214bb88 ; =gItemManager
mov r7, r0
ldr r0, [r1]
mov r1, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0214b8c8
cmp r7, #0
@@ -60050,7 +60050,7 @@ func_ov15_02152358: ; 0x02152358
mov r4, r0
ldr r0, [r1]
mov r1, #0x28
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
@@ -60395,7 +60395,7 @@ func_ov15_021527d4: ; 0x021527d4
ldr r0, _021529c0 ; =gItemManager
mov r1, #0x2f
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr ip, _021529c4 ; =data_027e0764
cmp r0, #0
ldr r2, [ip]
@@ -92740,12 +92740,12 @@ func_ov15_0216e534: ; 0x0216e534
str r1, [ip]
ldr r0, [r0]
mov r1, #0x25
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
mov r7, r0
ldr r0, _0216e694 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0216e5a4
cmp r7, #0
@@ -110851,7 +110851,7 @@ _0217dfa8:
bne _0217dfc4
ldr r0, [r4]
mov r1, r6
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0217dfe0
_0217dfc4:
@@ -110931,7 +110931,7 @@ _0217e0ac:
ldr r0, _0217e1c4 ; =gItemManager
mov r1, #0x2c
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0217e1a4
ldr r0, _0217e1b8 ; =data_ov00_020eec9c
@@ -110959,7 +110959,7 @@ _0217e114:
ldr r0, _0217e1c4 ; =gItemManager
mov r1, #0x28
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0217e1a4
ldr r0, _0217e1b8 ; =data_ov00_020eec9c
@@ -110986,7 +110986,7 @@ _0217e178:
ldr r0, _0217e1c4 ; =gItemManager
mov r1, #0x2e
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0217e1a4
ldr r0, _0217e1b8 ; =data_ov00_020eec9c
@@ -111028,7 +111028,7 @@ _0217e1fc:
mov r1, #0x2c
ldr r0, [r0]
mvn r7, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r7, #4
beq _0217e228
@@ -111055,7 +111055,7 @@ _0217e260:
mov r1, #0x28
ldr r0, [r0]
mvn r7, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r7, #4
beq _0217e28c
@@ -111082,7 +111082,7 @@ _0217e2c4:
mov r1, #0x2e
ldr r0, [r0]
mvn r7, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r7, #4
beq _0217e2f0
@@ -111200,7 +111200,7 @@ _0217e42c:
ldr r0, _0217e4c0 ; =gItemManager
mov r1, #0x2e
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r5, #0
_0217e460:
@@ -112435,28 +112435,28 @@ _0217f564:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f57c:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x22
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f594:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x23
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f5ac:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x24
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f5c4:
@@ -117692,7 +117692,7 @@ func_ov15_02183cb4: ; 0x02183cb4
mov r4, r0
ldr r0, [r1]
mov r1, #0x28
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
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 _ZN11ItemManager7AddItemEj
blx _ZN11ItemManager7AddItemEi
mov r4, #0
_0216eafc:
add r0, r5, r4, lsl #2
asm/ov20.s
+1 -1
View File
@@ -299,7 +299,7 @@ func_ov20_0216da64: ; 0x0216da64
ldr r0, _0216dac0 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
blx _ZN11ItemManager7AddItemEj
blx _ZN11ItemManager7AddItemEi
mov r4, #0
_0216da98:
add r0, r5, r4, lsl #2
asm/ov21.s
+3 -3
View File
@@ -93,7 +93,7 @@ func_ov21_0216d784: ; 0x0216d784
ldr r1, _0216d7c0 ; =data_ov21_02170bd4
ldr r0, [r0]
ldr r1, [r1, r2, lsl #2]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r0, #5
moveq r0, #0xc
@@ -151,14 +151,14 @@ func_ov21_0216d830: ; 0x0216d830
ldr r3, [r0, #0xb4]
ldr r2, _0216d850 ; =data_ov21_02170bd4
ldr r0, [r1]
ldr ip, _0216d854 ; =_ZNK11ItemManager7HasItemEj
ldr ip, _0216d854 ; =_ZNK11ItemManager7HasItemEi
ldr r1, [r2, r3, lsl #2]
bx ip
.align 2, 0
arm_func_end func_ov21_0216d830
_0216d84c: .word gItemManager
_0216d850: .word data_ov21_02170bd4
_0216d854: .word _ZNK11ItemManager7HasItemEj
_0216d854: .word _ZNK11ItemManager7HasItemEi
.global func_ov21_0216d858
arm_func_start func_ov21_0216d858
asm/ov26.s
+6 -6
View File
@@ -1420,7 +1420,7 @@ func_ov26_0216e5b4: ; 0x0216e5b4
ldr r0, _0216e628 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0216e620
ldr r0, _0216e62c ; =data_027e077c
@@ -1693,7 +1693,7 @@ func_ov26_0216e8b8: ; 0x0216e8b8
ldr r0, _0216e9b8 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
blx _ZNK11ItemManager7HasItemEj
blx _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0216e986
ldr r0, _0216e9b8 ; =gItemManager
@@ -1785,7 +1785,7 @@ func_ov26_0216e9d0: ; 0x0216e9d0
mov r1, #0x20
ldr r0, [r0]
mov r5, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0216ea08
ldrb r0, [r6, #0xc2]
@@ -4151,7 +4151,7 @@ func_ov26_02170894: ; 0x02170894
ldr r0, _02170934 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _021708dc
ldr r0, _02170934 ; =gItemManager
@@ -5599,7 +5599,7 @@ _02171cec:
ldr r1, _02171d24 ; =data_ov26_02179434
ldr r0, [r0]
ldr r1, [r1, r2, lsl #2]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r0, #5
moveq r0, #0xc
@@ -7173,7 +7173,7 @@ _021731b8:
ldr r0, _021732bc ; =gItemManager
mov r1, #0x60
ldr r0, [r0]
blx _ZN11ItemManager7AddItemEj
blx _ZN11ItemManager7AddItemEi
add r0, sp, #0xc
bl func_ov00_0209a4f4
mov r2, #0
asm/ov28.s
+1 -1
View File
@@ -11391,7 +11391,7 @@ func_ov28_021768dc: ; 0x021768dc
ldr r0, _021769e4 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r0, #0
strneb r0, [r4, #0x7ad]
asm/ov30.s
+1 -1
View File
@@ -6964,7 +6964,7 @@ _021813d0:
ldr r0, _02181804 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0218146c
mov r2, #2
asm/ov31.s
+16 -16
View File
@@ -1115,7 +1115,7 @@ _0217cbd8:
ldr r0, _0217cd00 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _0217cc80
ldr r1, _0217cd04 ; =0x00140054
@@ -1126,7 +1126,7 @@ _0217cc00:
ldr r0, _0217cd00 ; =gItemManager
mov r1, #5
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _0217cc80
ldr r1, _0217cd08 ; =0x00140053
@@ -1137,7 +1137,7 @@ _0217cc28:
ldr r0, _0217cd00 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
bne _0217cc80
ldr r1, _0217cd0c ; =0x00140055
@@ -1592,21 +1592,21 @@ _0217d1a4:
_0217d1b4:
ldr r0, [fp]
mov r1, #4
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1cc:
ldr r0, [fp]
mov r1, #5
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1e4:
ldr r0, [fp]
mov r1, #7
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
@@ -5339,7 +5339,7 @@ func_ov31_0217fe00: ; 0x0217fe00
ldr r0, [r1]
mov r1, #5
mov r2, #0xa
bl _ZN11ItemManager8GiveAmmoEjt
bl _ZN11ItemManager8GiveAmmoEit
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 _ZN11ItemManager8GiveAmmoEjt
bl _ZN11ItemManager8GiveAmmoEit
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 _ZN11ItemManager8GiveAmmoEjt
bl _ZN11ItemManager8GiveAmmoEit
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 _ZNK11ItemManager7GetAmmoEj
bl _ZNK11ItemManager7GetAmmoEi
mov r4, r0
mov r0, r5
mov r1, #5
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
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 _ZNK11ItemManager7GetAmmoEj
bl _ZNK11ItemManager7GetAmmoEi
mov r4, r0
mov r0, r5
mov r1, #4
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
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 _ZNK11ItemManager7GetAmmoEj
bl _ZNK11ItemManager7GetAmmoEi
mov r4, r0
mov r0, r5
mov r1, #7
blx _ZNK11ItemManager10GetMaxAmmoEj
blx _ZNK11ItemManager10GetMaxAmmoEi
cmp r4, r0
movge r0, #1
movlt r0, #0
@@ -6459,7 +6459,7 @@ _02180930:
ldr r0, _0218095c ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
movne r0, #0x10
moveq r0, #0xe
asm/ov35.s
+1 -1
View File
@@ -7758,7 +7758,7 @@ _021828f4:
ldr r0, _02182944 ; =gItemManager
mov r1, #0x1d
ldr r0, [r0]
blx _ZN11ItemManager7AddItemEj
blx _ZN11ItemManager7AddItemEi
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 _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
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 _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
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 _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
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 _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
add r1, sp, #0x14
ldr r2, [r2, #0x3c]
asm/ov40.s
+4 -4
View File
@@ -388,7 +388,7 @@ func_ov40_0217c2b8: ; 0x0217c2b8
ldr r0, _0217c470 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r0, #0
streqb r0, [r6, #0x1c4]
@@ -8538,7 +8538,7 @@ _021827e8:
ldr r0, _0218281c ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
blx _ZN11ItemManager7AddItemEj
blx _ZN11ItemManager7AddItemEi
_02182804:
mvn r0, #1
str r0, [r4, #0x10]
@@ -10151,12 +10151,12 @@ _02183ba8:
ldr r0, _02183d04 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
ldr r1, _02183d04 ; =gItemManager
mov r6, r0
ldr r0, [r1]
mov r1, #0
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _02183bdc
cmp r6, #0
asm/ov41.s
+1 -1
View File
@@ -2888,7 +2888,7 @@ _0218b9b4:
ldr r0, _0218be0c ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0218ba48
ldr r0, _0218be10 ; =data_027e0f74
asm/ov42.s
+1 -1
View File
@@ -326,7 +326,7 @@ _02189918:
ldr r0, _02189afc ; =gItemManager
mov r1, #5
ldr r0, [r0]
blx _ZN11ItemManager13ForceEquipItemEj
blx _ZN11ItemManager13ForceEquipItemEi
ldr r1, _02189b00 ; =data_027e0fc8
mov r0, r7
ldr r4, [r1]
asm/ov49.s
+1 -1
View File
@@ -856,7 +856,7 @@ func_ov49_02196008: ; 0x02196008
ldr r0, _021960f0 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
beq _0219605c
ldr r0, _021960f0 ; =gItemManager
asm/ov58.s
+2 -2
View File
@@ -2847,7 +2847,7 @@ _0219a92c:
ldr r0, _0219a994 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZN11ItemManager12GetEquipItemEj
bl _ZN11ItemManager12GetEquipItemEi
ldr r0, [r0, #0x18]
cmp r0, #0
bgt _0219a954
@@ -3091,7 +3091,7 @@ _0219abb0:
cmp r2, r1
bhs _0219ac8e
mov r1, #7
blx _ZN11ItemManager12GetEquipItemEj
blx _ZN11ItemManager12GetEquipItemEi
add r4, r0, #0
beq _0219ac8e
ldr r0, _0219ac9c ; =data_027e0d78
include/Item.hpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "types.h"
typedef u32 ItemFlag;
typedef s32 ItemFlag;
enum ItemFlag_ {
ItemFlag_None = -1,
ItemFlag_OshusSword = 0,
include/ItemManager.hpp
+1 -1
View File
@@ -305,7 +305,7 @@ public:
// Item
bool HasItem(ItemFlag item) const;
void AddItem(ItemFlag item);
void RemoveItem(s32 item);
void RemoveItem(ItemFlag item);
void GiveItem(ItemId id, unk32 param2, unk32 param3);
void GiveEquipItem(ItemFlag item, u16 ammo);
include/global.h
+1 -1
View File
@@ -3,7 +3,7 @@
#define NULL 0
#define GET_FLAG(arr, pos) (((1 << ((pos) & 0x1f)) & (arr)[(pos) >> 5]) != 0)
#define GET_FLAG(arr, pos) (((1 << ((pos) & 0x1f)) & (arr)[((u32)(pos)) >> 5]) != 0)
#define SET_FLAG(arr, pos) ((arr)[((u32(pos))) >> 5] |= 1 << ((pos) & 0x1f))
#define RESET_FLAG(arr, pos) ((arr)[((u32)(pos)) >> 5] &= ~(1 << ((pos) & 0x1f)))
src/ItemManager.cpp
+6 -6
View File
@@ -100,7 +100,7 @@ THUMB void ItemManager::Load(const SaveItemManager *save) {
if (this->mEquippedFairy >= FairyId_COUNT) {
this->mEquippedFairy = FairyId_None;
}
if (this->mEquippedItem - 9 <= 1) {
if ((u32) this->mEquippedItem - 9 <= 1) {
if (this->HasItem(ItemFlag_Boomerang)) {
this->mEquippedItem = ItemFlag_Boomerang;
} else {
@@ -127,7 +127,7 @@ extern UnkStruct_027e0d38 *data_027e0d38;
extern unk32 gPlayerAnimHandler;
extern "C" void LoadEquipItemModel(unk32 param1, ItemFlag param2);
extern "C" void _ZNK11ItemManager15GetEquippedItemEv();
extern "C" void _ZN14OverlayManager13LoadEquipItemEj();
extern "C" void _ZN14OverlayManager13LoadEquipItemEi();
ARM void ItemManager::TickEquipItem(void) {
ItemFlag equip = this->GetEquippedItem();
if (this->mEquipLoadTimer != 0) {
@@ -239,8 +239,8 @@ extern void *data_027e0e60;
extern "C" bool func_ov00_020849f8(void *param1);
extern unk32 data_027e0fc8;
extern "C" bool func_ov00_020bbd80(unk32 param1, unk32 param2);
extern "C" bool _ZNK11ItemManager7HasItemEj();
extern "C" void _ZN11ItemManager12GetEquipItemEj();
extern "C" bool _ZNK11ItemManager7HasItemEi();
extern "C" void _ZN11ItemManager12GetEquipItemEi();
ARM NONMATCH bool ItemManager::func_ov00_020ad790(unk32 param1) {
#ifndef NONMATCHING
#include "../asm/ov00/ItemManager/ItemManager_func_ov00_020ad790.inc"
@@ -257,7 +257,7 @@ ARM NONMATCH bool ItemManager::func_ov00_020ad790(unk32 param1) {
bool unk2 = !func_ov00_020849f8(data_027e0e60);
if (
this->mEquippedItem != ItemFlag_None &&
(unk2 || this->mEquippedItem - 9 <= 1) &&
(unk2 || (u32) this->mEquippedItem - 9 <= 1) &&
(data_027e0fc8 == 0 || func_ov00_020bbd80(data_027e0fc8, param1)) &&
this->HasItem(this->mEquippedItem)
) {
@@ -374,7 +374,7 @@ THUMB void ItemManager::SetTreasureSalvaged(u32 index) {
SET_FLAG(&this->mSalvagedTreasureFlags, index);
}
THUMB void ItemManager::RemoveItem(s32 item) {
THUMB void ItemManager::RemoveItem(ItemFlag item) {
RESET_FLAG(this->mItemFlags.flags, item);
if (item >= ItemFlag_EQUIP_START && item <= ItemFlag_EQUIP_END) {
(*this->mAmmo)[item] = 0;