Mangle PlayerBase

This commit is contained in:
Aetias
2024-03-30 12:13:41 +01:00
parent 3b9d07865c
commit cc3b43ddc1
56 changed files with 278 additions and 278 deletions
+1 -1
View File
@@ -1542,7 +1542,7 @@
.extern func_ov00_020af538
.extern func_ov00_020bc46c
.extern func_ov00_020afb6c
.extern func_ov00_020a7c00
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern func_ov00_020bc71c
.extern func_ov00_020bc46c
.extern func_ov00_020b5360
+4 -4
View File
@@ -489,7 +489,7 @@
.extern data_027e0e60
.extern func_ov00_020c3674
.extern func_ov05_0210e4e4
.extern func_ov00_020a7c00
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020b510c
.extern func_ov00_020b50f8
@@ -526,7 +526,7 @@
.extern func_ov00_020bccc8
.extern func_ov00_020bbb64
.extern func_ov00_020bcdb8
.extern func_ov00_020a7c00
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern func_ov00_020bbbd0
.extern func_ov00_02097738
.extern func_ov00_020d7b60
@@ -2268,7 +2268,7 @@
.extern data_ov00_020eec9c
.extern func_ov00_020c5e20
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020833f4
.extern func_ov00_02083400
.extern data_027e0f90
@@ -2630,7 +2630,7 @@
.extern func_ov00_020bcad8
.extern func_ov00_020bca94
.extern func_ov00_020bca4c
.extern func_ov00_020a7d8c
.extern _ZN10PlayerBase9AddHealthEs
.extern func_ov00_020bd5f0
.extern func_ov00_020bc27c
.extern func_ov00_020bc0a8
+7 -7
View File
@@ -824,7 +824,7 @@
.extern func_0202b154
.extern func_ov00_02097bcc
.extern func_ov00_02097bcc
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern data_027e1048
.extern data_ov03_02100634
.extern data_027e0d78
@@ -834,7 +834,7 @@
.extern data_027e0f74
.extern data_02050f54
.extern data_027e0f90
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_02097bcc
.extern func_ov00_020ce8e4
.extern func_ov00_0209a4f4
@@ -1412,14 +1412,14 @@
.extern func_ov00_02087d34
.extern func_ov00_02098074
.extern func_ov00_020888e8
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_0202e740
.extern func_020370d0
.extern func_0202e740
.extern func_ov00_02098074
.extern func_ov00_0208ba08
.extern func_0202e740
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_0208b180
.extern func_ov00_020875f8
.extern data_027e077c
@@ -2930,7 +2930,7 @@
.extern func_ov00_020bd5fc
.extern data_027e0fb8
.extern data_ov00_020e5684
.extern func_ov00_020a7c00
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN11ItemManager13TickEquipItemEv
.extern func_ov23_02178058
.extern func_ov23_02178174
@@ -2987,7 +2987,7 @@
.extern func_ov00_020bcdb8
.extern func_ov00_02097ff4
.extern func_ov05_02103ff0
.extern func_ov00_020a7d34
.extern _ZN10PlayerBase9SetHealthEs
.extern func_ov00_020bbbd0
.extern _ZN11ItemManager9SetPotionEjj
.extern _ZN11ItemManager17EquipPreviousItemEv
@@ -3004,7 +3004,7 @@
.extern data_027e0f64
.extern func_ov00_020bc46c
.extern func_ov23_02178174
.extern func_ov00_020a7d8c
.extern _ZN10PlayerBase9AddHealthEs
.extern data_027e0fbc
.extern func_ov00_020af298
.extern func_ov05_02110bb4
+9 -9
View File
@@ -1115,7 +1115,7 @@
.extern func_01ff9bc4
.extern func_ov00_020c2a0c
.extern func_ov00_020c28d4
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c198c
.extern data_027e10a4
.extern data_02050f54
@@ -2266,7 +2266,7 @@
.extern data_027e1094
.extern data_027e0fac
.extern data_027e0fac
.extern func_ov00_020a7c00
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN11ItemManager18func_ov00_020ad528Ev
.extern func_ov05_02103f4c
.extern func_ov00_02097738
@@ -2285,7 +2285,7 @@
.extern data_027e0f94
.extern data_027e0d78
.extern data_027e0fac
.extern func_ov00_020a7e70
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern data_027e0fac
.extern func_ov00_02097738
.extern func_ov00_02097750
@@ -6839,7 +6839,7 @@
.extern data_02050f54
.extern func_ov00_020c1d58
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_01ff9bf8
.extern data_027e0f90
.extern data_027e0f94
@@ -9053,9 +9053,9 @@
.extern func_ov00_020c322c
.extern func_ov00_020a9ab8
.extern data_ov12_0213a604
.extern func_ov00_020a7af0
.extern func_ov00_020a7af8
.extern func_ov00_020a7b00
.extern _ZN10PlayerBase8vfunc_04Ev
.extern _ZN10PlayerBase10GetEquipIdEv
.extern _ZN10PlayerBase7CanMoveEv
.extern data_ov12_02139ef4
.extern data_ov12_02139f50
.extern data_ov12_02139f7c
@@ -9064,9 +9064,9 @@
.extern data_ov12_0213a184
.extern data_ov12_02139170
.extern data_ov12_0213a480
.extern func_ov00_020a7df4
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern data_ov12_0213a618
.extern func_ov00_020a7d8c
.extern _ZN10PlayerBase9AddHealthEs
.extern data_ov12_02139ab4
.extern data_ov12_02139cd0
.extern data_ov12_02139a80
+2 -2
View File
@@ -276,7 +276,7 @@
.extern func_ov00_020c5118
.extern func_0203611c
.extern func_ov00_0207b2f0
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_020c1b18
.extern func_ov00_02083ee0
.extern func_ov00_02087d34
@@ -826,7 +826,7 @@
.extern func_ov00_020c29ec
.extern func_ov00_02083770
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c28ec
.extern func_ov00_020bd3b0
.extern func_ov00_020c243c
+1 -1
View File
@@ -52,7 +52,7 @@
.extern func_ov00_020c5d74
.extern func_ov00_020c5d74
.extern func_ov00_020c5d74
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_020c1b18
.extern func_ov00_020c5d74
.extern func_ov00_02087d34
+2 -2
View File
@@ -581,7 +581,7 @@
.extern func_ov00_020cd52c
.extern func_ov00_020cd62c
.extern func_ov00_020c28ec
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020cca50
.extern data_027e0f90
.extern func_ov00_020c38fc
@@ -595,7 +595,7 @@
.extern func_ov14_0212de74
.extern data_027e0fe4
.extern data_027e0e60
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020cca50
.extern data_027e0f90
.extern func_ov00_020c28ec
+1 -1
View File
@@ -746,7 +746,7 @@
.extern func_ov00_020c3180
.extern func_ov00_020c3674
.extern func_ov00_020c1e2c
.extern func_ov00_020a7ce4
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern func_ov00_020bf008
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern func_ov00_020c2238
+1 -1
View File
@@ -972,7 +972,7 @@
.extern func_ov00_020cb140
.extern func_ov00_020c1d58
.extern func_01ff9bf8
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0f94
.extern data_027e0f90
.extern func_ov00_020c5d74
+4 -4
View File
@@ -602,7 +602,7 @@
.extern func_ov00_02087d34
.extern func_ov00_02098074
.extern func_ov00_020888e8
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_0202e740
.extern func_0200b954
.extern func_020370d0
@@ -610,7 +610,7 @@
.extern func_ov00_02098074
.extern func_ov00_0208ba08
.extern func_0202e740
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_020875f8
.extern func_0200b974
.extern func_ov00_0209779c
@@ -834,7 +834,7 @@
.extern func_ov00_02087d34
.extern func_ov00_02098074
.extern func_ov00_020888e8
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_0209a4f4
.extern func_ov00_02097810
.extern func_ov00_0209a508
@@ -846,7 +846,7 @@
.extern func_ov09_0211a514
.extern func_0202e740
.extern func_ov00_020875f8
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_02097bcc
.extern func_ov09_02119030
.extern func_ov09_0211a52c
+1 -1
View File
@@ -709,7 +709,7 @@
.extern data_02050f54
.extern data_027e0e58
.extern func_ov00_020c1d58
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0f90
.extern data_027e0fc8
.extern data_02050f54
+3 -3
View File
@@ -355,7 +355,7 @@
.extern func_ov00_020c1e2c
.extern data_027e0764
.extern func_01fffcec
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c070c
.extern func_ov00_020c1ef8
.extern data_02050f54
@@ -656,7 +656,7 @@
.extern func_ov00_02087d34
.extern func_ov00_02098074
.extern func_ov00_020888e8
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_0202e740
.extern func_020370d0
.extern func_ov00_0208ba08
@@ -664,7 +664,7 @@
.extern func_ov00_020ceacc
.extern func_ov00_02098074
.extern func_0202e740
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_0208b180
.extern func_ov00_020875f8
.extern data_027e0f74
+1 -1
View File
@@ -609,7 +609,7 @@
.extern func_0202e58c
.extern func_ov00_020c2974
.extern func_0202b154
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_0202e310
.extern func_ov00_020ceacc
.extern func_0202e58c
+5 -5
View File
@@ -469,7 +469,7 @@
.extern func_ov00_02087d34
.extern func_ov00_02097810
.extern func_ov00_020bc46c
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_0207c5d4
.extern func_ov00_0209a508
.extern data_027e103c
@@ -500,7 +500,7 @@
.extern func_ov00_0207c5d4
.extern func_ov00_020c198c
.extern func_ov00_02097760
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_0207c5d4
.extern func_ov00_0209779c
.extern func_ov00_02097bcc
@@ -525,7 +525,7 @@
.extern func_ov00_02097810
.extern func_ov00_0209a508
.extern func_ov00_02097b9c
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_0202b308
.extern Divide
.extern Divide
@@ -556,7 +556,7 @@
.extern func_ov00_020ceacc
.extern func_0202e58c
.extern func_ov00_02097bcc
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_02083918
.extern func_ov00_02083948
.extern func_ov00_0208726c
@@ -586,7 +586,7 @@
.extern data_ov00_020eec68
.extern data_027e0d0c
.extern data_027e0f74
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_0207c1b0
.extern func_ov00_02088000
.extern func_ov00_020ceacc
+3 -3
View File
@@ -92,7 +92,7 @@
.extern func_ov00_020c5d74
.extern func_ov00_020bd070
.extern func_ov00_020cc960
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern func_ov00_020c1b18
.extern func_ov00_020c5d74
.extern func_ov00_0207c31c
@@ -866,11 +866,11 @@
.extern data_027e0ffc
.extern func_ov00_020c2974
.extern func_01ff9bf8
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0f94
.extern data_027e0f90
.extern func_01ff9bf8
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020cca50
.extern data_027e0f94
.extern data_027e0f90
+4 -4
View File
@@ -249,7 +249,7 @@
.extern func_ov00_020a61ac
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_ov00_020a7c60
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern data_02050f54
.extern data_027e0f90
.extern data_ov29_0217bd28
@@ -264,7 +264,7 @@
.extern data_027e0c68
.extern data_027e0e60
.extern func_ov00_020c2974
.extern func_ov00_020a7ce4
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern func_ov00_020bf008
.extern func_ov00_020ceacc
.extern func_ov00_020c71fc
@@ -578,7 +578,7 @@
.extern data_02050f54
.extern func_01ff9bf8
.extern func_01ff9bc4
.extern func_ov00_020a7cfc
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern func_ov09_02113698
.extern data_027e0f90
.extern data_ov29_0217a4ac
@@ -745,7 +745,7 @@
.extern func_0202e310
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_ov00_020a7ce4
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern func_ov00_020c070c
.extern func_ov00_020c1ef8
.extern func_ov00_020ceacc
+1 -1
View File
@@ -394,7 +394,7 @@
.extern data_027e0f90
.extern data_027e0fac
.extern data_027e0e60
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020cca50
.extern data_027e0f90
.extern func_ov00_020caef8
+1 -1
View File
@@ -110,7 +110,7 @@
.extern func_ov00_020c5d74
.extern func_ov00_020c5d74
.extern data_027e0764
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c070c
.extern func_ov00_020c1ef8
.extern func_ov00_020ceacc
+1 -1
View File
@@ -360,7 +360,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern func_ov00_020c2238
.extern func_ov00_020c070c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c3180
.extern func_ov00_0207a1c8
.extern data_027e0f94
+4 -4
View File
@@ -51,7 +51,7 @@
.extern func_ov00_020c1d58
.extern func_01ff9bf8
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0f94
.extern data_027e0f90
.extern func_ov00_020c5f1c
@@ -155,10 +155,10 @@
.extern func_ov00_020c288c
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern func_01ff9e64
.extern func_ov00_020a7c60
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern func_ov00_020c2974
.extern func_ov00_020c070c
.extern func_ov00_020a7bac
.extern _ZN10PlayerBase6LookAtEP5Vec3p
.extern func_ov00_020c28ec
.extern func_01ff9e64
.extern func_01ff9bf8
@@ -259,7 +259,7 @@
.extern func_ov00_020ceacc
.extern func_ov00_020ceacc
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_01ff9bf8
.extern func_02002c14
.extern func_02002c14
+2 -2
View File
@@ -137,7 +137,7 @@
.extern func_ov00_020cadb0
.extern data_027e0fc8
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c28d4
.extern func_ov00_020c28d4
.extern func_ov00_020cb160
@@ -162,7 +162,7 @@
.extern func_01fffbec
.extern func_01ff9bc4
.extern func_ov00_020bc46c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020bd3b0
.extern func_ov00_020c28ec
.extern func_ov00_020bd4d8
+1 -1
View File
@@ -150,7 +150,7 @@
.extern func_ov00_020c3674
.extern data_027e0fe4
.extern func_ov00_020c2a0c
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov00_020c37ec
.extern data_027e0f90
.extern data_027e0fe4
+1 -1
View File
@@ -89,7 +89,7 @@
.extern func_ov00_0207c474
.extern func_01ff9bf8
.extern func_ov00_020c1ef8
.extern func_ov00_020a7ce4
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern func_ov00_020b7e6c
.extern func_ov00_020cec60
.extern data_027e0e58
+4 -4
View File
@@ -249,12 +249,12 @@ _020a81e8: .word func_01fffcd8
.global _ZN13LinkStateBase6LookAtEP5Vec3p
arm_func_start _ZN13LinkStateBase6LookAtEP5Vec3p
_ZN13LinkStateBase6LookAtEP5Vec3p: ; 0x020a81ec
ldr ip, _020a81f8 ; =func_ov00_020a7bac
ldr ip, _020a81f8 ; =_ZN10PlayerBase6LookAtEP5Vec3p
ldr r0, [r0, #8]
bx ip
.align 2, 0
arm_func_end _ZN13LinkStateBase6LookAtEP5Vec3p
_020a81f8: .word func_ov00_020a7bac
_020a81f8: .word _ZN10PlayerBase6LookAtEP5Vec3p
.global _ZN13LinkStateBase18func_ov00_020a81fcEv
arm_func_start _ZN13LinkStateBase18func_ov00_020a81fcEv
@@ -501,9 +501,9 @@ _ZN13LinkStateBase18func_ov00_020a84bcEi: ; 0x020a84bc
moveq r0, #0
mov r0, r0, lsl #0x10
mov r4, r0, asr #0x10
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
strh r4, [r0, #0x5c]
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
ldr r1, _020a8504 ; =data_027e0e58
strh r4, [r0, #0xe]
ldr r0, [r1]
+2 -2
View File
@@ -1005,7 +1005,7 @@ _020aaff4:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020ab000:
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x14]
@@ -1600,7 +1600,7 @@ _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor: ; 0x020ab7bc
beq _020ab818
b _020ab8c0
_020ab7fc:
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x14]
+3 -3
View File
@@ -19,7 +19,7 @@
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern func_ov05_02106980
.extern func_01fffcd8
.extern func_ov00_020a7bac
.extern _ZN10PlayerBase6LookAtEP5Vec3p
.extern func_ov00_020bb810
.extern func_ov00_020bbbd0
.extern func_0202b154
@@ -41,8 +41,8 @@
.extern func_ov00_020c3674
.extern data_027e0fe8
.extern data_027e0fe4
.extern func_ov00_020a7b8c
.extern func_ov00_020a7b9c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern func_ov00_0207c5d4
.extern data_027e0e58
.extern data_027e0fcc
+2 -2
View File
@@ -85,7 +85,7 @@
.extern func_ov00_020c2a0c
.extern func_01ff9cec
.extern func_ov00_020af044
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern func_ov23_02171410
@@ -141,7 +141,7 @@
.extern func_ov00_020c3180
.extern func_ov00_020aeffc
.extern data_027e0fb8
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern func_ov00_020c2a0c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
+5 -5
View File
@@ -1997,7 +1997,7 @@
.extern func_ov00_0208949c
.extern func_ov00_02089318
.extern func_ov00_02089168
.extern func_ov00_020a7b08
.extern _ZN10PlayerBase12SetUpdatePosEb
.extern func_ov00_02087d98
.extern func_ov00_0207b2f0
.extern func_ov00_0207b334
@@ -2022,8 +2022,8 @@
.extern data_027e0f64
.extern func_ov00_020bcdec
.extern func_ov00_020bcdec
.extern func_ov00_020a7b10
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase10SetVisibleEb
.extern data_027e071c
.extern data_027e0fc8
.extern data_027e0f90
@@ -2032,8 +2032,8 @@
.extern func_ov00_0207b334
.extern data_027e0c68
.extern data_027e0db0
.extern func_ov00_020a7b10
.extern func_ov00_020a7b08
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12SetUpdatePosEb
.extern func_ov00_02087d98
.extern func_ov00_0207b334
.extern func_ov00_020838e8
+4 -4
View File
@@ -2,7 +2,7 @@
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase12GetEquipItemEi
.extern _ZN13LinkStateBase12GetEquipItemEi
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern func_ov00_020c06b0
.extern func_ov00_020d77e4
.extern data_ov00_020eec9c
@@ -33,7 +33,7 @@
.extern func_ov00_02083c7c
.extern data_027e0fb8
.extern data_027e0e60
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern data_027e0d78
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectdlEPv
@@ -266,7 +266,7 @@
.extern func_ov00_020c2a0c
.extern func_01ff9cec
.extern func_ov00_020af044
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern func_ov23_02171410
@@ -322,7 +322,7 @@
.extern func_ov00_020c3180
.extern func_ov00_020aeffc
.extern data_027e0fb8
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern func_ov00_020c2a0c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
+25 -25
View File
@@ -1019,9 +1019,9 @@
.extern func_ov00_020a914c
.extern func_ov00_020b1eec
.extern _ZN13LinkStateBase16GetLinkItemStateEv
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN13LinkStateBase16GetLinkItemStateEv
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern func_ov00_020a914c
.extern data_027e0fd4
.extern func_ov03_020f3f94
@@ -1038,7 +1038,7 @@
.extern data_027e0fd4
.extern func_ov05_0210eba4
.extern _ZN13LinkStateBase16GetLinkItemStateEv
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern gOverlayManager
.extern data_027e0fd4
.extern data_027e0fe4
@@ -1122,22 +1122,22 @@
.extern func_ov00_020b30e4
.extern data_027e0f74
.extern data_027e0fe4
.extern func_ov00_020a7df4
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern func_ov03_020f9f30
.extern func_ov00_02079878
.extern data_027e0c54
.extern data_027e0d3c
.extern func_ov00_020a7df4
.extern func_ov00_020a7b10
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern _ZN10PlayerBase10SetVisibleEb
.extern data_027e0c54
.extern func_ov00_020a7e70
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern func_ov00_020a914c
.extern func_ov00_020b38dc
.extern data_027e0d38
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0f94
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0fd8
.extern data_027e0fd4
.extern data_027e0fd8
@@ -1204,7 +1204,7 @@
.extern data_027e0fd0
.extern _ZN13LinkStateBase16GetLinkItemStateEv
.extern func_ov00_020a914c
.extern func_ov00_020a7b9c
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern data_027e0fd8
.extern data_027e0fd4
.extern data_027e0fcc
@@ -1486,18 +1486,18 @@
.extern data_027e0f94
.extern data_027e0f90
.extern func_01ff9bf8
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0f94
.extern data_027e0f90
.extern func_ov00_020a7c1c
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern data_027e0f90
.extern func_ov00_020a7c60
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern data_027e0f90
.extern func_ov00_02097738
.extern func_01ff9bf8
.extern func_ov00_020a7cfc
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern func_ov00_020a7cfc
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern data_027e0f74
.extern data_027e0f94
.extern data_027e0f90
@@ -1505,13 +1505,13 @@
.extern data_027e0fc8
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_ov00_020a7ce4
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0f90
.extern func_ov00_020a7c1c
.extern func_ov00_020a7ce4
.extern func_ov00_020a7ce4
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern data_027e0f90
.extern data_027e0fc8
.extern func_ov00_020c398c
@@ -1622,13 +1622,13 @@
.extern func_ov00_020a98bc
.extern func_ov00_020a9890
.extern func_ov00_020a9968
.extern func_ov00_020a7af0
.extern _ZN10PlayerBase8vfunc_04Ev
.extern func_ov04_0210a9ac
.extern func_ov04_0210ab20
.extern func_ov05_0210e8b4
.extern func_ov05_0210eaa0
.extern func_ov05_0210e4e4
.extern func_ov00_020a7d8c
.extern _ZN10PlayerBase9AddHealthEs
.extern func_ov04_0210a734
.extern func_ov04_0210a804
.extern func_ov00_0208f70c
@@ -2088,7 +2088,7 @@
.extern data_027e0e58
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020a7b8c
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern func_ov00_020bf008
.extern func_ov14_02146634
.extern func_ov14_021231d4
@@ -2096,13 +2096,13 @@
.extern func_ov14_02120ac4
.extern func_ov14_02123904
.extern data_027e0ffc
.extern func_ov00_020a7b9c
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern func_ov00_020c070c
.extern func_ov00_020a7b9c
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern func_ov00_020c070c
.extern func_ov00_020a7b9c
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern func_ov00_020c070c
.extern func_ov00_020a7b9c
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern func_ov00_020c070c
.extern data_027e0ffc
.extern Divide
+86 -86
View File
@@ -37894,7 +37894,7 @@ _0209828c:
ldr r0, _020985ac ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b08
bl _ZN10PlayerBase12SetUpdatePosEb
_020982a8:
ldrb r1, [r4, #0x11]
cmp r1, #0
@@ -38495,7 +38495,7 @@ _02098a34:
ldr r0, _02098b28 ; =data_027e0f90
strb r1, [r4, #0x21]
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
_02098a8c:
ldrb r0, [r4, #0x22]
cmp r0, #0
@@ -38522,7 +38522,7 @@ _02098abc:
ldr r0, _02098b28 ; =data_027e0f90
strb r1, [r4, #0x21]
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
_02098af0:
ldrb r0, [r4, #0x22]
cmp r0, #0
@@ -39110,7 +39110,7 @@ _02099244:
ldr r0, _020994b4 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
_0209925c:
ldrb r0, [r6, #0x2e]
cmp r0, #0
@@ -39131,7 +39131,7 @@ _0209928c:
ldr r0, _020994b4 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b08
bl _ZN10PlayerBase12SetUpdatePosEb
_020992a4:
ldrb r0, [r6, #0x2f]
cmp r0, #0
@@ -57528,37 +57528,37 @@ func_ov00_020a7aec: ; 0x020a7aec
bx lr
arm_func_end func_ov00_020a7aec
.global func_ov00_020a7af0
arm_func_start func_ov00_020a7af0
func_ov00_020a7af0: ; 0x020a7af0
.global _ZN10PlayerBase8vfunc_04Ev
arm_func_start _ZN10PlayerBase8vfunc_04Ev
_ZN10PlayerBase8vfunc_04Ev: ; 0x020a7af0
mov r0, #1
bx lr
arm_func_end func_ov00_020a7af0
arm_func_end _ZN10PlayerBase8vfunc_04Ev
.global func_ov00_020a7af8
arm_func_start func_ov00_020a7af8
func_ov00_020a7af8: ; 0x020a7af8
.global _ZN10PlayerBase10GetEquipIdEv
arm_func_start _ZN10PlayerBase10GetEquipIdEv
_ZN10PlayerBase10GetEquipIdEv: ; 0x020a7af8
mvn r0, #0
bx lr
arm_func_end func_ov00_020a7af8
arm_func_end _ZN10PlayerBase10GetEquipIdEv
.global func_ov00_020a7b00
arm_func_start func_ov00_020a7b00
func_ov00_020a7b00: ; 0x020a7b00
.global _ZN10PlayerBase7CanMoveEv
arm_func_start _ZN10PlayerBase7CanMoveEv
_ZN10PlayerBase7CanMoveEv: ; 0x020a7b00
mov r0, #1
bx lr
arm_func_end func_ov00_020a7b00
arm_func_end _ZN10PlayerBase7CanMoveEv
.global func_ov00_020a7b08
arm_func_start func_ov00_020a7b08
func_ov00_020a7b08: ; 0x020a7b08
.global _ZN10PlayerBase12SetUpdatePosEb
arm_func_start _ZN10PlayerBase12SetUpdatePosEb
_ZN10PlayerBase12SetUpdatePosEb: ; 0x020a7b08
strb r1, [r0, #0x10]
bx lr
arm_func_end func_ov00_020a7b08
arm_func_end _ZN10PlayerBase12SetUpdatePosEb
.global func_ov00_020a7b10
arm_func_start func_ov00_020a7b10
func_ov00_020a7b10: ; 0x020a7b10
.global _ZN10PlayerBase10SetVisibleEb
arm_func_start _ZN10PlayerBase10SetVisibleEb
_ZN10PlayerBase10SetVisibleEb: ; 0x020a7b10
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
mov r4, r1
@@ -57578,9 +57578,9 @@ func_ov00_020a7b10: ; 0x020a7b10
moveq r0, #0
mov r0, r0, lsl #0x10
mov r5, r0, asr #0x10
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
strh r5, [r0, #0x5c]
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
ldr r1, _020a7b88 ; =data_027e0e58
strh r5, [r0, #0xe]
ldr r0, [r1]
@@ -57589,33 +57589,33 @@ func_ov00_020a7b10: ; 0x020a7b10
bl func_ov00_0207c5d4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020a7b10
arm_func_end _ZN10PlayerBase10SetVisibleEb
_020a7b84: .word gItemManager
_020a7b88: .word data_027e0e58
.global func_ov00_020a7b8c
arm_func_start func_ov00_020a7b8c
func_ov00_020a7b8c: ; 0x020a7b8c
.global _ZN10PlayerBase13GetEquipSwordEv
arm_func_start _ZN10PlayerBase13GetEquipSwordEv
_ZN10PlayerBase13GetEquipSwordEv: ; 0x020a7b8c
ldr ip, _020a7b98 ; =func_01fffcec
mov r0, #0
bx ip
.align 2, 0
arm_func_end func_ov00_020a7b8c
arm_func_end _ZN10PlayerBase13GetEquipSwordEv
_020a7b98: .word func_01fffcec
.global func_ov00_020a7b9c
arm_func_start func_ov00_020a7b9c
func_ov00_020a7b9c: ; 0x020a7b9c
.global _ZN10PlayerBase14GetEquipShieldEv
arm_func_start _ZN10PlayerBase14GetEquipShieldEv
_ZN10PlayerBase14GetEquipShieldEv: ; 0x020a7b9c
ldr ip, _020a7ba8 ; =func_01fffcec
mov r0, #1
bx ip
.align 2, 0
arm_func_end func_ov00_020a7b9c
arm_func_end _ZN10PlayerBase14GetEquipShieldEv
_020a7ba8: .word func_01fffcec
.global func_ov00_020a7bac
arm_func_start func_ov00_020a7bac
func_ov00_020a7bac: ; 0x020a7bac
.global _ZN10PlayerBase6LookAtEP5Vec3p
arm_func_start _ZN10PlayerBase6LookAtEP5Vec3p
_ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac
stmdb sp!, {lr}
sub sp, sp, #0xc
mov r0, r1
@@ -57636,13 +57636,13 @@ func_ov00_020a7bac: ; 0x020a7bac
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
arm_func_end func_ov00_020a7bac
arm_func_end _ZN10PlayerBase6LookAtEP5Vec3p
_020a7bf8: .word data_027e0f94
_020a7bfc: .word data_027e0fac
.global func_ov00_020a7c00
arm_func_start func_ov00_020a7c00
func_ov00_020a7c00: ; 0x020a7c00
.global _ZN10PlayerBase18func_ov00_020a7c00Ei
arm_func_start _ZN10PlayerBase18func_ov00_020a7c00Ei
_ZN10PlayerBase18func_ov00_020a7c00Ei: ; 0x020a7c00
ldr r0, _020a7c18 ; =data_027e0c54
ldrb r0, [r0]
cmp r1, r0
@@ -57650,12 +57650,12 @@ func_ov00_020a7c00: ; 0x020a7c00
movne r0, #0
bx lr
.align 2, 0
arm_func_end func_ov00_020a7c00
arm_func_end _ZN10PlayerBase18func_ov00_020a7c00Ei
_020a7c18: .word data_027e0c54
.global func_ov00_020a7c1c
arm_func_start func_ov00_020a7c1c
func_ov00_020a7c1c: ; 0x020a7c1c
.global _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
arm_func_start _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
_ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder: ; 0x020a7c1c
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldr r2, [r0]
@@ -57673,11 +57673,11 @@ func_ov00_020a7c1c: ; 0x020a7c1c
bl func_01ffec34
add sp, sp, #0x10
ldmia sp!, {r4, pc}
arm_func_end func_ov00_020a7c1c
arm_func_end _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.global func_ov00_020a7c60
arm_func_start func_ov00_020a7c60
func_ov00_020a7c60: ; 0x020a7c60
.global _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
arm_func_start _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
_ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i: ; 0x020a7c60
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x28
ldr ip, [r0]
@@ -57711,23 +57711,23 @@ func_ov00_020a7c60: ; 0x020a7c60
bl func_ov00_0208f030
add sp, sp, #0x28
ldmia sp!, {r4, r5, r6, pc}
arm_func_end func_ov00_020a7c60
arm_func_end _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.global func_ov00_020a7ce4
arm_func_start func_ov00_020a7ce4
func_ov00_020a7ce4: ; 0x020a7ce4
.global _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
arm_func_start _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
_ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi: ; 0x020a7ce4
ldr r0, _020a7cf4 ; =gItemManager
ldr ip, _020a7cf8 ; =_ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
ldr r0, [r0]
bx ip
.align 2, 0
arm_func_end func_ov00_020a7ce4
arm_func_end _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
_020a7cf4: .word gItemManager
_020a7cf8: .word _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
.global func_ov00_020a7cfc
arm_func_start func_ov00_020a7cfc
func_ov00_020a7cfc: ; 0x020a7cfc
.global _ZN10PlayerBase18EquipItem_vfunc_2cEv
arm_func_start _ZN10PlayerBase18EquipItem_vfunc_2cEv
_ZN10PlayerBase18EquipItem_vfunc_2cEv: ; 0x020a7cfc
stmdb sp!, {r3, lr}
ldr r1, [r0]
ldr r1, [r1, #8]
@@ -57742,12 +57742,12 @@ func_ov00_020a7cfc: ; 0x020a7cfc
bl _ZN11ItemManager18EquipItem_vfunc_2cEi
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020a7cfc
arm_func_end _ZN10PlayerBase18EquipItem_vfunc_2cEv
_020a7d30: .word gItemManager
.global func_ov00_020a7d34
arm_func_start func_ov00_020a7d34
func_ov00_020a7d34: ; 0x020a7d34
.global _ZN10PlayerBase9SetHealthEs
arm_func_start _ZN10PlayerBase9SetHealthEs
_ZN10PlayerBase9SetHealthEs: ; 0x020a7d34
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
ldrb r2, [r5, #0x12]
@@ -57771,11 +57771,11 @@ _020a7d7c:
movlt r0, #0
strlth r0, [r5, #0xa]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_ov00_020a7d34
arm_func_end _ZN10PlayerBase9SetHealthEs
.global func_ov00_020a7d8c
arm_func_start func_ov00_020a7d8c
func_ov00_020a7d8c: ; 0x020a7d8c
.global _ZN10PlayerBase9AddHealthEs
arm_func_start _ZN10PlayerBase9AddHealthEs
_ZN10PlayerBase9AddHealthEs: ; 0x020a7d8c
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
ldrb r2, [r4, #0x12]
@@ -57803,11 +57803,11 @@ _020a7de4:
movlt r0, #0
strlth r0, [r4, #0xa]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_ov00_020a7d8c
arm_func_end _ZN10PlayerBase9AddHealthEs
.global func_ov00_020a7df4
arm_func_start func_ov00_020a7df4
func_ov00_020a7df4: ; 0x020a7df4
.global _ZN10PlayerBase8TeleportEP5Vec3psibb
arm_func_start _ZN10PlayerBase8TeleportEP5Vec3psibb
_ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #0x1c
ldr r3, _020a7e6c ; =data_027e0e60
@@ -57839,12 +57839,12 @@ func_ov00_020a7df4: ; 0x020a7df4
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
arm_func_end func_ov00_020a7df4
arm_func_end _ZN10PlayerBase8TeleportEP5Vec3psibb
_020a7e6c: .word data_027e0e60
.global func_ov00_020a7e70
arm_func_start func_ov00_020a7e70
func_ov00_020a7e70: ; 0x020a7e70
.global _ZN10PlayerBase18TeleportToEntranceEib
arm_func_start _ZN10PlayerBase18TeleportToEntranceEib
_ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
mov r5, r1
@@ -57909,7 +57909,7 @@ _020a7f58:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end func_ov00_020a7e70
arm_func_end _ZN10PlayerBase18TeleportToEntranceEib
_020a7f64: .word data_027e0f94
_020a7f68: .word data_027e0e60
_020a7f6c: .word data_027e0fac
@@ -57920,9 +57920,9 @@ _020a7f7c: .word data_027e0fe4
_020a7f80: .word data_027e0f74
_020a7f84: .word data_027e0f64
.global func_ov00_020a7f88
arm_func_start func_ov00_020a7f88
func_ov00_020a7f88: ; 0x020a7f88
.global _ZN10PlayerBase22TeleportToLastEntranceEb
arm_func_start _ZN10PlayerBase22TeleportToLastEntranceEb
_ZN10PlayerBase22TeleportToLastEntranceEb: ; 0x020a7f88
stmdb sp!, {r3, lr}
ldr r3, [r0]
mov r2, r1
@@ -57930,7 +57930,7 @@ func_ov00_020a7f88: ; 0x020a7f88
ldr r3, [r3, #0x38]
blx r3
ldmia sp!, {r3, pc}
arm_func_end func_ov00_020a7f88
arm_func_end _ZN10PlayerBase22TeleportToLastEntranceEb
.rodata
.global data_ov00_020d8798
@@ -68917,13 +68917,13 @@ data_ov00_020e55d8: ; 0x020e55d8
.byte 0x00, 0x00, 0x00, 0x00
.global data_ov00_020e55dc
data_ov00_020e55dc: ; 0x020e55dc
.word func_ov00_020a7af0
.word _ZN10PlayerBase8vfunc_04Ev
.global data_ov00_020e55e0
data_ov00_020e55e0: ; 0x020e55e0
.word func_ov00_020a7af8
.word _ZN10PlayerBase10GetEquipIdEv
.global data_ov00_020e55e4
data_ov00_020e55e4: ; 0x020e55e4
.word func_ov00_020a7b00
.word _ZN10PlayerBase7CanMoveEv
.global data_ov00_020e55e8
data_ov00_020e55e8: ; 0x020e55e8
.byte 0x00, 0x00, 0x00, 0x00
@@ -68953,16 +68953,16 @@ data_ov00_020e5608: ; 0x020e5608
.byte 0x00, 0x00, 0x00, 0x00
.global data_ov00_020e560c
data_ov00_020e560c: ; 0x020e560c
.word func_ov00_020a7e70
.word _ZN10PlayerBase18TeleportToEntranceEib
.global data_ov00_020e5610
data_ov00_020e5610: ; 0x020e5610
.word func_ov00_020a7df4
.word _ZN10PlayerBase8TeleportEP5Vec3psibb
.global data_ov00_020e5614
data_ov00_020e5614: ; 0x020e5614
.word func_ov00_020a7f88
.word _ZN10PlayerBase22TeleportToLastEntranceEb
.global data_ov00_020e5618
data_ov00_020e5618: ; 0x020e5618
.word func_ov00_020a7d8c
.word _ZN10PlayerBase9AddHealthEs
.global data_ov00_020e561c
data_ov00_020e561c: ; 0x020e561c
.byte 0x00, 0x00, 0x00, 0x00
+2 -2
View File
@@ -78,7 +78,7 @@ func_ov00_020a8e58: ; 0x020a8e58
mov r1, #1
ldr r2, [r2, #0x28]
blx r2
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
mvn r1, #0
bl func_ov00_020c06b0
ldr r0, _020a8ec8 ; =data_ov00_020eec9c
@@ -406,7 +406,7 @@ func_ov00_020a9210: ; 0x020a9210
str r1, [r4, #8]
ldmia sp!, {r4, r5, pc}
_020a926c:
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x14]
+25 -25
View File
@@ -16582,7 +16582,7 @@ func_ov00_020bbabc: ; 0x020bbabc
ldrb r0, [r0, #0x26]
cmp r0, #0
beq _020bbb10
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
ldr r0, [r0, #0x40]
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -16613,7 +16613,7 @@ func_ov00_020bbb18: ; 0x020bbb18
ldrb r0, [r0, #0x26]
cmp r0, #0
beq _020bbb5c
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
ldr r0, [r0, #0x40]
cmp r0, #5
cmpne r0, #6
@@ -16855,7 +16855,7 @@ _020bbdd8:
moveq r1, #0
cmp r1, #0
bne _020bbe44
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
ldr r0, [r0, #0x40]
cmp r0, #7
cmpne r0, #8
@@ -17839,7 +17839,7 @@ func_ov00_020bca4c: ; 0x020bca4c
add r4, r0, #0
add r2, r1, #0
ldrh r1, [r4, #0xe]
blx func_ov00_020a7df4
blx _ZN10PlayerBase8TeleportEP5Vec3psibb
cmp r0, #0
beq _020bca86
add r0, r4, #0
@@ -17875,7 +17875,7 @@ _020bca90: .word data_027e0d3c
func_ov00_020bca94: ; 0x020bca94
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020a7df4
bl _ZN10PlayerBase8TeleportEP5Vec3psibb
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -17886,7 +17886,7 @@ func_ov00_020bca94: ; 0x020bca94
mov r1, #1
strb r3, [r4, #0x5c]
strh r2, [r4, #0x48]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
@@ -17906,7 +17906,7 @@ func_ov00_020bcad8: ; 0x020bcad8
mov r5, r2
mov r4, r3
str ip, [sp, #4]
bl func_ov00_020a7e70
bl _ZN10PlayerBase18TeleportToEntranceEib
cmp r0, #0
beq _020bcc08
ldr r0, _020bcc14 ; =data_027e0d38
@@ -18010,7 +18010,7 @@ func_ov00_020bcc2c: ; 0x020bcc2c
ldrsh r2, [r2, #0x5a]
cmp r2, #4
bne _020bcc60
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
ldmia sp!, {r3, pc}
_020bcc60:
mov r0, #0
@@ -18611,7 +18611,7 @@ func_ov00_020bd364: ; 0x020bd364
ldr r2, [r1, #0xc]
ldr r1, _020bd3ac ; =data_027e0f94
blx func_ov00_020b4c4c
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
mov r1, #0
strb r1, [r0, #0xb]
ldmia sp!, {r3, pc}
@@ -24742,7 +24742,7 @@ _020c1e9c:
ldr r0, _020c1ef4 ; =data_027e0f90
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x1c
moveq r0, #0
@@ -24776,7 +24776,7 @@ func_ov00_020c1ef8: ; 0x020c1ef8
ldr r0, _020c1f58 ; =data_027e0f90
mov r1, r6
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
@@ -24809,7 +24809,7 @@ func_ov00_020c1f5c: ; 0x020c1f5c
ldr r0, [r0]
mov r2, r5
mov r3, r4
bl func_ov00_020a7c60
bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
@@ -24860,7 +24860,7 @@ func_ov00_020c1fc8: ; 0x020c1fc8
strb r2, [sp, #0x48]
str r1, [sp, #0x58]
str r2, [sp, #0x5c]
bl func_ov00_020a7cfc
bl _ZN10PlayerBase18EquipItem_vfunc_2cEv
mov r1, r5
ldr r5, [sp, #0x60]
ldr r3, [sp, #0x64]
@@ -24925,7 +24925,7 @@ _020c2110:
strb r2, [sp, #0x18]
str r1, [sp, #0x28]
str r2, [sp, #0x2c]
bl func_ov00_020a7cfc
bl _ZN10PlayerBase18EquipItem_vfunc_2cEv
ldr lr, [sp, #0x60]
ldr ip, [sp, #0x64]
ldr r3, [sp, #0x68]
@@ -25016,7 +25016,7 @@ func_ov00_020c2238: ; 0x020c2238
mov r1, r5
ldr r0, [r0]
mov r2, #1
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
addne sp, sp, #0xc
movne r0, #1
@@ -25049,7 +25049,7 @@ func_ov00_020c22b8: ; 0x020c22b8
ldr r0, _020c23bc ; =data_027e0f90
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addne sp, sp, #0x10
movne r0, #1
@@ -25061,7 +25061,7 @@ _020c2308:
add r1, sp, #0
ldr r0, [r0]
mov r2, #0
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
addne sp, sp, #0x10
movne r0, #1
@@ -25095,7 +25095,7 @@ _020c2384:
add r1, sp, #0
ldr r0, [r0]
mov r2, #8
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
addne sp, sp, #0x10
movne r0, #1
@@ -36837,7 +36837,7 @@ _020cb6fc:
strb r0, [sp, #4]
strb r0, [sp, #0x14]
strb r0, [sp, #0x15]
bl func_ov00_020a7b8c
bl _ZN10PlayerBase13GetEquipSwordEv
mov r1, #0xf6
mov r2, #0
bl func_ov00_020bf008
@@ -37372,14 +37372,14 @@ _020cbdfc:
ldrb r0, [r4, #0x15]
cmp r0, #0
beq _020cbe20
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
add r2, r5, #0x48
mov r1, #0x18c
mov r3, #0
bl func_ov00_020c070c
b _020cbec0
_020cbe20:
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
add r2, r5, #0x48
mvn r1, #0
mov r3, #0
@@ -37389,14 +37389,14 @@ _020cbe38:
ldrb r0, [r4, #0x15]
cmp r0, #0
beq _020cbe5c
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
add r2, r5, #0x48
mov r1, #0x18c
mov r3, #0
bl func_ov00_020c070c
b _020cbec0
_020cbe5c:
bl func_ov00_020a7b9c
bl _ZN10PlayerBase14GetEquipShieldEv
add r2, r5, #0x48
mvn r1, #0
mov r3, #0
@@ -60302,7 +60302,7 @@ data_ov00_020e6c88: ; 0x020e6c88
.word func_ov00_020bb44c - 1
.global data_ov00_020e6c8c
data_ov00_020e6c8c: ; 0x020e6c8c
.word func_ov00_020a7af0
.word _ZN10PlayerBase8vfunc_04Ev
.global data_ov00_020e6c90
data_ov00_020e6c90: ; 0x020e6c90
.word func_ov00_020bc6d4 - 1
@@ -60347,7 +60347,7 @@ data_ov00_020e6cc4: ; 0x020e6cc4
.word func_ov00_020bca4c
.global data_ov00_020e6cc8
data_ov00_020e6cc8: ; 0x020e6cc8
.word func_ov00_020a7d8c
.word _ZN10PlayerBase9AddHealthEs
.global data_ov00_020e6ccc
data_ov00_020e6ccc: ; 0x020e6ccc
.byte 0x00, 0x00, 0x00, 0x00
+1 -1
View File
@@ -16250,7 +16250,7 @@ func_ov05_0210e4e4: ; 0x0210e4e4
_0210e52c:
mov r0, r6
mov r1, r5
bl func_ov00_020a7c00
bl _ZN10PlayerBase18func_ov00_020a7c00Ei
cmp r0, #0
beq _0210e838
ldr r0, _0210e87c ; =data_027e0fcc
+4 -4
View File
@@ -8530,7 +8530,7 @@ _02119ac4:
bl func_ov05_0210e4e4
mov r0, r6
mov r1, r5
bl func_ov00_020a7c00
bl _ZN10PlayerBase18func_ov00_020a7c00Ei
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
ldr r0, _02119dc4 ; =gItemManager
@@ -8800,7 +8800,7 @@ _02119e90:
moveq r2, #0
mov r0, r6
strb r2, [r6, #0x74]
bl func_ov00_020a7c00
bl _ZN10PlayerBase18func_ov00_020a7c00Ei
cmp r0, #0
beq _0211a378
cmp r4, #0
@@ -38118,7 +38118,7 @@ _02131c18:
ldr r0, _02131d74 ; =data_027e0f90
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
bne _02131c88
ldr r0, [r4, #0x748]
@@ -46212,7 +46212,7 @@ data_ov12_02135db4: ; 0x02135db4
.word func_ov00_020bca4c
.global data_ov12_02135db8
data_ov12_02135db8: ; 0x02135db8
.word func_ov00_020a7d8c
.word _ZN10PlayerBase9AddHealthEs
.global data_ov12_02135dbc
data_ov12_02135dbc: ; 0x02135dbc
.word func_ov12_0211933c
+7 -7
View File
@@ -11281,7 +11281,7 @@ _02128938:
ldr r0, _021289a0 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r0, r7
mov r1, r6
bl func_ov14_02126b04
@@ -11347,7 +11347,7 @@ _02128a18:
ldr r0, _02128d70 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
b _02128d64
_02128a2c:
ldr r0, _02128d74 ; =data_027e0f74
@@ -18775,7 +18775,7 @@ _0212e97c:
ldr r0, _0212eb3c ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _0212eb40 ; =data_027e0fe4
mov r1, #0
ldr r0, [r0]
@@ -18824,7 +18824,7 @@ _0212eacc:
ldr r0, _0212eb3c ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _0212eb40 ; =data_027e0fe4
mov r2, #1
ldr r1, [r0]
@@ -39555,7 +39555,7 @@ func_ov14_0213f104: ; 0x0213f104
mov r4, r0
mov r7, r1
mov r6, r2
bl func_ov00_020a7c00
bl _ZN10PlayerBase18func_ov00_020a7c00Ei
movs r5, r0
beq _0213f170
ldr r0, _0213f318 ; =gItemManager
@@ -39873,7 +39873,7 @@ _0213f4f2:
blx func_ov05_02103ff0
add r0, r5, #0
mov r1, #0x20
blx func_ov00_020a7d34
blx _ZN10PlayerBase9SetHealthEs
cmp r4, #0
bne _0213f510
add r0, r5, #0
@@ -39977,7 +39977,7 @@ func_ov14_0213f5a8: ; 0x0213f5a8
func_ov14_0213f5dc: ; 0x0213f5dc
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020a7d8c
bl _ZN10PlayerBase9AddHealthEs
ldr r0, _0213f5fc ; =data_027e0fbc
ldrsh r1, [r4, #0xa]
ldr r0, [r0]
+9 -9
View File
@@ -17385,7 +17385,7 @@ _0212dbf4:
ldr r0, _0212dd1c ; =data_027e0f90
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _0212dcf8
_0212dcdc:
@@ -31478,7 +31478,7 @@ func_ov15_0213a184: ; 0x0213a184
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r2
bl func_ov00_020a7c00
bl _ZN10PlayerBase18func_ov00_020a7c00Ei
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _0213a454 ; =gItemManager
@@ -31706,7 +31706,7 @@ _0213a4b0:
mov r2, r6
mov r3, r5
str ip, [sp, #4]
bl func_ov00_020a7e70
bl _ZN10PlayerBase18TeleportToEntranceEib
cmp r0, #0
addeq sp, sp, #8
moveq r0, #0
@@ -97265,7 +97265,7 @@ func_ov15_021724d0: ; 0x021724d0
ldr r0, _021725c4 ; =data_027e0f90
add r1, sp, #0x1c
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x2c
ldmeqia sp!, {r3, r4, pc}
@@ -131913,13 +131913,13 @@ data_ov15_0218aaac: ; 0x0218aaac
.word func_ov15_0213a604
.global data_ov15_0218aab0
data_ov15_0218aab0: ; 0x0218aab0
.word func_ov00_020a7af0
.word _ZN10PlayerBase8vfunc_04Ev
.global data_ov15_0218aab4
data_ov15_0218aab4: ; 0x0218aab4
.word func_ov00_020a7af8
.word _ZN10PlayerBase10GetEquipIdEv
.global data_ov15_0218aab8
data_ov15_0218aab8: ; 0x0218aab8
.word func_ov00_020a7b00
.word _ZN10PlayerBase7CanMoveEv
.global data_ov15_0218aabc
data_ov15_0218aabc: ; 0x0218aabc
.word func_ov15_02139ef4
@@ -131952,13 +131952,13 @@ data_ov15_0218aae0: ; 0x0218aae0
.word func_ov15_0213a480
.global data_ov15_0218aae4
data_ov15_0218aae4: ; 0x0218aae4
.word func_ov00_020a7df4
.word _ZN10PlayerBase8TeleportEP5Vec3psibb
.global data_ov15_0218aae8
data_ov15_0218aae8: ; 0x0218aae8
.word func_ov15_0213a618
.global data_ov15_0218aaec
data_ov15_0218aaec: ; 0x0218aaec
.word func_ov00_020a7d8c
.word _ZN10PlayerBase9AddHealthEs
.global data_ov15_0218aaf0
data_ov15_0218aaf0: ; 0x0218aaf0
.word func_ov15_021412b0
+2 -2
View File
@@ -3454,7 +3454,7 @@ _021703a4:
ldr r0, _02170560 ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r0, r4
bl func_ov00_020c1b18
mov r0, #0
@@ -9179,7 +9179,7 @@ _02174f38:
ldr r0, _0217558c ; =data_027e0f90
add r1, sp, #0x38
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02174fa8
mov r0, r4
+1 -1
View File
@@ -936,7 +936,7 @@ _0216e3dc:
ldr r0, _0216e554 ; =data_027e0f90
mov r1, r4
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r0, r7
bl func_ov00_020c1b18
mov r0, #0x1f
+2 -2
View File
@@ -6380,7 +6380,7 @@ func_ov23_02172928: ; 0x02172928
ldr r0, [r0]
mov r1, r3
str r2, [sp, #0xc]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02172984
mov r0, r4
@@ -6514,7 +6514,7 @@ func_ov23_02172b18: ; 0x02172b18
add r1, r4, #0x184
ldr r0, [r0]
add r1, r1, #0x400
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02172b54
mov r0, r4
+1 -1
View File
@@ -9726,7 +9726,7 @@ _021754f4:
ldr r0, [r0]
add r1, r3, #0x400
mov r2, #0
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
beq _02175624
bl func_ov24_02170468
+1 -1
View File
@@ -13686,7 +13686,7 @@ func_ov25_02178d0c: ; 0x02178d0c
ldr r0, _02178d88 ; =data_027e0f90
add r1, r4, #0x34c
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addeq sp, sp, #0xc
moveq r0, #0
+4 -4
View File
@@ -7098,7 +7098,7 @@ _02173010:
ldr r0, _021732b0 ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _021732b4 ; =data_027e0fe4
mov r1, #0
ldr r0, [r0]
@@ -7149,7 +7149,7 @@ _02173160:
ldr r0, _021732b0 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _021732b4 ; =data_027e0fe4
mov r2, #1
ldr r1, [r0]
@@ -9780,7 +9780,7 @@ _02174d14:
ldr r0, _02174ff0 ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
add r0, sp, #0xc
bl func_ov00_0209a4f4
mvn r0, #0
@@ -9843,7 +9843,7 @@ _02174ea4:
ldr r0, _02174ff0 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _02174fec ; =data_027e0f74
ldr r1, [r4, #0x68]
ldr r0, [r0]
+1 -1
View File
@@ -8644,7 +8644,7 @@ func_ov30_02182ae4: ; 0x02182ae4
ldr r0, _02182b44 ; =data_027e0f90
mov r1, r6
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
+3 -3
View File
@@ -3858,7 +3858,7 @@ _0217ee34:
add r3, sb, r3
mov r2, r1
str r3, [r2, #8]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _0217ef50
ldr r0, _0217efd0 ; =data_027e0fac
@@ -7624,7 +7624,7 @@ _02182080:
ldr r0, _021822a4 ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
b _0218226c
_02182134:
ldr r0, _02182294 ; =data_027e077c
@@ -7708,7 +7708,7 @@ _0218223c:
ldr r0, _021822a4 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _0218229c ; =data_027e0f64
ldr r0, [r0]
bl func_ov00_0208b180
+1 -1
View File
@@ -7626,7 +7626,7 @@ func_ov35_02182720: ; 0x02182720
mov r4, r0
ldr r0, [r1]
mov r1, #0
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, [r4, #0x168]
mov r1, #0x32000
add r0, r0, #0xc
+5 -5
View File
@@ -6739,7 +6739,7 @@ _02181b40:
ldr r0, _02181ba0 ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r1, [r4, #0x6b4]
mov r2, #0
strb r2, [r1, #0x11a]
@@ -6950,7 +6950,7 @@ _02181e34:
ldr r0, _02181f38 ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, _02181f24 ; =data_027e0e58
mov r1, #1
ldr r0, [r0]
@@ -7234,7 +7234,7 @@ _02182270:
ldr r0, _0218294c ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r0, #1
strb r0, [r4, #0x8aa]
mov r0, #0
@@ -7643,7 +7643,7 @@ _0218287c:
ldr r0, _0218294c ; =data_027e0f90
mov r1, #1
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r3, #0
mov r0, #0xff
add r2, sp, #0x2c
@@ -7911,7 +7911,7 @@ func_ov36_02182c88: ; 0x02182c88
mov r4, r0
ldr r0, [r1]
mov r1, #0
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
ldr r0, [r4, #0x168]
ldr r0, [r0, #0x14]
cmp r0, #0xa8000
+3 -3
View File
@@ -817,7 +817,7 @@ _0217c814:
ldr r0, _0217c918 ; =data_027e0f90
mov r1, r2
ldr r0, [r0]
bl func_ov00_020a7b10
bl _ZN10PlayerBase10SetVisibleEb
mov r0, r4
bl func_ov00_020c1b18
ldr r1, [r4, #0x14]
@@ -13800,7 +13800,7 @@ func_ov37_02187c5c: ; 0x02187c5c
str lr, [sp, #0x14]
str r3, [sp, #0x10]
str r2, [sp, #0x18]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x28
moveq r0, #0
@@ -13841,7 +13841,7 @@ func_ov37_02187cec: ; 0x02187cec
str lr, [sp, #0x10]
str ip, [sp, #0x14]
str r2, [sp, #0x18]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02187d78
mov r0, r4
+4 -4
View File
@@ -3072,7 +3072,7 @@ _0217e6dc:
mov r1, r5
mov r2, r6
mov r3, r8
bl func_ov00_020a7c60
bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
cmp r0, #0
movne sl, #1
cmp sl, #0
@@ -3513,7 +3513,7 @@ _0217ecdc:
add r1, sp, #0
mov r2, #0
str r3, [sp, #0xc]
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
beq _0217edd8
ldr r0, [r4, #0x158]
@@ -8421,7 +8421,7 @@ func_ov39_021831d8: ; 0x021831d8
add r1, r1, #1
str r1, [r4, #0x174]
ldr r0, [r0]
bl func_ov00_020a7cfc
bl _ZN10PlayerBase18EquipItem_vfunc_2cEv
add r1, r4, #0x100
ldrsh r2, [r1, #0x20]
add r0, r2, r0
@@ -11551,7 +11551,7 @@ func_ov39_02185c3c: ; 0x02185c3c
add r1, sp, #0x28
ldr r0, [r0]
mov r2, #1
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
beq _02185d1c
bl func_ov39_02185ea8
+1 -1
View File
@@ -4803,7 +4803,7 @@ func_ov41_0218d324: ; 0x0218d324
ldr r0, [r1]
mov r1, r3
str r2, [sp, #0xc]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _0218d388
mov r0, r4
+1 -1
View File
@@ -1344,7 +1344,7 @@ func_ov43_0218a674: ; 0x0218a674
str sb, [sp, #0x1c]
add r2, sb, r3
str r2, [r1, #8]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _0218a7ac
ldr r0, _0218a858 ; =data_027e0fac
+1 -1
View File
@@ -4816,7 +4816,7 @@ _02194028:
ldr r0, _0219410c ; =data_027e0f90
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _0219407c
ldr r0, _0219410c ; =data_027e0f90
+4 -4
View File
@@ -782,7 +782,7 @@ func_ov48_021908ac: ; 0x021908ac
ldr r0, [r0]
add r1, sp, #0
str r2, [sp, #0xc]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addeq sp, sp, #0x1c
moveq r0, #0
@@ -2077,7 +2077,7 @@ _021918a4:
ldr r0, [r0]
add r1, sp, #0x44
add r2, sp, #0x38
bl func_ov00_020a7c60
bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
cmp r0, #0
beq _02191964
ldr r1, _02191c3c ; =data_027e0fac
@@ -2096,7 +2096,7 @@ _021918a4:
ldr r0, _02191c38 ; =data_027e0f90
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020a7bac
bl _ZN10PlayerBase6LookAtEP5Vec3p
mov r0, r4
bl func_ov00_020c28ec
sub r0, r0, #0x800
@@ -3568,7 +3568,7 @@ _02192b5c:
bl func_ov00_020c2a0c
ldr r0, [sl]
mov r1, r4
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02192bc4
add r0, sp, #0x6c
+2 -2
View File
@@ -1368,7 +1368,7 @@ func_ov49_02196710: ; 0x02196710
ldr r0, [r0]
add r1, sp, #0x98
str r2, [sp, #0xa4]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02196788
mov r0, r5
@@ -1679,7 +1679,7 @@ _02196bec:
ldr r0, _02196ff0 ; =data_027e0f90
add r1, sp, #0x70
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
beq _02196c54
mov r0, r5
+1 -1
View File
@@ -1919,7 +1919,7 @@ func_ov50_02196ee4: ; 0x02196ee4
ldr r0, _02196f70 ; =data_027e0f90
add r1, sp, #0x18
ldr r0, [r0]
bl func_ov00_020a7c1c
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
addne sp, sp, #0x28
movne r0, #1
+1 -1
View File
@@ -1209,7 +1209,7 @@ _021963d4:
ldr r0, [r4]
mov r1, r5
mov r2, #0
bl func_ov00_020a7ce4
bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
cmp r0, #0
beq _02196450
ldr r0, [r4]