From e0285dbb76da5d9c02b173d5b6b612dbe71e563e Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Thu, 23 May 2024 19:02:40 +0200
Subject: [PATCH] Rename `PlayerLinkBase::GongoronCollidesWith`

---
 asm/ov00/Actor/Actor.inc          | 2 +-
 asm/ov00/Actor/Actor.s            | 2 +-
 asm/ov00/ov00_020b1498.s          | 8 ++++----
 include/Player/PlayerLinkBase.hpp | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc
index 08f37c61..b54aae66 100644
--- a/asm/ov00/Actor/Actor.inc
+++ b/asm/ov00/Actor/Actor.inc
@@ -56,7 +56,7 @@
 .extern func_ov00_020bc46c
 .extern func_ov00_020bc7f8
 .extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
-.extern func_ov00_020bcc2c
+.extern _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
 .extern func_ov00_020bd304
 .extern func_ov00_020bff70
 .extern func_ov00_020c1500
diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s
index 29e01d44..b10a2602 100644
--- a/asm/ov00/Actor/Actor.s
+++ b/asm/ov00/Actor/Actor.s
@@ -1246,7 +1246,7 @@ _020c2358:
 	cmpne r0, #0
 	beq _020c2384
 	add r1, sp, #0
-	bl func_ov00_020bcc2c
+	bl _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
 	cmp r0, #0
 	addne sp, sp, #0x10
 	movne r0, #1
diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s
index f1af26fe..4b881dc2 100644
--- a/asm/ov00/ov00_020b1498.s
+++ b/asm/ov00/ov00_020b1498.s
@@ -14577,9 +14577,9 @@ func_ov00_020bcc24: ; 0x020bcc24
 _020bcc28: .word func_ov00_020bcdb8
 	thumb_func_end func_ov00_020bcc24
 
-	.global func_ov00_020bcc2c
-	arm_func_start func_ov00_020bcc2c
-func_ov00_020bcc2c: ; 0x020bcc2c
+	.global _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
+	arm_func_start _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
+_ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder: ; 0x020bcc2c
 	stmdb sp!, {r3, lr}
 	ldr r2, _020bcc68 ; =data_027e0fd8
 	ldr r2, [r2]
@@ -14599,7 +14599,7 @@ _020bcc60:
 	.align 2, 0
 _020bcc68: .word data_027e0fd8
 _020bcc6c: .word data_027e0fd4
-	arm_func_end func_ov00_020bcc2c
+	arm_func_end _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
 
 	.global func_ov00_020bcc70
 	arm_func_start func_ov00_020bcc70
diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp
index da67afb3..31eedf8e 100644
--- a/include/Player/PlayerLinkBase.hpp
+++ b/include/Player/PlayerLinkBase.hpp
@@ -69,7 +69,7 @@ public:
     /* 6c */ virtual void vfunc_6c();
     /* 70 */ virtual void vfunc_70(s32 param1, Vec3p *param2, unk32 param3);
     /* 74 */ virtual void vfunc_74();
-    /* 78 */ virtual bool vfunc_78();
+    /* 78 */ virtual unk32 vfunc_78();
     /* 7c */ virtual void vfunc_7c();
     /* 80 */ virtual void SetUnk_5e();
     /* 84 */ virtual void ResetUnk_5e();
@@ -78,6 +78,7 @@ public:
     bool func_ov00_020bbd80(s32 param1);
     void func_ov00_020bc854(Vec3p *param1);
     bool func_ov00_020bd304();
+    bool GongoronCollidesWith(Cylinder *hitbox);
 };
 
 extern PlayerLinkBase *gPlayerLink;