mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-08-24 15:07:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match ItemManager::Save and Load

Browse Source
This commit is contained in:
Aetias
2024-02-18 11:34:16 +01:00
parent aefcf5bf21
commit 7412a00674
52 changed files with 363 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/main.inc
+2 -2
View File
@@ -792,9 +792,9 @@
.extern data_ov00_020eec9c
.extern data_027e0c68
.extern func_ov00_02097760
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020c3b2c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0d54
.extern data_027e0c68
.extern data_027e0764
asm/include/ov02.inc
+28 -28
View File
@@ -38,16 +38,16 @@
.extern func_02007984
.extern func_02007984
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern func_ov09_02113c20
.extern func_ov09_02113c20
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern func_ov09_021144d0
.extern gItemManager
@@ -118,7 +118,7 @@
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_02097760
.extern func_0203493c
.extern func_0203493c
@@ -126,24 +126,24 @@
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_0203493c
.extern func_0203493c
.extern func_01ff9b4c
.extern func_0203493c
.extern func_01ff9b88
.extern func_0203493c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_0203493c
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_0203493c
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_0203493c
.extern _ZNK11ItemManager10GetMaxAmmoEj
.extern func_ov09_02113868
@@ -169,9 +169,9 @@
.extern data_027e0f74
.extern data_027e0fbc
.extern func_ov09_02113cfc
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113cfc
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov09_02113c20
.extern gItemManager
.extern func_ov09_02113a88
@@ -237,7 +237,7 @@
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
.extern func_020349cc
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_020352d8
.extern gItemManager
.extern func_020350ac
@@ -567,7 +567,7 @@
.extern func_0203493c
.extern func_0203493c
.extern func_0203493c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_0203493c
.extern func_0203493c
.extern gItemManager
asm/include/ov03.inc
+13 -13
View File
@@ -246,7 +246,7 @@
.extern data_027e0f74
.extern data_027e0f90
.extern data_027e103c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020cf750
.extern func_02034698
.extern func_02034984
@@ -1057,20 +1057,20 @@
.extern data_027e077c
.extern func_ov00_0209d8d8
.extern func_ov00_020a3fc0
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020a3fe4
.extern func_ov00_020a5e9c
.extern func_ov00_020d77e4
.extern func_ov00_0209d748
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0d78
.extern gItemManager
.extern data_027e0f7c
@@ -1103,10 +1103,10 @@
.extern func_01ff98e0
.extern func_02007984
.extern func_ov00_020d00c4
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_0209d8d8
.extern func_ov00_020a3fe4
.extern func_ov00_02079680
asm/include/ov05.inc
+12 -12
View File
@@ -317,7 +317,7 @@
.extern func_01ffbe34
.extern func_ov00_0209d90c
.extern func_02034a1c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager21HasShipPartPriceShownEj
.extern func_ov00_0209d90c
.extern func_ov00_02079680
@@ -334,13 +334,13 @@
.extern data_027e0d3c
.extern func_01ffbe34
.extern func_ov00_02097760
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_02097760
.extern _ZNK11ItemManager21HasShipPartPriceShownEj
.extern func_ov00_0209d90c
.extern func_ov00_02079680
.extern func_02034984
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0fb8
.extern gItemManager
.extern func_ov00_020a8d6c
@@ -919,9 +919,9 @@
.extern func_ov00_020a8dcc
.extern func_ov00_020a8b3c
.extern func_ov00_020a8138
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020a8b04
.extern func_ov00_020a8c4c
.extern data_027e071c
@@ -980,7 +980,7 @@
.extern data_027e0f64
.extern data_027e0e58
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020b2d8c
.extern func_ov00_020a8238
.extern func_ov00_020a8c58
@@ -1139,9 +1139,9 @@
.extern func_ov00_020a8bb8
.extern func_ov00_020a5e9c
.extern func_ov00_02097750
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020a8c4c
.extern func_ov00_020a8c78
.extern func_0202b154
@@ -1149,7 +1149,7 @@
.extern func_0202b154
.extern func_ov00_020a81fc
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020a8c4c
.extern func_01ff9bf8
.extern func_01ffa0f4
@@ -1412,7 +1412,7 @@
.extern func_ov00_020ab8cc
.extern func_ov00_020a8ca4
.extern func_ov00_0208583c
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_0208583c
.extern func_ov00_020a81ec
.extern func_ov00_020a8c78
asm/include/ov12.inc
+1 -1
View File
@@ -490,7 +490,7 @@
.extern func_ov00_020c3674
.extern func_ov05_0210e4e4
.extern func_ov00_020a7c00
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020b510c
.extern func_ov00_020b50f8
.extern func_ov00_020d77e4
asm/include/ov14.inc
+11 -11
View File
@@ -2004,7 +2004,7 @@
.extern _ZN9SysObjectdlEPv
.extern func_ov00_020c1730
.extern func_ov00_02078b40
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0d38
.extern gItemManager
.extern func_ov00_020c313c
@@ -2273,7 +2273,7 @@
.extern func_ov00_020c1c20
.extern func_ov00_020c3180
.extern func_ov00_020c1bfc
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020ceffc
.extern func_02034698
.extern func_02034698
.extern gItemManager
.extern data_027e103c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_02034698
.extern func_02034698
.extern func_ov03_020fc030
.extern gItemManager
.extern data_027e0c38
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager9HasPotionEj
.extern func_ov00_020d77e4
.extern func_ov00_020d0670
@@ -3029,7 +3029,7 @@
.extern func_ov00_020b510c
.extern func_ov00_020b50f8
.extern func_ov00_020d77e4
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020aa124
.extern func_020197fc
.extern func_020197fc
@@ -3996,7 +3996,7 @@
.extern data_027e0e60
.extern func_01ff98e0
.extern func_ov00_020cecd8
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_0208b930
.extern data_027e0ffc
.extern gItemManager
@@ -4021,9 +4021,9 @@
.extern data_027e0f74
.extern data_027e0e58
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_0208b930
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern func_ov00_020a956c
.extern data_027e0d0c
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 _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0d38
.extern gItemManager
.extern func_ov04_0210bfa8
@@ -2914,7 +2914,7 @@
.extern data_027e0ce0
.extern func_ov00_02097bcc
.extern data_027e0f74
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern func_0203673c
.extern func_02036ce4
@@ -3173,7 +3173,7 @@
.extern func_ov00_020a5e9c
.extern func_ov00_020c1734
.extern data_027e0d38
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager21HasShipPartPriceShownEj
.extern gItemManager
.extern data_027e0fe4
@@ -3610,8 +3610,8 @@
.extern data_027e10a4
.extern data_02050f54
.extern func_02019570
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_020079d8
.extern func_01ff88b0
.extern func_01ff9bc4
@@ -4155,7 +4155,7 @@
.extern data_027e0fe4
.extern data_ov00_020e72f0
.extern data_027e1060
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern func_01ff88b0
.extern func_01ff9bc4
@@ -7906,7 +7906,7 @@
.extern func_ov09_0211bcfc
.extern func_0203493c
.extern func_0203493c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020d77e4
.extern func_ov00_020d77e4
.extern func_ov00_020cf330
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020d77e4
.extern func_ov00_020d77e4
.extern func_ov05_021040c8
.extern func_ov00_020cf330
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020d77e4
.extern func_ov03_020f25a4
.extern data_ov00_020eec9c
.extern data_027e10a4
.extern data_027e103c
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_020349cc
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_020349cc
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern data_027e0f74
asm/include/ov21.inc
+2 -2
View File
@@ -8,13 +8,13 @@
.extern func_ov14_0212680c
.extern _ZN9SysObjectdlEPv
.extern func_ov14_02126b04
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern func_ov14_02127188
.extern func_ov00_020ceacc
.extern data_027e0ffc
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_0207c1f8
.extern func_ov00_0207c1f8
.extern data_027e0e58
asm/include/ov26.inc
+5 -5
View File
@@ -124,7 +124,7 @@
.extern _ZN9SysObjectdlEPv
.extern func_ov14_02143fc0
.extern func_ov14_02144650
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov03_020f4b7c
.extern gItemManager
.extern data_027e077c
@@ -145,13 +145,13 @@
.extern func_ov03_020fc014
.extern func_020350b4
.extern func_020351b8
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020a5e9c
.extern gItemManager
.extern data_027e0d38
.extern data_027e0fbc
.extern func_020350ac
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0ffc
.extern gItemManager
.extern func_ov14_02127188
asm/include/ov28.inc
+2 -2
View File
@@ -586,7 +586,7 @@
.extern data_027e0e60
.extern func_ov00_0207c474
.extern func_ov00_0207c474
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_0207c474
.extern func_ov00_020b7e6c
.extern func_ov00_020ceacc
@@ -1037,7 +1037,7 @@
.extern func_01ff8aa0
.extern func_01ff8e84
.extern func_ov00_020b3ee8
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020cb60c
.extern func_ov00_020cadb0
.extern func_ov00_020cadb0
asm/include/ov31.inc
+7 -7
View File
@@ -62,9 +62,9 @@
.extern func_ov00_020d77e4
.extern gItemManager
.extern data_ov00_020eec9c
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager13HasAllPotionsEv
.extern gItemManager
.extern data_027e0fe4
@@ -85,9 +85,9 @@
.extern func_ov14_02145e48
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov03_020f3d5c
.extern func_ov03_020f3d5c
.extern func_ov03_020f3d5c
@@ -365,7 +365,7 @@
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern func_ov00_02097760
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern data_027e0f74
.extern gItemManager
.extern func_ov18_02160a54
asm/include/ov40.inc
+3 -3
View File
@@ -56,7 +56,7 @@
.extern func_ov00_020a95a4
.extern func_ov00_020c1730
.extern data_027e0f6c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_020c4588
.extern func_ov00_020c42d8
.extern func_020196fc
@@ -431,8 +431,8 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020a9dc0
.extern func_ov00_020a9dc0
.extern _ZN11ItemManager7HasItemEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_02097760
.extern func_ov00_020d70a4
.extern func_ov14_02145318
asm/include/ov49.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern func_ov00_020bbc68
.extern data_027e0fc8
.extern func_01fffcd8
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZN11ItemManager10RemoveItemEj
.extern func_ov00_020d7ad4
.extern func_ov00_020c5a24
asm/include/ov54.inc
+1 -1
View File
@@ -43,7 +43,7 @@
.extern func_ov00_020a89bc
.extern func_ov00_020af050
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020ba3b4
.extern func_ov05_0210f808
.extern func_ov00_020aeffc
asm/include/ov59.inc
+4 -4
View File
@@ -1,6 +1,6 @@
#pragma once
.extern func_ov00_020beb30
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020a5e9c
.extern func_ov00_020bc500
.extern data_027e0fd4
@@ -17,7 +17,7 @@
.extern func_ov00_020a8c78
.extern func_0202b154
.extern func_ov00_020a89bc
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020a8db8
.extern func_ov00_020b0240
.extern func_ov00_020a81ec
@@ -38,7 +38,7 @@
.extern gItemManager
.extern data_027e0fb8
.extern func_01fffcec
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020b853c
.extern gItemManager
.extern func_ov00_020b0240
@@ -151,6 +151,6 @@
.extern data_027e0f94
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern data_027e0fb8
asm/main.s
+2 -2
View File
@@ -76437,7 +76437,7 @@ _02037d64:
ldr r0, _02037f50 ; =gItemManager
ldr r0, [r0]
add r1, r1, #0x60
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r0, #0
moveq r0, #1
asm/ov00/ItemManager/ItemManager.s
+6 -6
View File
@@ -224,19 +224,19 @@ _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj: ; 0x020ada48
mov r4, r1
add r1, r4, #0x1a
mov r5, r0
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r0, #2
ldmneia sp!, {r3, r4, r5, pc}
mov r0, r5
add r1, r4, #0x17
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9a48EjEj
.global _ZN11ItemManager7HasItemEj
arm_func_start _ZN11ItemManager7HasItemEj
_ZN11ItemManager7HasItemEj: ; 0x020ada78
.global _ZNK11ItemManager7HasItemEj
arm_func_start _ZNK11ItemManager7HasItemEj
_ZNK11ItemManager7HasItemEj: ; 0x020ada78
mov r2, r1, lsr #0x5
add r0, r0, r2, lsl #2
ldr r2, [r0, #0x128]
@@ -245,7 +245,7 @@ _ZN11ItemManager7HasItemEj: ; 0x020ada78
tst r2, r0, lsl r1
moveq r0, #0
bx lr
arm_func_end _ZN11ItemManager7HasItemEj
arm_func_end _ZNK11ItemManager7HasItemEj
.global _ZN11ItemManager7AddItemEj
thumb_func_start _ZN11ItemManager7AddItemEj
asm/ov00/ItemManager/ItemManager_Load.inc
-240
View File
@@ -1,240 +0,0 @@
push {r3, r4, r5, r6, r7, lr}
add r4, r0, #0
mov r0, #0x4a
add r6, r1, #0
lsl r0, r0, #2
add r3, r6, #0
add r2, r4, r0
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
add r0, r6, #0
add r0, #0x8e
ldrh r0, [r0]
strh r0, [r4, #0x22]
add r0, r6, #0
add r0, #0x80
ldrh r1, [r0]
ldconst r0, #0x000005dc
cmp r1, r0
bhi _020ad274
mov r0, #0x3c
mul r0, r1
b _020ad276
_020ad274:
ldconst r0, #0x00015f90
_020ad276:
mov r2, #0
mov r7, #0x4a
str r0, [r4, #0xc]
add r3, r2, #0
mov r0, #1
lsl r7, r7, #2
_020ad282:
mov r1, #0x1f
add r5, r2, #0
and r5, r1
add r1, r0, #0
lsl r1, r5
lsr r5, r2, #5
lsl r5, r5, #2
add r5, r4, r5
ldr r5, [r5, r7]
tst r1, r5
beq _020ad2a0
add r1, r4, #0
add r1, #0xb0
ldr r1, [r1, #0]
strh r0, [r1, r3]
_020ad2a0:
add r2, r2, #1
add r3, r3, #2
cmp r2, #0xb
blt _020ad282
add r0, r6, #0
add r0, #0x93
ldrb r1, [r0]
add r0, r4, #0
add r0, #0xb0
ldr r0, [r0, #0]
mov r2, #0
strh r1, [r0, #8]
add r0, r6, #0
add r0, #0x94
ldrb r1, [r0]
add r0, r4, #0
add r0, #0xb0
ldr r0, [r0, #0]
strh r1, [r0, #0xe]
add r0, r6, #0
add r0, #0x95
ldrb r1, [r0]
add r0, r4, #0
add r0, #0xb0
ldr r0, [r0, #0]
strh r1, [r0, #0xa]
_020ad2d4:
add r0, r6, r2
add r0, #0x97
ldrb r1, [r0]
add r0, r4, r2
add r0, #0xbc
add r2, r2, #1
strb r1, [r0]
cmp r2, #2
blt _020ad2d4
mov r0, #0x96
ldrsb r1, [r6, r0]
add r0, #0xa2
mov r2, #0
str r1, [r4]
ldr r1, [r6, #0x10]
str r1, [r4, r0]
_020ad2f4:
add r0, r6, r2
add r0, #0x99
ldrb r1, [r0]
add r0, r4, r2
add r0, #0x24
add r2, r2, #1
strb r1, [r0]
cmp r2, #3
blt _020ad2f4
mov r0, #0
mov ip, r0
str r4, [sp]
add r3, r6, #0
add r5, r4, #0
mov r7, #0x2c
_020ad312:
mov r0, ip
add r0, r6, r0
add r0, #0x24
ldrb r1, [r0]
ldr r0, [sp]
mov r2, #0
str r1, [r0, #0x28]
_020ad320:
add r0, r3, r2
ldrsb r1, [r0, r7]
add r0, r5, r2
add r0, #0x48
add r2, r2, #1
strb r1, [r0]
cmp r2, #9
blt _020ad320
ldr r0, [sp]
add r3, #9
add r0, r0, #4
str r0, [sp]
mov r0, ip
add r0, r0, #1
add r5, #9
mov ip, r0
cmp r0, #8
blt _020ad312
add r3, r6, #0
mov r0, #0x4f
lsl r0, r0, #2
add r3, #0x14
add r2, r4, r0
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
ldr r0, [r3, #0]
mov r3, #0
str r0, [r2]
mov r0, #0x74
_020ad35a:
add r1, r6, r3
ldrsb r2, [r1, r0]
add r1, r4, r3
add r1, #0x90
add r3, r3, #1
strb r2, [r1]
cmp r3, #8
blt _020ad35a
mov r0, #0x52
ldr r1, [r6, #0x20]
lsl r0, r0, #2
str r1, [r4, r0]
mov r0, #0
add r1, r6, #0
add r2, r4, #0
_020ad378:
add r3, r6, r0
add r3, #0x9f
ldrb r5, [r3]
add r3, r4, r0
add r3, #0x98
strb r5, [r3]
add r3, r1, #0
add r3, #0x82
ldrh r5, [r3]
add r3, r2, #0
add r3, #0x9e
add r0, r0, #1
strh r5, [r3]
add r1, r1, #2
add r2, r2, #2
cmp r0, #6
blt _020ad378
add r0, r6, #0
add r0, #0x9c
ldrb r1, [r0]
add r0, r4, #0
add r0, #0xb4
strh r1, [r0]
add r0, r6, #0
add r0, #0x9d
ldrb r1, [r0]
add r0, r4, #0
add r0, #0xb6
strh r1, [r0]
add r0, r6, #0
add r0, #0x9e
ldrb r1, [r0]
add r0, r4, #0
add r0, #0xb8
add r6, #0xa5
strh r1, [r0]
ldrb r0, [r6]
str r0, [r4, #0x10]
cmp r0, #3
blt _020ad3ce
mov r0, #0
mvn r0, r0
str r0, [r4, #0x10]
_020ad3ce:
ldr r1, [r4, #0]
add r0, r1, #0
sub r0, #9
cmp r0, #1
bhi _020ad3f2
add r0, r4, #0
mov r1, #2
bl _ZN11ItemManager7HasItemEj
cmp r0, #0
beq _020ad3ea
mov r0, #2
str r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_020ad3ea:
mov r0, #0
mvn r0, r0
str r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_020ad3f2:
mov r0, #0
mvn r0, r0
cmp r1, r0
bne _020ad40a
add r0, r4, #0
mov r1, #2
bl _ZN11ItemManager7HasItemEj
cmp r0, #0
beq _020ad40a
mov r0, #2
str r0, [r4]
_020ad40a:
pop {r3, r4, r5, r6, r7, pc}
asm/ov00/ItemManager/ItemManager_Save.inc
-181
View File
@@ -1,181 +0,0 @@
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
mov r0, #0x4a
add r4, r1, #0
lsl r0, r0, #2
add r3, r7, r0
add r2, r4, #0
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
add r0, r4, #0
ldrh r1, [r7, #0x22]
add r0, #0x8e
mov r2, #0
strh r1, [r0]
_020ad104:
add r0, r7, r2
add r0, #0xbc
ldrb r1, [r0]
add r0, r4, r2
add r0, #0x97
add r2, r2, #1
strb r1, [r0]
cmp r2, #2
blt _020ad104
add r0, r7, #0
add r0, #0xb0
ldr r0, [r0, #0]
ldrh r1, [r0, #8]
add r0, r4, #0
add r0, #0x93
strb r1, [r0, #0]
add r0, r7, #0
add r0, #0xb0
ldr r0, [r0, #0]
ldrh r1, [r0, #0xe]
add r0, r4, #0
add r0, #0x94
strb r1, [r0]
add r0, r7, #0
add r0, #0xb0
ldr r0, [r0, #0]
ldrh r1, [r0, #0xa]
add r0, r4, #0
add r0, #0x95
strb r1, [r0]
add r0, r4, #0
ldr r1, [r7, #0]
add r0, #0x96
strb r1, [r0]
mov r0, #0x4e
lsl r0, r0, #2
ldr r0, [r7, r0]
mov r1, #0x3c
str r0, [r4, #0x10]
ldr r0, [r7, #0xc]
bl FastDivide
add r1, r4, #0
add r1, #0x80
strh r0, [r1]
mov r2, #0
_020ad160:
add r0, r7, r2
add r0, #0x24
ldrb r1, [r0]
add r0, r4, r2
add r0, #0x99
add r2, r2, #1
strb r1, [r0]
cmp r2, #3
blt _020ad160
mov r0, #0
mov ip, r0
str r7, [sp]
add r3, r7, #0
add r5, r4, #0
mov r6, #0x48
_020ad17e:
ldr r0, [sp]
mov r2, #0
ldr r1, [r0, #0x28]
mov r0, ip
add r0, r4, r0
add r0, #0x24
strb r1, [r0]
_020ad18c:
add r0, r3, r2
ldrsb r1, [r0, r6]
add r0, r5, r2
add r0, #0x2c
add r2, r2, #1
strb r1, [r0]
cmp r2, #9
blt _020ad18c
ldr r0, [sp]
add r3, #9
add r0, r0, #4
str r0, [sp]
mov r0, ip
add r0, r0, #1
add r5, #9
mov ip, r0
cmp r0, #8
blt _020ad17e
mov r0, #0x4f
lsl r0, r0, #2
add r3, r7, r0
add r2, r4, #0
ldmia r3!, {r0, r1}
add r2, #0x14
stmia r2!, {r0, r1}
ldr r0, [r3, #0]
mov r3, #0
str r0, [r2]
mov r0, #0x90
_020ad1c6:
add r1, r7, r3
ldrsb r2, [r1, r0]
add r1, r4, r3
add r1, #0x74
add r3, r3, #1
strb r2, [r1]
cmp r3, #8
blt _020ad1c6
mov r0, #0x52
lsl r0, r0, #2
ldr r0, [r7, r0]
add r1, r7, #0
str r0, [r4, #0x20]
mov r0, #0
add r2, r4, #0
_020ad1e4:
add r3, r7, r0
add r3, #0x98
ldrb r5, [r3]
add r3, r4, r0
add r3, #0x9f
strb r5, [r3]
add r3, r1, #0
add r3, #0x9e
ldrh r5, [r3]
add r3, r2, #0
add r3, #0x82
add r0, r0, #1
strh r5, [r3]
add r1, r1, #2
add r2, r2, #2
cmp r0, #6
blt _020ad1e4
add r0, r7, #0
add r0, #0xb4
ldrh r1, [r0]
add r0, r4, #0
add r0, #0x9c
strb r1, [r0]
add r0, r7, #0
add r0, #0xb6
ldrh r1, [r0]
add r0, r4, #0
add r0, #0x9d
strb r1, [r0]
add r0, r7, #0
add r0, #0xb8
ldrh r1, [r0]
add r0, r4, #0
add r0, #0x9e
strb r1, [r0]
mov r0, #0
ldr r1, [r7, #0x10]
mvn r0, r0
cmp r1, r0
bne _020ad23c
mov r0, #3
add r4, #0xa5
strb r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_020ad23c:
add r4, #0xa5
strb r1, [r4]
pop {r3, r4, r5, r6, r7, pc}
asm/ov00/ItemManager/ItemManager_func_ov00_020ad790.inc
+1 -1
View File
@@ -57,7 +57,7 @@ _020ad840:
_020ad860:
ldr r1, [r6]
mov r0, r6
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
ldrne r4, [r6]
_020ad874:
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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov26_02173b7c
.extern func_ov00_020a5e9c
.extern func_ov00_020a5e9c
asm/ov00/include/ov00_020a03e4.inc
+3 -3
View File
@@ -541,7 +541,7 @@
.extern func_02019534
.extern data_ov00_020e9360
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_0207c5d4
.extern gItemManager
.extern data_027e0e58
@@ -864,7 +864,7 @@
.extern func_ov00_020af050
.extern data_027e0fb8
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020ba458
.extern gItemManager
.extern func_01ff9bf8
@@ -988,7 +988,7 @@
.extern func_ov00_020b7e6c
.extern func_ov00_020b7e6c
.extern func_ov05_021113c4
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern data_027e0e58
asm/ov00/include/ov00_020ae7a4.inc
+4 -4
View File
@@ -86,7 +86,7 @@
.extern func_ov00_02078b40
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern _ZN11ItemManager18func_ov00_020ad790Ej
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern data_027e0f74
.extern data_027e0c68
.extern data_027e0d38
@@ -148,7 +148,7 @@
.extern data_027e0e60
.extern func_ov00_020c3674
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020bad18
.extern func_01ff9ec0
.extern func_ov00_020c2a0c
@@ -169,7 +169,7 @@
.extern data_027e0fcc
.extern func_ov00_02078b40
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020baca8
.extern data_027e0d38
.extern gItemManager
@@ -180,7 +180,7 @@
.extern func_01ff9c2c
.extern func_01ff9e64
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020ba204
.extern data_027e0f64
.extern gItemManager
asm/ov00/include/ov00_020b4940.inc
+28 -28
View File
@@ -232,9 +232,9 @@
.extern func_ov00_020c45b0
.extern data_027e0fec
.extern func_ov00_020b1d3c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern gItemManager
.extern func_020193f0
.extern func_020193f0
@@ -244,9 +244,9 @@
.extern func_ov00_020a81dc
.extern func_ov00_020abd84
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern data_027e0618
.extern data_027e0f90
.extern data_027e0f64
@@ -319,25 +319,25 @@
.extern data_027e0fac
.extern func_0202af4c
.extern data_027e0fac
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager7HasItemEj
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern func_ov00_02097bbc
.extern func_020368f4
@@ -369,9 +369,9 @@
.extern func_ov00_02083ee0
.extern data_ov00_020e8b08
.extern data_027e0e60
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern func_ov00_02081f4c
.extern _ZN9SysObjectdlEPv
@@ -767,7 +767,7 @@
.extern data_027e0e58
.extern func_ov00_020d7cd4
.extern func_ov00_020d7a84
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_020197fc
.extern func_020197fc
.extern func_ov00_020b41c4
@@ -827,7 +827,7 @@
.extern _ZNK11ItemManager18_ZNK11ItemManager18func_ov00_020ad9e8EjEj
.extern gItemManager
.extern func_0202e58c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_01ffa9fc
.extern func_01ffa9fc
.extern func_01ff8230
asm/ov00/include/ov00_020c9a68.inc
+1 -1
View File
@@ -399,7 +399,7 @@
.extern data_027e077c
.extern data_02056be4
.extern data_027e103c
.extern _ZN11ItemManager7HasItemEj
.extern _ZNK11ItemManager7HasItemEj
.extern func_ov14_02152220
.extern gItemManager
.extern data_027e0618
asm/ov00/include/ov00_020d1870.inc
+10 -13
View File
@@ -12,10 +12,7 @@
.extern func_ov00_02087338
.extern func_ov00_02087ef0
.extern func_ov00_02087338
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern data_027e0fe4
.extern data_027e0f64
.extern gItemManager
@@ -49,12 +46,12 @@
.extern func_ov00_020bc320
.extern func_ov00_020bc398
.extern func_ov00_020c3674
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_02089a2c
.extern func_ov00_02089068
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020ba53c
.extern func_ov00_020ba4e4
.extern func_ov00_020bc2d4
@@ -246,16 +243,16 @@
.extern _ZN9SysObjectnwEmPjj
.extern data_027e0fe0
.extern func_0202bbbc
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020c3180
.extern gItemManager
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern func_ov00_0209a4f4
.extern func_ov00_02097810
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_0209a508
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern data_027e0f74
.extern gItemManager
.extern func_ov00_02097bcc
@@ -263,7 +260,7 @@
.extern data_027e0f74
.extern func_ov00_020bcf50
.extern data_027e0fc8
.extern _ZNK11ItemManager8GetFairyEj
.extern _ZNK11ItemManager8GetFairyEi
.extern gItemManager
.extern _ZN9SysObjectdlEPv
.extern func_ov00_020beba8
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 _ZN11ItemManager7HasItemEj
blx _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0207b6cc
ldrb r0, [r4, #0x12]
asm/ov00/ov00_020a03e4.s
+3 -3
View File
@@ -9498,7 +9498,7 @@ func_ov00_020a7b10: ; 0x020a7b10
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r5
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
ldrneb r1, [r6, #0x11]
strneb r1, [r0, #0x11a]
@@ -13722,7 +13722,7 @@ func_ov00_020aa818: ; 0x020aa818
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
bl func_ov00_020ba458
ldmia sp!, {r4, pc}
.align 2, 0
@@ -16262,7 +16262,7 @@ _020ac930:
ldr r0, _020ac9dc ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020ac9bc
ldr r0, _020ac9e0 ; =data_027e0f74
asm/ov00/ov00_020ae7a4.s
+4 -4
View File
@@ -868,7 +868,7 @@ _020af1f8:
ldr r0, _020af288 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
beq _020af268
ldr r1, _020af294 ; =data_027e0f94
@@ -1580,7 +1580,7 @@ func_ov00_020afb6c: ; 0x020afb6c
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r6
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r5, #0
ldreqb r1, [sb, #0x81]
cmpeq r1, #0
@@ -1885,7 +1885,7 @@ func_ov00_020aff90: ; 0x020aff90
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
mov r1, r6
@@ -2025,7 +2025,7 @@ func_ov00_020b014c: ; 0x020b014c
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r6
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
movs r6, r0
addeq sp, sp, #0x10
ldmeqia sp!, {r4, r5, r6, pc}
asm/ov00/ov00_020b4940.s
+28 -28
View File
@@ -4887,7 +4887,7 @@ func_ov00_020b8790: ; 0x020b8790
ldr r0, _020b87c4 ; =gItemManager
mov r1, #0x14
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r4, #3
_020b87f0:
@@ -5135,7 +5135,7 @@ _020b8a68:
beq _020b8ad4
ldr r0, [r4]
mov r1, r8
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r2, [r0, #8]
mov r1, r6
_020b8a94:
@@ -5181,7 +5181,7 @@ _020b8ae0:
ldr r0, _020b8b88 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldrb r0, [r0, #0x28e]
cmp r0, #0
beq _020b8b54
@@ -7170,13 +7170,13 @@ _020ba618:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba650
ldr r0, _020ba870 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x24c]
ldr r0, [r0, #0xc]
@@ -7185,13 +7185,13 @@ _020ba650:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba688
ldr r0, _020ba870 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x254]
ldr r0, [r0, #0xc]
@@ -7200,7 +7200,7 @@ _020ba688:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x25c]
ldr r1, [r0, #0xc]
@@ -7211,13 +7211,13 @@ _020ba6b0:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba6e8
ldr r0, _020ba870 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x24c]
ldr r0, [r0, #0xc]
@@ -7229,13 +7229,13 @@ _020ba6f0:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba728
ldr r0, _020ba870 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x254]
ldr r0, [r0, #0xc]
@@ -7247,13 +7247,13 @@ _020ba730:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba768
ldr r0, _020ba870 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x24c]
ldr r0, [r0, #0xc]
@@ -7262,7 +7262,7 @@ _020ba768:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x25c]
ldr r1, [r0, #0xc]
@@ -7273,13 +7273,13 @@ _020ba790:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba7c8
ldr r0, _020ba870 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x254]
ldr r0, [r0, #0xc]
@@ -7288,7 +7288,7 @@ _020ba7c8:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x25c]
ldr r1, [r0, #0xc]
@@ -7299,13 +7299,13 @@ _020ba7f0:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba828
ldr r0, _020ba870 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x24c]
ldr r0, [r0, #0xc]
@@ -7314,13 +7314,13 @@ _020ba828:
ldr r0, _020ba870 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ba860
ldr r0, _020ba870 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #8]
str r1, [r4, #0x254]
ldr r0, [r0, #0xc]
@@ -7931,7 +7931,7 @@ func_ov00_020bb0ac: ; 0x020bb0ac
_020bb0bc:
ldr r0, [r4]
mov r1, r6
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r6, r6, #1
strb r5, [r0, #0x290]
cmp r6, #3
@@ -7951,7 +7951,7 @@ func_ov00_020bb0e0: ; 0x020bb0e0
_020bb0f0:
ldr r0, [r4]
mov r1, r6
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r6, r6, #1
strb r5, [r0, #0x290]
cmp r6, #3
@@ -13866,7 +13866,7 @@ _020bf6d4:
ldr r0, _020bff38 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
asm/ov00/ov00_020d1870.s
+13 -13
View File
@@ -256,7 +256,7 @@ _020d1cdc:
ldr r0, _020d1da0 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r0, r0, #0x200
mov r1, #0
strh r1, [r0, #0x8a]
@@ -268,7 +268,7 @@ _020d1d08:
ldr r0, _020d1da0 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r0, r0, #0x200
mov r1, #1
strh r1, [r0, #0x8a]
@@ -280,7 +280,7 @@ _020d1d34:
ldr r0, _020d1da0 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r0, r0, #0x200
mov r1, #2
strh r1, [r0, #0x8a]
@@ -292,7 +292,7 @@ _020d1d60:
ldr r0, _020d1da0 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r0, r0, #0x200
mov r1, #3
strh r1, [r0, #0x8a]
@@ -879,7 +879,7 @@ _020d2560: ; jump table
_020d2588:
ldr r0, _020d27d8 ; =gItemManager
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r3, [r0]
mov r1, r4
ldr r3, [r3, #0x90]
@@ -894,7 +894,7 @@ _020d25bc:
ldr r0, _020d27d8 ; =gItemManager
sub r1, r2, #0x40
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r3, [r0]
mov r1, r4
ldr r3, [r3, #0x94]
@@ -911,7 +911,7 @@ _020d25f8:
ldr r0, _020d27d8 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r1, #1
strb r1, [r0, #0x28e]
add sp, sp, #8
@@ -960,7 +960,7 @@ _020d26ac:
ldr r0, _020d27d8 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r6, #4]
cmp r1, #0
beq _020d26d4
@@ -3121,7 +3121,7 @@ func_ov00_020d4058: ; 0x020d4058
bl func_ov00_020d4020
mov r1, r0
mov r0, r5
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r1, #0x10000
ldr r0, [r0, #0x23c]
rsb r1, r1, #0
@@ -3160,7 +3160,7 @@ func_ov00_020d40d8: ; 0x020d40d8
bl func_ov00_020d4020
mov r1, r0
mov r0, r5
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r4, #0x130]
cmp r1, #0
bne _020d4120
@@ -3217,7 +3217,7 @@ func_ov00_020d4134: ; 0x020d4134
bl func_ov00_020d4020
mov r1, r0
mov r0, r6
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r1, r4
ldr r4, [r0]
add r3, r5, #0x48
@@ -3239,7 +3239,7 @@ _020d41f4:
bl func_ov00_020d4020
mov r1, r0
mov r0, r5
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r5, [r0]
mov r1, r4
ldr r5, [r5, #0xbc]
@@ -3319,7 +3319,7 @@ func_ov00_020d42e4: ; 0x020d42e4
bl func_ov00_020d4020
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
add r0, r0, #0x224
ldmia sp!, {r4, pc}
.align 2, 0
asm/ov02.s
+28 -28
View File
@@ -286,7 +286,7 @@ _020ef0c0:
_020ef0d0:
ldr r0, [r6]
mov r1, r7
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef2c0
mov r2, #0x28
@@ -416,7 +416,7 @@ _020ef2c0:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x26
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef310
mov r2, #0x26
@@ -437,7 +437,7 @@ _020ef310:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x2b
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef360
mov r2, #0x27
@@ -620,7 +620,7 @@ _020ef5c8:
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef67c
ldr r0, _020ef998 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef6d0
mvn r3, #0
@@ -780,7 +780,7 @@ _020ef82c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef87c
mov r2, #0x1b
@@ -801,7 +801,7 @@ _020ef87c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #5
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef8cc
mov r2, #0x1d
@@ -822,7 +822,7 @@ _020ef8cc:
ldr r0, _020ef998 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef91c
mov r2, #0x22
@@ -843,7 +843,7 @@ _020ef91c:
ldr r0, _020ef998 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020ef96c
mov r2, #0x27
@@ -1376,7 +1376,7 @@ _020f0000:
ldr r0, _020f0720 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f01e4
mov r2, r4
@@ -1487,7 +1487,7 @@ _020f01e4:
ldr r0, _020f0720 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f035c
add r6, sp, #0x28
@@ -1583,7 +1583,7 @@ _020f035c:
ldr r0, _020f0720 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f03b8
add r6, sp, #0x28
@@ -1607,7 +1607,7 @@ _020f03b8:
ldr r0, _020f0720 ; =gItemManager
mov r1, #7
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f0414
add r6, sp, #0x28
@@ -1869,7 +1869,7 @@ _020f0774:
ldr r0, _020f08a8 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020f0aa0
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x1d
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f0aa8
_020f0aa0:
@@ -2101,13 +2101,13 @@ _020f0ab0:
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldmia sp!, {r3, pc}
_020f0ac4:
ldr r0, _020f0ae0 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
addeq sp, sp, #0x6c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
asm/ov03.s
+13 -13
View File
@@ -5781,7 +5781,7 @@ _020f23e8:
ldr r0, _020f2518 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
addeq sp, sp, #0x18
moveq r0, #1
@@ -16321,28 +16321,28 @@ _020f8fec: ; jump table
_020f8ffc:
ldr r0, [sl]
mov r1, #0x21
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020f9058
b _020f91c0
_020f9014:
ldr r0, [sl]
mov r1, #0x23
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020f9058
b _020f91c0
_020f902c:
ldr r0, [sl]
mov r1, #0x22
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020f9058
b _020f91c0
_020f9044:
ldr r0, [sl]
mov r1, #0x24
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f91c0
_020f9058:
@@ -16467,7 +16467,7 @@ _020f91f4: ; jump table
_020f9204:
ldr r0, [r4]
mov r1, #0x21
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f92c8
ldr r0, [sl]
@@ -16484,21 +16484,21 @@ _020f9204:
_020f9244:
ldr r0, [r4]
mov r1, #0x23
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020f9288
b _020f92c8
_020f925c:
ldr r0, [r4]
mov r1, #0x22
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _020f9288
b _020f92c8
_020f9274:
ldr r0, [r4]
mov r1, #0x24
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _020f92c8
_020f9288:
@@ -16890,22 +16890,22 @@ _020f97b4:
ldr r0, _020f9a74 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _020f9a74 ; =gItemManager
strb r0, [sp, #0x44]
ldr r0, [r1]
mov r1, #0x22
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _020f9a74 ; =gItemManager
strb r0, [sp, #0x45]
ldr r0, [r1]
mov r1, #0x23
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _020f9a74 ; =gItemManager
strb r0, [sp, #0x46]
ldr r0, [r1]
mov r1, #0x24
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
strb r0, [sp, #0x47]
ldr r0, [sp, #0x10]
mov r5, #4
asm/ov05.s
+12 -12
View File
@@ -4639,7 +4639,7 @@ _02104694:
beq _0210471c
ldr r0, [r6]
add r1, sb, #0x60
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0210471c
ldr r0, [r6]
@@ -4772,7 +4772,7 @@ _0210485c:
ldr r0, _02104a38 ; =gItemManager
mov r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _021048a8
mov r2, #0
@@ -4832,7 +4832,7 @@ _0210493c:
ldr r0, _02104a38 ; =gItemManager
mov r1, #0x16
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _02106874
ldr r0, [r6, #0x1c]
@@ -10295,21 +10295,21 @@ _02109420:
ldr r0, _02109524 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r4, r0
b _02109464
_02109438:
ldr r0, _02109524 ; =gItemManager
mov r1, #2
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r4, r0
b _02109464
_02109450:
ldr r0, _02109524 ; =gItemManager
mov r1, r4
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r4, r0
_02109464:
cmp r4, #0
@@ -10740,7 +10740,7 @@ func_ov05_021099dc: ; 0x021099dc
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldrsh r1, [r5, #0x80]
mov r4, r0
cmp r1, #4
@@ -12059,7 +12059,7 @@ _0210aba8:
ldr r0, _0210ad74 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, _0210ad74 ; =gItemManager
mov r4, r0
ldr r7, [r1]
@@ -12067,7 +12067,7 @@ _0210aba8:
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r7
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r5, r4
bne _0210ac7c
mov r0, #0x10000
@@ -12110,7 +12110,7 @@ _0210ac7c:
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, r5
mov r0, r6
beq _0210ad00
@@ -14073,7 +14073,7 @@ _0210c824:
ldr r2, [r7, #0x2c]
mov r1, #0
str r2, [sp, #0x14]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, _0210c950 ; =data_027e0e60
mov r4, r0
ldr r0, [r1]
asm/ov12.s
+1 -1
View File
@@ -8536,7 +8536,7 @@ _02119ac4:
ldr r0, _02119dc4 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r0, _02119dc8 ; =data_027e0fd4
ldr r4, [r0]
ldrb r0, [r4, #0x54]
asm/ov14.s
+14 -14
View File
@@ -26520,7 +26520,7 @@ _02134fd4:
blx r2
mov r1, r0
mov r0, r5
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
@@ -30529,7 +30529,7 @@ func_ov14_021383e0: ; 0x021383e0
ldr r0, _02138418 ; =gItemManager
add r1, r1, #0x15
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldmia sp!, {r3, pc}
_0213840c:
mov r1, #1
@@ -35316,7 +35316,7 @@ _0213c004:
ldr r0, _0213c0f4 ; =gItemManager
mov r1, sb
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0213c34c
ldr r1, [r7, #0x18]
@@ -40178,7 +40178,7 @@ _0213f874:
str r1, [r5, #0x70]
ldr r0, [r0]
mov r1, #0x20
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
mov r7, #0
ldr r1, _021415bc ; =gItemManager
mov r6, r0
ldr r0, [r1]
mov r1, r7
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 ; =_ZN11ItemManager7HasItemEj
ldr ip, _0214a400 ; =_ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
_0214a400: .word _ZNK11ItemManager7HasItemEj
.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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0214a480
ldr r0, _0214a4b4 ; =0x00003555
@@ -63347,7 +63347,7 @@ _021519d0:
bne _021519ec
ldr r0, [r4]
mov r1, r6
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r4, #1
_02153964:
asm/ov15.s
+29 -29
View File
@@ -2296,22 +2296,22 @@ _02121550:
ldr r0, _021216f8 ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _021216f8 ; =gItemManager
str r0, [sp, #0x10]
ldr r0, [r1]
mov r1, #0x23
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _021216f8 ; =gItemManager
mov fp, r0
ldr r0, [r1]
mov r1, #0x22
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _021216f8 ; =gItemManager
mov sl, r0
ldr r0, [r1]
mov r1, #0x24
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldmia sp!, {r4, pc}
_02129728:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x22
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldmia sp!, {r4, pc}
_0212973c:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x23
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldmia sp!, {r4, pc}
_02129750:
ldr r0, _02129770 ; =gItemManager
mov r1, #0x24
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _0214bb88 ; =gItemManager
mov r7, r0
ldr r0, [r1]
mov r1, #0
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
mov r7, r0
ldr r0, _0216e694 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0216e5a4
cmp r7, #0
@@ -110851,7 +110851,7 @@ _0217dfa8:
bne _0217dfc4
ldr r0, [r4]
mov r1, r6
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0217dfe0
_0217dfc4:
@@ -110931,7 +110931,7 @@ _0217e0ac:
ldr r0, _0217e1c4 ; =gItemManager
mov r1, #0x2c
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r7, #4
beq _0217e228
@@ -111055,7 +111055,7 @@ _0217e260:
mov r1, #0x28
ldr r0, [r0]
mvn r7, #0
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r7, #4
beq _0217e28c
@@ -111082,7 +111082,7 @@ _0217e2c4:
mov r1, #0x2e
ldr r0, [r0]
mvn r7, #0
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r7, #4
beq _0217e2f0
@@ -111200,7 +111200,7 @@ _0217e42c:
ldr r0, _0217e4c0 ; =gItemManager
mov r1, #0x2e
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r5, #0
_0217e460:
@@ -112435,28 +112435,28 @@ _0217f564:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x21
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f57c:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x22
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f594:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x23
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217f5ac:
ldr r0, _0217f5fc ; =gItemManager
mov r1, #0x24
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 ; =_ZN11ItemManager7HasItemEj
ldr ip, _0216d854 ; =_ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
_0216d854: .word _ZNK11ItemManager7HasItemEj
.global func_ov21_0216d858
arm_func_start func_ov21_0216d858
asm/ov26.s
+5 -5
View File
@@ -1420,7 +1420,7 @@ func_ov26_0216e5b4: ; 0x0216e5b4
ldr r0, _0216e628 ; =gItemManager
mov r1, #0x20
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
blx _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r0, #5
moveq r0, #0xc
asm/ov28.s
+2 -2
View File
@@ -6677,7 +6677,7 @@ _02172c54:
ldmeqia sp!, {r4, r5, pc}
ldr r0, _02172f10 ; =gItemManager
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
beq _02172ee4
add r1, r5, #0x100
@@ -11391,7 +11391,7 @@ func_ov28_021768dc: ; 0x021768dc
ldr r0, _021769e4 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0218146c
mov r2, #2
asm/ov31.s
+7 -7
View File
@@ -1115,7 +1115,7 @@ _0217cbd8:
ldr r0, _0217cd00 ; =gItemManager
mov r1, #4
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
bne _0217cc80
ldr r1, _0217cd0c ; =0x00140055
@@ -1592,21 +1592,21 @@ _0217d1a4:
_0217d1b4:
ldr r0, [fp]
mov r1, #4
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1cc:
ldr r0, [fp]
mov r1, #5
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1e4:
ldr r0, [fp]
mov r1, #7
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r8, r4
b _0217d25c
@@ -6459,7 +6459,7 @@ _02180930:
ldr r0, _0218095c ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
movne r0, #0x10
moveq r0, #0xe
asm/ov40.s
+3 -3
View File
@@ -388,7 +388,7 @@ func_ov40_0217c2b8: ; 0x0217c2b8
ldr r0, _0217c470 ; =gItemManager
mov r1, #1
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
moveq r0, #0
streqb r0, [r6, #0x1c4]
@@ -10151,12 +10151,12 @@ _02183ba8:
ldr r0, _02183d04 ; =gItemManager
mov r1, #0x25
ldr r0, [r0]
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
ldr r1, _02183d04 ; =gItemManager
mov r6, r0
ldr r0, [r1]
mov r1, #0
bl _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0218ba48
ldr r0, _0218be10 ; =data_027e0f74
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 _ZN11ItemManager7HasItemEj
bl _ZNK11ItemManager7HasItemEj
cmp r0, #0
beq _0219605c
ldr r0, _021960f0 ; =gItemManager
asm/ov54.s
+1 -1
View File
@@ -396,7 +396,7 @@ _021991a8:
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r4
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
beq _0219920c
bl func_ov00_020ba3b4
asm/ov59.s
+4 -4
View File
@@ -23,7 +23,7 @@ func_ov59_02198d00: ; 0x02198d00
ldr r0, _02198e1c ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
beq _02198d5c
ldr r0, [r0, #0x3b8]
@@ -339,7 +339,7 @@ _021990c4:
mov r5, r0
ldr r0, [r1]
mov r1, #0
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
mov r4, r0
mov r0, r6
bl func_ov00_020a8db8
@@ -509,7 +509,7 @@ func_ov59_0219931c: ; 0x0219931c
ldr r0, _02199338 ; =gItemManager
mov r1, #0
ldr r0, [r0]
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
bl func_ov00_020b853c
ldmia sp!, {r3, pc}
.align 2, 0
@@ -2482,7 +2482,7 @@ func_ov59_0219b020: ; 0x0219b020
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r1, r0
mov r0, r5
bl _ZNK11ItemManager8GetFairyEj
bl _ZNK11ItemManager8GetFairyEi
ldr r1, [r0, #0x48]
str r1, [r4, #0x48]
ldr r1, [r0, #0x4c]
include/ItemManager.hpp
+6 -11
View File
@@ -22,7 +22,7 @@
#define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
typedef u32 FairyId;
typedef s32 FairyId;
enum FairyId_ {
FairyId_None = -1,
FairyId_Courage = 0,
@@ -104,11 +104,6 @@ struct ShipPartPricesShown {
/* c */
};
struct ShipParts {
/* 0 */ u8 parts[ShipType_COUNT];
/* 9 */
};
struct UnkStruct_027e0d38 {
/* 00 */ unk8 mUnk_00;
/* 01 */ unk8 mUnk_01[3]; // padding?
@@ -166,7 +161,7 @@ struct SaveItemManager {
/* 14 */ ShipPartPricesShown shipPartPricesShown;
/* 20 */ u32 treasurePriceShownFlags[CEIL_DIV(Treasure_COUNT, 32)];
/* 24 */ u8 equippedShipParts[ShipPart_COUNT];
/* 2c */ ShipParts shipParts[ShipPart_COUNT];
/* 2c */ s8 shipParts[ShipPart_COUNT][ShipType_COUNT];
/* 74 */ s8 treasure[Treasure_COUNT];
/* 7c */ unk8 unk_7c[4];
/* 80 */ u16 hourglassSeconds;
@@ -178,7 +173,7 @@ struct SaveItemManager {
/* 93 */ u8 numBombs;
/* 94 */ u8 numBombchus;
/* 95 */ u8 numArrows;
/* 96 */ u8 equippedItem;
/* 96 */ s8 equippedItem;
/* 97 */ Potion potions[NUM_POTIONS];
/* 99 */ u8 numGems[Gem_COUNT];
/* 9c */ u8 quiverSize;
@@ -202,7 +197,7 @@ private:
/* 024 */ u8 mNumGems[Gem_COUNT];
/* 027 */ unk8 mUnk_027; // padding?
/* 028 */ ShipType mEquippedShipParts[ShipPart_COUNT];
/* 048 */ ShipParts mShipParts[ShipPart_COUNT];
/* 048 */ s8 mShipParts[ShipPart_COUNT][ShipType_COUNT];
/* 090 */ s8 mTreasure[Treasure_COUNT];
/* 098 */ u8 mUnk_098[6]; // max 99
/* 09e */ u16 mUnk_09e[6]; // max 9999, corresponds with mUnk_098
@@ -283,8 +278,8 @@ public:
// Ship
ShipType GetEquippedShipPart(ShipPart part) const;
void EquipShipPart(ShipPart part, ShipType type);
u8 GetShipPartCount(ShipPart part, ShipType type) const;
void SetShipPartCount(ShipPart part, ShipType type, u8 count);
s8 GetShipPartCount(ShipPart part, ShipType type) const;
void SetShipPartCount(ShipPart part, ShipType type, s8 count);
bool HasShipPartPriceShown(u32 index) const;
bool HasShipPartPriceShown(ShipPart part, ShipType type) const;
void AddShipPartPriceShown(u32 index);
src/ItemManager.cpp
+8 -40
View File
@@ -16,10 +16,7 @@ THUMB void ItemManager::ClearPrevEquippedItem() {
this->mPrevEquippedItem = ItemFlag_None;
}
THUMB NONMATCH void ItemManager::Save(SaveItemManager *save) {
#ifndef NONMATCHING
#include "../asm/ov00/ItemManager/ItemManager_Save.inc"
#else
THUMB void ItemManager::Save(SaveItemManager *save) {
save->itemFlags = this->mItemFlags;
save->numRupees = this->mNumRupees;
for (s32 i = 0; i < NUM_POTIONS; ++i) {
@@ -34,23 +31,12 @@ THUMB NONMATCH void ItemManager::Save(SaveItemManager *save) {
for (s32 i = 0; i < Gem_COUNT; ++i) {
save->numGems[i] = this->mNumGems[i];
}
u8 *saveEquippedParts = save->equippedShipParts;
const u32 *equippedParts = this->mEquippedShipParts;
s32 i = 0;
SaveItemManager *save2 = save;
ItemManager *this2 = this;
ShipParts (ItemManager::*shipParts)[ShipPart_COUNT] = &ItemManager::mShipParts;
for (; i < ShipPart_COUNT; ++i) {
for (s32 i = 0; i < ShipPart_COUNT; ++i) {
save->equippedShipParts[i] = this->mEquippedShipParts[i];
for (s32 j = 0; j < ShipType_COUNT; ++j) {
u8 shipPartCount = ((ItemManager*) ((u32)this2 + j)->*shipParts)[0].parts[0];
((SaveItemManager*) ((u32)save2 + j))->shipParts[0].parts[0] = shipPartCount;
save->shipParts[i][j] = this->mShipParts[i][j];
}
this2 = (ItemManager*) ((u32)this2 + sizeof(this2->mShipParts[0]));
save2 = (SaveItemManager*) ((u32)save2 + sizeof(save2->shipParts[0]));
}
save->shipPartPricesShown = this->mShipPartPricesShown;
for (s32 i = 0; i < Treasure_COUNT; ++i) {
save->treasure[i] = this->mTreasure[i];
@@ -68,14 +54,9 @@ THUMB NONMATCH void ItemManager::Save(SaveItemManager *save) {
return;
}
save->equippedFairy = (u8) this->mEquippedFairy;
#endif
}
extern "C" bool _ZN11ItemManager7HasItemEj();
THUMB NONMATCH void ItemManager::Load(const SaveItemManager *save) {
#ifndef NONMATCHING
#include "../asm/ov00/ItemManager/ItemManager_Load.inc"
#else
THUMB void ItemManager::Load(const SaveItemManager *save) {
this->mItemFlags = save->itemFlags;
this->mNumRupees = save->numRupees;
this->mHourglassSandFrames = save->hourglassSeconds <= MAX_HOURGLASS_SECONDS
@@ -97,25 +78,12 @@ THUMB NONMATCH void ItemManager::Load(const SaveItemManager *save) {
for (s32 i = 0; i < Gem_COUNT; ++i) {
this->mNumGems[i] = save->numGems[i];
}
s32 i = 0; // ip (r0)
ItemManager *this2 = this; // sp+0
const SaveItemManager *save2 = save; // r3
ItemManager *this3 = this; // r5
ShipParts (SaveItemManager::*shipParts)[ShipPart_COUNT] = &SaveItemManager::shipParts; // r7
do {
this2->mEquippedShipParts[0] = save->equippedShipParts[i];
for (s32 i = 0; i < ShipPart_COUNT; ++i) {
this->mEquippedShipParts[i] = save->equippedShipParts[i];
for (s32 j = 0; j < ShipType_COUNT; ++j) {
u8 partCount = (((const SaveItemManager*) ((u32)save2 + j))->*shipParts)[0].parts[0];
((ItemManager*) ((u32)this3 + j))->mShipParts[0].parts[0] = partCount;
this->mShipParts[i][j] = save->shipParts[i][j];
}
save2 = (const SaveItemManager*) ((u32)save2 + sizeof(save->shipParts[0]));
this2 = (ItemManager*) ((u32)this2 + sizeof(this->mEquippedShipParts[0]));
++i;
this3 = (ItemManager*) ((u32)this3 + sizeof(this->mShipParts[0]));
}
while(i < ShipPart_COUNT);
this->mShipPartPricesShown = save->shipPartPricesShown;
for (s32 i = 0; i < Treasure_COUNT; ++i) {
this->mTreasure[i] = save->treasure[i];
@@ -143,7 +111,6 @@ THUMB NONMATCH void ItemManager::Load(const SaveItemManager *save) {
this->mEquippedItem = ItemFlag_Boomerang;
}
}
#endif
}
ARM FairyId ItemManager::GetEquippedFairy() const {
@@ -272,6 +239,7 @@ 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();
ARM NONMATCH bool ItemManager::func_ov00_020ad790(unk32 param1) {
#ifndef NONMATCHING