diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 8c980d78..2224bda1 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -53,7 +53,7 @@ .extern func_ov00_0207a1c8 .extern func_ov00_0207b89c .extern func_ov00_02087ef0 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern _ZN14PlayerLinkBase14GetGrabActorIdEv .extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p .extern _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 838f010d..9d111394 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -1995,7 +1995,7 @@ _ZN5Actor18func_ov00_020c2c70Ev: ; 0x020c2c70 _020c2cbc: ldr r0, _020c2d3c ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _020c2cf0 add r1, sp, #0 @@ -2482,7 +2482,7 @@ _ZN5Actor10GetLinkPosEP5Vec3p: ; 0x020c3230 mov r4, r1 cmp r0, #0 beq _020c3268 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 beq _020c3268 mov r0, r5 diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index 2156d303..bfcf4664 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -48,7 +48,7 @@ .extern func_ov00_020bb5f0 .extern func_ov00_020bb810 .extern func_ov00_020bbbd0 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc48c .extern func_ov00_020bc500 .extern func_ov00_020bc71c diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index cb825784..736eb8a6 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -555,7 +555,7 @@ _ZN13LinkStateBase18func_ov00_020a853cEP5Vec3p: ; 0x020a853c _020a8578: ldr r4, [r4, #8] mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r2, r0 add r1, sp, #0 mov r0, r4 @@ -1123,11 +1123,11 @@ _020a8bd4: .word data_027e0fcc .global _ZN13LinkStateBase19GetCurrentCharacterEv arm_func_start _ZN13LinkStateBase19GetCurrentCharacterEv _ZN13LinkStateBase19GetCurrentCharacterEv: ; 0x020a8bd8 - ldr ip, _020a8be4 ; =func_ov00_020bc46c + ldr ip, _020a8be4 ; =_ZN14PlayerLinkBase19GetCurrentCharacterEv ldr r0, [r0, #8] bx ip .align 2, 0 -_020a8be4: .word func_ov00_020bc46c +_020a8be4: .word _ZN14PlayerLinkBase19GetCurrentCharacterEv arm_func_end _ZN13LinkStateBase19GetCurrentCharacterEv .global _ZN13LinkStateBase20GetPlayerControlDataEv @@ -1164,7 +1164,7 @@ _ZN13LinkStateBase25GetCurrentCharacterHealthEv: ; 0x020a8c14 stmdb sp!, {r4, lr} ldr r4, [r0, #8] mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r1, r0 mov r0, r4 bl func_ov00_020bc48c diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index 76aa87e3..a7dd5dc6 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -61,7 +61,7 @@ .extern func_ov00_020ba204 .extern func_ov00_020baca8 .extern func_ov00_020bad18 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020cebcc .extern func_ov00_020ced64 .extern func_ov00_020ced7c diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 8cba0ae9..6f952463 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -1113,7 +1113,7 @@ _020afc9c: beq _020afcf4 ldr r0, _020afe7c ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _020afcf4 add r1, sp, #0x10 @@ -1192,7 +1192,7 @@ _020afdc4: beq _020afe10 ldr r0, _020afe7c ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _020afe10 add r1, sp, #4 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 4ccc2124..c593efc1 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -5515,7 +5515,7 @@ _020b5884: ldr r0, _020b5c94 ; =gPlayerLink ldr r4, [r0] mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r1, r4, #0x2c add r2, r1, r0, lsl #1 ldrb r4, [r1, r0, lsl #1] @@ -10080,7 +10080,7 @@ _020b9444: mov r5, r2, asr #0x1 mov r4, r3, asr #0x1 beq _020b95ec - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _020b95ec ldrb r0, [r7, #0x28f] @@ -11845,7 +11845,7 @@ func_ov00_020baca8: ; 0x020baca8 ldmneia sp!, {r4, r5, r6, pc} ldr r0, _020bad14 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 ldmneia sp!, {r4, r5, r6, pc} ldr r1, [r5] @@ -13276,7 +13276,7 @@ _020bbc00: movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv rsb r1, r6, #0 mov r2, r1, lsl #0x10 mov r1, r0 @@ -13409,7 +13409,7 @@ _ZN14PlayerLinkBase18func_ov00_020bbd80Ei: ; 0x020bbd80 cmp r0, #0 bgt _020bbdd0 mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 beq _020bbdd8 _020bbdd0: @@ -13539,7 +13539,7 @@ _020bbf48: mov r0, r6 cmp r4, #0xa moveq r4, #1 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r1, r0 mov r0, r6 bl func_ov00_020bc48c @@ -13936,9 +13936,9 @@ _020bc464: .word gMapManager _020bc468: .word gPlayerAngle arm_func_end func_ov00_020bc398 - .global func_ov00_020bc46c - arm_func_start func_ov00_020bc46c -func_ov00_020bc46c: ; 0x020bc46c + .global _ZN14PlayerLinkBase19GetCurrentCharacterEv + arm_func_start _ZN14PlayerLinkBase19GetCurrentCharacterEv +_ZN14PlayerLinkBase19GetCurrentCharacterEv: ; 0x020bc46c stmdb sp!, {r3, lr} ldr r0, _020bc488 ; =data_027e0fcc ldr r0, [r0] @@ -13948,7 +13948,7 @@ func_ov00_020bc46c: ; 0x020bc46c ldmia sp!, {r3, pc} .align 2, 0 _020bc488: .word data_027e0fcc - arm_func_end func_ov00_020bc46c + arm_func_end _ZN14PlayerLinkBase19GetCurrentCharacterEv .global func_ov00_020bc48c arm_func_start func_ov00_020bc48c @@ -13973,7 +13973,7 @@ func_ov00_020bc494: ; 0x020bc494 func_ov00_020bc4ac: ; 0x020bc4ac stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r1, r0 mov r0, r4 bl func_ov00_020bc48c @@ -14506,7 +14506,7 @@ func_ov00_020bcad8: ; 0x020bcad8 b _020bcb98 _020bcb44: mov r0, r7 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r2, r0 mov r0, r7 mov r1, r6 @@ -14617,7 +14617,7 @@ func_ov00_020bcc78: ; 0x020bcc78 ldr r1, [r1, #4] cmp r1, #0 beq _020bccb8 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _020bccb8 ldr r0, _020bccc4 ; =data_027e0fd4 @@ -14758,7 +14758,7 @@ func_ov00_020bce48: ; 0x020bce48 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} diff --git a/asm/ov05.inc b/asm/ov05.inc index e207e087..7212d7cd 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -428,7 +428,7 @@ .extern func_ov00_020b804c .extern func_ov00_020b8600 .extern func_ov00_020bbb64 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc500 .extern func_ov00_020bc71c .extern func_ov00_020bc8b8 diff --git a/asm/ov05.s b/asm/ov05.s index ed184224..c026e826 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -15728,7 +15728,7 @@ _0210de74: ldr r0, [r0] cmp r0, #0 beq _0210de9c - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 beq _0210de9c add r0, r6, #0x24 @@ -16241,7 +16241,7 @@ func_ov05_0210e4e4: ; 0x0210e4e4 ldr r1, _0210e878 ; =gPlayerControl mov r0, r6 ldr r4, [r1] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 moveq r1, #1 movne r1, #0 @@ -16269,7 +16269,7 @@ _0210e52c: bl func_ov00_020bc71c mov r7, r0 mov r0, r6 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 moveq r2, #1 movne r2, #0 @@ -17570,7 +17570,7 @@ func_ov05_0210f758: ; 0x0210f758 ldmeqia sp!, {r3, r4, pc} ldr r4, [r4, #8] mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r2, r0 add r1, sp, #0 mov r0, r4 @@ -17597,7 +17597,7 @@ func_ov05_0210f7b8: ; 0x0210f7b8 ldmeqia sp!, {r4, pc} ldr r4, [r4, #8] mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r2, r0 ldr r1, _0210f804 ; =gPlayerPos mov r0, r4 @@ -18726,7 +18726,7 @@ func_ov05_021107fc: ; 0x021107fc ldrb r1, [r0, #0x5e] cmp r1, #0 ldmeqia sp!, {r4, pc} - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 ldmneia sp!, {r4, pc} mov r0, r4 diff --git a/asm/ov12.inc b/asm/ov12.inc index 798e48f5..1e6c6a04 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -505,7 +505,7 @@ .extern func_ov00_020bbed4 .extern func_ov00_020bc0a8 .extern func_ov00_020bc27c -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc48c .extern func_ov00_020bc500 .extern func_ov00_020bc6d4 diff --git a/asm/ov12.s b/asm/ov12.s index f69a0908..51e1135f 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -9396,7 +9396,7 @@ _0211a6f8: bl func_ov00_020bbed4 mov r5, r0 mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r1, r0 mov r0, r4 bl func_ov00_020bc48c diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 27b6aaa8..b2f80890 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -407,7 +407,7 @@ .extern func_ov00_020bba48 .extern func_ov00_020bbbb8 .extern func_ov00_020bbe94 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc494 .extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p .extern func_ov00_020bcdec diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 861f3cfb..39411385 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -4625,7 +4625,7 @@ _02123394: bl func_ov14_021235bc ldr r0, _02123554 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _02123440 ldr r2, [sp, #0x44] @@ -29815,7 +29815,7 @@ _02137af4: ldr r0, _02137c00 ; =gPlayerLink ldr r5, [r0] mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r2, r5, #0x2c ldrb r3, [r2, r0, lsl #1] ldrb r1, [r4, #0x170] @@ -29834,7 +29834,7 @@ _02137af4: ldr r0, _02137c00 ; =gPlayerLink ldr r5, [r0] mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r2, r5, #0x2c ldrb r1, [r2, r0, lsl #1] add r0, r2, r0, lsl #1 @@ -30059,7 +30059,7 @@ _02137e34: ldr r0, _02137fb8 ; =gPlayerLink ldr r5, [r0] mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r2, r5, #0x2c ldrb r3, [r2, r0, lsl #1] ldrb r1, [r4, #0x170] @@ -30078,7 +30078,7 @@ _02137e34: ldr r0, _02137fb8 ; =gPlayerLink ldr r5, [r0] mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r2, r5, #0x2c ldrb r1, [r2, r0, lsl #1] add r0, r2, r0, lsl #1 @@ -30205,7 +30205,7 @@ func_ov14_02138000: ; 0x02138000 mov r4, r0 ldr r5, [r1] mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r2, r5, #0x2c ldrb r3, [r2, r0, lsl #1] ldrb r1, [r4, #0x170] @@ -33190,7 +33190,7 @@ _0213a588: ldr r0, _0213a810 ; =gPlayerLink ldr r4, [r0] mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv mov r1, r0 mov r0, r4 mov r2, #4 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index dd8fc5a5..03d54962 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -499,7 +499,7 @@ .extern func_ov00_020bbe94 .extern func_ov00_020bbed4 .extern func_ov00_020bc0a8 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc4ac .extern func_ov00_020bc500 .extern func_ov00_020bc6d4 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 3dfb2cb5..4b47c882 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -2153,7 +2153,7 @@ func_ov14_0213d0bc: ; 0x0213d0bc mov r5, r0 ldr r0, [r2] mov r4, r1 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0213d11c ldr r1, _0213d154 ; =gActorManager @@ -4961,7 +4961,7 @@ func_ov14_0213f104: ; 0x0213f104 bl func_ov23_02178174 _0213f158: mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0213f170 mov r0, r4 @@ -5024,7 +5024,7 @@ _0213f218: bl func_ov00_020b4460 _0213f23c: mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _0213f2b0 ldr r0, _0213f330 ; =data_027e0d38 @@ -5057,7 +5057,7 @@ _0213f2a4: b _0213f2c8 _0213f2b0: mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0213f2c8 mov r0, r4 @@ -5348,7 +5348,7 @@ func_ov14_0213f5a8: ; 0x0213f5a8 mov r5, r1 mov r6, r0 mov r4, r2 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r5, r0 movne r0, #1 strneb r0, [r6, #0x5d] @@ -11639,7 +11639,7 @@ func_ov14_0214418c: ; 0x0214418c ldmneia sp!, {r3, r4, r5, pc} ldr r0, _021442bc ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _02144288 ldr r0, _021442c0 ; =data_ov00_020eec9c diff --git a/asm/ov21.inc b/asm/ov21.inc index 51d5b231..acaa078f 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -176,7 +176,7 @@ .extern func_ov00_020b7d74 .extern func_ov00_020b7e6c .extern func_ov00_020bba28 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc500 .extern func_ov00_020bd618 .extern func_ov00_020c0c08 diff --git a/asm/ov21.s b/asm/ov21.s index dcbab8c7..c10f34c1 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -2996,7 +2996,7 @@ func_ov21_0216fbc0: ; 0x0216fbc0 mov r4, r0 ldr r5, [r1] mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r1, r5, #0x2c ldrb r0, [r1, r0, lsl #1] cmp r0, #0x1e diff --git a/asm/ov23.inc b/asm/ov23.inc index 076d1faa..206a96d5 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -347,7 +347,7 @@ .extern func_ov00_020bb544 .extern func_ov00_020bb5f0 .extern func_ov00_020bba28 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc48c .extern func_ov00_020bc494 .extern func_ov00_020bc4ac diff --git a/asm/ov23.s b/asm/ov23.s index 46c139c5..a28bf2e5 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -10545,7 +10545,7 @@ func_ov23_02176190: ; 0x02176190 bne _02176204 ldr r0, _0217620c ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 ldr r0, _0217620c ; =gPlayerLink moveq r1, #1 @@ -10703,7 +10703,7 @@ func_ov23_021763c0: ; 0x021763c0 bne _02176440 ldr r0, _0217648c ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _02176440 _021763f4: @@ -12571,7 +12571,7 @@ func_ov23_02177ba0: ; 0x02177ba0 ldr r6, [r4, #8] mov r5, r1 mov r0, r6 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv add r2, r6, #0x2c mov r1, r0, lsl #0x1 add r3, r2, r0, lsl #1 @@ -12973,7 +12973,7 @@ _0217811c: ldmia sp!, {r4, pc} _02178124: mov r0, r4 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _0217814c mov r0, r4 @@ -13026,7 +13026,7 @@ func_ov23_02178174: ; 0x02178174 bl func_020385b8 bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv str r0, [sp] mov r0, r4 ldr r1, _02178310 ; =gPlayerPos @@ -13160,7 +13160,7 @@ func_ov23_02178354: ; 0x02178354 bl _ZN12ActorManager8GetActorEP8ActorRef mov r4, r0 mov r0, r5 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv str r0, [sp] ldr r1, _02178408 ; =gPlayerPos ldr r2, _0217840c ; =gPlayerAngle @@ -13213,7 +13213,7 @@ func_ov23_02178420: ; 0x02178420 cmp r1, #0 addeq sp, sp, #0x2c ldmeqia sp!, {r4, r5, pc} - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 addne sp, sp, #0x2c ldmneia sp!, {r4, r5, pc} diff --git a/asm/ov36.inc b/asm/ov36.inc index 7dee2858..03da0393 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -215,7 +215,7 @@ .extern func_ov00_020b7e6c .extern func_ov00_020bb5f0 .extern func_ov00_020bb6d4 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bcc78 .extern func_ov00_020bd0a8 .extern func_ov00_020bf008 diff --git a/asm/ov36.s b/asm/ov36.s index 2296cc8d..44e1c92f 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -2160,7 +2160,7 @@ func_ov36_0217da6c: ; 0x0217da6c bgt _0217dafc ldr r0, _0217dd64 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 beq _0217dac0 ldr r0, [r4, #0x878] @@ -2716,7 +2716,7 @@ _0217e2a4: ldr r0, _0217e3a4 ; =gPlayerLink str r1, [r5, #0x66c] ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _0217e2dc ldr r0, _0217e3a4 ; =gPlayerLink @@ -3171,7 +3171,7 @@ _0217e868: str r1, [r6, #0x878] str r4, [r6, #0x138] ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0217e934 ldr r0, _0217eb3c ; =gPlayerLink @@ -3657,7 +3657,7 @@ func_ov36_0217efc0: ; 0x0217efc0 ldr r1, _0217f0b4 ; =gPlayerLink mov r6, r0 ldr r0, [r1] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 mov r0, r6 bne _0217f0a0 @@ -5694,7 +5694,7 @@ _02180bd0: bic r1, r1, #1 str r1, [r4, #0x878] ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _02180c58 ldr r0, _02180d14 ; =gPlayerLink @@ -6725,7 +6725,7 @@ _021818fc: ldr r0, _02181b9c ; =gPlayerLink str r2, [r1, #0x10] ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _02181b40 ldr r0, _02181b9c ; =gPlayerLink @@ -8224,7 +8224,7 @@ func_ov36_021830e8: ; 0x021830e8 moveq r4, #1 ldr r0, [r0] movne r4, #0 - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r4, r0 bne _021831f4 mov r0, r5 @@ -10289,7 +10289,7 @@ func_ov36_02184e10: ; 0x02184e10 _02184e60: ldr r0, _02184f40 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 ldr r0, [r5, #0x878] bne _02184ed4 @@ -10439,7 +10439,7 @@ func_ov36_02185050: ; 0x02185050 ldr r1, _021850c0 ; =gPlayerLink mov r4, r0 ldr r0, [r1] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _02185090 ldr r0, _021850c4 ; =gPlayerPos @@ -10810,7 +10810,7 @@ func_ov36_021854e8: ; 0x021854e8 ldmneia sp!, {r4, pc} ldr r0, _0218557c ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 ldmneia sp!, {r4, pc} add r1, r4, #0x3b4 diff --git a/asm/ov43.inc b/asm/ov43.inc index a4941674..c4e0e8bd 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -114,7 +114,7 @@ .extern func_ov00_020b7d74 .extern func_ov00_020b7df0 .extern func_ov00_020b7e6c -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020c070c .extern func_ov00_020c0c08 .extern func_ov00_020c0cc8 diff --git a/asm/ov43.s b/asm/ov43.s index 0461cdfa..e600ac8e 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -3268,7 +3268,7 @@ _0218c128: bl func_ov00_020d77e4 ldr r0, _0218c9a0 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0218c32c ldr r2, [r4, #0x3c0] @@ -3947,7 +3947,7 @@ _0218cab4: beq _0218cb0c ldr r0, _0218cd24 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _0218cb0c mov r0, #0 @@ -3968,7 +3968,7 @@ _0218cb0c: _0218cb34: ldr r0, _0218cd24 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 bne _0218cd10 cmp r4, #0 @@ -4137,7 +4137,7 @@ func_ov43_0218cd7c: ; 0x0218cd7c mov r9, r1 mov r7, r3 ldr r6, [sp, #0x40] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0218ce34 mov r0, r10 @@ -4297,7 +4297,7 @@ func_ov43_0218cf90: ; 0x0218cf90 ldmeqia sp!, {r4, pc} ldr r0, _0218d028 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0218d014 ldr r0, _0218d028 ; =gPlayerLink @@ -4327,7 +4327,7 @@ func_ov43_0218d02c: ; 0x0218d02c beq _0218d054 ldr r0, _0218d084 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 beq _0218d074 _0218d054: @@ -4336,7 +4336,7 @@ _0218d054: bne _0218d07c ldr r0, _0218d084 ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 beq _0218d07c _0218d074: @@ -4396,7 +4396,7 @@ _0218d0e4: ldmia r0, {r0, r1, r2} stmia ip, {r0, r1, r2} ldr r0, [r3] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #1 bne _0218d168 ldr r0, _0218d1a4 ; =data_ov00_020eec9c diff --git a/asm/ov49.inc b/asm/ov49.inc index 80b2b3ad..9f3f0b96 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -155,7 +155,7 @@ .extern func_ov00_020b7e6c .extern func_ov00_020bbc68 .extern func_ov00_020bc1c8 -.extern func_ov00_020bc46c +.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv .extern func_ov00_020bc500 .extern func_ov00_020bce48 .extern func_ov00_020bd030 diff --git a/asm/ov49.s b/asm/ov49.s index e877b818..a3bea689 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -1666,7 +1666,7 @@ _02196ac0: bl Vec3p_Add ldr r0, _02196fec ; =gPlayerLink ldr r0, [r0] - bl func_ov00_020bc46c + bl _ZN14PlayerLinkBase19GetCurrentCharacterEv cmp r0, #0 movne r4, #1 ldr r0, [r5, #0x138] diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 8448a3b7..09eefeb1 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -80,6 +80,7 @@ public: bool func_ov00_020bd304(); bool GongoronCollidesWith(Cylinder *hitbox); s32 GetGrabActorId(); + PlayerCharacter GetCurrentCharacter(); }; extern PlayerLinkBase *gPlayerLink;