Mangle ActorManager

asm/ov00/Player/LinkStateBase.inc

@@ -60,7 +60,7 @@
 .extern func_ov00_020c0e24
 .extern func_ov00_020c1500
 .extern func_ov00_020c3348
-.extern func_ov00_020c3674
+.extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern func_ov00_020c4048
 .extern func_ov04_0210ade4
 .extern func_ov04_0210ade8

asm/ov00/Player/LinkStateBase.s

@@ -468,7 +468,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
 	ldr r0, _020a84b8 ; =data_027e0fe4
 	mov r1, r4
 	ldr r0, [r0]
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	movs r4, r0
 	beq _020a84a8
 	mov r0, r7
@@ -1247,13 +1247,13 @@ _ZN13LinkStateBase12GetGrabActorEv: ; 0x020a8ca4
 	ldr r1, _020a8cbc ; =data_027e0fe4
 	ldr r2, [r0, #8]
 	ldr r0, [r1]
-	ldr ip, _020a8cc0 ; =func_ov00_020c3674
+	ldr ip, _020a8cc0 ; =_ZN12ActorManager8GetActorEP8ActorRef
 	add r1, r2, #0x3c
 	bx ip
 	.align 2, 0
 	arm_func_end _ZN13LinkStateBase12GetGrabActorEv
 _020a8cbc: .word data_027e0fe4
-_020a8cc0: .word func_ov00_020c3674
+_020a8cc0: .word _ZN12ActorManager8GetActorEP8ActorRef
 
 	.global _ZN13LinkStateBase15GetGrabActorRefEv
 	arm_func_start _ZN13LinkStateBase15GetGrabActorRefEv

asm/ov00/Player/LinkStateInteract.inc

@@ -59,7 +59,7 @@
 .extern func_ov00_020c1908
 .extern func_ov00_020c2a0c
 .extern func_ov00_020c3180
-.extern func_ov00_020c3674
+.extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern func_ov00_020d7a84
 .extern func_ov00_020d7b20
 .extern func_ov04_0210ab88

asm/ov00/Player/LinkStateInteract.s

@@ -349,7 +349,7 @@ _020aa684:
 	ldr r0, _020aa7a8 ; =data_027e0fe4
 	add r1, r4, #0x10
 	ldr r0, [r0]
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	cmp r0, #0
 	mov r0, r4
 	beq _020aa6bc
@@ -859,7 +859,7 @@ _020aadbc:
 	str r2, [sp, #0x14]
 	ldr r2, [r3, #0x88]
 	str r2, [sp, #0x18]
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	movs r6, r0
 	bne _020aae38
 	mov r0, r4
@@ -1989,7 +1989,7 @@ _020abce0:
 	ldr r0, _020abd70 ; =data_027e0fe4
 	mov r1, r4
 	ldr r0, [r0]
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	mov r6, r0
 	mov r0, r5
 	bl _ZN13LinkStateBase15GetGrabActorRefEv

asm/ov00/Player/PlayerBase.inc

@@ -26,7 +26,7 @@
 .extern func_ov00_0208ae94
 .extern func_ov00_0208f030
 .extern func_ov00_02097700
-.extern func_ov00_020c357c
+.extern _ZN12ActorManager14Actor_vfunc_10Ej
 .extern func_ov04_0210b258
 .extern func_ov04_0210b280
 .extern gItemManager

asm/ov00/Player/PlayerBase.s

@@ -362,7 +362,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
 	ldr r0, _020a7f7c ; =data_027e0fe4
 	ldrb r1, [sp, #0x18]
 	ldr r0, [r0]
-	bl func_ov00_020c357c
+	bl _ZN12ActorManager14Actor_vfunc_10Ej
 	ldrb r0, [sp, #0x18]
 	cmp r0, #0
 	beq _020a7f40

asm/ov00/Player/PlayerControl.inc

@@ -1,6 +1,8 @@
 #pragma once
 .extern _ZN11ItemManager12GetEquipItemEi
 .extern _ZN11ItemManager18func_ov00_020ad790Ei
+.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
+.extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZNK11ItemManager15GetEquippedItemEv
 .extern _ZNK11ItemManager16GetEquippedFairyEv
 .extern _ZNK11ItemManager8GetFairyEi
@@ -61,8 +63,6 @@
 .extern func_ov00_020bc46c
 .extern func_ov00_020c28ec
 .extern func_ov00_020c2a0c
-.extern func_ov00_020c3484
-.extern func_ov00_020c3674
 .extern func_ov00_020cebcc
 .extern func_ov00_020ced64
 .extern func_ov00_020ced7c

asm/ov00/Player/PlayerControl.s

@@ -160,13 +160,13 @@ _ZN13PlayerControl14GetFollowActorEv: ; 0x020aeffc
 	ldr r1, _020af014 ; =data_027e0fe4
 	mov r2, r0
 	ldr r0, [r1]
-	ldr ip, _020af018 ; =func_ov00_020c3674
+	ldr ip, _020af018 ; =_ZN12ActorManager8GetActorEP8ActorRef
 	add r1, r2, #0x84
 	bx ip
 	.align 2, 0
 	arm_func_end _ZN13PlayerControl14GetFollowActorEv
 _020af014: .word data_027e0fe4
-_020af018: .word func_ov00_020c3674
+_020af018: .word _ZN12ActorManager8GetActorEP8ActorRef
 
 	.global _ZN13PlayerControl18func_ov00_020af01cEPc
 	arm_func_start _ZN13PlayerControl18func_ov00_020af01cEPc
@@ -837,7 +837,7 @@ _020af8b0:
 	ldr r0, _020afacc ; =data_027e0fe4
 	add r1, r1, #0x3c
 	ldr r0, [r0]
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	cmp r0, #0
 	movne r8, #1
 _020af8dc:
@@ -847,7 +847,7 @@ _020af8dc:
 	ldr r0, _020afacc ; =data_027e0fe4
 	add r1, sb, #0x8c
 	ldr r0, [r0]
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	movs r6, r0
 	mov r7, r4
 	beq _020af97c
@@ -949,7 +949,7 @@ _020afa68:
 	add r0, sp, #0
 	ldr r1, [r1]
 	mov r2, r4
-	bl func_ov00_020c3484
+	bl _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
 	ldr r0, [sp]
 	str r0, [sb, #0x8c]
 	ldr r0, [sp, #4]
@@ -1033,7 +1033,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
 	mov r4, r0
 	ldr r0, [r1]
 	add r1, sb, #0x84
-	bl func_ov00_020c3674
+	bl _ZN12ActorManager8GetActorEP8ActorRef
 	ldr r1, _020afe74 ; =gItemManager
 	mov r5, r0
 	ldr r6, [r1]