mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-28 16:31:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document grab actor methods in LinkStateBase

Browse Source
This commit is contained in:
Aetias
2024-03-25 19:29:37 +01:00
parent bde7c6f53c
commit ce3031f712
13 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/ov05.inc
+23 -23
View File
@@ -483,7 +483,7 @@
.extern data_ov00_020eec9c
.extern data_027e0e60
.extern data_02050f54
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetEquipItemEi
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d50Ev
@@ -573,7 +573,7 @@
.extern _ZN13LinkStateBase12GetEquipItemEi
.extern _ZN13LinkStateBase18func_ov00_020a8d50Ev
.extern _ZN13LinkStateBase18func_ov00_020a8c64Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_ov00_020b0b0c
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -634,7 +634,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18func_ov00_020a8b04Eib
.extern _ZN13LinkStateBase12GetPlayerPosEv
@@ -1090,8 +1090,8 @@
.extern data_ov00_020e9360
.extern func_ov00_020aee84
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7a84
.extern _ZN13LinkStateBase18ChangeLinkSubStateEii
@@ -1101,7 +1101,7 @@
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern _ZN13LinkStateBase18func_ov00_020a8994Ev
@@ -1111,22 +1111,22 @@
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov00_02083a1c
.extern func_ov00_020840c4
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov00_0208583c
.extern func_ov17_0215f874
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov00_02083ee0
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ffbf5c
.extern func_ov00_02081f4c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern data_027e0e60
@@ -1271,7 +1271,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern func_ov00_0208583c
.extern func_ov00_020c35d8
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7a84
.extern func_01fffcd8
@@ -1335,7 +1335,7 @@
.extern data_027e0f74
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020a9180
.extern func_020385b8
.extern func_ov00_020ab770
@@ -1355,7 +1355,7 @@
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020b13c4
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern data_027e0fb8
.extern data_02050f54
@@ -1377,7 +1377,7 @@
.extern func_ov00_020a9210
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9ec0
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020afeec
.extern func_ov00_020af050
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
@@ -1410,13 +1410,13 @@
.extern func_ov00_020af044
.extern func_020385b8
.extern func_ov00_020ab8cc
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_0208583c
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_0208583c
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
@@ -1805,7 +1805,7 @@
.extern _ZN13LinkStateBase9GetHealthEv
.extern func_ov00_020b510c
.extern func_ov00_020b50f8
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18func_ov00_020a8a90Ei
.extern _ZN13LinkStateBase18func_ov00_020a8704EPs
.extern _ZN13LinkStateBase18func_ov00_020a8a90Ei
@@ -1933,7 +1933,7 @@
.extern func_ov00_020b1e98
.extern _ZN13LinkStateItem18func_ov00_020abf70Ev
.extern func_ov00_020bd318
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020a9180
.extern func_020385b8
.extern func_ov00_020ab770
@@ -1977,14 +1977,14 @@
.extern func_020385b8
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern func_ov00_020ab614
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase18func_ov00_020a8ad0Ei
.extern _ZN13LinkStateBase18func_ov00_020a8d6cEv
.extern _ZN13LinkStateBase18func_ov00_020a8d6cEv
.extern _ZN13LinkStateBase18func_ov00_020a8ad0Ei
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern data_027e0f74
.extern data_027e0d38
asm/include/ov55.inc
+3 -3
View File
@@ -16,8 +16,8 @@
.extern data_027e0fe8
.extern data_027e0fe4
.extern _ZN13LinkStateBase18func_ov00_020a89bcEii
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov00_020af298
.extern data_027e0fb8
.extern func_01fffcec
@@ -35,7 +35,7 @@
.extern func_01ff9bc4
.extern func_020385b8
.extern func_ov00_020ab908
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov00_020af298
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020b034c
asm/include/ov58.inc
+1 -1
View File
@@ -148,7 +148,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a89bcEii
.extern data_027e1098
.extern func_ov00_020cf01c
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov14_0213ed94
.extern func_ov00_02083c7c
.extern func_020385b8
asm/ov00/Player/LinkStateBase.s
+9 -9
View File
@@ -472,7 +472,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
movs r4, r0
beq _020a84a8
mov r0, r7
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r1, [r4, #8]
str r1, [r0]
ldr r1, [r4, #0xc]
@@ -1241,9 +1241,9 @@ _ZN13LinkStateBase27Get_PlayerControlData_Unk32Ev: ; 0x020a8c90
arm_func_end _ZN13LinkStateBase27Get_PlayerControlData_Unk32Ev
_020a8ca0: .word data_027e0fcc
.global _ZN13LinkStateBase18func_ov00_020a8ca4Ev
arm_func_start _ZN13LinkStateBase18func_ov00_020a8ca4Ev
_ZN13LinkStateBase18func_ov00_020a8ca4Ev: ; 0x020a8ca4
.global _ZN13LinkStateBase12GetGrabActorEv
arm_func_start _ZN13LinkStateBase12GetGrabActorEv
_ZN13LinkStateBase12GetGrabActorEv: ; 0x020a8ca4
ldr r1, _020a8cbc ; =data_027e0fe4
ldr r2, [r0, #8]
ldr r0, [r1]
@@ -1251,17 +1251,17 @@ _ZN13LinkStateBase18func_ov00_020a8ca4Ev: ; 0x020a8ca4
add r1, r2, #0x3c
bx ip
.align 2, 0
arm_func_end _ZN13LinkStateBase18func_ov00_020a8ca4Ev
arm_func_end _ZN13LinkStateBase12GetGrabActorEv
_020a8cbc: .word data_027e0fe4
_020a8cc0: .word func_ov00_020c3674
.global _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
arm_func_start _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
_ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv: ; 0x020a8cc4
.global _ZN13LinkStateBase15GetGrabActorRefEv
arm_func_start _ZN13LinkStateBase15GetGrabActorRefEv
_ZN13LinkStateBase15GetGrabActorRefEv: ; 0x020a8cc4
ldr r0, [r0, #8]
add r0, r0, #0x3c
bx lr
arm_func_end _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
arm_func_end _ZN13LinkStateBase15GetGrabActorRefEv
.global _ZN13LinkStateBase4GrabEv
arm_func_start _ZN13LinkStateBase4GrabEv
asm/ov00/include/ov00_020a8e04.inc
+19 -19
View File
@@ -196,14 +196,14 @@
.extern func_ov00_020af044
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7b20
.extern func_01ffa0f4
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a89bcEii
.extern _ZN13LinkStateBase18func_ov00_020a8994Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_01ffa0f4
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
@@ -223,8 +223,8 @@
.extern data_027e0fe4
.extern _ZN13LinkStateBase12OnStateLeaveEi
.extern func_ov00_020af050
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern data_027e0fb8
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
@@ -248,7 +248,7 @@
.extern data_02050f54
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_ov00_020b05e8
.extern func_ov00_020b049c
@@ -258,7 +258,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern func_ov00_020afe88
.extern func_ov00_020af050
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_01ff9e64
.extern func_01ffbe78
.extern _ZN13LinkStateBase12GetPlayerPosEv
@@ -267,7 +267,7 @@
.extern func_01ff9cec
.extern func_ov00_020af044
.extern func_ov00_020a7b8c
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern func_ov23_02171410
.extern func_01ff9cec
@@ -293,7 +293,7 @@
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_01ff9cec
.extern func_ov05_0211139c
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern func_ov05_021113b4
.extern func_ov00_020c1908
@@ -314,11 +314,11 @@
.extern Divide
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern data_02050f54
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern data_027e0d0c
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020c3180
.extern func_ov00_020aeffc
.extern data_027e0fb8
@@ -333,21 +333,21 @@
.extern func_0202da8c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
.extern func_ov17_0215dff0
.extern func_ov17_0215e338
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7a84
.extern data_02050f54
@@ -356,14 +356,14 @@
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase10GetStateIdEv
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7a84
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18ChangeLinkSubStateEii
.extern data_027e0fb8
.extern data_027e0fe4
asm/ov00/include/ov00_020ae7a4.inc
+4 -4
View File
@@ -50,13 +50,13 @@
.extern func_ov23_021720f0
.extern func_ov00_020b7e6c
.extern data_027e0e58
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern func_ov23_021712fc
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
@@ -370,7 +370,7 @@
.extern func_ov05_02100ae0
.extern func_ov05_021099dc
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov05_0210f808
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_0202b2e8
@@ -410,7 +410,7 @@
.extern func_01ff9bf8
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk004Ev
.extern func_01ffa0f4
.extern _ZN13LinkStateBase18func_ov00_020a8ca4Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov05_02110228
.extern func_01ff9cec
.extern func_ov00_02097bcc
asm/ov00/ov00_020a8e04.s
+19 -19
View File
@@ -2275,7 +2275,7 @@ _020aa5c0:
b _020aa778
_020aa5d4:
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
mov r0, r4
beq _020aa62c
@@ -2301,7 +2301,7 @@ _020aa62c:
b _020aa778
_020aa634:
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
beq _020aa674
ldr r0, [r4, #0x18]
@@ -2423,7 +2423,7 @@ func_ov00_020aa7b0: ; 0x020aa7b0
bl func_ov00_020af050
_020aa7d4:
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
ldr r1, [r4, #4]
cmp r1, #1
ldmneia sp!, {r4, pc}
@@ -2433,7 +2433,7 @@ _020aa7d4:
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
@@ -2718,7 +2718,7 @@ _020aac08:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020aac14:
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
movs r5, r0
beq _020aadbc
cmp r6, #0
@@ -2890,7 +2890,7 @@ _020aae90:
cmp r0, #2
bne _020aaf78
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
bne _020aaf78
add r3, sp, #0x5c
@@ -2994,7 +2994,7 @@ _020ab000:
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
bne _020ab170
mov r0, r4
@@ -3179,7 +3179,7 @@ _020ab2b0:
cmp r0, #0
bne _020ab320
mov r0, r4
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r1, [r6, #8]
mov r2, #1
str r1, [r0]
@@ -3429,7 +3429,7 @@ func_ov00_020ab614: ; 0x020ab614
sub sp, sp, #0xc
mov r5, r0
mov r4, r1
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
movs ip, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
@@ -3445,7 +3445,7 @@ func_ov00_020ab614: ; 0x020ab614
mov r1, r4
blx r2
mov r0, r5
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
@@ -3461,7 +3461,7 @@ func_ov00_020ab680: ; 0x020ab680
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r1, [r0, #4]
@@ -3484,7 +3484,7 @@ _020ab6c4: .word 0x4b4f4b4f
func_ov00_020ab6c8: ; 0x020ab6c8
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r2, [r0, #4]
@@ -3683,7 +3683,7 @@ func_ov00_020ab934: ; 0x020ab934
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
mov r0, r5
@@ -3706,7 +3706,7 @@ func_ov00_020ab97c: ; 0x020ab97c
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
mov r0, r5
@@ -3728,7 +3728,7 @@ func_ov00_020ab9b8: ; 0x020ab9b8
mov r7, r0
mov r6, r1
mov r5, r2
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
movs r4, r0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
@@ -3822,7 +3822,7 @@ _020aba70:
blx r2
_020abb30:
mov r0, r7
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
@@ -3945,7 +3945,7 @@ func_ov00_020abc78: ; 0x020abc78
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, pc}
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, r5, r6, pc}
@@ -3971,7 +3971,7 @@ _020abce0:
bl func_ov00_020c3674
mov r6, r0
mov r0, r5
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r2, [r4]
add r1, r6, #0x48
str r2, [r0]
@@ -3990,7 +3990,7 @@ _020abce0:
mov r1, #0xcb
bl func_ov00_020d7a84
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
ldr r1, [r0]
ldr r1, [r1, #0x58]
blx r1
asm/ov00/ov00_020ae7a4.s
+4 -4
View File
@@ -348,7 +348,7 @@ func_ov00_020aec10: ; 0x020aec10
stmdb sp!, {r4, r5, r6, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
bne _020aecc8
ldrsh r0, [r5, #0x12]
@@ -398,7 +398,7 @@ _020aecc8:
cmp r0, #2
bne _020aed7c
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
bne _020aed70
mov r0, r5
@@ -4949,7 +4949,7 @@ _020b270c:
mov r1, #0
strh r1, [r0, #0xa4]
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne r3, #1
mov r1, #0
@@ -5450,7 +5450,7 @@ _020b2db8:
mov r1, r0, lsl #0x10
mov r0, r4
mov r6, r1, asr #0x10
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne ip, #1
moveq ip, #0
asm/ov05.s
+23 -23
View File
@@ -6223,7 +6223,7 @@ _02105c24: .word data_ov05_0211259c
func_ov05_02105c28: ; 0x02105c28
stmdb sp!, {r4, r5, r6, lr}
mov r5, r0
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldmneia sp!, {r4, r5, r6, pc}
mov r0, r5
@@ -7028,7 +7028,7 @@ func_ov05_02106740: ; 0x02106740
movne r0, #1
strne r0, [r5]
mov r0, r6
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r4, r5, r6, r7, pc}
@@ -7595,7 +7595,7 @@ _02106ee0:
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrsh r4, [r0]
mov r0, r7
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne r2, #1
moveq r2, #0
@@ -11683,11 +11683,11 @@ func_ov05_0210a690: ; 0x0210a690
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
beq _0210a700
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
ldr r1, [r0]
ldr r1, [r1, #0x58]
blx r1
@@ -11736,7 +11736,7 @@ _0210a750:
bl _ZN13LinkStateBase15ChangeLinkStateEi
_0210a758:
mov r0, r4
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mov r2, r0
mov r0, r4
mov r1, #1
@@ -11791,11 +11791,11 @@ func_ov05_0210a7d4: ; 0x0210a7d4
add r1, r6, #0x18
bl func_01ff9bc4
mov r0, r6
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
movs r4, r0
bne _0210a830
mov r0, r6
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
@@ -11832,7 +11832,7 @@ _0210a830:
ldr r1, _0210aad8 ; =data_027e0e60
mov r0, r6
ldr r7, [r1]
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r2, [r0]
add r1, sp, #0x2c
mov r0, r7
@@ -11850,13 +11850,13 @@ _0210a830:
mov r0, r4
bl func_ov17_0215f874
mov r0, r6
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
_0210a904:
mov r0, r6
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r0, [r0]
cmp r0, #0
blt _0210aa98
@@ -11955,13 +11955,13 @@ _0210aa64:
cmp r0, #0
beq _0210aa98
mov r0, r6
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mvn r1, #0
str r1, [r0]
str r1, [r0, #4]
_0210aa98:
mov r0, r6
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r0, [r0]
cmp r0, #0
bge _0210aac0
@@ -13079,7 +13079,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4
movs r5, r0
mov r0, r4
beq _0210ba7c
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r1, [r5, #8]
str r1, [r0]
ldr r1, [r5, #0xc]
@@ -13468,7 +13468,7 @@ func_ov05_0210bf50: ; 0x0210bf50
bl _ZN13LinkStateBase14GetPlayerAngleEv
mov r6, r0
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne r0, #1
moveq r0, #0
@@ -13619,7 +13619,7 @@ _0210c19c:
bl _ZN13LinkStateBase14GetPlayerAngleEv
mov r5, r0
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne r0, #1
moveq r0, #0
@@ -13780,7 +13780,7 @@ _0210c3f8:
movge r0, #0
ldmgeia sp!, {r3, r4, r5, r6, r7, pc}
mov r0, r7
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldr r0, _0210c94c ; =data_027e0fb8
movne r2, #1
@@ -14041,7 +14041,7 @@ _0210c7a8:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0210c7cc:
mov r0, r7
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
ldr r1, [r0, #4]
ldr r0, _0210c970 ; =0x424b4559
cmp r1, r0
@@ -14098,7 +14098,7 @@ _0210c88c:
bl _ZN13LinkStateBase14GetPlayerAngleEv
mov r4, r0
mov r0, r7
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
movne r0, #1
moveq r0, #0
@@ -18582,7 +18582,7 @@ func_ov05_0211058c: ; 0x0211058c
moveq r5, #1
_02110610:
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
beq _02110634
ldr r1, _021107c8 ; =data_ov00_020e5694
@@ -19624,7 +19624,7 @@ func_ov05_021113dc: ; 0x021113dc
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
sub sp, sp, #0x58
mov r5, r0
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
mov r6, r0
bl func_ov05_0210aaf8
add r1, sp, #0x4c
@@ -19994,7 +19994,7 @@ _02111944:
bl func_ov00_020ab614
_02111960:
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
bne _02111a3c
ldr r0, _02111a6c ; =data_ov05_02112be4
@@ -20054,7 +20054,7 @@ _02111a18:
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
_02111a3c:
mov r0, r5
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
mov r2, r0
mov r0, r5
mov r1, #1
asm/ov55.s
+3 -3
View File
@@ -225,7 +225,7 @@ func_ov55_02198f90: ; 0x02198f90
cmpne r1, #5
ldmneia sp!, {r3, r4, r5, pc}
mov r0, r5
bl _ZN13LinkStateBase18func_ov00_020a8ca4Ev
bl _ZN13LinkStateBase12GetGrabActorEv
cmp r0, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _0219900c ; =data_027e0fb8
@@ -237,7 +237,7 @@ func_ov55_02198f90: ; 0x02198f90
bl func_ov55_02198e60
mov r4, r0
mov r0, r5
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r1, [r4, #8]
str r1, [r0]
ldr r1, [r4, #0xc]
@@ -339,7 +339,7 @@ _02199128:
cmp r5, #0
beq _02199178
mov r0, r4
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r1, [r5, #8]
str r1, [r0]
ldr r1, [r5, #0xc]
asm/ov58.s
+1 -1
View File
@@ -2511,7 +2511,7 @@ func_ov58_0219a47c: ; 0x0219a47c
movs r4, r0
mov r0, r5
beq _0219a59c
bl _ZN13LinkStateBase24Get_PlayerLink_UnkRef_3cEv
bl _ZN13LinkStateBase15GetGrabActorRefEv
ldr r1, [r4, #8]
str r1, [r0]
ldr r1, [r4, #0xc]
include/Player/LinkStateBase.hpp
+2 -2
View File
@@ -113,8 +113,8 @@ public:
s16* GetPlayerAngle();
void* GetPlayer_Unk18();
s32 Get_PlayerControlData_Unk32();
Actor* func_ov00_020a8ca4();
ActorRef* Get_PlayerLink_UnkRef_3c();
Actor* GetGrabActor();
ActorRef* GetGrabActorRef();
unk32 Grab();
s32 Get_PlayerLink_Unk44();
bool IsEquipBeingUsed(ItemFlag id);
src/00_Core/Player/LinkStateBase.cpp
+2 -2
View File
@@ -70,8 +70,8 @@ unk8* LinkStateBase::func_ov00_020a8c64() {}
s16* LinkStateBase::GetPlayerAngle() {}
void* LinkStateBase::GetPlayer_Unk18() {}
s32 LinkStateBase::Get_PlayerControlData_Unk32() {}
Actor* LinkStateBase::func_ov00_020a8ca4() {}
ActorRef* LinkStateBase::Get_PlayerLink_UnkRef_3c() {}
Actor* LinkStateBase::GetGrabActor() {}
ActorRef* LinkStateBase::GetGrabActorRef() {}
unk32 LinkStateBase::Grab() {}
s32 LinkStateBase::Get_PlayerLink_Unk44() {}
bool LinkStateBase::IsEquipBeingUsed(ItemFlag id) {}