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

PlayerLink -> PlayerLinkBase

Browse Source
This commit is contained in:
Aetias
2024-03-26 21:35:38 +01:00
parent ac47abfa46
commit 0af61505a9
19 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/ov05.inc
+35 -35
View File
@@ -430,7 +430,7 @@
.extern data_027e0fb8
.extern data_027e077c
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern _ZN13LinkStateBase12GetEquipItemEi
.extern func_ov14_0213ec64
@@ -496,7 +496,7 @@
.extern data_02050f54
.extern func_01fffcec
.extern _ZN13LinkStateBase18func_ov00_020a8994Ev
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8b04Eib
.extern func_ov00_020aee58
.extern _ZN13LinkStateBase18func_ov00_020a8b04Eib
@@ -587,7 +587,7 @@
.extern _ZN13LinkStateBase12GetEquipItemEi
.extern _ZN13LinkStateBase10GetStateIdEv
.extern data_027e0764
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern func_ov00_020af050
.extern func_01fffcd8
.extern _ZN13LinkStateBase15ChangeLinkStateEi
@@ -726,17 +726,17 @@
.extern func_01fffcd8
.extern func_ov00_020af454
.extern func_ov00_020d77e4
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern data_027e0fb8
.extern data_ov00_020eec9c
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern func_ov00_020b134c
.extern _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8a90Ei
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_0202b308
@@ -752,9 +752,9 @@
.extern data_027e0fb8
.extern data_027e0e60
.extern data_027e0d0c
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
.extern _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern func_ov00_020c3674
.extern func_ov32_0217fd68
.extern func_ov32_0217fd7c
@@ -774,22 +774,22 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d50Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d50Ev
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern func_ov00_020c3674
.extern func_ov32_0217fd68
.extern func_ov26_02170150
.extern _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern data_027e0fe4
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern func_ov00_020af454
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern data_027e0fb8
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_01ff9ec0
.extern func_01ff9bc4
@@ -858,7 +858,7 @@
.extern _ZN11ItemManager15LoadFanfareItemEj
.extern gItemManager
.extern func_ov00_02097ff4
.extern _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
.extern func_0202d77c
.extern func_0202abf4
.extern data_027e0f74
@@ -874,7 +874,7 @@
.extern func_0202d77c
.extern func_0202ab78
.extern func_0202abf4
.extern _ZN13LinkStateBase19PlayerLink_vfunc_88Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_88Ev
.extern func_ov00_020d70a4
.extern func_ov00_02084740
.extern func_ov00_020d70a4
@@ -1102,7 +1102,7 @@
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern _ZN13LinkStateBase18func_ov00_020a8994Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d6cEv
@@ -1136,7 +1136,7 @@
.extern func_ov00_02081f4c
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
.extern func_ov00_020a5e9c
.extern func_ov00_02097750
.extern _ZNK11ItemManager8GetFairyEi
@@ -1172,7 +1172,7 @@
.extern func_ov00_020c3674
.extern func_ov00_02097738
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_0202bbbc
@@ -1193,8 +1193,8 @@
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18func_ov00_020a8a90Ei
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
.extern func_0203516c
@@ -1206,15 +1206,15 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020b0ab4
.extern func_ov00_02097738
.extern _ZN13LinkStateBase18func_ov00_020a8b3cEi
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
.extern data_027e0fe4
.extern data_027e0fb8
@@ -1365,7 +1365,7 @@
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bf8
.extern func_ov23_021716b0
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -1621,7 +1621,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern func_ov23_021787a4
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
.extern func_0203611c
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern func_ov00_020872e8
@@ -1740,7 +1740,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase18func_ov00_020a8294Eij
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk004Ev
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern func_ov14_0213d63c
.extern _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -1926,7 +1926,7 @@
.extern data_027e0e58
.extern data_027e0e60
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern data_027e0fac
.extern func_ov00_020bbb64
@@ -1967,7 +1967,7 @@
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern func_ov00_020c37ec
.extern _ZN13LinkStateBase18func_ov00_020a81fcEv
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
.extern _ZN13LinkStateBase18func_ov00_020a8294Eij
.extern _ZN13LinkStateBase18func_ov00_020a827cEij
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
@@ -1983,9 +1983,9 @@
.extern _ZN13LinkStateBase18func_ov00_020a8d6cEv
.extern _ZN13LinkStateBase18func_ov00_020a8d6cEv
.extern _ZN13LinkStateBase18func_ov00_020a8ad0Ei
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
.extern data_027e0f74
.extern data_027e0d38
.extern data_027e0618
asm/include/ov12.inc
+1 -1
View File
@@ -2515,7 +2515,7 @@
.extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p
.extern data_027e0e60
.extern func_ov00_02097738
.extern _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
.extern data_027e0f74
.extern func_ov00_020d77e4
.extern func_ov00_0207bd4c
asm/include/ov19.inc
+2 -2
View File
@@ -915,13 +915,13 @@
.extern func_ov00_020a95ec
.extern _ZN9SysObjectdlEPv
.extern func_ov00_020aeef8
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern func_ov00_020b134c
.extern _ZN13LinkStateBase18func_ov00_020a84bcEi
.extern _ZN13LinkStateBase18func_ov00_020a8224Ei
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_ov00_020d7b20
.extern _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_0202b308
.extern _ZN13LinkStateBase12GetPlayerPosEv
asm/include/ov21.inc
+1 -1
View File
@@ -295,7 +295,7 @@
.extern func_ov00_0208b9cc
.extern func_ov00_0207a1c8
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern func_ov05_02107c8c
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
asm/ov00/Player/LinkStateBase.s
+41 -41
View File
@@ -80,7 +80,7 @@ _020a8050:
beq _020a807c
mov r0, r6
mov r1, #0x3f
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
bne _020a807c
bl func_ov00_020aeeac
@@ -599,35 +599,35 @@ _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p: ; 0x020a85e0
ldmia sp!, {r3, pc}
arm_func_end _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p
.global _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
arm_func_start _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
_ZN13LinkStateBase19PlayerLink_vfunc_74Ev: ; 0x020a85fc
.global _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
arm_func_start _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
_ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev: ; 0x020a85fc
stmdb sp!, {r3, lr}
ldr r0, [r0, #8]
ldr r1, [r0]
ldr r1, [r1, #0x74]
blx r1
ldmia sp!, {r3, pc}
arm_func_end _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
arm_func_end _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
.global _ZN13LinkStateBase19PlayerLink_vfunc_88Ev
arm_func_start _ZN13LinkStateBase19PlayerLink_vfunc_88Ev
_ZN13LinkStateBase19PlayerLink_vfunc_88Ev: ; 0x020a8614
.global _ZN13LinkStateBase23PlayerLinkBase_vfunc_88Ev
arm_func_start _ZN13LinkStateBase23PlayerLinkBase_vfunc_88Ev
_ZN13LinkStateBase23PlayerLinkBase_vfunc_88Ev: ; 0x020a8614
stmdb sp!, {r3, lr}
ldr r0, [r0, #8]
ldr r2, [r0]
ldr r2, [r2, #0x88]
blx r2
ldmia sp!, {r3, pc}
arm_func_end _ZN13LinkStateBase19PlayerLink_vfunc_88Ev
arm_func_end _ZN13LinkStateBase23PlayerLinkBase_vfunc_88Ev
.global _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
arm_func_start _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
_ZN13LinkStateBase20Get_PlayerLink_Unk48Ev: ; 0x020a862c
.global _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
arm_func_start _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
_ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev: ; 0x020a862c
ldr r0, [r0, #8]
ldrh r0, [r0, #0x48]
bx lr
arm_func_end _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
arm_func_end _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.global _ZN13LinkStateBase18func_ov00_020a8638Ei
arm_func_start _ZN13LinkStateBase18func_ov00_020a8638Ei
@@ -646,16 +646,16 @@ _ZN13LinkStateBase18func_ov00_020a8638Ei: ; 0x020a8638
ldmia sp!, {pc}
arm_func_end _ZN13LinkStateBase18func_ov00_020a8638Ei
.global _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
arm_func_start _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
_ZN13LinkStateBase22Clear_PlayerLink_Unk48Et: ; 0x020a8668
.global _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
arm_func_start _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
_ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et: ; 0x020a8668
ldr r2, [r0, #8]
mvn r0, r1
ldrh r1, [r2, #0x48]
and r0, r1, r0
strh r0, [r2, #0x48]
bx lr
arm_func_end _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
arm_func_end _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.global _ZN13LinkStateBase18func_ov00_020a8680Eisb
arm_func_start _ZN13LinkStateBase18func_ov00_020a8680Eisb
@@ -687,26 +687,26 @@ _020a86bc:
arm_func_end _ZN13LinkStateBase18func_ov00_020a8680Eisb
_020a86d8: .word data_027e0fd4
.global _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
arm_func_start _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
_ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev: ; 0x020a86dc
.global _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
arm_func_start _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
_ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev: ; 0x020a86dc
ldr ip, _020a86e8 ; =func_ov00_020bccc8
ldr r0, [r0, #8]
bx ip
.align 2, 0
arm_func_end _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
arm_func_end _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
_020a86e8: .word func_ov00_020bccc8
.global _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
arm_func_start _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
_ZN13LinkStateBase19PlayerLink_vfunc_58Ev: ; 0x020a86ec
.global _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
arm_func_start _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
_ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev: ; 0x020a86ec
stmdb sp!, {r3, lr}
ldr r0, [r0, #8]
ldr r3, [r0]
ldr r3, [r3, #0x58]
blx r3
ldmia sp!, {r3, pc}
arm_func_end _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
arm_func_end _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
.global _ZN13LinkStateBase18func_ov00_020a8704EPs
arm_func_start _ZN13LinkStateBase18func_ov00_020a8704EPs
@@ -1090,24 +1090,24 @@ _ZN13LinkStateBase18func_ov00_020a8b80Ev: ; 0x020a8b80
arm_func_end _ZN13LinkStateBase18func_ov00_020a8b80Ev
_020a8b9c: .word data_027e0fd4
.global _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
arm_func_start _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
_ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et: ; 0x020a8ba0
.global _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
arm_func_start _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
_ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et: ; 0x020a8ba0
ldr r0, [r0, #8]
ldrh r0, [r0, #0x48]
tst r0, r1
movne r0, #1
moveq r0, #0
bx lr
arm_func_end _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
arm_func_end _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.global _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
arm_func_start _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
_ZN13LinkStateBase20Get_PlayerLink_Unk5eEv: ; 0x020a8bb8
.global _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
arm_func_start _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
_ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv: ; 0x020a8bb8
ldr r0, [r0, #8]
ldrb r0, [r0, #0x5e]
bx lr
arm_func_end _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
arm_func_end _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
.global _ZN13LinkStateBase28Get_PlayerControlData_Unk004Ev
arm_func_start _ZN13LinkStateBase28Get_PlayerControlData_Unk004Ev
@@ -1273,13 +1273,13 @@ _ZN13LinkStateBase4GrabEv: ; 0x020a8cd0
arm_func_end _ZN13LinkStateBase4GrabEv
_020a8cdc: .word func_ov00_020bc71c
.global _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
arm_func_start _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
_ZN13LinkStateBase20Get_PlayerLink_Unk44Ev: ; 0x020a8ce0
.global _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
arm_func_start _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
_ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev: ; 0x020a8ce0
ldr r0, [r0, #8]
add r0, r0, #0x44
bx lr
arm_func_end _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
arm_func_end _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.global _ZN13LinkStateBase16IsEquipBeingUsedEi
arm_func_start _ZN13LinkStateBase16IsEquipBeingUsedEi
@@ -1391,13 +1391,13 @@ _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev: ; 0x020a8dcc
arm_func_end _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
_020a8ddc: .word data_027e0fcc
.global _ZN13LinkStateBase20Get_PlayerLink_Unk38Ev
arm_func_start _ZN13LinkStateBase20Get_PlayerLink_Unk38Ev
_ZN13LinkStateBase20Get_PlayerLink_Unk38Ev: ; 0x020a8de0
.global _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev
arm_func_start _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev
_ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev: ; 0x020a8de0
ldr r0, [r0, #8]
add r0, r0, #0x38
bx lr
arm_func_end _ZN13LinkStateBase20Get_PlayerLink_Unk38Ev
arm_func_end _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev
.global _ZN13LinkStateBase18GetDebugHierarchy0Ev
arm_func_start _ZN13LinkStateBase18GetDebugHierarchy0Ev
asm/ov00/Player/LinkStateDamage.s
+3 -3
View File
@@ -616,7 +616,7 @@ _020ac6dc:
ldmleia sp!, {r4, r5, pc}
_020ac70c:
mov r0, r4
bl _ZN13LinkStateBase20Get_PlayerLink_Unk38Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev
ldr r0, [r0]
cmp r0, #0
addge sp, sp, #0x14
@@ -643,12 +643,12 @@ _020ac70c:
mov r0, r4
bhi _020ac788
mov r1, #1
bl _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
bl _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
add sp, sp, #0x14
ldmia sp!, {r4, r5, pc}
_020ac788:
mov r1, #0
bl _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
bl _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
add sp, sp, #0x14
ldmia sp!, {r4, r5, pc}
.align 2, 0
asm/ov00/Player/LinkStateGrab.s
+4 -4
View File
@@ -353,7 +353,7 @@ _020aa684:
cmp r0, #0
mov r0, r4
beq _020aa6bc
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
b _020aa6c4
@@ -382,7 +382,7 @@ _020aa704:
cmp r0, #0
beq _020aa720
mov r0, r4
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #1
str r1, [r0]
_020aa720:
@@ -395,7 +395,7 @@ _020aa730:
cmp r0, #0
beq _020aa74c
mov r0, r4
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mvn r1, #0
str r1, [r0]
_020aa74c:
@@ -726,7 +726,7 @@ _ZN13LinkStateGrab8vfunc_20Ei: ; 0x020aabd8
mov r6, r1
mov r1, #2
mov r4, r0
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
bne _020aac08
mov r0, r4
asm/ov00/Player/include/LinkStateDamage.inc
+3 -3
View File
@@ -88,9 +88,9 @@
.extern func_ov00_02097ff4
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase25GetCurrentCharacterHealthEv
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk38Ev
.extern _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
.extern _ZN13LinkStateBase29PlayerLink_func_ov00_020bccc8Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev
.extern _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
.extern _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev
.extern data_ov00_020eec9c
.extern data_027e0e58
.extern data_027e0618
asm/ov00/Player/include/LinkStateGrab.inc
+4 -4
View File
@@ -29,12 +29,12 @@
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020af044
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_020350b4
.extern func_020351b8
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern func_ov00_020af044
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern data_027e0fb8
@@ -65,7 +65,7 @@
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern data_02050f54
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
asm/ov00/include/ov00_020a8e04.inc
+4 -4
View File
@@ -210,12 +210,12 @@
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020af044
.extern func_ov00_020c3674
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_020350b4
.extern func_020351b8
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern func_ov00_020af044
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern data_027e0fb8
@@ -246,7 +246,7 @@
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern data_02050f54
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
asm/ov00/include/ov00_020ae7a4.inc
+3 -3
View File
@@ -43,7 +43,7 @@
.extern data_ov00_020eec9c
.extern data_027e0e58
.extern _ZN13LinkStateBase12OnStateLeaveEi
.extern _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern func_ov00_0207c444
.extern _ZN13LinkStateBase18func_ov00_020a84bcEi
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -54,7 +54,7 @@
.extern _ZN13LinkStateBase18func_ov00_020a8b80Ev
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a8d40Ev
.extern _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
.extern _ZN13LinkStateBase12GetGrabActorEv
.extern _ZN13LinkStateBase19GetCurrentCharacterEv
@@ -317,7 +317,7 @@
.extern func_0202ab78
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
.extern _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
.extern _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
asm/ov00/ov00_020ae7a4.s
+3 -3
View File
@@ -298,7 +298,7 @@ _020aeb54: ; jump table
_020aeb7c:
mov r0, r4
mov r1, #1
bl _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
ldr r0, _020aec0c ; =data_027e0e58
add r7, r4, #0x2c
ldr r5, [r0]
@@ -376,7 +376,7 @@ func_ov00_020aec10: ; 0x020aec10
bne _020aecc8
mov r0, r5
mov r1, #0x3f
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
bne _020aecc8
ldr r0, _020aed88 ; =data_027e0618
@@ -4513,7 +4513,7 @@ _020b2144:
bl _ZN13LinkStateBase18func_ov00_020a82acEv
mov r0, r4
mov r1, #0x3f
bl _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, _020b2478 ; =data_027e0d0c
asm/ov05.s
+35 -35
View File
@@ -5820,7 +5820,7 @@ func_ov05_02105670: ; 0x02105670
beq _021056b4
mov r0, r4
mov r1, #2
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _021056c0
_021056b4:
@@ -6347,7 +6347,7 @@ func_ov05_02105dac: ; 0x02105dac
mov r6, r0
mov r0, r4
mov r1, #2
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
bne _02105dec
ldr r0, _021065e8 ; =gItemManager
@@ -7239,7 +7239,7 @@ func_ov05_02106a50: ; 0x02106a50
stmdb sp!, {r3, r4, r5, lr}
mov r1, #2
mov r4, r0
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
@@ -8290,7 +8290,7 @@ _02107908:
bl func_ov05_02107fc0
mov r0, r5
mov r1, #2
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
bne _02107934
mov r0, r5
@@ -8319,7 +8319,7 @@ func_ov05_02107954: ; 0x02107954
mov r1, #0
str r1, [r0, #4]
mov r0, r4
bl _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
tst r0, #0x10
beq _02107a18
ldrb r0, [r4, #0x28]
@@ -8362,7 +8362,7 @@ _021079d0:
_02107a08:
mov r0, r4
mov r1, #0x10
bl _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
b _02107b1c
_02107a18:
ldr r1, _02107b60 ; =data_ov05_021126b4
@@ -8464,7 +8464,7 @@ func_ov05_02107b74: ; 0x02107b74
mov r6, r1
mov r5, r2
mov r4, r3
bl _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
tst r0, #8
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
ldr r1, [r6]
@@ -8476,12 +8476,12 @@ func_ov05_02107b74: ; 0x02107b74
str r1, [r7, #0x94]
strh r5, [r7, #0x10]
strh r4, [r7, #0x18]
bl _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
tst r0, #0x10
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
mov r0, r7
mov r1, #0x10
bl _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
ldmia sp!, {r3, r4, r5, r6, r7, pc}
arm_func_end func_ov05_02107b74
@@ -8782,7 +8782,7 @@ func_ov05_02107fc0: ; 0x02107fc0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
mov r1, #2
mov sl, r0
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
mov r6, #0
@@ -8832,7 +8832,7 @@ _02108060:
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
mov r0, sl
mov r1, #2
bl _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
arm_func_end func_ov05_02107fc0
@@ -8846,12 +8846,12 @@ func_ov05_02108094: ; 0x02108094
stmdb sp!, {r4, lr}
mov r1, #0x3f
mov r4, r0
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _0210817c
mov r0, r4
mov r1, #2
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _021080ec
ldr r0, _02108184 ; =data_027e0fb8
@@ -8868,7 +8868,7 @@ func_ov05_02108094: ; 0x02108094
_021080ec:
mov r0, r4
mov r1, #8
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _02108110
mov r0, #6
@@ -8878,7 +8878,7 @@ _021080ec:
_02108110:
mov r0, r4
mov r1, #4
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _02108134
mov r0, #5
@@ -8888,7 +8888,7 @@ _02108110:
_02108134:
mov r0, r4
mov r1, #0x10
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _02108158
mov r0, #7
@@ -8898,7 +8898,7 @@ _02108134:
_02108158:
mov r0, r4
mov r1, #0x20
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _0210817c
mov r0, #8
@@ -8931,7 +8931,7 @@ _021081a4: .word data_ov05_021126e4
func_ov05_021081a8: ; 0x021081a8
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
tst r0, #0x20
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -9916,7 +9916,7 @@ func_ov05_02108e8c: ; 0x02108e8c
mov r2, #1
bl func_ov00_02097ff4
mov r0, r4
bl _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
ldmia sp!, {r4, pc}
_02108ee8:
ldmneia sp!, {r4, pc}
@@ -10018,7 +10018,7 @@ _02109018:
beq _021090dc
ldrb r1, [r4, #0xab]
mov r0, r4
bl _ZN13LinkStateBase19PlayerLink_vfunc_88Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_88Ev
ldr r1, [r4, #0x98]
cmp r1, #0
blt _02109060
@@ -11740,7 +11740,7 @@ _0210a758:
mov r2, r0
mov r0, r4
mov r1, #1
bl _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
ldmia sp!, {r4, pc}
arm_func_end func_ov05_0210a714
@@ -12026,7 +12026,7 @@ func_ov05_0210ab1c: ; 0x0210ab1c
mov r1, #0
bl func_ov05_0211058c
mov r0, r6
bl _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
cmp r0, #0
beq _0210ab84
ldr r0, _0210ad6c ; =data_027e0d38
@@ -12203,7 +12203,7 @@ func_ov05_0210ad88: ; 0x0210ad88
ble _0210ae00
_0210ade0:
mov r0, r5
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
mov r0, r5
@@ -12487,13 +12487,13 @@ _0210b220:
subgt r0, r0, #1
strgt r0, [r5, #0xc]
mov r0, r5
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
b _0210b264
_0210b244:
mov r0, r5
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
mov r0, r5
@@ -12539,7 +12539,7 @@ func_ov05_0210b2a4: ; 0x0210b2a4
movs r4, r0
bne _0210b2fc
mov r0, r5
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
mov r0, r5
@@ -12574,7 +12574,7 @@ _0210b32c:
cmp r0, #0
beq _0210b37c
mov r0, r5
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
mov r0, r5
@@ -12588,7 +12588,7 @@ _0210b37c:
bl _ZN13LinkStateBase15ChangeLinkStateEi
ldmia sp!, {r3, r4, r5, pc}
_0210b394:
bl _ZN13LinkStateBase20Get_PlayerLink_Unk44Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
mov r1, #0
str r1, [r0]
_0210b3a0:
@@ -13689,7 +13689,7 @@ _0210c2a8:
_0210c2b4:
mov r0, r7
mov r1, #2
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
addne sp, sp, #0x78
movne r0, #0
@@ -17079,7 +17079,7 @@ _0210f0f8:
mov r1, #2
str r3, [sp]
str r3, [sp, #4]
bl _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
ldr r0, _0210f6ac ; =data_027e0c54
ldrb r1, [r0]
cmp r1, #0
@@ -17969,7 +17969,7 @@ _0210fd44:
mov r4, r3, lsr #0xc
mov r1, #2
orr r4, r4, r2, lsl #20
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
beq _0210feec
ldr r0, _02110200 ; =0x000004cd
@@ -19534,7 +19534,7 @@ func_ov05_021112ec: ; 0x021112ec
ldmeqia sp!, {r4, pc}
mov r0, r4
mov r1, #0x3f
bl _ZN13LinkStateBase25HasFlags_PlayerLink_Unk48Et
bl _ZN13LinkStateBase29HasFlags_PlayerLinkBase_Unk48Et
cmp r0, #0
ldmneia sp!, {r4, pc}
mov r0, r4
@@ -19936,7 +19936,7 @@ _02111868:
strh r0, [r5, #0x12]
b _021118c0
_0211188c:
bl _ZN13LinkStateBase20Get_PlayerLink_Unk5eEv
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk5eEv
cmp r0, #0
beq _021118c0
cmp r4, #0
@@ -20049,7 +20049,7 @@ _02111a18:
mov r1, #0
str r3, [sp, #4]
str r3, [sp, #8]
bl _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
add sp, sp, #0x58
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
_02111a3c:
@@ -20058,7 +20058,7 @@ _02111a3c:
mov r2, r0
mov r0, r5
mov r1, #1
bl _ZN13LinkStateBase19PlayerLink_vfunc_58Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
add sp, sp, #0x58
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
asm/ov12.s
+1 -1
View File
@@ -41132,7 +41132,7 @@ func_ov12_02134378: ; 0x02134378
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
bl _ZN13LinkStateBase19PlayerLink_vfunc_74Ev
bl _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov12_02134378
asm/ov19.s
+2 -2
View File
@@ -10011,7 +10011,7 @@ func_ov19_02175a2c: ; 0x02175a2c
addeq sp, sp, #0x10
ldmeqia sp!, {r3, r4, r5, pc}
mov r0, r4
bl _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
tst r0, #8
beq _02175af8
ldrsh r0, [r4, #0x10]
@@ -10054,7 +10054,7 @@ _02175ad8:
_02175ae8:
mov r0, r4
mov r1, #8
bl _ZN13LinkStateBase22Clear_PlayerLink_Unk48Et
bl _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et
b _02175be8
_02175af8:
ldrsh r5, [r4, #0x10]
asm/ov21.s
+1 -1
View File
@@ -3816,7 +3816,7 @@ _0217067c: .word data_ov21_02171958
func_ov21_02170680: ; 0x02170680
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl _ZN13LinkStateBase20Get_PlayerLink_Unk48Ev
bl _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
tst r0, #4
beq _021706fc
ldrb r0, [r5, #0x28]
include/Player/LinkStateBase.hpp
+12 -12
View File
@@ -6,7 +6,7 @@
#include "lib/math.h"
#include "System/SysNew.hpp"
#include "Player/PlayerLink.hpp"
#include "Player/PlayerLinkBase.hpp"
#include "Player/PlayerControlData.hpp"
#include "Actor/Actor.hpp"
#include "Actor/ActorManager.hpp"
@@ -31,7 +31,7 @@ class LinkStateBase : public SysObject {
public:
/* 0 (vtable) */
/* 4 */ unk32 mSubState;
/* 8 */ PlayerLink *mLink;
/* 8 */ PlayerLinkBase *mLink;
/* c */
/* 00 */ virtual void vfunc_00();
@@ -76,14 +76,14 @@ public:
void func_ov00_020a853c(Vec3p *param1);
void Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5);
void PlayerBase_vfunc_38(Vec3p *pos);
void PlayerLink_vfunc_74();
void PlayerLink_vfunc_88();
unk16 Get_PlayerLink_Unk48();
void PlayerLinkBase_vfunc_74();
void PlayerLinkBase_vfunc_88();
unk16 Get_PlayerLinkBase_Unk48();
bool func_ov00_020a8638(unk32 param1);
void Clear_PlayerLink_Unk48(u16 flags);
void Clear_PlayerLinkBase_Unk48(u16 flags);
void func_ov00_020a8680(unk32 param1, unk16 param2, bool param3);
void PlayerLink_func_ov00_020bccc8();
bool PlayerLink_vfunc_58();
void PlayerLinkBase_func_ov00_020bccc8();
bool PlayerLinkBase_vfunc_58();
bool func_ov00_020a8704(s16 *pAngle);
bool func_ov00_020a8774(Vec3p *param1, s32 angle);
void func_ov00_020a8844(Vec3p *param1, bool param2, bool param3);
@@ -98,8 +98,8 @@ public:
void func_ov00_020a8b04(s32 param1, bool param2);
void func_ov00_020a8b3c(s32 param1);
bool func_ov00_020a8b80();
bool HasFlags_PlayerLink_Unk48(u16 flags);
unk8 Get_PlayerLink_Unk5e();
bool HasFlags_PlayerLinkBase_Unk48(u16 flags);
unk8 Get_PlayerLinkBase_Unk5e();
unk32 Get_PlayerControlData_Unk004();
PlayerCharacter GetCurrentCharacter();
PlayerControlData* GetPlayerControlData();
@@ -116,7 +116,7 @@ public:
Actor* GetGrabActor();
ActorRef* GetGrabActorRef();
unk32 Grab();
s32 Get_PlayerLink_Unk44();
s32 Get_PlayerLinkBase_Unk44();
bool IsEquipBeingUsed(ItemFlag id);
EquipItem* GetEquipItem(ItemFlag id);
void* func_ov00_020a8d40();
@@ -125,7 +125,7 @@ public:
s32 PlayerControlData_vfunc_14(s32 param1);
unk32 Get_PlayerControlData_Unk100();
unk32 Get_PlayerControlData_Unk120();
s32 Get_PlayerLink_Unk38();
s32 Get_PlayerLinkBase_Unk38();
DebugHierarchy* GetDebugHierarchy0();
DebugHierarchy* GetDebugHierarchy1();
};
include/Player/PlayerLink.hpp → include/Player/PlayerLinkBase.hpp
+1 -1
View File
@@ -17,7 +17,7 @@ enum PlayerCharacter_ {
PlayerCharacter_Gongoron = 1,
};
class PlayerLink: public PlayerBase {
class PlayerLinkBase: public PlayerBase {
/* 00 (base) */
/* 14 */ Vec3p mPos;
/* 20 */ Vec3p mVel;
src/00_Core/Player/LinkStateBase.cpp
+10 -10
View File
@@ -33,14 +33,14 @@ void LinkStateBase::func_ov00_020a8508() {}
void LinkStateBase::func_ov00_020a853c(Vec3p *param1) {}
void LinkStateBase::Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) {}
void LinkStateBase::PlayerBase_vfunc_38(Vec3p *pos) {}
void LinkStateBase::PlayerLink_vfunc_74() {}
void LinkStateBase::PlayerLink_vfunc_88() {}
unk16 LinkStateBase::Get_PlayerLink_Unk48() {}
void LinkStateBase::PlayerLinkBase_vfunc_74() {}
void LinkStateBase::PlayerLinkBase_vfunc_88() {}
unk16 LinkStateBase::Get_PlayerLinkBase_Unk48() {}
bool LinkStateBase::func_ov00_020a8638(unk32 param1) {}
void LinkStateBase::Clear_PlayerLink_Unk48(u16 flags) {}
void LinkStateBase::Clear_PlayerLinkBase_Unk48(u16 flags) {}
void LinkStateBase::func_ov00_020a8680(unk32 param1, unk16 param2, bool param3) {}
void LinkStateBase::PlayerLink_func_ov00_020bccc8() {}
bool LinkStateBase::PlayerLink_vfunc_58() {}
void LinkStateBase::PlayerLinkBase_func_ov00_020bccc8() {}
bool LinkStateBase::PlayerLinkBase_vfunc_58() {}
bool LinkStateBase::func_ov00_020a8704(s16 *pAngle) {}
bool LinkStateBase::func_ov00_020a8774(Vec3p *param1, s32 angle) {}
void LinkStateBase::func_ov00_020a8844(Vec3p *param1, bool param2, bool param3) {}
@@ -55,8 +55,8 @@ void LinkStateBase::func_ov00_020a8ad0(unk32 param1) {}
void LinkStateBase::func_ov00_020a8b04(s32 param1, bool param2) {}
void LinkStateBase::func_ov00_020a8b3c(s32 param1) {}
bool LinkStateBase::func_ov00_020a8b80() {}
bool LinkStateBase::HasFlags_PlayerLink_Unk48(u16 flags) {}
unk8 LinkStateBase::Get_PlayerLink_Unk5e() {}
bool LinkStateBase::HasFlags_PlayerLinkBase_Unk48(u16 flags) {}
unk8 LinkStateBase::Get_PlayerLinkBase_Unk5e() {}
unk32 LinkStateBase::Get_PlayerControlData_Unk004() {}
PlayerCharacter LinkStateBase::GetCurrentCharacter() {}
PlayerControlData* LinkStateBase::GetPlayerControlData() {}
@@ -73,7 +73,7 @@ s32 LinkStateBase::Get_PlayerControlData_Unk32() {}
Actor* LinkStateBase::GetGrabActor() {}
ActorRef* LinkStateBase::GetGrabActorRef() {}
unk32 LinkStateBase::Grab() {}
s32 LinkStateBase::Get_PlayerLink_Unk44() {}
s32 LinkStateBase::Get_PlayerLinkBase_Unk44() {}
bool LinkStateBase::IsEquipBeingUsed(ItemFlag id) {}
EquipItem* LinkStateBase::GetEquipItem(ItemFlag id) {}
void* LinkStateBase::func_ov00_020a8d40() {}
@@ -82,7 +82,7 @@ unk32 LinkStateBase::func_ov00_020a8d6c() {}
s32 LinkStateBase::PlayerControlData_vfunc_14(s32 param1) {}
unk32 LinkStateBase::Get_PlayerControlData_Unk100() {}
unk32 LinkStateBase::Get_PlayerControlData_Unk120() {}
s32 LinkStateBase::Get_PlayerLink_Unk38() {}
s32 LinkStateBase::Get_PlayerLinkBase_Unk38() {}
DebugHierarchy* LinkStateBase::GetDebugHierarchy0() {}
DebugHierarchy* LinkStateBase::GetDebugHierarchy1() {}