summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAetias <aetias@outlook.com>2024-05-18 17:07:11 +0200
committerAetias <aetias@outlook.com>2024-05-18 17:07:11 +0200
commit7bbc47069bbf95eb1659d35050ccbcbe19bf9bea (patch)
treee194bc40476647585b9b1a9db3493460754bb67e
parent9bf232a4fd27da50baaac4a983cd6b810480def7 (diff)
Mangle `PlayerLinkBase::func_ov00_020bc854`
-rw-r--r--asm/ov00/Actor/Actor.inc2
-rw-r--r--asm/ov00/Actor/Actor.s2
-rw-r--r--asm/ov00/ov00_020b1498.s8
-rw-r--r--asm/ov14/ov14_0211f640.inc2
-rw-r--r--asm/ov14/ov14_0211f640.s4
5 files changed, 9 insertions, 9 deletions
diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc
index 3225226d..cec967aa 100644
--- a/asm/ov00/Actor/Actor.inc
+++ b/asm/ov00/Actor/Actor.inc
@@ -55,7 +55,7 @@
.extern func_ov00_02087ef0
.extern func_ov00_020bc46c
.extern func_ov00_020bc7f8
-.extern func_ov00_020bc854
+.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.extern func_ov00_020bcc2c
.extern func_ov00_020bd304
.extern func_ov00_020bff70
diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s
index 665c485e..0e520282 100644
--- a/asm/ov00/Actor/Actor.s
+++ b/asm/ov00/Actor/Actor.s
@@ -468,7 +468,7 @@ _ZN5Actor18func_ov00_020c195cEv: ; 0x020c195c
ldr r2, _020c1988 ; =gPlayerLink
add r1, r0, #0x48
ldr r0, [r2]
- bl func_ov00_020bc854
+ bl _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s
index 8a1ea151..6484e75f 100644
--- a/asm/ov00/ov00_020b1498.s
+++ b/asm/ov00/ov00_020b1498.s
@@ -14262,9 +14262,9 @@ func_ov00_020bc84c: ; 0x020bc84c
bx lr
arm_func_end func_ov00_020bc84c
- .global func_ov00_020bc854
- arm_func_start func_ov00_020bc854
-func_ov00_020bc854: ; 0x020bc854
+ .global _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
+ arm_func_start _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
+_ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p: ; 0x020bc854
stmdb sp!, {r4, lr}
ldr r0, _020bc8ac ; =data_027e0fcc
mov r4, r1
@@ -14291,7 +14291,7 @@ func_ov00_020bc854: ; 0x020bc854
_020bc8ac: .word data_027e0fcc
_020bc8b0: .word data_027e0f94
_020bc8b4: .word data_027e0fd0
- arm_func_end func_ov00_020bc854
+ arm_func_end _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.global func_ov00_020bc8b8
arm_func_start func_ov00_020bc8b8
diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc
index 900ac70d..025cd9a2 100644
--- a/asm/ov14/ov14_0211f640.inc
+++ b/asm/ov14/ov14_0211f640.inc
@@ -409,7 +409,7 @@
.extern func_ov00_020bbe94
.extern func_ov00_020bc46c
.extern func_ov00_020bc494
-.extern func_ov00_020bc854
+.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.extern func_ov00_020bcdec
.extern func_ov00_020bce48
.extern func_ov00_020bd618
diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s
index 00e14744..3bb87284 100644
--- a/asm/ov14/ov14_0211f640.s
+++ b/asm/ov14/ov14_0211f640.s
@@ -30714,7 +30714,7 @@ _02138610:
ldr r0, _021389c8 ; =gPlayerLink
add r1, r5, #0x48
ldr r0, [r0]
- bl func_ov00_020bc854
+ bl _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
mov r0, r5
bl func_ov14_02138d6c
add sp, sp, #0xb0
@@ -30987,7 +30987,7 @@ func_ov14_021389d8: ; 0x021389d8
ldr r0, _02138a10 ; =gPlayerLink
add r1, r4, #0x48
ldr r0, [r0]
- bl func_ov00_020bc854
+ bl _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
mov r0, r4
bl func_ov14_02138d6c
ldmia sp!, {r4, pc}