Delink Actor

asm/ov00/Actor/Actor.inc

@@ -0,0 +1,76 @@
+#pragma once
+.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
+.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
+.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
+.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
+.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
+.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
+.extern _ZN12ActorManager18func_ov00_020c398cEv
+.extern _ZN12ActorManager18func_ov00_020c399cEv
+.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
+.extern _ZN12ActorManager8GetActorEP8ActorRef
+.extern _ZN13PlayerControl13StopFollowingEv
+.extern _ZN9SysObjectdlEPv
+.extern _ZNK11ItemManager19GetActiveFairyLevelEi
+.extern data_02050f54
+.extern data_02056be4
+.extern data_02063e4c
+.extern data_027e077c
+.extern data_027e0c54
+.extern data_027e0d0c
+.extern data_027e0d3c
+.extern data_027e0e60
+.extern data_027e0f74
+.extern data_027e0f90
+.extern data_027e0f94
+.extern data_027e0fac
+.extern data_027e0fb8
+.extern data_027e0fc8
+.extern data_027e0fe4
+.extern data_027e103c
+.extern data_ov00_020e9c88
+.extern func_01ff9bc4
+.extern func_01ff9bf8
+.extern func_01ff9cec
+.extern func_01ff9ec0
+.extern func_01ffa0f4
+.extern func_01ffbe34
+.extern func_01ffec34
+.extern func_01fffcec
+.extern func_01fffd04
+.extern func_0202b864
+.extern func_0202b894
+.extern func_0202d95c
+.extern func_020313c8
+.extern func_02042f74
+.extern func_ov00_02079470
+.extern func_ov00_0207a188
+.extern func_ov00_0207a1c8
+.extern func_ov00_0207b89c
+.extern func_ov00_02083570
+.extern func_ov00_02083ef8
+.extern func_ov00_02084b38
+.extern func_ov00_02084be0
+.extern func_ov00_02084c5c
+.extern func_ov00_02087ef0
+.extern func_ov00_02097738
+.extern func_ov00_020bc46c
+.extern func_ov00_020bc7f8
+.extern func_ov00_020bc854
+.extern func_ov00_020bcc2c
+.extern func_ov00_020bd304
+.extern func_ov00_020bff70
+.extern func_ov00_020c1500
+.extern func_ov00_020c5924
+.extern func_ov00_020c8398
+.extern func_ov05_02103f4c
+.extern func_ov14_0213d15c
+.extern func_ov14_0213d420
+.extern func_ov14_0213d440
+.extern func_ov14_0213d480
+.extern func_ov14_0213d81c
+.extern func_ov14_0213d91c
+.extern func_ov14_0213dadc
+.extern func_ov14_0213ddd4
+.extern func_ov14_0213defc
+.extern gItemManager

asm/ov00/ov00_020b1498.inc

@@ -3,11 +3,8 @@
 .extern _ZN10PlayerBase10SetVisibleEb
 .extern _ZN10PlayerBase13GetEquipSwordEv
 .extern _ZN10PlayerBase14GetEquipShieldEv
-.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
-.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
 .extern _ZN10PlayerBase18TeleportToEntranceEib
 .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
-.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
 .extern _ZN10PlayerBase8TeleportEP5Vec3psibb
 .extern _ZN10PlayerBase8vfunc_04Ev
 .extern _ZN10PlayerBase9AddHealthEs
@@ -20,9 +17,6 @@
 .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
 .extern _ZN12ActorManager13FindActorByIdEj
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
-.extern _ZN12ActorManager18func_ov00_020c398cEv
-.extern _ZN12ActorManager18func_ov00_020c399cEv
-.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN12TouchControl19UpdateConditionallyEP10TouchStatet
 .extern _ZN13LinkStateBase10GetStateIdEv
@@ -67,6 +61,58 @@
 .extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
 .extern _ZN17LinkStateInteract4GrabEP8ActorRef
 .extern _ZN4Item18func_ov00_020ad068Ei
+.extern _ZN5Actor10GetLinkPosEP5Vec3p
+.extern _ZN5Actor10SetUnk_11bEv
+.extern _ZN5Actor10SetUnk_11cEc
+.extern _ZN5Actor11SetVelocityEP5Vec3p
+.extern _ZN5Actor12CollidesWithEPKS_
+.extern _ZN5Actor12GetOffsetPosEP5Vec3p
+.extern _ZN5Actor12SetTransformEP9Transform
+.extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor15IsHitboxTouchedEb
+.extern _ZN5Actor15TrySetTransformEP9Transform
+.extern _ZN5Actor16CollidesWithLinkEv
+.extern _ZN5Actor16XzDistanceToLinkEv
+.extern _ZN5Actor18func_Ov00_020c1bfcEi
+.extern _ZN5Actor18func_ov00_020c1c20Eiii
+.extern _ZN5Actor18func_ov00_020c313cEj
+.extern _ZN5Actor20IncreaseActiveFramesEv
+.extern _ZN5Actor4KillEv
+.extern _ZN5Actor6GetPosEv
+.extern _ZN5Actor8vfunc_0cEv
+.extern _ZN5Actor8vfunc_10Ej
+.extern _ZN5Actor8vfunc_1cEt
+.extern _ZN5Actor8vfunc_20Ei
+.extern _ZN5Actor8vfunc_24Ev
+.extern _ZN5Actor8vfunc_28Ev
+.extern _ZN5Actor8vfunc_2cEv
+.extern _ZN5Actor8vfunc_30Ev
+.extern _ZN5Actor8vfunc_38Ev
+.extern _ZN5Actor8vfunc_48Ei
+.extern _ZN5Actor8vfunc_4cEPi
+.extern _ZN5Actor8vfunc_54Ev
+.extern _ZN5Actor8vfunc_60Ev
+.extern _ZN5Actor8vfunc_64Ev
+.extern _ZN5Actor8vfunc_68Ev
+.extern _ZN5Actor8vfunc_6cEv
+.extern _ZN5Actor8vfunc_70Ev
+.extern _ZN5Actor8vfunc_74Ev
+.extern _ZN5Actor8vfunc_78Ev
+.extern _ZN5Actor8vfunc_7cEv
+.extern _ZN5Actor8vfunc_80Ev
+.extern _ZN5Actor8vfunc_84Ev
+.extern _ZN5Actor8vfunc_88Ev
+.extern _ZN5Actor8vfunc_8cEv
+.extern _ZN5Actor8vfunc_90Ev
+.extern _ZN5Actor8vfunc_94Ev
+.extern _ZN5Actor8vfunc_98Ev
+.extern _ZN5Actor8vfunc_9cEv
+.extern _ZN5Actor8vfunc_a8Ev
+.extern _ZN5Actor8vfunc_acEv
+.extern _ZN5Actor8vfunc_b0Ev
+.extern _ZN5Actor9GetHitboxEP8Cylinder
+.extern _ZN5ActorC2Ev
+.extern _ZN5ActorD2Ev
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZNK11ItemManager16GetEquippedFairyEv
@@ -79,11 +125,9 @@
 .extern data_02051f54
 .extern data_02052f54
 .extern data_02053f54
-.extern data_02056be4
 .extern data_02057840
 .extern data_0205785c
 .extern data_02057878
-.extern data_02063e4c
 .extern data_020691a0
 .extern data_027e0194
 .extern data_027e03c8
@@ -158,14 +202,11 @@
 .extern func_01ffa0f4
 .extern func_01ffa9fc
 .extern func_01ffb7ec
-.extern func_01ffbe34
 .extern func_01ffbf5c
 .extern func_01ffe468
-.extern func_01ffec34
 .extern func_01fffbec
 .extern func_01fffcd8
 .extern func_01fffcec
-.extern func_01fffd04
 .extern func_02002c14
 .extern func_020059ec
 .extern func_020078d8
@@ -199,8 +240,6 @@
 .extern func_0202b418
 .extern func_0202b4e4
 .extern func_0202b7e4
-.extern func_0202b864
-.extern func_0202b894
 .extern func_0202bbbc
 .extern func_0202d550
 .extern func_0202d56c
@@ -214,13 +253,9 @@
 .extern func_0202e1c4
 .extern func_0202e1e8
 .extern func_0202e58c
-.extern func_0202ea24
-.extern func_0202ea34
-.extern func_0202ea50
 .extern func_0203005c
 .extern func_020300cc
 .extern func_0203010c
-.extern func_020313c8
 .extern func_02034984
 .extern func_020367ec
 .extern func_020368f4
@@ -239,18 +274,15 @@
 .extern func_020386cc
 .extern func_0203e784
 .extern func_0203e7b4
-.extern func_02042f74
 .extern func_0204f614
 .extern func_0204f754
 .extern func_0204f8d4
 .extern func_ov00_02078b40
-.extern func_ov00_02079470
 .extern func_ov00_02079878
 .extern func_ov00_02079e3c
 .extern func_ov00_02079e68
 .extern func_ov00_02079eb4
 .extern func_ov00_0207a038
-.extern func_ov00_0207a188
 .extern func_ov00_0207a1a4
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207b89c
@@ -268,7 +300,6 @@
 .extern func_ov00_020833d0
 .extern func_ov00_020833dc
 .extern func_ov00_020833e8
-.extern func_ov00_02083570
 .extern func_ov00_020836dc
 .extern func_ov00_02083770
 .extern func_ov00_020838e8
@@ -280,7 +311,6 @@
 .extern func_ov00_02083c7c
 .extern func_ov00_02083e34
 .extern func_ov00_02083ee0
-.extern func_ov00_02083ef8
 .extern func_ov00_02083f44
 .extern func_ov00_02083fb0
 .extern func_ov00_02084088
@@ -288,13 +318,9 @@
 .extern func_ov00_020840c4
 .extern func_ov00_0208412c
 .extern func_ov00_02084164
-.extern func_ov00_02084b38
-.extern func_ov00_02084be0
-.extern func_ov00_02084c5c
 .extern func_ov00_020853fc
 .extern func_ov00_020872e8
 .extern func_ov00_02087e8c
-.extern func_ov00_02087ef0
 .extern func_ov00_0208b180
 .extern func_ov00_0208b73c
 .extern func_ov00_0208b988
@@ -329,13 +355,13 @@
 .extern func_ov00_020a98bc
 .extern func_ov00_020a9968
 .extern func_ov00_020a9aac
+.extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
 .extern func_ov00_020c45b0
 .extern func_ov00_020c4ae8
 .extern func_ov00_020c5924
 .extern func_ov00_020c5a24
-.extern func_ov00_020c8398
 .extern func_ov00_020ceacc
 .extern func_ov00_020ceb24
 .extern func_ov00_020cebcc
@@ -418,15 +444,7 @@
 .extern func_ov12_02134378
 .extern func_ov12_021343bc
 .extern func_ov14_021238f0
-.extern func_ov14_0213d15c
 .extern func_ov14_0213d420
-.extern func_ov14_0213d440
-.extern func_ov14_0213d480
-.extern func_ov14_0213d81c
-.extern func_ov14_0213d91c
-.extern func_ov14_0213dadc
-.extern func_ov14_0213ddd4
-.extern func_ov14_0213defc
 .extern func_ov14_0213dfbc
 .extern func_ov14_0213e144
 .extern func_ov14_021474ac

asm/ov00/ov00_020c3348.inc

@@ -0,0 +1,8 @@
+#pragma once
+.extern _ZN9SysObjectdlEPv
+.extern _ZN9SysObjectnwEmPjj
+.extern data_027e0ce0
+.extern data_027e0fe0
+.extern func_0202ea24
+.extern func_0202ea34
+.extern func_0202ea50

tools/lcf.py

@@ -60,6 +60,11 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
 
     'asm/ov00/ov00_020b1498.s',
 
+    'asm/ov00/Actor/Actor.s',
+    'src/00_Core/Actor/Actor.cpp',
+
+    'asm/ov00/ov00_020c3348.s',
+
     'asm/ov00/Actor/ActorManager.s',
     'src/00_Core/Actor/ActorManager.cpp',