diff --git a/asm/itcm.s b/asm/itcm.s index 5405e3d9..ed956e51 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -9129,9 +9129,9 @@ func_01fffcd8: ; 0x01fffcd8 _01fffce8: .word data_027e0fdc arm_func_end func_01fffcd8 - .global func_01fffcec - arm_func_start func_01fffcec -func_01fffcec: ; 0x01fffcec + .global _ZN11ItemManager21GetEquipItemUncheckedEi + arm_func_start _ZN11ItemManager21GetEquipItemUncheckedEi +_ZN11ItemManager21GetEquipItemUncheckedEi: ; 0x01fffcec ldr r1, _01fffd00 ; =gItemManager ldr r1, [r1] ldr r1, [r1, #0xac] @@ -9139,7 +9139,7 @@ func_01fffcec: ; 0x01fffcec bx lr .align 2, 0 _01fffd00: .word gItemManager - arm_func_end func_01fffcec + arm_func_end _ZN11ItemManager21GetEquipItemUncheckedEi .global func_01fffd04 arm_func_start func_01fffd04 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 2224bda1..f6793343 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -41,7 +41,7 @@ .extern Atan2 .extern func_01ffbe34 .extern _ZN8Cylinder8OverlapsEPS_ -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_0202b864 .extern func_0202b894 diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 9d111394..69d0a48a 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -2035,11 +2035,11 @@ _020c2d40: .word gPlayerPos .global _ZN5Actor17GetEquipBoomerangEv arm_func_start _ZN5Actor17GetEquipBoomerangEv _ZN5Actor17GetEquipBoomerangEv: ; 0x020c2d44 - ldr ip, _020c2d50 ; =func_01fffcec + ldr ip, _020c2d50 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #2 bx ip .align 2, 0 -_020c2d50: .word func_01fffcec +_020c2d50: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end _ZN5Actor17GetEquipBoomerangEv .global _ZN5Actor18func_ov00_020c2d54Ev diff --git a/asm/ov00/Player/LinkStateItem.inc b/asm/ov00/Player/LinkStateItem.inc index 12f9bd1d..a60d73a5 100644 --- a/asm/ov00/Player/LinkStateItem.inc +++ b/asm/ov00/Player/LinkStateItem.inc @@ -9,7 +9,7 @@ .extern data_027e103c .extern data_027e1098 .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern _ZN14AdventureFlags18func_ov00_02097b9cEv .extern func_ov00_020b7e6c .extern func_ov00_020cf01c diff --git a/asm/ov00/Player/LinkStateItem.s b/asm/ov00/Player/LinkStateItem.s index ef9f3174..fa39c3a9 100644 --- a/asm/ov00/Player/LinkStateItem.s +++ b/asm/ov00/Player/LinkStateItem.s @@ -164,11 +164,11 @@ _020abf4c: .word gPlayerControl .global _ZN13LinkStateItem15GetEquipBombchuEv arm_func_start _ZN13LinkStateItem15GetEquipBombchuEv _ZN13LinkStateItem15GetEquipBombchuEv: ; 0x020abf50 - ldr ip, _020abf5c ; =func_01fffcec + ldr ip, _020abf5c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #7 bx ip .align 2, 0 -_020abf5c: .word func_01fffcec +_020abf5c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end _ZN13LinkStateItem15GetEquipBombchuEv .global _ZN13LinkStateItem16GetLinkStateMoveEv diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index 6a24e67c..7d72dd6b 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -18,7 +18,7 @@ .extern Vec3p_Sub .extern Atan2 .extern _ZN8Cylinder8OverlapsEPS_ -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_ov00_0207c5d4 .extern _ZN10MapManager18func_ov00_02082af4Ev .extern _ZN10MapManager14GetEntrancePosEP5Vec3pi diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 83c69492..8b2bd72f 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -71,21 +71,21 @@ _020a7b88: .word data_027e0e58 .global _ZN10PlayerBase13GetEquipSwordEv arm_func_start _ZN10PlayerBase13GetEquipSwordEv _ZN10PlayerBase13GetEquipSwordEv: ; 0x020a7b8c - ldr ip, _020a7b98 ; =func_01fffcec + ldr ip, _020a7b98 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_020a7b98: .word func_01fffcec +_020a7b98: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end _ZN10PlayerBase13GetEquipSwordEv .global _ZN10PlayerBase14GetEquipShieldEv arm_func_start _ZN10PlayerBase14GetEquipShieldEv _ZN10PlayerBase14GetEquipShieldEv: ; 0x020a7b9c - ldr ip, _020a7ba8 ; =func_01fffcec + ldr ip, _020a7ba8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_020a7ba8: .word func_01fffcec +_020a7ba8: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end _ZN10PlayerBase14GetEquipShieldEv .global _ZN10PlayerBase6LookAtEP5Vec3p diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 1cc1d7d6..885b9ca6 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -242,7 +242,7 @@ .extern func_01ffe468 .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02002c14 .extern func_020059ec .extern func_020078d8 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index c593efc1..5a7352d6 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -8820,11 +8820,11 @@ _020b8528: .word data_027e0618 .global func_ov00_020b852c arm_func_start func_ov00_020b852c func_ov00_020b852c: ; 0x020b852c - ldr ip, _020b8538 ; =func_01fffcec + ldr ip, _020b8538 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #8 bx ip .align 2, 0 -_020b8538: .word func_01fffcec +_020b8538: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov00_020b852c .global func_ov00_020b853c @@ -18654,11 +18654,11 @@ _020bff6c: .word data_027e0d38 .global func_ov00_020bff70 arm_func_start func_ov00_020bff70 func_ov00_020bff70: ; 0x020bff70 - ldr ip, _020bff7c ; =func_01fffcec + ldr ip, _020bff7c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_020bff7c: .word func_01fffcec +_020bff7c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov00_020bff70 .global func_ov00_020bff80 diff --git a/asm/ov05.inc b/asm/ov05.inc index 7212d7cd..0fbd0df9 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -275,7 +275,7 @@ .extern func_01ffe468 .extern func_01ffec78 .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02002c14 .extern func_02005934 .extern func_02005bfc diff --git a/asm/ov05.s b/asm/ov05.s index c026e826..4fb240c5 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -5752,11 +5752,11 @@ _021055cc: .word data_ov05_0211264c .global func_ov05_021055d0 arm_func_start func_ov05_021055d0 func_ov05_021055d0: ; 0x021055d0 - ldr ip, _021055dc ; =func_01fffcec + ldr ip, _021055dc ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_021055dc: .word func_01fffcec +_021055dc: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov05_021055d0 .global func_ov05_021055e0 @@ -5899,11 +5899,11 @@ _021057b0: .word gPlayerControl .global func_ov05_021057b4 arm_func_start func_ov05_021057b4 func_ov05_021057b4: ; 0x021057b4 - ldr ip, _021057c0 ; =func_01fffcec + ldr ip, _021057c0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #7 bx ip .align 2, 0 -_021057c0: .word func_01fffcec +_021057c0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov05_021057b4 .global func_ov05_021057c4 @@ -6319,11 +6319,11 @@ _02105d80: .word gSinCosTable .global func_ov05_02105d84 arm_func_start func_ov05_02105d84 func_ov05_02105d84: ; 0x02105d84 - ldr ip, _02105d90 ; =func_01fffcec + ldr ip, _02105d90 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02105d90: .word func_01fffcec +_02105d90: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov05_02105d84 .global func_ov05_02105d94 @@ -13017,11 +13017,11 @@ _0210b968: .word gMapManager .global func_ov05_0210b96c arm_func_start func_ov05_0210b96c func_ov05_0210b96c: ; 0x0210b96c - ldr ip, _0210b978 ; =func_01fffcec + ldr ip, _0210b978 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_0210b978: .word func_01fffcec +_0210b978: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov05_0210b96c .global func_ov05_0210b97c diff --git a/asm/ov12.inc b/asm/ov12.inc index 1e6c6a04..6e5c8d82 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -212,7 +212,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02002bac .extern func_02003a9c diff --git a/asm/ov12.s b/asm/ov12.s index 51e1135f..5358d5a7 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -3020,11 +3020,11 @@ _021153cc: .word 0x00000192 .global func_ov12_021153d0 arm_func_start func_ov12_021153d0 func_ov12_021153d0: ; 0x021153d0 - ldr ip, _021153dc ; =func_01fffcec + ldr ip, _021153dc ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_021153dc: .word func_01fffcec +_021153dc: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov12_021153d0 .global func_ov12_021153e0 @@ -34910,11 +34910,11 @@ _0212f1d4: .word data_027e0e58 .global func_ov12_0212f1d8 arm_func_start func_ov12_0212f1d8 func_ov12_0212f1d8: ; 0x0212f1d8 - ldr ip, _0212f1e4 ; =func_01fffcec + ldr ip, _0212f1e4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0212f1e4: .word func_01fffcec +_0212f1e4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov12_0212f1d8 .global func_ov12_0212f1e8 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index b2f80890..822fde7d 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -220,7 +220,7 @@ .extern func_01ffbf5c .extern func_01fffb4c .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020020d0 .extern func_0200250c diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 39411385..08f6304d 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -1052,11 +1052,11 @@ _021202ec: .word data_027e0ffc .global func_ov14_021202f0 arm_func_start func_ov14_021202f0 func_ov14_021202f0: ; 0x021202f0 - ldr ip, _021202fc ; =func_01fffcec + ldr ip, _021202fc ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_021202fc: .word func_01fffcec +_021202fc: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_021202f0 .global func_ov14_02120300 @@ -1928,11 +1928,11 @@ _02120ed0: .word gPlayerPos .global func_ov14_02120ed4 arm_func_start func_ov14_02120ed4 func_ov14_02120ed4: ; 0x02120ed4 - ldr ip, _02120ee0 ; =func_01fffcec + ldr ip, _02120ee0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02120ee0: .word func_01fffcec +_02120ee0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_02120ed4 .global func_ov14_02120ee4 @@ -4505,11 +4505,11 @@ func_ov14_021231e0: ; 0x021231e0 .global func_ov14_0212321c arm_func_start func_ov14_0212321c func_ov14_0212321c: ; 0x0212321c - ldr ip, _02123228 ; =func_01fffcec + ldr ip, _02123228 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #2 bx ip .align 2, 0 -_02123228: .word func_01fffcec +_02123228: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_0212321c .global func_ov14_0212322c @@ -5792,11 +5792,11 @@ _02124298: .word func_ov00_020b7d74 .global func_ov14_0212429c arm_func_start func_ov14_0212429c func_ov14_0212429c: ; 0x0212429c - ldr ip, _021242a8 ; =func_01fffcec + ldr ip, _021242a8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #7 bx ip .align 2, 0 -_021242a8: .word func_01fffcec +_021242a8: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_0212429c .global func_ov14_021242ac diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 03d54962..a993b2a9 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -243,7 +243,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020029fc .extern func_02002c14 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 4b47c882..38c3680a 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -946,21 +946,21 @@ _0213c360: .word data_ov00_020eec9c .global func_ov14_0213c364 arm_func_start func_ov14_0213c364 func_ov14_0213c364: ; 0x0213c364 - ldr ip, _0213c370 ; =func_01fffcec + ldr ip, _0213c370 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #9 bx ip .align 2, 0 -_0213c370: .word func_01fffcec +_0213c370: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_0213c364 .global func_ov14_0213c374 arm_func_start func_ov14_0213c374 func_ov14_0213c374: ; 0x0213c374 - ldr ip, _0213c380 ; =func_01fffcec + ldr ip, _0213c380 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0xa bx ip .align 2, 0 -_0213c380: .word func_01fffcec +_0213c380: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_0213c374 .global func_ov14_0213c384 @@ -7920,11 +7920,11 @@ _021415e0: .word func_01fffcd8 .global func_ov14_021415e4 arm_func_start func_ov14_021415e4 func_ov14_021415e4: ; 0x021415e4 - ldr ip, _021415f0 ; =func_01fffcec + ldr ip, _021415f0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_021415f0: .word func_01fffcec +_021415f0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov14_021415e4 .global func_ov14_021415f4 diff --git a/asm/ov18.inc b/asm/ov18.inc index 97faab74..91b3a568 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -146,7 +146,7 @@ .extern func_01ffbe34 .extern func_01fffb4c .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02000c60 .extern func_0200107c .extern func_02001154 diff --git a/asm/ov18.s b/asm/ov18.s index eb5a4c06..94b6d2ef 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -12706,11 +12706,11 @@ _02165848: .word 0x524f5045 .global func_ov18_0216584c arm_func_start func_ov18_0216584c func_ov18_0216584c: ; 0x0216584c - ldr ip, _02165858 ; =func_01fffcec + ldr ip, _02165858 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_02165858: .word func_01fffcec +_02165858: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov18_0216584c .global func_ov18_0216585c diff --git a/asm/ov19.inc b/asm/ov19.inc index 6ee13fe3..d5ea83e3 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -155,7 +155,7 @@ .extern func_01ffa9fc .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02016fe8 .extern func_02018450 diff --git a/asm/ov19.s b/asm/ov19.s index 247d0bcf..38e23d9b 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -3333,11 +3333,11 @@ _0217024c: .word 0x000001d7 .global func_ov19_02170250 arm_func_start func_ov19_02170250 func_ov19_02170250: ; 0x02170250 - ldr ip, _0217025c ; =func_01fffcec + ldr ip, _0217025c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0217025c: .word func_01fffcec +_0217025c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov19_02170250 .global func_ov19_02170260 diff --git a/asm/ov20.inc b/asm/ov20.inc index 354beb8a..781edc72 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -143,7 +143,7 @@ .extern Atan2 .extern func_01ffbe78 .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02016fe8 .extern func_02018450 diff --git a/asm/ov20.s b/asm/ov20.s index 7025aed4..5113e337 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -2094,11 +2094,11 @@ _0216f4b0: .word gAdventureFlags .global func_ov20_0216f4b4 arm_func_start func_ov20_0216f4b4 func_ov20_0216f4b4: ; 0x0216f4b4 - ldr ip, _0216f4c0 ; =func_01fffcec + ldr ip, _0216f4c0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #2 bx ip .align 2, 0 -_0216f4c0: .word func_01fffcec +_0216f4c0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov20_0216f4b4 .global func_ov20_0216f4c4 diff --git a/asm/ov22.inc b/asm/ov22.inc index d5ab01c4..2afde756 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -153,7 +153,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020020d0 .extern func_0200250c diff --git a/asm/ov22.s b/asm/ov22.s index 30f12a39..836ba70e 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -5381,21 +5381,21 @@ _02171dd8: .word 0x524f5045 .global func_ov22_02171ddc arm_func_start func_ov22_02171ddc func_ov22_02171ddc: ; 0x02171ddc - ldr ip, _02171de8 ; =func_01fffcec + ldr ip, _02171de8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_02171de8: .word func_01fffcec +_02171de8: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov22_02171ddc .global func_ov22_02171dec arm_func_start func_ov22_02171dec func_ov22_02171dec: ; 0x02171dec - ldr ip, _02171df8 ; =func_01fffcec + ldr ip, _02171df8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02171df8: .word func_01fffcec +_02171df8: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov22_02171dec .global func_ov22_02171dfc diff --git a/asm/ov23.inc b/asm/ov23.inc index 206a96d5..d613dc2a 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -201,7 +201,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02016fe8 .extern func_02018450 diff --git a/asm/ov23.s b/asm/ov23.s index a28bf2e5..155b63ff 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -3358,11 +3358,11 @@ _021701ac: .word 0x524f5045 .global func_ov23_021701b0 arm_func_start func_ov23_021701b0 func_ov23_021701b0: ; 0x021701b0 - ldr ip, _021701bc ; =func_01fffcec + ldr ip, _021701bc ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_021701bc: .word func_01fffcec +_021701bc: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov23_021701b0 .global func_ov23_021701c0 @@ -13126,21 +13126,21 @@ _02178330: .word data_ov00_020eec9c .global func_ov23_02178334 arm_func_start func_ov23_02178334 func_ov23_02178334: ; 0x02178334 - ldr ip, _02178340 ; =func_01fffcec + ldr ip, _02178340 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #7 bx ip .align 2, 0 -_02178340: .word func_01fffcec +_02178340: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov23_02178334 .global func_ov23_02178344 arm_func_start func_ov23_02178344 func_ov23_02178344: ; 0x02178344 - ldr ip, _02178350 ; =func_01fffcec + ldr ip, _02178350 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02178350: .word func_01fffcec +_02178350: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov23_02178344 .global func_ov23_02178354 diff --git a/asm/ov24.inc b/asm/ov24.inc index dbe42392..2d108561 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -143,7 +143,7 @@ .extern func_01ffbf5c .extern _ZN8Cylinder8OverlapsEPS_ .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02005dcc .extern func_02007908 diff --git a/asm/ov24.s b/asm/ov24.s index 873a1367..0d963e8e 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -3539,21 +3539,21 @@ _02170454: .word data_027e0d0c .global func_ov24_02170458 arm_func_start func_ov24_02170458 func_ov24_02170458: ; 0x02170458 - ldr ip, _02170464 ; =func_01fffcec + ldr ip, _02170464 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02170464: .word func_01fffcec +_02170464: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov24_02170458 .global func_ov24_02170468 arm_func_start func_ov24_02170468 func_ov24_02170468: ; 0x02170468 - ldr ip, _02170474 ; =func_01fffcec + ldr ip, _02170474 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_02170474: .word func_01fffcec +_02170474: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov24_02170468 .global func_ov24_02170478 @@ -3717,11 +3717,11 @@ _021706b4: .word 0x000003a9 .global func_ov24_021706b8 arm_func_start func_ov24_021706b8 func_ov24_021706b8: ; 0x021706b8 - ldr ip, _021706c4 ; =func_01fffcec + ldr ip, _021706c4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #8 bx ip .align 2, 0 -_021706c4: .word func_01fffcec +_021706c4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov24_021706b8 .global func_ov24_021706c8 diff --git a/asm/ov25.inc b/asm/ov25.inc index 951345c9..97eefe94 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -150,7 +150,7 @@ .extern Atan2 .extern func_01ffe1cc .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02002c14 .extern func_02016fe8 diff --git a/asm/ov25.s b/asm/ov25.s index d28fd760..a70b1115 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -12993,11 +12993,11 @@ _02178508: .word 0x66666667 .global func_ov25_0217850c arm_func_start func_ov25_0217850c func_ov25_0217850c: ; 0x0217850c - ldr ip, _02178518 ; =func_01fffcec + ldr ip, _02178518 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02178518: .word func_01fffcec +_02178518: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov25_0217850c .global func_ov25_0217851c diff --git a/asm/ov27.inc b/asm/ov27.inc index 26482e1e..08ea7bd1 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -139,7 +139,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02018450 .extern func_0201b1bc diff --git a/asm/ov27.s b/asm/ov27.s index 60ad1055..a75c830b 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -2004,21 +2004,21 @@ _0216f344: .word 0x00006aab .global func_ov27_0216f348 arm_func_start func_ov27_0216f348 func_ov27_0216f348: ; 0x0216f348 - ldr ip, _0216f354 ; =func_01fffcec + ldr ip, _0216f354 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0216f354: .word func_01fffcec +_0216f354: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov27_0216f348 .global func_ov27_0216f358 arm_func_start func_ov27_0216f358 func_ov27_0216f358: ; 0x0216f358 - ldr ip, _0216f364 ; =func_01fffcec + ldr ip, _0216f364 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0216f364: .word func_01fffcec +_0216f364: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov27_0216f358 .global func_ov27_0216f368 diff --git a/asm/ov29.inc b/asm/ov29.inc index 838d84c3..9d4fa55c 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -132,7 +132,7 @@ .extern Atan2 .extern func_01fffb4c .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02006b14 .extern func_02006b2c .extern func_02006b90 diff --git a/asm/ov29.s b/asm/ov29.s index fcebbac1..083b1e8e 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -9631,11 +9631,11 @@ _021758ec: .word data_ov29_0217bc78 .global func_ov29_021758f0 arm_func_start func_ov29_021758f0 func_ov29_021758f0: ; 0x021758f0 - ldr ip, _021758fc ; =func_01fffcec + ldr ip, _021758fc ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_021758fc: .word func_01fffcec +_021758fc: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov29_021758f0 .global func_ov29_02175900 diff --git a/asm/ov30.inc b/asm/ov30.inc index 7553b9da..905deb8b 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -114,7 +114,7 @@ .extern func_01ffbf5c .extern func_01ffe1cc .extern _ZN8Cylinder8OverlapsEPS_ -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02002c14 .extern func_0200e8f8 .extern func_02018450 diff --git a/asm/ov30.s b/asm/ov30.s index 684397a2..38f0a9fa 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -7262,21 +7262,21 @@ _02181824: .word 0x42494752 .global func_ov30_02181828 arm_func_start func_ov30_02181828 func_ov30_02181828: ; 0x02181828 - ldr ip, _02181834 ; =func_01fffcec + ldr ip, _02181834 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_02181834: .word func_01fffcec +_02181834: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov30_02181828 .global func_ov30_02181838 arm_func_start func_ov30_02181838 func_ov30_02181838: ; 0x02181838 - ldr ip, _02181844 ; =func_01fffcec + ldr ip, _02181844 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #8 bx ip .align 2, 0 -_02181844: .word func_01fffcec +_02181844: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov30_02181838 .global func_ov30_02181848 diff --git a/asm/ov32.inc b/asm/ov32.inc index 4b2fcd1b..8a0466c5 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -126,7 +126,7 @@ .extern func_01ffa9fc .extern func_01ffbf5c .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020020d0 .extern func_0200250c diff --git a/asm/ov32.s b/asm/ov32.s index 8e6ac2fb..236d0e51 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -3627,11 +3627,11 @@ _0217ebb0: .word func_01fffcd8 .global func_ov32_0217ebb4 arm_func_start func_ov32_0217ebb4 func_ov32_0217ebb4: ; 0x0217ebb4 - ldr ip, _0217ebc0 ; =func_01fffcec + ldr ip, _0217ebc0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0217ebc0: .word func_01fffcec +_0217ebc0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov32_0217ebb4 .global func_ov32_0217ebc4 @@ -3782,11 +3782,11 @@ _0217edc8: .word 0x00000201 .global func_ov32_0217edcc arm_func_start func_ov32_0217edcc func_ov32_0217edcc: ; 0x0217edcc - ldr ip, _0217edd8 ; =func_01fffcec + ldr ip, _0217edd8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_0217edd8: .word func_01fffcec +_0217edd8: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov32_0217edcc .global func_ov32_0217eddc @@ -3929,11 +3929,11 @@ _0217efd4: .word 0x00005555 .global func_ov32_0217efd8 arm_func_start func_ov32_0217efd8 func_ov32_0217efd8: ; 0x0217efd8 - ldr ip, _0217efe4 ; =func_01fffcec + ldr ip, _0217efe4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0217efe4: .word func_01fffcec +_0217efe4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov32_0217efd8 .global func_ov32_0217efe8 diff --git a/asm/ov33.inc b/asm/ov33.inc index 33aaf2f3..98279af0 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -93,7 +93,7 @@ .extern Vec3p_Distance .extern Atan2 .extern func_01ffe1cc -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02016fcc .extern func_02016fe8 .extern func_0201e544 diff --git a/asm/ov33.s b/asm/ov33.s index efdedd10..31f61244 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -380,11 +380,11 @@ _0217c20c: .global func_ov33_0217c218 arm_func_start func_ov33_0217c218 func_ov33_0217c218: ; 0x0217c218 - ldr ip, _0217c224 ; =func_01fffcec + ldr ip, _0217c224 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0217c224: .word func_01fffcec +_0217c224: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov33_0217c218 .global func_ov33_0217c228 @@ -4178,11 +4178,11 @@ _0217f3e4: .word data_027e0e58 .global func_ov33_0217f3e8 arm_func_start func_ov33_0217f3e8 func_ov33_0217f3e8: ; 0x0217f3e8 - ldr ip, _0217f3f4 ; =func_01fffcec + ldr ip, _0217f3f4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_0217f3f4: .word func_01fffcec +_0217f3f4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov33_0217f3e8 .global func_ov33_0217f3f8 diff --git a/asm/ov34.inc b/asm/ov34.inc index aff8348d..73a9e77f 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -97,7 +97,7 @@ .extern Vec3p_Distance .extern Atan2 .extern func_01ffa9fc -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020078f4 .extern func_02007908 diff --git a/asm/ov34.s b/asm/ov34.s index e50dc1df..91135a5d 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -4751,11 +4751,11 @@ _021800c0: .word 0x00001030 .global func_ov34_021800c4 arm_func_start func_ov34_021800c4 func_ov34_021800c4: ; 0x021800c4 - ldr ip, _021800d0 ; =func_01fffcec + ldr ip, _021800d0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_021800d0: .word func_01fffcec +_021800d0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov34_021800c4 .global func_ov34_021800d4 diff --git a/asm/ov35.inc b/asm/ov35.inc index a4527abe..180e0d0a 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -128,7 +128,7 @@ .extern func_01ffa9fc .extern func_01ffbe78 .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020079d8 .extern func_02016fe8 diff --git a/asm/ov35.s b/asm/ov35.s index 54501783..12d8af13 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -948,11 +948,11 @@ _0217ca80: .word gActorManager .global func_ov35_0217ca84 arm_func_start func_ov35_0217ca84 func_ov35_0217ca84: ; 0x0217ca84 - ldr ip, _0217ca90 ; =func_01fffcec + ldr ip, _0217ca90 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0217ca90: .word func_01fffcec +_0217ca90: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov35_0217ca84 .global func_ov35_0217ca94 diff --git a/asm/ov36.inc b/asm/ov36.inc index 03da0393..d29b04e5 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -113,7 +113,7 @@ .extern func_01ffbe34 .extern func_01ffe1cc .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020078f4 .extern func_02007908 diff --git a/asm/ov36.s b/asm/ov36.s index 44e1c92f..6c20a770 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -9322,11 +9322,11 @@ _021840b0: .word 0x524f5045 .global func_ov36_021840b4 arm_func_start func_ov36_021840b4 func_ov36_021840b4: ; 0x021840b4 - ldr ip, _021840c0 ; =func_01fffcec + ldr ip, _021840c0 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_021840c0: .word func_01fffcec +_021840c0: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov36_021840b4 .global func_ov36_021840c4 diff --git a/asm/ov37.inc b/asm/ov37.inc index c0cb50ff..92b4a269 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -115,7 +115,7 @@ .extern func_01ffbe78 .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_020079d8 .extern func_02016fe8 diff --git a/asm/ov37.s b/asm/ov37.s index 76e9cec3..86782e90 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -10707,11 +10707,11 @@ _021852fc: .word 0x524f5045 .global func_ov37_02185300 arm_func_start func_ov37_02185300 func_ov37_02185300: ; 0x02185300 - ldr ip, _0218530c ; =func_01fffcec + ldr ip, _0218530c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0218530c: .word func_01fffcec +_0218530c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov37_02185300 .global func_ov37_02185310 diff --git a/asm/ov38.inc b/asm/ov38.inc index 0719ba58..9d705b5a 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -116,7 +116,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_0200536c .extern func_02005398 .extern func_020053c4 diff --git a/asm/ov38.s b/asm/ov38.s index 44d2e6a7..94f31ddf 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -2096,11 +2096,11 @@ _0217dabc: .word gSinCosTable .global func_ov38_0217dac0 arm_func_start func_ov38_0217dac0 func_ov38_0217dac0: ; 0x0217dac0 - ldr ip, _0217dacc ; =func_01fffcec + ldr ip, _0217dacc ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_0217dacc: .word func_01fffcec +_0217dacc: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov38_0217dac0 .global func_ov38_0217dad0 @@ -9319,11 +9319,11 @@ _021840b4: .word 0x524f5045 .global func_ov38_021840b8 arm_func_start func_ov38_021840b8 func_ov38_021840b8: ; 0x021840b8 - ldr ip, _021840c4 ; =func_01fffcec + ldr ip, _021840c4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_021840c4: .word func_01fffcec +_021840c4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov38_021840b8 .global func_ov38_021840c8 diff --git a/asm/ov39.inc b/asm/ov39.inc index aedcf25f..328939ca 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -114,7 +114,7 @@ .extern Atan2 .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_020078f4 .extern func_020079d8 .extern func_02016fe8 diff --git a/asm/ov39.s b/asm/ov39.s index ca423bf6..a1981e89 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -2696,11 +2696,11 @@ _0217e284: .word gPlayerLink .global func_ov39_0217e288 arm_func_start func_ov39_0217e288 func_ov39_0217e288: ; 0x0217e288 - ldr ip, _0217e294 ; =func_01fffcec + ldr ip, _0217e294 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0217e294: .word func_01fffcec +_0217e294: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov39_0217e288 .global func_ov39_0217e298 @@ -11674,11 +11674,11 @@ _02185ea4: .word 0x00000312 .global func_ov39_02185ea8 arm_func_start func_ov39_02185ea8 func_ov39_02185ea8: ; 0x02185ea8 - ldr ip, _02185eb4 ; =func_01fffcec + ldr ip, _02185eb4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02185eb4: .word func_01fffcec +_02185eb4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov39_02185ea8 .global func_ov39_02185eb8 diff --git a/asm/ov40.inc b/asm/ov40.inc index ddf800f0..c6f5891b 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -135,7 +135,7 @@ .extern func_01ffa8d4 .extern func_01ffbe34 .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02004e4c .extern func_020050e4 .extern func_020052e4 diff --git a/asm/ov40.s b/asm/ov40.s index 1cae22fa..e65bd5b1 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -10024,11 +10024,11 @@ _02183a04: .word gAdventureFlags .global func_ov40_02183a08 arm_func_start func_ov40_02183a08 func_ov40_02183a08: ; 0x02183a08 - ldr ip, _02183a14 ; =func_01fffcec + ldr ip, _02183a14 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02183a14: .word func_01fffcec +_02183a14: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov40_02183a08 .global func_ov40_02183a18 diff --git a/asm/ov41.inc b/asm/ov41.inc index f0243f80..e2337b40 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -113,7 +113,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern Atan2 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02018450 .extern func_020196bc .extern func_020196fc diff --git a/asm/ov41.s b/asm/ov41.s index 39657929..af6b0214 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -1592,11 +1592,11 @@ _0218a954: .word gPlayerLink .global func_ov41_0218a958 arm_func_start func_ov41_0218a958 func_ov41_0218a958: ; 0x0218a958 - ldr ip, _0218a964 ; =func_01fffcec + ldr ip, _0218a964 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0218a964: .word func_01fffcec +_0218a964: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov41_0218a958 .global func_ov41_0218a968 diff --git a/asm/ov42.inc b/asm/ov42.inc index 4d9dec93..5013b5e4 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -84,7 +84,7 @@ .extern func_01ff8230 .extern func_01ff8690 .extern func_01ffbe34 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_020196bc .extern func_020196fc .extern func_0201e388 diff --git a/asm/ov42.s b/asm/ov42.s index da4dcca3..b418f977 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -591,11 +591,11 @@ _02189ce4: .word data_027e0ffc .global func_ov42_02189ce8 arm_func_start func_ov42_02189ce8 func_ov42_02189ce8: ; 0x02189ce8 - ldr ip, _02189cf4 ; =func_01fffcec + ldr ip, _02189cf4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #5 bx ip .align 2, 0 -_02189cf4: .word func_01fffcec +_02189cf4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov42_02189ce8 .global func_ov42_02189cf8 diff --git a/asm/ov43.inc b/asm/ov43.inc index c4e0e8bd..354c8d55 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -81,7 +81,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern Atan2 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_0201e544 .extern func_0202b154 diff --git a/asm/ov43.s b/asm/ov43.s index e600ac8e..dce3fbc3 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -1428,11 +1428,11 @@ _0218a868: .word data_027e0ffc .global func_ov43_0218a86c arm_func_start func_ov43_0218a86c func_ov43_0218a86c: ; 0x0218a86c - ldr ip, _0218a878 ; =func_01fffcec + ldr ip, _0218a878 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0218a878: .word func_01fffcec +_0218a878: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov43_0218a86c .global func_ov43_0218a87c diff --git a/asm/ov44.inc b/asm/ov44.inc index 837dfce6..d30c4c71 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -85,7 +85,7 @@ .extern Vec3p_Sub .extern Vec3p_Axpy .extern Atan2 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02002bf4 .extern func_02016fe8 diff --git a/asm/ov44.s b/asm/ov44.s index a7c1a3f6..113d9f53 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -4024,11 +4024,11 @@ _0218c5cc: .global func_ov44_0218c5e0 arm_func_start func_ov44_0218c5e0 func_ov44_0218c5e0: ; 0x0218c5e0 - ldr ip, _0218c5ec ; =func_01fffcec + ldr ip, _0218c5ec ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0218c5ec: .word func_01fffcec +_0218c5ec: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov44_0218c5e0 .global func_ov44_0218c5f0 diff --git a/asm/ov46.inc b/asm/ov46.inc index 2012a9ba..4acc7dd3 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -107,7 +107,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02007908 .extern func_02018cb8 .extern func_0201e388 diff --git a/asm/ov46.s b/asm/ov46.s index a9c1c578..25ca9d3e 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -4668,11 +4668,11 @@ _02193e80: .word 0x00000ddb .global func_ov46_02193e84 arm_func_start func_ov46_02193e84 func_ov46_02193e84: ; 0x02193e84 - ldr ip, _02193e90 ; =func_01fffcec + ldr ip, _02193e90 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_02193e90: .word func_01fffcec +_02193e90: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov46_02193e84 .global func_ov46_02193e94 diff --git a/asm/ov47.inc b/asm/ov47.inc index a3392c79..8c639125 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -91,7 +91,7 @@ .extern func_01ffbe78 .extern func_01fffb4c .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02018450 .extern func_0201b1bc diff --git a/asm/ov47.s b/asm/ov47.s index 65fea84b..f4007b74 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -2676,21 +2676,21 @@ _0219232c: .word 0x524f5045 .global func_ov47_02192330 arm_func_start func_ov47_02192330 func_ov47_02192330: ; 0x02192330 - ldr ip, _0219233c ; =func_01fffcec + ldr ip, _0219233c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_0219233c: .word func_01fffcec +_0219233c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov47_02192330 .global func_ov47_02192340 arm_func_start func_ov47_02192340 func_ov47_02192340: ; 0x02192340 - ldr ip, _0219234c ; =func_01fffcec + ldr ip, _0219234c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_0219234c: .word func_01fffcec +_0219234c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov47_02192340 .global func_ov47_02192350 diff --git a/asm/ov48.inc b/asm/ov48.inc index b20b41f1..53ea7e21 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -153,7 +153,7 @@ .extern Vec3p_Axpy .extern Atan2 .extern func_01ffbf5c -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02002c14 .extern func_02016fe8 diff --git a/asm/ov48.s b/asm/ov48.s index 038ac169..08b6bf21 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -1770,11 +1770,11 @@ _02191464: .word 0x524f5045 .global func_ov48_02191468 arm_func_start func_ov48_02191468 func_ov48_02191468: ; 0x02191468 - ldr ip, _02191474 ; =func_01fffcec + ldr ip, _02191474 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #0 bx ip .align 2, 0 -_02191474: .word func_01fffcec +_02191474: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov48_02191468 .global func_ov48_02191478 @@ -2308,11 +2308,11 @@ _02191c4c: .word 0x00000249 .global func_ov48_02191c50 arm_func_start func_ov48_02191c50 func_ov48_02191c50: ; 0x02191c50 - ldr ip, _02191c5c ; =func_01fffcec + ldr ip, _02191c5c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02191c5c: .word func_01fffcec +_02191c5c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov48_02191c50 .global func_ov48_02191c60 diff --git a/asm/ov51.inc b/asm/ov51.inc index cd8df54b..530b03a2 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -86,7 +86,7 @@ .extern Vec3p_Axpy .extern Atan2 .extern func_01ffe1cc -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_01fffd04 .extern func_02002c14 .extern func_02016fe8 diff --git a/asm/ov51.s b/asm/ov51.s index 00f4a85e..63cf2f8e 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -597,11 +597,11 @@ _02195c68: .global func_ov51_02195c70 arm_func_start func_ov51_02195c70 func_ov51_02195c70: ; 0x02195c70 - ldr ip, _02195c7c ; =func_01fffcec + ldr ip, _02195c7c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #1 bx ip .align 2, 0 -_02195c7c: .word func_01fffcec +_02195c7c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov51_02195c70 .global func_ov51_02195c80 diff --git a/asm/ov53.inc b/asm/ov53.inc index 35760759..98717d16 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -35,7 +35,7 @@ .extern func_01ffa9fc .extern func_01ffbe78 .extern _ZN8Cylinder8OverlapsEPS_ -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_0202b4e4 .extern func_0204f614 .extern func_ov00_0207bb1c diff --git a/asm/ov53.s b/asm/ov53.s index 13aec309..7e400068 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -1021,11 +1021,11 @@ _02199a0c: .word data_027e0d0c .global func_ov53_02199a10 arm_func_start func_ov53_02199a10 func_ov53_02199a10: ; 0x02199a10 - ldr ip, _02199a1c ; =func_01fffcec + ldr ip, _02199a1c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #2 bx ip .align 2, 0 -_02199a1c: .word func_01fffcec +_02199a1c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov53_02199a10 .global func_ov53_02199a20 diff --git a/asm/ov54.inc b/asm/ov54.inc index 550c3f95..eeea191f 100644 --- a/asm/ov54.inc +++ b/asm/ov54.inc @@ -42,7 +42,7 @@ .extern Vec3p_Length .extern Vec3p_Distance .extern func_01ffa9fc -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_0202af4c .extern func_ov00_0207c1b0 .extern func_ov00_0207c2e8 diff --git a/asm/ov54.s b/asm/ov54.s index 2de5a6b0..c72f851d 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -811,11 +811,11 @@ _021997dc: .word data_ov54_02199914 .global func_ov54_021997e0 arm_func_start func_ov54_021997e0 func_ov54_021997e0: ; 0x021997e0 - ldr ip, _021997ec ; =func_01fffcec + ldr ip, _021997ec ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #3 bx ip .align 2, 0 -_021997ec: .word func_01fffcec +_021997ec: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov54_021997e0 .global func_ov54_021997f0 diff --git a/asm/ov55.inc b/asm/ov55.inc index 17b8ec43..02d06a59 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -37,7 +37,7 @@ .extern data_ov00_020eec9c .extern Vec3p_Add .extern func_01ffa9fc -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_02019570 .extern func_020385b8 .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p diff --git a/asm/ov55.s b/asm/ov55.s index df12f2df..9f9bacf1 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -257,11 +257,11 @@ _0219900c: .word gPlayerControl .global func_ov55_02199010 arm_func_start func_ov55_02199010 func_ov55_02199010: ; 0x02199010 - ldr ip, _0219901c ; =func_01fffcec + ldr ip, _0219901c ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #4 bx ip .align 2, 0 -_0219901c: .word func_01fffcec +_0219901c: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov55_02199010 .global func_ov55_02199020 diff --git a/asm/ov56.inc b/asm/ov56.inc index bc1b4331..27e28948 100644 --- a/asm/ov56.inc +++ b/asm/ov56.inc @@ -20,7 +20,7 @@ .extern Vec3p_Add .extern func_01ffa9fc .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern __register_global_object .extern func_ov00_02087f08 .extern func_ov00_0208967c diff --git a/asm/ov56.s b/asm/ov56.s index 6ed865b9..c76bf556 100644 --- a/asm/ov56.s +++ b/asm/ov56.s @@ -454,11 +454,11 @@ _021992e4: .word data_027e0d0c .global func_ov56_021992e8 arm_func_start func_ov56_021992e8 func_ov56_021992e8: ; 0x021992e8 - ldr ip, _021992f4 ; =func_01fffcec + ldr ip, _021992f4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #5 bx ip .align 2, 0 -_021992f4: .word func_01fffcec +_021992f4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov56_021992e8 .global func_ov56_021992f8 diff --git a/asm/ov57.inc b/asm/ov57.inc index 745b7f8b..9d07586b 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -48,7 +48,7 @@ .extern Vec3p_Distance .extern func_01ffa9fc .extern func_01ffbe78 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_0202af4c .extern func_0202b2f8 .extern func_0202d95c diff --git a/asm/ov57.s b/asm/ov57.s index a806ea54..4c8f9150 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -1372,11 +1372,11 @@ _02199ec8: .word data_ov57_0219ab14 .global func_ov57_02199ecc arm_func_start func_ov57_02199ecc func_ov57_02199ecc: ; 0x02199ecc - ldr ip, _02199ed8 ; =func_01fffcec + ldr ip, _02199ed8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #6 bx ip .align 2, 0 -_02199ed8: .word func_01fffcec +_02199ed8: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov57_02199ecc .global func_ov57_02199edc diff --git a/asm/ov58.inc b/asm/ov58.inc index 2d10ef2e..4d7cffea 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -45,7 +45,7 @@ .extern func_01ffbf5c .extern func_01fffb4c .extern func_01fffbec -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_0200388c .extern func_020197bc .extern func_0201987c diff --git a/asm/ov58.s b/asm/ov58.s index 54435830..15c6f293 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -2575,11 +2575,11 @@ _0219a5b4: .word gPlayerControl .global func_ov58_0219a5b8 arm_func_start func_ov58_0219a5b8 func_ov58_0219a5b8: ; 0x0219a5b8 - ldr ip, _0219a5c4 ; =func_01fffcec + ldr ip, _0219a5c4 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #7 bx ip .align 2, 0 -_0219a5c4: .word func_01fffcec +_0219a5c4: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov58_0219a5b8 .global func_ov58_0219a5c8 diff --git a/asm/ov59.inc b/asm/ov59.inc index 3cfd4c8f..9afc5b96 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -37,7 +37,7 @@ .extern Atan2 .extern func_01ffbf5c .extern func_01fffcd8 -.extern func_01fffcec +.extern _ZN11ItemManager21GetEquipItemUncheckedEi .extern func_0202af4c .extern func_0202b154 .extern func_0202b2f8 diff --git a/asm/ov59.s b/asm/ov59.s index 45c77cbe..4188d1dd 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -495,11 +495,11 @@ _02199308: .word data_ov59_0219b1a0 .global func_ov59_0219930c arm_func_start func_ov59_0219930c func_ov59_0219930c: ; 0x0219930c - ldr ip, _02199318 ; =func_01fffcec + ldr ip, _02199318 ; =_ZN11ItemManager21GetEquipItemUncheckedEi mov r0, #8 bx ip .align 2, 0 -_02199318: .word func_01fffcec +_02199318: .word _ZN11ItemManager21GetEquipItemUncheckedEi arm_func_end func_ov59_0219930c .global func_ov59_0219931c diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index d38e5fb9..24bcdb05 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -260,6 +260,7 @@ public: void ForceEquipItem(ItemFlag equipId); bool ClearForcedEquipItem(); void UpdateSwordShieldInUse(); + static EquipItem* GetEquipItemUnchecked(ItemFlag equipId); // Ammo u16 GetAmmo(ItemFlag equipId) const;