diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index f7b445cd..514e2eac 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -58,7 +58,7 @@ .extern func_ov00_0207a1c8 .extern func_ov00_0207b89c .extern func_ov00_02087ef0 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020c5924 .extern func_ov00_020c8398 .extern func_ov05_02103f4c diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index c1ed8837..9e1f2f68 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -538,7 +538,7 @@ _020c19f4: ldr r0, [r0] cmp r0, #0 beq _020c1a14 - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index f0fab13d..f826b0a8 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -261,7 +261,7 @@ .extern func_ov00_020a6110 .extern func_ov00_020a61ac .extern func_ov00_020b3ea8 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020bd618 .extern _ZN19Actor_UnkStruct_020C1Ev .extern func_ov00_020c3348 diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 962e9cf7..c3aaeb3c 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -6630,7 +6630,7 @@ func_ov00_0208c3a4: ; 0x0208c3a4 ldr r0, [r0] cmp r0, #0 beq _0208c448 - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} @@ -6675,7 +6675,7 @@ func_ov00_0208c468: ; 0x0208c468 ldr r0, [r0] cmp r0, #0 beq _0208c4e0 - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 22ce42c3..906c1972 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -15137,15 +15137,15 @@ _020bd2fc: ldmia sp!, {r3, r4, r5, pc} arm_func_end func_ov00_020bd2bc - .global func_ov00_020bd304 - arm_func_start func_ov00_020bd304 -func_ov00_020bd304: ; 0x020bd304 + .global _ZN14PlayerLinkBase18func_ov00_020bd304Ev + arm_func_start _ZN14PlayerLinkBase18func_ov00_020bd304Ev +_ZN14PlayerLinkBase18func_ov00_020bd304Ev: ; 0x020bd304 ldrb r0, [r0, #0x5f] cmp r0, #0 moveq r0, #1 movne r0, #0 bx lr - arm_func_end func_ov00_020bd304 + arm_func_end _ZN14PlayerLinkBase18func_ov00_020bd304Ev .global func_ov00_020bd318 arm_func_start func_ov00_020bd318 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 02f96ec7..95f4ac82 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -510,7 +510,7 @@ .extern func_ov00_020bcdb8 .extern func_ov00_020bcf50 .extern func_ov00_020bcfb8 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020bd318 .extern func_ov00_020bd5f4 .extern func_ov00_020bd5fc diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index bdc0622f..e9b201aa 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -10651,7 +10651,7 @@ func_ov14_0214392c: ; 0x0214392c ldr r0, [r0] cmp r0, #0 beq _021439bc - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} diff --git a/asm/ov18.inc b/asm/ov18.inc index 67ea7af0..8c337424 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -358,7 +358,7 @@ .extern func_ov00_020bce48 .extern func_ov00_020bcec8 .extern func_ov00_020bcf50 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020bd318 .extern func_ov00_020bd618 .extern func_ov00_020bd728 diff --git a/asm/ov18.s b/asm/ov18.s index 3e03261c..d2dcc843 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -14417,7 +14417,7 @@ func_ov18_02166e7c: ; 0x02166e7c ldmeqia sp!, {r4, pc} ldr r0, _02166f18 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 diff --git a/asm/ov24.inc b/asm/ov24.inc index 5bbaa186..7562cd7b 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -261,7 +261,7 @@ .extern func_ov00_020b7d74 .extern func_ov00_020b7e6c .extern func_ov00_020bba28 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020bd618 .extern func_ov00_020bf008 .extern func_ov00_020c070c diff --git a/asm/ov24.s b/asm/ov24.s index 1a725aa6..bad082fe 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -2270,7 +2270,7 @@ _0216f40c: bne _0216f450 ldr r0, _0216f460 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 beq _0216f450 mov r0, r4 diff --git a/asm/ov28.inc b/asm/ov28.inc index e5737f49..121e294b 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -266,7 +266,7 @@ .extern func_ov00_020bc500 .extern func_ov00_020bce48 .extern func_ov00_020bcec8 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020bd318 .extern func_ov00_020bd618 .extern func_ov00_020c0c08 diff --git a/asm/ov28.s b/asm/ov28.s index ecc1d669..dc3e0821 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -5018,7 +5018,7 @@ _021716f8: ldmeqia sp!, {r4, pc} ldr r0, _021718cc ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} diff --git a/asm/ov41.inc b/asm/ov41.inc index b42a62ab..c0d8f827 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -161,7 +161,7 @@ .extern func_ov00_020bbb18 .extern func_ov00_020bc500 .extern func_ov00_020bcf50 -.extern func_ov00_020bd304 +.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev .extern func_ov00_020bf008 .extern func_ov00_020c0c08 .extern func_ov00_020c0ec0 diff --git a/asm/ov41.s b/asm/ov41.s index 800bbc29..8ec11441 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -2797,7 +2797,7 @@ _0218b870: beq _0218bda8 ldr r0, _0218bdfc ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 beq _0218bda8 add r0, r4, #0x1d8 @@ -2984,7 +2984,7 @@ _0218bb2c: beq _0218bda8 ldr r0, _0218bdfc ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 beq _0218bda8 ldrsh r0, [r4, #0x12] @@ -4099,7 +4099,7 @@ _0218ca08: bne _0218cbd0 ldr r0, _0218cbe4 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 beq _0218cbd0 mov r0, r6 @@ -4117,7 +4117,7 @@ _0218ca3c: bge _0218ca80 ldr r0, _0218cbe4 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 beq _0218ca80 mov r0, r6 @@ -4203,7 +4203,7 @@ _0218cb5c: bge _0218cbd0 ldr r0, _0218cbe4 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bd304 + bl _ZN14PlayerLinkBase18func_ov00_020bd304Ev cmp r0, #0 beq _0218cbd0 mov r0, r6