diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 93f479d8..7a105cea 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -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 diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index ece7c3a0..a0b19400 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -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 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index c7ae3ac2..c25e4a8d 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -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 diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 31eedf8e..8448a3b7 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -79,6 +79,7 @@ public: void func_ov00_020bc854(Vec3p *param1); bool func_ov00_020bd304(); bool GongoronCollidesWith(Cylinder *hitbox); + s32 GetGrabActorId(); }; extern PlayerLinkBase *gPlayerLink;