Mangle `EquipRope::func_ov14_0213defc`

8 files changed, 13 insertions, 12 deletions

diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc
index 99f68fcc..7735c924 100644
--- a/asm/ov00/Actor/Actor.inc
+++ b/asm/ov00/Actor/Actor.inc
@@ -71,6 +71,6 @@
 .extern func_ov14_0213d91c
 .extern func_ov14_0213dadc
 .extern func_ov14_0213ddd4
-.extern func_ov14_0213defc
+.extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
 .extern gAdventureFlags
 .extern gItemManager
diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s
index 369a7b7d..9da8c0bc 100644
--- a/asm/ov00/Actor/Actor.s
+++ b/asm/ov00/Actor/Actor.s
@@ -2160,7 +2160,7 @@ _ZN5Actor18func_ov00_020c2ebcEv: ; 0x020c2ebc
 	mov r4, r0
 	bl _ZN10EquipSword12GetEquipRopeEv
 	mov r1, r4
-	bl func_ov14_0213defc
+	bl _ZN9EquipRope18func_ov14_0213defcEP5Actor
 	ldmia sp!, {r4, pc}
 	arm_func_end _ZN5Actor18func_ov00_020c2ebcEv
 
diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s
index 6b26a729..2877a814 100644
--- a/asm/ov14/ov14_0213b778.s
+++ b/asm/ov14/ov14_0213b778.s
@@ -3400,9 +3400,9 @@ _0213def0:
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	arm_func_end func_ov14_0213ddd4
 
-	.global func_ov14_0213defc
-	arm_func_start func_ov14_0213defc
-func_ov14_0213defc: ; 0x0213defc
+	.global _ZN9EquipRope18func_ov14_0213defcEP5Actor
+	arm_func_start _ZN9EquipRope18func_ov14_0213defcEP5Actor
+_ZN9EquipRope18func_ov14_0213defcEP5Actor: ; 0x0213defc
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r2, #0
 	mov r3, r2
@@ -3455,7 +3455,7 @@ _0213df8c:
 _0213dfb4:
 	mov r0, r2
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end func_ov14_0213defc
+	arm_func_end _ZN9EquipRope18func_ov14_0213defcEP5Actor
 
 	.global func_ov14_0213dfbc
 	arm_func_start func_ov14_0213dfbc
diff --git a/asm/ov34.inc b/asm/ov34.inc
index 08ac9fb4..200a4aa2 100644
--- a/asm/ov34.inc
+++ b/asm/ov34.inc
@@ -240,7 +240,7 @@
 .extern func_ov14_0213dadc
 .extern func_ov14_0213dba4
 .extern func_ov14_0213ddd4
-.extern func_ov14_0213defc
+.extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
 .extern func_ov14_0213dfbc
 .extern func_ov14_0213e144
 .extern func_ov17_02168660
diff --git a/asm/ov34.s b/asm/ov34.s
index c7280945..70bbc3ef 100644
--- a/asm/ov34.s
+++ b/asm/ov34.s
@@ -4708,7 +4708,7 @@ _0217ffc8:
 	blt _02180038
 	mov r0, r4
 	mov r1, r5
-	bl func_ov14_0213defc
+	bl _ZN9EquipRope18func_ov14_0213defcEP5Actor
 _02180038:
 	mov r0, r5
 	mov r1, #0xa
diff --git a/asm/ov38.inc b/asm/ov38.inc
index 226c9d0c..4f2ccba4 100644
--- a/asm/ov38.inc
+++ b/asm/ov38.inc
@@ -238,7 +238,7 @@
 .extern func_ov14_0213d91c
 .extern func_ov14_0213dadc
 .extern func_ov14_0213ddd4
-.extern func_ov14_0213defc
+.extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
 .extern func_ov29_0216d74c
 .extern func_ov29_0216d77c
 .extern func_ov29_0216d86c
diff --git a/asm/ov38.s b/asm/ov38.s
index 208d8799..b8aae8dd 100644
--- a/asm/ov38.s
+++ b/asm/ov38.s
@@ -4370,7 +4370,7 @@ _0217fa8c:
 	blt _0217fae8
 	mov r0, r5
 	mov r1, r4
-	bl func_ov14_0213defc
+	bl _ZN9EquipRope18func_ov14_0213defcEP5Actor
 _0217fae8:
 	add r0, r4, #0x2c8
 	mov r1, #2
diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp
index 151c06c3..6a75a15e 100644
--- a/include/Player/EquipRope.hpp
+++ b/include/Player/EquipRope.hpp
@@ -7,7 +7,7 @@
 #include "Player/EquipItem.hpp"

 

 class EquipRope : public EquipItem {

-private:

+public:

     /* 00 (base) */

     /* 09 */ unk8 mUnk_09;

     /* 0a */ unk16 mUnk_0a;

@@ -23,7 +23,6 @@ private:
     /* a0 */ unk32 mUnk_a0;

     /* a4 */

 

-public:

     EquipRope();

 

     /* 04 */ virtual ~EquipRope() override;

@@ -41,4 +40,6 @@ public:
 

     Actor* func_ov14_0213d420();

     s32 func_ov14_0213d480(s32 actorId);

+    s32 func_ov14_0213ddd4(Actor *actor);

+    bool func_ov14_0213defc(Actor *actor);

 };