mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-01 17:57:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add LinkStateGrab

Browse Source
This commit is contained in:
Aetias
2024-03-25 19:44:30 +01:00
parent c974e75926
commit 16cf2f6091
30 changed files with 2570 additions and 2418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/main.inc
+2 -2
View File
@@ -813,7 +813,7 @@
.extern func_ov00_0207b334
.extern func_ov00_020838e8
.extern func_ov05_02100ae0
.extern func_ov00_020ab6c8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN11ItemManager7AddItemEi
.extern func_ov00_02087d98
@@ -1223,4 +1223,4 @@
.extern data_ov09_0211e8c0
.extern data_ov13_0211606c
.extern data_ov13_02116094
.extern data_ov12_02134e80
.extern data_ov12_02134e80
asm/include/ov04.inc
+1 -1
View File
@@ -1535,7 +1535,7 @@
.extern data_027e0f94
.extern data_027e0fd8
.extern func_02035064
.extern data_ov00_020e5974
.extern _ZTV13LinkStateGrab
.extern func_020350ac
.extern func_020350ac
.extern _ZN9SysObjectdlEPv
asm/include/ov05.inc
+10 -10
View File
@@ -816,7 +816,7 @@
.extern data_ov00_020eec68
.extern data_027e071c
.extern func_020385b8
.extern func_ov00_020ab6c8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
.extern func_ov00_020af044
.extern func_ov00_020cfbb0
@@ -1107,7 +1107,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8994Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d6cEv
.extern func_01ff9cec
.extern func_ov00_020ab9b8
.extern _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
@@ -1156,7 +1156,7 @@
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_0202b154
.extern _ZN13LinkStateBase18func_ov00_020a81fcEv
.extern func_ov00_020aa818
.extern _ZN13LinkStateGrab18func_ov00_020aa818Ev
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_01ffa0f4
@@ -1196,7 +1196,7 @@
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020aa844
.extern _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
.extern func_0203516c
.extern data_027e0fe4
.extern data_027e0f74
@@ -1215,7 +1215,7 @@
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern func_ov00_020aa844
.extern _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
.extern data_027e0fe4
.extern data_027e0fb8
.extern data_027e0f74
@@ -1253,7 +1253,7 @@
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020af044
.extern func_020385b8
.extern func_ov00_020ab97c
.extern _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18EquipItem_vfunc_28Ev
.extern _ZN13LinkStateBase12GetPlayerPosEv
@@ -1338,7 +1338,7 @@
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020a9180
.extern func_020385b8
.extern func_ov00_020ab770
.extern _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
.extern func_01fffcd8
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_01fffcd8
@@ -1409,7 +1409,7 @@
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern func_ov00_020af044
.extern func_020385b8
.extern func_ov00_020ab8cc
.extern _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_0208583c
.extern _ZNK11ItemManager8GetFairyEi
@@ -1936,7 +1936,7 @@
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020a9180
.extern func_020385b8
.extern func_ov00_020ab770
.extern _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
.extern func_01fffcd8
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_02097738
@@ -1976,7 +1976,7 @@
.extern func_ov00_020ceacc
.extern func_020385b8
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase18func_ov00_020a8ad0Ei
asm/include/ov12.inc
+1 -1
View File
@@ -588,7 +588,7 @@
.extern data_027e0f64
.extern func_ov00_020bcdb8
.extern func_020385b8
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern func_ov00_02083664
.extern func_ov00_020bb544
.extern func_ov00_020b4460
asm/include/ov18.inc
+1 -1
View File
@@ -1102,7 +1102,7 @@
.extern func_ov14_02145f0c
.extern Approach_thunk
.extern func_020385b8
.extern func_ov00_020ab934
.extern _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
.extern func_ov14_02145f0c
.extern data_027e0fc8
.extern Approach_thunk
asm/include/ov23.inc
+2 -2
View File
@@ -429,7 +429,7 @@
.extern _ZN13LinkStateBase15GetPlayer_Unk18Ev
.extern func_ov00_020a9180
.extern func_020385b8
.extern func_ov00_020ab770
.extern _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_01ffa0f4
@@ -1146,7 +1146,7 @@
.extern func_ov00_020c3674
.extern func_ov00_020bb544
.extern func_020385b8
.extern func_ov00_020ab6c8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern func_ov00_020bc46c
.extern func_ov14_0213ec64
.extern func_ov00_02083918
asm/include/ov41.inc
+3 -3
View File
@@ -282,7 +282,7 @@
.extern func_ov00_020c3674
.extern func_ov00_020c2974
.extern func_020385b8
.extern func_ov00_020ab934
.extern _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0f74
@@ -321,7 +321,7 @@
.extern func_ov00_02097760
.extern func_ov00_020c2974
.extern func_020385b8
.extern func_ov00_020ab934
.extern _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
.extern func_ov00_020c1908
.extern func_ov00_020bd304
.extern func_ov00_020c1908
@@ -331,7 +331,7 @@
.extern func_ov00_020c28d4
.extern func_ov00_020c2974
.extern func_020385b8
.extern func_ov00_020ab934
.extern _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
.extern func_ov00_020c28d4
.extern func_ov00_020bd304
.extern func_ov00_020c1908
asm/include/ov42.inc
+1 -1
View File
@@ -19,7 +19,7 @@
.extern func_ov00_02087400
.extern _ZN11ItemManager13ForceEquipItemEi
.extern func_020385b8
.extern func_ov00_020ab6c8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern func_ov00_020bcf50
.extern func_ov00_020c1500
.extern func_ov00_020c3348
asm/include/ov55.inc
+2 -2
View File
@@ -29,12 +29,12 @@
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
.extern func_020385b8
.extern func_ov00_020ab8cc
.extern _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
.extern func_ov00_020b049c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
.extern func_020385b8
.extern func_ov00_020ab908
.extern _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov00_020af298
.extern _ZN13LinkStateBase15ChangeLinkStateEi
asm/include/ov58.inc
+1 -1
View File
@@ -152,7 +152,7 @@
.extern func_ov14_0213ed94
.extern func_ov00_02083c7c
.extern func_020385b8
.extern func_ov00_020ab8cc
.extern _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase14GetPlayerAngleEv
asm/main.s
+1 -1
View File
@@ -76899,7 +76899,7 @@ _02038374:
ldmia sp!, {r3, r4, r5, pc}
_020383ac:
bl func_020385b8
bl func_ov00_020ab6c8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
asm/ov00/Player/LinkStateDamage.s
+1 -1
View File
@@ -581,7 +581,7 @@ _020ac64c:
bl func_ov00_020d716c
bl func_020385b8
mov r1, #0
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
_020ac698:
mov r1, #0xf
ldr r0, _020ac7e0 ; =data_027e0db0
asm/ov00/Player/LinkStateGrab.s
+2228
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Player/include/LinkStateDamage.inc
+1 -1
View File
@@ -84,7 +84,7 @@
.extern func_ov00_020a914c
.extern func_ov00_020d716c
.extern func_020385b8
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern func_ov00_02097ff4
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase25GetCurrentCharacterHealthEv
asm/ov00/Player/include/LinkStateGrab.inc
+198
View File
@@ -0,0 +1,198 @@
#pragma once
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase26PlayerControlData_vfunc_14Ei
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18GetDebugHierarchy0Ev
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
.extern _ZN13LinkStateBase18EquipItem_vfunc_28Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020af044
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7b20
.extern func_01ffa0f4
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a89bcEii
.extern _ZN13LinkStateBase18func_ov00_020a8994Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_01ffa0f4
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020af044
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_020350b4
.extern func_020351b8
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern func_ov00_020af044
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern data_027e0fb8
.extern data_ov00_020eec9c
.extern data_027e0fe4
.extern _ZN13LinkStateBase12OnStateLeaveEi
.extern func_ov00_020af050
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern data_027e0fb8
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern func_ov00_020ba458
.extern gItemManager
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_ov00_020c2a0c
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern data_02050f54
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_ov00_020b05e8
.extern func_ov00_020b049c
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern func_ov00_020b0ad0
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern func_ov00_020afe88
.extern func_ov00_020af050
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_01ff9e64
.extern func_01ffbe78
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_ov00_020c2a0c
.extern func_01ff9cec
.extern func_ov00_020af044
.extern func_ov00_020a7b8c
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern func_ov23_02171410
.extern func_01ff9cec
.extern func_01ffa0f4
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a81b8Eii
.extern _ZN13LinkStateBase18func_ov00_020a81b8Eii
.extern _ZN13LinkStateBase18func_ov00_020a81b8Eii
.extern _ZN13LinkStateBase18func_ov00_020a81b8Eii
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a81b8Eii
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_01ff9cec
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_ov00_020af044
.extern func_01ff9cec
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_0202bbbc
.extern func_0202bba8
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_01ff9cec
.extern func_ov05_0211139c
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern func_ov05_021113b4
.extern func_ov00_020c1908
.extern _ZN13LinkStateBase18EquipItem_vfunc_28Ev
.extern func_ov00_020af050
.extern gItemManager
.extern data_027e0d0c
.extern data_02050f54
.extern data_027e0fb8
.extern data_027e0fe4
.extern data_027e0e60
.extern func_01fffcd8
.extern _ZN13LinkStateBase8vfunc_24Ei
.extern _ZN13LinkStateBase8vfunc_24Ei
.extern _ZN13LinkStateBase8vfunc_24Ei
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d50Ev
.extern Divide
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern data_02050f54
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern data_027e0d0c
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern func_ov00_020c3180
.extern func_ov00_020aeffc
.extern data_027e0fb8
.extern func_ov00_020a7b8c
.extern func_ov00_020c2a0c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_0202bbbc
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_0202da8c
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
.extern func_ov17_0215dff0
.extern func_ov17_0215e338
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7a84
.extern data_02050f54
.extern data_ov00_020eec9c
.extern _ZN13LinkStateBase18ChangeLinkSubStateEii
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase10GetStateIdEv
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7a84
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase18ChangeLinkSubStateEii
.extern data_027e0fb8
.extern data_027e0fe4
.extern data_ov00_020eec9c
.extern func_ov04_0210ab88
.extern func_ov04_0210ab9c
.extern func_ov05_0210a648
.extern _ZN13LinkStateBase8vfunc_28Ev
.extern func_ov05_0210b3bc
.extern func_ov05_0210f708
.extern func_ov05_0210f70c
.extern func_ov05_0210f714
.extern func_ov05_0210f71c
asm/ov00/include/ov00_020ae7a4.inc
+18 -18
View File
@@ -330,7 +330,7 @@
.extern func_ov00_020b542c
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
.extern func_020385b8
.extern func_ov00_020ab680
.extern _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
.extern func_ov00_020d70a4
.extern func_0202ab78
@@ -362,11 +362,11 @@
.extern func_ov00_020838e8
.extern func_ov12_021343bc
.extern func_020385b8
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern func_ov05_02100ae0
.extern func_ov00_020a5e9c
.extern func_020385b8
.extern func_ov00_020ab680
.extern _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
.extern func_ov05_02100ae0
.extern func_ov05_021099dc
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -922,7 +922,7 @@
.extern func_ov00_02083ee0
.extern func_0202b2f8
.extern func_020385b8
.extern func_ov00_020abb78
.extern _ZN13LinkStateGrab4GrabEP8ActorRef
.extern data_027e0fc8
.extern data_027e0f74
.extern data_027e0c68
@@ -1046,7 +1046,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern func_020385b8
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern func_ov00_020af050
.extern data_027e0fcc
.extern data_027e0f94
@@ -1059,16 +1059,16 @@
.extern func_02002c14
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern func_020385b8
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern func_ov00_020af050
.extern data_027e0f74
.extern data_027e0fa0
.extern data_027e0fb8
.extern func_ov00_020ab3e8
.extern _ZN13LinkStateGrab13GetLinkState4Ev
.extern func_ov05_02107b74
.extern data_027e0fa0
.extern data_027e0fac
.extern func_ov00_020ab3e8
.extern _ZN13LinkStateGrab13GetLinkState4Ev
.extern func_01ffa0f4
.extern data_027e0fa0
.extern data_027e0fac
@@ -1102,9 +1102,9 @@
.extern data_027e0fd0
.extern data_027e0fe4
.extern func_020385b8
.extern func_ov00_020abc78
.extern _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
.extern func_020385b8
.extern func_ov00_020aa338
.extern _ZN13LinkStateGrab20CreateDebugHierarchyEv
.extern data_027e0fdc
.extern func_01ff9bc4
.extern func_020385b8
@@ -1162,7 +1162,7 @@
.extern data_027e0fd4
.extern data_027e0fac
.extern func_020385b8
.extern func_ov00_020ab6c8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern func_ov00_020a914c
.extern func_ov05_021096bc
.extern func_ov00_020a914c
@@ -1184,7 +1184,7 @@
.extern data_ov00_020e6298
.extern data_ov00_020e6288
.extern func_020385b8
.extern func_ov00_020ab6c8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern func_ov00_020a914c
.extern func_ov00_020b2f70
.extern data_ov00_020e62a8
@@ -1210,12 +1210,12 @@
.extern data_027e0fcc
.extern data_027e0f94
.extern func_ov05_02103f4c
.extern func_ov00_020ab3e8
.extern _ZN13LinkStateGrab13GetLinkState4Ev
.extern func_ov05_02107e80
.extern func_ov00_020cfb84
.extern func_ov00_020ab3e8
.extern _ZN13LinkStateGrab13GetLinkState4Ev
.extern func_020385b8
.extern func_ov00_020ab614
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern data_027e103c
.extern data_027e0fa0
.extern data_027e0f94
@@ -2732,7 +2732,7 @@
.extern func_020376c0
.extern func_020385d0
.extern func_020385b8
.extern func_ov00_020abc18
.extern _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
.extern func_02036da8
.extern func_02037258
.extern data_027e0f64
@@ -2747,7 +2747,7 @@
.extern func_ov00_020c3674
.extern func_ov00_020c3674
.extern func_020385b8
.extern func_ov00_020abbdc
.extern _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
.extern func_ov00_020bc320
.extern func_ov00_020bc398
.extern func_ov00_020c3674
@@ -2782,7 +2782,7 @@
.extern func_ov00_020c3674
.extern func_ov00_020c3674
.extern func_020385b8
.extern func_ov00_020abba0
.extern _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
.extern func_ov00_02087ef0
.extern func_ov00_02087338
.extern data_027e0fe4
asm/ov00/ov00_020a8e04.s
-2332
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020ae7a4.s
+18 -18
View File
@@ -4645,7 +4645,7 @@ _020b2338:
bl _ZN13LinkStateBase18func_ov00_020a82acEv
bl func_020385b8
mov r1, #0
bl func_ov00_020ab680
bl _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
ldr r0, [r4, #0x64]
cmp r0, #0xf
addls pc, pc, r0, lsl #2
@@ -4898,7 +4898,7 @@ _020b2658:
_020b2664:
bl func_020385b8
mov r1, #0
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
ldr r0, _020b2b94 ; =data_027e0d38
add r1, sp, #0
ldr r0, [r0]
@@ -4912,7 +4912,7 @@ _020b2688:
beq _020b26a4
bl func_020385b8
mov r1, #0
bl func_ov00_020ab680
bl _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
_020b26a4:
ldr r0, _020b2b94 ; =data_027e0d38
add r1, sp, #0
@@ -15210,7 +15210,7 @@ _020bac10:
bl func_ov00_020c1908
bl func_020385b8
add r1, r6, #8
bl func_ov00_020abb78
bl _ZN13LinkStateGrab4GrabEP8ActorRef
mov r0, r6
strb r5, [r6, #0x278]
ldr r2, [r0]
@@ -17018,7 +17018,7 @@ _020bc028:
bne _020bc060
bl func_020385b8
add r1, sp, #0
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
_020bc060:
ldr r0, _020bc084 ; =data_027e0fb8
ldr r0, [r0]
@@ -17118,7 +17118,7 @@ _020bc114:
bl func_ov00_020bb544
bl func_020385b8
add r1, sp, #0xc
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
ldr r0, _020bc1c4 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
@@ -17139,7 +17139,7 @@ func_ov00_020bc1c8: ; 0x020bc1c8
mov r6, r1
mov r5, r2
mov r4, r3
bl func_ov00_020ab3e8
bl _ZN13LinkStateGrab13GetLinkState4Ev
mov r1, r6
mov r2, r5
mov r3, r4
@@ -17160,7 +17160,7 @@ _020bc20c: .word data_027e0fac
arm_func_start func_ov00_020bc210
func_ov00_020bc210: ; 0x020bc210
stmdb sp!, {r3, lr}
bl func_ov00_020ab3e8
bl _ZN13LinkStateGrab13GetLinkState4Ev
mov r1, #1
strb r1, [r0, #0x28]
mov r0, r1
@@ -17638,7 +17638,7 @@ func_ov00_020bc7e0: ; 0x020bc7e0
mov r4, r1
bl func_020385b8
mov r1, r4
bl func_ov00_020abc78
bl _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
ldmia sp!, {r4, pc}
arm_func_end func_ov00_020bc7e0
@@ -17647,7 +17647,7 @@ func_ov00_020bc7e0: ; 0x020bc7e0
func_ov00_020bc7f8: ; 0x020bc7f8
stmdb sp!, {r3, lr}
bl func_020385b8
bl func_ov00_020aa338
bl _ZN13LinkStateGrab20CreateDebugHierarchyEv
ldmia sp!, {r3, pc}
arm_func_end func_ov00_020bc7f8
@@ -18194,7 +18194,7 @@ func_ov00_020bce48: ; 0x020bce48
cmp r1, r0
beq _020bce9c
bl func_020385b8
bl func_ov00_020ab6c8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
_020bce9c:
bl func_ov00_020a914c
mov r1, r4
@@ -18341,7 +18341,7 @@ func_ov00_020bd030: ; 0x020bd030
mov r5, r0
mov r4, r1
bl func_020385b8
bl func_ov00_020ab6c8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl func_ov00_020a914c
mov r2, r4
ldr r1, _020bd06c ; =data_ov00_020e62a8
@@ -18657,7 +18657,7 @@ _020bd408:
mov r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
strb r0, [sp, #4]
bl func_ov00_020ab3e8
bl _ZN13LinkStateGrab13GetLinkState4Ev
add ip, sp, #4
mov r1, r6
mov r2, r5
@@ -18684,7 +18684,7 @@ _020bd484:
ldrb r0, [sp, #4]
cmp r0, #0
beq _020bd4b8
bl func_ov00_020ab3e8
bl _ZN13LinkStateGrab13GetLinkState4Ev
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x20]
@@ -18697,7 +18697,7 @@ _020bd484:
_020bd4b8:
bl func_020385b8
ldr r1, _020bd4d4 ; =data_027e0fa0
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
mov r0, #1
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -45392,7 +45392,7 @@ _020d1f74:
beq _020d1ff8
bl func_020385b8
mov r1, r7
bl func_ov00_020abc18
bl _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
b _020d1ff8
_020d1fd8:
ldrb r4, [r8, #1]
@@ -45699,7 +45699,7 @@ _020d2400:
bl func_020385b8
add r1, r7, #0x20
add r1, r1, r4, lsl #3
bl func_ov00_020abbdc
bl _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
add sp, sp, #8
mov r0, #2
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -46080,7 +46080,7 @@ _020d2934:
blt _020d2904
bl func_020385b8
mov r1, r6
bl func_ov00_020abba0
bl _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
ldrb r0, [r8, #0x54]
cmp r0, #0
beq _020d29c0
asm/ov04.s
+2 -2
View File
@@ -20593,7 +20593,7 @@ func_ov04_0210ab44: ; 0x0210ab44
push {r4, lr}
add r4, r0, #0
bl func_ov04_0210add4
ldr r0, _0210ab84 ; =data_ov00_020e5974
ldr r0, _0210ab84 ; =_ZTV13LinkStateGrab
str r0, [r4]
mov r0, #0
str r0, [r4, #0xc]
@@ -20622,7 +20622,7 @@ func_ov04_0210ab44: ; 0x0210ab44
pop {r4, pc}
.align 2, 0
thumb_func_end func_ov04_0210ab44
_0210ab84: .word data_ov00_020e5974
_0210ab84: .word _ZTV13LinkStateGrab
.global func_ov04_0210ab88
thumb_func_start func_ov04_0210ab88
asm/ov05.s
+10 -10
View File
@@ -9567,7 +9567,7 @@ func_ov05_021089f4: ; 0x021089f4
sub sp, sp, #0xc
mov r4, r0
bl func_020385b8
bl func_ov00_020ab6c8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a82acEv
ldr r0, _02108ce0 ; =data_027e0fb8
@@ -11770,7 +11770,7 @@ _0210a798:
moveq r2, #1
movne r2, #0
mov r0, r4
bl func_ov00_020ab9b8
bl _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
ldmia sp!, {r4, pc}
arm_func_end func_ov05_0210a774
@@ -12134,7 +12134,7 @@ _0210ac7c:
add r1, sp, #0x18
bl _ZN13LinkStateBase18func_ov00_020a81fcEv
mov r0, r6
bl func_ov00_020aa818
bl _ZN13LinkStateGrab18func_ov00_020aa818Ev
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, pc}
_0210ad00:
@@ -12503,7 +12503,7 @@ _0210b244:
_0210b264:
mov r0, r5
mov r1, r4
bl func_ov00_020aa844
bl _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
add r0, r5, #0x24
bl func_0203516c
add sp, sp, #0x100
@@ -12594,7 +12594,7 @@ _0210b394:
_0210b3a0:
mov r0, r5
mov r1, r4
bl func_ov00_020aa844
bl _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_0210b2a4
@@ -12901,7 +12901,7 @@ _0210b7b0:
bl func_ov00_020af044
bl func_020385b8
add r1, r5, #0x24
bl func_ov00_020ab97c
bl _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
mov r0, r5
mov r1, #2
bl _ZN13LinkStateBase15ChangeLinkStateEi
@@ -13486,7 +13486,7 @@ func_ov05_0210bf50: ; 0x0210bf50
mov r5, r0
bl func_020385b8
add r1, sp, #8
bl func_ov00_020ab770
bl _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
cmp r0, #0
cmpeq r5, #0
movne r5, #1
@@ -14035,7 +14035,7 @@ _0210c7a8:
bl func_ov00_020af044
bl func_020385b8
add r1, r5, #0x18
bl func_ov00_020ab8cc
bl _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -19632,7 +19632,7 @@ func_ov05_021113dc: ; 0x021113dc
mov r7, r0
bl func_020385b8
add r1, sp, #0x4c
bl func_ov00_020ab770
bl _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
movs r8, r0
cmpeq r7, #0
moveq sb, #0
@@ -19991,7 +19991,7 @@ _02111944:
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, r0
mov r0, r6
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
_02111960:
mov r0, r5
bl _ZN13LinkStateBase12GetGrabActorEv
asm/ov12.s
+1 -1
View File
@@ -9472,7 +9472,7 @@ func_ov12_0211a7d0: ; 0x0211a7d0
bl func_ov00_020bcdb8
bl func_020385b8
mov r1, #0
bl func_ov00_020ab614
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl func_ov12_0211a964
mov r2, #0
strh r2, [r0, #0x12]
asm/ov18.s
+1 -1
View File
@@ -12822,7 +12822,7 @@ func_ov18_02165948: ; 0x02165948
beq _02165980
bl func_020385b8
add r1, r4, #0x48
bl func_ov00_020ab934
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
_02165980:
add r0, r4, #0x1d8
mov r1, #2
asm/ov23.s
+2 -2
View File
@@ -5178,7 +5178,7 @@ _021719b0:
mov r5, r0
bl func_020385b8
add r1, sp, #0x28
bl func_ov00_020ab770
bl _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
cmp r0, #0
cmpeq r5, #0
movne r8, #1
@@ -13024,7 +13024,7 @@ func_ov23_02178174: ; 0x02178174
mov r1, #0
bl func_ov00_020bb544
bl func_020385b8
bl func_ov00_020ab6c8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
mov r0, r5
bl func_ov00_020bc46c
str r0, [sp]
asm/ov41.s
+3 -3
View File
@@ -3579,7 +3579,7 @@ func_ov41_0218c204: ; 0x0218c204
str r0, [sp, #8]
bl func_020385b8
add r1, sp, #0
bl func_ov00_020ab934
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
mov r0, #1
strb r0, [r4, #0x52b]
add sp, sp, #0x18
@@ -4074,7 +4074,7 @@ func_ov41_0218c834: ; 0x0218c834
str r0, [sp, #0x14]
bl func_020385b8
add r1, sp, #0xc
bl func_ov00_020ab934
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
b _0218cbd0
_0218c9c4:
cmp r4, #0
@@ -4180,7 +4180,7 @@ _0218ca80:
str r0, [sp, #8]
bl func_020385b8
add r1, sp, #0
bl func_ov00_020ab934
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
b _0218cbd0
_0218cb5c:
cmp r4, #0
asm/ov42.s
+1 -1
View File
@@ -347,7 +347,7 @@ _02189918:
mov r0, #0
strb r0, [r7, #0x64]
bl func_020385b8
bl func_ov00_020ab6c8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
mov r0, r4
add r1, sp, #0x3c
mov r2, #0x800
asm/ov55.s
+2 -2
View File
@@ -313,7 +313,7 @@ _0219907c:
bl func_01ff9bc4
bl func_020385b8
add r1, r4, #0x38
bl func_ov00_020ab8cc
bl _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
b _02199128
_021990dc:
ldr r0, _021991a4 ; =data_027e0fb8
@@ -334,7 +334,7 @@ _021990dc:
bl func_01ff9bc4
bl func_020385b8
add r1, r4, #0x38
bl func_ov00_020ab908
bl _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
_02199128:
cmp r5, #0
beq _02199178
asm/ov58.s
+1 -1
View File
@@ -2541,7 +2541,7 @@ func_ov58_0219a47c: ; 0x0219a47c
bl func_ov00_02083c7c
bl func_020385b8
add r1, sp, #4
bl func_ov00_020ab8cc
bl _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
mov r0, r5
add r1, sp, #4
bl _ZN13LinkStateBase6LookAtEP5Vec3p
include/Player/LinkStateGrab.hpp
+22
View File
@@ -6,6 +6,7 @@
#include "lib/math.h"
#include "Player/LinkStateBase.hpp"
#include "Player/LinkState4.hpp"
#include "Actor/ActorManager.hpp"
#include "Actor/Actor.hpp"
@@ -32,4 +33,25 @@ public:
/* 2c */ virtual void vfunc_2c(u16 *param1) override;
/* 34 */ virtual bool vfunc_34(Vec3p *param1) override;
/* 44 */
s32 GetGrabActorId();
bool func_ov00_020aa818();
void func_ov00_020aa844(Actor *param1);
LinkState4* GetLinkState4();
void SetGrabActorVelocity(Vec3p *velocity);
void SetBombVelocity(Vec3p *velocity);
void func_ov00_020ab6c8();
unk32 func_ov00_020ab770(Vec3p *param1);
unk32 func_ov00_020ab7bc(Vec3p *param1, Actor *actor);
void SetNormalizedThrowOffset(Vec3p *target);
void SetThrowOffset(Vec3p *target);
void func_ov00_020ab934(Vec3p *target);
void func_ov00_020ab97c(Vec3p *target);
void func_ov00_020ab9b8(u32 param1, bool param2);
void Grab(ActorRef *ref);
void func_ov00_020abba0(ActorRef *ref);
void func_ov00_020abbdc(ActorRef *ref); // duplicate of func_ov00_020abba0
void func_ov00_020abc18(ActorRef *ref);
bool func_ov00_020abc40();
bool func_ov00_020abc78(ActorRef *ref);
};
src/00_Core/Player/LinkStateGrab.cpp
+34
View File
@@ -0,0 +1,34 @@
#include "Player/LinkStateGrab.hpp"
#ifdef STUBS
void LinkStateGrab::vfunc_00() {}
LinkStateId LinkStateGrab::GetId() {}
void LinkStateGrab::CreateDebugHierarchy() {}
s32 LinkStateGrab::GetGrabActorId() {}
void LinkStateGrab::OnStateEnter() {}
void LinkStateGrab::OnStateLeave(s32 param1) {}
bool LinkStateGrab::func_ov00_020aa818() {}
void LinkStateGrab::func_ov00_020aa844(Actor *param1) {}
bool LinkStateGrab::vfunc_20(s32 param1) {}
LinkState4* LinkStateGrab::GetLinkState4() {}
bool LinkStateGrab::vfunc_24(s32 param1) {}
bool LinkStateGrab::vfunc_34(Vec3p *param1) {}
void LinkStateGrab::SetGrabActorVelocity(Vec3p *velocity) {}
void LinkStateGrab::SetBombVelocity(Vec3p *velocity) {}
void LinkStateGrab::func_ov00_020ab6c8() {}
unk32 LinkStateGrab::func_ov00_020ab770(Vec3p *param1) {}
unk32 LinkStateGrab::func_ov00_020ab7bc(Vec3p *param1, Actor *actor) {}
void LinkStateGrab::SetNormalizedThrowOffset(Vec3p *target) {}
void LinkStateGrab::SetThrowOffset(Vec3p *target) {}
void LinkStateGrab::func_ov00_020ab934(Vec3p *target) {}
void LinkStateGrab::func_ov00_020ab97c(Vec3p *target) {}
void LinkStateGrab::func_ov00_020ab9b8(u32 param1, bool param2) {}
void LinkStateGrab::Grab(ActorRef *ref) {}
void LinkStateGrab::func_ov00_020abba0(ActorRef *ref) {}
void LinkStateGrab::func_ov00_020abbdc(ActorRef *ref) {}
void LinkStateGrab::func_ov00_020abc18(ActorRef *ref) {}
bool LinkStateGrab::func_ov00_020abc40() {}
bool LinkStateGrab::func_ov00_020abc78(ActorRef *ref) {}
#endif
tools/lcf.py
+2
View File
@@ -29,6 +29,8 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
'asm/ov00/ov00_0207af9c.s',
'asm/ov00/Player/LinkStateBase.s',
'asm/ov00/ov00_020a8e04.s',
'src/00_Core/Player/LinkStateGrab.cpp',
'asm/ov00/Player/LinkStateGrab.s',
'src/00_Core/Player/LinkStateItem.cpp',
'asm/ov00/Player/LinkStateItem.s',
'src/00_Core/Player/LinkStateDamage.cpp',