mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-28 18:40:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle PlayerLinkBase::GetGrabActorId

Browse Source
This commit is contained in:
Aetias
2024-05-23 23:03:19 +02:00
parent 5746ed7925
commit 4ca86b9fdd
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -54,7 +54,7 @@
.extern func_ov00_0207b89c
.extern func_ov00_02087ef0
.extern func_ov00_020bc46c
.extern func_ov00_020bc7f8
.extern _ZN14PlayerLinkBase14GetGrabActorIdEv
.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.extern _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
.extern func_ov00_020bd304
asm/ov00/Actor/Actor.s
+1 -1
View File
@@ -1644,7 +1644,7 @@ _ZN5Actor9IsGrabbedEv: ; 0x020c2864
ldr r1, _020c2888 ; =gPlayerLink
ldr r4, [r0, #8]
ldr r0, [r1]
bl func_ov00_020bc7f8
bl _ZN14PlayerLinkBase14GetGrabActorIdEv
cmp r4, r0
moveq r0, #1
movne r0, #0
asm/ov00/ov00_020b1498.s
+4 -4
View File
@@ -14223,14 +14223,14 @@ func_ov00_020bc7e0: ; 0x020bc7e0
ldmia sp!, {r4, pc}
arm_func_end func_ov00_020bc7e0
.global func_ov00_020bc7f8
arm_func_start func_ov00_020bc7f8
func_ov00_020bc7f8: ; 0x020bc7f8
.global _ZN14PlayerLinkBase14GetGrabActorIdEv
arm_func_start _ZN14PlayerLinkBase14GetGrabActorIdEv
_ZN14PlayerLinkBase14GetGrabActorIdEv: ; 0x020bc7f8
stmdb sp!, {r3, lr}
bl func_020385b8
bl _ZN17LinkStateInteract20CreateDebugHierarchyEv
ldmia sp!, {r3, pc}
arm_func_end func_ov00_020bc7f8
arm_func_end _ZN14PlayerLinkBase14GetGrabActorIdEv
.global func_ov00_020bc808
arm_func_start func_ov00_020bc808
include/Player/PlayerLinkBase.hpp
+1
View File
@@ -79,6 +79,7 @@ public:
void func_ov00_020bc854(Vec3p *param1);
bool func_ov00_020bd304();
bool GongoronCollidesWith(Cylinder *hitbox);
s32 GetGrabActorId();
};
extern PlayerLinkBase *gPlayerLink;