mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

LinkStateGrab -> LinkStateInteract

Browse Source
This commit is contained in:
Aetias
2024-03-31 09:53:44 +02:00
parent 348a5b5b65
commit de7aff1571
31 changed files with 256 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/main.inc
+1 -1
View File
@@ -229,7 +229,7 @@
.extern func_ov00_0207b334
.extern func_ov00_020838e8
.extern func_ov05_02100ae0
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN11ItemManager7AddItemEi
.extern func_ov00_02087d98
asm/include/ov04.inc
+1 -1
View File
@@ -571,7 +571,7 @@
.extern func_ov00_020b4b90
.extern func_ov00_020bd364
.extern func_ov00_020bb544
.extern _ZTV13LinkStateGrab
.extern _ZTV17LinkStateInteract
.extern func_020350ac
.extern func_02037750
.extern data_ov00_020e634c
asm/include/ov05.inc
+8 -8
View File
@@ -316,7 +316,7 @@
.extern data_027e0fbc
.extern func_0202d6e4
.extern func_020385b8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern func_ov00_020cfbb0
.extern func_ov09_0211cac0
.extern func_ov09_0211c808
@@ -391,7 +391,7 @@
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev
.extern func_01ff9cec
.extern _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
.extern _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
.extern func_ov00_020840c4
.extern func_ov00_0208583c
.extern func_ov17_0215f874
@@ -402,20 +402,20 @@
.extern func_0202b154
.extern _ZN13LinkStateBase18func_ov00_020a81fcEv
.extern func_01ffa0f4
.extern _ZN13LinkStateGrab18func_ov00_020aa818Ev
.extern _ZN17LinkStateInteract18func_ov00_020aa818Ev
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk44Ev
.extern func_0202bbbc
.extern func_0202bb78
.extern _ZN13LinkStateBase18func_ov00_020a8c34Ev
.extern func_ov00_020b0778
.extern _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
.extern _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
.extern func_ov00_020b0ab4
.extern _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb
.extern func_ov00_020c2a0c
.extern _ZN9SysObjectdlEPv
.extern func_020350b4
.extern func_020351b8
.extern _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov14_0213d420
@@ -426,7 +426,7 @@
.extern func_ov14_0214bd7c
.extern func_ov14_0214bd68
.extern func_ov00_020a9180
.extern _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
.extern func_ov00_020b13c4
.extern func_ov23_021716b0
.extern func_ov00_0208527c
@@ -436,7 +436,7 @@
.extern func_ov21_0216d830
.extern func_ov14_0214a3dc
.extern _ZN13LinkStateBase18func_ov00_020a81b8Eii
.extern _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
.extern func_ov00_020798e8
.extern func_ov00_020d3e80
.extern func_ov00_02079a4c
@@ -549,7 +549,7 @@
.extern _ZN13LinkStateBase27Get_PlayerControlData_Unk32Ev
.extern func_0202b418
.extern func_ov00_020ceacc
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern data_ov00_020e56f0
.extern func_ov00_02080de8
.extern func_ov00_0208344c
asm/include/ov12.inc
+1 -1
View File
@@ -207,7 +207,7 @@
.extern func_ov00_020bcc24
.extern func_ov00_0208ae94
.extern func_020385b8
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern func_ov00_02083664
.extern func_ov00_020bb544
.extern func_0202d77c
asm/include/ov18.inc
+1 -1
View File
@@ -297,7 +297,7 @@
.extern func_ov00_020c243c
.extern func_ov00_020c1fc8
.extern func_020385b8
.extern _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.extern func_ov14_02145cac
.extern func_ov14_02145178
.extern func_ov00_020c5f1c
asm/include/ov23.inc
+2 -2
View File
@@ -191,7 +191,7 @@
.extern _ZN13LinkStateBase15GetPlayer_Unk18Ev
.extern func_ov00_020a9180
.extern func_020385b8
.extern _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
.extern func_ov00_020b034c
.extern func_ov00_020b0328
.extern func_01fffcd8
@@ -378,7 +378,7 @@
.extern data_027e0fd8
.extern data_027e0fd0
.extern func_ov00_020bb544
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern func_ov14_0213ec64
.extern func_ov00_02083918
.extern func_ov00_02083948
asm/include/ov41.inc
+1 -1
View File
@@ -127,7 +127,7 @@
.extern func_ov14_0214aa0c
.extern func_ov00_020c2974
.extern func_020385b8
.extern _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.extern data_027e0f94
.extern func_ov14_02145c7c
.extern func_ov00_02083a1c
asm/include/ov42.inc
+1 -1
View File
@@ -13,7 +13,7 @@
.extern func_ov00_02087400
.extern _ZN11ItemManager13ForceEquipItemEi
.extern func_020385b8
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern func_ov00_020bcf50
.extern func_ov00_020c1500
.extern func_ov00_020c3348
asm/include/ov55.inc
+2 -2
View File
@@ -26,9 +26,9 @@
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern func_01ff9bc4
.extern func_020385b8
.extern _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
.extern func_ov00_020b049c
.extern _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
.extern _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020b034c
.extern func_ov05_0210f808
asm/include/ov58.inc
+1 -1
View File
@@ -82,7 +82,7 @@
.extern _ZN13LinkStateBase15GetGrabActorRefEv
.extern func_ov14_0213ed94
.extern func_020385b8
.extern _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
.extern _ZN13LinkStateBase6LookAtEP5Vec3p
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase14GetPlayerAngleEv
asm/main.s
+1 -1
View File
@@ -76899,7 +76899,7 @@ _02038374:
ldmia sp!, {r3, r4, r5, pc}
_020383ac:
bl func_020385b8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
add sp, sp, #0x18
mov r0, #2
ldmia sp!, {r3, r4, r5, pc}
asm/ov00/Player/LinkStateDamage.s
+1 -1
View File
@@ -581,7 +581,7 @@ _020ac64c:
bl func_ov00_020d716c
bl func_020385b8
mov r1, #0
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
_020ac698:
mov r1, #0xf
ldr r0, _020ac7e0 ; =data_027e0db0
asm/ov00/Player/LinkStateGrab.s → asm/ov00/Player/LinkStateInteract.s
+136 -136
View File
@@ -1,25 +1,25 @@
.include "macros/function.inc"
.include "ov00/Player/include/LinkStateGrab.inc"
.include "ov00/Player/include/LinkStateInteract.inc"
.text
.global _ZN13LinkStateGrab8vfunc_00Ev
thumb_func_start _ZN13LinkStateGrab8vfunc_00Ev
_ZN13LinkStateGrab8vfunc_00Ev: ; 0x020aa32c
.global _ZN17LinkStateInteract8vfunc_00Ev
thumb_func_start _ZN17LinkStateInteract8vfunc_00Ev
_ZN17LinkStateInteract8vfunc_00Ev: ; 0x020aa32c
bx lr
.align 2, 0
thumb_func_end _ZN13LinkStateGrab8vfunc_00Ev
thumb_func_end _ZN17LinkStateInteract8vfunc_00Ev
.global _ZN13LinkStateGrab5GetIdEv
arm_func_start _ZN13LinkStateGrab5GetIdEv
_ZN13LinkStateGrab5GetIdEv: ; 0x020aa330
.global _ZN17LinkStateInteract5GetIdEv
arm_func_start _ZN17LinkStateInteract5GetIdEv
_ZN17LinkStateInteract5GetIdEv: ; 0x020aa330
mov r0, #2
bx lr
arm_func_end _ZN13LinkStateGrab5GetIdEv
arm_func_end _ZN17LinkStateInteract5GetIdEv
.global _ZN13LinkStateGrab20CreateDebugHierarchyEv
arm_func_start _ZN13LinkStateGrab20CreateDebugHierarchyEv
_ZN13LinkStateGrab20CreateDebugHierarchyEv: ; 0x020aa338
.global _ZN17LinkStateInteract20CreateDebugHierarchyEv
arm_func_start _ZN17LinkStateInteract20CreateDebugHierarchyEv
_ZN17LinkStateInteract20CreateDebugHierarchyEv: ; 0x020aa338
ldr r1, [r0, #4]
cmp r1, #7
cmpne r1, #8
@@ -30,11 +30,11 @@ _ZN13LinkStateGrab20CreateDebugHierarchyEv: ; 0x020aa338
_020aa354:
mvn r0, #0
bx lr
arm_func_end _ZN13LinkStateGrab20CreateDebugHierarchyEv
arm_func_end _ZN17LinkStateInteract20CreateDebugHierarchyEv
.global _ZN13LinkStateGrab14GetGrabActorIdEv
thumb_func_start _ZN13LinkStateGrab14GetGrabActorIdEv
_ZN13LinkStateGrab14GetGrabActorIdEv: ; 0x020aa35c
.global _ZN17LinkStateInteract14GetGrabActorIdEv
thumb_func_start _ZN17LinkStateInteract14GetGrabActorIdEv
_ZN17LinkStateInteract14GetGrabActorIdEv: ; 0x020aa35c
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r5, r0, #0
@@ -227,7 +227,7 @@ _ZN13LinkStateGrab14GetGrabActorIdEv: ; 0x020aa35c
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
thumb_func_end _ZN13LinkStateGrab14GetGrabActorIdEv
thumb_func_end _ZN17LinkStateInteract14GetGrabActorIdEv
_020aa4f0: .word data_ov00_020e59b8
_020aa4f4: .word 0x4c475242
_020aa4f8: .word data_ov00_020e5940
@@ -246,9 +246,9 @@ _020aa528: .word data_ov00_020e5a34
_020aa52c: .word data_ov00_020e5928
_020aa530: .word 0x4c505348
.global _ZN13LinkStateGrab12OnStateEnterEv
arm_func_start _ZN13LinkStateGrab12OnStateEnterEv
_ZN13LinkStateGrab12OnStateEnterEv: ; 0x020aa534
.global _ZN17LinkStateInteract12OnStateEnterEv
arm_func_start _ZN17LinkStateInteract12OnStateEnterEv
_ZN17LinkStateInteract12OnStateEnterEv: ; 0x020aa534
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #8
mov r4, r0
@@ -419,7 +419,7 @@ _020aa778:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab12OnStateEnterEv
arm_func_end _ZN17LinkStateInteract12OnStateEnterEv
_020aa78c: .word data_027e0fb8
_020aa790: .word data_ov00_020e592c
_020aa794: .word data_ov00_020e593c
@@ -430,9 +430,9 @@ _020aa7a4: .word data_ov00_020e594c
_020aa7a8: .word data_027e0fe4
_020aa7ac: .word data_ov00_020e5908
.global _ZN13LinkStateGrab12OnStateLeaveEi
arm_func_start _ZN13LinkStateGrab12OnStateLeaveEi
_ZN13LinkStateGrab12OnStateLeaveEi: ; 0x020aa7b0
.global _ZN17LinkStateInteract12OnStateLeaveEi
arm_func_start _ZN17LinkStateInteract12OnStateLeaveEi
_ZN17LinkStateInteract12OnStateLeaveEi: ; 0x020aa7b0
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN13LinkStateBase12OnStateLeaveEi
@@ -460,12 +460,12 @@ _020aa7d4:
str r1, [r0, #4]
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab12OnStateLeaveEi
arm_func_end _ZN17LinkStateInteract12OnStateLeaveEi
_020aa814: .word data_027e0fb8
.global _ZN13LinkStateGrab18func_ov00_020aa818Ev
arm_func_start _ZN13LinkStateGrab18func_ov00_020aa818Ev
_ZN13LinkStateGrab18func_ov00_020aa818Ev: ; 0x020aa818
.global _ZN17LinkStateInteract18func_ov00_020aa818Ev
arm_func_start _ZN17LinkStateInteract18func_ov00_020aa818Ev
_ZN17LinkStateInteract18func_ov00_020aa818Ev: ; 0x020aa818
stmdb sp!, {r4, lr}
ldr r0, _020aa840 ; =gItemManager
ldr r4, [r0]
@@ -477,12 +477,12 @@ _ZN13LinkStateGrab18func_ov00_020aa818Ev: ; 0x020aa818
bl func_ov00_020ba458
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab18func_ov00_020aa818Ev
arm_func_end _ZN17LinkStateInteract18func_ov00_020aa818Ev
_020aa840: .word gItemManager
.global _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
arm_func_start _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
_ZN13LinkStateGrab18func_ov00_020aa844EP5Actor: ; 0x020aa844
.global _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
arm_func_start _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
_ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
sub sp, sp, #0x2c
mov r4, r1
@@ -714,13 +714,13 @@ _020aab34:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
arm_func_end _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
_020aabd0: .word data_02050f54
_020aabd4: .word 0x00000155
.global _ZN13LinkStateGrab8vfunc_20Ei
arm_func_start _ZN13LinkStateGrab8vfunc_20Ei
_ZN13LinkStateGrab8vfunc_20Ei: ; 0x020aabd8
.global _ZN17LinkStateInteract8vfunc_20Ei
arm_func_start _ZN17LinkStateInteract8vfunc_20Ei
_ZN17LinkStateInteract8vfunc_20Ei: ; 0x020aabd8
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #0xc8
mov r6, r1
@@ -969,7 +969,7 @@ _020aaf78:
add r1, sp, #0x5c
mov r0, r4
mov r2, r6
bl _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor
bl _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor
_020aaf88:
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerPosEv
@@ -1022,7 +1022,7 @@ _020ab000:
bl _ZN13LinkStateBase19GetCurrentCharacterEv
cmp r0, #1
bne _020ab060
bl _ZN13LinkStateGrab13GetLinkState4Ev
bl _ZN17LinkStateInteract13GetLinkState4Ev
add r2, sp, #0x50
mov r1, r6
bl func_ov23_02171410
@@ -1262,7 +1262,7 @@ _020ab3b0:
add sp, sp, #0xc8
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab8vfunc_20Ei
arm_func_end _ZN17LinkStateInteract8vfunc_20Ei
_020ab3bc: .word gItemManager
_020ab3c0: .word data_027e0d0c
_020ab3c4: .word data_02050f54
@@ -1275,19 +1275,19 @@ _020ab3dc: .word 0x00001ccd
_020ab3e0: .word 0x00001333
_020ab3e4: .word 0x000018e4
.global _ZN13LinkStateGrab13GetLinkState4Ev
arm_func_start _ZN13LinkStateGrab13GetLinkState4Ev
_ZN13LinkStateGrab13GetLinkState4Ev: ; 0x020ab3e8
.global _ZN17LinkStateInteract13GetLinkState4Ev
arm_func_start _ZN17LinkStateInteract13GetLinkState4Ev
_ZN17LinkStateInteract13GetLinkState4Ev: ; 0x020ab3e8
ldr ip, _020ab3f4 ; =func_01fffcd8
mov r0, #4
bx ip
.align 2, 0
arm_func_end _ZN13LinkStateGrab13GetLinkState4Ev
arm_func_end _ZN17LinkStateInteract13GetLinkState4Ev
_020ab3f4: .word func_01fffcd8
.global _ZN13LinkStateGrab8vfunc_24Ei
arm_func_start _ZN13LinkStateGrab8vfunc_24Ei
_ZN13LinkStateGrab8vfunc_24Ei: ; 0x020ab3f8
.global _ZN17LinkStateInteract8vfunc_24Ei
arm_func_start _ZN17LinkStateInteract8vfunc_24Ei
_ZN17LinkStateInteract8vfunc_24Ei: ; 0x020ab3f8
stmdb sp!, {r3, lr}
cmp r1, #5
addls pc, pc, r1, lsl #2
@@ -1340,11 +1340,11 @@ _020ab484:
_020ab49c:
mov r0, #0
ldmia sp!, {r3, pc}
arm_func_end _ZN13LinkStateGrab8vfunc_24Ei
arm_func_end _ZN17LinkStateInteract8vfunc_24Ei
.global _ZN13LinkStateGrab8vfunc_34EP5Vec3p
arm_func_start _ZN13LinkStateGrab8vfunc_34EP5Vec3p
_ZN13LinkStateGrab8vfunc_34EP5Vec3p: ; 0x020ab4a4
.global _ZN17LinkStateInteract8vfunc_34EP5Vec3p
arm_func_start _ZN17LinkStateInteract8vfunc_34EP5Vec3p
_ZN17LinkStateInteract8vfunc_34EP5Vec3p: ; 0x020ab4a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov r6, r0
mov r4, r1
@@ -1439,13 +1439,13 @@ _020ab604:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab8vfunc_34EP5Vec3p
arm_func_end _ZN17LinkStateInteract8vfunc_34EP5Vec3p
_020ab60c: .word data_02050f54
_020ab610: .word 0x00000b33
.global _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
arm_func_start _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
_ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
.global _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
arm_func_start _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
_ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
mov r5, r0
@@ -1473,12 +1473,12 @@ _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
arm_func_end _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
_020ab67c: .word data_027e0d0c
.global _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
arm_func_start _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
_ZN13LinkStateGrab15SetBombVelocityEP5Vec3p: ; 0x020ab680
.global _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
arm_func_start _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
_ZN17LinkStateInteract15SetBombVelocityEP5Vec3p: ; 0x020ab680
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
@@ -1493,16 +1493,16 @@ _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p: ; 0x020ab680
ldmneia sp!, {r3, r4, r5, pc}
mov r0, r5
mov r1, r4
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
arm_func_end _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
_020ab6c0: .word 0x424f4d42
_020ab6c4: .word 0x4b4f4b4f
.global _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
arm_func_start _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
_ZN13LinkStateGrab18func_ov00_020ab6c8Ev: ; 0x020ab6c8
.global _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
_ZN17LinkStateInteract18func_ov00_020ab6c8Ev: ; 0x020ab6c8
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN13LinkStateBase12GetGrabActorEv
@@ -1542,10 +1542,10 @@ _020ab740:
_020ab748:
mov r0, r4
mov r1, #0
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
_020ab758: .word 0x4b4f4b4f
_020ab75c: .word 0x424f4d42
_020ab760: .word 0x4452554d
@@ -1553,9 +1553,9 @@ _020ab764: .word 0x54415255
_020ab768: .word 0x53544e45
_020ab76c: .word 0x54535542
.global _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
arm_func_start _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
_ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p: ; 0x020ab770
.global _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
_ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p: ; 0x020ab770
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _020ab7b8 ; =data_027e0fb8
mov r6, r0
@@ -1567,7 +1567,7 @@ _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p: ; 0x020ab770
mov r0, r6
mov r1, r5
mov r2, r4
bl _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor
bl _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor
cmp r0, #0
bne _020ab7b0
_020ab7a8:
@@ -1577,12 +1577,12 @@ _020ab7b0:
ldr r0, [r4, #0x12c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
_020ab7b8: .word data_027e0fb8
.global _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor
arm_func_start _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor
_ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor: ; 0x020ab7bc
.global _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor
_ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor: ; 0x020ab7bc
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0x1c
ldr r3, [r2, #0x48]
@@ -1660,11 +1660,11 @@ _020ab8c0:
mov r0, #1
add sp, sp, #0x1c
ldmia sp!, {r4, r5, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor
.global _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
arm_func_start _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
_ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p: ; 0x020ab8cc
.global _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
arm_func_start _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
_ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p: ; 0x020ab8cc
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
@@ -1680,11 +1680,11 @@ _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p: ; 0x020ab8cc
mov r0, #5
str r0, [r5, #4]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
arm_func_end _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
.global _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
arm_func_start _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
_ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p: ; 0x020ab908
.global _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p
arm_func_start _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p
_ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p: ; 0x020ab908
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
@@ -1696,11 +1696,11 @@ _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p: ; 0x020ab908
mov r0, #3
str r0, [r5, #4]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
arm_func_end _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p
.global _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
arm_func_start _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
_ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p: ; 0x020ab934
.global _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
_ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p: ; 0x020ab934
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
@@ -1719,11 +1719,11 @@ _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p: ; 0x020ab934
str r2, [r5, #4]
bl _ZN13LinkStateBase15ChangeLinkStateEi
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.global _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
arm_func_start _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
_ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p: ; 0x020ab97c
.global _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
_ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p: ; 0x020ab97c
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
@@ -1739,11 +1739,11 @@ _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p: ; 0x020ab97c
mov r0, #4
str r0, [r5, #4]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
.global _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
arm_func_start _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
_ZN13LinkStateGrab18func_ov00_020ab9b8Ejb: ; 0x020ab9b8
.global _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
_ZN17LinkStateInteract18func_ov00_020ab9b8Ejb: ; 0x020ab9b8
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x18
mov r7, r0
@@ -1782,7 +1782,7 @@ _020aba30:
beq _020aba70
mov r0, r7
mov r5, #0
bl _ZN13LinkStateGrab18func_ov00_020aa818Ev
bl _ZN17LinkStateInteract18func_ov00_020aa818Ev
b _020aba70
_020aba54:
add r1, sp, #0xc
@@ -1791,7 +1791,7 @@ _020aba54:
cmp r0, #0
beq _020aba70
mov r0, r7
bl _ZN13LinkStateGrab18func_ov00_020aa818Ev
bl _ZN17LinkStateInteract18func_ov00_020aa818Ev
_020aba70:
cmp r5, #0
beq _020abb30
@@ -1856,16 +1856,16 @@ _020abb30:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
_020abb64: .word 0x424b4559
_020abb68: .word 0x464f5243
_020abb6c: .word 0x0000028f
_020abb70: .word data_02050f54
_020abb74: .word data_ov00_020eec9c
.global _ZN13LinkStateGrab4GrabEP8ActorRef
arm_func_start _ZN13LinkStateGrab4GrabEP8ActorRef
_ZN13LinkStateGrab4GrabEP8ActorRef: ; 0x020abb78
.global _ZN17LinkStateInteract4GrabEP8ActorRef
arm_func_start _ZN17LinkStateInteract4GrabEP8ActorRef
_ZN17LinkStateInteract4GrabEP8ActorRef: ; 0x020abb78
stmdb sp!, {r3, lr}
ldr r3, [r1]
mov r2, #6
@@ -1876,20 +1876,20 @@ _ZN13LinkStateGrab4GrabEP8ActorRef: ; 0x020abb78
bl _ZN13LinkStateBase18ChangeLinkSubStateEii
mov r0, #1
ldmia sp!, {r3, pc}
arm_func_end _ZN13LinkStateGrab4GrabEP8ActorRef
arm_func_end _ZN17LinkStateInteract4GrabEP8ActorRef
.global _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
arm_func_start _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
_ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef: ; 0x020abba0
.global _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
arm_func_start _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
_ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef: ; 0x020abba0
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateGrab18func_ov00_020abc40Ev
bl _ZN17LinkStateInteract18func_ov00_020abc40Ev
cmp r0, #0
beq _020abbc8
mov r0, r5
mov r1, r4
bl _ZN13LinkStateGrab4GrabEP8ActorRef
bl _ZN17LinkStateInteract4GrabEP8ActorRef
ldmia sp!, {r3, r4, r5, pc}
_020abbc8:
ldr r0, [r4]
@@ -1897,20 +1897,20 @@ _020abbc8:
ldr r0, [r4, #4]
str r0, [r5, #0x14]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
arm_func_end _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
.global _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
arm_func_start _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
_ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef: ; 0x020abbdc
.global _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
arm_func_start _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
_ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef: ; 0x020abbdc
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateGrab18func_ov00_020abc40Ev
bl _ZN17LinkStateInteract18func_ov00_020abc40Ev
cmp r0, #0
beq _020abc04
mov r0, r5
mov r1, r4
bl _ZN13LinkStateGrab4GrabEP8ActorRef
bl _ZN17LinkStateInteract4GrabEP8ActorRef
ldmia sp!, {r3, r4, r5, pc}
_020abc04:
ldr r0, [r4]
@@ -1918,26 +1918,26 @@ _020abc04:
ldr r0, [r4, #4]
str r0, [r5, #0x14]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
arm_func_end _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
.global _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
arm_func_start _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
_ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef: ; 0x020abc18
.global _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
arm_func_start _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
_ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef: ; 0x020abc18
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl _ZN13LinkStateGrab18func_ov00_020abc40Ev
bl _ZN17LinkStateInteract18func_ov00_020abc40Ev
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
mov r0, r5
mov r1, r4
bl _ZN13LinkStateGrab4GrabEP8ActorRef
bl _ZN17LinkStateInteract4GrabEP8ActorRef
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
arm_func_end _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
.global _ZN13LinkStateGrab18func_ov00_020abc40Ev
arm_func_start _ZN13LinkStateGrab18func_ov00_020abc40Ev
_ZN13LinkStateGrab18func_ov00_020abc40Ev: ; 0x020abc40
.global _ZN17LinkStateInteract18func_ov00_020abc40Ev
arm_func_start _ZN17LinkStateInteract18func_ov00_020abc40Ev
_ZN17LinkStateInteract18func_ov00_020abc40Ev: ; 0x020abc40
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN13LinkStateBase10GetStateIdEv
@@ -1953,11 +1953,11 @@ _ZN13LinkStateGrab18func_ov00_020abc40Ev: ; 0x020abc40
_020abc70:
mov r0, #0
ldmia sp!, {r4, pc}
arm_func_end _ZN13LinkStateGrab18func_ov00_020abc40Ev
arm_func_end _ZN17LinkStateInteract18func_ov00_020abc40Ev
.global _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
arm_func_start _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
_ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef: ; 0x020abc78
.global _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
arm_func_start _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
_ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef: ; 0x020abc78
stmdb sp!, {r4, r5, r6, lr}
mov r5, r0
mov r4, r1
@@ -2022,7 +2022,7 @@ _020abce0:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
arm_func_end _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
arm_func_end _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
_020abd6c: .word data_027e0fb8
_020abd70: .word data_027e0fe4
_020abd74: .word data_ov00_020eec9c
@@ -2179,22 +2179,22 @@ data_ov00_020e5968: ; 0x020e5968
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global _ZTV13LinkStateGrab
_ZTV13LinkStateGrab: ; 0x020e5974
.word _ZN13LinkStateGrab8vfunc_00Ev
.global _ZTV17LinkStateInteract
_ZTV17LinkStateInteract: ; 0x020e5974
.word _ZN17LinkStateInteract8vfunc_00Ev
.word func_ov04_0210ab88 ; data_ov07_0210ab88
.word func_ov04_0210ab9c ; data_ov07_0210ab9c
.word _ZN13LinkStateGrab5GetIdEv - 1
.word _ZN13LinkStateGrab14GetGrabActorIdEv
.word _ZN13LinkStateGrab12OnStateEnterEv - 1
.word _ZN13LinkStateGrab12OnStateLeaveEi - 1
.word _ZN17LinkStateInteract5GetIdEv - 1
.word _ZN17LinkStateInteract14GetGrabActorIdEv
.word _ZN17LinkStateInteract12OnStateEnterEv - 1
.word _ZN17LinkStateInteract12OnStateLeaveEi - 1
.word func_ov05_0210a648 ; data_ov07_0210a648
.word _ZN13LinkStateGrab8vfunc_20Ei - 1
.word _ZN13LinkStateGrab8vfunc_24Ei - 1
.word _ZN17LinkStateInteract8vfunc_20Ei - 1
.word _ZN17LinkStateInteract8vfunc_24Ei - 1
.word _ZN13LinkStateBase8vfunc_28Ev
.word func_ov05_0210b3bc ; data_ov07_0210b3bc
.word func_ov05_0210f708
.word _ZN13LinkStateGrab8vfunc_34EP5Vec3p - 1
.word _ZN17LinkStateInteract8vfunc_34EP5Vec3p - 1
.word func_ov05_0210f70c
.word func_ov05_0210f714
.word func_ov05_0210f71c
asm/ov00/Player/include/LinkStateDamage.inc
+1 -1
View File
@@ -27,7 +27,7 @@
.extern func_ov00_020d7424
.extern func_ov00_020d716c
.extern func_020385b8
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern func_ov00_02097ff4
.extern _ZN13LinkStateBase25GetCurrentCharacterHealthEv
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev
asm/ov00/Player/include/LinkStateGrab.inc → asm/ov00/Player/include/LinkStateInteract.inc
View File
asm/ov00/include/ov00_020ae7a4.inc
+10 -10
View File
@@ -117,7 +117,7 @@
.extern func_ov00_02097b9c
.extern func_0202ab78
.extern func_020385b8
.extern _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
.extern _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
.extern func_ov00_020872e8
.extern func_ov03_020f3f94
.extern func_ov00_0209779c
@@ -131,7 +131,7 @@
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern func_ov00_020838e8
.extern func_ov12_021343bc
.extern _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern func_ov05_02100ae0
.extern func_ov05_021099dc
.extern data_02052f54
@@ -242,7 +242,7 @@
.extern func_020368f4
.extern func_02036ce4
.extern func_0202b2f8
.extern _ZN13LinkStateGrab4GrabEP8ActorRef
.extern _ZN17LinkStateInteract4GrabEP8ActorRef
.extern func_ov00_020a95ec
.extern func_0202d598
.extern data_027e0ce0
@@ -267,15 +267,15 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern func_01fffcd8
.extern _ZN13LinkStateGrab13GetLinkState4Ev
.extern _ZN17LinkStateInteract13GetLinkState4Ev
.extern func_ov05_02107b74
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern func_ov05_0210a0c0
.extern func_ov22_02175958
.extern func_ov05_02109cd0
.extern func_ov05_0211058c
.extern _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
.extern _ZN13LinkStateGrab20CreateDebugHierarchyEv
.extern _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
.extern _ZN17LinkStateInteract20CreateDebugHierarchyEv
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern func_ov03_020f9f30
.extern func_ov00_02079878
@@ -286,7 +286,7 @@
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern func_ov05_02103f70
.extern func_ov29_02179238
.extern _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern func_ov05_021096bc
.extern _ZN4Item18func_ov00_020ad068Ei
.extern _ZN10PlayerBase14GetEquipShieldEv
@@ -494,16 +494,16 @@
.extern func_ov00_020876bc
.extern func_020376c0
.extern func_020385d0
.extern _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
.extern func_02036da8
.extern func_02037258
.extern func_02037b88
.extern func_ov00_02097968
.extern _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
.extern func_ov00_02089a2c
.extern func_ov00_02089068
.extern func_02037f58
.extern _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
.extern func_ov00_02097bdc
.extern func_02036d4c
.extern func_ov00_02087ab0
asm/ov00/ov00_020ae7a4.s
+18 -18
View File
@@ -4645,7 +4645,7 @@ _020b2338:
bl _ZN13LinkStateBase18func_ov00_020a82acEv
bl func_020385b8
mov r1, #0
bl _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
bl _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
ldr r0, [r4, #0x64]
cmp r0, #0xf
addls pc, pc, r0, lsl #2
@@ -4898,7 +4898,7 @@ _020b2658:
_020b2664:
bl func_020385b8
mov r1, #0
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
ldr r0, _020b2b94 ; =data_027e0d38
add r1, sp, #0
ldr r0, [r0]
@@ -4912,7 +4912,7 @@ _020b2688:
beq _020b26a4
bl func_020385b8
mov r1, #0
bl _ZN13LinkStateGrab15SetBombVelocityEP5Vec3p
bl _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
_020b26a4:
ldr r0, _020b2b94 ; =data_027e0d38
add r1, sp, #0
@@ -15210,7 +15210,7 @@ _020bac10:
bl func_ov00_020c1908
bl func_020385b8
add r1, r6, #8
bl _ZN13LinkStateGrab4GrabEP8ActorRef
bl _ZN17LinkStateInteract4GrabEP8ActorRef
mov r0, r6
strb r5, [r6, #0x278]
ldr r2, [r0]
@@ -17018,7 +17018,7 @@ _020bc028:
bne _020bc060
bl func_020385b8
add r1, sp, #0
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
_020bc060:
ldr r0, _020bc084 ; =data_027e0fb8
ldr r0, [r0]
@@ -17118,7 +17118,7 @@ _020bc114:
bl func_ov00_020bb544
bl func_020385b8
add r1, sp, #0xc
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
ldr r0, _020bc1c4 ; =data_027e0fb8
ldr r0, [r0]
bl func_ov00_020af050
@@ -17139,7 +17139,7 @@ func_ov00_020bc1c8: ; 0x020bc1c8
mov r6, r1
mov r5, r2
mov r4, r3
bl _ZN13LinkStateGrab13GetLinkState4Ev
bl _ZN17LinkStateInteract13GetLinkState4Ev
mov r1, r6
mov r2, r5
mov r3, r4
@@ -17160,7 +17160,7 @@ _020bc20c: .word data_027e0fac
arm_func_start func_ov00_020bc210
func_ov00_020bc210: ; 0x020bc210
stmdb sp!, {r3, lr}
bl _ZN13LinkStateGrab13GetLinkState4Ev
bl _ZN17LinkStateInteract13GetLinkState4Ev
mov r1, #1
strb r1, [r0, #0x28]
mov r0, r1
@@ -17638,7 +17638,7 @@ func_ov00_020bc7e0: ; 0x020bc7e0
mov r4, r1
bl func_020385b8
mov r1, r4
bl _ZN13LinkStateGrab18func_ov00_020abc78EP8ActorRef
bl _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
ldmia sp!, {r4, pc}
arm_func_end func_ov00_020bc7e0
@@ -17647,7 +17647,7 @@ func_ov00_020bc7e0: ; 0x020bc7e0
func_ov00_020bc7f8: ; 0x020bc7f8
stmdb sp!, {r3, lr}
bl func_020385b8
bl _ZN13LinkStateGrab20CreateDebugHierarchyEv
bl _ZN17LinkStateInteract20CreateDebugHierarchyEv
ldmia sp!, {r3, pc}
arm_func_end func_ov00_020bc7f8
@@ -18194,7 +18194,7 @@ func_ov00_020bce48: ; 0x020bce48
cmp r1, r0
beq _020bce9c
bl func_020385b8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
_020bce9c:
bl func_ov00_020a914c
mov r1, r4
@@ -18341,7 +18341,7 @@ func_ov00_020bd030: ; 0x020bd030
mov r5, r0
mov r4, r1
bl func_020385b8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
bl func_ov00_020a914c
mov r2, r4
ldr r1, _020bd06c ; =data_ov00_020e62a8
@@ -18657,7 +18657,7 @@ _020bd408:
mov r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, pc}
strb r0, [sp, #4]
bl _ZN13LinkStateGrab13GetLinkState4Ev
bl _ZN17LinkStateInteract13GetLinkState4Ev
add ip, sp, #4
mov r1, r6
mov r2, r5
@@ -18684,7 +18684,7 @@ _020bd484:
ldrb r0, [sp, #4]
cmp r0, #0
beq _020bd4b8
bl _ZN13LinkStateGrab13GetLinkState4Ev
bl _ZN17LinkStateInteract13GetLinkState4Ev
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x20]
@@ -18697,7 +18697,7 @@ _020bd484:
_020bd4b8:
bl func_020385b8
ldr r1, _020bd4d4 ; =data_027e0fa0
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
mov r0, #1
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -45392,7 +45392,7 @@ _020d1f74:
beq _020d1ff8
bl func_020385b8
mov r1, r7
bl _ZN13LinkStateGrab18func_ov00_020abc18EP8ActorRef
bl _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
b _020d1ff8
_020d1fd8:
ldrb r4, [r8, #1]
@@ -45699,7 +45699,7 @@ _020d2400:
bl func_020385b8
add r1, r7, #0x20
add r1, r1, r4, lsl #3
bl _ZN13LinkStateGrab18func_ov00_020abbdcEP8ActorRef
bl _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
add sp, sp, #8
mov r0, #2
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -46080,7 +46080,7 @@ _020d2934:
blt _020d2904
bl func_020385b8
mov r1, r6
bl _ZN13LinkStateGrab18func_ov00_020abba0EP8ActorRef
bl _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
ldrb r0, [r8, #0x54]
cmp r0, #0
beq _020d29c0
asm/ov04.s
+2 -2
View File
@@ -20593,7 +20593,7 @@ func_ov04_0210ab44: ; 0x0210ab44
push {r4, lr}
add r4, r0, #0
bl func_ov04_0210add4
ldr r0, _0210ab84 ; =_ZTV13LinkStateGrab
ldr r0, _0210ab84 ; =_ZTV17LinkStateInteract
str r0, [r4]
mov r0, #0
str r0, [r4, #0xc]
@@ -20622,7 +20622,7 @@ func_ov04_0210ab44: ; 0x0210ab44
pop {r4, pc}
.align 2, 0
thumb_func_end func_ov04_0210ab44
_0210ab84: .word _ZTV13LinkStateGrab
_0210ab84: .word _ZTV17LinkStateInteract
.global func_ov04_0210ab88
thumb_func_start func_ov04_0210ab88
asm/ov05.s
+10 -10
View File
@@ -9567,7 +9567,7 @@ func_ov05_021089f4: ; 0x021089f4
sub sp, sp, #0xc
mov r4, r0
bl func_020385b8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a82acEv
ldr r0, _02108ce0 ; =data_027e0fb8
@@ -11770,7 +11770,7 @@ _0210a798:
moveq r2, #1
movne r2, #0
mov r0, r4
bl _ZN13LinkStateGrab18func_ov00_020ab9b8Ejb
bl _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
ldmia sp!, {r4, pc}
arm_func_end func_ov05_0210a774
@@ -12134,7 +12134,7 @@ _0210ac7c:
add r1, sp, #0x18
bl _ZN13LinkStateBase18func_ov00_020a81fcEv
mov r0, r6
bl _ZN13LinkStateGrab18func_ov00_020aa818Ev
bl _ZN17LinkStateInteract18func_ov00_020aa818Ev
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, pc}
_0210ad00:
@@ -12503,7 +12503,7 @@ _0210b244:
_0210b264:
mov r0, r5
mov r1, r4
bl _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
bl _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
add r0, r5, #0x24
bl func_0203516c
add sp, sp, #0x100
@@ -12594,7 +12594,7 @@ _0210b394:
_0210b3a0:
mov r0, r5
mov r1, r4
bl _ZN13LinkStateGrab18func_ov00_020aa844EP5Actor
bl _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end func_ov05_0210b2a4
@@ -12901,7 +12901,7 @@ _0210b7b0:
bl func_ov00_020af044
bl func_020385b8
add r1, r5, #0x24
bl _ZN13LinkStateGrab18func_ov00_020ab97cEP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p
mov r0, r5
mov r1, #2
bl _ZN13LinkStateBase15ChangeLinkStateEi
@@ -13486,7 +13486,7 @@ func_ov05_0210bf50: ; 0x0210bf50
mov r5, r0
bl func_020385b8
add r1, sp, #8
bl _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
cmp r0, #0
cmpeq r5, #0
movne r5, #1
@@ -14035,7 +14035,7 @@ _0210c7a8:
bl func_ov00_020af044
bl func_020385b8
add r1, r5, #0x18
bl _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -19632,7 +19632,7 @@ func_ov05_021113dc: ; 0x021113dc
mov r7, r0
bl func_020385b8
add r1, sp, #0x4c
bl _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
movs r8, r0
cmpeq r7, #0
moveq sb, #0
@@ -19991,7 +19991,7 @@ _02111944:
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, r0
mov r0, r6
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
_02111960:
mov r0, r5
bl _ZN13LinkStateBase12GetGrabActorEv
asm/ov12.s
+1 -1
View File
@@ -9472,7 +9472,7 @@ func_ov12_0211a7d0: ; 0x0211a7d0
bl func_ov00_020bcdb8
bl func_020385b8
mov r1, #0
bl _ZN13LinkStateGrab20SetGrabActorVelocityEP5Vec3p
bl _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
bl func_ov12_0211a964
mov r2, #0
strh r2, [r0, #0x12]
asm/ov18.s
+1 -1
View File
@@ -12822,7 +12822,7 @@ func_ov18_02165948: ; 0x02165948
beq _02165980
bl func_020385b8
add r1, r4, #0x48
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
_02165980:
add r0, r4, #0x1d8
mov r1, #2
asm/ov23.s
+2 -2
View File
@@ -5178,7 +5178,7 @@ _021719b0:
mov r5, r0
bl func_020385b8
add r1, sp, #0x28
bl _ZN13LinkStateGrab18func_ov00_020ab770EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
cmp r0, #0
cmpeq r5, #0
movne r8, #1
@@ -13024,7 +13024,7 @@ func_ov23_02178174: ; 0x02178174
mov r1, #0
bl func_ov00_020bb544
bl func_020385b8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
mov r0, r5
bl func_ov00_020bc46c
str r0, [sp]
asm/ov41.s
+3 -3
View File
@@ -3579,7 +3579,7 @@ func_ov41_0218c204: ; 0x0218c204
str r0, [sp, #8]
bl func_020385b8
add r1, sp, #0
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
mov r0, #1
strb r0, [r4, #0x52b]
add sp, sp, #0x18
@@ -4074,7 +4074,7 @@ func_ov41_0218c834: ; 0x0218c834
str r0, [sp, #0x14]
bl func_020385b8
add r1, sp, #0xc
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
b _0218cbd0
_0218c9c4:
cmp r4, #0
@@ -4180,7 +4180,7 @@ _0218ca80:
str r0, [sp, #8]
bl func_020385b8
add r1, sp, #0
bl _ZN13LinkStateGrab18func_ov00_020ab934EP5Vec3p
bl _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
b _0218cbd0
_0218cb5c:
cmp r4, #0
asm/ov42.s
+1 -1
View File
@@ -347,7 +347,7 @@ _02189918:
mov r0, #0
strb r0, [r7, #0x64]
bl func_020385b8
bl _ZN13LinkStateGrab18func_ov00_020ab6c8Ev
bl _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
mov r0, r4
add r1, sp, #0x3c
mov r2, #0x800
asm/ov55.s
+2 -2
View File
@@ -313,7 +313,7 @@ _0219907c:
bl func_01ff9bc4
bl func_020385b8
add r1, r4, #0x38
bl _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
b _02199128
_021990dc:
ldr r0, _021991a4 ; =data_027e0fb8
@@ -334,7 +334,7 @@ _021990dc:
bl func_01ff9bc4
bl func_020385b8
add r1, r4, #0x38
bl _ZN13LinkStateGrab14SetThrowOffsetEP5Vec3p
bl _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p
_02199128:
cmp r5, #0
beq _02199178
asm/ov58.s
+1 -1
View File
@@ -2541,7 +2541,7 @@ func_ov58_0219a47c: ; 0x0219a47c
bl func_ov00_02083c7c
bl func_020385b8
add r1, sp, #4
bl _ZN13LinkStateGrab24SetNormalizedThrowOffsetEP5Vec3p
bl _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p
mov r0, r5
add r1, sp, #4
bl _ZN13LinkStateBase6LookAtEP5Vec3p
docs/link.md
+9 -9
View File
@@ -7,15 +7,15 @@ This file documents technical information about Link.
State handlers contain data and functions to process Link's state. Only one state handler is active at a time, but data can be
shared outside of the active state handler.
Index | Name | Description
-------|---------------|-------------
0 | `LinkMove` | Handles Link's movement.
1 | `LinkItem` | Handles item usage.
2 | `LinkGrab` | Handles grabbing objects.
3 | `LinkState3` | Unknown
4 | `LinkState4` | Unknown
5 | `LinkDamage` | Handles receiving damage.
6 | `LinkItemGet` | Handles getting items.
Index | Name | Description
-------|---------------------|-------------
0 | `LinkStateMove` | Handles Link's movement.
1 | `LinkStateItem` | Handles item usage.
2 | `LinkStateInteract` | Handles talking to NPCs and grabbing/pushing/pulling objects.
3 | `LinkState3` | Unknown
4 | `LinkState4` | Unknown
5 | `LinkStateDamage` | Handles receiving damage.
6 | `LinkStateItemGet` | Handles getting items.
## State hierarchy
Link's states are organized in a hierarchical structure. Similar to actor IDs, states are labelled by 4-character IDs. In
include/Player/LinkStateGrab.hpp → include/Player/LinkStateInteract.hpp
+2 -2
View File
@@ -10,7 +10,7 @@
#include "Actor/ActorManager.hpp"
#include "Actor/Actor.hpp"
class LinkStateGrab : public LinkStateBase {
class LinkStateInteract : public LinkStateBase {
public:
/* 00 (base) */
/* 0c */ void *mUnk_0c;
@@ -22,7 +22,7 @@ public:
/* b4 */
/* 00 */ virtual void vfunc_00() override;
/* 04 */ virtual ~LinkStateGrab() override;
/* 04 */ virtual ~LinkStateInteract() override;
/* 0c */ virtual LinkStateId GetId() override;
/* 10 */ virtual void CreateDebugHierarchy() override;
/* 14 */ virtual void OnStateEnter() override;
src/00_Core/Player/LinkStateGrab.cpp
-34
View File
@@ -1,34 +0,0 @@
#include "Player/LinkStateGrab.hpp"
#ifdef STUBS
void LinkStateGrab::vfunc_00() {}
LinkStateId LinkStateGrab::GetId() {}
void LinkStateGrab::CreateDebugHierarchy() {}
s32 LinkStateGrab::GetGrabActorId() {}
void LinkStateGrab::OnStateEnter() {}
void LinkStateGrab::OnStateLeave(s32 param1) {}
bool LinkStateGrab::func_ov00_020aa818() {}
void LinkStateGrab::func_ov00_020aa844(Actor *param1) {}
bool LinkStateGrab::vfunc_20(s32 param1) {}
LinkState4* LinkStateGrab::GetLinkState4() {}
bool LinkStateGrab::vfunc_24(s32 param1) {}
bool LinkStateGrab::vfunc_34(Vec3p *param1) {}
void LinkStateGrab::SetGrabActorVelocity(Vec3p *velocity) {}
void LinkStateGrab::SetBombVelocity(Vec3p *velocity) {}
void LinkStateGrab::func_ov00_020ab6c8() {}
unk32 LinkStateGrab::func_ov00_020ab770(Vec3p *param1) {}
unk32 LinkStateGrab::func_ov00_020ab7bc(Vec3p *param1, Actor *actor) {}
void LinkStateGrab::SetNormalizedThrowOffset(Vec3p *target) {}
void LinkStateGrab::SetThrowOffset(Vec3p *target) {}
void LinkStateGrab::func_ov00_020ab934(Vec3p *target) {}
void LinkStateGrab::func_ov00_020ab97c(Vec3p *target) {}
void LinkStateGrab::func_ov00_020ab9b8(u32 param1, bool param2) {}
void LinkStateGrab::Grab(ActorRef *ref) {}
void LinkStateGrab::func_ov00_020abba0(ActorRef *ref) {}
void LinkStateGrab::func_ov00_020abbdc(ActorRef *ref) {}
void LinkStateGrab::func_ov00_020abc18(ActorRef *ref) {}
bool LinkStateGrab::func_ov00_020abc40() {}
bool LinkStateGrab::func_ov00_020abc78(ActorRef *ref) {}
#endif
src/00_Core/Player/LinkStateInteract.cpp
+34
View File
@@ -0,0 +1,34 @@
#include "Player/LinkStateInteract.hpp"
#ifdef STUBS
void LinkStateInteract::vfunc_00() {}
LinkStateId LinkStateInteract::GetId() {}
void LinkStateInteract::CreateDebugHierarchy() {}
s32 LinkStateInteract::GetGrabActorId() {}
void LinkStateInteract::OnStateEnter() {}
void LinkStateInteract::OnStateLeave(s32 param1) {}
bool LinkStateInteract::func_ov00_020aa818() {}
void LinkStateInteract::func_ov00_020aa844(Actor *param1) {}
bool LinkStateInteract::vfunc_20(s32 param1) {}
LinkState4* LinkStateInteract::GetLinkState4() {}
bool LinkStateInteract::vfunc_24(s32 param1) {}
bool LinkStateInteract::vfunc_34(Vec3p *param1) {}
void LinkStateInteract::SetGrabActorVelocity(Vec3p *velocity) {}
void LinkStateInteract::SetBombVelocity(Vec3p *velocity) {}
void LinkStateInteract::func_ov00_020ab6c8() {}
unk32 LinkStateInteract::func_ov00_020ab770(Vec3p *param1) {}
unk32 LinkStateInteract::func_ov00_020ab7bc(Vec3p *param1, Actor *actor) {}
void LinkStateInteract::SetNormalizedThrowOffset(Vec3p *target) {}
void LinkStateInteract::SetThrowOffset(Vec3p *target) {}
void LinkStateInteract::func_ov00_020ab934(Vec3p *target) {}
void LinkStateInteract::func_ov00_020ab97c(Vec3p *target) {}
void LinkStateInteract::func_ov00_020ab9b8(u32 param1, bool param2) {}
void LinkStateInteract::Grab(ActorRef *ref) {}
void LinkStateInteract::func_ov00_020abba0(ActorRef *ref) {}
void LinkStateInteract::func_ov00_020abbdc(ActorRef *ref) {}
void LinkStateInteract::func_ov00_020abc18(ActorRef *ref) {}
bool LinkStateInteract::func_ov00_020abc40() {}
bool LinkStateInteract::func_ov00_020abc78(ActorRef *ref) {}
#endif
tools/lcf.py
+2 -2
View File
@@ -32,8 +32,8 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
'src/00_Core/Player/LinkStateBase.cpp',
'asm/ov00/Player/LinkStateBase.s',
'asm/ov00/ov00_020a8e04.s',
'src/00_Core/Player/LinkStateGrab.cpp',
'asm/ov00/Player/LinkStateGrab.s',
'src/00_Core/Player/LinkStateInteract.cpp',
'asm/ov00/Player/LinkStateInteract.s',
'src/00_Core/Player/LinkStateItem.cpp',
'asm/ov00/Player/LinkStateItem.s',
'src/00_Core/Player/LinkStateDamage.cpp',