diff --git a/asm/dtcm.s b/asm/dtcm.s index a0c6f7b4..d17ecb82 100644 --- a/asm/dtcm.s +++ b/asm/dtcm.s @@ -3995,8 +3995,8 @@ data_027e0fac: .global data_027e0fb0 data_027e0fb0: .space 0x4 - .global gInventory -gInventory: + .global gItemManager +gItemManager: .space 0x4 .global data_027e0fb8 data_027e0fb8: diff --git a/asm/global.inc b/asm/global.inc index 576db420..401766cc 100644 --- a/asm/global.inc +++ b/asm/global.inc @@ -48965,7 +48965,7 @@ .extern data_027e0fa8 .extern data_027e0fac .extern data_027e0fb0 -.extern gInventory +.extern gItemManager .extern data_027e0fb8 .extern data_027e0fbc .extern data_027e0fc0 @@ -264281,12 +264281,12 @@ .extern func_ov00_020ad064 .extern func_ov00_020ad068 .extern func_ov00_020ad08a -.extern _ZN9Inventory6CreateEv +.extern _ZN11ItemManager6CreateEv .extern func_ov00_020ad0a8 -.extern _ZN9Inventory7DestroyEv +.extern _ZN11ItemManager7DestroyEv .extern func_ov00_020ad0ce -.extern _ZN9Inventory21ClearPrevEquippedItemEv -.extern _ZN9Inventory4SaveEP13SaveInventory +.extern _ZN11ItemManager21ClearPrevEquippedItemEv +.extern _ZN11ItemManager4SaveEP15SaveItemManager .extern func_ov00_020ad104 .extern func_ov00_020ad160 .extern func_ov00_020ad17e @@ -264294,7 +264294,7 @@ .extern func_ov00_020ad1c6 .extern func_ov00_020ad1e4 .extern func_ov00_020ad23c -.extern _ZN9Inventory4LoadEPK13SaveInventory +.extern _ZN11ItemManager4LoadEPK15SaveItemManager .extern func_ov00_020ad274 .extern func_ov00_020ad276 .extern func_ov00_020ad282 @@ -264309,9 +264309,9 @@ .extern func_ov00_020ad3ea .extern func_ov00_020ad3f2 .extern func_ov00_020ad40a -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory13TickEquipItemEv +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZN11ItemManager13TickEquipItemEv .extern func_ov00_020ad4b4 .extern func_ov00_020ad528 .extern func_ov00_020ad52c @@ -264364,7 +264364,7 @@ .extern func_ov00_020ad9e8 .extern func_ov00_020ada24 .extern func_ov00_020ada48 -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_ov00_020ada98 .extern func_ov00_020adabc .extern func_ov00_020adadc @@ -264480,7 +264480,7 @@ .extern func_ov00_020ae368 .extern func_ov00_020ae37c .extern func_ov00_020ae382 -.extern _ZNK9Inventory15GetEquippedItemEv +.extern _ZNK11ItemManager15GetEquippedItemEv .extern func_ov00_020ae3a8 .extern func_ov00_020ae3c0 .extern func_ov00_020ae3d0 @@ -271981,7 +271981,7 @@ .extern func_ov04_021071ba .extern func_ov04_021071bc .extern func_ov04_021071ca -.extern _ZN9InventoryC1Ev +.extern _ZN11ItemManagerC1Ev .extern func_ov04_021072b6 .extern func_ov04_021072c0 .extern func_ov04_021072c4 @@ -272001,7 +272001,7 @@ .extern func_ov04_0210749e .extern func_ov04_021074a6 .extern func_ov04_021074ac -.extern _ZN9InventoryD1Ev +.extern _ZN11ItemManagerD1Ev .extern func_ov04_02107504 .extern func_ov04_0210751c .extern func_ov04_02107538 diff --git a/asm/itcm.s b/asm/itcm.s index 04a6ec85..74e30caa 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -9139,14 +9139,14 @@ _01fffce8: .word data_027e0fdc .global func_01fffcec arm_func_start func_01fffcec func_01fffcec: ; 0x01fffcec - ldr r1, _01fffd00 ; =gInventory + ldr r1, _01fffd00 ; =gItemManager ldr r1, [r1] ldr r1, [r1, #0xac] ldr r0, [r1, r0, lsl #2] bx lr .align 2, 0 arm_func_end func_01fffcec -_01fffd00: .word gInventory +_01fffd00: .word gItemManager .global func_01fffd04 arm_func_start func_01fffd04 diff --git a/asm/main.s b/asm/main.s index f43d3e2d..6ebb66ea 100644 --- a/asm/main.s +++ b/asm/main.s @@ -75863,10 +75863,10 @@ _02037d38: ldmia sp!, {r4, r5, r6, pc} _02037d64: ldrh r1, [r4, #4] - ldr r0, _02037f50 ; =gInventory + ldr r0, _02037f50 ; =gItemManager ldr r0, [r0] add r1, r1, #0x60 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #0 moveq r0, #1 @@ -75939,7 +75939,7 @@ _02037e78: mov r0, r0, asr #0x18 ldmia sp!, {r4, r5, r6, pc} _02037e84: - ldr r0, _02037f50 ; =gInventory + ldr r0, _02037f50 ; =gItemManager ldrh r1, [r4, #4] ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -75950,10 +75950,10 @@ _02037e84: mov r0, r0, asr #0x18 ldmia sp!, {r4, r5, r6, pc} _02037eac: - ldr r0, _02037f50 ; =gInventory + ldr r0, _02037f50 ; =gItemManager ldrh r1, [r4, #4] ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #0 moveq r0, #1 @@ -75995,7 +75995,7 @@ _02037f40: .word data_027e0c68 _02037f44: .word data_027e0764 _02037f48: .word data_027e0f74 _02037f4c: .word data_027e0cb4 -_02037f50: .word gInventory +_02037f50: .word gItemManager _02037f54: .word data_027e0fe4 .global func_02037f58 @@ -76223,7 +76223,7 @@ _02038250: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _0203826c: - ldr r0, _02038590 ; =gInventory + ldr r0, _02038590 ; =gItemManager ldr r1, [r4, #4] ldr r0, [r0] mov r2, #1 @@ -76298,7 +76298,7 @@ _02038368: _02038374: ldrh r2, [r4, #4] mov r0, #0xe10 - ldr r1, _02038590 ; =gInventory + ldr r1, _02038590 ; =gItemManager mul r3, r2, r0 ldrh r2, [r4, #6] mov r0, #0x3c @@ -76320,7 +76320,7 @@ _020383c0: ldrh r0, [r4, #4] cmp r0, #0 bne _020383dc - ldr r0, _02038590 ; =gInventory + ldr r0, _02038590 ; =gItemManager ldrsh r1, [r4, #6] ldr r0, [r0] blx func_ov00_020ae368 @@ -76329,7 +76329,7 @@ _020383dc: mov r0, #2 ldmia sp!, {r3, r4, r5, pc} _020383e8: - ldr r0, _02038590 ; =gInventory + ldr r0, _02038590 ; =gItemManager ldr r1, [r4, #4] ldr r0, [r0] blx func_ov00_020ada98 @@ -76449,7 +76449,7 @@ _02038580: .word 0x00007fff _02038584: .word data_027e0cb4 _02038588: .word data_ov12_02137c64 _0203858c: .word data_027e0618 -_02038590: .word gInventory +_02038590: .word gItemManager _02038594: .word data_027e0db0 _02038598: .word data_027e0c68 _0203859c: .word data_027e0e60 diff --git a/asm/ov00/inventory/inventory.s b/asm/ov00/ItemManager/ItemManager.s similarity index 98% rename from asm/ov00/inventory/inventory.s rename to asm/ov00/ItemManager/ItemManager.s index f6787dfd..bd4b348f 100644 --- a/asm/ov00/inventory/inventory.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -118,7 +118,7 @@ _020ad620: cmp r0, #1 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 - bl _ZNK9Inventory15GetEquippedItemEv + bl _ZNK11ItemManager15GetEquippedItemEv mvn r1, #0 cmp r0, r1 ldmeqia sp!, {r3, r4, r5, pc} @@ -295,7 +295,7 @@ _020ad840: _020ad860: ldr r1, [r6] mov r0, r6 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 ldrne r4, [r6] _020ad874: @@ -544,7 +544,7 @@ func_ov00_020ad9e8: ; 0x020ad9e8 mov r4, r1 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv cmp r0, #0 bne _020ada24 ldrb r0, [r5, #0x14d] @@ -553,7 +553,7 @@ func_ov00_020ad9e8: ; 0x020ad9e8 ldmneia sp!, {r3, r4, r5, pc} _020ada24: mov r0, r5 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv cmp r4, r0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -570,19 +570,19 @@ func_ov00_020ada48: ; 0x020ada48 mov r4, r1 add r1, r4, #0x1a mov r5, r0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #2 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 add r1, r4, #0x17 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov00_020ada48 - .global _ZN9Inventory7HasItemEj - arm_func_start _ZN9Inventory7HasItemEj -_ZN9Inventory7HasItemEj: ; 0x020ada78 + .global _ZN11ItemManager7HasItemEj + arm_func_start _ZN11ItemManager7HasItemEj +_ZN11ItemManager7HasItemEj: ; 0x020ada78 mov r2, r1, lsr #0x5 add r0, r0, r2, lsl #2 ldr r2, [r0, #0x128] @@ -591,7 +591,7 @@ _ZN9Inventory7HasItemEj: ; 0x020ada78 tst r2, r0, lsl r1 moveq r0, #0 bx lr - arm_func_end _ZN9Inventory7HasItemEj + arm_func_end _ZN11ItemManager7HasItemEj .global func_ov00_020ada98 thumb_func_start func_ov00_020ada98 @@ -1826,16 +1826,16 @@ _020ae382: thumb_func_end func_ov00_020ae368 _020ae38c: .word data_027e0e60 - .global _ZNK9Inventory15GetEquippedItemEv - arm_func_start _ZNK9Inventory15GetEquippedItemEv -_ZNK9Inventory15GetEquippedItemEv: ; 0x020ae390 + .global _ZNK11ItemManager15GetEquippedItemEv + arm_func_start _ZNK11ItemManager15GetEquippedItemEv +_ZNK11ItemManager15GetEquippedItemEv: ; 0x020ae390 ldr r2, [r0, #8] mvn r1, #0 cmp r2, r1 ldreq r2, [r0] mov r0, r2 bx lr - arm_func_end _ZNK9Inventory15GetEquippedItemEv + arm_func_end _ZNK11ItemManager15GetEquippedItemEv .global func_ov00_020ae3a8 arm_func_start func_ov00_020ae3a8 @@ -2160,7 +2160,7 @@ _020ae644: .word data_027e0f78 thumb_func_start func_ov00_020ae648 func_ov00_020ae648: ; 0x020ae648 push {r3, lr} - ldr r1, _020ae6e8 ; =gInventory + ldr r1, _020ae6e8 ; =gItemManager ldr r2, [r1] mov r1, #0x53 lsl r1, r1, #2 @@ -2256,7 +2256,7 @@ _020ae6de: pop {r3, pc} nop thumb_func_end func_ov00_020ae648 -_020ae6e8: .word gInventory +_020ae6e8: .word gItemManager _020ae6ec: .word data_ov00_020eec68 .global func_ov00_020ae6f0 diff --git a/asm/ov00/inventory/Inventory_Load.inc b/asm/ov00/ItemManager/ItemManager_Load.inc similarity index 98% rename from asm/ov00/inventory/Inventory_Load.inc rename to asm/ov00/ItemManager/ItemManager_Load.inc index e9e72fa5..21f8ff52 100644 --- a/asm/ov00/inventory/Inventory_Load.inc +++ b/asm/ov00/ItemManager/ItemManager_Load.inc @@ -213,7 +213,7 @@ _020ad3ce: bhi _020ad3f2 add r0, r4, #0 mov r1, #2 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ad3ea mov r0, #2 @@ -231,7 +231,7 @@ _020ad3f2: bne _020ad40a add r0, r4, #0 mov r1, #2 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ad40a mov r0, #2 diff --git a/asm/ov00/inventory/Inventory_Save.inc b/asm/ov00/ItemManager/ItemManager_Save.inc similarity index 100% rename from asm/ov00/inventory/Inventory_Save.inc rename to asm/ov00/ItemManager/ItemManager_Save.inc diff --git a/asm/ov00/inventory/Inventory_TickEquipItem.inc b/asm/ov00/ItemManager/ItemManager_TickEquipItem.inc similarity index 96% rename from asm/ov00/inventory/Inventory_TickEquipItem.inc rename to asm/ov00/ItemManager/ItemManager_TickEquipItem.inc index 672b205b..19b353ff 100644 --- a/asm/ov00/inventory/Inventory_TickEquipItem.inc +++ b/asm/ov00/ItemManager/ItemManager_TickEquipItem.inc @@ -1,7 +1,7 @@ func_ov00_020ad434: // 0x020ad434 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl _ZNK9Inventory15GetEquippedItemEv + bl _ZNK11ItemManager15GetEquippedItemEv ldrh r1, [r5, #0x20] mov r4, r0 cmp r1, #0 diff --git a/asm/ov00/include/ov00_02079d28.inc b/asm/ov00/include/ov00_02079d28.inc index 57b9bcab..4fe53730 100644 --- a/asm/ov00/include/ov00_02079d28.inc +++ b/asm/ov00/include/ov00_02079d28.inc @@ -171,7 +171,7 @@ .extern func_ov00_020a5e9c .extern func_ov00_020a5e9c .extern func_ov00_0209d738 -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_ov26_02173b7c .extern func_ov00_020a5e9c .extern func_ov00_020a5e9c @@ -189,7 +189,7 @@ .extern data_027e0f94 .extern data_027e0fac .extern data_027e0f7c -.extern gInventory +.extern gItemManager .extern data_ov09_0211f5dc .extern func_ov05_021010b0 .extern func_ov05_021010ec diff --git a/asm/ov00/include/ov00_0209bea0.inc b/asm/ov00/include/ov00_0209bea0.inc index 9a1b4ef5..27ee8eb9 100644 --- a/asm/ov00/include/ov00_0209bea0.inc +++ b/asm/ov00/include/ov00_0209bea0.inc @@ -51,7 +51,7 @@ .extern func_ov00_020c46cc .extern func_ov00_020c474c .extern func_0201842c -.extern gInventory +.extern gItemManager .extern data_027e0fec .extern data_027e0e60 .extern data_027e0f68 diff --git a/asm/ov00/include/ov00_020a03e4.inc b/asm/ov00/include/ov00_020a03e4.inc index a6ea4370..9ff1843d 100644 --- a/asm/ov00/include/ov00_020a03e4.inc +++ b/asm/ov00/include/ov00_020a03e4.inc @@ -540,10 +540,10 @@ .extern func_ov00_02079e68 .extern func_02019534 .extern data_ov00_020e9360 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_0207c5d4 -.extern gInventory +.extern gItemManager .extern data_027e0e58 .extern func_01fffcec .extern func_01fffcec @@ -554,10 +554,10 @@ .extern data_027e0c54 .extern func_01ffec34 .extern func_ov00_0208f030 -.extern gInventory +.extern gItemManager .extern func_ov00_020ad678 .extern func_ov00_020ad6f8 -.extern gInventory +.extern gItemManager .extern func_ov00_02083624 .extern data_027e0e60 .extern func_ov00_02083ee0 @@ -588,8 +588,8 @@ .extern func_ov00_020bb544 .extern func_ov00_020bb594 .extern func_ov00_020ad714 -.extern gInventory -.extern gInventory +.extern gItemManager +.extern gItemManager .extern func_ov00_020ae418 .extern func_ov05_02106980 .extern func_01fffcd8 @@ -672,8 +672,8 @@ .extern func_ov00_020c3674 .extern func_ov00_020bc71c .extern func_ov00_020ad714 -.extern gInventory -.extern gInventory +.extern gItemManager +.extern gItemManager .extern func_ov00_020ad714 .extern data_027e0fd4 .extern data_027e0fcc @@ -863,10 +863,10 @@ .extern data_027e0fe4 .extern func_ov00_020af050 .extern data_027e0fb8 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_020ba458 -.extern gInventory +.extern gItemManager .extern func_01ff9bf8 .extern func_ov00_020c2a0c .extern data_02050f54 @@ -898,7 +898,7 @@ .extern func_ov05_021113b4 .extern func_ov00_020c1908 .extern func_ov00_020af050 -.extern gInventory +.extern gItemManager .extern data_027e0d0c .extern data_02050f54 .extern data_027e0fb8 @@ -988,13 +988,13 @@ .extern func_ov00_020b7e6c .extern func_ov00_020b7e6c .extern func_ov05_021113c4 -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_ov00_02097760 .extern func_ov00_0209779c .extern data_027e0e58 .extern data_ov00_020eec9c .extern data_027e0618 -.extern gInventory +.extern gItemManager .extern data_027e0f74 .extern func_ov05_02110f50 .extern func_ov05_0210f7b8 @@ -1017,8 +1017,8 @@ .extern func_0202d95c .extern func_01ff9bc4 .extern data_027e0618 -.extern gInventory +.extern gItemManager .extern func_01ffa0f4 .extern func_ov00_020ae5d0 .extern data_027e0618 -.extern gInventory +.extern gItemManager diff --git a/asm/ov00/include/ov00_020ae7a4.inc b/asm/ov00/include/ov00_020ae7a4.inc index 662ef173..1ca220e1 100644 --- a/asm/ov00/include/ov00_020ae7a4.inc +++ b/asm/ov00/include/ov00_020ae7a4.inc @@ -86,11 +86,11 @@ .extern func_ov00_02078b40 .extern func_ov00_020ad790 .extern func_ov00_020ad790 -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern data_027e0f74 .extern data_027e0c68 .extern data_027e0d38 -.extern gInventory +.extern gItemManager .extern data_027e05f8 .extern data_027e103c .extern data_027e0f94 @@ -137,7 +137,7 @@ .extern func_ov00_020c3484 .extern data_027e0f74 .extern data_027e0f90 -.extern gInventory +.extern gItemManager .extern data_027e0fc8 .extern data_027e0fe4 .extern data_027e0e60 @@ -147,8 +147,8 @@ .extern data_027e0f90 .extern data_027e0e60 .extern func_ov00_020c3674 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_020bad18 .extern func_01ff9ec0 .extern func_ov00_020c2a0c @@ -160,7 +160,7 @@ .extern func_ov00_020ced7c .extern func_01ff9ec0 .extern data_027e0fe4 -.extern gInventory +.extern gItemManager .extern data_027e0f94 .extern data_027e0fc8 .extern data_027e0ffc @@ -168,22 +168,22 @@ .extern data_027e0fcc .extern data_027e0fcc .extern func_ov00_02078b40 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_020baca8 .extern data_027e0d38 -.extern gInventory +.extern gItemManager .extern func_01ff9e64 .extern func_01ff9cec .extern func_01ff9cec .extern func_01ff991c .extern func_01ff9c2c .extern func_01ff9e64 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_020ba204 .extern data_027e0f64 -.extern gInventory +.extern gItemManager .extern data_027e0d0c .extern func_ov00_020a5e9c .extern func_ov24_02178348 @@ -217,13 +217,13 @@ .extern data_027e0f64 .extern data_02050f54 .extern func_ov00_020ad790 -.extern _ZNK9Inventory15GetEquippedItemEv +.extern _ZNK11ItemManager15GetEquippedItemEv .extern func_ov00_020cf330 .extern func_01ff9cec .extern func_01ffa0f4 .extern func_01ffa0f4 .extern func_01ff9bf8 -.extern gInventory +.extern gItemManager .extern data_027e103c .extern func_ov00_020b7d4c .extern func_01ff9cec diff --git a/asm/ov00/include/ov00_020b4940.inc b/asm/ov00/include/ov00_020b4940.inc index bbba581f..1dd7a572 100644 --- a/asm/ov00/include/ov00_020b4940.inc +++ b/asm/ov00/include/ov00_020b4940.inc @@ -65,7 +65,7 @@ .extern data_027e0fc8 .extern data_027e0e60 .extern data_027e0f78 -.extern gInventory +.extern gItemManager .extern func_ov05_0210826c .extern func_01ff9bc4 .extern func_01ffbf5c @@ -189,10 +189,10 @@ .extern _ZN9SysObjectdlEPv .extern func_ov00_020b3ea8 .extern func_020078d8 -.extern _ZN9Inventory4SaveEP13SaveInventory -.extern gInventory +.extern _ZN11ItemManager4SaveEP15SaveItemManager +.extern gItemManager .extern func_ov00_020ad8e0 -.extern gInventory +.extern gItemManager .extern _ZN9SysObjectnwEmPjj .extern func_ov04_02107aa0 .extern data_027e0fe0 @@ -232,10 +232,10 @@ .extern func_ov00_020c45b0 .extern data_027e0fec .extern func_ov00_020b1d3c -.extern _ZN9Inventory7HasItemEj -.extern gInventory -.extern _ZN9Inventory7HasItemEj -.extern gInventory +.extern _ZN11ItemManager7HasItemEj +.extern gItemManager +.extern _ZN11ItemManager7HasItemEj +.extern gItemManager .extern func_020193f0 .extern func_020193f0 .extern func_ov00_02079e3c @@ -243,15 +243,15 @@ .extern func_ov00_02097750 .extern func_ov00_020a81dc .extern func_ov00_020abd84 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern _ZNK11ItemManager8GetFairyEj .extern data_027e0618 .extern data_027e0f90 .extern data_027e0f64 .extern data_027e0f74 -.extern gInventory +.extern gItemManager .extern data_ov00_020e8b08 .extern func_ov00_02087e8c .extern func_0202b2e8 @@ -302,43 +302,43 @@ .extern data_027e0fc8 .extern data_ov00_020e9c88 .extern data_ov00_020e9370 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern gInventory +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern gItemManager .extern func_01ff9e64 .extern func_01ffbf5c .extern func_ov00_02081f4c .extern data_027e0e60 .extern func_ov00_02081f4c -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern gInventory +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern gItemManager .extern func_01ff9bc4 .extern data_027e0f90 -.extern _ZNK9Inventory16GetEquippedFairyEv -.extern gInventory +.extern _ZNK11ItemManager16GetEquippedFairyEv +.extern gItemManager .extern func_0202af4c .extern data_027e0fac .extern func_0202af4c .extern data_027e0fac -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZN9Inventory7HasItemEj -.extern _ZNK9Inventory8GetFairyEj -.extern gInventory +.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 gItemManager .extern func_ov00_02097bbc .extern func_020368f4 .extern func_02036ce4 @@ -369,10 +369,10 @@ .extern func_ov00_02083ee0 .extern data_ov00_020e8b08 .extern data_027e0e60 -.extern _ZNK9Inventory8GetFairyEj -.extern gInventory -.extern _ZNK9Inventory8GetFairyEj -.extern gInventory +.extern _ZNK11ItemManager8GetFairyEj +.extern gItemManager +.extern _ZNK11ItemManager8GetFairyEj +.extern gItemManager .extern func_ov00_02081f4c .extern _ZN9SysObjectdlEPv .extern func_ov00_020a95ec @@ -400,7 +400,7 @@ .extern data_027e0fd4 .extern func_ov00_020ae2c0 .extern data_027e0fcc -.extern gInventory +.extern gItemManager .extern data_027e0fd0 .extern data_027e0fdc .extern data_027e0fd0 @@ -457,7 +457,7 @@ .extern data_027e0f74 .extern data_027e0c68 .extern func_ov00_020aeef8 -.extern gInventory +.extern gItemManager .extern data_027e0fd0 .extern data_027e0fd4 .extern data_027e0fd4 @@ -479,7 +479,7 @@ .extern data_027e0fa0 .extern data_027e0fb8 .extern func_01fffcd8 -.extern gInventory +.extern gItemManager .extern func_ov00_02097bbc .extern func_ov00_020ad9e8 .extern func_02002c14 @@ -577,7 +577,7 @@ .extern func_ov29_02179238 .extern func_ov00_0209a508 .extern data_027e0f74 -.extern gInventory +.extern gItemManager .extern data_027e103c .extern data_027e0d38 .extern data_027e0c68 @@ -649,7 +649,7 @@ .extern func_ov00_020c5a24 .extern func_ov00_020ae2e0 .extern func_ov00_020c5924 -.extern gInventory +.extern gItemManager .extern data_027e0f94 .extern data_027e0fe4 .extern func_02023548 @@ -719,7 +719,7 @@ .extern func_0204713c .extern func_0204713c .extern func_0202d56c -.extern gInventory +.extern gItemManager .extern data_027e0f94 .extern data_027e0f90 .extern func_ov00_020d0a30 @@ -728,9 +728,9 @@ .extern data_027e0f64 .extern data_02050f54 .extern func_ov00_020ad72c -.extern gInventory +.extern gItemManager .extern func_ov00_020ad73c -.extern gInventory +.extern gItemManager .extern func_ov00_02093a1c .extern data_027e0f6c .extern func_ov00_02093a1c @@ -751,13 +751,13 @@ .extern data_027e1038 .extern func_ov00_020ad52c .extern func_ov00_020ad52c -.extern gInventory +.extern gItemManager .extern func_ov00_0207c1f8 .extern func_ov00_0207c1f8 .extern data_027e0e58 .extern data_027e0d0c .extern func_ov00_020ad9e8 -.extern gInventory +.extern gItemManager .extern func_0202af4c .extern func_01ff9bc4 .extern func_ov00_0207c1f8 @@ -767,7 +767,7 @@ .extern data_027e0e58 .extern func_ov00_020d7cd4 .extern func_ov00_020d7a84 -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_ov00_020d7a84 .extern func_ov00_020d7a84 .extern func_01ffbf5c @@ -785,7 +785,7 @@ .extern func_ov00_02081f4c .extern func_ov00_020ad9e8 .extern data_ov00_020eec9c -.extern gInventory +.extern gItemManager .extern data_027e0e60 .extern data_027e0fe4 .extern data_02050f54 @@ -799,7 +799,7 @@ .extern func_01ff9158 .extern func_02018450 .extern func_01ff9158 -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_020197fc .extern func_020197fc .extern func_ov00_020b41c4 @@ -810,7 +810,7 @@ .extern func_ov00_020b41c4 .extern func_01ffa9fc .extern func_ov00_020b41c4 -.extern gInventory +.extern gItemManager .extern data_027e0e5c .extern data_02050f54 .extern data_02050f54 @@ -818,16 +818,16 @@ .extern data_027e0e58 .extern func_ov00_0207c444 .extern func_ov00_020ad9e8 -.extern gInventory +.extern gItemManager .extern func_ov00_02081f4c .extern _ZN9SysObjectdlEPv .extern data_027e0fb8 .extern func_ov00_020ceacc .extern data_027e0ffc .extern func_ov00_020ad9e8 -.extern gInventory +.extern gItemManager .extern func_0202e58c -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_01ffa9fc .extern func_01ffa9fc .extern func_01ff8230 @@ -839,7 +839,7 @@ .extern func_01ffa9fc .extern func_ov00_020b41c4 .extern func_ov00_020b413c -.extern gInventory +.extern gItemManager .extern data_02053f54 .extern data_027e03c8 .extern data_02050f54 @@ -927,7 +927,7 @@ .extern data_027e0f74 .extern data_027e0f94 .extern data_027e0f90 -.extern gInventory +.extern gItemManager .extern data_027e0fc8 .extern func_01ff9bf8 .extern func_01ffa0f4 diff --git a/asm/ov00/include/ov00_020c9a68.inc b/asm/ov00/include/ov00_020c9a68.inc index a0980af9..5c6cea0e 100644 --- a/asm/ov00/include/ov00_020c9a68.inc +++ b/asm/ov00/include/ov00_020c9a68.inc @@ -386,7 +386,7 @@ .extern func_ov09_0211cc8c .extern func_ov00_020ad790 .extern data_027e0fb8 -.extern gInventory +.extern gItemManager .extern func_ov00_020a5e9c .extern func_0203673c .extern data_027e0618 @@ -399,9 +399,9 @@ .extern data_027e077c .extern data_02056be4 .extern data_027e103c -.extern _ZN9Inventory7HasItemEj +.extern _ZN11ItemManager7HasItemEj .extern func_ov14_02152220 -.extern gInventory +.extern gItemManager .extern data_027e0618 .extern func_01ff98e0 .extern func_ov00_02079e04 @@ -418,7 +418,7 @@ .extern func_ov09_0211b6e8 .extern func_ov05_02104ca4 .extern func_ov26_0216ebc0 -.extern gInventory +.extern gItemManager .extern func_ov26_0216ecb8 .extern func_ov03_020fa528 .extern func_ov03_020fa5d8 diff --git a/asm/ov00/include/ov00_020d1870.inc b/asm/ov00/include/ov00_020d1870.inc index 72a8c979..e7ad4f77 100644 --- a/asm/ov00/include/ov00_020d1870.inc +++ b/asm/ov00/include/ov00_020d1870.inc @@ -12,13 +12,13 @@ .extern func_ov00_02087338 .extern func_ov00_02087ef0 .extern func_ov00_02087338 -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern data_027e0fe4 .extern data_027e0f64 -.extern gInventory +.extern gItemManager .extern func_ov00_020c3674 .extern data_027e0fe4 .extern func_ov00_02089b00 @@ -49,12 +49,12 @@ .extern func_ov00_020bc320 .extern func_ov00_020bc398 .extern func_ov00_020c3674 -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_02089a2c .extern func_ov00_02089068 -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_020ba53c .extern func_ov00_020ba4e4 .extern func_ov00_020bc2d4 @@ -68,7 +68,7 @@ .extern data_027e0fe4 .extern data_027e0f74 .extern data_027e0fc8 -.extern gInventory +.extern gItemManager .extern data_027e0f64 .extern data_027e103c .extern data_027e0fbc @@ -237,7 +237,7 @@ .extern func_ov00_020cf9dc .extern func_0203878c .extern data_027e0c68 -.extern gInventory +.extern gItemManager .extern data_027e103c .extern func_020387a4 .extern func_0203780c @@ -246,25 +246,25 @@ .extern _ZN9SysObjectnwEmPjj .extern data_027e0fe0 .extern func_0202bbbc -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_020c3180 -.extern gInventory -.extern _ZNK9Inventory8GetFairyEj -.extern gInventory +.extern gItemManager +.extern _ZNK11ItemManager8GetFairyEj +.extern gItemManager .extern func_ov00_0209a4f4 .extern func_ov00_02097810 -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern func_ov00_0209a508 -.extern _ZNK9Inventory8GetFairyEj +.extern _ZNK11ItemManager8GetFairyEj .extern data_027e0f74 -.extern gInventory +.extern gItemManager .extern func_ov00_02097bcc .extern data_027e0fc8 .extern data_027e0f74 .extern func_ov00_020bcf50 .extern data_027e0fc8 -.extern _ZNK9Inventory8GetFairyEj -.extern gInventory +.extern _ZNK11ItemManager8GetFairyEj +.extern gItemManager .extern _ZN9SysObjectdlEPv .extern func_ov00_020beba8 .extern func_ov00_02081f4c diff --git a/asm/ov00/ov00_02079d28.s b/asm/ov00/ov00_02079d28.s index 81d25c47..b465f892 100644 --- a/asm/ov00/ov00_02079d28.s +++ b/asm/ov00/ov00_02079d28.s @@ -2907,10 +2907,10 @@ _0207b688: blx func_ov00_0209d738 cmp r0, #3 bne _0207b6cc - ldr r0, _0207b818 ; =gInventory + ldr r0, _0207b818 ; =gItemManager mov r1, #0x20 ldr r0, [r0] - blx _ZN9Inventory7HasItemEj + blx _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0207b6cc ldrb r0, [r4, #0x12] @@ -3076,7 +3076,7 @@ _0207b808: .word data_027e0e60 _0207b80c: .word data_027e0f94 _0207b810: .word data_027e0fac _0207b814: .word data_027e0f7c -_0207b818: .word gInventory +_0207b818: .word gItemManager _0207b81c: .word data_ov09_0211f5dc .global func_ov00_0207b820 diff --git a/asm/ov00/ov00_0209bea0.s b/asm/ov00/ov00_0209bea0.s index 728d1896..ce6ba211 100644 --- a/asm/ov00/ov00_0209bea0.s +++ b/asm/ov00/ov00_0209bea0.s @@ -1072,7 +1072,7 @@ func_ov00_0209cc3c: ; 0x0209cc3c arm_func_start func_ov00_0209cc48 func_ov00_0209cc48: ; 0x0209cc48 stmdb sp!, {r4, lr} - ldr r1, _0209ccd8 ; =gInventory + ldr r1, _0209ccd8 ; =gItemManager mov r4, r0 ldr r0, [r1] blx func_ov00_020ae5fc @@ -1109,7 +1109,7 @@ func_ov00_0209cc48: ; 0x0209cc48 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_0209cc48 -_0209ccd8: .word gInventory +_0209ccd8: .word gItemManager _0209ccdc: .word data_027e0fec _0209cce0: .word data_027e0e60 _0209cce4: .word data_027e0f68 diff --git a/asm/ov00/ov00_020a03e4.s b/asm/ov00/ov00_020a03e4.s index b20d24f7..7c533a28 100644 --- a/asm/ov00/ov00_020a03e4.s +++ b/asm/ov00/ov00_020a03e4.s @@ -9491,14 +9491,14 @@ func_ov00_020a7b10: ; 0x020a7b10 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r4, r1 - ldr r0, _020a7b84 ; =gInventory + ldr r0, _020a7b84 ; =gItemManager strb r4, [r6, #0x11] ldr r5, [r0] mov r0, r5 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r5 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, #0 ldrneb r1, [r6, #0x11] strneb r1, [r0, #0x11a] @@ -9519,7 +9519,7 @@ func_ov00_020a7b10: ; 0x020a7b10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020a7b10 -_020a7b84: .word gInventory +_020a7b84: .word gItemManager _020a7b88: .word data_027e0e58 .global func_ov00_020a7b8c @@ -9645,13 +9645,13 @@ func_ov00_020a7c60: ; 0x020a7c60 .global func_ov00_020a7ce4 arm_func_start func_ov00_020a7ce4 func_ov00_020a7ce4: ; 0x020a7ce4 - ldr r0, _020a7cf4 ; =gInventory + ldr r0, _020a7cf4 ; =gItemManager ldr ip, _020a7cf8 ; =func_ov00_020ad678 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov00_020a7ce4 -_020a7cf4: .word gInventory +_020a7cf4: .word gItemManager _020a7cf8: .word func_ov00_020ad678 .global func_ov00_020a7cfc @@ -9666,13 +9666,13 @@ func_ov00_020a7cfc: ; 0x020a7cfc cmp r1, r0 moveq r0, #0 ldmeqia sp!, {r3, pc} - ldr r0, _020a7d30 ; =gInventory + ldr r0, _020a7d30 ; =gItemManager ldr r0, [r0] bl func_ov00_020ad6f8 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020a7cfc -_020a7d30: .word gInventory +_020a7d30: .word gItemManager .global func_ov00_020a7d34 arm_func_start func_ov00_020a7d34 @@ -10047,7 +10047,7 @@ _020a8154: .word func_ov00_020bb594 func_ov00_020a8158: ; 0x020a8158 stmdb sp!, {r4, r5, r6, lr} mov r6, #0 - ldr r4, _020a819c ; =gInventory + ldr r4, _020a819c ; =gItemManager mov r5, r6 _020a8168: ldr r0, [r4] @@ -10066,18 +10066,18 @@ _020a818c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020a8158 -_020a819c: .word gInventory +_020a819c: .word gItemManager .global func_ov00_020a81a0 arm_func_start func_ov00_020a81a0 func_ov00_020a81a0: ; 0x020a81a0 - ldr r0, _020a81b0 ; =gInventory + ldr r0, _020a81b0 ; =gItemManager ldr ip, _020a81b4 ; =func_ov00_020ae418 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov00_020a81a0 -_020a81b0: .word gInventory +_020a81b0: .word gItemManager _020a81b4: .word func_ov00_020ae418 .global func_ov00_020a81b8 @@ -11143,7 +11143,7 @@ func_ov00_020a8ce0: ; 0x020a8ce0 arm_func_start func_ov00_020a8cec func_ov00_020a8cec: ; 0x020a8cec stmdb sp!, {r3, lr} - ldr r0, _020a8d24 ; =gInventory + ldr r0, _020a8d24 ; =gItemManager ldr r0, [r0] bl func_ov00_020ad714 cmp r0, #0 @@ -11159,18 +11159,18 @@ _020a8d1c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020a8cec -_020a8d24: .word gInventory +_020a8d24: .word gItemManager .global func_ov00_020a8d28 arm_func_start func_ov00_020a8d28 func_ov00_020a8d28: ; 0x020a8d28 - ldr r0, _020a8d38 ; =gInventory + ldr r0, _020a8d38 ; =gItemManager ldr ip, _020a8d3c ; =func_ov00_020ad714 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov00_020a8d28 -_020a8d38: .word gInventory +_020a8d38: .word gItemManager _020a8d3c: .word func_ov00_020ad714 .global func_ov00_020a8d40 @@ -13716,18 +13716,18 @@ _020aa814: .word data_027e0fb8 arm_func_start func_ov00_020aa818 func_ov00_020aa818: ; 0x020aa818 stmdb sp!, {r4, lr} - ldr r0, _020aa840 ; =gInventory + ldr r0, _020aa840 ; =gItemManager ldr r4, [r0] mov r0, r4 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r4 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj bl func_ov00_020ba458 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020aa818 -_020aa840: .word gInventory +_020aa840: .word gItemManager .global func_ov00_020aa844 arm_func_start func_ov00_020aa844 @@ -13993,7 +13993,7 @@ _020aac14: beq _020aadbc cmp r6, #0 bne _020aadbc - ldr r0, _020ab3bc ; =gInventory + ldr r0, _020ab3bc ; =gItemManager mov r6, #0 ldr r0, [r0] ldr r0, [r0] @@ -14512,7 +14512,7 @@ _020ab3b0: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_020aabd8 -_020ab3bc: .word gInventory +_020ab3bc: .word gItemManager _020ab3c0: .word data_027e0d0c _020ab3c4: .word data_02050f54 _020ab3c8: .word 0x000004cd @@ -16259,10 +16259,10 @@ _020ac930: cmp r0, #0xd cmpne r0, #0xf beq _020ac9bc - ldr r0, _020ac9dc ; =gInventory + ldr r0, _020ac9dc ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020ac9bc ldr r0, _020ac9e0 ; =data_027e0f74 @@ -16287,7 +16287,7 @@ _020ac9bc: _020ac9d0: .word data_027e0e58 _020ac9d4: .word data_ov00_020eec9c _020ac9d8: .word data_027e0618 -_020ac9dc: .word gInventory +_020ac9dc: .word gItemManager _020ac9e0: .word data_027e0f74 .global func_ov00_020ac9e4 @@ -16424,7 +16424,7 @@ func_ov00_020acb6c: ; 0x020acb6c mov r4, r2 cmp r0, #2 bne _020acbb0 - ldr r0, _020ace74 ; =gInventory + ldr r0, _020ace74 ; =gItemManager mov r1, #7 ldr r0, [r0] bl func_ov00_020ad714 @@ -16622,7 +16622,7 @@ _020ace44: .align 2, 0 arm_func_end func_ov00_020acb6c _020ace70: .word data_027e0618 -_020ace74: .word gInventory +_020ace74: .word gItemManager _020ace78: .word 0x0000028f _020ace7c: .word 0x000004cd _020ace80: .word 0x00000548 @@ -16701,7 +16701,7 @@ func_ov00_020acf28: ; 0x020acf28 ldr r0, [r0, #4] cmp r0, #0 bgt _020acf98 - ldr r0, _020acfe4 ; =gInventory + ldr r0, _020acfe4 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae5d0 cmp r0, #0 @@ -16737,7 +16737,7 @@ _020acfd8: .align 2, 0 arm_func_end func_ov00_020acf28 _020acfe0: .word data_027e0618 -_020acfe4: .word gInventory +_020acfe4: .word gItemManager .global func_ov00_020acfe8 arm_func_start func_ov00_020acfe8 diff --git a/asm/ov00/ov00_020ae7a4.s b/asm/ov00/ov00_020ae7a4.s index a48b7ec7..23d221f6 100644 --- a/asm/ov00/ov00_020ae7a4.s +++ b/asm/ov00/ov00_020ae7a4.s @@ -772,7 +772,7 @@ func_ov00_020af06c: ; 0x020af06c strneb r0, [r6, #0x79] ldmia sp!, {r4, r5, r6, pc} _020af0d4: - ldr r0, _020af288 ; =gInventory + ldr r0, _020af288 ; =gItemManager ldr r0, [r0] ldr r4, [r0] cmp r4, #9 @@ -800,7 +800,7 @@ _020af124: cmp r0, #2 bne _020af164 mov r1, #1 - ldr r0, _020af288 ; =gInventory + ldr r0, _020af288 ; =gItemManager strb r1, [r6, #0x7b] ldr r0, [r0] bl func_ov00_020ad790 @@ -851,7 +851,7 @@ _020af1b4: mov r0, #0 strb r0, [r6, #0x7c] _020af1f8: - ldr r0, _020af288 ; =gInventory + ldr r0, _020af288 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad790 @@ -865,10 +865,10 @@ _020af1f8: ldreqb r0, [r6, #0x7b] cmpeq r0, #1 bne _020af268 - ldr r0, _020af288 ; =gInventory + ldr r0, _020af288 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, #0 beq _020af268 ldr r1, _020af294 ; =data_027e0f94 @@ -890,7 +890,7 @@ _020af268: _020af27c: .word data_027e0f74 _020af280: .word data_027e0c68 _020af284: .word data_027e0d38 -_020af288: .word gInventory +_020af288: .word gItemManager _020af28c: .word data_027e05f8 _020af290: .word data_027e103c _020af294: .word data_027e0f94 @@ -1363,7 +1363,7 @@ _020af810: mvn r0, #0 cmp r1, r0 beq _020af8b0 - ldr r0, _020afac4 ; =gInventory + ldr r0, _020afac4 ; =gItemManager ldr r0, [r0] bl func_ov00_020ad714 mov r5, r0 @@ -1510,7 +1510,7 @@ _020afaa8: arm_func_end func_ov00_020af778 _020afabc: .word data_027e0f74 _020afac0: .word data_027e0f90 -_020afac4: .word gInventory +_020afac4: .word gItemManager _020afac8: .word data_027e0fc8 _020afacc: .word data_027e0fe4 _020afad0: .word data_027e0e60 @@ -1573,14 +1573,14 @@ func_ov00_020afb6c: ; 0x020afb6c ldr r0, [r1] add r1, sb, #0x84 bl func_ov00_020c3674 - ldr r1, _020afe74 ; =gInventory + ldr r1, _020afe74 ; =gItemManager mov r5, r0 ldr r6, [r1] mov r0, r6 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r6 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r5, #0 ldreqb r1, [sb, #0x81] cmpeq r1, #0 @@ -1777,7 +1777,7 @@ _020afe64: .align 2, 0 arm_func_end func_ov00_020afb6c _020afe70: .word data_027e0fe4 -_020afe74: .word gInventory +_020afe74: .word gItemManager _020afe78: .word data_027e0f94 _020afe7c: .word data_027e0fc8 _020afe80: .word data_027e0ffc @@ -1879,13 +1879,13 @@ func_ov00_020aff90: ; 0x020aff90 bl func_ov00_02078b40 cmp r0, #2 ldmeqia sp!, {r4, r5, r6, pc} - ldr r0, _020affe8 ; =gInventory + ldr r0, _020affe8 ; =gItemManager ldr r4, [r0] mov r0, r4 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r4 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, #0 ldmeqia sp!, {r4, r5, r6, pc} mov r1, r6 @@ -1895,7 +1895,7 @@ func_ov00_020aff90: ; 0x020aff90 .align 2, 0 arm_func_end func_ov00_020aff90 _020affe4: .word data_027e0d38 -_020affe8: .word gInventory +_020affe8: .word gItemManager .global func_ov00_020affec arm_func_start func_ov00_020affec @@ -2019,13 +2019,13 @@ func_ov00_020b014c: ; 0x020b014c cmp r0, #0 addle sp, sp, #0x10 ldmleia sp!, {r4, r5, r6, pc} - ldr r0, _020b0218 ; =gInventory + ldr r0, _020b0218 ; =gItemManager ldr r6, [r0] mov r0, r6 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r6 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj movs r6, r0 addeq sp, sp, #0x10 ldmeqia sp!, {r4, r5, r6, pc} @@ -2048,7 +2048,7 @@ func_ov00_020b014c: ; 0x020b014c arm_func_end func_ov00_020b014c _020b0210: .word data_ov00_020ee198 _020b0214: .word data_027e0f64 -_020b0218: .word gInventory +_020b0218: .word gItemManager .global func_ov00_020b021c arm_func_start func_ov00_020b021c @@ -2717,15 +2717,15 @@ func_ov00_020b0b0c: ; 0x020b0b0c mov r5, r3 cmp r0, #0 beq _020b0b80 - ldr r0, _020b0de0 ; =gInventory + ldr r0, _020b0de0 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad790 cmp r0, #0 beq _020b0b80 - ldr r0, _020b0de0 ; =gInventory + ldr r0, _020b0de0 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory15GetEquippedItemEv + bl _ZNK11ItemManager15GetEquippedItemEv ldr r1, _020b0de4 ; =data_027e103c str r0, [r4] ldr r0, [r1] @@ -2902,7 +2902,7 @@ _020b0dd4: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020b0b0c -_020b0de0: .word gInventory +_020b0de0: .word gItemManager _020b0de4: .word data_027e103c .global func_ov00_020b0de8 diff --git a/asm/ov00/ov00_020b4940.s b/asm/ov00/ov00_020b4940.s index 6a4c6d0e..f1cdb9c3 100644 --- a/asm/ov00/ov00_020b4940.s +++ b/asm/ov00/ov00_020b4940.s @@ -1357,7 +1357,7 @@ _020b5884: ldr r0, [sp, #0x48] str r0, [r5, #8] _020b5a04: - ldr r0, _020b5ca0 ; =gInventory + ldr r0, _020b5ca0 ; =gItemManager mov r1, #6 ldr r0, [r0] bl func_ov00_020ad714 @@ -1536,7 +1536,7 @@ _020b5c90: .word 0x00000ccd _020b5c94: .word data_027e0fc8 _020b5c98: .word data_027e0e60 _020b5c9c: .word data_027e0f78 -_020b5ca0: .word gInventory +_020b5ca0: .word gItemManager _020b5ca4: .word 0x0000019a _020b5ca8: .word 0x000004cd _020b5cac: .word 0xfffffa66 @@ -4094,14 +4094,14 @@ _020b8016: add r1, #0x7c mov r2, #4 blx func_020078d8 - ldr r0, _020b8048 ; =gInventory + ldr r0, _020b8048 ; =gItemManager add r1, r4, #0 ldr r0, [r0] - bl _ZN9Inventory4SaveEP13SaveInventory + bl _ZN11ItemManager4SaveEP15SaveItemManager pop {r4, pc} nop thumb_func_end func_ov00_020b7ffc -_020b8048: .word gInventory +_020b8048: .word gItemManager .global func_ov00_020b804c thumb_func_start func_ov00_020b804c @@ -4133,7 +4133,7 @@ _020b806c: stmia r1!, {r5} cmp r0, #9 blt _020b806c - ldr r6, _020b80dc ; =gInventory + ldr r6, _020b80dc ; =gItemManager add r4, sp, #0 _020b8078: ldr r0, [r6] @@ -4194,7 +4194,7 @@ _020b80d4: pop {r4, r5, r6, r7, pc} nop thumb_func_end func_ov00_020b8060 -_020b80dc: .word gInventory +_020b80dc: .word gItemManager .global func_ov00_020b80e0 arm_func_start func_ov00_020b80e0 @@ -4884,10 +4884,10 @@ func_ov00_020b8790: ; 0x020b8790 stmdb sp!, {r4, lr} movs r4, r0 bne _020b87b4 - ldr r0, _020b87c4 ; =gInventory + ldr r0, _020b87c4 ; =gItemManager mov r1, #0x14 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r4, #3 _020b87b4: @@ -4897,7 +4897,7 @@ _020b87b4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020b8790 -_020b87c4: .word gInventory +_020b87c4: .word gItemManager _020b87c8: .word data_ov00_020dc800 .global func_ov00_020b87cc @@ -4906,10 +4906,10 @@ func_ov00_020b87cc: ; 0x020b87cc stmdb sp!, {r4, lr} movs r4, r0 bne _020b87f0 - ldr r0, _020b8800 ; =gInventory + ldr r0, _020b8800 ; =gItemManager mov r1, #0x14 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r4, #3 _020b87f0: @@ -4919,7 +4919,7 @@ _020b87f0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020b87cc -_020b8800: .word gInventory +_020b8800: .word gItemManager _020b8804: .word data_ov00_020dc808 .global func_ov00_020b8808 @@ -5082,9 +5082,9 @@ _020b8978: cmp r0, r1 bne _020b89f0 bne _020b8b70 - ldr r0, _020b8b88 ; =gInventory + ldr r0, _020b8b88 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r4, r0 mov r0, sl ldr r1, [r0] @@ -5122,7 +5122,7 @@ _020b8a40: movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r8, #0 - ldr r4, _020b8b88 ; =gInventory + ldr r4, _020b8b88 ; =gItemManager mov r6, r8 mov fp, r8 mov r5, #1 @@ -5135,7 +5135,7 @@ _020b8a68: beq _020b8ad4 ldr r0, [r4] mov r1, r8 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r2, [r0, #8] mov r1, r6 _020b8a94: @@ -5161,9 +5161,9 @@ _020b8ad4: cmp r8, #3 blt _020b8a68 _020b8ae0: - ldr r0, _020b8b88 ; =gInventory + ldr r0, _020b8b88 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r4, r0 mov r0, sl ldr r1, [r0] @@ -5178,10 +5178,10 @@ _020b8ae0: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _020b8b88 ; =gInventory + ldr r0, _020b8b88 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldrb r0, [r0, #0x28e] cmp r0, #0 beq _020b8b54 @@ -5208,7 +5208,7 @@ _020b8b78: .word data_027e0618 _020b8b7c: .word data_027e0f90 _020b8b80: .word data_027e0f64 _020b8b84: .word data_027e0f74 -_020b8b88: .word gInventory +_020b8b88: .word gItemManager _020b8b8c: .word data_ov00_020e8b08 .global func_ov00_020b8b90 @@ -6801,9 +6801,9 @@ func_ov00_020ba170: ; 0x020ba170 ldr r0, [r5, #0x130] cmp r0, #0 bne _020ba1c4 - ldr r0, _020ba200 ; =gInventory + ldr r0, _020ba200 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r4, r0 mov r0, r5 ldr r1, [r0] @@ -6835,7 +6835,7 @@ _020ba1c4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020ba170 -_020ba200: .word gInventory +_020ba200: .word gItemManager .global func_ov00_020ba204 arm_func_start func_ov00_020ba204 @@ -6967,10 +6967,10 @@ _020ba3ac: arm_func_start func_ov00_020ba3b4 func_ov00_020ba3b4: ; 0x020ba3b4 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _020ba410 ; =gInventory + ldr r1, _020ba410 ; =gItemManager mov r5, r0 ldr r0, [r1] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r4, r0 mov r0, r5 ldr r1, [r0] @@ -6993,7 +6993,7 @@ _020ba408: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020ba3b4 -_020ba410: .word gInventory +_020ba410: .word gItemManager .global func_ov00_020ba414 arm_func_start func_ov00_020ba414 @@ -7022,10 +7022,10 @@ _020ba454: .word data_027e0f90 arm_func_start func_ov00_020ba458 func_ov00_020ba458: ; 0x020ba458 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _020ba4e0 ; =gInventory + ldr r1, _020ba4e0 ; =gItemManager mov r5, r0 ldr r0, [r1] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r4, r0 mov r0, r5 ldr r1, [r0] @@ -7058,7 +7058,7 @@ _020ba4d8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020ba458 -_020ba4e0: .word gInventory +_020ba4e0: .word gItemManager .global func_ov00_020ba4e4 arm_func_start func_ov00_020ba4e4 @@ -7167,40 +7167,40 @@ _020ba600: ; jump table b _020ba790 ; case 4 b _020ba7f0 ; case 5 _020ba618: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba650 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x24c] ldr r0, [r0, #0xc] str r0, [r4, #0x250] _020ba650: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x16 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba688 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #2 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x254] ldr r0, [r0, #0xc] str r0, [r4, #0x258] _020ba688: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x25c] ldr r1, [r0, #0xc] @@ -7208,16 +7208,16 @@ _020ba688: str r1, [r4, #0x260] ldmia sp!, {r4, pc} _020ba6b0: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba6e8 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x24c] ldr r0, [r0, #0xc] @@ -7226,16 +7226,16 @@ _020ba6e8: mov r0, #1 ldmia sp!, {r4, pc} _020ba6f0: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x16 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba728 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #2 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x254] ldr r0, [r0, #0xc] @@ -7244,25 +7244,25 @@ _020ba728: mov r0, #1 ldmia sp!, {r4, pc} _020ba730: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba768 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x24c] ldr r0, [r0, #0xc] str r0, [r4, #0x250] _020ba768: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x25c] ldr r1, [r0, #0xc] @@ -7270,25 +7270,25 @@ _020ba768: str r1, [r4, #0x260] ldmia sp!, {r4, pc} _020ba790: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x16 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba7c8 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #2 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x254] ldr r0, [r0, #0xc] str r0, [r4, #0x258] _020ba7c8: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x25c] ldr r1, [r0, #0xc] @@ -7296,31 +7296,31 @@ _020ba7c8: str r1, [r4, #0x260] ldmia sp!, {r4, pc} _020ba7f0: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba828 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x24c] ldr r0, [r0, #0xc] str r0, [r4, #0x250] _020ba828: - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #0x16 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ba860 - ldr r0, _020ba870 ; =gInventory + ldr r0, _020ba870 ; =gItemManager mov r1, #2 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #8] str r1, [r4, #0x254] ldr r0, [r0, #0xc] @@ -7333,7 +7333,7 @@ _020ba868: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020ba5ec -_020ba870: .word gInventory +_020ba870: .word gItemManager .global func_ov00_020ba874 arm_func_start func_ov00_020ba874 @@ -7925,13 +7925,13 @@ _020bb0a8: .word data_027e0e60 arm_func_start func_ov00_020bb0ac func_ov00_020bb0ac: ; 0x020bb0ac stmdb sp!, {r4, r5, r6, lr} - ldr r4, _020bb0dc ; =gInventory + ldr r4, _020bb0dc ; =gItemManager mov r6, #0 mov r5, #1 _020bb0bc: ldr r0, [r4] mov r1, r6 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r6, r6, #1 strb r5, [r0, #0x290] cmp r6, #3 @@ -7939,19 +7939,19 @@ _020bb0bc: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020bb0ac -_020bb0dc: .word gInventory +_020bb0dc: .word gItemManager .global func_ov00_020bb0e0 arm_func_start func_ov00_020bb0e0 func_ov00_020bb0e0: ; 0x020bb0e0 stmdb sp!, {r4, r5, r6, lr} mov r6, #0 - ldr r4, _020bb110 ; =gInventory + ldr r4, _020bb110 ; =gItemManager mov r5, r6 _020bb0f0: ldr r0, [r4] mov r1, r6 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r6, r6, #1 strb r5, [r0, #0x290] cmp r6, #3 @@ -7959,7 +7959,7 @@ _020bb0f0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020bb0e0 -_020bb110: .word gInventory +_020bb110: .word gItemManager .global func_ov00_020bb114 arm_func_start func_ov00_020bb114 @@ -8456,7 +8456,7 @@ func_ov00_020bb50c: ; 0x020bb50c ldr r1, [r1, #0x18] bl func_ov00_020bb544 mov r1, #0 - ldr r0, _020bb540 ; =gInventory + ldr r0, _020bb540 ; =gItemManager strh r1, [r4, #8] ldr r0, [r0] blx func_ov00_020ae2c0 @@ -8464,7 +8464,7 @@ func_ov00_020bb50c: ; 0x020bb50c .align 2, 0 arm_func_end func_ov00_020bb50c _020bb53c: .word data_027e0fcc -_020bb540: .word gInventory +_020bb540: .word gItemManager .global func_ov00_020bb544 arm_func_start func_ov00_020bb544 @@ -9107,7 +9107,7 @@ _020bbc94: cmp r0, #0 movgt r0, #0 ldmgtia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _020bbd34 ; =gInventory + ldr r0, _020bbd34 ; =gItemManager ldr r0, [r0] ldr r0, [r0] cmp r0, #9 @@ -9149,7 +9149,7 @@ _020bbd2c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020bbc68 -_020bbd34: .word gInventory +_020bbd34: .word gItemManager _020bbd38: .word data_027e0fd0 _020bbd3c: .word data_027e0fd4 @@ -9419,12 +9419,12 @@ _020bc094: .word func_01fffcd8 .global func_ov00_020bc098 arm_func_start func_ov00_020bc098 func_ov00_020bc098: ; 0x020bc098 - ldr r0, _020bc0a4 ; =gInventory + ldr r0, _020bc0a4 ; =gItemManager ldr r0, [r0] bx lr .align 2, 0 arm_func_end func_ov00_020bc098 -_020bc0a4: .word gInventory +_020bc0a4: .word gItemManager .global func_ov00_020bc0a8 arm_func_start func_ov00_020bc0a8 @@ -10452,7 +10452,7 @@ func_ov00_020bccc8: ; 0x020bccc8 strb r2, [sp, #0xb] strb r4, [sp, #0x16] bl func_ov00_02097810 - ldr r1, _020bcda8 ; =gInventory + ldr r1, _020bcda8 ; =gItemManager str r0, [r5, #0x38] ldr r0, [r1] ldr r0, [r0] @@ -10491,7 +10491,7 @@ _020bcd94: .align 2, 0 arm_func_end func_ov00_020bccc8 _020bcda4: .word data_027e0f74 -_020bcda8: .word gInventory +_020bcda8: .word gItemManager _020bcdac: .word data_027e103c _020bcdb0: .word data_027e0d38 _020bcdb4: .word data_027e0c68 @@ -11114,7 +11114,7 @@ func_ov00_020bd510: ; 0x020bd510 mov r0, r5 mov r4, r2 bl func_ov00_020c5a24 - ldr r1, _020bd5e4 ; =gInventory + ldr r1, _020bd5e4 ; =gItemManager mov r2, r0 ldr r0, [r1] ldrh r1, [r0, #0x22] @@ -11163,7 +11163,7 @@ func_ov00_020bd510: ; 0x020bd510 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020bd510 -_020bd5e4: .word gInventory +_020bd5e4: .word gItemManager _020bd5e8: .word data_027e0f94 _020bd5ec: .word data_027e0fe4 @@ -12729,7 +12729,7 @@ func_ov00_020be904: ; 0x020be904 bl func_ov00_020beb30 cmp r0, #0 bgt _020be94c - ldr r1, _020be960 ; =gInventory + ldr r1, _020be960 ; =gItemManager mov r0, r7 ldr r2, [r1] ldr r1, [r0] @@ -12747,7 +12747,7 @@ _020be954: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020be904 -_020be960: .word gInventory +_020be960: .word gItemManager .global func_ov00_020be964 arm_func_start func_ov00_020be964 @@ -12917,7 +12917,7 @@ _020beb2c: .word 0x00000266 func_ov00_020beb30: ; 0x020beb30 stmdb sp!, {r4, lr} ldr r2, [r0] - ldr r1, _020beb58 ; =gInventory + ldr r1, _020beb58 ; =gItemManager ldr r2, [r2, #0xc] ldr r4, [r1] blx r2 @@ -12927,14 +12927,14 @@ func_ov00_020beb30: ; 0x020beb30 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020beb30 -_020beb58: .word gInventory +_020beb58: .word gItemManager .global func_ov00_020beb5c arm_func_start func_ov00_020beb5c func_ov00_020beb5c: ; 0x020beb5c stmdb sp!, {r3, r4, r5, lr} ldr r3, [r0] - ldr r2, _020beb8c ; =gInventory + ldr r2, _020beb8c ; =gItemManager ldr r3, [r3, #0xc] ldr r4, [r2] mov r5, r1 @@ -12946,7 +12946,7 @@ func_ov00_020beb5c: ; 0x020beb5c ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020beb5c -_020beb8c: .word gInventory +_020beb8c: .word gItemManager .global func_ov00_020beb90 arm_func_start func_ov00_020beb90 @@ -13462,7 +13462,7 @@ _020bf188: .word data_027e1038 func_ov00_020bf18c: ; 0x020bf18c push {r4, lr} add r4, r0, #0 - ldr r0, _020bf1bc ; =gInventory + ldr r0, _020bf1bc ; =gItemManager mov r1, #0 ldr r0, [r0] blx func_ov00_020ad52c @@ -13471,7 +13471,7 @@ func_ov00_020bf18c: ; 0x020bf18c ldr r2, [r0] ldr r2, [r2, #0xc] blx r2 - ldr r0, _020bf1bc ; =gInventory + ldr r0, _020bf1bc ; =gItemManager mov r1, #1 ldr r0, [r0] blx func_ov00_020ad52c @@ -13483,7 +13483,7 @@ func_ov00_020bf18c: ; 0x020bf18c pop {r4, pc} nop thumb_func_end func_ov00_020bf18c -_020bf1bc: .word gInventory +_020bf1bc: .word gItemManager .global func_ov00_020bf1c0 arm_func_start func_ov00_020bf1c0 @@ -13548,7 +13548,7 @@ func_ov00_020bf270: ; 0x020bf270 ldr r0, [r4, #0x40] cmp r0, #3 bgt _020bf2b4 - ldr r0, _020bf2d4 ; =gInventory + ldr r0, _020bf2d4 ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -13568,7 +13568,7 @@ _020bf2b4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020bf270 -_020bf2d4: .word gInventory +_020bf2d4: .word gItemManager .global func_ov00_020bf2d8 arm_func_start func_ov00_020bf2d8 @@ -13863,10 +13863,10 @@ _020bf6a8: bl func_ov00_020d7a84 b _020bf70c _020bf6d4: - ldr r0, _020bff38 ; =gInventory + ldr r0, _020bff38 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 add r2, sp, #0xe4 beq _020bf700 @@ -14283,7 +14283,7 @@ _020bfd18: cmp r0, #1 moveq r0, #0 beq _020bfd40 - ldr r0, _020bff38 ; =gInventory + ldr r0, _020bff38 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -14428,7 +14428,7 @@ _020bff28: .word 0x000008a4 _020bff2c: .word data_ov00_020e6f90 _020bff30: .word data_ov00_020dd294 _020bff34: .word data_ov00_020eec9c -_020bff38: .word gInventory +_020bff38: .word gItemManager _020bff3c: .word data_027e0e60 _020bff40: .word 0x0000099a _020bff44: .word data_ov00_020dd268 @@ -14495,10 +14495,10 @@ func_ov00_020bff94: ; 0x020bff94 add r0, r4, #0x60 mov r2, r0 bl func_01ff9158 - ldr r0, _020c01d4 ; =gInventory + ldr r0, _020c01d4 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 ldrsh r5, [r4, #0x5c] beq _020c0064 @@ -14624,7 +14624,7 @@ _020c01bc: .align 2, 0 arm_func_end func_ov00_020bff94 _020c01d0: .word data_ov00_020dd280 -_020c01d4: .word gInventory +_020c01d4: .word gItemManager _020c01d8: .word data_027e0e5c .global func_ov00_020c01dc @@ -14969,7 +14969,7 @@ _020c0670: .word func_ov00_0207c444 arm_func_start func_ov00_020c0674 func_ov00_020c0674: ; 0x020c0674 stmdb sp!, {r4, lr} - ldr r1, _020c06a8 ; =gInventory + ldr r1, _020c06a8 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #1 @@ -14983,7 +14983,7 @@ func_ov00_020c0674: ; 0x020c0674 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020c0674 -_020c06a8: .word gInventory +_020c06a8: .word gItemManager _020c06ac: .word data_ov00_020dd298 .global func_ov00_020c06b0 @@ -15084,7 +15084,7 @@ func_ov00_020c0770: ; 0x020c0770 bl func_ov00_020c0e24 mov r1, #0 strb r1, [r4, #0xb] - ldr r0, _020c07f4 ; =gInventory + ldr r0, _020c07f4 ; =gItemManager mov r1, #2 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -15110,7 +15110,7 @@ func_ov00_020c0770: ; 0x020c0770 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020c0770 -_020c07f4: .word gInventory +_020c07f4: .word gItemManager .global func_ov00_020c07f8 arm_func_start func_ov00_020c07f8 @@ -15161,10 +15161,10 @@ func_ov00_020c086c: ; 0x020c086c bl func_ov00_020beb30 cmp r0, #0 ble _020c0a60 - ldr r0, _020c0a70 ; =gInventory + ldr r0, _020c0a70 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 ldrneb r0, [r4, #0xd] cmpne r0, #0 @@ -15295,7 +15295,7 @@ _020c0a60: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020c086c -_020c0a70: .word gInventory +_020c0a70: .word gItemManager _020c0a74: .word data_02053f54 _020c0a78: .word data_ov00_020dd364 _020c0a7c: .word data_027e03c8 @@ -17257,7 +17257,7 @@ _020c208c: bl func_ov00_020c22b8 cmp r0, #0 beq _020c2110 - ldr r0, _020c2230 ; =gInventory + ldr r0, _020c2230 ; =gItemManager ldr ip, [sp, #0x60] ldr r3, [sp, #0x64] ldr r2, [sp, #0x68] @@ -17362,7 +17362,7 @@ _020c2218: _020c2224: .word data_027e0f74 _020c2228: .word data_027e0f94 _020c222c: .word data_027e0f90 -_020c2230: .word gInventory +_020c2230: .word gItemManager _020c2234: .word data_027e0fc8 .global func_ov00_020c2238 diff --git a/asm/ov00/ov00_020c9a68.s b/asm/ov00/ov00_020c9a68.s index 74d632f4..d8230ddd 100644 --- a/asm/ov00/ov00_020c9a68.s +++ b/asm/ov00/ov00_020c9a68.s @@ -7385,7 +7385,7 @@ func_ov00_020cf444: ; 0x020cf444 ldrb r0, [r0, #0x79] cmp r0, #0 beq _020cf478 - ldr r0, _020cf484 ; =gInventory + ldr r0, _020cf484 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad790 @@ -7398,7 +7398,7 @@ _020cf478: .align 2, 0 arm_func_end func_ov00_020cf444 _020cf480: .word data_027e0fb8 -_020cf484: .word gInventory +_020cf484: .word gItemManager .global func_ov00_020cf488 arm_func_start func_ov00_020cf488 @@ -7643,11 +7643,11 @@ _020cf74c: .word 0x0000018f arm_func_start func_ov00_020cf750 func_ov00_020cf750: ; 0x020cf750 stmdb sp!, {r4, lr} - ldr r1, _020cf7c0 ; =gInventory + ldr r1, _020cf7c0 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #0x21 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -7673,7 +7673,7 @@ _020cf7ac: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020cf750 -_020cf7c0: .word gInventory +_020cf7c0: .word gItemManager .global func_ov00_020cf7c4 arm_func_start func_ov00_020cf7c4 @@ -8049,13 +8049,13 @@ func_ov00_020cfbb0: ; 0x020cfbb0 cmp r0, #0 ldrne r0, [r0, #0xb4] ldmneia sp!, {r3, pc} - ldr r0, _020cfbd4 ; =gInventory + ldr r0, _020cfbd4 ; =gItemManager ldr r0, [r0] ldr r0, [r0, #0xc] ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020cfbb0 -_020cfbd4: .word gInventory +_020cfbd4: .word gItemManager .global func_ov00_020cfbd8 arm_func_start func_ov00_020cfbd8 diff --git a/asm/ov00/ov00_020d1870.s b/asm/ov00/ov00_020d1870.s index 393bfb01..86e7a950 100644 --- a/asm/ov00/ov00_020d1870.s +++ b/asm/ov00/ov00_020d1870.s @@ -253,10 +253,10 @@ _020d1cb8: add sp, sp, #0x10 bx lr _020d1cdc: - ldr r0, _020d1da0 ; =gInventory + ldr r0, _020d1da0 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r0, r0, #0x200 mov r1, #0 strh r1, [r0, #0x8a] @@ -265,10 +265,10 @@ _020d1cdc: add sp, sp, #0x10 bx lr _020d1d08: - ldr r0, _020d1da0 ; =gInventory + ldr r0, _020d1da0 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r0, r0, #0x200 mov r1, #1 strh r1, [r0, #0x8a] @@ -277,10 +277,10 @@ _020d1d08: add sp, sp, #0x10 bx lr _020d1d34: - ldr r0, _020d1da0 ; =gInventory + ldr r0, _020d1da0 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r0, r0, #0x200 mov r1, #2 strh r1, [r0, #0x8a] @@ -289,10 +289,10 @@ _020d1d34: add sp, sp, #0x10 bx lr _020d1d60: - ldr r0, _020d1da0 ; =gInventory + ldr r0, _020d1da0 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r0, r0, #0x200 mov r1, #3 strh r1, [r0, #0x8a] @@ -308,7 +308,7 @@ _020d1d90: .word 0x00040001 _020d1d94: .word 0x000300ff _020d1d98: .word 0x020af2d8 _020d1d9c: .word data_027e0f64 -_020d1da0: .word gInventory +_020d1da0: .word gItemManager .global func_ov00_020d1da4 arm_func_start func_ov00_020d1da4 @@ -872,9 +872,9 @@ _020d2560: ; jump table b _020d25bc ; case 8 b _020d25bc ; case 9 _020d2588: - ldr r0, _020d27d8 ; =gInventory + ldr r0, _020d27d8 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r3, [r0] mov r1, r4 ldr r3, [r3, #0x90] @@ -886,10 +886,10 @@ _020d2588: moveq r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _020d25bc: - ldr r0, _020d27d8 ; =gInventory + ldr r0, _020d27d8 ; =gItemManager sub r1, r2, #0x40 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r3, [r0] mov r1, r4 ldr r3, [r3, #0x94] @@ -903,10 +903,10 @@ _020d25ec: mov r0, #2 ldmia sp!, {r3, r4, r5, r6, r7, pc} _020d25f8: - ldr r0, _020d27d8 ; =gInventory + ldr r0, _020d27d8 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r1, #1 strb r1, [r0, #0x28e] add sp, sp, #8 @@ -952,10 +952,10 @@ _020d2694: str r1, [r7, #0x4c] ldmia sp!, {r3, r4, r5, r6, r7, pc} _020d26ac: - ldr r0, _020d27d8 ; =gInventory + ldr r0, _020d27d8 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r6, #4] cmp r1, #0 beq _020d26d4 @@ -999,7 +999,7 @@ _020d2730: mov r0, #2 ldmia sp!, {r3, r4, r5, r6, r7, pc} _020d274c: - ldr r0, _020d27d8 ; =gInventory + ldr r0, _020d27d8 ; =gItemManager mov r1, #0x3c ldr r0, [r0] ldr r0, [r0, #0xc] @@ -1037,7 +1037,7 @@ _020d27c8: .word data_027e0f74 _020d27cc: .word data_ov00_020df28c _020d27d0: .word data_ov00_020df28c _020d27d4: .word data_027e0fc8 -_020d27d8: .word gInventory +_020d27d8: .word gItemManager _020d27dc: .word data_027e0f64 _020d27e0: .word data_ov00_020df294 _020d27e4: .word data_027e103c @@ -2993,7 +2993,7 @@ func_ov00_020d3ef4: ; 0x020d3ef4 cmp r0, #1 b _020d3f58 _020d3f34: - ldr r0, _020d3f6c ; =gInventory + ldr r0, _020d3f6c ; =gItemManager ldr r1, [r5, #0x40] ldr r0, [r0] bl func_ov00_020ae3a8 @@ -3010,7 +3010,7 @@ _020d3f58: .align 2, 0 arm_func_end func_ov00_020d3ef4 _020d3f68: .word data_027e0c68 -_020d3f6c: .word gInventory +_020d3f6c: .word gItemManager _020d3f70: .word data_027e103c .global func_ov00_020d3f74 @@ -3110,13 +3110,13 @@ _020d4050: arm_func_start func_ov00_020d4058 func_ov00_020d4058: ; 0x020d4058 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _020d40d4 ; =gInventory + ldr r1, _020d40d4 ; =gItemManager mov r4, r0 ldr r5, [r1] bl func_ov00_020d4020 mov r1, r0 mov r0, r5 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r1, #0x10000 ldr r0, [r0, #0x23c] rsb r1, r1, #0 @@ -3142,20 +3142,20 @@ func_ov00_020d4058: ; 0x020d4058 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020d4058 -_020d40d4: .word gInventory +_020d40d4: .word gItemManager .global func_ov00_020d40d8 arm_func_start func_ov00_020d40d8 func_ov00_020d40d8: ; 0x020d40d8 stmdb sp!, {r4, r5, r6, lr} - ldr r2, _020d4130 ; =gInventory + ldr r2, _020d4130 ; =gItemManager mov r4, r0 ldr r5, [r2] mov r6, r1 bl func_ov00_020d4020 mov r1, r0 mov r0, r5 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r4, #0x130] cmp r1, #0 bne _020d4120 @@ -3172,7 +3172,7 @@ _020d4120: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020d40d8 -_020d4130: .word gInventory +_020d4130: .word gItemManager .global func_ov00_020d4134 arm_func_start func_ov00_020d4134 @@ -3206,13 +3206,13 @@ func_ov00_020d4134: ; 0x020d4134 str r2, [sp, #0x28] bl func_ov00_02097810 str r0, [r5, #0x160] - ldr r1, _020d423c ; =gInventory + ldr r1, _020d423c ; =gItemManager mov r0, r5 ldr r6, [r1] bl func_ov00_020d4020 mov r1, r0 mov r0, r6 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r1, r4 ldr r4, [r0] add r3, r5, #0x48 @@ -3226,7 +3226,7 @@ func_ov00_020d4134: ; 0x020d4134 mov r0, r4 ldmia sp!, {r4, r5, r6, pc} _020d41f4: - ldr r1, _020d423c ; =gInventory + ldr r1, _020d423c ; =gItemManager cmp r0, #3 mov r0, r5 ldr r5, [r1] @@ -3234,7 +3234,7 @@ _020d41f4: bl func_ov00_020d4020 mov r1, r0 mov r0, r5 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r5, [r0] mov r1, r4 ldr r5, [r5, #0xbc] @@ -3246,7 +3246,7 @@ _020d41f4: .align 2, 0 arm_func_end func_ov00_020d4134 _020d4238: .word data_027e0f74 -_020d423c: .word gInventory +_020d423c: .word gItemManager .global func_ov00_020d4240 arm_func_start func_ov00_020d4240 @@ -3309,17 +3309,17 @@ _020d42e0: .word data_027e0fc8 arm_func_start func_ov00_020d42e4 func_ov00_020d42e4: ; 0x020d42e4 stmdb sp!, {r4, lr} - ldr r1, _020d4308 ; =gInventory + ldr r1, _020d4308 ; =gItemManager ldr r4, [r1] bl func_ov00_020d4020 mov r1, r0 mov r0, r4 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj add r0, r0, #0x224 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020d42e4 -_020d4308: .word gInventory +_020d4308: .word gItemManager .global func_ov00_020d430c arm_func_start func_ov00_020d430c diff --git a/asm/ov02.s b/asm/ov02.s index b2daa7d9..2182edf2 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -188,7 +188,7 @@ func_ov02_020eef6c: ; 0x020eef6c mov r0, r4 blx func_ov09_021144c8 ldr r1, _020ef07c ; =data_ov02_020f69e0 - ldr r0, _020ef080 ; =gInventory + ldr r0, _020ef080 ; =gItemManager ldr r2, [r1, #0x20] ldr r1, [r1, #0x24] str r2, [r4, #0xd10] @@ -211,7 +211,7 @@ _020eefbc: mov r2, #0x320 bl func_02007984 _020eefd8: - ldr r0, _020ef080 ; =gInventory + ldr r0, _020ef080 ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xb6] cmp r0, #1 @@ -233,7 +233,7 @@ _020ef008: mov r2, #0x200 bl func_02007984 _020ef028: - ldr r0, _020ef080 ; =gInventory + ldr r0, _020ef080 ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xb8] cmp r0, #1 @@ -258,14 +258,14 @@ _020ef058: .align 2, 0 arm_func_end func_ov02_020eef6c _020ef07c: .word data_ov02_020f69e0 -_020ef080: .word gInventory +_020ef080: .word gItemManager .global func_ov02_020ef084 arm_func_start func_ov02_020ef084 func_ov02_020ef084: ; 0x020ef084 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc - ldr r2, _020ef998 ; =gInventory + ldr r2, _020ef998 ; =gItemManager ldr r1, _020ef99c ; =0x91a2b3c5 ldr r2, [r2] mov r5, r0 @@ -280,13 +280,13 @@ func_ov02_020ef084: ; 0x020ef084 movhs r4, #2 _020ef0c0: mov r0, #0 - ldr r6, _020ef998 ; =gInventory + ldr r6, _020ef998 ; =gItemManager str r0, [r5, #0xd04] mov r7, #0x61 _020ef0d0: ldr r0, [r6] mov r1, r7 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 ldrne r0, [r5, #0xd04] add r7, r7, #1 @@ -333,7 +333,7 @@ _020ef108: mov r1, r0 mov r0, r5 bl func_ov02_020f08b8 - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager ldr r0, [r0] ldrb r0, [r0, #0x24] cmp r0, #0 @@ -352,7 +352,7 @@ _020ef108: mov r0, #0x1a str r0, [r5, #0x3b8] _020ef1d8: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager ldr r0, [r0] ldrb r0, [r0, #0x25] cmp r0, #0 @@ -372,7 +372,7 @@ _020ef1d8: mov r0, #0x1e str r0, [r5, #0x2f8] _020ef224: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager ldr r0, [r0] ldrb r0, [r0, #0x26] cmp r0, #0 @@ -392,10 +392,10 @@ _020ef224: mov r0, #0x22 str r0, [r5, #0x358] _020ef270: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0x2a ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef2c0 mov r2, #0x28 @@ -413,10 +413,10 @@ _020ef270: mov r0, #0x28 str r0, [r5, #0x4d8] _020ef2c0: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0x26 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef310 mov r2, #0x26 @@ -434,10 +434,10 @@ _020ef2c0: mov r0, #0x26 str r0, [r5, #0x418] _020ef310: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0x2b ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef360 mov r2, #0x27 @@ -617,10 +617,10 @@ _020ef578: mov r0, #0x38 str r0, [r5, #0x7d8] _020ef5c8: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0x20 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef614 add r3, r4, #0x2b @@ -637,16 +637,16 @@ _020ef5c8: add r0, r4, #0x2b str r0, [r5, #0x838] _020ef614: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef67c - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r6, #0x13 moveq r6, #0x12 @@ -664,10 +664,10 @@ _020ef614: strb r0, [r5, #0x8d8] str r6, [r5, #0x898] _020ef67c: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef6d0 mvn r3, #0 @@ -777,10 +777,10 @@ _020ef7dc: mov r0, #0x19 str r0, [r5, #0x958] _020ef82c: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef87c mov r2, #0x1b @@ -798,10 +798,10 @@ _020ef82c: mov r0, #0x1b str r0, [r5, #0xa78] _020ef87c: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #5 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef8cc mov r2, #0x1d @@ -819,10 +819,10 @@ _020ef87c: mov r0, #0x1d str r0, [r5, #0xad8] _020ef8cc: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #4 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef91c mov r2, #0x22 @@ -840,10 +840,10 @@ _020ef8cc: mov r0, #0x22 str r0, [r5, #0xb38] _020ef91c: - ldr r0, _020ef998 ; =gInventory + ldr r0, _020ef998 ; =gItemManager mov r1, #7 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020ef96c mov r2, #0x27 @@ -874,7 +874,7 @@ _020ef96c: ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov02_020ef084 -_020ef998: .word gInventory +_020ef998: .word gItemManager _020ef99c: .word 0x91a2b3c5 _020ef9a0: .word data_027e0f74 _020ef9a4: .word 0x00000123 @@ -1373,10 +1373,10 @@ _020f0000: mov r1, #0x11 str r6, [sp] bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f008c ldr r0, _020f0724 ; =data_027e0f74 @@ -1424,10 +1424,10 @@ _020f008c: mov r2, r4 mov r3, r5 bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #0x20 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f01e4 mov r2, r4 @@ -1436,7 +1436,7 @@ _020f008c: mov r1, #8 str r6, [sp] bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager ldr r1, _020f0728 ; =0x91a2b3c5 ldr r2, [r0] add r0, sp, #4 @@ -1456,7 +1456,7 @@ _020f008c: mov r0, #0x50 mov r1, #2 bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager ldr r1, _020f072c ; =0x88888889 ldr r0, [r0] mov r2, #0x3c @@ -1484,10 +1484,10 @@ _020f008c: mov r3, r5 bl func_0203493c _020f01e4: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f02e8 add r6, sp, #0x28 @@ -1550,7 +1550,7 @@ _020f01e4: mov r3, r5 bl func_0203493c _020f02e8: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r6, #0 ldr r0, [r0] mov r3, #1 @@ -1559,7 +1559,7 @@ _020f02e8: str r6, [sp, #0x2c] str r3, [sp, #4] str r2, [sp, #0xc] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f035c add r6, sp, #0x28 @@ -1569,7 +1569,7 @@ _020f02e8: mov r1, #0x20 str r6, [sp] bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #5 ldr r0, [r0] blx func_ov00_020ad9a0 @@ -1580,10 +1580,10 @@ _020f02e8: str r3, [sp, #0x10] bl func_ov02_020f5f98 _020f035c: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #4 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f03b8 add r6, sp, #0x28 @@ -1593,7 +1593,7 @@ _020f035c: mov r1, #0x25 str r6, [sp] bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #4 ldr r0, [r0] blx func_ov00_020ad9a0 @@ -1604,10 +1604,10 @@ _020f035c: str r3, [sp, #0x10] bl func_ov02_020f5f98 _020f03b8: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #7 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f0414 add r6, sp, #0x28 @@ -1617,7 +1617,7 @@ _020f03b8: mov r1, #0x2a str r6, [sp] bl func_0203493c - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager mov r1, #7 ldr r0, [r0] blx func_ov00_020ad9a0 @@ -1746,7 +1746,7 @@ _020f057c: str r6, [sp] bl func_0203493c _020f05c8: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager ldr r0, [r0] ldrb r8, [r0, #0x24] cmp r8, #0 @@ -1765,7 +1765,7 @@ _020f05c8: str r3, [sp, #0x10] bl func_ov02_020f5f98 _020f0610: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager ldr r0, [r0] ldrb r8, [r0, #0x25] cmp r8, #0 @@ -1784,7 +1784,7 @@ _020f0610: str r3, [sp, #0x10] bl func_ov02_020f5f98 _020f0658: - ldr r0, _020f0720 ; =gInventory + ldr r0, _020f0720 ; =gItemManager ldr r0, [r0] ldrb r8, [r0, #0x26] cmp r8, #0 @@ -1838,7 +1838,7 @@ _020f06e0: .align 2, 0 arm_func_end func_ov02_020eff70 _020f071c: .word data_ov09_0211f528 -_020f0720: .word gInventory +_020f0720: .word gItemManager _020f0724: .word data_027e0f74 _020f0728: .word 0x91a2b3c5 _020f072c: .word 0x88888889 @@ -1866,10 +1866,10 @@ func_ov02_020f0734: ; 0x020f0734 _020f0774: cmp r5, #0x12 bne _020f07a4 - ldr r0, _020f08a8 ; =gInventory + ldr r0, _020f08a8 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f07a4 ldr r1, _020f08ac ; =0x0012009a @@ -1879,10 +1879,10 @@ _020f0774: _020f07a4: cmp r5, #0x13 bne _020f07d4 - ldr r0, _020f08a8 ; =gInventory + ldr r0, _020f08a8 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f07d4 ldr r1, _020f08b0 ; =0x0012009b @@ -1948,7 +1948,7 @@ _020f087c: .align 2, 0 arm_func_end func_ov02_020f0734 _020f08a4: .word data_ov02_020f672c -_020f08a8: .word gInventory +_020f08a8: .word gItemManager _020f08ac: .word 0x0012009a _020f08b0: .word 0x0012009b _020f08b4: .word data_ov02_020f672c @@ -1978,7 +1978,7 @@ _020f08fc: str r0, [r5, #0xd00] mov r1, #0 strb r1, [r5, #0xc3c] - ldr r0, _020f0a50 ; =gInventory + ldr r0, _020f0a50 ; =gItemManager sub r1, r1, #1 ldr r0, [r0] add sp, sp, #0x14 @@ -1986,7 +1986,7 @@ _020f08fc: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} _020f0928: - ldr r1, _020f0a50 ; =gInventory + ldr r1, _020f0a50 ; =gItemManager mov r0, r4 ldr r6, [r1] bl func_ov02_020eed40 @@ -1997,7 +1997,7 @@ _020f0928: blt _020f0968 cmp r4, #2 bne _020f0974 - ldr r0, _020f0a50 ; =gInventory + ldr r0, _020f0a50 ; =gItemManager ldr r0, [r0] ldrb r0, [r0, #0x14d] cmp r0, #0 @@ -2040,7 +2040,7 @@ _020f0974: strb r0, [r5, #0xc3c] ldr r0, [r5, #0xd00] bl func_ov02_020eed40 - ldr r1, _020f0a50 ; =gInventory + ldr r1, _020f0a50 ; =gItemManager mov r7, #0 ldr r1, [r1] add r8, r5, #0x10 @@ -2067,7 +2067,7 @@ _020f0a34: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov02_020f08b8 -_020f0a50: .word gInventory +_020f0a50: .word gItemManager .global func_ov02_020f0a54 arm_func_start func_ov02_020f0a54 @@ -2079,16 +2079,16 @@ func_ov02_020f0a54: ; 0x020f0a54 beq _020f0ac4 cmp r1, #2 bne _020f0ad8 - ldr r0, _020f0ae0 ; =gInventory + ldr r0, _020f0ae0 ; =gItemManager mov r1, #0x14 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f0aa0 - ldr r0, _020f0ae0 ; =gInventory + ldr r0, _020f0ae0 ; =gItemManager mov r1, #0x1d ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f0aa8 _020f0aa0: @@ -2098,28 +2098,28 @@ _020f0aa8: mov r0, #0 ldmia sp!, {r3, pc} _020f0ab0: - ldr r0, _020f0ae0 ; =gInventory + ldr r0, _020f0ae0 ; =gItemManager mov r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r3, pc} _020f0ac4: - ldr r0, _020f0ae0 ; =gInventory + ldr r0, _020f0ae0 ; =gItemManager mov r1, #0x16 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r3, pc} _020f0ad8: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov02_020f0a54 -_020f0ae0: .word gInventory +_020f0ae0: .word gItemManager .global func_ov02_020f0ae4 arm_func_start func_ov02_020f0ae4 func_ov02_020f0ae4: ; 0x020f0ae4 - ldr r0, _020f0b38 ; =gInventory + ldr r0, _020f0b38 ; =gItemManager ldr r1, [r0] ldr r0, [r1, #0x10] cmp r0, #0 @@ -2146,17 +2146,17 @@ _020f0b30: bx lr .align 2, 0 arm_func_end func_ov02_020f0ae4 -_020f0b38: .word gInventory +_020f0b38: .word gItemManager .global func_ov02_020f0b3c arm_func_start func_ov02_020f0b3c func_ov02_020f0b3c: ; 0x020f0b3c stmdb sp!, {r4, lr} - ldr r0, _020f0bd4 ; =gInventory + ldr r0, _020f0bd4 ; =gItemManager mov r1, #0x2d ldr r0, [r0] mvn r4, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r4, #0x2f bne _020f0bcc @@ -2192,7 +2192,7 @@ _020f0bcc: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov02_020f0b3c -_020f0bd4: .word gInventory +_020f0bd4: .word gItemManager _020f0bd8: .word data_027e0f74 .global func_ov02_020f0bdc @@ -2497,10 +2497,10 @@ func_ov02_020f0f14: ; 0x020f0f14 str r5, [r4, #0xe8] cmp r5, #2 bne _020f0f90 - ldr r0, _020f0fd4 ; =gInventory + ldr r0, _020f0fd4 ; =gItemManager mov r1, #0x14 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #4 streqb r0, [r4, #0xec] @@ -2526,7 +2526,7 @@ _020f0f98: .align 2, 0 arm_func_end func_ov02_020f0f14 _020f0fd0: .word 0x00000b33 -_020f0fd4: .word gInventory +_020f0fd4: .word gItemManager .global func_ov02_020f0fd8 arm_func_start func_ov02_020f0fd8 @@ -2586,7 +2586,7 @@ func_ov02_020f0ffc: ; 0x020f0ffc add r2, r1, #0xf mov r1, #0xef bl func_02034b0c - ldr r1, _020f10f4 ; =gInventory + ldr r1, _020f10f4 ; =gItemManager ldr r0, [r6, #0xe8] ldr r7, [r1] bl func_ov02_020eed40 @@ -2609,7 +2609,7 @@ func_ov02_020f0ffc: ; 0x020f0ffc ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov02_020f0ffc -_020f10f4: .word gInventory +_020f10f4: .word gItemManager .global func_ov02_020f10f8 arm_func_start func_ov02_020f10f8 @@ -2620,10 +2620,10 @@ func_ov02_020f10f8: ; 0x020f10f8 mov r4, r1 cmp r0, #2 bne _020f1128 - ldr r0, _020f114c ; =gInventory + ldr r0, _020f114c ; =gItemManager mov r1, #0x14 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _020f1128: @@ -2638,7 +2638,7 @@ _020f1128: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov02_020f10f8 -_020f114c: .word gInventory +_020f114c: .word gItemManager .global func_ov02_020f1150 arm_func_start func_ov02_020f1150 @@ -2876,7 +2876,7 @@ _020f1424: mvn r0, #0 cmp r1, r0 beq _020f14f4 - ldr r2, _020f1504 ; =gInventory + ldr r2, _020f1504 ; =gItemManager mov r0, r5 ldr r6, [r2] blx func_ov09_02118028 @@ -2931,7 +2931,7 @@ _020f14f4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov02_020f1380 -_020f1504: .word gInventory +_020f1504: .word gItemManager .global func_ov02_020f1508 arm_func_start func_ov02_020f1508 @@ -3215,7 +3215,7 @@ _020f183c: ldr r1, [r5, #0x1c] cmp r1, #0 blt _020f18e8 - ldr r0, _020f18f8 ; =gInventory + ldr r0, _020f18f8 ; =gItemManager ldr r0, [r0] blx func_ov00_020ae744 cmp r0, #0 @@ -3262,7 +3262,7 @@ _020f18e8: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov02_020f17a0 -_020f18f8: .word gInventory +_020f18f8: .word gItemManager .global func_ov02_020f18fc arm_func_start func_ov02_020f18fc @@ -5007,7 +5007,7 @@ _020f2e44: .word data_027e1050 func_ov02_020f2e48: ; 0x020f2e48 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r2, _020f2e80 ; =gInventory + ldr r2, _020f2e80 ; =gItemManager ldr r1, [r5, #0x18] ldr r4, [r2] blx func_ov09_02118028 @@ -5021,14 +5021,14 @@ func_ov02_020f2e48: ; 0x020f2e48 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov02_020f2e48 -_020f2e80: .word gInventory +_020f2e80: .word gItemManager .global func_ov02_020f2e84 arm_func_start func_ov02_020f2e84 func_ov02_020f2e84: ; 0x020f2e84 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r2, _020f2f0c ; =gInventory + ldr r2, _020f2f0c ; =gItemManager ldr r1, [r5, #0x18] ldr r4, [r2] blx func_ov09_02118028 @@ -5062,7 +5062,7 @@ func_ov02_020f2e84: ; 0x020f2e84 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov02_020f2e84 -_020f2f0c: .word gInventory +_020f2f0c: .word gItemManager _020f2f10: .word data_ov02_020f6c80 _020f2f14: .word data_ov00_020eec9c _020f2f18: .word data_027e0fbc @@ -5129,7 +5129,7 @@ func_ov02_020f2fb0: ; 0x020f2fb0 arm_func_start func_ov02_020f2fd8 func_ov02_020f2fd8: ; 0x020f2fd8 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _020f3030 ; =gInventory + ldr r1, _020f3030 ; =gItemManager mov r5, r0 ldr r4, [r1] ldr r1, [r5, #0x18] @@ -5152,7 +5152,7 @@ func_ov02_020f2fd8: ; 0x020f2fd8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov02_020f2fd8 -_020f3030: .word gInventory +_020f3030: .word gItemManager .global func_ov02_020f3034 arm_func_start func_ov02_020f3034 @@ -6095,7 +6095,7 @@ _020f3b80: mov r3, #0 str sl, [sp] bl func_0203493c - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager mov r1, r4 ldr r0, [r0] blx func_ov00_020ad930 @@ -6150,7 +6150,7 @@ _020f3c58: bne _020f3d00 mov r0, #0 str r0, [sp, #0x28] - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager mov r1, r4 ldr r0, [r0] blx func_ov00_020ad944 @@ -6188,7 +6188,7 @@ _020f3cc4: bl func_ov02_020f5f98 b _020f3d9c _020f3d00: - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager mov r1, r4 ldr r0, [r0] blx func_ov00_020ad938 @@ -6260,7 +6260,7 @@ _020f3dfc: mov r3, #0 str r6, [sp] bl func_0203493c - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager add r1, r7, #3 ldr r0, [r0] blx func_ov00_020ad930 @@ -6318,7 +6318,7 @@ _020f3edc: bne _020f3f84 mov r0, #0 str r0, [sp, #0x28] - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager add r1, r7, #3 ldr r0, [r0] blx func_ov00_020ad944 @@ -6356,7 +6356,7 @@ _020f3f48: bl func_ov02_020f5f98 b _020f4020 _020f3f84: - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager add r1, r7, #3 ldr r0, [r0] blx func_ov00_020ad938 @@ -6407,7 +6407,7 @@ _020f4020: add sl, sl, #2 cmp r7, #2 blt _020f3dfc - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager mov r1, #5 ldr r0, [r0] blx func_ov00_020ad930 @@ -6493,10 +6493,10 @@ _020f40fc: add r0, sp, #0x28 mov r2, r4 bl func_ov02_020f5f98 - ldr r0, _020f41ec ; =gInventory + ldr r0, _020f41ec ; =gItemManager mov r1, #0x2f ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 addeq sp, sp, #0x6c ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -6516,7 +6516,7 @@ _020f40fc: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov02_020f3ae4 -_020f41ec: .word gInventory +_020f41ec: .word gItemManager _020f41f0: .word data_027e05f4 .global func_ov02_020f41f4 diff --git a/asm/ov03.s b/asm/ov03.s index f652eeb0..d2fc038e 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -5778,10 +5778,10 @@ func_ov03_020f23b4: ; 0x020f23b4 beq _020f24cc b _020f250c _020f23e8: - ldr r0, _020f2518 ; =gInventory + ldr r0, _020f2518 ; =gItemManager mov r1, #0x21 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 addeq sp, sp, #0x18 moveq r0, #1 @@ -5859,7 +5859,7 @@ _020f250c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov03_020f23b4 -_020f2518: .word gInventory +_020f2518: .word gItemManager _020f251c: .word data_027e103c _020f2520: .word data_027e0d38 @@ -11836,9 +11836,9 @@ func_ov03_020f59d4: ; 0x020f59d4 bl func_ov00_02078b40 cmp r0, #2 beq _020f5a6c - ldr r0, _020f5a94 ; =gInventory + ldr r0, _020f5a94 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv cmp r0, #2 ldrsh r0, [r4, #0xe] mov r1, #4 @@ -11880,7 +11880,7 @@ _020f5a6c: .align 2, 0 arm_func_end func_ov03_020f59d4 _020f5a90: .word data_027e0d38 -_020f5a94: .word gInventory +_020f5a94: .word gItemManager .global func_ov03_020f5a98 arm_func_start func_ov03_020f5a98 @@ -12106,7 +12106,7 @@ _020f5d44: .word data_027e0c38 func_ov03_020f5d48: ; 0x020f5d48 push {r4, lr} add r4, r0, #0 - ldr r0, _020f5d6c ; =gInventory + ldr r0, _020f5d6c ; =gItemManager mov r1, #0 ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -12123,7 +12123,7 @@ func_ov03_020f5d48: ; 0x020f5d48 pop {r4, pc} nop thumb_func_end func_ov03_020f5d48 -_020f5d6c: .word gInventory +_020f5d6c: .word gItemManager .global func_ov03_020f5d70 arm_func_start func_ov03_020f5d70 @@ -12238,7 +12238,7 @@ func_ov03_020f5eec: ; 0x020f5eec bl func_ov00_02097738 cmp r0, #0 beq _020f5f3c - ldr r0, _020f6154 ; =gInventory + ldr r0, _020f6154 ; =gItemManager ldr r1, [r6, #0x24] ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -12289,7 +12289,7 @@ _020f5f98: cmp r0, #0 beq _020f6140 _020f5fc4: - ldr r0, _020f6154 ; =gInventory + ldr r0, _020f6154 ; =gItemManager ldr r1, [r6, #0x24] ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -12361,7 +12361,7 @@ _020f60b0: add r0, r1, r0 str r0, [r6, #0x24] _020f60cc: - ldr r0, _020f6154 ; =gInventory + ldr r0, _020f6154 ; =gItemManager ldr r1, [r6, #0x24] ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -12384,7 +12384,7 @@ _020f60f4: ldr r0, _020f6160 ; =data_ov00_020eec9c mov r1, r1, lsr #0x10 bl func_ov00_020d7c8c - ldr r0, _020f6154 ; =gInventory + ldr r0, _020f6154 ; =gItemManager ldr r1, [r6, #0x24] ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -12399,7 +12399,7 @@ _020f6140: .align 2, 0 arm_func_end func_ov03_020f5eec _020f6150: .word data_027e0f74 -_020f6154: .word gInventory +_020f6154: .word gItemManager _020f6158: .word data_027e0e28 _020f615c: .word 0x00001388 _020f6160: .word data_ov00_020eec9c @@ -12415,7 +12415,7 @@ func_ov03_020f6164: ; 0x020f6164 .global func_ov03_020f6170 arm_func_start func_ov03_020f6170 func_ov03_020f6170: ; 0x020f6170 - ldr r1, _020f618c ; =gInventory + ldr r1, _020f618c ; =gItemManager mov r2, #0 ldr r1, [r1] ldrh r1, [r1, #0x22] @@ -12424,7 +12424,7 @@ func_ov03_020f6170: ; 0x020f6170 bx lr .align 2, 0 arm_func_end func_ov03_020f6170 -_020f618c: .word gInventory +_020f618c: .word gItemManager .global func_ov03_020f6190 arm_func_start func_ov03_020f6190 @@ -12677,7 +12677,7 @@ func_ov03_020f63d4: ; 0x020f63d4 bl func_ov03_020f57b8 add r0, r4, #0 bl func_ov03_020f5d48 - ldr r0, _020f6414 ; =gInventory + ldr r0, _020f6414 ; =gItemManager ldr r0, [r0] blx func_ov00_020ae350 mov r1, #0x79 @@ -12697,7 +12697,7 @@ func_ov03_020f63d4: ; 0x020f63d4 .align 2, 0 thumb_func_end func_ov03_020f63d4 _020f6410: .word data_027e0f90 -_020f6414: .word gInventory +_020f6414: .word gItemManager .global func_ov03_020f6418 arm_func_start func_ov03_020f6418 @@ -12980,7 +12980,7 @@ func_ov03_020f6770: ; 0x020f6770 subeq r4, r4, #0xd4 subne r4, r4, #0xe4 _020f680c: - ldr r0, _020f69c8 ; =gInventory + ldr r0, _020f69c8 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad790 @@ -13048,7 +13048,7 @@ _020f68d8: blx r5 cmp r0, #0 beq _020f69a8 - ldr r0, _020f69c8 ; =gInventory + ldr r0, _020f69c8 ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad790 @@ -13059,12 +13059,12 @@ _020f68d8: bl func_ov00_020d77e4 b _020f69a8 _020f693c: - ldr r0, _020f69c8 ; =gInventory + ldr r0, _020f69c8 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory15GetEquippedItemEv + bl _ZNK11ItemManager15GetEquippedItemEv cmp r0, #7 bne _020f69a8 - ldr r0, _020f69c8 ; =gInventory + ldr r0, _020f69c8 ; =gItemManager mov r1, #7 ldr r0, [r0] bl func_ov00_020ad714 @@ -13098,7 +13098,7 @@ _020f69b8: .word data_027e0c68 _020f69bc: .word data_027e103c _020f69c0: .word 0x000004cc _020f69c4: .word data_027e0c38 -_020f69c8: .word gInventory +_020f69c8: .word gItemManager _020f69cc: .word data_027e0d78 _020f69d0: .word data_ov00_020eec9c _020f69d4: .word data_027e0f64 @@ -13171,7 +13171,7 @@ func_ov03_020f6a88: ; 0x020f6a88 bl func_ov00_02078b40 cmp r0, #2 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _020f6b10 ; =gInventory + ldr r0, _020f6b10 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae350 ldr r1, [r5, #0x1e4] @@ -13202,7 +13202,7 @@ _020f6af8: .align 2, 0 arm_func_end func_ov03_020f6a88 _020f6b0c: .word data_027e0d38 -_020f6b10: .word gInventory +_020f6b10: .word gItemManager _020f6b14: .word 0x00007530 .global func_ov03_020f6b18 @@ -13524,7 +13524,7 @@ _020f6f58: addeq sp, sp, #0x10 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, _020f7008 ; =data_027e0c38 - ldr r1, _020f700c ; =gInventory + ldr r1, _020f700c ; =gItemManager ldr r0, [r0, #0x10] ldr r5, [r1] cmp r0, #0 @@ -13541,7 +13541,7 @@ _020f6f58: cmp r7, #0x10 mov r0, r5 movge r7, #0x10 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv cmp r0, #2 moveq r5, #1 str r6, [sp] @@ -13564,7 +13564,7 @@ _020f6ffc: .word data_027e0f74 _020f7000: .word data_027e0f90 _020f7004: .word data_027e0cbc _020f7008: .word data_027e0c38 -_020f700c: .word gInventory +_020f700c: .word gItemManager .global func_ov03_020f7010 arm_func_start func_ov03_020f7010 @@ -13599,7 +13599,7 @@ _020f704c: strne r0, [r4, #0x1ec] ldmia sp!, {r4, pc} _020f7068: - ldr r0, _020f70bc ; =gInventory + ldr r0, _020f70bc ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad790 @@ -13623,7 +13623,7 @@ _020f70ac: .align 2, 0 arm_func_end func_ov03_020f7020 _020f70b8: .word data_027e103c -_020f70bc: .word gInventory +_020f70bc: .word gItemManager _020f70c0: .word data_027e0fb8 _020f70c4: .word data_027e05f8 @@ -13649,7 +13649,7 @@ func_ov03_020f70c8: ; 0x020f70c8 mov r4, #0 cmp r1, #1 bne _020f7128 - ldr r0, _020f72ac ; =gInventory + ldr r0, _020f72ac ; =gItemManager ldr r0, [r0] ldr r0, [r0] cmp r0, #7 @@ -13692,7 +13692,7 @@ _020f71a4: beq _020f721c add r0, sp, #0xc bl func_01ffbe34 - ldr r0, _020f72ac ; =gInventory + ldr r0, _020f72ac ; =gItemManager ldr r0, [r0] ldr r0, [r0] bl func_ov14_021538b8 @@ -13738,7 +13738,7 @@ _020f7240: add r0, r0, r7 add r1, r1, r6 bl func_ov14_02153924 - ldr r0, _020f72ac ; =gInventory + ldr r0, _020f72ac ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad790 @@ -13759,7 +13759,7 @@ _020f7240: .align 2, 0 arm_func_end func_ov03_020f70c8 _020f72a8: .word data_027e0c38 -_020f72ac: .word gInventory +_020f72ac: .word gItemManager _020f72b0: .word data_027e103c .global func_ov03_020f72b4 @@ -13852,7 +13852,7 @@ func_ov03_020f7398: ; 0x020f7398 bne _020f7404 tst ip, #0xe beq _020f7404 - ldr r0, _020f7410 ; =gInventory + ldr r0, _020f7410 ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad790 @@ -13875,7 +13875,7 @@ _020f7404: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov03_020f7398 -_020f7410: .word gInventory +_020f7410: .word gItemManager .global func_ov03_020f7414 arm_func_start func_ov03_020f7414 @@ -13891,7 +13891,7 @@ func_ov03_020f7414: ; 0x020f7414 ands r7, ip, #0xe mov r6, #0 beq _020f747c - ldr r0, _020f74b4 ; =gInventory + ldr r0, _020f74b4 ; =gItemManager mov r1, r6 ldr r0, [r0] bl func_ov00_020ad790 @@ -13924,7 +13924,7 @@ _020f74a8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov03_020f7414 -_020f74b4: .word gInventory +_020f74b4: .word gItemManager .global func_ov03_020f74b8 arm_func_start func_ov03_020f74b8 @@ -16274,7 +16274,7 @@ _020f8ec4: strb r0, [r7, #0x24c] _020f8f80: mvn fp, #0 - ldr sl, _020f92ec ; =gInventory + ldr sl, _020f92ec ; =gItemManager str fp, [sp, #4] str fp, [sp, #8] add r4, r7, #0x80 @@ -16311,28 +16311,28 @@ _020f8fec: ; jump table _020f8ffc: ldr r0, [sl] mov r1, #0x21 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f9058 b _020f91c0 _020f9014: ldr r0, [sl] mov r1, #0x23 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f9058 b _020f91c0 _020f902c: ldr r0, [sl] mov r1, #0x22 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f9058 b _020f91c0 _020f9044: ldr r0, [sl] mov r1, #0x24 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f91c0 _020f9058: @@ -16440,7 +16440,7 @@ _020f91c0: cmp r8, #0x14 blt _020f8f9c _020f91d4: - ldr r4, _020f92ec ; =gInventory + ldr r4, _020f92ec ; =gItemManager ldr sl, _020f92fc ; =data_027e0f74 mov r8, r7 add sb, r7, #0x20 @@ -16457,7 +16457,7 @@ _020f91f4: ; jump table _020f9204: ldr r0, [r4] mov r1, #0x21 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f92c8 ldr r0, [sl] @@ -16474,21 +16474,21 @@ _020f9204: _020f9244: ldr r0, [r4] mov r1, #0x23 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f9288 b _020f92c8 _020f925c: ldr r0, [r4] mov r1, #0x22 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _020f9288 b _020f92c8 _020f9274: ldr r0, [r4] mov r1, #0x24 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _020f92c8 _020f9288: @@ -16520,7 +16520,7 @@ _020f92c8: .align 2, 0 arm_func_end func_ov03_020f8e48 _020f92e8: .word data_027e0d78 -_020f92ec: .word gInventory +_020f92ec: .word gItemManager _020f92f0: .word data_027e0f7c _020f92f4: .word data_027e0d38 _020f92f8: .word data_ov00_020eec9c @@ -16877,25 +16877,25 @@ _020f97b4: add r8, r8, #0x18 add sb, sb, #0x18 blt _020f976c - ldr r0, _020f9a74 ; =gInventory + ldr r0, _020f9a74 ; =gItemManager mov r1, #0x21 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj - ldr r1, _020f9a74 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _020f9a74 ; =gItemManager strb r0, [sp, #0x44] ldr r0, [r1] mov r1, #0x22 - bl _ZN9Inventory7HasItemEj - ldr r1, _020f9a74 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _020f9a74 ; =gItemManager strb r0, [sp, #0x45] ldr r0, [r1] mov r1, #0x23 - bl _ZN9Inventory7HasItemEj - ldr r1, _020f9a74 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _020f9a74 ; =gItemManager strb r0, [sp, #0x46] ldr r0, [r1] mov r1, #0x24 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj strb r0, [sp, #0x47] ldr r0, [sp, #0x10] mov r5, #4 @@ -17059,7 +17059,7 @@ _020f9a64: .word data_027e0f7c _020f9a68: .word data_027e0d3c _020f9a6c: .word data_027e0f74 _020f9a70: .word data_027e0c38 -_020f9a74: .word gInventory +_020f9a74: .word gItemManager _020f9a78: .word data_ov03_020ff634 .global func_ov03_020f9a7c diff --git a/asm/ov04.s b/asm/ov04.s index 00011fa4..902b6b89 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -9556,13 +9556,13 @@ _021056b4: .word 0x0000011b .global func_ov04_021056b8 thumb_func_start func_ov04_021056b8 func_ov04_021056b8: ; 0x021056b8 - ldr r0, _021056c0 ; =gInventory + ldr r0, _021056c0 ; =gItemManager ldr r3, _021056c4 ; =func_ov04_02107750 ldr r0, [r0] bx r3 .align 2, 0 thumb_func_end func_ov04_021056b8 -_021056c0: .word gInventory +_021056c0: .word gItemManager _021056c4: .word func_ov04_02107750 .global func_ov04_021056c8 @@ -13252,9 +13252,9 @@ _021071ca: .align 2, 0 thumb_func_end func_ov04_021071bc - .global _ZN9InventoryC1Ev - thumb_func_start _ZN9InventoryC1Ev -_ZN9InventoryC1Ev: ; 0x021071d4 + .global _ZN11ItemManagerC1Ev + thumb_func_start _ZN11ItemManagerC1Ev +_ZN11ItemManagerC1Ev: ; 0x021071d4 push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 mov r0, #0 @@ -13407,7 +13407,7 @@ _021072f0: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_end _ZN9InventoryC1Ev + thumb_func_end _ZN11ItemManagerC1Ev _02107308: .word 0x00008ca0 _0210730c: .word data_027e0ce0 _02107310: .word data_027e0618 @@ -13631,9 +13631,9 @@ _021074dc: .word 0x494d4e47 _021074e0: .word data_027e0d38 _021074e4: .word 0x0000014d - .global _ZN9InventoryD1Ev - thumb_func_start _ZN9InventoryD1Ev -_ZN9InventoryD1Ev: ; 0x021074e8 + .global _ZN11ItemManagerD1Ev + thumb_func_start _ZN11ItemManagerD1Ev +_ZN11ItemManagerD1Ev: ; 0x021074e8 push {r4, lr} add r4, r0, #0 add r0, #0xb0 @@ -13646,7 +13646,7 @@ _ZN9InventoryD1Ev: ; 0x021074e8 add r0, r4, #0 pop {r4, pc} .align 2, 0 - thumb_func_end _ZN9InventoryD1Ev + thumb_func_end _ZN11ItemManagerD1Ev .global func_ov04_02107504 thumb_func_start func_ov04_02107504 @@ -14380,7 +14380,7 @@ func_ov04_02107aa0: ; 0x02107aa0 ldr r0, _02107b4c ; =data_ov00_020e6560 mov r1, #0xd str r0, [r4] - ldr r0, _02107b50 ; =gInventory + ldr r0, _02107b50 ; =gItemManager ldr r0, [r0] blx func_ov00_020ad52c add r1, r0, #0 @@ -14388,7 +14388,7 @@ func_ov04_02107aa0: ; 0x02107aa0 lsl r0, r0, #2 add r0, r4, r0 bl func_ov00_020a9588 - ldr r0, _02107b50 ; =gInventory + ldr r0, _02107b50 ; =gItemManager mov r1, #0xd ldr r0, [r0] blx func_ov00_020ad52c @@ -14457,7 +14457,7 @@ func_ov04_02107aa0: ; 0x02107aa0 .align 2, 0 thumb_func_end func_ov04_02107aa0 _02107b4c: .word data_ov00_020e6560 -_02107b50: .word gInventory +_02107b50: .word gItemManager _02107b54: .word data_ov04_02110540 _02107b58: .word func_ov00_020b7d74 _02107b5c: .word func_ov04_021079d4 @@ -14468,7 +14468,7 @@ _02107b60: .word data_02057200 func_ov04_02107b64: ; 0x02107b64 push {r4, lr} add r4, r0, #0 - ldr r0, _02107bf4 ; =gInventory + ldr r0, _02107bf4 ; =gItemManager ldr r1, _02107bf8 ; =data_ov00_020dc7d0 ldr r0, [r0] blx func_ov00_020ad538 @@ -14532,7 +14532,7 @@ func_ov04_02107b64: ; 0x02107b64 pop {r4, pc} .align 2, 0 thumb_func_end func_ov04_02107b64 -_02107bf4: .word gInventory +_02107bf4: .word gItemManager _02107bf8: .word data_ov00_020dc7d0 _02107bfc: .word 0x000003c6 @@ -14936,7 +14936,7 @@ func_ov04_02107e9c: ; 0x02107e9c strb r1, [r4, #0xe] strb r1, [r4, #0xf] bl func_ov04_0210b13c - bl _ZN9Inventory6CreateEv + bl _ZN11ItemManager6CreateEv ldr r0, _02107f20 ; =data_027e0618 ldr r0, [r0] cmp r0, #2 @@ -14955,17 +14955,17 @@ func_ov04_02107e9c: ; 0x02107e9c strh r0, [r4, #0xa] ldr r0, _02107f28 ; =data_ov00_020e9e94 blx func_020078d8 - ldr r0, _02107f2c ; =gInventory + ldr r0, _02107f2c ; =gItemManager ldr r1, _02107f30 ; =data_ov00_020e9e18 ldr r0, [r0] - bl _ZN9Inventory4LoadEPK13SaveInventory + bl _ZN11ItemManager4LoadEPK15SaveItemManager _02107ef6: ldr r0, _02107f34 ; =data_027e0fb8 ldr r0, [r0] bl func_ov00_020aef30 - ldr r0, _02107f2c ; =gInventory + ldr r0, _02107f2c ; =gItemManager ldr r0, [r0] - bl _ZN9Inventory21ClearPrevEquippedItemEv + bl _ZN11ItemManager21ClearPrevEquippedItemEv add r0, r4, #0 bl func_ov00_020b8060 mov r0, #4 @@ -14980,7 +14980,7 @@ _02107f1c: .word data_ov00_020dc7cc _02107f20: .word data_027e0618 _02107f24: .word data_ov00_020e9e98 _02107f28: .word data_ov00_020e9e94 -_02107f2c: .word gInventory +_02107f2c: .word gItemManager _02107f30: .word data_ov00_020e9e18 _02107f34: .word data_027e0fb8 @@ -14989,7 +14989,7 @@ _02107f34: .word data_027e0fb8 func_ov04_02107f38: ; 0x02107f38 push {r4, lr} add r4, r0, #0 - bl _ZN9Inventory7DestroyEv + bl _ZN11ItemManager7DestroyEv bl func_ov04_0210b160 add r0, r4, #0 pop {r4, pc} @@ -15068,7 +15068,7 @@ _02107fd0: _02107fd6: bl func_ov14_0213eeb4 _02107fda: - ldr r0, _02108000 ; =gInventory + ldr r0, _02108000 ; =gItemManager ldr r0, [r0] bl func_ov04_02107314 ldr r0, _02108004 ; =data_027e0fb8 @@ -15082,7 +15082,7 @@ _02107ff0: .word data_027e0618 _02107ff4: .word data_ov09_0211f530 _02107ff8: .word data_027e0d38 _02107ffc: .word data_027e0f7c -_02108000: .word gInventory +_02108000: .word gItemManager _02108004: .word data_027e0fb8 .global func_ov04_02108008 @@ -15093,7 +15093,7 @@ func_ov04_02108008: ; 0x02108008 ldr r0, _0210804c ; =data_027e0fb8 ldr r0, [r0] bl func_ov04_0210b1d0 - ldr r0, _02108050 ; =gInventory + ldr r0, _02108050 ; =gItemManager ldr r0, [r0] bl func_ov04_021076bc ldr r0, _02108054 ; =data_027e0618 @@ -15117,7 +15117,7 @@ _02108048: nop thumb_func_end func_ov04_02108008 _0210804c: .word data_027e0fb8 -_02108050: .word gInventory +_02108050: .word gItemManager _02108054: .word data_027e0618 _02108058: .word data_ov09_0211f530 _0210805c: .word data_027e0d38 @@ -22706,7 +22706,7 @@ func_ov04_0210ba8c: ; 0x0210ba8c strh r0, [r5, #0xe] str r1, [r5, #0x10] str r1, [r5, #0x14] - ldr r0, _0210bc08 ; =gInventory + ldr r0, _0210bc08 ; =gItemManager mov r1, #2 ldr r0, [r0] blx func_ov00_020ad52c @@ -22722,7 +22722,7 @@ func_ov04_0210ba8c: ; 0x0210ba8c bl func_ov00_020a9588 _0210bad0: str r0, [r5, #0x10] - ldr r0, _0210bc08 ; =gInventory + ldr r0, _0210bc08 ; =gItemManager ldr r1, _0210bc10 ; =data_ov04_0210f940 ldr r0, [r0] blx func_ov00_020ad538 @@ -22868,7 +22868,7 @@ _0210bbfe: nop thumb_func_end func_ov04_0210ba8c _0210bc04: .word data_ov00_020e7048 -_0210bc08: .word gInventory +_0210bc08: .word gItemManager _0210bc0c: .word data_027e0ce0 _0210bc10: .word data_ov04_0210f940 _0210bc14: .word data_027e0fc4 diff --git a/asm/ov05.s b/asm/ov05.s index 54dad4e0..e973fc89 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -4629,7 +4629,7 @@ _02104664: addeq sp, sp, #0x2c ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r5, _02104738 ; =data_027e0f7c - ldr r6, _02104740 ; =gInventory + ldr r6, _02104740 ; =gItemManager add r4, r4, #0x200 add fp, sp, #8 add r8, sp, #0xc @@ -4639,7 +4639,7 @@ _02104694: beq _0210471c ldr r0, [r6] add r1, sb, #0x60 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0210471c ldr r0, [r6] @@ -4680,7 +4680,7 @@ _02104730: .word data_027e1054 _02104734: .word data_027e0d38 _02104738: .word data_027e0f7c _0210473c: .word data_027e0d3c -_02104740: .word gInventory +_02104740: .word gItemManager .global func_ov05_02104744 arm_func_start func_ov05_02104744 @@ -4769,10 +4769,10 @@ _0210485c: bl func_ov00_02097760 cmp r0, #0 beq _021048a8 - ldr r0, _02104a38 ; =gInventory + ldr r0, _02104a38 ; =gItemManager mov r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _021048a8 mov r2, #0 @@ -4790,7 +4790,7 @@ _021048a8: cmp r0, #0 addeq sp, sp, #0x34 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _02104a38 ; =gInventory + ldr r0, _02104a38 ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020adabc @@ -4829,10 +4829,10 @@ _0210493c: cmp r1, #0 addeq sp, sp, #0x34 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _02104a38 ; =gInventory + ldr r0, _02104a38 ; =gItemManager mov r1, #0x16 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 addne sp, sp, #0x34 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -4888,7 +4888,7 @@ _02104a28: .word data_027e1054 _02104a2c: .word data_027e0d3c _02104a30: .word data_027e0f74 _02104a34: .word 0x0000015f -_02104a38: .word gInventory +_02104a38: .word gItemManager _02104a3c: .word data_027e0f7c _02104a40: .word data_027e077c _02104a44: .word 0x00000125 @@ -6350,7 +6350,7 @@ func_ov05_02105dac: ; 0x02105dac bl func_ov00_020a8ba0 cmp r0, #0 bne _02105dec - ldr r0, _021065e8 ; =gInventory + ldr r0, _021065e8 ; =gItemManager ldr r0, [r0] ldr r0, [r0] sub r0, r0, #9 @@ -6905,7 +6905,7 @@ _021065a8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov05_02105dac -_021065e8: .word gInventory +_021065e8: .word gItemManager _021065ec: .word data_ov05_0211252c _021065f0: .word data_027e0fb8 _021065f4: .word 0x00000ccd @@ -7071,10 +7071,10 @@ _02106810: bl func_ov05_02106c80 cmp r0, #3 blt _02106874 - ldr r0, _02106890 ; =gInventory + ldr r0, _02106890 ; =gItemManager mov r1, #0x2d ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _02106874 ldr r0, [r6, #0x1c] @@ -7102,7 +7102,7 @@ _02106874: .align 2, 0 arm_func_end func_ov05_02106740 _0210688c: .word data_027e0fb8 -_02106890: .word gInventory +_02106890: .word gItemManager .global func_ov05_02106894 arm_func_start func_ov05_02106894 @@ -9632,7 +9632,7 @@ _02108ad4: blx func_ov09_0211cac0 b _02108be8 _02108af4: - ldr r0, _02108cf0 ; =gInventory + ldr r0, _02108cf0 ; =gItemManager cmp r1, #0x85 moveq r5, #1 ldr r0, [r0] @@ -9684,7 +9684,7 @@ _02108b9c: blx func_ov09_0211ca20 b _02108be8 _02108bb4: - ldr r0, _02108cf0 ; =gInventory + ldr r0, _02108cf0 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae598 cmp r0, #0 @@ -9692,7 +9692,7 @@ _02108bb4: strne r0, [r4, #0x74] b _02108be8 _02108bd0: - ldr r0, _02108cf0 ; =gInventory + ldr r0, _02108cf0 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae598 cmp r0, #0 @@ -9723,7 +9723,7 @@ _02108c34: bl func_ov00_020a8158 mov r0, #0 strh r0, [r4, #0x78] - ldr r0, _02108cf0 ; =gInventory + ldr r0, _02108cf0 ; =gItemManager ldr r1, [r4, #0x74] ldr r0, [r0] blx func_ov00_020adb30 @@ -9771,7 +9771,7 @@ _02108ce0: .word data_027e0fb8 _02108ce4: .word data_027e103c _02108ce8: .word 0x00002a30 _02108cec: .word 0x00008ca0 -_02108cf0: .word gInventory +_02108cf0: .word gItemManager _02108cf4: .word data_027e0764 _02108cf8: .word data_ov09_0211f5dc _02108cfc: .word data_ov05_021127c0 @@ -9881,7 +9881,7 @@ _02108e44: mov r0, r5 ldr r1, [r1, #0x68] bl func_ov00_020a8ad0 - ldr r0, _02108e88 ; =gInventory + ldr r0, _02108e88 ; =gItemManager mov r1, r4 ldr r0, [r0] blx func_ov00_020adb30 @@ -9890,7 +9890,7 @@ _02108e44: arm_func_end func_ov05_02108e08 _02108e80: .word data_ov05_021127d0 _02108e84: .word data_ov05_02112770 -_02108e88: .word gInventory +_02108e88: .word gItemManager .global func_ov05_02108e8c arm_func_start func_ov05_02108e8c @@ -10292,24 +10292,24 @@ _02109408: ; jump table b _02109438 ; case 4 b _02109450 ; case 5 _02109420: - ldr r0, _02109524 ; =gInventory + ldr r0, _02109524 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r4, r0 b _02109464 _02109438: - ldr r0, _02109524 ; =gInventory + ldr r0, _02109524 ; =gItemManager mov r1, #2 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r4, r0 b _02109464 _02109450: - ldr r0, _02109524 ; =gInventory + ldr r0, _02109524 ; =gItemManager mov r1, r4 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r4, r0 _02109464: cmp r4, #0 @@ -10363,7 +10363,7 @@ _02109514: .word data_027e0f74 _02109518: .word data_027e0f64 _0210951c: .word data_ov00_020eec68 _02109520: .word data_ov05_02112770 -_02109524: .word gInventory +_02109524: .word gItemManager _02109528: .word 0xfffffccd .global func_ov05_0210952c @@ -10643,7 +10643,7 @@ _0210989c: blx func_ov00_020ad020 cmp r0, #0 bne _021098bc - ldr r0, _021099cc ; =gInventory + ldr r0, _021099cc ; =gItemManager ldr r1, [r5, #0x74] ldr r0, [r0] blx func_ov00_020adcdc @@ -10723,7 +10723,7 @@ _021099bc: .word data_027e0fbc _021099c0: .word data_027e103c _021099c4: .word 0x424b4559 _021099c8: .word 0x43525953 -_021099cc: .word gInventory +_021099cc: .word gItemManager _021099d0: .word data_027e0c68 _021099d4: .word data_027e0f64 _021099d8: .word data_027e0e58 @@ -10733,14 +10733,14 @@ _021099d8: .word data_027e0e58 func_ov05_021099dc: ; 0x021099dc stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc - ldr r1, _02109cb4 ; =gInventory + ldr r1, _02109cb4 ; =gItemManager mov r5, r0 ldr r4, [r1] mov r0, r4 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r4 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldrsh r1, [r5, #0x80] mov r4, r0 cmp r1, #4 @@ -10929,7 +10929,7 @@ _02109cac: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov05_021099dc -_02109cb4: .word gInventory +_02109cb4: .word gItemManager _02109cb8: .word 0x00000e39 _02109cbc: .word data_027e0d0c _02109cc0: .word 0x00780335 @@ -11085,7 +11085,7 @@ func_ov05_02109e84: ; 0x02109e84 str r3, [sp, #4] mov r0, #1 str r0, [sp, #8] - ldr r0, _02109f20 ; =gInventory + ldr r0, _02109f20 ; =gItemManager ldr r1, _02109f24 ; =data_ov05_02112820 ldr r0, [r0] ldr r2, _02109f28 ; =data_ov05_02112838 @@ -11104,7 +11104,7 @@ func_ov05_02109e84: ; 0x02109e84 .align 2, 0 arm_func_end func_ov05_02109e84 _02109f1c: .word data_ov00_020e62d8 -_02109f20: .word gInventory +_02109f20: .word gItemManager _02109f24: .word data_ov05_02112820 _02109f28: .word data_ov05_02112838 @@ -11288,7 +11288,7 @@ _0210a154: cmp r0, #0x4c addne sp, sp, #0xd0 ldmneia sp!, {r4, r5, r6, pc} - ldr r0, _0210a4b4 ; =gInventory + ldr r0, _0210a4b4 ; =gItemManager mov r1, #0xb ldr r0, [r0] bl func_ov00_020ad52c @@ -11391,7 +11391,7 @@ _0210a2c4: add sp, sp, #0xd0 ldmia sp!, {r4, r5, r6, pc} _0210a2e4: - ldr r0, _0210a4b4 ; =gInventory + ldr r0, _0210a4b4 ; =gItemManager mov r1, #0 ldr r3, [r0] mov r2, r1 @@ -11513,7 +11513,7 @@ _0210a4ac: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov05_0210a110 -_0210a4b4: .word gInventory +_0210a4b4: .word gItemManager _0210a4b8: .word data_ov05_02112308 _0210a4bc: .word data_ov05_02112770 _0210a4c0: .word data_02050f54 @@ -11565,7 +11565,7 @@ func_ov05_0210a4e0: ; 0x0210a4e0 ldrsh r1, [r3, r4] ldrsh r2, [r3, r2] blx func_01ff8214 - ldr r1, _0210a608 ; =gInventory + ldr r1, _0210a608 ; =gItemManager ldr r0, _0210a60c ; =data_ov00_020e9360 ldr r2, [r1] mov r1, #2 @@ -11584,7 +11584,7 @@ func_ov05_0210a4e0: ; 0x0210a4e0 blx r1 mov r1, #1 bl func_0201987c - ldr r0, _0210a608 ; =gInventory + ldr r0, _0210a608 ; =gItemManager add r1, sp, #0 ldr r0, [r0] blx func_ov00_020adca8 @@ -11611,7 +11611,7 @@ _0210a5e4: arm_func_end func_ov05_0210a4e0 _0210a600: .word data_ov05_02112770 _0210a604: .word data_02050f54 -_0210a608: .word gInventory +_0210a608: .word gItemManager _0210a60c: .word data_ov00_020e9360 .global func_ov05_0210a610 @@ -11819,7 +11819,7 @@ _0210a830: ldr r1, [r4, #4] ldr r0, _0210aadc ; =0x424f4d42 cmp r1, r0 - ldr r0, _0210aae0 ; =gInventory + ldr r0, _0210aae0 ; =gItemManager movne r5, #1 ldr r0, [r0] ldr r0, [r0] @@ -11981,7 +11981,7 @@ _0210aac0: arm_func_end func_ov05_0210a7d4 _0210aad8: .word data_027e0e60 _0210aadc: .word 0x424f4d42 -_0210aae0: .word gInventory +_0210aae0: .word gItemManager _0210aae4: .word 0x43525953 _0210aae8: .word data_027e0d0c _0210aaec: .word 0x424d5459 @@ -12056,18 +12056,18 @@ _0210aba8: add r1, sp, #0x18 ldr r2, [r2, #0x34] blx r2 - ldr r0, _0210ad74 ; =gInventory + ldr r0, _0210ad74 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj - ldr r1, _0210ad74 ; =gInventory + bl _ZNK11ItemManager8GetFairyEj + ldr r1, _0210ad74 ; =gItemManager mov r4, r0 ldr r7, [r1] mov r0, r7 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r7 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r5, r4 bne _0210ac7c mov r0, #0x10000 @@ -12104,13 +12104,13 @@ _0210ac64: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, pc} _0210ac7c: - ldr r0, _0210ad74 ; =gInventory + ldr r0, _0210ad74 ; =gItemManager ldr r4, [r0] mov r0, r4 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r4 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, r5 mov r0, r6 beq _0210ad00 @@ -12170,7 +12170,7 @@ _0210ad54: _0210ad68: .word data_027e0fe4 _0210ad6c: .word data_027e0d38 _0210ad70: .word data_027e0f74 -_0210ad74: .word gInventory +_0210ad74: .word gItemManager _0210ad78: .word 0x00000aab _0210ad7c: .word 0x0000071c _0210ad80: .word 0xfffff555 @@ -14065,7 +14065,7 @@ _0210c818: ldmia sp!, {r3, r4, r5, r6, r7, pc} _0210c824: ldr r1, [r7, #0x24] - ldr r0, _0210c978 ; =gInventory + ldr r0, _0210c978 ; =gItemManager str r1, [sp, #0xc] ldr r1, [r7, #0x28] ldr r0, [r0] @@ -14073,7 +14073,7 @@ _0210c824: ldr r2, [r7, #0x2c] mov r1, #0 str r2, [sp, #0x14] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, _0210c950 ; =data_027e0e60 mov r4, r0 ldr r0, [r1] @@ -14153,7 +14153,7 @@ _0210c968: .word 0x00020007 _0210c96c: .word data_027e0c68 _0210c970: .word 0x424b4559 _0210c974: .word 0x464f5243 -_0210c978: .word gInventory +_0210c978: .word gItemManager _0210c97c: .word 0x000004cd .global func_ov05_0210c980 @@ -17164,7 +17164,7 @@ _0210f244: bl func_ov00_020a8c14 cmp r0, #0 bgt _0210f298 - ldr r0, _0210f6c4 ; =gInventory + ldr r0, _0210f6c4 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae5d0 cmp r0, #0 @@ -17473,7 +17473,7 @@ _0210f6b4: .word data_ov00_020e5acc _0210f6b8: .word data_027e0f64 _0210f6bc: .word data_027e0618 _0210f6c0: .word data_ov00_020dc55c -_0210f6c4: .word gInventory +_0210f6c4: .word gItemManager _0210f6c8: .word data_ov00_020eec9c _0210f6cc: .word data_027e103c _0210f6d0: .word data_ov05_02112a7c diff --git a/asm/ov09.s b/asm/ov09.s index 29b6d0ca..aafcfd22 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -3800,7 +3800,7 @@ func_ov09_021149d8: ; 0x021149d8 _02114a44: add r0, r5, r4 str r7, [r0, #0x14] - ldr r0, _02114b14 ; =gInventory + ldr r0, _02114b14 ; =gItemManager add r1, r6, #0 ldr r0, [r0] bl func_ov00_020ad8e0 @@ -3895,7 +3895,7 @@ _02114ae2: thumb_func_end func_ov09_021149d8 _02114b0c: .word data_ov09_0211e8b4 _02114b10: .word data_ov09_0211e9a4 -_02114b14: .word gInventory +_02114b14: .word gItemManager _02114b18: .word data_027e1040 _02114b1c: .word data_ov09_0211da34 _02114b20: .word data_027e0ce0 @@ -3968,7 +3968,7 @@ func_ov09_02114b30: ; 0x02114b30 _02114b9c: add r0, r5, r4 str r7, [r0, #0x14] - ldr r0, _02114c6c ; =gInventory + ldr r0, _02114c6c ; =gItemManager add r1, r6, #0 ldr r0, [r0] bl func_ov00_020ad8e0 @@ -4063,7 +4063,7 @@ _02114c3a: thumb_func_end func_ov09_02114b30 _02114c64: .word data_ov09_0211e8b4 _02114c68: .word data_ov09_0211e9a4 -_02114c6c: .word gInventory +_02114c6c: .word gItemManager _02114c70: .word data_027e1040 _02114c74: .word data_ov09_0211da34 _02114c78: .word data_027e0ce0 @@ -7569,7 +7569,7 @@ _02117054: ldr r0, [r0, #0x3c] str r1, [r5, #0x10] str r0, [r5, #0x14] - ldr r0, _0211711c ; =gInventory + ldr r0, _0211711c ; =gItemManager str r6, [r5, #0x18] ldr r4, [r0] add r0, r5, #0 @@ -7657,7 +7657,7 @@ _0211710a: nop thumb_func_end func_ov09_02117048 _02117118: .word data_ov09_0211eaa4 -_0211711c: .word gInventory +_0211711c: .word gItemManager _02117120: .word 0x00001420 _02117124: .word 0x0000141c _02117128: .word 0x00001230 @@ -9087,7 +9087,7 @@ _02117c20: bl func_ov09_02117f18 add r4, r0, #0 bmi _02117d2c - ldr r0, _02117d8c ; =gInventory + ldr r0, _02117d8c ; =gItemManager ldr r1, [r7, #0x18] ldr r0, [r0] str r0, [sp, #0x20] @@ -9145,7 +9145,7 @@ _02117ca4: _02117caa: ldr r0, _02117d94 ; =0x00000dfc str r1, [r5, r0] - ldr r0, _02117d8c ; =gInventory + ldr r0, _02117d8c ; =gItemManager ldr r1, [r7, #0x18] ldr r0, [r0] str r0, [sp, #0x1c] @@ -9259,7 +9259,7 @@ _02117d7c: _02117d80: .word data_ov09_0211db0c _02117d84: .word 0x00000f9c _02117d88: .word 0x0000141c -_02117d8c: .word gInventory +_02117d8c: .word gItemManager _02117d90: .word 0x000007fc _02117d94: .word 0x00000dfc _02117d98: .word 0x00000e0c @@ -10965,7 +10965,7 @@ func_ov09_021189f8: ; 0x021189f8 str r0, [sp, #0x10] sub r4, #0x1a _02118a22: - ldr r0, _02118b10 ; =gInventory + ldr r0, _02118b10 ; =gItemManager ldr r1, [sp, #0x18] ldr r0, [r0] bl func_ov00_020ad918 @@ -11078,7 +11078,7 @@ _02118aea: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov09_021189f8 -_02118b10: .word gInventory +_02118b10: .word gItemManager .global func_ov09_02118b14 thumb_func_start func_ov09_02118b14 @@ -16124,7 +16124,7 @@ _0211c054: mov r0, #1 str r0, [sp] str r0, [sp, #4] - ldr r0, _0211c0a0 ; =gInventory + ldr r0, _0211c0a0 ; =gItemManager str r4, [sp, #8] ldr r1, [r0] mov r0, #0x12 @@ -16148,7 +16148,7 @@ _0211c08c: pop {r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c020 -_0211c0a0: .word gInventory +_0211c0a0: .word gItemManager .global func_ov09_0211c0a4 arm_func_start func_ov09_0211c0a4 @@ -16262,7 +16262,7 @@ _0211c162: mov r3, #0 str r3, [sp] str r3, [sp, #4] - ldr r0, _0211c1a4 ; =gInventory + ldr r0, _0211c1a4 ; =gItemManager str r5, [sp, #8] ldr r1, [r0] mov r0, #0x12 @@ -16285,7 +16285,7 @@ _0211c190: pop {r3, r4, r5, r6, pc} .align 2, 0 thumb_func_end func_ov09_0211c144 -_0211c1a4: .word gInventory +_0211c1a4: .word gItemManager .global func_ov09_0211c1a8 arm_func_start func_ov09_0211c1a8 @@ -16939,7 +16939,7 @@ _0211c6b0: .word 0x03210048 func_ov09_0211c6b4: ; 0x0211c6b4 push {r3, r4, r5, r6, r7, lr} mov r5, #0 - ldr r4, _0211c6fc ; =gInventory + ldr r4, _0211c6fc ; =gItemManager add r6, r5, #0 add r7, r5, #0 _0211c6be: @@ -16973,19 +16973,19 @@ _0211c6f2: pop {r3, r4, r5, r6, r7, pc} nop thumb_func_end func_ov09_0211c6b4 -_0211c6fc: .word gInventory +_0211c6fc: .word gItemManager .global func_ov09_0211c700 thumb_func_start func_ov09_0211c700 func_ov09_0211c700: ; 0x0211c700 push {r3, lr} - ldr r0, _0211c720 ; =gInventory + ldr r0, _0211c720 ; =gItemManager mov r1, #3 ldr r0, [r0] bl func_ov00_020ad8e0 cmp r0, #0 bge _0211c71c - ldr r0, _0211c720 ; =gInventory + ldr r0, _0211c720 ; =gItemManager mov r1, #3 ldr r0, [r0] mov r2, #0 @@ -16994,7 +16994,7 @@ _0211c71c: pop {r3, pc} nop thumb_func_end func_ov09_0211c700 -_0211c720: .word gInventory +_0211c720: .word gItemManager .global func_ov09_0211c724 thumb_func_start func_ov09_0211c724 @@ -17151,7 +17151,7 @@ _0211c840: .word data_ov09_0211e0fc func_ov09_0211c844: ; 0x0211c844 push {r3, r4, r5, r6, r7, lr} mov r4, #0 - ldr r6, _0211c870 ; =gInventory + ldr r6, _0211c870 ; =gItemManager add r7, r4, #0 _0211c84c: add r5, r7, #0 @@ -17175,13 +17175,13 @@ _0211c860: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov09_0211c844 -_0211c870: .word gInventory +_0211c870: .word gItemManager .global func_ov09_0211c874 thumb_func_start func_ov09_0211c874 func_ov09_0211c874: ; 0x0211c874 push {r3, r4, r5, lr} - ldr r4, _0211c894 ; =gInventory + ldr r4, _0211c894 ; =gItemManager mov r5, #0 _0211c87a: ldr r0, [r4] @@ -17199,13 +17199,13 @@ _0211c88a: pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c874 -_0211c894: .word gInventory +_0211c894: .word gItemManager .global func_ov09_0211c898 thumb_func_start func_ov09_0211c898 func_ov09_0211c898: ; 0x0211c898 push {r3, r4, r5, lr} - ldr r4, _0211c8b8 ; =gInventory + ldr r4, _0211c8b8 ; =gItemManager mov r5, #0 _0211c89e: ldr r0, [r4] @@ -17223,21 +17223,21 @@ _0211c8ae: pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c898 -_0211c8b8: .word gInventory +_0211c8b8: .word gItemManager .global func_ov09_0211c8bc thumb_func_start func_ov09_0211c8bc func_ov09_0211c8bc: ; 0x0211c8bc push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _0211c8e8 ; =gInventory + ldr r0, _0211c8e8 ; =gItemManager add r4, r1, #0 ldr r0, [r0] add r1, r5, #0 bl func_ov00_020ad8e0 cmp r4, r0 bne _0211c8e4 - ldr r0, _0211c8e8 ; =gInventory + ldr r0, _0211c8e8 ; =gItemManager add r1, r5, #0 ldr r0, [r0] add r2, r4, #0 @@ -17251,13 +17251,13 @@ _0211c8e4: pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c8bc -_0211c8e8: .word gInventory +_0211c8e8: .word gItemManager .global func_ov09_0211c8ec thumb_func_start func_ov09_0211c8ec func_ov09_0211c8ec: ; 0x0211c8ec push {r3, r4, r5, r6, r7, lr} - ldr r6, _0211c924 ; =gInventory + ldr r6, _0211c924 ; =gItemManager mov r4, #0 mov r7, #1 _0211c8f4: @@ -17287,13 +17287,13 @@ _0211c914: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov09_0211c8ec -_0211c924: .word gInventory +_0211c924: .word gItemManager .global func_ov09_0211c928 thumb_func_start func_ov09_0211c928 func_ov09_0211c928: ; 0x0211c928 push {r3, r4, r5, lr} - ldr r4, _0211c948 ; =gInventory + ldr r4, _0211c948 ; =gItemManager mov r5, #0 _0211c92e: ldr r0, [r4] @@ -17311,7 +17311,7 @@ _0211c93e: pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c928 -_0211c948: .word gInventory +_0211c948: .word gItemManager .global func_ov09_0211c94c thumb_func_start func_ov09_0211c94c @@ -17322,7 +17322,7 @@ func_ov09_0211c94c: ; 0x0211c94c add r7, r5, #0 add r4, r5, #0 _0211c956: - ldr r0, _0211c97c ; =gInventory + ldr r0, _0211c97c ; =gItemManager add r1, r6, #0 ldr r0, [r0] add r2, r4, #0 @@ -17344,7 +17344,7 @@ _0211c978: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end func_ov09_0211c94c -_0211c97c: .word gInventory +_0211c97c: .word gItemManager .global func_ov09_0211c980 thumb_func_start func_ov09_0211c980 @@ -17389,7 +17389,7 @@ _0211c9a4: .word func_ov09_0211c604 thumb_func_start func_ov09_0211c9a8 func_ov09_0211c9a8: ; 0x0211c9a8 push {r4, r5, r6, lr} - ldr r3, _0211c9e4 ; =gInventory + ldr r3, _0211c9e4 ; =gItemManager add r5, r0, #0 ldr r6, [r3] add r4, r1, #0 @@ -17398,7 +17398,7 @@ func_ov09_0211c9a8: ; 0x0211c9a8 add r0, r6, #0 mov r2, #1 blx func_ov00_020ae2e0 - ldr r0, _0211c9e4 ; =gInventory + ldr r0, _0211c9e4 ; =gItemManager add r1, r5, #0 ldr r6, [r0] add r2, r4, #0 @@ -17415,13 +17415,13 @@ func_ov09_0211c9a8: ; 0x0211c9a8 pop {r4, r5, r6, pc} nop thumb_func_end func_ov09_0211c9a8 -_0211c9e4: .word gInventory +_0211c9e4: .word gItemManager .global func_ov09_0211c9e8 thumb_func_start func_ov09_0211c9e8 func_ov09_0211c9e8: ; 0x0211c9e8 push {r3, r4, r5, lr} - ldr r2, _0211ca1c ; =gInventory + ldr r2, _0211ca1c ; =gItemManager add r5, r0, #0 ldr r4, [r2] bl func_ov09_0211c9a0 @@ -17429,7 +17429,7 @@ func_ov09_0211c9e8: ; 0x0211c9e8 add r0, r4, #0 mov r2, #1 blx func_ov00_020ae2e0 - ldr r0, _0211ca1c ; =gInventory + ldr r0, _0211ca1c ; =gItemManager add r1, r5, #0 ldr r4, [r0] add r0, r4, #0 @@ -17444,7 +17444,7 @@ func_ov09_0211c9e8: ; 0x0211c9e8 pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov09_0211c9e8 -_0211ca1c: .word gInventory +_0211ca1c: .word gItemManager .global func_ov09_0211ca20 thumb_func_start func_ov09_0211ca20 @@ -17467,14 +17467,14 @@ _0211ca32: _0211ca3a: mov r4, #1 _0211ca3c: - ldr r0, _0211caa8 ; =gInventory + ldr r0, _0211caa8 ; =gItemManager add r1, r5, #0 ldr r0, [r0] add r2, r4, #0 bl func_ov00_020ad8f0 cmp r0, #0 bge _0211ca5c - ldr r0, _0211caa8 ; =gInventory + ldr r0, _0211caa8 ; =gItemManager add r1, r5, #0 ldr r0, [r0] add r2, r4, #0 @@ -17482,7 +17482,7 @@ _0211ca3c: bl func_ov00_020ad900 b _0211ca7c _0211ca5c: - ldr r0, _0211caa8 ; =gInventory + ldr r0, _0211caa8 ; =gItemManager add r1, r5, #0 ldr r6, [r0] add r2, r4, #0 @@ -17522,7 +17522,7 @@ _0211ca94: pop {r3, r4, r5, r6, pc} .align 2, 0 thumb_func_end func_ov09_0211ca20 -_0211caa8: .word gInventory +_0211caa8: .word gItemManager _0211caac: .word data_ov09_0211f294 _0211cab0: .word data_ov09_0211f298 _0211cab4: .word gOverlayManager @@ -17540,20 +17540,20 @@ func_ov09_0211cac0: ; 0x0211cac0 _0211caca: mov r5, #0 _0211cacc: - ldr r0, _0211cb28 ; =gInventory + ldr r0, _0211cb28 ; =gItemManager add r1, r5, #0 ldr r0, [r0] bl func_ov00_020ad918 cmp r0, #0 bge _0211cae8 - ldr r0, _0211cb28 ; =gInventory + ldr r0, _0211cb28 ; =gItemManager add r1, r5, #0 ldr r0, [r0] mov r2, #1 bl func_ov00_020ad920 b _0211cb04 _0211cae8: - ldr r0, _0211cb28 ; =gInventory + ldr r0, _0211cb28 ; =gItemManager add r1, r5, #0 ldr r4, [r0] add r0, r4, #0 @@ -17586,7 +17586,7 @@ _0211cb18: pop {r3, r4, r5, pc} nop thumb_func_end func_ov09_0211cac0 -_0211cb28: .word gInventory +_0211cb28: .word gItemManager _0211cb2c: .word data_ov09_0211f308 _0211cb30: .word gOverlayManager _0211cb34: .word 0x00000005 diff --git a/asm/ov12.s b/asm/ov12.s index 2be8e50c..95286184 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -8538,10 +8538,10 @@ _02119ac4: bl func_ov00_020a7c00 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02119dc4 ; =gInventory + ldr r0, _02119dc4 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r0, _02119dc8 ; =data_027e0fd4 ldr r4, [r0] ldrb r0, [r4, #0x54] @@ -8736,7 +8736,7 @@ _02119db4: .word data_ov12_02137c64 _02119db8: .word data_027e0fe4 _02119dbc: .word data_027e0f94 _02119dc0: .word data_027e0d0c -_02119dc4: .word gInventory +_02119dc4: .word gItemManager _02119dc8: .word data_027e0fd4 _02119dcc: .word data_ov00_020eec9c _02119dd0: .word data_027e0fac @@ -9017,12 +9017,12 @@ _0211a0a8: ; jump table b _0211a1f0 ; case 76 b _0211a1f0 ; case 77 _0211a1e0: - ldr r0, _0211a3ec ; =gInventory + ldr r0, _0211a3ec ; =gItemManager ldr r0, [r0] bl func_ov00_020ae418 b _0211a230 _0211a1f0: - ldr r0, _0211a3ec ; =gInventory + ldr r0, _0211a3ec ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad714 @@ -9030,7 +9030,7 @@ _0211a1f0: mov r1, #0 ldr r2, [r2, #0x28] blx r2 - ldr r0, _0211a3ec ; =gInventory + ldr r0, _0211a3ec ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad714 @@ -9162,7 +9162,7 @@ _0211a3dc: .word data_027e0fcc _0211a3e0: .word data_027e0f64 _0211a3e4: .word data_ov00_020eec9c _0211a3e8: .word 0x00000123 -_0211a3ec: .word gInventory +_0211a3ec: .word gItemManager _0211a3f0: .word data_027e0fc0 _0211a3f4: .word data_027e0e58 @@ -10800,12 +10800,12 @@ func_ov12_0211b8bc: ; 0x0211b8bc ldrb r0, [r5, #0x245] cmp r0, #0 beq _0211b96c - ldr r0, _0211b994 ; =gInventory + ldr r0, _0211b994 ; =gItemManager mov r1, r4 ldr r0, [r0] bl func_ov00_020ad5d8 _0211b96c: - ldr r0, _0211b994 ; =gInventory + ldr r0, _0211b994 ; =gItemManager mov r1, r4 ldr r0, [r0] bl func_ov00_020ad5f4 @@ -10818,7 +10818,7 @@ _0211b97c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_0211b8bc -_0211b994: .word gInventory +_0211b994: .word gItemManager .global func_ov12_0211b998 arm_func_start func_ov12_0211b998 @@ -28441,7 +28441,7 @@ func_ov12_02129fb4: ; 0x02129fb4 mov r4, r0 bl func_ov00_020d4414 ldr r1, _0212a074 ; =data_ov12_02136aec - ldr r0, _0212a078 ; =gInventory + ldr r0, _0212a078 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #0 @@ -28449,7 +28449,7 @@ func_ov12_02129fb4: ; 0x02129fb4 mov r1, r0 add r0, r4, #0x18c blx func_ov00_020a9588 - ldr r0, _0212a078 ; =gInventory + ldr r0, _0212a078 ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad588 @@ -28488,7 +28488,7 @@ func_ov12_02129fb4: ; 0x02129fb4 .align 2, 0 arm_func_end func_ov12_02129fb4 _0212a074: .word data_ov12_02136aec -_0212a078: .word gInventory +_0212a078: .word gItemManager _0212a07c: .word data_ov12_02136bb4 _0212a080: .word data_ov12_02136bdc _0212a084: .word func_ov12_02129698 @@ -28697,7 +28697,7 @@ func_ov12_0212a2cc: ; 0x0212a2cc addeq sp, sp, #0xc moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, pc} - ldr r0, _0212a458 ; =gInventory + ldr r0, _0212a458 ; =gItemManager ldr r1, _0212a45c ; =data_ov12_02134914 ldr r0, [r0] bl func_ov00_020ad594 @@ -28793,7 +28793,7 @@ _0212a44c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov12_0212a2cc -_0212a458: .word gInventory +_0212a458: .word gItemManager _0212a45c: .word data_ov12_02134914 _0212a460: .word data_027e0fc4 _0212a464: .word 0x00000666 diff --git a/asm/ov14.s b/asm/ov14.s index 5a17bd9a..936fa4f1 100644 --- a/asm/ov14.s +++ b/asm/ov14.s @@ -263,7 +263,7 @@ func_ov14_0211f8d0: ; 0x0211f8d0 mov r1, #0 mov r4, r2 str r1, [r5] - ldr r0, _0211f974 ; =gInventory + ldr r0, _0211f974 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #7 @@ -301,7 +301,7 @@ _0211f968: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0211f8d0 -_0211f974: .word gInventory +_0211f974: .word gItemManager _0211f978: .word data_027e0fe4 _0211f97c: .word 0x424d5459 @@ -319,7 +319,7 @@ func_ov14_0211f980: ; 0x0211f980 cmp r0, #0 addeq sp, sp, #0x20 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _0211faa4 ; =gInventory + ldr r0, _0211faa4 ; =gItemManager mvn r5, #0 ldr r3, _0211faa8 ; =data_027e0d3c ldr r2, _0211faac ; =data_027e0e60 @@ -387,7 +387,7 @@ _0211fa8c: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov14_0211f980 -_0211faa4: .word gInventory +_0211faa4: .word gItemManager _0211faa8: .word data_027e0d3c _0211faac: .word data_027e0e60 @@ -669,7 +669,7 @@ func_ov14_0211fda4: ; 0x0211fda4 mvn r1, #0 str r0, [r4] str r1, [r4, #0x164] - ldr r0, _0211fea0 ; =gInventory + ldr r0, _0211fea0 ; =gItemManager str r1, [r4, #0x168] ldr r0, [r0] mov r1, #4 @@ -679,7 +679,7 @@ func_ov14_0211fda4: ; 0x0211fda4 mov r3, r2 add r0, r4, #0x16c blx func_ov00_020bd618 - ldr r0, _0211fea0 ; =gInventory + ldr r0, _0211fea0 ; =gItemManager mov r1, #5 ldr r0, [r0] bl func_ov00_020ad52c @@ -726,7 +726,7 @@ func_ov14_0211fda4: ; 0x0211fda4 .align 2, 0 arm_func_end func_ov14_0211fda4 _0211fe9c: .word data_ov14_021559e8 -_0211fea0: .word gInventory +_0211fea0: .word gItemManager _0211fea4: .word data_027e0d0c _0211fea8: .word 0x00000266 @@ -3021,11 +3021,11 @@ func_ov14_02121d80: ; 0x02121d80 beq _02121df0 b _02121e48 _02121da8: - ldr r0, _02121e9c ; =gInventory + ldr r0, _02121e9c ; =gItemManager mov r1, #8 ldr r0, [r0] bl func_ov00_020ad52c - ldr r1, _02121e9c ; =gInventory + ldr r1, _02121e9c ; =gItemManager mov r5, r0 ldr r0, [r1] ldr r1, _02121ea0 ; =data_ov14_02153b84 @@ -3089,7 +3089,7 @@ _02121e50: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_02121d80 -_02121e9c: .word gInventory +_02121e9c: .word gItemManager _02121ea0: .word data_ov14_02153b84 _02121ea4: .word data_ov14_02153bac _02121ea8: .word data_027e0f68 @@ -4546,9 +4546,9 @@ func_ov14_02123254: ; 0x02123254 ldr r0, [r5, #0x130] cmp r0, #0 bne _021232b8 - ldr r0, _02123550 ; =gInventory + ldr r0, _02123550 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory15GetEquippedItemEv + bl _ZNK11ItemManager15GetEquippedItemEv cmp r0, #2 beq _021232b8 mov r0, r5 @@ -4736,7 +4736,7 @@ _02123530: arm_func_end func_ov14_02123254 _02123548: .word data_027e0ffc _0212354c: .word 0x0000019e -_02123550: .word gInventory +_02123550: .word gItemManager _02123554: .word data_027e0fc8 _02123558: .word data_027e0f90 _0212355c: .word data_027e0fb8 @@ -5692,7 +5692,7 @@ func_ov14_02124128: ; 0x02124128 mov r4, r0 bl func_ov00_020c1554 ldr r1, _02124230 ; =data_ov14_02155ef4 - ldr r0, _02124234 ; =gInventory + ldr r0, _02124234 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #9 @@ -5756,7 +5756,7 @@ func_ov14_02124128: ; 0x02124128 .align 2, 0 arm_func_end func_ov14_02124128 _02124230: .word data_ov14_02155ef4 -_02124234: .word gInventory +_02124234: .word gItemManager _02124238: .word 0x00000444 _0212423c: .word func_ov00_020b7d74 _02124240: .word func_ov14_021242ac @@ -10422,7 +10422,7 @@ func_ov14_02127d70: ; 0x02127d70 _02127da8: cmp r5, #0 bne _02127dc0 - ldr r0, _02127de8 ; =gInventory + ldr r0, _02127de8 ; =gItemManager mvn r1, #0 ldr r0, [r0] blx func_ov00_020ae368 @@ -10440,7 +10440,7 @@ _02127de0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_02127d70 -_02127de8: .word gInventory +_02127de8: .word gItemManager _02127dec: .word data_027e0ffc _02127df0: .word 0x0000018d @@ -10452,7 +10452,7 @@ func_ov14_02127df4: ; 0x02127df4 cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _02127e24 ; =gInventory + ldr r0, _02127e24 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae350 cmp r0, #0 @@ -10461,7 +10461,7 @@ func_ov14_02127df4: ; 0x02127df4 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_02127df4 -_02127e24: .word gInventory +_02127e24: .word gItemManager .global func_ov14_02127e28 arm_func_start func_ov14_02127e28 @@ -10472,7 +10472,7 @@ func_ov14_02127e28: ; 0x02127e28 cmp r0, #0 mvnne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _02127eb4 ; =gInventory + ldr r0, _02127eb4 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae350 cmp r0, #0 @@ -10506,7 +10506,7 @@ _02127e94: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02127e28 -_02127eb4: .word gInventory +_02127eb4: .word gItemManager .global func_ov14_02127eb8 arm_func_start func_ov14_02127eb8 @@ -26484,13 +26484,13 @@ func_ov14_02134f98: ; 0x02134f98 _02134fd4: mov r0, r4 ldr r2, [r0] - ldr r1, _02135084 ; =gInventory + ldr r1, _02135084 ; =gItemManager ldr r2, [r2, #0xb4] ldr r5, [r1] blx r2 mov r1, r0 mov r0, r5 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -26529,7 +26529,7 @@ _02135004: .align 2, 0 arm_func_end func_ov14_02134f98 _02135080: .word data_027e0d38 -_02135084: .word gInventory +_02135084: .word gItemManager _02135088: .word 0x000004cd .global func_ov14_0213508c @@ -26621,7 +26621,7 @@ _02135170: _021351c4: mov r0, r5 ldr r2, [r0] - ldr r1, _0213535c ; =gInventory + ldr r1, _0213535c ; =gItemManager ldr r2, [r2, #0xb4] ldr r6, [r1] blx r2 @@ -26736,7 +26736,7 @@ _02135344: .align 2, 0 arm_func_end func_ov14_0213508c _02135358: .word data_027e103c -_0213535c: .word gInventory +_0213535c: .word gItemManager _02135360: .word data_ov00_020eec9c .global func_ov14_02135364 @@ -30496,10 +30496,10 @@ func_ov14_021383e0: ; 0x021383e0 blt _0213840c cmp r1, #0x6a bgt _0213840c - ldr r0, _02138418 ; =gInventory + ldr r0, _02138418 ; =gItemManager add r1, r1, #0x15 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r3, pc} _0213840c: mov r1, #1 @@ -30507,7 +30507,7 @@ _0213840c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_021383e0 -_02138418: .word gInventory +_02138418: .word gItemManager .global func_ov14_0213841c arm_func_start func_ov14_0213841c @@ -34230,7 +34230,7 @@ _0213b2ec: bl func_ov14_0213b204 b _0213b358 _0213b2f8: - ldr r1, _0213b510 ; =gInventory + ldr r1, _0213b510 ; =gItemManager ldr r0, [r5, #0x158] ldr r6, [r1] bl func_ov00_020c5a24 @@ -34381,7 +34381,7 @@ _0213b4fc: .align 2, 0 arm_func_end func_ov14_0213b254 _0213b50c: .word data_027e0fc8 -_0213b510: .word gInventory +_0213b510: .word gItemManager _0213b514: .word data_ov00_020eec9c _0213b518: .word data_027e0e60 @@ -35283,10 +35283,10 @@ _0213c004: cmp sb, r0 moveq r8, #1 beq _0213c034 - ldr r0, _0213c0f4 ; =gInventory + ldr r0, _0213c0f4 ; =gItemManager mov r1, sb ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 addeq sp, sp, #0x14 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} @@ -35345,7 +35345,7 @@ _0213c0b8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov14_0213bfd0 -_0213c0f4: .word gInventory +_0213c0f4: .word gItemManager _0213c0f8: .word data_027e103c .global func_ov14_0213c0fc @@ -35353,14 +35353,14 @@ _0213c0f8: .word data_027e103c func_ov14_0213c0fc: ; 0x0213c0fc stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x18 - ldr r4, _0213c214 ; =gInventory + ldr r4, _0213c214 ; =gItemManager mov r8, r0 mov r7, r1 ldr r0, [r4] ldr r1, [r8, #0x18] mov r6, r2 mov r5, r3 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0213c208 ldr r0, _0213c218 ; =data_027e0c38 @@ -35384,7 +35384,7 @@ _0213c15c: _0213c16c: cmp sb, #0 bne _0213c1fc - ldr r1, _0213c214 ; =gInventory + ldr r1, _0213c214 ; =gItemManager ldr r0, _0213c21c ; =data_ov14_0215b494 ldr r1, [r1] add r2, sp, #0x14 @@ -35428,7 +35428,7 @@ _0213c208: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov14_0213c0fc -_0213c214: .word gInventory +_0213c214: .word gItemManager _0213c218: .word data_027e0c38 _0213c21c: .word data_ov14_0215b494 @@ -35437,14 +35437,14 @@ _0213c21c: .word data_ov14_0215b494 func_ov14_0213c220: ; 0x0213c220 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 - ldr r4, _0213c358 ; =gInventory + ldr r4, _0213c358 ; =gItemManager mov r7, r0 mov r6, r1 ldr r0, [r4] ldr r1, [r7, #0x18] mov r5, r2 mov r4, r3 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0213c34c ldr r1, [r7, #0x18] @@ -35458,7 +35458,7 @@ _0213c268: _0213c26c: cmp r0, #0 beq _0213c330 - ldr r0, _0213c358 ; =gInventory + ldr r0, _0213c358 ; =gItemManager sub r8, r1, #9 ldr r0, [r0] mov r1, r8 @@ -35522,7 +35522,7 @@ _0213c34c: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov14_0213c220 -_0213c358: .word gInventory +_0213c358: .word gItemManager _0213c35c: .word data_027e0d78 _0213c360: .word data_ov00_020eec9c @@ -35973,7 +35973,7 @@ _0213c7d4: ldr r0, _0213c8dc ; =data_ov00_020eec9c mov r1, #6 bl func_ov00_020d77e4 - ldr r0, _0213c8e0 ; =gInventory + ldr r0, _0213c8e0 ; =gItemManager mov r1, r5 ldr r0, [r0] bl func_ov00_020ae3a8 @@ -36043,7 +36043,7 @@ _0213c8d0: .word data_027e0c68 _0213c8d4: .word data_027e0fb8 _0213c8d8: .word 0x00020010 _0213c8dc: .word data_ov00_020eec9c -_0213c8e0: .word gInventory +_0213c8e0: .word gItemManager .global func_ov14_0213c8e4 arm_func_start func_ov14_0213c8e4 @@ -36351,7 +36351,7 @@ func_ov14_0213ccd8: ; 0x0213ccd8 mov r4, #1 cmp r0, #0x36 cmpne r0, #0x37 - ldr r6, _0213cdb8 ; =gInventory + ldr r6, _0213cdb8 ; =gItemManager moveq r4, #0 mov sb, r5 mov r7, r5 @@ -36400,7 +36400,7 @@ _0213cda8: arm_func_end func_ov14_0213ccd8 _0213cdb0: .word data_027e0c68 _0213cdb4: .word data_027e077c -_0213cdb8: .word gInventory +_0213cdb8: .word gItemManager _0213cdbc: .word data_027e0618 .global func_ov14_0213cdc0 @@ -36699,7 +36699,7 @@ _0213d074: .word func_ov00_020be904 func_ov14_0213d078: ; 0x0213d078 push {r4, lr} add r4, r0, #0 - ldr r0, _0213d094 ; =gInventory + ldr r0, _0213d094 ; =gItemManager mov r1, #6 ldr r0, [r0] blx func_ov00_020ad52c @@ -36711,7 +36711,7 @@ func_ov14_0213d078: ; 0x0213d078 pop {r4, pc} nop thumb_func_end func_ov14_0213d078 -_0213d094: .word gInventory +_0213d094: .word gItemManager .global func_ov14_0213d098 arm_func_start func_ov14_0213d098 @@ -37079,7 +37079,7 @@ func_ov14_0213d3a0: ; 0x0213d3a0 ldr r0, [r0] cmp r0, #0 beq _0213d3c2 - ldr r0, _0213d3c8 ; =gInventory + ldr r0, _0213d3c8 ; =gItemManager mov r1, #0xe ldr r0, [r0] blx func_ov00_020ad52c @@ -37094,7 +37094,7 @@ _0213d3c2: .align 2, 0 thumb_func_end func_ov14_0213d3a0 _0213d3c4: .word data_027e0fc8 -_0213d3c8: .word gInventory +_0213d3c8: .word gItemManager .global func_ov14_0213d3cc arm_func_start func_ov14_0213d3cc @@ -39528,9 +39528,9 @@ func_ov14_0213f104: ; 0x0213f104 bl func_ov00_020a7c00 movs r5, r0 beq _0213f170 - ldr r0, _0213f318 ; =gInventory + ldr r0, _0213f318 ; =gItemManager ldr r0, [r0] - bl _ZN9Inventory13TickEquipItemEv + bl _ZN11ItemManager13TickEquipItemEv ldrb r0, [r4, #0x5d] cmp r0, #0 beq _0213f158 @@ -39657,7 +39657,7 @@ _0213f2d0: ldr r0, [r0] strb r1, [r0, #0xbe] _0213f2ec: - ldr r0, _0213f318 ; =gInventory + ldr r0, _0213f318 ; =gItemManager mov r1, #7 ldr r0, [r0] bl func_ov00_020ad714 @@ -39671,7 +39671,7 @@ _0213f30c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov14_0213f104 -_0213f318: .word gInventory +_0213f318: .word gItemManager _0213f31c: .word data_027e0fd4 _0213f320: .word data_027e0fcc _0213f324: .word data_027e0f74 @@ -39685,7 +39685,7 @@ func_ov14_0213f334: ; 0x0213f334 stmdb sp!, {r4, lr} mov r4, r1 bl func_ov05_0210e8b4 - ldr r0, _0213f378 ; =gInventory + ldr r0, _0213f378 ; =gItemManager ldr r0, [r0] ldr r1, [r0] cmp r1, #7 @@ -39701,7 +39701,7 @@ func_ov14_0213f334: ; 0x0213f334 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0213f334 -_0213f378: .word gInventory +_0213f378: .word gItemManager .global func_ov14_0213f37c arm_func_start func_ov14_0213f37c @@ -39851,7 +39851,7 @@ _0213f4f2: mov r2, #1 blx func_ov00_020bbbd0 _0213f510: - ldr r0, _0213f598 ; =gInventory + ldr r0, _0213f598 ; =gItemManager mov r1, #0 ldr r2, [r0] _0213f516: @@ -39860,7 +39860,7 @@ _0213f516: ldrb r0, [r0] cmp r0, #2 bne _0213f52c - ldr r0, _0213f598 ; =gInventory + ldr r0, _0213f598 ; =gItemManager mov r2, #0 ldr r0, [r0] blx func_ov00_020ae50c @@ -39871,7 +39871,7 @@ _0213f52c: cmp r1, #2 blt _0213f516 _0213f534: - ldr r0, _0213f598 ; =gInventory + ldr r0, _0213f598 ; =gItemManager ldr r0, [r0] ldr r0, [r0] cmp r0, #9 @@ -39879,7 +39879,7 @@ _0213f534: cmp r0, #0xa bne _0213f54a _0213f542: - ldr r0, _0213f598 ; =gInventory + ldr r0, _0213f598 ; =gItemManager ldr r0, [r0] blx func_ov00_020ae3c0 _0213f54a: @@ -39919,7 +39919,7 @@ _0213f57a: thumb_func_end func_ov14_0213f4cc _0213f590: .word data_027e0f74 _0213f594: .word data_027e103c -_0213f598: .word gInventory +_0213f598: .word gItemManager _0213f59c: .word data_027e0fcc _0213f5a0: .word data_027e071c _0213f5a4: .word data_027e0f64 @@ -40143,12 +40143,12 @@ _0213f7c0: bl func_ov00_020d77e4 _0213f874: ldr r1, [r5, #0x70] - ldr r0, _0213f964 ; =gInventory + ldr r0, _0213f964 ; =gItemManager add r1, r1, #1 str r1, [r5, #0x70] ldr r0, [r0] mov r1, #0x20 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _0213f8c0 ldr r4, [r5, #0x70] @@ -40209,7 +40209,7 @@ _0213f940: _0213f958: .word data_027e0fd4 _0213f95c: .word data_ov00_020eec9c _0213f960: .word data_027e103c -_0213f964: .word gInventory +_0213f964: .word gItemManager _0213f968: .word 0x88888889 _0213f96c: .word data_027e077c _0213f970: .word 0x0000011e @@ -42278,7 +42278,7 @@ _021412a8: mov r0, r0, lsr #0x10 mov r0, r0, asr #0x4 mov r2, r0, lsl #0x1 - ldr r0, _021415bc ; =gInventory + ldr r0, _021415bc ; =gItemManager add r1, r2, #1 ldr r0, [r0] ldr r3, _021415c0 ; =data_02050f54 @@ -42287,13 +42287,13 @@ _021412a8: mov r1, #0x25 ldrsh fp, [r3, r5] ldrsh r5, [r3, r2] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj mov r7, #0 - ldr r1, _021415bc ; =gInventory + ldr r1, _021415bc ; =gItemManager mov r6, r0 ldr r0, [r1] mov r1, r7 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _02141308 cmp r6, #0 @@ -42483,7 +42483,7 @@ _0214159c: arm_func_end func_ov14_02141154 _021415b4: .word data_027e0c54 _021415b8: .word data_027e0d38 -_021415bc: .word gInventory +_021415bc: .word gItemManager _021415c0: .word data_02050f54 _021415c4: .word 0x00007fff _021415c8: .word data_ov14_0215b250 @@ -42814,7 +42814,7 @@ func_ov14_021419d8: ; 0x021419d8 ldrsh r3, [r1, #0x9c] add r1, r4, #0x190 bl func_ov00_020b4944 - ldr r0, _02141a70 ; =gInventory + ldr r0, _02141a70 ; =gItemManager ldrb r1, [r4, #0x4c0] ldr r0, [r0] bl func_ov00_020ad5f4 @@ -42847,7 +42847,7 @@ func_ov14_021419d8: ; 0x021419d8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_021419d8 -_02141a70: .word gInventory +_02141a70: .word gItemManager .global func_ov14_02141a74 arm_func_start func_ov14_02141a74 @@ -53557,12 +53557,12 @@ _02149f9c: mov r1, #0x1b8 bl func_ov00_020cecd8 _02149fc8: - ldr r0, _0214a058 ; =gInventory + ldr r0, _0214a058 ; =gItemManager ldr r2, [r4, #0x74] ldr r1, _0214a05c ; =data_ov14_02153f1c ldr r0, [r0] ldr r1, [r1, r2, lsl #2] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0214a040 ldr r0, [r4, #0x74] @@ -53598,7 +53598,7 @@ _0214a040: arm_func_end func_ov14_02149e90 _0214a050: .word data_ov14_02153f04 _0214a054: .word data_027e0ffc -_0214a058: .word gInventory +_0214a058: .word gItemManager _0214a05c: .word data_ov14_02153f1c _0214a060: .word 0x00003555 @@ -53859,18 +53859,18 @@ func_ov14_0214a3d4: ; 0x0214a3d4 .global func_ov14_0214a3dc arm_func_start func_ov14_0214a3dc func_ov14_0214a3dc: ; 0x0214a3dc - ldr r1, _0214a3f8 ; =gInventory + ldr r1, _0214a3f8 ; =gItemManager ldr r3, [r0, #0x74] ldr r2, _0214a3fc ; =data_ov14_02153f1c ldr r0, [r1] - ldr ip, _0214a400 ; =_ZN9Inventory7HasItemEj + ldr ip, _0214a400 ; =_ZN11ItemManager7HasItemEj ldr r1, [r2, r3, lsl #2] bx ip .align 2, 0 arm_func_end func_ov14_0214a3dc -_0214a3f8: .word gInventory +_0214a3f8: .word gItemManager _0214a3fc: .word data_ov14_02153f1c -_0214a400: .word _ZN9Inventory7HasItemEj +_0214a400: .word _ZN11ItemManager7HasItemEj .global func_ov14_0214a404 arm_func_start func_ov14_0214a404 @@ -53890,11 +53890,11 @@ func_ov14_0214a404: ; 0x0214a404 bl func_ov00_0208b930 ldr r3, [r4, #0x74] ldr r2, _0214a4ac ; =data_ov14_02153f1c - ldr r1, _0214a4b0 ; =gInventory + ldr r1, _0214a4b0 ; =gItemManager mov r5, r0 ldr r0, [r1] ldr r1, [r2, r3, lsl #2] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0214a480 ldr r0, _0214a4b4 ; =0x00003555 @@ -53924,7 +53924,7 @@ _0214a490: .align 2, 0 arm_func_end func_ov14_0214a404 _0214a4ac: .word data_ov14_02153f1c -_0214a4b0: .word gInventory +_0214a4b0: .word gItemManager _0214a4b4: .word 0x00003555 _0214a4b8: .word 0x006a0026 @@ -61517,7 +61517,7 @@ _021506e6: sub r0, #0x79 cmp r0, #3 bhi _0215070c - ldr r0, _02150764 ; =gInventory + ldr r0, _02150764 ; =gItemManager add r1, r4, #0 ldr r0, [r0] bl func_ov00_020adcdc @@ -61558,12 +61558,12 @@ _02150734: add r3, r1, #0 bl func_ov09_0211ceec _02150742: - ldr r0, _02150764 ; =gInventory + ldr r0, _02150764 ; =gItemManager add r1, r4, #0 ldr r0, [r0] bl func_ov00_020adcdc _0215074c: - ldr r0, _02150764 ; =gInventory + ldr r0, _02150764 ; =gItemManager add r1, r4, #0 ldr r0, [r0] bl func_ov00_020adb30 @@ -61574,7 +61574,7 @@ _0215074c: .align 2, 0 thumb_func_end func_ov14_021506c4 _02150760: .word data_027e1058 -_02150764: .word gInventory +_02150764: .word gItemManager .global func_ov14_02150768 thumb_func_start func_ov14_02150768 @@ -61863,7 +61863,7 @@ _02150952: ldr r0, [r3] add r1, sp, #0x3c str r0, [r2] - ldr r0, _021509cc ; =gInventory + ldr r0, _021509cc ; =gItemManager ldr r0, [r0] bl func_ov00_020adca8 cmp r0, #0 @@ -61881,7 +61881,7 @@ _02150952: blx func_0200388c str r0, [sp, #0x50] _02150994: - ldr r0, _021509cc ; =gInventory + ldr r0, _021509cc ; =gItemManager add r4, #0x20 ldr r1, [r0] mov r0, #0x45 @@ -61907,7 +61907,7 @@ _02150994: nop thumb_func_end func_ov14_02150908 _021509c8: .word 0xfffff000 -_021509cc: .word gInventory +_021509cc: .word gItemManager _021509d0: .word data_027e0e58 .global func_ov14_021509d4 @@ -63009,7 +63009,7 @@ _02151640: mov r0, #0 ldmia sp!, {r4, pc} _02151648: - ldr r0, _02151688 ; =gInventory + ldr r0, _02151688 ; =gItemManager ldr r1, [r4, #0xc] ldr r0, [r0] bl func_ov00_020ae564 @@ -63030,7 +63030,7 @@ _0215167c: .align 2, 0 arm_func_end func_ov14_02151610 _02151684: .word data_027e0fc8 -_02151688: .word gInventory +_02151688: .word gItemManager .global func_ov14_0215168c arm_func_start func_ov14_0215168c @@ -63307,7 +63307,7 @@ func_ov14_02151940: ; 0x02151940 cmp r0, #0 addle sp, sp, #0x24 ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r4, _02151a28 ; =gInventory + ldr r4, _02151a28 ; =gItemManager mov r8, r7 mov r5, r7 add fp, sp, #4 @@ -63317,7 +63317,7 @@ _021519d0: bne _021519ec ldr r0, [r4] mov r1, r6 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _02151a08 _021519ec: @@ -63339,7 +63339,7 @@ _02151a08: .align 2, 0 arm_func_end func_ov14_02151940 _02151a24: .word data_027e0cbc -_02151a28: .word gInventory +_02151a28: .word gItemManager .global func_ov14_02151a2c arm_func_start func_ov14_02151a2c @@ -65628,7 +65628,7 @@ _02153648: .word data_ov14_02154198 arm_func_start func_ov14_0215364c func_ov14_0215364c: ; 0x0215364c stmdb sp!, {r4, lr} - ldr r0, _02153674 ; =gInventory + ldr r0, _02153674 ; =gItemManager ldr r0, [r0] ldr r4, [r0] mov r0, r4 @@ -65639,7 +65639,7 @@ func_ov14_0215364c: ; 0x0215364c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0215364c -_02153674: .word gInventory +_02153674: .word gItemManager .global func_ov14_02153678 arm_func_start func_ov14_02153678 @@ -65917,10 +65917,10 @@ func_ov14_02153924: ; 0x02153924 cmp r5, r0 moveq r4, #1 beq _02153964 - ldr r0, _02153a3c ; =gInventory + ldr r0, _02153a3c ; =gItemManager mov r1, r5 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r4, #1 _02153964: @@ -65948,7 +65948,7 @@ _021539a8: cmp r5, #9 cmpne r5, #0xa bne _02153a00 - ldr r0, _02153a3c ; =gInventory + ldr r0, _02153a3c ; =gItemManager sub r4, r5, #9 ldr r0, [r0] mov r1, r4 @@ -65956,7 +65956,7 @@ _021539a8: cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, r6, r7, pc} - ldr r0, _02153a3c ; =gInventory + ldr r0, _02153a3c ; =gItemManager ldr r1, _02153a44 ; =data_ov14_021541d0 ldr r0, [r0] add r0, r0, r4 @@ -65983,7 +65983,7 @@ _02153a0c: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov14_02153924 -_02153a3c: .word gInventory +_02153a3c: .word gItemManager _02153a40: .word data_027e103c _02153a44: .word data_ov14_021541d0 @@ -66007,11 +66007,11 @@ func_ov14_02153a48: ; 0x02153a48 mov r7, r4 cmpne r8, #7 bne _02153ab4 - ldr r0, _02153b4c ; =gInventory + ldr r0, _02153b4c ; =gItemManager mov r1, r8 ldr r0, [r0] bl func_ov00_020ad72c - ldr r1, _02153b4c ; =gInventory + ldr r1, _02153b4c ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, r8 @@ -66059,7 +66059,7 @@ _02153b08: .align 2, 0 arm_func_end func_ov14_02153a48 _02153b48: .word data_027e0d38 -_02153b4c: .word gInventory +_02153b4c: .word gItemManager .rodata .global data_ov14_02153b50 diff --git a/asm/ov15.s b/asm/ov15.s index 17c5be5a..4aaa52f9 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -2293,25 +2293,25 @@ _02121550: cmp r8, #0 addeq sp, sp, #0x5c ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _021216f8 ; =gInventory + ldr r0, _021216f8 ; =gItemManager mov r1, #0x21 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj - ldr r1, _021216f8 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _021216f8 ; =gItemManager str r0, [sp, #0x10] ldr r0, [r1] mov r1, #0x23 - bl _ZN9Inventory7HasItemEj - ldr r1, _021216f8 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _021216f8 ; =gItemManager mov fp, r0 ldr r0, [r1] mov r1, #0x22 - bl _ZN9Inventory7HasItemEj - ldr r1, _021216f8 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _021216f8 ; =gItemManager mov sl, r0 ldr r0, [r1] mov r1, #0x24 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj mov r5, #0 ldr r1, _021216fc ; =data_027e0e60 mov r4, r0 @@ -2407,7 +2407,7 @@ _021216e8: .word data_ov15_02185b54 _021216ec: .word data_027e1054 _021216f0: .word data_027e0d3c _021216f4: .word data_ov15_02185b5c -_021216f8: .word gInventory +_021216f8: .word gItemManager _021216fc: .word data_027e0e60 .global func_ov15_02121700 @@ -12149,28 +12149,28 @@ _02129704: ; jump table b _0212973c ; case 2 b _02129750 ; case 3 _02129714: - ldr r0, _02129770 ; =gInventory + ldr r0, _02129770 ; =gItemManager mov r1, #0x21 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r4, pc} _02129728: - ldr r0, _02129770 ; =gInventory + ldr r0, _02129770 ; =gItemManager mov r1, #0x22 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r4, pc} _0212973c: - ldr r0, _02129770 ; =gInventory + ldr r0, _02129770 ; =gItemManager mov r1, #0x23 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r4, pc} _02129750: - ldr r0, _02129770 ; =gInventory + ldr r0, _02129770 ; =gItemManager mov r1, #0x24 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldmia sp!, {r4, pc} _02129764: mov r0, #1 @@ -12178,7 +12178,7 @@ _02129764: .align 2, 0 arm_func_end func_ov15_021296d4 _0212976c: .word data_027e0d38 -_02129770: .word gInventory +_02129770: .word gItemManager .global func_ov15_02129774 arm_func_start func_ov15_02129774 @@ -31481,7 +31481,7 @@ func_ov15_0213a184: ; 0x0213a184 bl func_ov00_020a7c00 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0213a454 ; =gInventory + ldr r0, _0213a454 ; =gItemManager ldr r0, [r0] bl func_ov00_020ad528 mov r1, #1 @@ -31670,7 +31670,7 @@ _0213a404: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0213a184 -_0213a454: .word gInventory +_0213a454: .word gItemManager _0213a458: .word data_027e077c _0213a45c: .word data_027e103c _0213a460: .word data_027e0f74 @@ -41547,11 +41547,11 @@ _021428ec: .word data_027e0f74 arm_func_start func_ov15_021428f0 func_ov15_021428f0: ; 0x021428f0 stmdb sp!, {r4, lr} - ldr r1, _02142944 ; =gInventory + ldr r1, _02142944 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #0x2c - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -41569,7 +41569,7 @@ func_ov15_021428f0: ; 0x021428f0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021428f0 -_02142944: .word gInventory +_02142944: .word gItemManager .global func_ov15_02142948 arm_func_start func_ov15_02142948 @@ -44535,12 +44535,12 @@ _02145300: _0214531c: cmp r5, #0x26 beq _02145334 - ldr r0, _0214581c ; =gInventory + ldr r0, _0214581c ; =gItemManager mov r1, r5 ldr r0, [r0] blx func_ov00_020adcdc _02145334: - ldr r0, _0214581c ; =gInventory + ldr r0, _0214581c ; =gItemManager mov r1, r5 ldr r0, [r0] blx func_ov00_020adb30 @@ -44579,7 +44579,7 @@ _02145390: mov r1, r0 cmp r1, #0x20 bhs _021453d4 - ldr r0, _0214581c ; =gInventory + ldr r0, _0214581c ; =gItemManager ldr r0, [r0] blx func_ov00_020adadc b _021453f8 @@ -44599,7 +44599,7 @@ _021453f8: bl func_ov15_021464fc cmp r0, #0x26 bne _0214541c - ldr r0, _0214581c ; =gInventory + ldr r0, _0214581c ; =gItemManager mov r1, #0x26 ldr r0, [r0] blx func_ov00_020adcdc @@ -44866,7 +44866,7 @@ _0214580c: .word 0x000003e7 _02145810: .word 0x00000333 _02145814: .word 0x000003e9 _02145818: .word data_ov09_0211f5dc -_0214581c: .word gInventory +_0214581c: .word gItemManager _02145820: .word data_ov00_020eec68 _02145824: .word data_027e0fe4 _02145828: .word data_ov15_0218b214 @@ -45641,16 +45641,16 @@ func_ov15_021461b0: ; 0x021461b0 cmp r0, #8 bge _02146214 ldr r5, _021462c0 ; =data_ov15_0218f430 - ldr r0, _021462c4 ; =gInventory + ldr r0, _021462c4 ; =gItemManager ldrh r1, [r5, r4] ldr r0, [r0] add r1, r1, #0x60 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 addeq sp, sp, #0x18 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _021462c4 ; =gInventory + ldr r0, _021462c4 ; =gItemManager ldrh r1, [r5, r4] ldr r0, [r0] bl func_ov00_020adabc @@ -45708,7 +45708,7 @@ _021462b4: .align 2, 0 arm_func_end func_ov15_021461b0 _021462c0: .word data_ov15_0218f430 -_021462c4: .word gInventory +_021462c4: .word gItemManager _021462c8: .word data_027e0fe4 _021462cc: .word data_ov15_0218f42c _021462d0: .word data_027e0f94 @@ -47019,7 +47019,7 @@ func_ov15_0214725c: ; 0x0214725c movne r2, #1 b _021472c0 _021472c0: - ldr r0, _0214753c ; =gInventory + ldr r0, _0214753c ; =gItemManager strb r2, [r4, #0x43d] ldr r1, [r4, #0x41c] ldr r0, [r0] @@ -47184,7 +47184,7 @@ _021474e0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_0214725c -_0214753c: .word gInventory +_0214753c: .word gItemManager _02147540: .word data_027e0764 _02147544: .word data_ov15_021861c0 _02147548: .word data_ov15_021861c4 @@ -48304,7 +48304,7 @@ func_ov15_02148520: ; 0x02148520 b _0214862c _02148540: ldr r1, [r4, #0x420] - ldr r0, _02148670 ; =gInventory + ldr r0, _02148670 ; =gItemManager mov r2, r1, lsl #0x10 ldr r0, [r0] ldr r1, [r4, #0x41c] @@ -48314,7 +48314,7 @@ _02148540: cmp r0, #0 beq _021485cc ldr ip, _02148674 ; =data_027e0764 - ldr r2, _02148670 ; =gInventory + ldr r2, _02148670 ; =gItemManager ldr r1, [ip] ldmib ip, {r0, r3} umull lr, r5, r3, r1 @@ -48385,7 +48385,7 @@ _0214862c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov15_02148520 -_02148670: .word gInventory +_02148670: .word gItemManager _02148674: .word data_027e0764 _02148678: .word data_027e0e58 _0214867c: .word data_ov15_021861c0 @@ -51993,15 +51993,15 @@ func_ov15_0214b86c: ; 0x0214b86c mov r4, r2 addeq sp, sp, #0x3c ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc} - ldr r0, _0214bb88 ; =gInventory + ldr r0, _0214bb88 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj - ldr r1, _0214bb88 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _0214bb88 ; =gItemManager mov r7, r0 ldr r0, [r1] mov r1, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0214b8c8 cmp r7, #0 @@ -52193,7 +52193,7 @@ _0214bab8: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov15_0214b86c -_0214bb88: .word gInventory +_0214bb88: .word gItemManager _0214bb8c: .word data_027e10a4 _0214bb90: .word data_ov15_0218b704 _0214bb94: .word data_027e0fb0 @@ -54178,7 +54178,7 @@ func_ov15_0214d358: ; 0x0214d358 ldr r0, [r4, #0x138] cmp r0, #0xf ldmltia sp!, {r3, r4, r5, pc} - ldr r1, _0214d3d8 ; =gInventory + ldr r1, _0214d3d8 ; =gItemManager ldr r0, [r4, #0x158] ldr r5, [r1] bl func_ov00_020c5a24 @@ -54198,7 +54198,7 @@ func_ov15_0214d358: ; 0x0214d358 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0214d358 -_0214d3d8: .word gInventory +_0214d3d8: .word gItemManager _0214d3dc: .word data_ov00_020eec9c _0214d3e0: .word data_027e0f94 @@ -60046,11 +60046,11 @@ _02152354: .word data_027e1060 arm_func_start func_ov15_02152358 func_ov15_02152358: ; 0x02152358 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r1, _021523dc ; =gInventory + ldr r1, _021523dc ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #0x28 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} @@ -60082,7 +60082,7 @@ _021523c4: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov15_02152358 -_021523dc: .word gInventory +_021523dc: .word gItemManager _021523e0: .word data_027e0fe4 .global func_ov15_021523e4 @@ -60392,10 +60392,10 @@ func_ov15_021527d4: ; 0x021527d4 bl func_ov00_02097760 cmp r0, #0 beq _021528d0 - ldr r0, _021529c0 ; =gInventory + ldr r0, _021529c0 ; =gItemManager mov r1, #0x2f ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj ldr ip, _021529c4 ; =data_027e0764 cmp r0, #0 ldr r2, [ip] @@ -60504,7 +60504,7 @@ _021529b0: .word data_027e1060 _021529b4: .word 0x0000ffff _021529b8: .word data_027e0f74 _021529bc: .word 0x00000111 -_021529c0: .word gInventory +_021529c0: .word gItemManager _021529c4: .word data_027e0764 _021529c8: .word data_ov15_02186470 _021529cc: .word data_027e0f94 @@ -88235,7 +88235,7 @@ _0216a8cc: blx func_ov09_0211cac0 b _0216a8f8 _0216a8e8: - ldr r0, _0216a95c ; =gInventory + ldr r0, _0216a95c ; =gItemManager mov r1, r4 ldr r0, [r0] blx func_ov00_020adcdc @@ -88244,7 +88244,7 @@ _0216a8f8: mov r1, r0 cmp r1, #0x20 bhs _0216a918 - ldr r0, _0216a95c ; =gInventory + ldr r0, _0216a95c ; =gItemManager ldr r0, [r0] blx func_ov00_020adadc b _0216a93c @@ -88259,7 +88259,7 @@ _0216a918: str r3, [sp] bl func_ov15_02184728 _0216a93c: - ldr r0, _0216a95c ; =gInventory + ldr r0, _0216a95c ; =gItemManager mov r1, r4 ldr r0, [r0] blx func_ov00_020adb30 @@ -88269,7 +88269,7 @@ _0216a93c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_0216a838 -_0216a95c: .word gInventory +_0216a95c: .word gItemManager _0216a960: .word data_027e0fe4 _0216a964: .word data_ov15_0218d34c @@ -88402,7 +88402,7 @@ func_ov15_0216aadc: ; 0x0216aadc add r3, sp, #0x48 ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _0216abe0 ; =gInventory + ldr r0, _0216abe0 ; =gItemManager add r1, sp, #0x3c ldr r0, [r0] blx func_ov00_020adca8 @@ -88437,7 +88437,7 @@ _0216ab80: add ip, sp, #0 ldmia r4, {r0, r1, r2} stmia ip, {r0, r1, r2} - ldr r3, _0216abe0 ; =gInventory + ldr r3, _0216abe0 ; =gItemManager add r0, sp, #0xc ldr r1, [r3] ldr r5, [r1, #0x114] @@ -88459,7 +88459,7 @@ _0216ab80: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0216aadc -_0216abe0: .word gInventory +_0216abe0: .word gItemManager _0216abe4: .word data_027e0e58 .global func_ov15_0216abe8 @@ -92736,16 +92736,16 @@ func_ov15_0216e534: ; 0x0216e534 ldmia lr!, {r0, r1, r2, r3} stmia ip!, {r0, r1, r2, r3} ldr r1, [lr] - ldr r0, _0216e694 ; =gInventory + ldr r0, _0216e694 ; =gItemManager str r1, [ip] ldr r0, [r0] mov r1, #0x25 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj mov r7, r0 - ldr r0, _0216e694 ; =gInventory + ldr r0, _0216e694 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0216e5a4 cmp r7, #0 @@ -92815,7 +92815,7 @@ _0216e5a8: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov15_0216e534 -_0216e694: .word gInventory +_0216e694: .word gItemManager _0216e698: .word 0x000001df .global func_ov15_0216e69c @@ -92885,7 +92885,7 @@ func_ov15_0216e69c: ; 0x0216e69c mov r0, fp mov r2, r1 bl func_01ff8690 - ldr r0, _0216e978 ; =gInventory + ldr r0, _0216e978 ; =gItemManager add r1, sp, #0x14 ldr r0, [r0] ldr r6, [r0, #0x114] @@ -93013,7 +93013,7 @@ _0216e944: _0216e96c: .word 0x0000152d _0216e970: .word 0xfffffa1d _0216e974: .word data_02050f54 -_0216e978: .word gInventory +_0216e978: .word gItemManager _0216e97c: .word data_027e0e58 .global func_ov15_0216e980 @@ -99845,7 +99845,7 @@ _02174790: .word data_027e0e58 func_ov15_02174794: ; 0x02174794 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 - ldr r1, _02174874 ; =gInventory + ldr r1, _02174874 ; =gItemManager mov r4, r0 ldr r5, [r1] ldr r0, [r4, #0x2c] @@ -99903,7 +99903,7 @@ _0217481c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02174794 -_02174874: .word gInventory +_02174874: .word gItemManager _02174878: .word data_ov00_020eec9c _0217487c: .word data_027e0e58 _02174880: .word 0x00001009 @@ -110842,7 +110842,7 @@ func_ov15_0217defc: ; 0x0217defc addle sp, sp, #0x24 ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} mov fp, r4 - ldr r4, _0217e000 ; =gInventory + ldr r4, _0217e000 ; =gItemManager mov r8, r7 mov r5, r7 mov r6, #0x21 @@ -110851,7 +110851,7 @@ _0217dfa8: bne _0217dfc4 ldr r0, [r4] mov r1, r6 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0217dfe0 _0217dfc4: @@ -110873,7 +110873,7 @@ _0217dfe0: .align 2, 0 arm_func_end func_ov15_0217defc _0217dffc: .word data_027e0cbc -_0217e000: .word gInventory +_0217e000: .word gItemManager .global func_ov15_0217e004 arm_func_start func_ov15_0217e004 @@ -110928,10 +110928,10 @@ _0217e074: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0217e0ac: - ldr r0, _0217e1c4 ; =gInventory + ldr r0, _0217e1c4 ; =gItemManager mov r1, #0x2c ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0217e1a4 ldr r0, _0217e1b8 ; =data_ov00_020eec9c @@ -110956,10 +110956,10 @@ _0217e0d8: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0217e114: - ldr r0, _0217e1c4 ; =gInventory + ldr r0, _0217e1c4 ; =gItemManager mov r1, #0x28 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0217e1a4 ldr r0, _0217e1b8 ; =data_ov00_020eec9c @@ -110983,10 +110983,10 @@ _0217e140: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0217e178: - ldr r0, _0217e1c4 ; =gInventory + ldr r0, _0217e1c4 ; =gItemManager mov r1, #0x2e ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0217e1a4 ldr r0, _0217e1b8 ; =data_ov00_020eec9c @@ -111005,7 +111005,7 @@ _0217e1a4: _0217e1b8: .word data_ov00_020eec9c _0217e1bc: .word data_027e10a4 _0217e1c0: .word data_027e103c -_0217e1c4: .word gInventory +_0217e1c4: .word gItemManager .global func_ov15_0217e1c8 arm_func_start func_ov15_0217e1c8 @@ -111024,11 +111024,11 @@ func_ov15_0217e1c8: ; 0x0217e1c8 beq _0217e2c4 b _0217e328 _0217e1fc: - ldr r0, _0217e334 ; =gInventory + ldr r0, _0217e334 ; =gItemManager mov r1, #0x2c ldr r0, [r0] mvn r7, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r7, #4 beq _0217e228 @@ -111051,11 +111051,11 @@ _0217e228: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0217e260: - ldr r0, _0217e334 ; =gInventory + ldr r0, _0217e334 ; =gItemManager mov r1, #0x28 ldr r0, [r0] mvn r7, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r7, #4 beq _0217e28c @@ -111078,11 +111078,11 @@ _0217e28c: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0217e2c4: - ldr r0, _0217e334 ; =gInventory + ldr r0, _0217e334 ; =gItemManager mov r1, #0x2e ldr r0, [r0] mvn r7, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r7, #4 beq _0217e2f0 @@ -111110,7 +111110,7 @@ _0217e328: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov15_0217e1c8 -_0217e334: .word gInventory +_0217e334: .word gItemManager .global func_ov15_0217e338 arm_func_start func_ov15_0217e338 @@ -111197,10 +111197,10 @@ _0217e42c: moveq r6, #0 cmp r6, #0 bne _0217e460 - ldr r0, _0217e4c0 ; =gInventory + ldr r0, _0217e4c0 ; =gItemManager mov r1, #0x2e ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r5, #0 _0217e460: @@ -111232,7 +111232,7 @@ _0217e4b0: .word data_027e0d38 _0217e4b4: .word data_027e10a4 _0217e4b8: .word data_027e0d3c _0217e4bc: .word data_027e0d04 -_0217e4c0: .word gInventory +_0217e4c0: .word gItemManager .global func_ov15_0217e4c4 arm_func_start func_ov15_0217e4c4 @@ -112432,31 +112432,31 @@ _0217f554: ; jump table b _0217f594 ; case 2 b _0217f5ac ; case 3 _0217f564: - ldr r0, _0217f5fc ; =gInventory + ldr r0, _0217f5fc ; =gItemManager mov r1, #0x21 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0217f57c: - ldr r0, _0217f5fc ; =gInventory + ldr r0, _0217f5fc ; =gItemManager mov r1, #0x22 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0217f594: - ldr r0, _0217f5fc ; =gInventory + ldr r0, _0217f5fc ; =gItemManager mov r1, #0x23 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0217f5ac: - ldr r0, _0217f5fc ; =gInventory + ldr r0, _0217f5fc ; =gItemManager mov r1, #0x24 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0217f5c4: @@ -112476,7 +112476,7 @@ _0217f5ec: .word data_ov15_0218e6d8 _0217f5f0: .word data_ov15_0218e6dc _0217f5f4: .word data_ov15_0218e6e0 _0217f5f8: .word data_ov15_0218e6e4 -_0217f5fc: .word gInventory +_0217f5fc: .word gItemManager .global func_ov15_0217f600 arm_func_start func_ov15_0217f600 @@ -117661,11 +117661,11 @@ func_ov15_02183c8c: ; 0x02183c8c arm_func_start func_ov15_02183cb4 func_ov15_02183cb4: ; 0x02183cb4 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _021840e0 ; =gInventory + ldr r1, _021840e0 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #0x28 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} @@ -117941,7 +117941,7 @@ _021840bc: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov15_02183cb4 -_021840e0: .word gInventory +_021840e0: .word gItemManager _021840e4: .word data_027e0ff0 _021840e8: .word data_027e0764 _021840ec: .word data_027e0d38 diff --git a/asm/ov17.s b/asm/ov17.s index 50d445c1..345db7b6 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -2270,7 +2270,7 @@ func_ov17_0215cf24: ; 0x0215cf24 mov r4, r0 bl func_ov00_020d4414 ldr r1, _0215cf90 ; =data_ov17_0216bcc4 - ldr r0, _0215cf94 ; =gInventory + ldr r0, _0215cf94 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #1 @@ -2296,7 +2296,7 @@ func_ov17_0215cf24: ; 0x0215cf24 .align 2, 0 arm_func_end func_ov17_0215cf24 _0215cf90: .word data_ov17_0216bcc4 -_0215cf94: .word gInventory +_0215cf94: .word gItemManager _0215cf98: .word data_027e0d0c .global func_ov17_0215cf9c @@ -3648,7 +3648,7 @@ func_ov17_0215e1f0: ; 0x0215e1f0 mov r4, r0 bl func_ov00_020d4414 ldr r1, _0215e298 ; =data_ov17_0216bdcc - ldr r0, _0215e29c ; =gInventory + ldr r0, _0215e29c ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #0 @@ -3656,7 +3656,7 @@ func_ov17_0215e1f0: ; 0x0215e1f0 mov r1, r0 add r0, r4, #0x188 blx func_ov00_020a9588 - ldr r0, _0215e29c ; =gInventory + ldr r0, _0215e29c ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad588 @@ -3688,7 +3688,7 @@ func_ov17_0215e1f0: ; 0x0215e1f0 .align 2, 0 arm_func_end func_ov17_0215e1f0 _0215e298: .word data_ov17_0216bdcc -_0215e29c: .word gInventory +_0215e29c: .word gItemManager _0215e2a0: .word data_ov17_0216be94 _0215e2a4: .word func_ov00_020b7d74 _0215e2a8: .word func_ov17_0215bf80 @@ -4150,7 +4150,7 @@ func_ov17_0215e8f4: ; 0x0215e8f4 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0215e9dc ; =gInventory + ldr r0, _0215e9dc ; =gItemManager ldr r1, _0215e9e0 ; =data_ov17_0216b0ac ldr r0, [r0] bl func_ov00_020ad594 @@ -4204,7 +4204,7 @@ func_ov17_0215e8f4: ; 0x0215e8f4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_0215e8f4 -_0215e9dc: .word gInventory +_0215e9dc: .word gItemManager _0215e9e0: .word data_ov17_0216b0ac _0215e9e4: .word data_027e0fc4 _0215e9e8: .word 0x00000733 @@ -4800,7 +4800,7 @@ func_ov17_0215f16c: ; 0x0215f16c ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} ldrh r1, [r4, #0x22] - ldr r0, _0215f2d0 ; =gInventory + ldr r0, _0215f2d0 ; =gItemManager ldr r0, [r0] ldr r1, [r3, r1, lsl #2] bl func_ov00_020ad588 @@ -4881,7 +4881,7 @@ _0215f2b8: .align 2, 0 arm_func_end func_ov17_0215f16c _0215f2cc: .word data_ov17_0216b0c4 -_0215f2d0: .word gInventory +_0215f2d0: .word gItemManager _0215f2d4: .word data_027e0fc4 _0215f2d8: .word 0x00000733 _0215f2dc: .word data_ov17_0216b0d0 @@ -11497,7 +11497,7 @@ func_ov17_02164538: ; 0x02164538 mov r3, r2 add r0, r4, #0x6c blx func_ov00_020bd618 - ldr r0, _021645fc ; =gInventory + ldr r0, _021645fc ; =gItemManager mov r1, #4 ldr r0, [r0] bl func_ov00_020ad52c @@ -11519,7 +11519,7 @@ _021645ec: .word data_ov00_020e2dd8 _021645f0: .word data_ov17_0216c6e8 _021645f4: .word 0x000004cd _021645f8: .word data_027e0f68 -_021645fc: .word gInventory +_021645fc: .word gItemManager _02164600: .word data_ov00_020e2f68 .global func_ov17_02164604 diff --git a/asm/ov19.s b/asm/ov19.s index 816464dd..eb0e8106 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -1543,7 +1543,7 @@ func_ov19_0216eacc: ; 0x0216eacc mov r1, #0x1e mov r2, #1 bl func_ov00_0209779c - ldr r0, _0216eb2c ; =gInventory + ldr r0, _0216eb2c ; =gItemManager mov r1, #0x16 ldr r0, [r0] blx func_ov00_020ada98 @@ -1563,7 +1563,7 @@ _0216eafc: .align 2, 0 arm_func_end func_ov19_0216eacc _0216eb28: .word data_027e0f74 -_0216eb2c: .word gInventory +_0216eb2c: .word gItemManager _0216eb30: .word 0x0000048d _0216eb34: .word data_027e0ffc diff --git a/asm/ov20.s b/asm/ov20.s index 08070254..3cfe9580 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -291,7 +291,7 @@ func_ov20_0216da64: ; 0x0216da64 ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c - ldr r0, _0216dac0 ; =gInventory + ldr r0, _0216dac0 ; =gItemManager mov r1, #0x15 ldr r0, [r0] blx func_ov00_020ada98 @@ -309,7 +309,7 @@ _0216da98: .align 2, 0 arm_func_end func_ov20_0216da64 _0216dabc: .word data_027e0f74 -_0216dac0: .word gInventory +_0216dac0: .word gItemManager .global func_ov20_0216dac4 arm_func_start func_ov20_0216dac4 @@ -8612,7 +8612,7 @@ func_ov20_021749b0: ; 0x021749b0 func_ov20_021749dc: ; 0x021749dc stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x5c - ldr r1, _02174b94 ; =gInventory + ldr r1, _02174b94 ; =gItemManager mov r6, r0 ldr r0, [r1] mov r1, #2 @@ -8667,7 +8667,7 @@ _02174a20: bl func_ov00_020c2238 cmp r0, #0 beq _02174b28 - ldr r0, _02174b94 ; =gInventory + ldr r0, _02174b94 ; =gItemManager mov lr, r4 ldr r4, [sp, #0x34] ldr r3, [sp, #0x38] @@ -8727,7 +8727,7 @@ _02174b88: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov20_021749dc -_02174b94: .word gInventory +_02174b94: .word gItemManager _02174b98: .word 0x000008a4 _02174b9c: .word 0x00000733 _02174ba0: .word data_027e0e60 diff --git a/asm/ov21.s b/asm/ov21.s index a42f4d6a..260624a3 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -88,12 +88,12 @@ func_ov21_0216d784: ; 0x0216d784 stmdb sp!, {r4, lr} mov r4, r0 bl func_ov14_02126b04 - ldr r0, _0216d7bc ; =gInventory + ldr r0, _0216d7bc ; =gItemManager ldr r2, [r4, #0xb4] ldr r1, _0216d7c0 ; =data_ov21_02170bd4 ldr r0, [r0] ldr r1, [r1, r2, lsl #2] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #5 moveq r0, #0xc @@ -101,7 +101,7 @@ func_ov21_0216d784: ; 0x0216d784 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov21_0216d784 -_0216d7bc: .word gInventory +_0216d7bc: .word gItemManager _0216d7c0: .word data_ov21_02170bd4 .global func_ov21_0216d7c4 @@ -147,18 +147,18 @@ func_ov21_0216d828: ; 0x0216d828 .global func_ov21_0216d830 arm_func_start func_ov21_0216d830 func_ov21_0216d830: ; 0x0216d830 - ldr r1, _0216d84c ; =gInventory + ldr r1, _0216d84c ; =gItemManager ldr r3, [r0, #0xb4] ldr r2, _0216d850 ; =data_ov21_02170bd4 ldr r0, [r1] - ldr ip, _0216d854 ; =_ZN9Inventory7HasItemEj + ldr ip, _0216d854 ; =_ZN11ItemManager7HasItemEj ldr r1, [r2, r3, lsl #2] bx ip .align 2, 0 arm_func_end func_ov21_0216d830 -_0216d84c: .word gInventory +_0216d84c: .word gItemManager _0216d850: .word data_ov21_02170bd4 -_0216d854: .word _ZN9Inventory7HasItemEj +_0216d854: .word _ZN11ItemManager7HasItemEj .global func_ov21_0216d858 arm_func_start func_ov21_0216d858 diff --git a/asm/ov23.s b/asm/ov23.s index 9c0f8067..62a04ea7 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -1850,7 +1850,7 @@ _0216edf0: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0216ee18: - ldr r0, _0216eee8 ; =gInventory + ldr r0, _0216eee8 ; =gItemManager mov r2, #0xbd ldr r1, [r0] add sp, sp, #8 @@ -1858,7 +1858,7 @@ _0216ee18: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0216ee34: - ldr r0, _0216eee8 ; =gInventory + ldr r0, _0216eee8 ; =gItemManager mov r2, #0xbe ldr r1, [r0] add sp, sp, #8 @@ -1866,7 +1866,7 @@ _0216ee34: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0216ee50: - ldr r0, _0216eee8 ; =gInventory + ldr r0, _0216eee8 ; =gItemManager mov r2, #0xbf ldr r1, [r0] add sp, sp, #8 @@ -1874,7 +1874,7 @@ _0216ee50: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0216ee6c: - ldr r0, _0216eee8 ; =gInventory + ldr r0, _0216eee8 ; =gItemManager mov r2, #0xc0 ldr r1, [r0] add sp, sp, #8 @@ -1882,7 +1882,7 @@ _0216ee6c: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0216ee88: - ldr r0, _0216eee8 ; =gInventory + ldr r0, _0216eee8 ; =gItemManager mov r2, #0xc1 ldr r1, [r0] add sp, sp, #8 @@ -1911,7 +1911,7 @@ _0216eed4: arm_func_end func_ov23_0216ed6c _0216eee0: .word data_027e0f94 _0216eee4: .word data_027e0e58 -_0216eee8: .word gInventory +_0216eee8: .word gItemManager _0216eeec: .word data_ov00_020eec68 .global func_ov23_0216eef0 @@ -8499,7 +8499,7 @@ func_ov23_02174684: ; 0x02174684 bl func_ov00_020c5c98 add r0, r4, #0x20 bl func_ov23_021744b0 - ldr r0, _02174714 ; =gInventory + ldr r0, _02174714 ; =gItemManager mov r1, #8 ldr r0, [r0] bl func_ov00_020ad52c @@ -8529,7 +8529,7 @@ func_ov23_02174684: ; 0x02174684 .align 2, 0 arm_func_end func_ov23_02174684 _02174710: .word data_ov23_02179578 -_02174714: .word gInventory +_02174714: .word gItemManager .global func_ov23_02174718 arm_func_start func_ov23_02174718 diff --git a/asm/ov24.s b/asm/ov24.s index d585b1f7..f66d3a7a 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -9734,7 +9734,7 @@ _021754f4: mov r2, #0 bl func_ov00_020bf008 _02175624: - ldr r0, _02175ed0 ; =gInventory + ldr r0, _02175ed0 ; =gItemManager mov r1, #2 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -10333,7 +10333,7 @@ _02175ec0: .word data_ov24_021792e4 _02175ec4: .word 0x00000b33 _02175ec8: .word data_02050f54 _02175ecc: .word data_027e0f90 -_02175ed0: .word gInventory +_02175ed0: .word gItemManager _02175ed4: .word data_027e0ffc _02175ed8: .word 0x0000ffff _02175edc: .word 0x0000019a diff --git a/asm/ov25.s b/asm/ov25.s index af9dee78..f52785db 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -12898,7 +12898,7 @@ _021783b0: bl func_ov00_020c1fc8 cmp r0, #0 beq _02178404 - ldr r0, _02178504 ; =gInventory + ldr r0, _02178504 ; =gItemManager mov r1, #2 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -12987,7 +12987,7 @@ _021784e8: .align 2, 0 arm_func_end func_ov25_02178218 _02178500: .word data_027e0e60 -_02178504: .word gInventory +_02178504: .word gItemManager _02178508: .word 0x66666667 .global func_ov25_0217850c diff --git a/asm/ov26.s b/asm/ov26.s index 828dfc2a..541cbe61 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -1417,10 +1417,10 @@ func_ov26_0216e594: ; 0x0216e594 arm_func_start func_ov26_0216e5b4 func_ov26_0216e5b4: ; 0x0216e5b4 stmdb sp!, {r3, lr} - ldr r0, _0216e628 ; =gInventory + ldr r0, _0216e628 ; =gItemManager mov r1, #0x20 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0216e620 ldr r0, _0216e62c ; =data_027e077c @@ -1448,7 +1448,7 @@ _0216e620: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov26_0216e5b4 -_0216e628: .word gInventory +_0216e628: .word gItemManager _0216e62c: .word data_027e077c _0216e630: .word data_02056be4 _0216e634: .word data_027e1054 @@ -1690,13 +1690,13 @@ func_ov26_0216e8b8: ; 0x0216e8b8 add r3, r1, #0 str r1, [sp] blx func_020351b8 - ldr r0, _0216e9b8 ; =gInventory + ldr r0, _0216e9b8 ; =gItemManager mov r1, #0x20 ldr r0, [r0] - blx _ZN9Inventory7HasItemEj + blx _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0216e986 - ldr r0, _0216e9b8 ; =gInventory + ldr r0, _0216e9b8 ; =gItemManager ldr r0, [r0] ldr r1, [r0, #0xc] add r0, r4, #0 @@ -1760,7 +1760,7 @@ _0216e9b0: pop {r4, pc} nop thumb_func_end func_ov26_0216e8b8 -_0216e9b8: .word gInventory +_0216e9b8: .word gItemManager _0216e9bc: .word data_027e0d38 _0216e9c0: .word data_027e0fbc @@ -1781,11 +1781,11 @@ func_ov26_0216e9d0: ; 0x0216e9d0 mov r6, r0 add r0, r6, #0x9c bl func_ov26_0216e638 - ldr r0, _0216eb38 ; =gInventory + ldr r0, _0216eb38 ; =gItemManager mov r1, #0x20 ldr r0, [r0] mov r5, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0216ea08 ldrb r0, [r6, #0xc2] @@ -1877,7 +1877,7 @@ _0216eb28: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov26_0216e9d0 -_0216eb38: .word gInventory +_0216eb38: .word gItemManager _0216eb3c: .word data_ov00_020eec9c .global func_ov26_0216eb40 @@ -1995,7 +1995,7 @@ _0216ecb4: .word data_027e1054 arm_func_start func_ov26_0216ecb8 func_ov26_0216ecb8: ; 0x0216ecb8 stmdb sp!, {r3, lr} - ldr ip, _0216ed5c ; =gInventory + ldr ip, _0216ed5c ; =gItemManager ldr lr, [r0, #0xb4] ldr ip, [ip] add lr, lr, r1 @@ -2039,7 +2039,7 @@ _0216ed2c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov26_0216ecb8 -_0216ed5c: .word gInventory +_0216ed5c: .word gItemManager _0216ed60: .word 0x88888889 .global func_ov26_0216ed64 @@ -4148,13 +4148,13 @@ func_ov26_02170894: ; 0x02170894 mov r5, r0 cmp r2, #0 bne _0217090c - ldr r0, _02170934 ; =gInventory + ldr r0, _02170934 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _021708dc - ldr r0, _02170934 ; =gInventory + ldr r0, _02170934 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -4188,7 +4188,7 @@ _0217092c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov26_02170894 -_02170934: .word gInventory +_02170934: .word gItemManager .global func_ov26_02170938 arm_func_start func_ov26_02170938 @@ -5594,12 +5594,12 @@ _02171cd4: _02171ce8: bl func_ov14_02126b04 _02171cec: - ldr r0, _02171d20 ; =gInventory + ldr r0, _02171d20 ; =gItemManager ldr r2, [r5, #0xb4] ldr r1, _02171d24 ; =data_ov26_02179434 ldr r0, [r0] ldr r1, [r1, r2, lsl #2] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #5 moveq r0, #0xc @@ -5609,7 +5609,7 @@ _02171cec: arm_func_end func_ov26_02171c60 _02171d18: .word data_ov26_02179446 _02171d1c: .word data_027e0ffc -_02171d20: .word gInventory +_02171d20: .word gItemManager _02171d24: .word data_ov26_02179434 .global func_ov26_02171d28 @@ -7170,7 +7170,7 @@ _021731b8: ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c - ldr r0, _021732bc ; =gInventory + ldr r0, _021732bc ; =gItemManager mov r1, #0x60 ldr r0, [r0] blx func_ov00_020ada98 @@ -7234,7 +7234,7 @@ _021732ac: .word data_027e0f74 _021732b0: .word data_027e0f90 _021732b4: .word data_027e0fe4 _021732b8: .word data_027e0c68 -_021732bc: .word gInventory +_021732bc: .word gItemManager _021732c0: .word data_027e0ffc _021732c4: .word data_027e0d04 _021732c8: .word data_027e1054 @@ -8187,7 +8187,7 @@ _02173cfa: add r0, r4, #0 str r1, [r4, #0x68] bl func_ov26_02173e14 - ldr r0, _02173dd8 ; =gInventory + ldr r0, _02173dd8 ; =gItemManager mov r1, #0xe1 ldr r5, [r0] lsl r1, r1, #4 @@ -8280,7 +8280,7 @@ _02173dac: pop {r3, r4, r5, pc} nop thumb_func_end func_ov26_02173cec -_02173dd8: .word gInventory +_02173dd8: .word gItemManager _02173ddc: .word data_ov26_0217abd4 _02173de0: .word 0x04000050 _02173de4: .word data_027e0c38 @@ -8331,7 +8331,7 @@ _02173e2e: mov r2, #0x10 add r1, #0x74 strh r2, [r1] - ldr r1, _02173e4c ; =gInventory + ldr r1, _02173e4c ; =gItemManager add r0, #0xa4 ldr r1, [r1] ldr r1, [r1, #0xc] @@ -8345,7 +8345,7 @@ _02173e48: bx lr nop thumb_func_end func_ov26_02173e14 -_02173e4c: .word gInventory +_02173e4c: .word gItemManager .global func_ov26_02173e50 thumb_func_start func_ov26_02173e50 @@ -8783,7 +8783,7 @@ _02174196: _021741b6: mov r2, #0 _021741b8: - ldr r1, _02174254 ; =gInventory + ldr r1, _02174254 ; =gItemManager ldr r1, [r1] ldr r3, [r1, #0xc] lsl r1, r2, #0x10 @@ -8824,7 +8824,7 @@ _021741f4: str r2, [r1] b _0217422a _02174204: - ldr r1, _02174254 ; =gInventory + ldr r1, _02174254 ; =gItemManager ldr r1, [r1] ldr r2, [r1, #0xc] add r1, r0, #0 @@ -8868,7 +8868,7 @@ _0217424e: .align 2, 0 thumb_func_end func_ov26_02174170 _02174250: .word data_027e0fbc -_02174254: .word gInventory +_02174254: .word gItemManager .global func_ov26_02174258 thumb_func_start func_ov26_02174258 @@ -13275,7 +13275,7 @@ func_ov26_021778e8: ; 0x021778e8 cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, r5, r6, pc} - ldr r0, _021779cc ; =gInventory + ldr r0, _021779cc ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020adabc @@ -13329,7 +13329,7 @@ _021779ac: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov26_021778e8 -_021779cc: .word gInventory +_021779cc: .word gItemManager _021779d0: .word data_027e0f7c _021779d4: .word data_027e0f74 _021779d8: .word data_027e0d3c diff --git a/asm/ov27.s b/asm/ov27.s index 562c9538..75be1931 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -6847,7 +6847,7 @@ func_ov27_02173590: ; 0x02173590 cmpne r1, #0x3d addne sp, sp, #8 ldmneia sp!, {r4, pc} - ldr r0, _02173700 ; =gInventory + ldr r0, _02173700 ; =gItemManager ldr r0, [r0] ldr r0, [r0] cmp r0, #9 @@ -6906,7 +6906,7 @@ _021736dc: _021736f4: .word data_027e103c _021736f8: .word data_027e0f90 _021736fc: .word data_027e077c -_02173700: .word gInventory +_02173700: .word gItemManager _02173704: .word data_027e0fe4 _02173708: .word 0x55424c4e _0217370c: .word data_ov00_020eec68 @@ -8569,7 +8569,7 @@ func_ov27_02174bdc: ; 0x02174bdc beq _02174c30 b _02174d20 _02174bf8: - ldr r0, _02174d28 ; =gInventory + ldr r0, _02174d28 ; =gItemManager mov r4, #0 ldr r5, [r0] _02174c04: @@ -8585,7 +8585,7 @@ _02174c04: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _02174c30: - ldr r0, _02174d28 ; =gInventory + ldr r0, _02174d28 ; =gItemManager mov r1, #4 ldr r4, [r0] mov r0, r4 @@ -8653,7 +8653,7 @@ _02174d20: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov27_02174bdc -_02174d28: .word gInventory +_02174d28: .word gItemManager _02174d2c: .word data_027e0f74 _02174d30: .word 0x0000013e _02174d34: .word 0x0000013f @@ -12969,7 +12969,7 @@ _02178718: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} _02178760: mov r5, #0 - ldr r7, _02178868 ; =gInventory + ldr r7, _02178868 ; =gItemManager str r5, [sp] mov r1, r5 mov r8, #1 @@ -13043,7 +13043,7 @@ _02178858: .word 0x00001001 _0217885c: .word data_ov27_021790dc _02178860: .word data_027e0dbc _02178864: .word data_027e0fc8 -_02178868: .word gInventory +_02178868: .word gItemManager _0217886c: .word data_ov27_02179114 .global func_ov27_02178870 diff --git a/asm/ov28.s b/asm/ov28.s index ae6d4154..d4dd5f31 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -2993,7 +2993,7 @@ func_ov28_0216fe68: ; 0x0216fe68 beq _0216febc b _0216ffac _0216fe84: - ldr r0, _0216ffb4 ; =gInventory + ldr r0, _0216ffb4 ; =gItemManager mov r4, #0 ldr r5, [r0] _0216fe90: @@ -3009,7 +3009,7 @@ _0216fe90: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _0216febc: - ldr r0, _0216ffb4 ; =gInventory + ldr r0, _0216ffb4 ; =gItemManager mov r1, #4 ldr r4, [r0] mov r0, r4 @@ -3077,7 +3077,7 @@ _0216ffac: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov28_0216fe68 -_0216ffb4: .word gInventory +_0216ffb4: .word gItemManager _0216ffb8: .word data_027e0f74 _0216ffbc: .word 0x0000013e _0216ffc0: .word 0x0000013f @@ -3089,7 +3089,7 @@ func_ov28_0216ffc4: ; 0x0216ffc4 ldrh r0, [r1, #2] cmp r0, #0x11 bne _0216fffc - ldr r0, _02170004 ; =gInventory + ldr r0, _02170004 ; =gItemManager mov r1, #5 ldr r0, [r0] blx func_ov00_020ad930 @@ -3104,7 +3104,7 @@ _0216fffc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov28_0216ffc4 -_02170004: .word gInventory +_02170004: .word gItemManager .global func_ov28_02170008 arm_func_start func_ov28_02170008 @@ -5115,7 +5115,7 @@ func_ov28_021718d8: ; 0x021718d8 beq _0217192c b _02171a1c _021718f4: - ldr r0, _02171a24 ; =gInventory + ldr r0, _02171a24 ; =gItemManager mov r4, #0 ldr r5, [r0] _02171900: @@ -5131,7 +5131,7 @@ _02171900: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _0217192c: - ldr r0, _02171a24 ; =gInventory + ldr r0, _02171a24 ; =gItemManager mov r1, #4 ldr r4, [r0] mov r0, r4 @@ -5199,7 +5199,7 @@ _02171a1c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov28_021718d8 -_02171a24: .word gInventory +_02171a24: .word gItemManager _02171a28: .word data_027e0f74 _02171a2c: .word 0x0000013e _02171a30: .word 0x0000013f @@ -5228,7 +5228,7 @@ func_ov28_02171a60: ; 0x02171a60 ldrh r0, [r1, #2] cmp r0, #0x11 bne _02171a98 - ldr r0, _02171aa0 ; =gInventory + ldr r0, _02171aa0 ; =gItemManager mov r1, #5 ldr r0, [r0] blx func_ov00_020ad930 @@ -5243,7 +5243,7 @@ _02171a98: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov28_02171a60 -_02171aa0: .word gInventory +_02171aa0: .word gItemManager .global func_ov28_02171aa4 arm_func_start func_ov28_02171aa4 @@ -6292,7 +6292,7 @@ _02172808: .word 0x000001ad arm_func_start func_ov28_0217280c func_ov28_0217280c: ; 0x0217280c stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r3, _021728fc ; =gInventory + ldr r3, _021728fc ; =gItemManager mov sb, r1 ldr r7, [r3] mov sl, r0 @@ -6359,7 +6359,7 @@ _021728d0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov28_0217280c -_021728fc: .word gInventory +_021728fc: .word gItemManager .global func_ov28_02172900 arm_func_start func_ov28_02172900 @@ -6417,7 +6417,7 @@ func_ov28_0217297c: ; 0x0217297c _02172998: ldrh r2, [r1, #4] ldr r1, _02172a3c ; =data_ov28_021782e0 - ldr r0, _02172a40 ; =gInventory + ldr r0, _02172a40 ; =gItemManager ldr r1, [r1, r2, lsl #2] ldr r0, [r0] add r2, r0, r1 @@ -6444,7 +6444,7 @@ _021729ec: _021729f4: ldrh r2, [r1, #4] ldr r1, _02172a3c ; =data_ov28_021782e0 - ldr r0, _02172a40 ; =gInventory + ldr r0, _02172a40 ; =gItemManager ldr r1, [r1, r2, lsl #2] ldr r0, [r0] add r2, r0, r1 @@ -6465,7 +6465,7 @@ _02172a34: .align 2, 0 arm_func_end func_ov28_0217297c _02172a3c: .word data_ov28_021782e0 -_02172a40: .word gInventory +_02172a40: .word gItemManager .global func_ov28_02172a44 arm_func_start func_ov28_02172a44 @@ -6475,7 +6475,7 @@ func_ov28_02172a44: ; 0x02172a44 cmp r0, #0x10 bne _02172a78 ldrh r2, [r1, #4] - ldr r0, _02172a80 ; =gInventory + ldr r0, _02172a80 ; =gItemManager ldr r1, _02172a84 ; =data_ov28_021782e0 ldr r0, [r0] ldr r1, [r1, r2, lsl #2] @@ -6488,7 +6488,7 @@ _02172a78: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov28_02172a44 -_02172a80: .word gInventory +_02172a80: .word gItemManager _02172a84: .word data_ov28_021782e0 .global func_ov28_02172a88 @@ -6496,7 +6496,7 @@ _02172a84: .word data_ov28_021782e0 func_ov28_02172a88: ; 0x02172a88 ldrh r2, [r1, #4] ldr r1, _02172abc ; =data_ov28_021782e0 - ldr r0, _02172ac0 ; =gInventory + ldr r0, _02172ac0 ; =gItemManager ldr r1, [r1, r2, lsl #2] ldr r0, [r0] add r0, r0, r1 @@ -6510,7 +6510,7 @@ func_ov28_02172a88: ; 0x02172a88 .align 2, 0 arm_func_end func_ov28_02172a88 _02172abc: .word data_ov28_021782e0 -_02172ac0: .word gInventory +_02172ac0: .word gItemManager .global func_ov28_02172ac4 arm_func_start func_ov28_02172ac4 @@ -6675,9 +6675,9 @@ _02172c54: cmp r1, r0 addeq sp, sp, #0x14 ldmeqia sp!, {r4, r5, pc} - ldr r0, _02172f10 ; =gInventory + ldr r0, _02172f10 ; =gItemManager ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, #0 beq _02172ee4 add r1, r5, #0x100 @@ -6835,7 +6835,7 @@ _02172ee4: arm_func_end func_ov28_02172c28 _02172f08: .word data_027e0e58 _02172f0c: .word 0xfffff19a -_02172f10: .word gInventory +_02172f10: .word gItemManager _02172f14: .word data_027e0ffc _02172f18: .word 0x0000014d _02172f1c: .word 0x0000014e @@ -11388,10 +11388,10 @@ func_ov28_021768dc: ; 0x021768dc add r0, r0, #0x400 add r1, r1, #0x400 bl func_ov00_020b3ee8 - ldr r0, _021769e4 ; =gInventory + ldr r0, _021769e4 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x7ad] @@ -11403,7 +11403,7 @@ _021769d4: .word 0x0000063d _021769d8: .word data_02050f54 _021769dc: .word data_02051154 _021769e0: .word data_02051f54 -_021769e4: .word gInventory +_021769e4: .word gItemManager .global func_ov28_021769e8 arm_func_start func_ov28_021769e8 diff --git a/asm/ov29.s b/asm/ov29.s index 71a3c1e0..79789a24 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -752,7 +752,7 @@ _0216df70: ldr r0, _0216dff4 ; =data_027e104c ldr r0, [r0] bl func_ov09_0211a988 - ldr r0, _0216e008 ; =gInventory + ldr r0, _0216e008 ; =gItemManager mvn r1, #0 ldr r0, [r0] bl func_ov00_020ae4dc @@ -779,7 +779,7 @@ _0216dff8: .word data_ov00_020eec9c _0216dffc: .word 0x0000099a _0216e000: .word data_027e0fc8 _0216e004: .word data_ov29_0217a504 -_0216e008: .word gInventory +_0216e008: .word gItemManager .global func_ov29_0216e00c arm_func_start func_ov29_0216e00c @@ -11179,7 +11179,7 @@ func_ov29_02176d6c: ; 0x02176d6c ldrb r0, [r0, #0x2a] cmp r0, #0 bne _02176da8 - ldr r0, _02176dbc ; =gInventory + ldr r0, _02176dbc ; =gItemManager ldr r0, [r0] ldr r0, [r0] cmp r0, #9 @@ -11197,7 +11197,7 @@ _02176db0: .align 2, 0 arm_func_end func_ov29_02176d6c _02176db8: .word data_027e103c -_02176dbc: .word gInventory +_02176dbc: .word gItemManager .global func_ov29_02176dc0 arm_func_start func_ov29_02176dc0 @@ -11307,7 +11307,7 @@ _02176eec: cmp r2, r1 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r1, _02176fb4 ; =gInventory + ldr r1, _02176fb4 ; =gItemManager ldr r1, [r1] ldrh r1, [r1, #0xba] cmp r1, #0 @@ -11356,7 +11356,7 @@ _02176f60: arm_func_end func_ov29_02176ea8 _02176fac: .word data_027e0f74 _02176fb0: .word data_ov29_0217a4ac -_02176fb4: .word gInventory +_02176fb4: .word gItemManager _02176fb8: .word data_027e103c .global func_ov29_02176fbc @@ -11514,7 +11514,7 @@ _0217714c: add sp, sp, #0x1c ldmia sp!, {r3, r4, r5, r6, pc} _021771d8: - ldr r0, _021772f4 ; =gInventory + ldr r0, _021772f4 ; =gItemManager ldr r0, [r0] ldrh r6, [r0, #0xba] cmp r6, #0 @@ -11588,7 +11588,7 @@ _021772e4: .word data_027e0618 _021772e8: .word data_027e0db0 _021772ec: .word data_ov29_0217a4ac _021772f0: .word data_027e103c -_021772f4: .word gInventory +_021772f4: .word gItemManager .global func_ov29_021772f8 arm_func_start func_ov29_021772f8 @@ -11947,7 +11947,7 @@ _021777f8: cmp r1, #0 moveq r1, #1 streqb r1, [r0, #0x55] - ldr r1, _021778ec ; =gInventory + ldr r1, _021778ec ; =gItemManager ldr r0, _021778f0 ; =data_ov00_020eec9c ldr r2, [r1] mov r1, #0xc1 @@ -12005,7 +12005,7 @@ _021778dc: .word data_ov29_0217a244 _021778e0: .word data_02057200 _021778e4: .word data_ov29_0217bd28 _021778e8: .word data_ov29_0217a4ac -_021778ec: .word gInventory +_021778ec: .word gItemManager _021778f0: .word data_ov00_020eec9c _021778f4: .word data_ov38_02189238 diff --git a/asm/ov30.s b/asm/ov30.s index 77f5c2a1..9ceb8f42 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -6961,10 +6961,10 @@ _021813d0: bl func_ov30_021812f0 cmp r0, #0 beq _021814f4 - ldr r0, _02181804 ; =gInventory + ldr r0, _02181804 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0218146c mov r2, #2 @@ -6999,7 +6999,7 @@ _02181464: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0218146c: - ldr r0, _02181804 ; =gInventory + ldr r0, _02181804 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -7249,7 +7249,7 @@ _021817fc: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov30_02181364 -_02181804: .word gInventory +_02181804: .word gItemManager _02181808: .word 0x43485334 _0218180c: .word data_027e0ffc _02181810: .word 0x000001bd diff --git a/asm/ov31.s b/asm/ov31.s index 614e8811..50d7849d 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -1044,7 +1044,7 @@ _0217cae4: bl func_ov31_0217ce90 cmp r0, #0 bne _0217cb38 - ldr r0, _0217cb68 ; =gInventory + ldr r0, _0217cb68 ; =gItemManager ldr r1, [r5, #0x18] ldr r0, [r0] rsb r1, r1, #0 @@ -1078,7 +1078,7 @@ _0217cb38: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov31_0217ca10 -_0217cb68: .word gInventory +_0217cb68: .word gItemManager _0217cb6c: .word data_ov00_020eec9c .global func_ov31_0217cb70 @@ -1112,10 +1112,10 @@ _0217cb90: ; jump table b _0217cc50 ; case 16 b _0217cc50 ; case 17 _0217cbd8: - ldr r0, _0217cd00 ; =gInventory + ldr r0, _0217cd00 ; =gItemManager mov r1, #4 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _0217cc80 ldr r1, _0217cd04 ; =0x00140054 @@ -1123,10 +1123,10 @@ _0217cbd8: str r1, [r4, #0xc] ldmia sp!, {r4, pc} _0217cc00: - ldr r0, _0217cd00 ; =gInventory + ldr r0, _0217cd00 ; =gItemManager mov r1, #5 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _0217cc80 ldr r1, _0217cd08 ; =0x00140053 @@ -1134,10 +1134,10 @@ _0217cc00: str r1, [r4, #0xc] ldmia sp!, {r4, pc} _0217cc28: - ldr r0, _0217cd00 ; =gInventory + ldr r0, _0217cd00 ; =gItemManager mov r1, #7 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 bne _0217cc80 ldr r1, _0217cd0c ; =0x00140055 @@ -1145,7 +1145,7 @@ _0217cc28: str r1, [r4, #0xc] ldmia sp!, {r4, pc} _0217cc50: - ldr r0, _0217cd00 ; =gInventory + ldr r0, _0217cd00 ; =gItemManager ldr r0, [r0] bl func_ov00_020ae598 cmp r0, #0 @@ -1158,7 +1158,7 @@ _0217cc50: mov r0, #0 ldmia sp!, {r4, pc} _0217cc80: - ldr r0, _0217cd00 ; =gInventory + ldr r0, _0217cd00 ; =gItemManager ldr r1, [r4, #0x18] ldr r0, [r0] ldrh r0, [r0, #0x22] @@ -1193,7 +1193,7 @@ _0217ccc0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217cb70 -_0217cd00: .word gInventory +_0217cd00: .word gItemManager _0217cd04: .word 0x00140054 _0217cd08: .word 0x00140053 _0217cd0c: .word 0x00140055 @@ -1515,7 +1515,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4 add r0, r0, #0xe2 str r0, [sp, #0xc] ldr r0, _0217d3ec ; =0x49544150 - ldr fp, _0217d3f4 ; =gInventory + ldr fp, _0217d3f4 ; =gItemManager add r0, r0, #0x1200 str r0, [sp, #0x18] ldr r0, _0217d3f8 ; =0x49545452 @@ -1592,21 +1592,21 @@ _0217d1a4: _0217d1b4: ldr r0, [fp] mov r1, #4 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r8, r4 b _0217d25c _0217d1cc: ldr r0, [fp] mov r1, #5 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r8, r4 b _0217d25c _0217d1e4: ldr r0, [fp] mov r1, #7 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r8, r4 b _0217d25c @@ -1745,7 +1745,7 @@ _0217d2c8: _0217d3e8: .word 0x00005555 _0217d3ec: .word 0x49544150 _0217d3f0: .word 0x4954534f -_0217d3f4: .word gInventory +_0217d3f4: .word gItemManager _0217d3f8: .word 0x49545452 _0217d3fc: .word data_ov31_021818a0 _0217d400: .word data_027e0dbc @@ -2846,7 +2846,7 @@ func_ov31_0217e040: ; 0x0217e040 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr r7, _0217e278 ; =data_02057878 ldr r6, _0217e27c ; =data_0205785c - ldr r5, _0217e280 ; =gInventory + ldr r5, _0217e280 ; =gItemManager ldr r4, _0217e284 ; =data_ov31_021822b0 ldr fp, _0217e288 ; =data_027e0ce0 mov sl, #0 @@ -2997,7 +2997,7 @@ _0217e254: arm_func_end func_ov31_0217e040 _0217e278: .word data_02057878 _0217e27c: .word data_0205785c -_0217e280: .word gInventory +_0217e280: .word gItemManager _0217e284: .word data_ov31_021822b0 _0217e288: .word data_027e0ce0 _0217e28c: .word data_ov31_02182318 @@ -3594,7 +3594,7 @@ func_ov31_0217e97c: ; 0x0217e97c ldr r1, [r4, #0x158] cmp r1, #6 bne _0217e9a8 - ldr r0, _0217ea0c ; =gInventory + ldr r0, _0217ea0c ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xb6] cmp r0, #1 @@ -3603,7 +3603,7 @@ func_ov31_0217e97c: ; 0x0217e97c _0217e9a8: cmp r1, #7 bne _0217e9c8 - ldr r0, _0217ea0c ; =gInventory + ldr r0, _0217ea0c ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xb4] cmp r0, #1 @@ -3612,7 +3612,7 @@ _0217e9a8: _0217e9c8: cmp r1, #8 bne _0217e9e8 - ldr r0, _0217ea0c ; =gInventory + ldr r0, _0217ea0c ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xb8] cmp r0, #1 @@ -3631,7 +3631,7 @@ _0217e9f0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217e97c -_0217ea0c: .word gInventory +_0217ea0c: .word gItemManager _0217ea10: .word data_ov31_02181a08 _0217ea14: .word data_ov31_02181a18 _0217ea18: .word data_ov31_02181a28 @@ -5334,7 +5334,7 @@ _0217fdfc: .word data_027e0f74 arm_func_start func_ov31_0217fe00 func_ov31_0217fe00: ; 0x0217fe00 stmdb sp!, {r4, lr} - ldr r1, _0217fe28 ; =gInventory + ldr r1, _0217fe28 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #5 @@ -5345,7 +5345,7 @@ func_ov31_0217fe00: ; 0x0217fe00 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217fe00 -_0217fe28: .word gInventory +_0217fe28: .word gItemManager .global func_ov31_0217fe2c arm_func_start func_ov31_0217fe2c @@ -5368,7 +5368,7 @@ _0217fe54: .word data_027e0f74 arm_func_start func_ov31_0217fe58 func_ov31_0217fe58: ; 0x0217fe58 stmdb sp!, {r4, lr} - ldr r1, _0217fe80 ; =gInventory + ldr r1, _0217fe80 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #4 @@ -5379,7 +5379,7 @@ func_ov31_0217fe58: ; 0x0217fe58 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217fe58 -_0217fe80: .word gInventory +_0217fe80: .word gItemManager .global func_ov31_0217fe84 arm_func_start func_ov31_0217fe84 @@ -5402,7 +5402,7 @@ _0217feac: .word data_027e0f74 arm_func_start func_ov31_0217feb0 func_ov31_0217feb0: ; 0x0217feb0 stmdb sp!, {r4, lr} - ldr r1, _0217fed8 ; =gInventory + ldr r1, _0217fed8 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #7 @@ -5413,7 +5413,7 @@ func_ov31_0217feb0: ; 0x0217feb0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217feb0 -_0217fed8: .word gInventory +_0217fed8: .word gItemManager .global func_ov31_0217fedc arm_func_start func_ov31_0217fedc @@ -5787,7 +5787,7 @@ func_ov31_021802a0: ; 0x021802a0 arm_func_start func_ov31_021802a8 func_ov31_021802a8: ; 0x021802a8 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _021802e0 ; =gInventory + ldr r0, _021802e0 ; =gItemManager mov r1, #5 ldr r5, [r0] mov r0, r5 @@ -5802,7 +5802,7 @@ func_ov31_021802a8: ; 0x021802a8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov31_021802a8 -_021802e0: .word gInventory +_021802e0: .word gItemManager .global func_ov31_021802e4 arm_func_start func_ov31_021802e4 @@ -5815,7 +5815,7 @@ func_ov31_021802e4: ; 0x021802e4 arm_func_start func_ov31_021802ec func_ov31_021802ec: ; 0x021802ec stmdb sp!, {r3, r4, r5, lr} - ldr r0, _02180324 ; =gInventory + ldr r0, _02180324 ; =gItemManager mov r1, #4 ldr r5, [r0] mov r0, r5 @@ -5830,7 +5830,7 @@ func_ov31_021802ec: ; 0x021802ec ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov31_021802ec -_02180324: .word gInventory +_02180324: .word gItemManager .global func_ov31_02180328 arm_func_start func_ov31_02180328 @@ -5843,7 +5843,7 @@ func_ov31_02180328: ; 0x02180328 arm_func_start func_ov31_02180330 func_ov31_02180330: ; 0x02180330 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _02180368 ; =gInventory + ldr r0, _02180368 ; =gItemManager mov r1, #7 ldr r5, [r0] mov r0, r5 @@ -5858,7 +5858,7 @@ func_ov31_02180330: ; 0x02180330 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov31_02180330 -_02180368: .word gInventory +_02180368: .word gItemManager .global func_ov31_0218036c arm_func_start func_ov31_0218036c @@ -5871,7 +5871,7 @@ func_ov31_0218036c: ; 0x0218036c arm_func_start func_ov31_02180374 func_ov31_02180374: ; 0x02180374 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _021803c0 ; =gInventory + ldr r1, _021803c0 ; =gItemManager mov r6, r0 ldr r5, [r1] bl func_ov31_02180248 @@ -5891,13 +5891,13 @@ func_ov31_02180374: ; 0x02180374 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov31_02180374 -_021803c0: .word gInventory +_021803c0: .word gItemManager .global func_ov31_021803c4 arm_func_start func_ov31_021803c4 func_ov31_021803c4: ; 0x021803c4 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _021803fc ; =gInventory + ldr r1, _021803fc ; =gItemManager ldr r5, [r1] bl func_ov31_02180278 mov r1, r0 @@ -5912,7 +5912,7 @@ func_ov31_021803c4: ; 0x021803c4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov31_021803c4 -_021803fc: .word gInventory +_021803fc: .word gItemManager .global func_ov31_02180400 arm_func_start func_ov31_02180400 @@ -6456,10 +6456,10 @@ _021808b0: movne r0, #1 ldmia sp!, {r4, pc} _02180930: - ldr r0, _0218095c ; =gInventory + ldr r0, _0218095c ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 movne r0, #0x10 moveq r0, #0xe @@ -6470,7 +6470,7 @@ _02180950: .align 2, 0 arm_func_end func_ov31_02180858 _02180958: .word data_027e0f74 -_0218095c: .word gInventory +_0218095c: .word gItemManager .global func_ov31_02180960 arm_func_start func_ov31_02180960 diff --git a/asm/ov35.s b/asm/ov35.s index b46e0d2a..eb6f8c1e 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -3465,7 +3465,7 @@ func_ov35_0217ebb4: ; 0x0217ebb4 str r1, [r4, #0x3ac] sub r0, r1, #1 str r0, [r4, #0x3b0] - ldr r0, _0217eca4 ; =gInventory + ldr r0, _0217eca4 ; =gItemManager str r1, [r4, #0x3b4] ldr r0, [r0] mov r1, #4 @@ -3507,7 +3507,7 @@ func_ov35_0217ebb4: ; 0x0217ebb4 _0217ec98: .word data_ov35_02185cf0 _0217ec9c: .word func_ov35_0217bf4c _0217eca0: .word func_ov35_0217bf68 -_0217eca4: .word gInventory +_0217eca4: .word gItemManager .global func_ov35_0217eca8 arm_func_start func_ov35_0217eca8 @@ -7755,7 +7755,7 @@ _021828f4: mov r1, #0x1f mov r2, #1 bl func_ov00_0209779c - ldr r0, _02182944 ; =gInventory + ldr r0, _02182944 ; =gItemManager mov r1, #0x1d ldr r0, [r0] blx func_ov00_020ada98 @@ -7770,7 +7770,7 @@ _021828f4: _02182938: .word data_027e0f74 _0218293c: .word 0x0000099a _02182940: .word data_027e0e58 -_02182944: .word gInventory +_02182944: .word gItemManager .global func_ov35_02182948 arm_func_start func_ov35_02182948 diff --git a/asm/ov36.s b/asm/ov36.s index debd08bc..e74fc1fa 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -6063,7 +6063,7 @@ _02181138: bl func_ov00_020c198c cmp r0, #0 beq _0218116c - ldr r0, _02181544 ; =gInventory + ldr r0, _02181544 ; =gItemManager ldr r0, [r0] ldr r0, [r0] sub r0, r0, #9 @@ -6326,7 +6326,7 @@ _021814ec: .align 2, 0 arm_func_end func_ov36_0218108c _02181540: .word data_027e0f74 -_02181544: .word gInventory +_02181544: .word gItemManager _02181548: .word data_027e0f64 _0218154c: .word 0x000004cd _02181550: .word 0x00001e84 @@ -9014,7 +9014,7 @@ _02183c28: ; jump table b _02183cbc ; case 8 b _02183cbc ; case 9 _02183c50: - ldr r0, _02184090 ; =gInventory + ldr r0, _02184090 ; =gItemManager mov r1, #0 ldr r0, [r0] bl func_ov00_020ad714 @@ -9024,7 +9024,7 @@ _02183c50: blx r2 b _02183ce8 _02183c74: - ldr r0, _02184090 ; =gInventory + ldr r0, _02184090 ; =gItemManager mov r1, #8 ldr r0, [r0] bl func_ov00_020ad714 @@ -9034,7 +9034,7 @@ _02183c74: blx r2 b _02183ce8 _02183c98: - ldr r0, _02184090 ; =gInventory + ldr r0, _02184090 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad714 @@ -9309,7 +9309,7 @@ _02184078: .align 2, 0 arm_func_end func_ov36_02183b7c _0218408c: .word 0x424d5459 -_02184090: .word gInventory +_02184090: .word gItemManager _02184094: .word data_027e0f94 _02184098: .word data_027e0fd4 _0218409c: .word data_02050f54 @@ -9471,7 +9471,7 @@ _02184160: _021842d4: cmp r1, #0 bne _02184320 - ldr r0, _02184420 ; =gInventory + ldr r0, _02184420 ; =gItemManager mov r1, r4 ldr r0, [r0] bl func_ov00_020ad714 @@ -9559,7 +9559,7 @@ _02184410: .word 0x524f5045 _02184414: .word 0x41525257 _02184418: .word data_02050f54 _0218441c: .word 0x00000ccd -_02184420: .word gInventory +_02184420: .word gItemManager _02184424: .word data_027e0f64 _02184428: .word 0x000002cb diff --git a/asm/ov37.s b/asm/ov37.s index 4175848e..166e0cf6 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -9603,7 +9603,7 @@ func_ov37_021843d4: ; 0x021843d4 mov r4, r0 bl func_ov00_020c1554 ldr r1, _02184474 ; =data_ov37_02188cd4 - ldr r0, _02184478 ; =gInventory + ldr r0, _02184478 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #4 @@ -9613,7 +9613,7 @@ func_ov37_021843d4: ; 0x021843d4 mov r3, r2 add r0, r4, #0x158 blx func_ov00_020bd618 - ldr r0, _02184478 ; =gInventory + ldr r0, _02184478 ; =gItemManager mov r1, #5 ldr r0, [r0] bl func_ov00_020ad52c @@ -9642,7 +9642,7 @@ func_ov37_021843d4: ; 0x021843d4 .align 2, 0 arm_func_end func_ov37_021843d4 _02184474: .word data_ov37_02188cd4 -_02184478: .word gInventory +_02184478: .word gItemManager _0218447c: .word 0x000004cd .global func_ov37_02184480 diff --git a/asm/ov38.s b/asm/ov38.s index 2f4934a9..684ab5a6 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -1343,7 +1343,7 @@ _0217cf8c: .word data_02050f54 func_ov38_0217cf90: ; 0x0217cf90 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x6c - ldr r1, _0217d504 ; =gInventory + ldr r1, _0217d504 ; =gItemManager mov r2, #0 ldr r3, [r1] ldr r1, _0217d508 ; =data_027e0f74 @@ -1696,7 +1696,7 @@ _0217d360: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov38_0217cf90 -_0217d504: .word gInventory +_0217d504: .word gItemManager _0217d508: .word data_027e0f74 _0217d50c: .word data_ov38_021889b8 _0217d510: .word func_ov38_0217cc2c @@ -7049,7 +7049,7 @@ func_ov38_02182040: ; 0x02182040 str r2, [r1, #0x38] mov r3, #0x400 str r3, [r1, #0x3c] - ldr r2, _0218208c ; =gInventory + ldr r2, _0218208c ; =gItemManager ldr ip, _02182090 ; =func_ov38_0217d570 ldr r2, [r2] mov r3, #0x200 @@ -7063,7 +7063,7 @@ func_ov38_02182040: ; 0x02182040 bx ip .align 2, 0 arm_func_end func_ov38_02182040 -_0218208c: .word gInventory +_0218208c: .word gItemManager _02182090: .word func_ov38_0217d570 .global func_ov38_02182094 @@ -11125,7 +11125,7 @@ _02185984: strh r1, [r0, #0x9c] ldmia sp!, {r4, pc} _021859e4: - ldr r0, _02185a6c ; =gInventory + ldr r0, _02185a6c ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xba] cmp r0, #0 @@ -11162,7 +11162,7 @@ _02185a58: arm_func_end func_ov38_02185830 _02185a64: .word data_027e0e60 _02185a68: .word data_ov29_0217a4ac -_02185a6c: .word gInventory +_02185a6c: .word gItemManager .global func_ov38_02185a70 arm_func_start func_ov38_02185a70 @@ -12355,7 +12355,7 @@ func_ov38_02186b08: ; 0x02186b08 mov r2, #0x7100 ldr ip, [ip, #0x34] blx ip - ldr r1, _02186c74 ; =gInventory + ldr r1, _02186c74 ; =gItemManager ldr r0, _02186c78 ; =data_ov38_02188ca0 ldr r2, [r1] mov r3, #0x7f @@ -12390,7 +12390,7 @@ _02186c64: .word data_ov38_021893d4 _02186c68: .word data_ov38_02189414 _02186c6c: .word data_027e071c _02186c70: .word data_027e0fc8 -_02186c74: .word gInventory +_02186c74: .word gItemManager _02186c78: .word data_ov38_02188ca0 _02186c7c: .word data_ov00_020eec68 _02186c80: .word data_027e0f74 @@ -12934,7 +12934,7 @@ _0218746c: ldr r0, _02187514 ; =data_ov38_02188ca0 ldr r1, [r0, #0x258] cmp r1, #0 - ldrne r0, _02187518 ; =gInventory + ldrne r0, _02187518 ; =gItemManager ldrne r0, [r0] strne r1, [r0, #0x10] ldr r0, _0218751c ; =data_02057200 @@ -12967,7 +12967,7 @@ _02187508: .word data_027e0fc8 _0218750c: .word data_ov00_020eec68 _02187510: .word data_027e0f74 _02187514: .word data_ov38_02188ca0 -_02187518: .word gInventory +_02187518: .word gItemManager _0218751c: .word data_02057200 .global func_ov38_02187520 diff --git a/asm/ov39.s b/asm/ov39.s index 753776bb..ad050e65 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -1557,7 +1557,7 @@ _0217d20c: .word func_ov39_0217cfe8 func_ov39_0217d210: ; 0x0217d210 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x48 - ldr r1, _0217d504 ; =gInventory + ldr r1, _0217d504 ; =gItemManager mov r4, r0 ldr r0, [r1] mov r1, #0 @@ -1747,7 +1747,7 @@ _0217d46c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov39_0217d210 -_0217d504: .word gInventory +_0217d504: .word gItemManager _0217d508: .word 0x00001333 _0217d50c: .word 0x0000199a _0217d510: .word func_ov39_0217c24c @@ -3385,7 +3385,7 @@ _0217eb48: cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} - ldr r0, _0217ec20 ; =gInventory + ldr r0, _0217ec20 ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xba] cmp r0, #0 @@ -3430,7 +3430,7 @@ _0217ebb8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov39_0217eb14 -_0217ec20: .word gInventory +_0217ec20: .word gItemManager _0217ec24: .word 0x00000548 _0217ec28: .word 0x00001548 _0217ec2c: .word 0x00003548 @@ -3743,7 +3743,7 @@ func_ov39_0217f034: ; 0x0217f034 bl func_ov29_02178060 cmp r0, #0 beq _0217f0ac - ldr r0, _0217f0b8 ; =gInventory + ldr r0, _0217f0b8 ; =gItemManager ldr r1, [r0] ldrh r0, [r1, #0xba] cmp r0, #9 @@ -3768,7 +3768,7 @@ _0217f0ac: .align 2, 0 arm_func_end func_ov39_0217f034 _0217f0b4: .word data_ov29_0217bd28 -_0217f0b8: .word gInventory +_0217f0b8: .word gItemManager _0217f0bc: .word data_ov00_020eec9c .global func_ov39_0217f0c0 @@ -4012,7 +4012,7 @@ _0217f40c: ldr r0, [r0] cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0217f484 ; =gInventory + ldr r0, _0217f484 ; =gItemManager ldr r0, [r0] ldrh r0, [r0, #0xba] cmp r0, #0 @@ -4040,7 +4040,7 @@ _0217f40c: arm_func_end func_ov39_0217f32c _0217f47c: .word data_027e0e60 _0217f480: .word data_ov29_0217bd28 -_0217f484: .word gInventory +_0217f484: .word gItemManager .global func_ov39_0217f488 arm_func_start func_ov39_0217f488 @@ -5059,7 +5059,7 @@ _02180004: ldr r4, [r4, #0x34] blx r4 ldr r1, [r5, #0x48] - ldr r0, _02180f3c ; =gInventory + ldr r0, _02180f3c ; =gItemManager str r1, [r5, #0x238] ldr r1, [r5, #0x4c] str r1, [r5, #0x23c] @@ -5796,7 +5796,7 @@ _02180d4c: ldr r1, [r5, #0x280] mov r3, #0 strb r3, [r1, #0x11a] - ldr r0, _02180f3c ; =gInventory + ldr r0, _02180f3c ; =gItemManager mov r1, #1 ldr r0, [r0] add r2, r5, #0x48 @@ -5904,7 +5904,7 @@ _02180e94: bl func_ov39_0217d5d4 ldr r1, [r5, #0x1a0] cmp r1, #0 - ldrne r0, _02180f3c ; =gInventory + ldrne r0, _02180f3c ; =gItemManager ldrne r0, [r0] strne r1, [r0, #0x10] _02180f14: @@ -5920,7 +5920,7 @@ _02180f2c: .word 0x00001b33 _02180f30: .word 0x00000b33 _02180f34: .word 0x00000666 _02180f38: .word data_027e0f90 -_02180f3c: .word gInventory +_02180f3c: .word gItemManager _02180f40: .word data_02050f54 _02180f44: .word data_027e0c68 _02180f48: .word 0x00080015 @@ -11879,7 +11879,7 @@ func_ov39_0218609c: ; 0x0218609c ldr r3, [r4, #0x280] ldr r2, [r0] ldr r1, [r0, #4] - ldr r0, _02186104 ; =gInventory + ldr r0, _02186104 ; =gItemManager str r2, [r3, #0x3b8] str r1, [r3, #0x3bc] ldr r0, [r0] @@ -11889,7 +11889,7 @@ func_ov39_0218609c: ; 0x0218609c .align 2, 0 arm_func_end func_ov39_0218609c _02186100: .word data_02057200 -_02186104: .word gInventory +_02186104: .word gItemManager .global func_ov39_02186108 arm_func_start func_ov39_02186108 diff --git a/asm/ov40.s b/asm/ov40.s index 554c3943..bb3a3826 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -385,10 +385,10 @@ func_ov40_0217c2b8: ; 0x0217c2b8 ldr r0, [r6, #0x1b8] cmp r0, #0xe4 bne _0217c2f8 - ldr r0, _0217c470 ; =gInventory + ldr r0, _0217c470 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 moveq r0, #0 streqb r0, [r6, #0x1c4] @@ -492,7 +492,7 @@ _0217c464: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov40_0217c2b8 -_0217c470: .word gInventory +_0217c470: .word gItemManager _0217c474: .word data_027e0fec _0217c478: .word data_027e0f78 _0217c47c: .word data_ov40_02187ffc @@ -4424,7 +4424,7 @@ _0217f580: ldmia sp!, {r3, pc} _0217f5a4: ldr r1, [r3] - ldr r0, _0217f858 ; =gInventory + ldr r0, _0217f858 ; =gItemManager mov r1, r1, lsl #0x8 ldr r0, [r0] mov r1, r1, lsr #0x10 @@ -4611,7 +4611,7 @@ _0217f84c: .align 2, 0 arm_func_end func_ov40_0217f534 _0217f854: .word data_027e0f74 -_0217f858: .word gInventory +_0217f858: .word gItemManager _0217f85c: .word data_027e0d38 _0217f860: .word data_027e103c @@ -8535,7 +8535,7 @@ _021827e8: ldr r0, [r4, #0x10] cmp r0, #0x10 bne _02182804 - ldr r0, _0218281c ; =gInventory + ldr r0, _0218281c ; =gItemManager mov r1, #0x25 ldr r0, [r0] blx func_ov00_020ada98 @@ -8548,7 +8548,7 @@ _02182804: arm_func_end func_ov40_021827b0 _02182814: .word 0x00000187 _02182818: .word data_027e0f74 -_0218281c: .word gInventory +_0218281c: .word gItemManager .global func_ov40_02182820 arm_func_start func_ov40_02182820 @@ -10148,15 +10148,15 @@ _02183b84: ldr r2, [r2, #0x24] blx r2 _02183ba8: - ldr r0, _02183d04 ; =gInventory + ldr r0, _02183d04 ; =gItemManager mov r1, #0x25 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj - ldr r1, _02183d04 ; =gInventory + bl _ZN11ItemManager7HasItemEj + ldr r1, _02183d04 ; =gItemManager mov r6, r0 ldr r0, [r1] mov r1, #0 - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _02183bdc cmp r6, #0 @@ -10240,7 +10240,7 @@ _02183c24: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov40_02183a6c -_02183d04: .word gInventory +_02183d04: .word gItemManager _02183d08: .word data_02050f54 .global func_ov40_02183d0c @@ -14631,7 +14631,7 @@ func_ov40_02187410: ; 0x02187410 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 bl func_ov40_0217c2b8 - ldr r2, _02187548 ; =gInventory + ldr r2, _02187548 ; =gItemManager ldr r1, _0218754c ; =0x91a2b3c5 ldr r3, [r2] str r0, [sp] @@ -14710,7 +14710,7 @@ _021874c4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov40_02187410 -_02187548: .word gInventory +_02187548: .word gItemManager _0218754c: .word 0x91a2b3c5 _02187550: .word data_027e0f74 _02187554: .word data_ov40_02188330 diff --git a/asm/ov41.s b/asm/ov41.s index 27dde080..2f3ca629 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -2885,10 +2885,10 @@ _0218b9b4: blx r1 cmp r0, #0 beq _0218bda8 - ldr r0, _0218be0c ; =gInventory + ldr r0, _0218be0c ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0218ba48 ldr r0, _0218be10 ; =data_027e0f74 @@ -3176,7 +3176,7 @@ _0218bdfc: .word data_027e0fc8 _0218be00: .word data_027e0ffc _0218be04: .word 0x00000329 _0218be08: .word data_ov00_020eec68 -_0218be0c: .word gInventory +_0218be0c: .word gItemManager _0218be10: .word data_027e0f74 _0218be14: .word data_027e0fd0 _0218be18: .word data_027e0d04 diff --git a/asm/ov42.s b/asm/ov42.s index d8754098..4a2b4af7 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -323,7 +323,7 @@ _021898e0: mov r3, r2 bl func_ov00_02087400 _02189918: - ldr r0, _02189afc ; =gInventory + ldr r0, _02189afc ; =gItemManager mov r1, #5 ldr r0, [r0] blx func_ov00_020ae3d0 @@ -449,7 +449,7 @@ _02189a74: arm_func_end func_ov42_02189834 _02189af4: .word data_027e0e60 _02189af8: .word data_027e0f64 -_02189afc: .word gInventory +_02189afc: .word gItemManager _02189b00: .word data_027e0fc8 _02189b04: .word data_ov42_0218c6f4 _02189b08: .word 0x4d544748 @@ -531,7 +531,7 @@ _02189be4: cmp r8, #3 add sb, sb, #8 blt _02189be4 - ldr r0, _02189cd0 ; =gInventory + ldr r0, _02189cd0 ; =gItemManager ldr r0, [r0] blx func_ov00_020ae400 bl func_ov42_02189ce8 @@ -581,7 +581,7 @@ _02189c88: .align 2, 0 arm_func_end func_ov42_02189b84 _02189ccc: .word data_027e0fe4 -_02189cd0: .word gInventory +_02189cd0: .word gItemManager _02189cd4: .word data_027e0fb8 _02189cd8: .word data_027e0f64 _02189cdc: .word data_ov09_0211f5b4 diff --git a/asm/ov44.s b/asm/ov44.s index d787092a..29e36189 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -4883,7 +4883,7 @@ func_ov44_0218cfc4: ; 0x0218cfc4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _0218d008: - ldr r0, _0218d078 ; =gInventory + ldr r0, _0218d078 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -4916,7 +4916,7 @@ _0218d070: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov44_0218cfc4 -_0218d078: .word gInventory +_0218d078: .word gItemManager .global func_ov44_0218d07c arm_func_start func_ov44_0218d07c diff --git a/asm/ov45.s b/asm/ov45.s index 8fbdc7da..ec602140 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -1212,7 +1212,7 @@ _0218a508: ldr r1, [r5, #0x1c] cmp r1, #0 blt _0218a5b4 - ldr r0, _0218a5c4 ; =gInventory + ldr r0, _0218a5c4 ; =gItemManager ldr r0, [r0] blx func_ov00_020ae744 cmp r0, #0 @@ -1259,7 +1259,7 @@ _0218a5b4: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov45_0218a46c -_0218a5c4: .word gInventory +_0218a5c4: .word gItemManager .global func_ov45_0218a5c8 arm_func_start func_ov45_0218a5c8 @@ -1276,7 +1276,7 @@ func_ov45_0218a5c8: ; 0x0218a5c8 arm_func_start func_ov45_0218a5e0 func_ov45_0218a5e0: ; 0x0218a5e0 stmdb sp!, {r3, lr} - ldr r1, _0218a608 ; =gInventory + ldr r1, _0218a608 ; =gItemManager mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x1c] @@ -1287,7 +1287,7 @@ func_ov45_0218a5e0: ; 0x0218a5e0 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov45_0218a5e0 -_0218a608: .word gInventory +_0218a608: .word gItemManager .global func_ov45_0218a60c arm_func_start func_ov45_0218a60c @@ -1357,7 +1357,7 @@ func_ov45_0218a6ac: ; 0x0218a6ac mov r0, #0x14 mul r3, r1, r0 ldr r2, [r5, #0x1c] - ldr r0, _0218a734 ; =gInventory + ldr r0, _0218a734 ; =gItemManager ldr r1, _0218a738 ; =0x020ec7ef add r2, r2, #0x48 ldr r4, [r0] @@ -1379,7 +1379,7 @@ func_ov45_0218a6ac: ; 0x0218a6ac arm_func_end func_ov45_0218a6ac _0218a72c: .word data_ov45_0218e5e8 _0218a730: .word data_ov45_0218e6e4 -_0218a734: .word gInventory +_0218a734: .word gItemManager _0218a738: .word 0x020ec7ef _0218a73c: .word 0x020ec7ee @@ -4806,7 +4806,7 @@ _0218d10c: blx func_ov09_02114110 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0218d200 ; =gInventory + ldr r2, _0218d200 ; =gItemManager ldr r1, [r4, #0x18] mov r0, r4 ldr r5, [r2] @@ -4868,7 +4868,7 @@ _0218d1e4: _0218d1f4: .word 0x00070032 _0218d1f8: .word data_ov45_0218ea6c _0218d1fc: .word data_ov00_020eec9c -_0218d200: .word gInventory +_0218d200: .word gItemManager _0218d204: .word 0x0007003a _0218d208: .word 0x00070039 _0218d20c: .word 0x00070037 @@ -5120,7 +5120,7 @@ func_ov45_0218d4d4: ; 0x0218d4d4 mov r3, #4 str r1, [sp] blx func_ov09_02113f40 - ldr r2, _0218d538 ; =gInventory + ldr r2, _0218d538 ; =gItemManager ldr r1, [r5, #0x18] mov r0, r5 ldr r4, [r2] @@ -5133,7 +5133,7 @@ func_ov45_0218d4d4: ; 0x0218d4d4 .align 2, 0 arm_func_end func_ov45_0218d4d4 _0218d534: .word data_ov45_0218ea6c -_0218d538: .word gInventory +_0218d538: .word gItemManager .global func_ov45_0218d53c arm_func_start func_ov45_0218d53c @@ -5369,7 +5369,7 @@ func_ov45_0218d714: ; 0x0218d714 cmp r0, #0 addgt sp, sp, #4 ldmgtia sp!, {r3, r4, pc} - ldr r0, _0218d7d0 ; =gInventory + ldr r0, _0218d7d0 ; =gItemManager ldr r1, [r4, #0x1c] ldr r0, [r0] blx func_ov00_020ad918 @@ -5413,7 +5413,7 @@ _0218d784: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov45_0218d714 -_0218d7d0: .word gInventory +_0218d7d0: .word gItemManager _0218d7d4: .word 0x0007003a _0218d7d8: .word data_ov45_0218eba0 _0218d7dc: .word 0x00070037 @@ -5422,7 +5422,7 @@ _0218d7e0: .word data_ov00_020eec9c .global func_ov45_0218d7e4 arm_func_start func_ov45_0218d7e4 func_ov45_0218d7e4: ; 0x0218d7e4 - ldr r1, _0218d7fc ; =gInventory + ldr r1, _0218d7fc ; =gItemManager mov r2, r0 ldr r0, [r1] ldr ip, _0218d800 ; =func_ov00_020ae76c @@ -5430,7 +5430,7 @@ func_ov45_0218d7e4: ; 0x0218d7e4 bx ip .align 2, 0 arm_func_end func_ov45_0218d7e4 -_0218d7fc: .word gInventory +_0218d7fc: .word gItemManager _0218d800: .word func_ov00_020ae76c .global func_ov45_0218d804 @@ -5748,7 +5748,7 @@ func_ov45_0218db40: ; 0x0218db40 mov r5, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0218db90 ; =gInventory + ldr r0, _0218db90 ; =gItemManager mov r1, r5 ldr r0, [r0] mov r2, r4 @@ -5765,7 +5765,7 @@ func_ov45_0218db40: ; 0x0218db40 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov45_0218db40 -_0218db90: .word gInventory +_0218db90: .word gItemManager .global func_ov45_0218db94 arm_func_start func_ov45_0218db94 @@ -6005,7 +6005,7 @@ _0218de84: mvn r0, #0 cmp r1, r0 beq _0218df54 - ldr r2, _0218df64 ; =gInventory + ldr r2, _0218df64 ; =gItemManager mov r0, r5 ldr r6, [r2] blx func_ov09_02118028 @@ -6060,7 +6060,7 @@ _0218df54: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov45_0218dde0 -_0218df64: .word gInventory +_0218df64: .word gItemManager .global func_ov45_0218df68 arm_func_start func_ov45_0218df68 @@ -6155,7 +6155,7 @@ func_ov45_0218e010: ; 0x0218e010 ldr ip, [r4, #0x1c] ldr r1, [r1] mov r0, #0x14 - ldr r2, _0218e0e0 ; =gInventory + ldr r2, _0218e0e0 ; =gItemManager mul r3, r1, r0 ldr r1, _0218e0e4 ; =0x020ec7ef add r5, ip, r5 @@ -6189,7 +6189,7 @@ func_ov45_0218e010: ; 0x0218e010 _0218e0d4: .word data_ov09_0211f52c _0218e0d8: .word data_ov45_0218ec9c _0218e0dc: .word data_ov45_0218e6e4 -_0218e0e0: .word gInventory +_0218e0e0: .word gItemManager _0218e0e4: .word 0x020ec7ef _0218e0e8: .word 0x020ec7ee diff --git a/asm/ov46.s b/asm/ov46.s index e846f058..0e9d0053 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -2959,7 +2959,7 @@ _0219267c: strb r0, [r6, #0x498] add r0, r6, #0x400 ldrh r1, [r0, #0x88] - ldr r0, _02192700 ; =gInventory + ldr r0, _02192700 ; =gItemManager str r1, [r6, #0x48c] ldrb r1, [r6, #0x48a] ldr r0, [r0] @@ -2990,7 +2990,7 @@ _0219267c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov46_02192638 -_02192700: .word gInventory +_02192700: .word gItemManager _02192704: .word 0x00002710 .global func_ov46_02192708 @@ -3018,7 +3018,7 @@ _02192724: b _021927c4 _02192754: ldrb r1, [r5, #0x48a] - ldr r0, _021927d0 ; =gInventory + ldr r0, _021927d0 ; =gItemManager mov r1, r1, lsl #0x1c ldr r0, [r0] mov r1, r1, lsr #0x1c @@ -3030,14 +3030,14 @@ _02192754: add r0, r5, #0x400 ldrb r2, [r5, #0x48b] ldrh r1, [r0, #0x88] - ldr r0, _021927d0 ; =gInventory + ldr r0, _021927d0 ; =gItemManager add r2, r2, #1 strb r2, [r5, #0x48b] ldr r0, [r0] mov r2, #1 bl func_ov00_020ae2e0 ldrb r2, [r5, #0x48a] - ldr r0, _021927d0 ; =gInventory + ldr r0, _021927d0 ; =gItemManager sub r1, r4, #1 mov r3, r2, lsl #0x1c mov r2, r1, lsl #0x18 @@ -3051,7 +3051,7 @@ _021927c4: .align 2, 0 arm_func_end func_ov46_02192708 _021927cc: .word 0x00001555 -_021927d0: .word gInventory +_021927d0: .word gItemManager _021927d4: .word data_027e0dbc .global func_ov46_021927d8 @@ -3070,7 +3070,7 @@ _021927f8: cmp r0, #0 bne _02192834 ldrb r1, [r4, #0x48a] - ldr r0, _021928b8 ; =gInventory + ldr r0, _021928b8 ; =gItemManager mov r1, r1, lsl #0x1c ldr r0, [r0] mov r1, r1, lsr #0x1c @@ -3085,7 +3085,7 @@ _02192834: cmp r0, #1 bne _021928b0 ldrb r1, [r4, #0x48a] - ldr r0, _021928b8 ; =gInventory + ldr r0, _021928b8 ; =gItemManager mov r1, r1, lsl #0x1c ldr r0, [r0] mov r1, r1, lsr #0x1c @@ -3119,7 +3119,7 @@ _021928b0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov46_021927d8 -_021928b8: .word gInventory +_021928b8: .word gItemManager .global func_ov46_021928bc arm_func_start func_ov46_021928bc diff --git a/asm/ov47.s b/asm/ov47.s index 52b8bf8c..26b7c822 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -4789,7 +4789,7 @@ func_ov47_02193f78: ; 0x02193f78 mov r0, r5 bl func_ov00_020c2a0c ldr r1, _02194104 ; =data_027e0f94 - ldr r0, _02194108 ; =gInventory + ldr r0, _02194108 ; =gItemManager ldr r2, [r1, #4] ldr r0, [r0] mov r1, #2 @@ -4874,7 +4874,7 @@ _021940ec: .align 2, 0 arm_func_end func_ov47_02193f78 _02194104: .word data_027e0f94 -_02194108: .word gInventory +_02194108: .word gItemManager _0219410c: .word data_027e0f90 .global func_ov47_02194110 diff --git a/asm/ov48.s b/asm/ov48.s index 994c1866..8faca418 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -723,7 +723,7 @@ func_ov48_021907f4: ; 0x021907f4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _02190838: - ldr r0, _021908a8 ; =gInventory + ldr r0, _021908a8 ; =gItemManager mov r1, #1 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -756,7 +756,7 @@ _021908a0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov48_021907f4 -_021908a8: .word gInventory +_021908a8: .word gItemManager .global func_ov48_021908ac arm_func_start func_ov48_021908ac @@ -2054,7 +2054,7 @@ _021917c4: cmp r1, r0 strgt r0, [r4, #0x518] _021918a4: - ldr r0, _02191c34 ; =gInventory + ldr r0, _02191c34 ; =gItemManager mov r1, #2 ldr r0, [r0] mov r5, #0 @@ -2297,7 +2297,7 @@ _02191c24: .word data_ov48_0219545c _02191c28: .word 0x0000ffff _02191c2c: .word 0x00000333 _02191c30: .word data_027e0e60 -_02191c34: .word gInventory +_02191c34: .word gItemManager _02191c38: .word data_027e0f90 _02191c3c: .word data_027e0fac _02191c40: .word 0x00000b33 @@ -3224,7 +3224,7 @@ _0219266c: cmpne r0, #4 cmpne r0, #5 beq _02192714 - ldr r0, _02193160 ; =gInventory + ldr r0, _02193160 ; =gItemManager mov r1, #2 ldr r0, [r0] bl func_ov00_020ad9e8 @@ -3982,7 +3982,7 @@ _02193154: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov48_02192604 -_02193160: .word gInventory +_02193160: .word gItemManager _02193164: .word data_027e0ffc _02193168: .word 0x00000247 _0219316c: .word data_027e0f94 diff --git a/asm/ov49.s b/asm/ov49.s index 8100cb8b..9a3f0bfd 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -853,13 +853,13 @@ func_ov49_02196008: ; 0x02196008 ldr r0, [r4, #0x138] cmp r0, #0x3c ldmleia sp!, {r3, r4, r5, pc} - ldr r0, _021960f0 ; =gInventory + ldr r0, _021960f0 ; =gItemManager mov r1, #1 ldr r0, [r0] - bl _ZN9Inventory7HasItemEj + bl _ZN11ItemManager7HasItemEj cmp r0, #0 beq _0219605c - ldr r0, _021960f0 ; =gInventory + ldr r0, _021960f0 ; =gItemManager mov r1, #1 ldr r0, [r0] blx func_ov00_020adb00 @@ -886,7 +886,7 @@ _02196068: add r1, r1, #0xf9 bl func_ov00_020d7ad4 ldrb r0, [r4, #0x5c8] - ldr r1, _021960f0 ; =gInventory + ldr r1, _021960f0 ; =gItemManager sub r0, r0, #1 ldr r5, [r1] bl func_ov00_020c5a24 @@ -896,7 +896,7 @@ _02196068: mov r2, #0 bl func_ov00_020ae2e0 ldrb r1, [r4, #0x5c9] - ldr r0, _021960f0 ; =gInventory + ldr r0, _021960f0 ; =gItemManager add r1, r1, #1 strb r1, [r4, #0x5c9] ldr r0, [r0] @@ -907,7 +907,7 @@ _02196068: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov49_02196008 -_021960f0: .word gInventory +_021960f0: .word gItemManager _021960f4: .word 0x66666667 _021960f8: .word data_ov00_020eec9c @@ -2462,7 +2462,7 @@ func_ov49_0219766c: ; 0x0219766c mov r4, r0 bl func_ov00_020c1554 ldr r1, _021976b4 ; =data_ov49_0219879c - ldr r0, _021976b8 ; =gInventory + ldr r0, _021976b8 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #2 @@ -2479,7 +2479,7 @@ func_ov49_0219766c: ; 0x0219766c .align 2, 0 arm_func_end func_ov49_0219766c _021976b4: .word data_ov49_0219879c -_021976b8: .word gInventory +_021976b8: .word gItemManager .global func_ov49_021976bc arm_func_start func_ov49_021976bc diff --git a/asm/ov53.s b/asm/ov53.s index 909674b3..efb6b000 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -1084,7 +1084,7 @@ func_ov53_02199ac8: ; 0x02199ac8 mov r4, r0 bl func_ov00_020c1554 ldr r1, _02199b64 ; =data_ov14_02155cfc - ldr r0, _02199b68 ; =gInventory + ldr r0, _02199b68 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #6 @@ -1121,7 +1121,7 @@ func_ov53_02199ac8: ; 0x02199ac8 .align 2, 0 arm_func_end func_ov53_02199ac8 _02199b64: .word data_ov14_02155cfc -_02199b68: .word gInventory +_02199b68: .word gItemManager _02199b6c: .word func_ov53_02199b78 _02199b70: .word func_ov53_02199c34 _02199b74: .word 0xfffffe66 diff --git a/asm/ov54.s b/asm/ov54.s index 83505d1e..0c90d377 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -7,7 +7,7 @@ arm_func_start func_ov54_02198d00 func_ov54_02198d00: ; 0x02198d00 stmdb sp!, {r3, lr} - ldr r0, _02198d24 ; =gInventory + ldr r0, _02198d24 ; =gItemManager mov r1, #7 ldr r0, [r0] bl func_ov00_020ad52c @@ -17,7 +17,7 @@ func_ov54_02198d00: ; 0x02198d00 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov54_02198d00 -_02198d24: .word gInventory +_02198d24: .word gItemManager _02198d28: .word data_ov54_02199a2c .global func_ov54_02198d2c @@ -390,13 +390,13 @@ _021991a8: strb r1, [r2, #0x7b] ldr r0, [r0] bl func_ov00_020af050 - ldr r0, _021992c4 ; =gInventory + ldr r0, _021992c4 ; =gItemManager ldr r4, [r0] mov r0, r4 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r4 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, #0 beq _0219920c bl func_ov00_020ba3b4 @@ -459,7 +459,7 @@ _021992b4: .word 0x00000216 _021992b8: .word data_ov00_020eec9c _021992bc: .word data_ov54_021999d8 _021992c0: .word data_027e0fb8 -_021992c4: .word gInventory +_021992c4: .word gItemManager .global func_ov54_021992c8 arm_func_start func_ov54_021992c8 diff --git a/asm/ov55.s b/asm/ov55.s index 9650215c..2b7ddfe3 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -7,7 +7,7 @@ arm_func_start func_ov55_02198d00 func_ov55_02198d00: ; 0x02198d00 stmdb sp!, {r3, lr} - ldr r0, _02198d24 ; =gInventory + ldr r0, _02198d24 ; =gItemManager mov r1, #8 ldr r0, [r0] bl func_ov00_020ad52c @@ -17,7 +17,7 @@ func_ov55_02198d00: ; 0x02198d00 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov55_02198d00 -_02198d24: .word gInventory +_02198d24: .word gItemManager _02198d28: .word data_ov55_021998ac .global func_ov55_02198d2c @@ -392,7 +392,7 @@ func_ov55_021991b0: ; 0x021991b0 mov r4, r0 ldr r0, [r1] bl func_ov05_02103ff0 - ldr r0, _0219926c ; =gInventory + ldr r0, _0219926c ; =gItemManager ldr r1, [r4, #0xc] ldr r0, [r0] add r0, r0, r1 @@ -428,19 +428,19 @@ _0219922c: ldr r2, [r2, #0x40] blx r2 _02199244: - ldr r0, _0219926c ; =gInventory + ldr r0, _0219926c ; =gItemManager ldr r1, [r4, #0xc] ldr r0, [r0] mov r2, #0 bl func_ov00_020ae50c - ldr r0, _0219926c ; =gInventory + ldr r0, _0219926c ; =gItemManager ldr r0, [r0] bl func_ov00_020ae3c0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov55_021991b0 _02199268: .word data_027e103c -_0219926c: .word gInventory +_0219926c: .word gItemManager _02199270: .word data_027e0f90 .global func_ov55_02199274 @@ -458,7 +458,7 @@ func_ov55_02199278: ; 0x02199278 add r0, sp, #4 mov r1, #0 blx func_ov00_020a9588 - ldr r0, _021993a4 ; =gInventory + ldr r0, _021993a4 ; =gItemManager ldr r1, [r5, #0xc] ldr r0, [r0] add r1, r0, r1 @@ -535,7 +535,7 @@ _02199374: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov55_02199278 -_021993a4: .word gInventory +_021993a4: .word gItemManager _021993a8: .word data_ov55_021997b0 _021993ac: .word data_ov55_021997c4 _021993b0: .word data_ov55_021997d8 diff --git a/asm/ov56.s b/asm/ov56.s index beb94f12..4f50a8ab 100644 --- a/asm/ov56.s +++ b/asm/ov56.s @@ -7,14 +7,14 @@ arm_func_start func_ov56_02198d00 func_ov56_02198d00: ; 0x02198d00 stmdb sp!, {r3, lr} - ldr r0, _02198d40 ; =gInventory + ldr r0, _02198d40 ; =gItemManager mov r1, #3 ldr r0, [r0] bl func_ov00_020ad52c mov r1, r0 ldr r0, _02198d44 ; =data_ov56_0219940c bl func_ov00_020a9614 - ldr r0, _02198d40 ; =gInventory + ldr r0, _02198d40 ; =gItemManager mov r1, #4 ldr r0, [r0] bl func_ov00_020ad52c @@ -24,7 +24,7 @@ func_ov56_02198d00: ; 0x02198d00 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov56_02198d00 -_02198d40: .word gInventory +_02198d40: .word gItemManager _02198d44: .word data_ov56_0219940c _02198d48: .word data_ov56_02199474 @@ -35,7 +35,7 @@ func_ov56_02198d4c: ; 0x02198d4c bl func_ov00_020beb30 cmp r0, #0 bgt _02198d70 - ldr r0, _02198d80 ; =gInventory + ldr r0, _02198d80 ; =gItemManager ldr r0, [r0] ldr r0, [r0, #8] cmp r0, #5 @@ -48,7 +48,7 @@ _02198d78: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov56_02198d4c -_02198d80: .word gInventory +_02198d80: .word gItemManager .global func_ov56_02198d84 arm_func_start func_ov56_02198d84 @@ -125,7 +125,7 @@ func_ov56_02198df8: ; 0x02198df8 bl func_ov00_020beb30 cmp r0, #0 bgt _02198e90 - ldr r0, _02198ecc ; =gInventory + ldr r0, _02198ecc ; =gItemManager ldr r0, [r0] ldr r0, [r0, #8] cmp r0, #5 @@ -149,7 +149,7 @@ _02198e90: .align 2, 0 arm_func_end func_ov56_02198df8 _02198ec8: .word data_ov56_0219940c -_02198ecc: .word gInventory +_02198ecc: .word gItemManager _02198ed0: .word data_ov56_021994d0 _02198ed4: .word data_ov56_02199474 @@ -176,7 +176,7 @@ func_ov56_02198ee8: ; 0x02198ee8 bl func_ov00_020beb30 cmp r0, #0 bgt _02198f24 - ldr r0, _02198f40 ; =gInventory + ldr r0, _02198f40 ; =gItemManager ldr r0, [r0] ldr r0, [r0, #8] cmp r0, #5 @@ -192,7 +192,7 @@ _02198f38: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov56_02198ee8 -_02198f40: .word gInventory +_02198f40: .word gItemManager _02198f44: .word data_027e0ffc .global func_ov56_02198f48 @@ -207,7 +207,7 @@ func_ov56_02198f48: ; 0x02198f48 bl func_ov00_020beb30 cmp r0, #0 bgt _02198f84 - ldr r0, _021990ac ; =gInventory + ldr r0, _021990ac ; =gItemManager ldr r0, [r0] ldr r0, [r0, #8] cmp r0, #5 @@ -271,7 +271,7 @@ _02198f84: bl func_ov00_020c4048 cmp r0, #0 blt _02199090 - ldr r0, _021990ac ; =gInventory + ldr r0, _021990ac ; =gItemManager ldr r0, [r0] ldr r0, [r0, #8] cmp r0, #5 @@ -291,7 +291,7 @@ _02199090: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov56_02198f48 -_021990ac: .word gInventory +_021990ac: .word gItemManager _021990b0: .word data_027e0764 _021990b4: .word data_027e0fe8 _021990b8: .word 0x41525257 diff --git a/asm/ov57.s b/asm/ov57.s index db57b9fc..b18cb9d3 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -1792,7 +1792,7 @@ func_ov57_0219a460: ; 0x0219a460 mov r4, r0 bl func_ov00_020c1554 ldr r1, _0219a55c ; =data_ov14_02155df8 - ldr r0, _0219a560 ; =gInventory + ldr r0, _0219a560 ; =gItemManager str r1, [r4] ldr r0, [r0] mov r1, #0xe @@ -1853,7 +1853,7 @@ func_ov57_0219a460: ; 0x0219a460 .align 2, 0 arm_func_end func_ov57_0219a460 _0219a55c: .word data_ov14_02155df8 -_0219a560: .word gInventory +_0219a560: .word gItemManager _0219a564: .word data_027e0d0c .global func_ov57_0219a568 diff --git a/asm/ov58.s b/asm/ov58.s index 86d6534d..00375a05 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -213,27 +213,27 @@ _02198fbc: .word data_ov58_0219afc0 thumb_func_start func_ov58_02198fc0 func_ov58_02198fc0: ; 0x02198fc0 push {r3, lr} - ldr r0, _02199020 ; =gInventory + ldr r0, _02199020 ; =gItemManager mov r1, #9 ldr r0, [r0] blx func_ov00_020ad52c add r1, r0, #0 ldr r0, _02199024 ; =data_ov58_0219afcc blx func_ov00_020a9614 - ldr r0, _02199020 ; =gInventory + ldr r0, _02199020 ; =gItemManager mov r1, #0xf ldr r0, [r0] blx func_ov00_020ad52c add r1, r0, #0 ldr r0, _02199028 ; =data_ov58_0219b034 blx func_ov00_020a9614 - ldr r0, _02199020 ; =gInventory + ldr r0, _02199020 ; =gItemManager mov r1, #0xf ldr r0, [r0] blx func_ov00_020ad52c ldr r1, _0219902c ; =data_ov58_0219b040 str r0, [r1, #0x68] - ldr r0, _02199020 ; =gInventory + ldr r0, _02199020 ; =gItemManager ldr r1, _02199030 ; =data_ov58_0219ad68 ldr r0, [r0] blx func_ov00_020ad538 @@ -252,7 +252,7 @@ func_ov58_02198fc0: ; 0x02198fc0 pop {r3, pc} nop thumb_func_end func_ov58_02198fc0 -_02199020: .word gInventory +_02199020: .word gItemManager _02199024: .word data_ov58_0219afcc _02199028: .word data_ov58_0219b034 _0219902c: .word data_ov58_0219b040 @@ -2844,7 +2844,7 @@ _0219a91c: strh r0, [r4, #0xd8] ldmia sp!, {r3, r4, pc} _0219a92c: - ldr r0, _0219a994 ; =gInventory + ldr r0, _0219a994 ; =gItemManager mov r1, #7 ldr r0, [r0] bl func_ov00_020ad714 @@ -2876,7 +2876,7 @@ _0219a984: .word data_027e077c _0219a988: .word data_027e0d78 _0219a98c: .word data_027e0d3c _0219a990: .word data_027e0f94 -_0219a994: .word gInventory +_0219a994: .word gItemManager .global func_ov58_0219a998 arm_func_start func_ov58_0219a998 @@ -3075,7 +3075,7 @@ _0219abb0: ldrb r0, [r0] cmp r0, #0 beq _0219ac8e - ldr r0, _0219aca0 ; =gInventory + ldr r0, _0219aca0 ; =gItemManager ldr r0, [r0] ldr r1, [r0] cmp r1, #7 @@ -3179,7 +3179,7 @@ _0219ac8e: _0219ac94: .word data_027e077c _0219ac98: .word data_027e0d3c _0219ac9c: .word data_027e0d78 -_0219aca0: .word gInventory +_0219aca0: .word gItemManager _0219aca4: .word data_027e103c _0219aca8: .word data_ov00_020ee6f8 diff --git a/asm/ov59.s b/asm/ov59.s index e13de883..358ee5fc 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -20,10 +20,10 @@ func_ov59_02198d00: ; 0x02198d00 cmpeq r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _02198e1c ; =gInventory + ldr r0, _02198e1c ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj cmp r0, #0 beq _02198d5c ldr r0, [r0, #0x3b8] @@ -33,7 +33,7 @@ _02198d5c: mov r0, #0 ldmia sp!, {r4, pc} _02198d64: - ldr r0, _02198e1c ; =gInventory + ldr r0, _02198e1c ; =gItemManager ldr r0, [r0] ldrb r0, [r0, #0x14d] cmp r0, #0 @@ -84,7 +84,7 @@ _02198e10: .align 2, 0 arm_func_end func_ov59_02198d00 _02198e18: .word data_027e0fd4 -_02198e1c: .word gInventory +_02198e1c: .word gItemManager _02198e20: .word data_027e0d38 _02198e24: .word data_027e0fc8 _02198e28: .word data_027e0fd0 @@ -335,11 +335,11 @@ func_ov59_021990a4: ; 0x021990a4 ldmeqia sp!, {r4, r5, r6, pc} _021990c4: bl func_ov59_0219930c - ldr r1, _021992f0 ; =gInventory + ldr r1, _021992f0 ; =gItemManager mov r5, r0 ldr r0, [r1] mov r1, #0 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj mov r4, r0 mov r0, r6 bl func_ov00_020a8db8 @@ -484,7 +484,7 @@ _021992d0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov59_021990a4 -_021992f0: .word gInventory +_021992f0: .word gItemManager _021992f4: .word data_ov59_0219b160 _021992f8: .word data_027e0fb8 _021992fc: .word data_ov59_0219b190 @@ -506,15 +506,15 @@ _02199318: .word func_01fffcec arm_func_start func_ov59_0219931c func_ov59_0219931c: ; 0x0219931c stmdb sp!, {r3, lr} - ldr r0, _02199338 ; =gInventory + ldr r0, _02199338 ; =gItemManager mov r1, #0 ldr r0, [r0] - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj bl func_ov00_020b853c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov59_0219931c -_02199338: .word gInventory +_02199338: .word gItemManager .global func_ov59_0219933c arm_func_start func_ov59_0219933c @@ -573,7 +573,7 @@ _021993b4: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} _02199408: - ldr r0, _0219a068 ; =gInventory + ldr r0, _0219a068 ; =gItemManager ldr r1, _0219a06c ; =data_ov59_0219b110 ldr r0, [r0] bl func_ov00_020ad538 @@ -1400,7 +1400,7 @@ _0219a058: .align 2, 0 arm_func_end func_ov59_0219933c _0219a064: .word data_027e0fb8 -_0219a068: .word gInventory +_0219a068: .word gItemManager _0219a06c: .word data_ov59_0219b110 _0219a070: .word data_027e0f94 _0219a074: .word 0xfffff99a @@ -1435,7 +1435,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac addne sp, sp, #0x220 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, [sl, #0x2f4] - ldr r0, _0219a9e8 ; =gInventory + ldr r0, _0219a9e8 ; =gItemManager ldr r4, [r1, #8] ldr r0, [r0] ldr r1, _0219a9ec ; =data_ov59_0219b110 @@ -2029,7 +2029,7 @@ _0219a998: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov59_0219a0ac -_0219a9e8: .word gInventory +_0219a9e8: .word gItemManager _0219a9ec: .word data_ov59_0219b110 _0219a9f0: .word data_027e0f94 _0219a9f4: .word 0x00000666 @@ -2343,7 +2343,7 @@ _0219ae74: add sp, sp, #0x128 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0219ae8c: - ldr r0, _0219af08 ; =gInventory + ldr r0, _0219af08 ; =gItemManager ldr r1, _0219af0c ; =data_ov00_020dc7d0 ldr r0, [r0] bl func_ov00_020ad538 @@ -2357,7 +2357,7 @@ _0219ae8c: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0219aebc: mov r1, #0 - ldr r0, _0219af08 ; =gInventory + ldr r0, _0219af08 ; =gItemManager str r1, [r5, #0x348] ldr r0, [r0] ldr r1, _0219af10 ; =data_ov00_020dc7e4 @@ -2377,7 +2377,7 @@ _0219aef8: .word data_027e0f94 _0219aefc: .word 0x0000ffff _0219af00: .word data_027e0e60 _0219af04: .word data_027e0fb8 -_0219af08: .word gInventory +_0219af08: .word gItemManager _0219af0c: .word data_ov00_020dc7d0 _0219af10: .word data_ov00_020dc7e4 @@ -2470,19 +2470,19 @@ _0219b01c: .word data_027e0f94 arm_func_start func_ov59_0219b020 func_ov59_0219b020: ; 0x0219b020 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0219b108 ; =gInventory + ldr r1, _0219b108 ; =gItemManager mov r4, r0 ldr r0, [r1] - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv cmp r0, #0 beq _0219b0a4 - ldr r0, _0219b108 ; =gInventory + ldr r0, _0219b108 ; =gItemManager ldr r5, [r0] mov r0, r5 - bl _ZNK9Inventory16GetEquippedFairyEv + bl _ZNK11ItemManager16GetEquippedFairyEv mov r1, r0 mov r0, r5 - bl _ZNK9Inventory8GetFairyEj + bl _ZNK11ItemManager8GetFairyEj ldr r1, [r0, #0x48] str r1, [r4, #0x48] ldr r1, [r0, #0x4c] @@ -2531,7 +2531,7 @@ _0219b0bc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov59_0219b020 -_0219b108: .word gInventory +_0219b108: .word gItemManager _0219b10c: .word data_027e0fb8 .rodata diff --git a/include/Inventory.hpp b/include/ItemManager.hpp similarity index 92% rename from include/Inventory.hpp rename to include/ItemManager.hpp index 05f9217f..81281f18 100644 --- a/include/Inventory.hpp +++ b/include/ItemManager.hpp @@ -129,7 +129,7 @@ struct UnkStruct_027e0d38 { /* 2c */ }; -struct SaveInventory { +struct SaveItemManager { /* 00 */ ItemFlags itemFlags; /* 10 */ u32 salvagedTreasureFlags; /* 14 */ ShipPartPricesShown shipPartPricesShown; @@ -158,7 +158,7 @@ struct SaveInventory { /* a6 */ }; -class Inventory : public SysObject { +class ItemManager : public SysObject { private: /* 000 */ ItemFlag mEquippedItem; /* 004 */ ItemFlag mPrevEquippedItem; @@ -199,14 +199,14 @@ private: /* 150 */ public: - static Inventory* Create(); + static ItemManager* Create(); static void Destroy(); - Inventory(); - ~Inventory(); + ItemManager(); + ~ItemManager(); void ClearPrevEquippedItem(); - void Save(SaveInventory *save); - void Load(const SaveInventory *save); + void Save(SaveItemManager *save); + void Load(const SaveItemManager *save); FairyId GetEquippedFairy() const; Navi* GetFairy(FairyId id) const; @@ -227,4 +227,4 @@ public: bool HasItem(ItemFlag item); }; -extern Inventory *gInventory; +extern ItemManager *gItemManager; diff --git a/src/Inventory.cpp b/src/ItemManager.cpp similarity index 70% rename from src/Inventory.cpp rename to src/ItemManager.cpp index 969eb26d..4b53fa8a 100644 --- a/src/Inventory.cpp +++ b/src/ItemManager.cpp @@ -1,27 +1,27 @@ -#include "Inventory.hpp" +#include "ItemManager.hpp" extern u32 *data_027e0ce0[]; #pragma thumb on -Inventory* Inventory::Create() { - gInventory = new(data_027e0ce0[1], 4) Inventory(); - return gInventory; +ItemManager* ItemManager::Create() { + gItemManager = new(data_027e0ce0[1], 4) ItemManager(); + return gItemManager; } -void Inventory::Destroy() { - delete gInventory; - gInventory = 0; +void ItemManager::Destroy() { + delete gItemManager; + gItemManager = 0; } #pragma interworking on -void Inventory::ClearPrevEquippedItem() { +void ItemManager::ClearPrevEquippedItem() { this->mPrevEquippedItem = ItemFlag_None; } #pragma interworking off -NONMATCH void Inventory::Save(SaveInventory *save) { +NONMATCH void ItemManager::Save(SaveItemManager *save) { #ifndef NONMATCHING - #include "../asm/ov00/inventory/Inventory_Save.inc" + #include "../asm/ov00/ItemManager/ItemManager_Save.inc" #else save->itemFlags = this->mItemFlags; save->numRupees = this->mNumRupees; @@ -41,17 +41,17 @@ NONMATCH void Inventory::Save(SaveInventory *save) { const u32 *equippedParts = this->mEquippedShipParts; s32 i = 0; - SaveInventory *save2 = save; - Inventory *this2 = this; - ShipParts (Inventory::*shipParts)[ShipPart_COUNT] = &Inventory::mShipParts; + SaveItemManager *save2 = save; + ItemManager *this2 = this; + ShipParts (ItemManager::*shipParts)[ShipPart_COUNT] = &ItemManager::mShipParts; for (; i < ShipPart_COUNT; ++i) { save->equippedShipParts[i] = this->mEquippedShipParts[i]; for (s32 j = 0; j < ShipType_COUNT; ++j) { - u8 shipPartCount = ((Inventory*) ((u32)this2 + j)->*shipParts)[0].parts[0]; - ((SaveInventory*) ((u32)save2 + j))->shipParts[0].parts[0] = shipPartCount; + u8 shipPartCount = ((ItemManager*) ((u32)this2 + j)->*shipParts)[0].parts[0]; + ((SaveItemManager*) ((u32)save2 + j))->shipParts[0].parts[0] = shipPartCount; } - this2 = (Inventory*) ((u32)this2 + sizeof(this2->mShipParts[0])); - save2 = (SaveInventory*) ((u32)save2 + sizeof(save2->shipParts[0])); + this2 = (ItemManager*) ((u32)this2 + sizeof(this2->mShipParts[0])); + save2 = (SaveItemManager*) ((u32)save2 + sizeof(save2->shipParts[0])); } save->shipPartPricesShown = this->mShipPartPricesShown; @@ -74,10 +74,10 @@ NONMATCH void Inventory::Save(SaveInventory *save) { #endif } -extern "C" bool _ZN9Inventory7HasItemEj(); -NONMATCH void Inventory::Load(const SaveInventory *save) { +extern "C" bool _ZN11ItemManager7HasItemEj(); +NONMATCH void ItemManager::Load(const SaveItemManager *save) { #ifndef NONMATCHING - #include "../asm/ov00/inventory/Inventory_Load.inc" + #include "../asm/ov00/ItemManager/ItemManager_Load.inc" #else this->mItemFlags = save->itemFlags; this->mNumRupees = save->numRupees; @@ -102,20 +102,20 @@ NONMATCH void Inventory::Load(const SaveInventory *save) { } s32 i = 0; // ip (r0) - Inventory *this2 = this; // sp+0 - const SaveInventory *save2 = save; // r3 - Inventory *this3 = this; // r5 - ShipParts (SaveInventory::*shipParts)[ShipPart_COUNT] = &SaveInventory::shipParts; // r7 + 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 j = 0; j < ShipType_COUNT; ++j) { - u8 partCount = (((const SaveInventory*) ((u32)save2 + j))->*shipParts)[0].parts[0]; - ((Inventory*) ((u32)this3 + j))->mShipParts[0].parts[0] = partCount; + u8 partCount = (((const SaveItemManager*) ((u32)save2 + j))->*shipParts)[0].parts[0]; + ((ItemManager*) ((u32)this3 + j))->mShipParts[0].parts[0] = partCount; } - save2 = (const SaveInventory*) ((u32)save2 + sizeof(save->shipParts[0])); - this2 = (Inventory*) ((u32)this2 + sizeof(this->mEquippedShipParts[0])); + save2 = (const SaveItemManager*) ((u32)save2 + sizeof(save->shipParts[0])); + this2 = (ItemManager*) ((u32)this2 + sizeof(this->mEquippedShipParts[0])); ++i; - this3 = (Inventory*) ((u32)this3 + sizeof(this->mShipParts[0])); + this3 = (ItemManager*) ((u32)this3 + sizeof(this->mShipParts[0])); } while(i < ShipPart_COUNT); @@ -151,13 +151,13 @@ NONMATCH void Inventory::Load(const SaveInventory *save) { #pragma thumb off #pragma interworking on -FairyId Inventory::GetEquippedFairy() const { +FairyId ItemManager::GetEquippedFairy() const { FairyId fairy = this->mEquippedFairy; if (fairy == FairyId_None) return FairyId_Courage; return fairy; } -Navi* Inventory::GetFairy(FairyId id) const { +Navi* ItemManager::GetFairy(FairyId id) const { return this->mFairies[id]; } #pragma interworking off @@ -165,11 +165,11 @@ Navi* Inventory::GetFairy(FairyId id) const { extern UnkStruct_027e0d38 *data_027e0d38; extern unk32 gPlayerAnimHandler; extern "C" void LoadEquipItemModel(unk32 param1, ItemFlag param2); -extern "C" void _ZNK9Inventory15GetEquippedItemEv(); +extern "C" void _ZNK11ItemManager15GetEquippedItemEv(); extern "C" void _ZN14OverlayManager13LoadEquipItemEj(); -NONMATCH void Inventory::TickEquipItem(void) { +NONMATCH void ItemManager::TickEquipItem(void) { #ifndef NONMATCHING - #include "../asm/ov00/inventory/Inventory_TickEquipItem.inc" + #include "../asm/ov00/ItemManager/ItemManager_TickEquipItem.inc" #else ItemFlag equip = this->GetEquippedItem(); if (this->mEquipLoadTimer != 0) { diff --git a/tools/lcf.py b/tools/lcf.py index d7972a6a..9f75552a 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -30,8 +30,8 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[ 'asm/ov00/ov00_0209afc4.s', 'asm/ov00/ov00_0209bea0.s', 'asm/ov00/ov00_020a03e4.s', - 'src/Inventory.cpp', - 'asm/ov00/inventory/inventory.s', + 'src/ItemManager.cpp', + 'asm/ov00/ItemManager/ItemManager.s', 'asm/ov00/ov00_020ae7a4.s', 'asm/ov00/ov00_020b4940.s', 'asm/ov00/ov00_020c36b4.s',