mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-04 02:46:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle PlayerLinkBase::GetCurrentCharacter

Browse Source
This commit is contained in:
Aetias
2024-05-23 23:52:52 +02:00
parent 23bbb6fe5b
commit 5d8782d64a
26 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -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
asm/ov00/Actor/Actor.s
+2 -2
View File
@@ -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
asm/ov00/Player/LinkStateBase.inc
+1 -1
View File
@@ -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
asm/ov00/Player/LinkStateBase.s
+4 -4
View File
@@ -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
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -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
asm/ov00/Player/PlayerControl.s
+2 -2
View File
@@ -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
asm/ov00/ov00_020b1498.s
+14 -14
View File
@@ -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}
asm/ov05.inc
+1 -1
View File
@@ -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
asm/ov05.s
+6 -6
View File
@@ -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
asm/ov12.inc
+1 -1
View File
@@ -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
asm/ov12.s
+1 -1
View File
@@ -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
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -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
asm/ov14/ov14_0211f640.s
+7 -7
View File
@@ -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
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -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
asm/ov14/ov14_0213b778.s
+6 -6
View File
@@ -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
asm/ov21.inc
+1 -1
View File
@@ -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
asm/ov21.s
+1 -1
View File
@@ -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
asm/ov23.inc
+1 -1
View File
@@ -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
asm/ov23.s
+7 -7
View File
@@ -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}
asm/ov36.inc
+1 -1
View File
@@ -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
asm/ov36.s
+10 -10
View File
@@ -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
asm/ov43.inc
+1 -1
View File
@@ -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
asm/ov43.s
+8 -8
View File
@@ -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
asm/ov49.inc
+1 -1
View File
@@ -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
asm/ov49.s
+1 -1
View File
@@ -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]
include/Player/PlayerLinkBase.hpp
+1
View File
@@ -80,6 +80,7 @@ public:
bool func_ov00_020bd304();
bool GongoronCollidesWith(Cylinder *hitbox);
s32 GetGrabActorId();
PlayerCharacter GetCurrentCharacter();
};
extern PlayerLinkBase *gPlayerLink;