Mangle Actor_UnkStruct_0a4::Actor_UnkStruct_0a4

asm/main/main_02000000.inc

@@ -1,5 +1,13 @@
 #pragma once
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Cross
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager18func_ov00_02082614Eii
 .extern _ZN10MapManager18func_ov00_020838e8EjPi
 .extern _ZN10MapManager18func_ov00_02084740Ev
@@ -103,7 +111,6 @@
 .extern data_027e0cbc
 .extern data_027e0ce0
 .extern data_027e0d04
-.extern gVec3p_ZERO
 .extern data_027e0d18
 .extern data_027e0d28
 .extern data_027e0d38
@@ -120,10 +127,7 @@
 .extern data_027e0f80
 .extern data_027e0f84
 .extern data_027e0f8c
-.extern gPlayerPos
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0ffc
 .extern data_027e103c
 .extern data_027e1054
@@ -274,15 +278,7 @@
 .extern func_01ff9b24
 .extern func_01ff9b4c
 .extern func_01ff9b88
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Cross
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Distance
 .extern func_01ff9f3c
-.extern Atan2
 .extern func_01ffa29c
 .extern func_01ffa2dc
 .extern func_01ffa34c
@@ -473,11 +469,15 @@
 .extern func_ov16_021200fc
 .extern func_ov16_02120130
 .extern func_ov18_02169634
+.extern gActorManager
 .extern gAdventureFlags
 .extern gHeap
 .extern gItemManager
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gVec3p_ZERO
 .extern gpBuildDate
 .extern strcat
 .extern strcpy

asm/ov00/Actor/Actor.inc

@@ -1,69 +1,38 @@
 #pragma once
+.extern Atan2
+.extern Vec3p_Add
+.extern Vec3p_Distance
+.extern Vec3p_Length
+.extern Vec3p_Sub
+.extern _ZN10EquipSword12GetEquipRopeEv
 .extern _ZN10MapManager18func_ov00_02083570Eii
 .extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
 .extern _ZN10MapManager18func_ov00_02084b38Eiii
 .extern _ZN10MapManager18func_ov00_02084be0Eii
 .extern _ZN10MapManager18func_ov00_02084c5cEii
-.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
-.extern _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
+.extern _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
+.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
 .extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
 .extern _ZN12ActorManager18func_ov00_020c398cEj
 .extern _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
 .extern _ZN12ActorManager18func_ov00_020c39acEjPKjb
 .extern _ZN12ActorManager8GetActorEP8ActorRef
-.extern _ZN13PlayerControl13StopFollowingEv
-.extern _ZN14AdventureFlags18func_ov00_02097738Ev
-.extern _ZN9SysObjectdlEPv
-.extern _ZNK11ItemManager19GetActiveFairyLevelEi
-.extern gSinCosTable
-.extern data_02056be4
-.extern data_02063e4c
-.extern data_027e077c
-.extern data_027e0c54
-.extern gVec3p_ZERO
-.extern data_027e0d3c
-.extern gMapManager
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
-.extern gActorManager
-.extern data_027e103c
-.extern data_ov00_020e9c88
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Length
-.extern Vec3p_Distance
-.extern Atan2
-.extern func_01ffbe34
-.extern _ZN8Cylinder8OverlapsEPS_
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN12TouchControl13func_0202b864EP5Vec3pic
 .extern _ZN12TouchControl13func_0202b894EP5Vec3pic
-.extern func_0202d95c
-.extern func_020313c8
-.extern abs
-.extern func_ov00_02079470
-.extern func_ov00_0207a188
-.extern func_ov00_0207a1c8
-.extern func_ov00_0207b89c
-.extern func_ov00_02087ef0
-.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
+.extern _ZN13PlayerControl13StopFollowingEv
+.extern _ZN14AdventureFlags18func_ov00_02097738Ev
+.extern _ZN14EquipBoomerang8GetActorEv
 .extern _ZN14PlayerLinkBase14GetGrabActorIdEv
 .extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
+.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
-.extern func_ov00_020bd304
-.extern _ZN10EquipSword12GetEquipRopeEv
-.extern _ZN19Actor_UnkStruct_020C1Ev
-.extern func_ov00_020c5924
-.extern func_ov00_020c8398
-.extern func_ov05_02103f4c
-.extern _ZN14EquipBoomerang8GetActorEv
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
+.extern _ZN5Actor13func_01fffd04Ei
+.extern _ZN8Cylinder8OverlapsEPS_
 .extern _ZN9EquipRope18func_ov14_0213d420Ev
 .extern _ZN9EquipRope18func_ov14_0213d440Ei
 .extern _ZN9EquipRope18func_ov14_0213d480Ei
@@ -72,5 +41,35 @@
 .extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder
 .extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor
 .extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
+.extern _ZN9SysObjectdlEPv
+.extern _ZNK11ItemManager19GetActiveFairyLevelEi
+.extern abs
+.extern data_02056be4
+.extern data_02063e4c
+.extern data_027e077c
+.extern data_027e0c54
+.extern data_027e0d3c
+.extern data_027e103c
+.extern data_ov00_020e9c88
+.extern func_01ffbe34
+.extern func_0202d95c
+.extern func_020313c8
+.extern func_ov00_02079470
+.extern func_ov00_0207a1c8
+.extern func_ov00_0207b89c
+.extern func_ov00_02087ef0
+.extern func_ov00_020bd304
+.extern func_ov00_020c5924
+.extern func_ov00_020c8398
+.extern func_ov05_02103f4c
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
+.extern gVec3p_ZERO

asm/ov00/Actor/Actor.s

@@ -83,7 +83,7 @@ _ZN5ActorC2Ev: ; 0x020c1554
 	str r2, [sp]
 	add r0, r4, #0xa4
 	mov r3, r1
-	blx func_ov00_0207a188
+	bl _ZN19Actor_UnkStruct_0a4C1Eiiii
 	ldr r0, _020c1714 ; =0x0000ffff
 	mov lr, #0
 	strh r0, [r4, #0xdc]

asm/ov00/ov00_020773c0.inc

@@ -1,5 +1,6 @@
 #pragma once
 .extern Divide
+.extern Vec3p_Add
 .extern WaitByLoop
 .extern _ZN10MapManager13GetCourseMaxXEv
 .extern _ZN10MapManager13GetCourseMaxZEv
@@ -42,7 +43,6 @@
 .extern data_ov00_020ec718
 .extern data_ov00_020ec7dc
 .extern func_01ff9b4c
-.extern Vec3p_Add
 .extern func_02000b60
 .extern func_02002bac
 .extern func_02002bf4

asm/ov00/ov00_020773c0.s

@@ -5628,9 +5628,9 @@ func_ov00_0207a13c: ; 0x0207a13c
 _0207a184: .word 0x00007fff
 	arm_func_end func_ov00_0207a13c
 
-	.global func_ov00_0207a188
-	thumb_func_start func_ov00_0207a188
-func_ov00_0207a188: ; 0x0207a188
+	.global _ZN19Actor_UnkStruct_0a4C1Eiiii
+	thumb_func_start _ZN19Actor_UnkStruct_0a4C1Eiiii
+_ZN19Actor_UnkStruct_0a4C1Eiiii: ; 0x0207a188
 	push {r3, r4}
 	mov r4, #1
 	strb r4, [r0]
@@ -5645,7 +5645,7 @@ func_ov00_0207a188: ; 0x0207a188
 	str r1, [r0, #0x10]
 	pop {r3, r4}
 	bx lr
-	thumb_func_end func_ov00_0207a188
+	thumb_func_end _ZN19Actor_UnkStruct_0a4C1Eiiii
 
 	.global func_ov00_0207a1a4
 	arm_func_start func_ov00_0207a1a4

asm/ov00/ov00_020b1498.inc

@@ -1,5 +1,13 @@
 #pragma once
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_54Ev
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager16MapData_vfunc_78Ev
@@ -26,10 +34,10 @@
 .extern _ZN10MapManager18func_ov00_02084164Ev
 .extern _ZN10MapManager18func_ov00_020853fcEv
 .extern _ZN10PlayerBase10SetVisibleEb
+.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
 .extern _ZN10PlayerBase13GetEquipSwordEv
 .extern _ZN10PlayerBase14GetEquipShieldEv
 .extern _ZN10PlayerBase18TeleportToEntranceEib
-.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
 .extern _ZN10PlayerBase8TeleportEP5Vec3psibb
 .extern _ZN10PlayerBase8vfunc_04Ev
 .extern _ZN10PlayerBase9AddHealthEs
@@ -37,6 +45,7 @@
 .extern _ZN11ItemManager12GetEquipItemEi
 .extern _ZN11ItemManager12GetItemModelEj
 .extern _ZN11ItemManager13UnequipPotionEv
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN11ItemManager4SaveEP15SaveItemManager
 .extern _ZN11ItemManager8GiveAmmoEit
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
@@ -93,6 +102,7 @@
 .extern _ZN17LinkStateInteract20CreateDebugHierarchyEv
 .extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
 .extern _ZN17LinkStateInteract4GrabEP8ActorRef
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN4Item18func_ov00_020ad068Ei
 .extern _ZN5Actor10GetLinkPosEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
@@ -150,6 +160,7 @@
 .extern _ZN7MapBase18func_ov00_0207e96cEv
 .extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
 .extern _ZN9ActorTypeD1Ev
+.extern _ZN9EquipRope18func_ov14_0213d420Ev
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZNK11ItemManager16GetEquippedFairyEv
@@ -159,7 +170,6 @@
 .extern _ZNK11ItemManager7HasItemEi
 .extern _ZNK11ItemManager8GetFairyEi
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02051f54
 .extern data_02052f54
 .extern data_02053f54
@@ -178,7 +188,6 @@
 .extern data_027e0c54
 .extern data_027e0c68
 .extern data_027e0ce0
-.extern gVec3p_ZERO
 .extern data_027e0d38
 .extern data_027e0d3c
 .extern data_027e0d44
@@ -188,21 +197,13 @@
 .extern data_027e0f64
 .extern data_027e0f6c
 .extern data_027e0f78
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gHealthManager
 .extern data_027e0fc4
-.extern gPlayerLink
 .extern data_027e0fcc
 .extern data_027e0fd0
 .extern data_027e0fd4
 .extern data_027e0fd8
 .extern data_027e0fdc
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff0
@@ -228,21 +229,12 @@
 .extern func_01ff8690
 .extern func_01ff9158
 .extern func_01ff992c
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01ffb7ec
 .extern func_01ffbf5c
 .extern func_01ffe468
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern func_02002c14
 .extern func_020059ec
 .extern func_020078d8
@@ -442,7 +434,6 @@
 .extern func_ov12_02134378
 .extern func_ov12_021343bc
 .extern func_ov14_021238f0
-.extern _ZN9EquipRope18func_ov14_0213d420Ev
 .extern func_ov14_0213dfbc
 .extern func_ov14_0213e144
 .extern func_ov14_021474ac
@@ -457,8 +448,18 @@
 .extern func_ov59_0219af14
 .extern func_ov59_0219afc4
 .extern func_ov59_0219b020
+.extern gActorManager
 .extern gAdventureFlags
+.extern gHealthManager
 .extern gItemManager
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strcat

asm/ov00/ov00_020c3e54.inc

@@ -1,6 +1,15 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Cross
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager16MapData_vfunc_78Ev
 .extern _ZN10MapManager17GetMapData_Unk_48Ev
@@ -40,6 +49,7 @@
 .extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
 .extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
 .extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10GetUnk_08cEP8Cylinder
 .extern _ZN5Actor10SetUnk_11bEv
@@ -51,6 +61,7 @@
 .extern _ZN5Actor12KillInBoundsEv
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor14ResetWallTouchEv
 .extern _ZN5Actor15IsHitboxTouchedEb
@@ -115,7 +126,7 @@
 .extern _ZNK11ItemManager7HasItemEi
 .extern _ZNK11ItemManager8GetFairyEi
 .extern __register_global_object
-.extern gSinCosTable
+.extern abs
 .extern data_020561f4
 .extern data_02056be4
 .extern data_02057840
@@ -130,7 +141,6 @@
 .extern data_027e0cbc
 .extern data_027e0ce0
 .extern data_027e0d04
-.extern gVec3p_ZERO
 .extern data_027e0d38
 .extern data_027e0d3c
 .extern data_027e0d44
@@ -144,14 +154,8 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f88
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fd4
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff0
@@ -327,23 +331,13 @@
 .extern func_01ff9958
 .extern func_01ff998c
 .extern func_01ff9b4c
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Cross
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
 .extern func_01ff9f3c
-.extern Atan2
 .extern func_01ffa8d4
 .extern func_01ffbe34
 .extern func_01ffbe78
 .extern func_01ffe1cc
 .extern func_01ffe468
 .extern func_01fffb4c
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_020029fc
 .extern func_02002bac
 .extern func_02002bb8
@@ -499,7 +493,6 @@
 .extern func_0203e284
 .extern func_0203efd8
 .extern func_0203f378
-.extern abs
 .extern func_0204b068
 .extern func_0204b0a4
 .extern func_0204f558
@@ -593,7 +586,6 @@
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov01_020f8658
 .extern func_ov03_020f13b0
@@ -666,11 +658,19 @@
 .extern func_ov26_0216ecb8
 .extern func_ov26_021767ec
 .extern func_ov29_0216d918
+.extern gActorManager
 .extern gAdventureFlags
 .extern gHealthManager
 .extern gItemManager
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strcat
 .extern strcpy
 .extern strncpy

asm/ov03.inc

@@ -1,6 +1,25 @@
 #pragma once
+.extern Atan2
 .extern Divide
 .extern FastDivide
+.extern _ZN10MapManager13GetCourseMaxXEv
+.extern _ZN10MapManager13GetCourseMaxZEv
+.extern _ZN10MapManager13GetCourseMinXEv
+.extern _ZN10MapManager13GetCourseMinZEv
+.extern _ZN10MapManager18func_ov00_02082614Eii
+.extern _ZN10MapManager18func_ov00_02082accEv
+.extern _ZN10MapManager18func_ov00_02082d08Ev
+.extern _ZN10MapManager18func_ov00_02082d40Ev
+.extern _ZN10MapManager18func_ov00_02082d74Ei
+.extern _ZN10MapManager18func_ov00_0208306cEv
+.extern _ZN10MapManager18func_ov00_0208315cEPiS0_
+.extern _ZN10MapManager18func_ov00_02083588Ev
+.extern _ZN10MapManager18func_ov00_020835a4Ev
+.extern _ZN10MapManager18func_ov00_020835b4Ev
+.extern _ZN10MapManager18func_ov00_020835c4Eii
+.extern _ZN10MapManager18func_ov00_020835f4Ei
+.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj
+.extern _ZN10MapManager18func_ov00_020849c0Ev
 .extern _ZN11ItemManager12GetEquipItemEi
 .extern _ZN11ItemManager18func_ov00_020ad790Ei
 .extern _ZN14AdventureFlags18func_Ov00_02097810Ei
@@ -52,14 +71,15 @@
 .extern _ZN5Actor8vfunc_b0Ev
 .extern _ZN5ActorC2Ev
 .extern _ZN5ActorD2Ev
+.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
+.extern _ZN9ActorTypeD1Ev
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
+.extern _ZNK11ItemManager10GetNumKeysEv
 .extern _ZNK11ItemManager15GetEquippedItemEv
 .extern _ZNK11ItemManager16GetEquippedFairyEv
-.extern _ZNK11ItemManager10GetNumKeysEv
 .extern _ZNK11ItemManager7HasItemEi
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02056be4
 .extern data_02057b18
 .extern data_020683f4
@@ -93,15 +113,10 @@
 .extern data_027e0e28
 .extern data_027e0e2c
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f7c
 .extern data_027e0f84
 .extern data_027e0f88
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
 .extern data_027e103c
 .extern data_027e1044
@@ -128,7 +143,6 @@
 .extern func_01ff9b24
 .extern func_01ff9b4c
 .extern func_01ff9b88
-.extern Atan2
 .extern func_01ffa8d4
 .extern func_01ffb7ec
 .extern func_01ffbe34
@@ -221,8 +235,6 @@
 .extern func_0203d77c
 .extern func_0203d7b8
 .extern func_0203d7e0
-.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
-.extern _ZN9ActorTypeD1Ev
 .extern func_0203eadc
 .extern func_0203eba8
 .extern func_0203ebc8
@@ -266,24 +278,6 @@
 .extern func_ov00_0207c0ac
 .extern func_ov00_0207c0cc
 .extern func_ov00_0207c5b0
-.extern _ZN10MapManager18func_ov00_02082614Eii
-.extern _ZN10MapManager18func_ov00_02082accEv
-.extern _ZN10MapManager18func_ov00_02082d08Ev
-.extern _ZN10MapManager18func_ov00_02082d40Ev
-.extern _ZN10MapManager18func_ov00_02082d74Ei
-.extern _ZN10MapManager18func_ov00_0208306cEv
-.extern _ZN10MapManager18func_ov00_0208315cEPiS0_
-.extern _ZN10MapManager13GetCourseMinXEv
-.extern _ZN10MapManager13GetCourseMinZEv
-.extern _ZN10MapManager13GetCourseMaxXEv
-.extern _ZN10MapManager13GetCourseMaxZEv
-.extern _ZN10MapManager18func_ov00_02083588Ev
-.extern _ZN10MapManager18func_ov00_020835a4Ev
-.extern _ZN10MapManager18func_ov00_020835b4Ev
-.extern _ZN10MapManager18func_ov00_020835c4Eii
-.extern _ZN10MapManager18func_ov00_020835f4Ei
-.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj
-.extern _ZN10MapManager18func_ov00_020849c0Ev
 .extern func_ov00_0208b180
 .extern func_ov00_0208b694
 .extern func_ov00_0208b698
@@ -500,7 +494,13 @@
 .extern func_ov52_02196198
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
 .extern gOverlayManager
+.extern gPlayer
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
 .extern strcat
 .extern strcmp
 .extern strcpy

asm/ov04.inc

@@ -1,4 +1,8 @@
 #pragma once
+.extern Atan2
+.extern Vec3p_Add
+.extern Vec3p_Distance
+.extern Vec3p_Sub
 .extern _ZN10MapManager10DestroyMapEv
 .extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
 .extern _ZN10MapManager16MapData_vfunc_44Ev
@@ -55,6 +59,8 @@
 .extern _ZN14AdventureFlags4LoadEv
 .extern _ZN14OverlayManager4LoadEjj
 .extern _ZN14OverlayManager6UnloadEj
+.extern _ZN19Actor_UnkStruct_020C1Ev
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern _ZN5ActorC2Ev
 .extern _ZN5ActorD2Ev
 .extern _ZN6Course11FindMapDataEj
@@ -89,6 +95,7 @@
 .extern _ZTV15LinkStateDamage
 .extern _ZTV15LinkStateFollow
 .extern _ZTV17LinkStateInteract
+.extern _ZTV7MapBase
 .extern data_02056924
 .extern data_02057200
 .extern data_0205750c
@@ -116,7 +123,6 @@
 .extern data_027e0cbc
 .extern data_027e0ce0
 .extern data_027e0d04
-.extern gVec3p_ZERO
 .extern data_027e0d28
 .extern data_027e0d38
 .extern data_027e0d3c
@@ -133,20 +139,13 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f7c
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gHealthManager
 .extern data_027e0fc0
 .extern data_027e0fc4
-.extern gPlayerLink
 .extern data_027e0fcc
 .extern data_027e0fd0
 .extern data_027e0fd4
 .extern data_027e0fd8
 .extern data_027e0fdc
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff0
@@ -177,7 +176,6 @@
 .extern data_ov00_020dc7cc
 .extern data_ov00_020dc7d0
 .extern data_ov00_020e233c
-.extern _ZTV7MapBase
 .extern data_ov00_020e2508
 .extern data_ov00_020e250c
 .extern data_ov00_020e2544
@@ -272,10 +270,6 @@
 .extern data_ov40_0218827c
 .extern data_ov40_0218a0e0
 .extern func_01ff892c
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa8d4
 .extern func_01ffec78
 .extern func_02002bf4
@@ -433,7 +427,6 @@
 .extern func_ov00_02079e68
 .extern func_ov00_02079efc
 .extern func_ov00_02079f3c
-.extern func_ov00_0207a188
 .extern func_ov00_0207afa0
 .extern func_ov00_0207afc4
 .extern func_ov00_0207aff8
@@ -576,7 +569,6 @@
 .extern func_ov00_020c0c70
 .extern func_ov00_020c0c9c
 .extern func_ov00_020c0e5c
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c3388
 .extern func_ov00_020c33b0
@@ -710,11 +702,19 @@
 .extern func_ov40_02186948
 .extern func_ov40_02186c8c
 .extern func_ov40_02187ba0
+.extern gActorManager
 .extern gAdventureFlags
+.extern gHealthManager
 .extern gItemManager
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayer
+.extern gPlayerAngle
 .extern gPlayerAnimHandler
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gVec3p_ZERO
 .extern strcat
 .extern strcpy
 .extern strlen

asm/ov04.s

@@ -21846,7 +21846,7 @@ func_ov04_0210b3f0: ; 0x0210b3f0
 	add r0, r5, r0
 	add r3, r1, #0
 	str r2, [sp]
-	bl func_ov00_0207a188
+	bl _ZN19Actor_UnkStruct_0a4C1Eiiii
 	ldr r0, _0210b520 ; =func_ov04_0210b3d4
 	ldr r3, _0210b524 ; =func_ov04_0210b634
 	str r0, [sp]

asm/ov12.inc

@@ -1,7 +1,15 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
 .extern PlaySoundEffect
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager17GetMapData_Unk_48Ev
 .extern _ZN10MapManager17Get_MapData_Unk28Ev
@@ -20,13 +28,14 @@
 .extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
 .extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
 .extern _ZN10MapManager18func_ov00_020840a0Ecci
-.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
+.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
 .extern _ZN10PlayerBase9AddHealthEs
 .extern _ZN11ItemManager12GetEquipItemEi
 .extern _ZN11ItemManager15Shield_vfunc_38Ei
 .extern _ZN11ItemManager18EquipItem_vfunc_38Ei
 .extern _ZN11ItemManager19GetDungeonItemModelEj
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN11ItemManager22UpdateSwordShieldInUseEv
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager13FindActorByIdEj
@@ -39,7 +48,9 @@
 .extern _ZN14AdventureFlags18func_ov00_02097bbcEv
 .extern _ZN14AdventureFlags18func_ov00_02097bccEv
 .extern _ZN14OverlayManager15LoadIfNotLoadedEjj
+.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
@@ -49,6 +60,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor15IsHitboxTouchedEb
 .extern _ZN5Actor15TrySetTransformEP9Transform
 .extern _ZN5Actor16CollidesWithLinkEv
@@ -114,6 +126,7 @@
 .extern _ZN7MapBase8vfunc_b4Ev
 .extern _ZN7MapBase8vfunc_b8Ev
 .extern _ZN7MapBaseD1Ev
+.extern _ZN8Cylinder8OverlapsEPS_
 .extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
 .extern _ZN9ActorTypeD1Ev
 .extern _ZN9SysObjectdlEPv
@@ -121,7 +134,6 @@
 .extern _ZNK11ItemManager18func_ov00_020ad594Ei
 .extern _ZNK11ItemManager8GetFairyEi
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02056be4
 .extern data_02057200
 .extern data_02068e9c
@@ -139,7 +151,6 @@
 .extern data_027e0c68
 .extern data_027e0cbc
 .extern data_027e0ce0
-.extern gVec3p_ZERO
 .extern data_027e0d38
 .extern data_027e0d3c
 .extern data_027e0d44
@@ -152,18 +163,12 @@
 .extern data_027e0f64
 .extern data_027e0f68
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerAngle
 .extern data_027e0fc0
 .extern data_027e0fc4
-.extern gPlayerLink
 .extern data_027e0fcc
 .extern data_027e0fd4
 .extern data_027e0fd8
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff8
@@ -196,24 +201,13 @@
 .extern func_01ff9958
 .extern func_01ff9b4c
 .extern func_01ff9b88
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01ffbe34
 .extern func_01ffbe78
 .extern func_01ffbf5c
-.extern _ZN8Cylinder8OverlapsEPS_
 .extern func_01fffb4c
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_02002bac
 .extern func_02003a9c
 .extern func_02003b04
@@ -505,7 +499,6 @@
 .extern func_ov00_020bbed4
 .extern func_ov00_020bc0a8
 .extern func_ov00_020bc27c
-.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern func_ov00_020bc48c
 .extern func_ov00_020bc500
 .extern func_ov00_020bc6d4
@@ -535,7 +528,6 @@
 .extern func_ov00_020c0ecc
 .extern func_ov00_020c1424
 .extern func_ov00_020c1450
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -756,9 +748,17 @@
 .extern func_ov61_02179ce4
 .extern func_ov61_02179ee4
 .extern func_ov61_02179f88
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayer
+.extern gPlayerAngle
 .extern gPlayerAnimHandler
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strncpy

asm/ov14/Actor/ActorRupee.inc

@@ -1,4 +1,5 @@
 #pragma once
+.extern Vec3p_Add
 .extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
 .extern _ZN11ItemManager10GiveRupeesEsb
 .extern _ZN5Actor10SetUnk_11bEv
@@ -8,6 +9,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12KillInBoundsEv
 .extern _ZN5Actor12SetTransformEP9Transform
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor15IsHitboxTouchedEb
 .extern _ZN5Actor15TrySetTransformEP9Transform
 .extern _ZN5Actor16CollidesWithLinkEv
@@ -56,13 +58,9 @@
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
 .extern data_027e0764
-.extern gMapManager
-.extern gPlayerLink
 .extern data_027e0fe0
 .extern data_ov00_020e9370
 .extern data_ov00_020eec9c
-.extern Vec3p_Add
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_0202bc38
 .extern func_ov00_0207a13c
 .extern func_ov00_0207a1c8
@@ -71,3 +69,5 @@
 .extern func_ov00_020d7ad4
 .extern func_ov05_02102c2c
 .extern gItemManager
+.extern gMapManager
+.extern gPlayerLink

asm/ov14/ov14_0211f640.inc

@@ -1,6 +1,14 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_54Ev
 .extern _ZN10MapManager16MapData_vfunc_58Ev
 .extern _ZN10MapManager16MapData_vfunc_60Ev
@@ -42,6 +50,7 @@
 .extern _ZN10PlayerBase10SetVisibleEb
 .extern _ZN11ItemManager12GetEquipItemEi
 .extern _ZN11ItemManager12GetItemModelEj
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN11ItemManager8GiveAmmoEit
 .extern _ZN11ItemManager8GiveKeysEj
 .extern _ZN12ActorManager13FindActorByIdEj
@@ -61,6 +70,10 @@
 .extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
 .extern _ZN14AdventureFlags18func_ov00_0209809cEv
 .extern _ZN14AdventureFlags3GetEj
+.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
+.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
+.extern _ZN19Actor_UnkStruct_020C1Ev
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern _ZN5Actor10GetUnk_08cEP8Cylinder
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_129Eb
@@ -70,6 +83,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12KillInBoundsEv
 .extern _ZN5Actor12SetTransformEP9Transform
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor15IsHitboxTouchedEb
 .extern _ZN5Actor15TrySetTransformEP9Transform
 .extern _ZN5Actor16CollidesWithLinkEv
@@ -142,7 +156,6 @@
 .extern _ZNK11ItemManager18func_ov00_020ad560Ei
 .extern _ZNK11ItemManager7HasItemEi
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02052f54
 .extern data_02056be4
 .extern data_02063e4c
@@ -152,7 +165,6 @@
 .extern data_027e080c
 .extern data_027e0c68
 .extern data_027e0ce0
-.extern gVec3p_ZERO
 .extern data_027e0d18
 .extern data_027e0d38
 .extern data_027e0d3c
@@ -165,15 +177,9 @@
 .extern data_027e0f70
 .extern data_027e0f78
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fcc
 .extern data_027e0fd4
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ffc
@@ -206,22 +212,12 @@
 .extern func_01ff8aa0
 .extern func_01ff9158
 .extern func_01ff9958
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01ffbe34
 .extern func_01ffbe78
 .extern func_01ffbf5c
 .extern func_01fffb4c
 .extern func_01fffbec
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_020020d0
 .extern func_0200250c
 .extern func_02002540
@@ -283,7 +279,6 @@
 .extern func_ov00_02079b78
 .extern func_ov00_02079e68
 .extern func_ov00_0207a13c
-.extern func_ov00_0207a188
 .extern func_ov00_0207a1a4
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207c1b0
@@ -407,9 +402,7 @@
 .extern func_ov00_020bba48
 .extern func_ov00_020bbbb8
 .extern func_ov00_020bbe94
-.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern func_ov00_020bc494
-.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
 .extern func_ov00_020bcdec
 .extern func_ov00_020bce48
 .extern func_ov00_020bd618
@@ -426,7 +419,6 @@
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -514,8 +506,16 @@
 .extern func_ov57_0219a6b8
 .extern func_ov57_0219a850
 .extern func_ov58_0219ab28
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strcmp

asm/ov14/ov14_0211f640.s

@@ -695,7 +695,7 @@ func_ov14_0211fda4: ; 0x0211fda4
 	add r0, r4, #0x188
 	mov r1, #0
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov ip, #0
 	add r0, r4, #0x100
 	strh ip, [r0, #0xac]
@@ -13469,7 +13469,7 @@ func_ov14_0212a5f8: ; 0x0212a5f8
 	add r0, r4, #0xd0
 	mov r1, #0
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	ldr r0, _0212a6e0 ; =data_027e0f68
 	ldr r3, [r4, #0x64]
 	ldr r0, [r0]
@@ -25964,7 +25964,7 @@ func_ov14_021348b0: ; 0x021348b0
 	str r2, [sp]
 	add r0, r4, #0x5c
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov14/ov14_0213b778.inc

@@ -337,7 +337,7 @@
 .extern func_ov00_0207977c
 .extern func_ov00_02079b34
 .extern func_ov00_02079e68
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1a4
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207b89c

asm/ov14/ov14_0213b778.s

@@ -8392,7 +8392,7 @@ func_ov14_02141b70: ; 0x02141b70
 	str r2, [sp]
 	add r0, r4, #0x70
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}
@@ -26224,7 +26224,7 @@ func_ov14_0214fdcc: ; 0x0214fdcc
 	str r2, [sp]
 	add r0, r4, #0x5c
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov15.inc

@@ -460,7 +460,7 @@
 .extern func_ov00_02079b54
 .extern func_ov00_02079e68
 .extern func_ov00_0207a13c
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207a730
 .extern func_ov00_0207b89c

asm/ov15.s

@@ -7832,7 +7832,7 @@ func_ov15_02126128: ; 0x02126128
 	mov r3, r1
 	add r0, r4, #0x94
 	str r2, [sp]
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, #0
 	str r0, [r4, #0xa8]
 	mov r3, #2
@@ -9943,7 +9943,7 @@ func_ov15_021278f4: ; 0x021278f4
 	mov r3, r1
 	add r0, r4, #0x6c
 	str r2, [sp]
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r1, #0
 	mov r0, r4
 	str r1, [r4, #0x80]
@@ -10209,7 +10209,7 @@ func_ov15_02127c2c: ; 0x02127c2c
 	mov r3, r1
 	add r0, r4, #0x6c
 	str r2, [sp]
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r1, #0
 	ldr r0, _02127ce0 ; =data_ov00_020e2f68
 	str r1, [r4, #0x80]
@@ -10768,7 +10768,7 @@ func_ov15_0212836c: ; 0x0212836c
 	str r2, [sp]
 	add r0, r4, #0x6c
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, #0
 	str r0, [r4, #0x80]
 	str r0, [r4, #0x84]

asm/ov17.inc

@@ -197,7 +197,7 @@
 .extern func_ov00_02079008
 .extern func_ov00_02079470
 .extern func_ov00_02079e68
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207b89c
 .extern func_ov00_0207c1b0

asm/ov17.s

@@ -17237,7 +17237,7 @@ func_ov17_02168dc4: ; 0x02168dc4
 	str r2, [sp]
 	add r0, r4, #0xcc
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mvn r0, #0
 	str r0, [r4, #0xe0]
 	str r0, [r4, #0xe4]

asm/ov18.inc

@@ -217,7 +217,7 @@
 .extern func_ov00_02079680
 .extern func_ov00_02079e68
 .extern func_ov00_0207a13c
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207a300
 .extern func_ov00_0207a730

asm/ov18.s

@@ -3716,7 +3716,7 @@ func_ov18_0215e514: ; 0x0215e514
 	mov r3, r1
 	add r0, r4, #0x94
 	str r2, [sp]
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, #0
 	str r0, [r4, #0xa8]
 	strb r0, [r4, #0xac]
@@ -6291,7 +6291,7 @@ func_ov18_021605b0: ; 0x021605b0
 	str r2, [sp]
 	add r0, r4, #0x94
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}
@@ -6723,7 +6723,7 @@ func_ov18_02160ad8: ; 0x02160ad8
 	mov r3, r1
 	add r0, r4, #0x94
 	str r2, [sp]
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov19.inc

@@ -1,6 +1,11 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager18func_ov00_02082680Eii
 .extern _ZN10MapManager18func_ov00_020836dcEii
@@ -11,6 +16,7 @@
 .extern _ZN10MapManager18func_ov00_02084d24Ecci
 .extern _ZN10PlayerBase10SetVisibleEb
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN11ItemManager7AddItemEi
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -34,6 +40,7 @@
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN14AdventureFlags3SetEjb
 .extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor11SetVelocityEP5Vec3p
 .extern _ZN5Actor12ApplyGravityEv
@@ -41,6 +48,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor14ResetWallTouchEv
 .extern _ZN5Actor15IsHitboxTouchedEb
@@ -103,28 +111,20 @@
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZTV11FilterActor
 .extern __register_global_object
-.extern gSinCosTable
+.extern abs
 .extern data_02051254
 .extern data_027e0764
 .extern data_027e0c54
 .extern data_027e0c68
-.extern gVec3p_ZERO
 .extern data_027e0d44
 .extern data_027e0db0
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f78
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ffc
@@ -147,16 +147,9 @@
 .extern func_01ff8690
 .extern func_01ff9158
 .extern func_01ff9958
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_02016fe8
 .extern func_02018450
 .extern func_02019534
@@ -177,7 +170,6 @@
 .extern func_020370d0
 .extern func_0203eba8
 .extern func_0203ebc8
-.extern abs
 .extern func_0204f614
 .extern func_0204f754
 .extern func_ov00_02079e68
@@ -283,7 +275,6 @@
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0d4c
 .extern func_ov00_020c0e04
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -368,6 +359,15 @@
 .extern func_ov05_02102c2c
 .extern func_ov17_02168660
 .extern func_ov17_021687f0
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strncpy

asm/ov21.inc

@@ -1,4 +1,8 @@
 #pragma once
+.extern Atan2
+.extern Vec3p_Add
+.extern Vec3p_Dot
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_54Ev
 .extern _ZN10MapManager16MapData_vfunc_60Ev
 .extern _ZN10MapManager16MapData_vfunc_68Ev
@@ -10,6 +14,9 @@
 .extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
 .extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
 .extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
+.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
+.extern _ZN19Actor_UnkStruct_020C1Ev
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -18,6 +25,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor15IsHitboxTouchedEb
 .extern _ZN5Actor15TrySetTransformEP9Transform
 .extern _ZN5Actor16CollidesWithLinkEv
@@ -68,20 +76,15 @@
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZNK11ItemManager7HasItemEi
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_027e0764
 .extern data_027e077c
 .extern data_027e0d3c
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern gPlayerPos
-.extern gPlayerLink
 .extern data_027e0fd0
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ffc
@@ -95,13 +98,8 @@
 .extern data_ov00_020eed2c
 .extern func_01ff8aa0
 .extern func_01ff9158
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Atan2
 .extern func_01ffbe78
 .extern func_01ffbf5c
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_020020d0
 .extern func_0200250c
 .extern func_02002540
@@ -124,7 +122,6 @@
 .extern func_ov00_020792a0
 .extern func_ov00_020793b8
 .extern func_ov00_02079ab4
-.extern func_ov00_0207a188
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207c1f8
 .extern func_ov00_02081f4c
@@ -176,14 +173,12 @@
 .extern func_ov00_020b7d74
 .extern func_ov00_020b7e6c
 .extern func_ov00_020bba28
-.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern func_ov00_020bc500
 .extern func_ov00_020bd618
 .extern func_ov00_020c0c08
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -309,4 +304,9 @@
 .extern func_ov17_0216a3e8
 .extern func_ov17_0216a4ac
 .extern func_ov17_0216a634
+.extern gActorManager
 .extern gItemManager
+.extern gMapManager
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable

asm/ov21.s

@@ -3651,7 +3651,7 @@ func_ov21_02170438: ; 0x02170438
 	str r2, [sp]
 	add r0, r4, #0x6c
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov22.inc

@@ -184,7 +184,7 @@
 .extern func_0204f614
 .extern func_0204f754
 .extern func_ov00_02079e68
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207c1b0
 .extern func_ov00_0207c1f8

asm/ov22.s

@@ -1760,7 +1760,7 @@ func_ov22_0216edc0: ; 0x0216edc0
 	str r2, [sp]
 	add r0, r4, #0x5c
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov23.inc

@@ -1,6 +1,15 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern PlaySoundEffect
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
 .extern _ZN10MapManager16MapData_vfunc_60Ev
 .extern _ZN10MapManager16MapData_vfunc_68Ev
@@ -25,6 +34,7 @@
 .extern _ZN10MapManager18func_ov00_02084d24Ecci
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
 .extern _ZN11ItemManager12GetItemModelEj
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
 .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
@@ -59,10 +69,13 @@
 .extern _ZN14AdventureFlags18func_ov00_02097bccEv
 .extern _ZN14AdventureFlags18func_ov00_02098058Ev
 .extern _ZN14AdventureFlags3GetEj
+.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
 .extern _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
 .extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
 .extern _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
+.extern _ZN19Actor_UnkStruct_020C1Ev
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10GetUnk_08cEP8Cylinder
 .extern _ZN5Actor10SetUnk_11bEv
@@ -72,6 +85,7 @@
 .extern _ZN5Actor12CollidesWithEPS_
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14DistanceToLinkEv
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor15IsHitboxTouchedEb
@@ -120,13 +134,13 @@
 .extern _ZN5Actor9GetHitboxEP8Cylinder
 .extern _ZN5ActorC2Ev
 .extern _ZN5ActorD2Ev
+.extern _ZN8Cylinder8OverlapsEPS_
 .extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
 .extern _ZN9ActorTypeD1Ev
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZTV11FilterActor
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02056be4
 .extern data_02057200
 .extern data_02063e4c
@@ -136,30 +150,21 @@
 .extern data_027e0c68
 .extern data_027e0cbc
 .extern data_027e0ce0
-.extern gVec3p_ZERO
 .extern data_027e0d38
 .extern data_027e0d3c
 .extern data_027e0db0
 .extern data_027e0e2c
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f70
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fcc
 .extern data_027e0fd0
 .extern data_027e0fd4
 .extern data_027e0fd8
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff4
@@ -187,22 +192,11 @@
 .extern func_01ff9158
 .extern func_01ff991c
 .extern func_01ff9b88
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffbe34
 .extern func_01ffbe78
-.extern _ZN8Cylinder8OverlapsEPS_
 .extern func_01fffb4c
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_02016fe8
 .extern func_02018450
 .extern func_02019570
@@ -235,7 +229,6 @@
 .extern func_ov00_02079470
 .extern func_ov00_0207977c
 .extern func_ov00_02079eb4
-.extern func_ov00_0207a188
 .extern func_ov00_0207a1a4
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207c1b0
@@ -347,7 +340,6 @@
 .extern func_ov00_020bb544
 .extern func_ov00_020bb5f0
 .extern func_ov00_020bba28
-.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
 .extern func_ov00_020bc48c
 .extern func_ov00_020bc494
 .extern func_ov00_020bc4ac
@@ -367,7 +359,6 @@
 .extern func_ov00_020c0ffc
 .extern func_ov00_020c10a0
 .extern func_ov00_020c10d4
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -457,7 +448,6 @@
 .extern func_ov00_020d1980
 .extern func_ov00_020d70a4
 .extern func_ov00_020d716c
-.extern PlaySoundEffect
 .extern func_ov00_020d77e4
 .extern func_ov00_020d7a84
 .extern func_ov00_020d7b20
@@ -573,6 +563,16 @@
 .extern func_ov17_0216a734
 .extern func_ov52_02195754
 .extern func_ov52_02195b5c
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strncpy

asm/ov23.s

@@ -10148,7 +10148,7 @@ func_ov23_02175c54: ; 0x02175c54
 	mov r3, r1
 	add r0, r4, #0xc0
 	str r2, [sp]
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov24.inc

@@ -173,7 +173,7 @@
 .extern func_0204f614
 .extern func_0204f754
 .extern func_ov00_02079e68
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207b89c
 .extern func_ov00_0207c1b0

asm/ov24.s

@@ -62,7 +62,7 @@ func_ov24_0216d6d8: ; 0x0216d6d8
 	str r2, [sp]
 	add r0, r4, #0x84
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov25.inc

@@ -1,5 +1,13 @@
 #pragma once
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Cross
+.extern Vec3p_Distance
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager16MapData_vfunc_78Ev
 .extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -12,6 +20,7 @@
 .extern _ZN10MapManager18func_ov00_02084b38Eiii
 .extern _ZN10MapManager18func_ov00_02084be0Eii
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager13FindActorByIdEj
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
@@ -25,6 +34,7 @@
 .extern _ZN14AdventureFlags18func_ov00_020980acEv
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN14AdventureFlags3SetEjb
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
@@ -34,6 +44,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor14ResetWallTouchEv
 .extern _ZN5Actor15IsHitboxTouchedEb
@@ -99,7 +110,6 @@
 .extern _ZNK11ItemManager19GetActiveFairyLevelEi
 .extern _ZTV11FilterActor
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_027e0178
 .extern data_027e0764
 .extern data_027e0c54
@@ -108,18 +118,11 @@
 .extern data_027e0d38
 .extern data_027e0db0
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff0
@@ -140,18 +143,8 @@
 .extern func_01ff9158
 .extern func_01ff992c
 .extern func_01ff9958
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Cross
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffe1cc
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_02002c14
 .extern func_02016fe8
 .extern func_02018450
@@ -255,7 +248,6 @@
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -409,6 +401,14 @@
 .extern func_ov30_021872c4
 .extern func_ov30_02187304
 .extern func_ov30_02187340
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
 .extern strncpy

asm/ov26.inc

@@ -222,7 +222,7 @@
 .extern func_ov00_02079680
 .extern func_ov00_02079ab4
 .extern func_ov00_02079e68
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207a1c8
 .extern func_ov00_0207b55c
 .extern func_ov00_0207b820

asm/ov26.s

@@ -944,7 +944,7 @@ func_ov26_0216dfe4: ; 0x0216dfe4
 	str r2, [sp]
 	add r0, r4, #0x44
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	ldr r1, _0216e07c ; =data_ov00_020e2f04
 	mov r0, #1
 	str r1, [r4, #0x58]
@@ -7415,7 +7415,7 @@ func_ov26_02173474: ; 0x02173474
 	str r2, [sp]
 	add r0, r4, #0x110
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, #0
 	str r0, [r4, #0x124]
 	strb r0, [r4, #0x128]
@@ -11643,7 +11643,7 @@ func_ov26_0217640c: ; 0x0217640c
 	str r2, [sp]
 	add r0, r4, #0x138
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, #0
 	strb r0, [r4, #0x7e]
 	strb r0, [r4, #0x88]
@@ -14263,7 +14263,7 @@ func_ov26_0217848c: ; 0x0217848c
 	str r2, [sp]
 	add r0, r4, #0x74
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	mov r0, r4
 	add sp, sp, #4
 	ldmia sp!, {r3, r4, pc}

asm/ov27.inc

@@ -1,13 +1,22 @@
 #pragma once
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
 .extern _ZN10MapManager18func_ov00_020836bcEjPi
 .extern _ZN10MapManager18func_ov00_020836dcEii
 .extern _ZN10MapManager18func_ov00_020838e8EjPi
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager13FindActorByIdEj
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
 .extern _ZN12ActorManager8GetActorEP8ActorRef
+.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
+.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
 .extern _ZN13PlayerControl14IsTouchingFastEv
 .extern _ZN14AdventureFlags18func_Ov00_02097810Ei
 .extern _ZN14AdventureFlags18func_ov00_02097738Ev
@@ -15,6 +24,7 @@
 .extern _ZN14AdventureFlags18func_ov00_02097bccEv
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN14AdventureFlags3SetEjb
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
@@ -24,6 +34,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14DistanceToLinkEv
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor15IsHitboxTouchedEb
@@ -81,7 +92,6 @@
 .extern _ZNK11ItemManager16GetTreasureCountEj
 .extern _ZNK11ItemManager19GetMaxTreasureCountEv
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02057200
 .extern data_027e0618
 .extern data_027e0764
@@ -89,23 +99,14 @@
 .extern data_027e0c38
 .extern data_027e0c68
 .extern data_027e0cbc
-.extern gVec3p_ZERO
 .extern data_027e0d38
 .extern data_027e0dbc
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fd4
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff0
@@ -128,19 +129,11 @@
 .extern func_01ff8e84
 .extern func_01ff9158
 .extern func_01ff9958
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffbe34
 .extern func_01ffbe78
 .extern func_01fffb4c
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_02018450
 .extern func_0201b1bc
 .extern func_0201e388
@@ -148,8 +141,6 @@
 .extern func_0202b2e8
 .extern func_0202b2f8
 .extern func_0202b4e4
-.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
-.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
 .extern func_0202bbbc
 .extern func_0202da8c
 .extern func_0202e030
@@ -234,7 +225,6 @@
 .extern func_ov00_020c0ecc
 .extern func_ov00_020c1424
 .extern func_ov00_020c1450
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -345,5 +335,15 @@
 .extern func_ov14_0214f668
 .extern func_ov14_0214f7f0
 .extern func_ov14_0214fa48
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO

asm/ov29.inc

@@ -1,6 +1,14 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_6cEv
 .extern _ZN10MapManager18Set_MapData_Unk_16Eci
 .extern _ZN10MapManager18func_ov00_02082680Eii
@@ -11,11 +19,13 @@
 .extern _ZN10MapManager18func_ov00_020846a4Ev
 .extern _ZN10MapManager18func_ov00_02084d24Ecci
 .extern _ZN11ItemManager18func_ov00_020ae4dcEi
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
 .extern _ZN12ActorManager18func_ov00_020c3b2cEPi
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN14AdventureFlags18func_ov00_02097738Ev
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
@@ -70,10 +80,14 @@
 .extern _ZN5ActorD2Ev
 .extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
 .extern _ZN9ActorTypeD1Ev
+.extern _ZN9EquipRope18func_ov14_0213d420Ev
+.extern _ZN9EquipRope18func_ov14_0213d440Ei
+.extern _ZN9EquipRope18func_ov14_0213d480Ei
+.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder
+.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02051354
 .extern data_02052f54
 .extern data_02054b54
@@ -86,7 +100,6 @@
 .extern data_027e0c54
 .extern data_027e0c68
 .extern data_027e0ce0
-.extern gVec3p_ZERO
 .extern data_027e0d38
 .extern data_027e0db0
 .extern data_027e0e58
@@ -94,13 +107,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff8
@@ -122,17 +129,8 @@
 .extern func_01ff992c
 .extern func_01ff9958
 .extern func_01ff9b4c
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01fffb4c
 .extern func_01fffbec
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern func_02006b14
 .extern func_02006b2c
 .extern func_02006b90
@@ -269,7 +267,6 @@
 .extern func_ov00_020c0d4c
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -337,12 +334,7 @@
 .extern func_ov09_0211a988
 .extern func_ov14_02120998
 .extern func_ov14_02122e98
-.extern _ZN9EquipRope18func_ov14_0213d420Ev
-.extern _ZN9EquipRope18func_ov14_0213d440Ei
-.extern _ZN9EquipRope18func_ov14_0213d480Ei
 .extern func_ov14_0213d5d0
-.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder
-.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor
 .extern func_ov14_021448d4
 .extern func_ov14_021448dc
 .extern func_ov14_021448e4
@@ -388,7 +380,15 @@
 .extern func_ov38_02182e3c
 .extern func_ov38_021854e4
 .extern func_ov38_02185720
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
 .extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strcpy

asm/ov32.inc

@@ -1,6 +1,12 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Distance
+.extern Vec3p_Length
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager18func_ov00_020836dcEii
 .extern _ZN10MapManager18func_ov00_02083780Ei
@@ -8,6 +14,7 @@
 .extern _ZN10MapManager18func_ov00_02084cc8Ei
 .extern _ZN10PlayerBase10SetVisibleEb
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
 .extern _ZN12ActorManager13FindActorByIdEj
 .extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -19,6 +26,7 @@
 .extern _ZN14AdventureFlags18func_ov00_02098058Ev
 .extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
 .extern _ZN14AdventureFlags18func_ov00_0209809cEv
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetUnk_08cEP8Cylinder
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -26,6 +34,7 @@
 .extern _ZN5Actor12CollidesWithEPS_
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14DistanceToLinkEv
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor14StopLinkFollowEv
@@ -74,11 +83,11 @@
 .extern _ZN5ActorD2Ev
 .extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
 .extern _ZN9ActorTypeD1Ev
+.extern _ZN9EquipRope18func_ov14_0213d480Ei
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZTV11FilterActor
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02051f54
 .extern data_02056be4
 .extern data_027e0618
@@ -86,7 +95,6 @@
 .extern data_027e077c
 .extern data_027e080c
 .extern data_027e0c68
-.extern gVec3p_ZERO
 .extern data_027e0d78
 .extern data_027e0e58
 .extern data_027e0e5c
@@ -94,13 +102,7 @@
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f84
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerAngle
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ffc
@@ -117,17 +119,9 @@
 .extern func_01ff9158
 .extern func_01ff991c
 .extern func_01ff9b88
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Length
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01ffbf5c
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_020020d0
 .extern func_0200250c
 .extern func_02002540
@@ -256,7 +250,6 @@
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -344,7 +337,14 @@
 .extern func_ov14_02127ac4
 .extern func_ov14_0213b904
 .extern func_ov14_0213b984
-.extern _ZN9EquipRope18func_ov14_0213d480Ei
+.extern gActorManager
 .extern gAdventureFlags
 .extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strncpy

asm/ov35.inc

@@ -1,10 +1,17 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Distance
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager18func_ov00_020836bcEjPi
 .extern _ZN10PlayerBase10SetVisibleEb
 .extern _ZN11ItemManager12GetItemModelEj
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN11ItemManager7AddItemEi
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN13PlayerControl14CheckTouchFastEj
@@ -16,12 +23,14 @@
 .extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN14AdventureFlags3SetEjb
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
 .extern _ZN5Actor11SetVelocityEP5Vec3p
 .extern _ZN5Actor12CollidesWithEPS_
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14DistanceToLinkEv
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor15IsHitboxTouchedEb
@@ -77,7 +86,6 @@
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_027e0194
 .extern data_027e037c
 .extern data_027e03c8
@@ -88,18 +96,10 @@
 .extern data_027e0764
 .extern data_027e0c54
 .extern data_027e0c68
-.extern gVec3p_ZERO
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fcc
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff4
@@ -119,17 +119,9 @@
 .extern func_01ff8aa0
 .extern func_01ff8e84
 .extern func_01ff9158
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01ffbe78
 .extern func_01fffbec
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_020079d8
 .extern func_02016fe8
 .extern func_0201838c
@@ -228,7 +220,6 @@
 .extern func_ov00_020c0d54
 .extern func_ov00_020c0d70
 .extern func_ov00_020c0e04
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -295,6 +286,15 @@
 .extern func_ov14_02123904
 .extern func_ov17_02168660
 .extern func_ov17_021687f0
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strncpy

asm/ov37.inc

@@ -1,15 +1,26 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Cross
+.extern Vec3p_Distance
+.extern Vec3p_Dot
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager18Set_MapData_Unk_16Eci
 .extern _ZN10MapManager18func_ov00_02083908EcPi
 .extern _ZN10PlayerBase10SetVisibleEb
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
 .extern _ZN11ItemManager12GetItemModelEj
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager13FindActorByIdEj
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN14AdventureFlags18func_ov00_02097968Ei
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -18,6 +29,7 @@
 .extern _ZN5Actor12GetOffsetPosEP5Vec3p
 .extern _ZN5Actor12SetTransformEP9Transform
 .extern _ZN5Actor12XzDistanceToEP5Vec3p
+.extern _ZN5Actor13func_01fffd04Ei
 .extern _ZN5Actor14GetAngleToLinkEv
 .extern _ZN5Actor15IsHitboxTouchedEb
 .extern _ZN5Actor15TrySetTransformEP9Transform
@@ -74,19 +86,12 @@
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_027e0764
 .extern data_027e0c54
-.extern gVec3p_ZERO
 .extern data_027e0e58
 .extern data_027e0f64
 .extern data_027e0f6c
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerVel
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff8
@@ -102,21 +107,10 @@
 .extern func_01ff892c
 .extern func_01ff8e84
 .extern func_01ff9158
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Dot
-.extern Vec3p_Cross
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Axpy
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01ffa9fc
 .extern func_01ffbe78
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
-.extern _ZN5Actor13func_01fffd04Ei
 .extern func_020079d8
 .extern func_02016fe8
 .extern func_02018450
@@ -193,7 +187,6 @@
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
 .extern func_ov00_020c0e24
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -273,7 +266,14 @@
 .extern func_ov14_02146634
 .extern func_ov17_02168660
 .extern func_ov17_021687f0
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
 .extern gMapManager
+.extern gPlayer
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gPlayerVel
+.extern gSinCosTable
+.extern gVec3p_ZERO
 .extern strncpy

asm/ov39.inc

@@ -1,12 +1,20 @@
 #pragma once
 .extern Approach_thunk
+.extern Atan2
 .extern Divide
+.extern PlaySoundEffect
+.extern Vec3p_Add
+.extern Vec3p_Distance
+.extern Vec3p_Length
+.extern Vec3p_Normalize
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager18func_ov00_02084b38Eiii
 .extern _ZN10MapManager18func_ov00_02084be0Eii
-.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
 .extern _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
+.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
 .extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN13PlayerControl14IsTouchingFastEv
@@ -14,6 +22,7 @@
 .extern _ZN14AdventureFlags18func_ov00_02097968Ei
 .extern _ZN14AdventureFlags18func_ov00_02097b9cEv
 .extern _ZN14AdventureFlags18func_ov00_02097bccEv
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10GetAngleToEP5Vec3p
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
@@ -71,7 +80,6 @@
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02057200
 .extern data_027e0194
 .extern data_027e01b8
@@ -80,15 +88,8 @@
 .extern data_027e0c54
 .extern data_027e0c68
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff8
@@ -106,15 +107,8 @@
 .extern func_01ff8e84
 .extern func_01ff9158
 .extern func_01ff9958
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Length
-.extern Vec3p_Normalize
-.extern Vec3p_Distance
-.extern Atan2
 .extern func_01fffbec
 .extern func_01fffcd8
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern func_020078f4
 .extern func_020079d8
 .extern func_02016fe8
@@ -208,7 +202,6 @@
 .extern func_ov00_020c0ecc
 .extern func_ov00_020c1424
 .extern func_ov00_020c1450
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -230,7 +223,6 @@
 .extern func_ov00_020d18f4
 .extern func_ov00_020d1980
 .extern func_ov00_020d716c
-.extern PlaySoundEffect
 .extern func_ov00_020d73f0
 .extern func_ov00_020d77e4
 .extern func_ov00_020d7ad4
@@ -259,6 +251,14 @@
 .extern func_ov29_02177d90
 .extern func_ov29_02177ff0
 .extern func_ov29_02178060
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
 .extern strncpy

asm/ov41.inc

@@ -1,14 +1,20 @@
 #pragma once
+.extern Atan2
+.extern Vec3p_Add
+.extern Vec3p_Axpy
+.extern Vec3p_Sub
 .extern _ZN10MapManager16MapData_vfunc_68Ev
 .extern _ZN10MapManager16MapData_vfunc_7cEv
 .extern _ZN10MapManager18func_ov00_020836dcEii
 .extern _ZN10MapManager18func_ov00_02083770Eji
 .extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
 .extern _ZN10PlayerBase12CollidesWithEP8Cylinder
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
 .extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -71,7 +77,6 @@
 .extern _ZN9SysObjectnwEmPjj
 .extern _ZNK11ItemManager7HasItemEi
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02057200
 .extern data_027e0764
 .extern data_027e077c
@@ -79,17 +84,11 @@
 .extern data_027e0d04
 .extern data_027e0e58
 .extern data_027e0e5c
-.extern gMapManager
 .extern data_027e0f68
 .extern data_027e0f6c
 .extern data_027e0f78
-.extern gPlayer
-.extern gPlayerPos
-.extern gPlayerAngle
-.extern gPlayerLink
 .extern data_027e0fd0
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff0
@@ -109,11 +108,6 @@
 .extern func_01ff8214
 .extern func_01ff8e84
 .extern func_01ff9158
-.extern Vec3p_Add
-.extern Vec3p_Sub
-.extern Vec3p_Axpy
-.extern Atan2
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern func_02018450
 .extern func_020196bc
 .extern func_020196fc
@@ -175,7 +169,6 @@
 .extern func_ov00_020c0ffc
 .extern func_ov00_020c10a0
 .extern func_ov00_020c10d4
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -303,5 +296,12 @@
 .extern func_ov14_0214aa0c
 .extern func_ov26_02175f30
 .extern func_ov26_02175f68
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayer
+.extern gPlayerAngle
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable

asm/ov42.inc

@@ -2,9 +2,11 @@
 .extern _ZN10MapManager18func_ov00_02083918EiPi
 .extern _ZN11ItemManager14ForceEquipItemEi
 .extern _ZN11ItemManager20ClearForcedEquipItemEv
+.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern _ZN12ActorManager8GetActorEP8ActorRef
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
 .extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -54,7 +56,6 @@
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_027e05f4
 .extern data_027e0618
 .extern data_027e0764
@@ -62,14 +63,9 @@
 .extern data_027e0d44
 .extern data_027e0de4
 .extern data_027e0e58
-.extern gMapManager
 .extern data_027e0f64
 .extern data_027e0f78
-.extern gPlayerPos
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ffc
@@ -84,7 +80,6 @@
 .extern func_01ff8230
 .extern func_01ff8690
 .extern func_01ffbe34
-.extern _ZN11ItemManager21GetEquipItemUncheckedEi
 .extern func_020196bc
 .extern func_020196fc
 .extern func_0201e388
@@ -121,7 +116,6 @@
 .extern func_ov00_020bc500
 .extern func_ov00_020bcdec
 .extern func_ov00_020bcf50
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -185,7 +179,13 @@
 .extern func_ov14_02145f0c
 .extern func_ov14_0214a92c
 .extern func_ov14_0214aa0c
+.extern gActorManager
 .extern gAdventureFlags
 .extern gItemManager
+.extern gMapManager
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerPos
+.extern gSinCosTable
 .extern strcat
 .extern strcpy

asm/ov52.inc

@@ -1,4 +1,7 @@
 #pragma once
+.extern GiveShipPart
+.extern Vec3p_Add
+.extern Vec3p_Length
 .extern _ZN10MapManager18func_ov00_02082b3cEi
 .extern _ZN10MapManager18func_ov00_020836dcEii
 .extern _ZN10MapManager18func_ov00_020838e8EjPi
@@ -10,6 +13,7 @@
 .extern _ZN14AdventureFlags3GetEj
 .extern _ZN14AdventureFlags3SetEjb
 .extern _ZN14OverlayManager15LoadIfNotLoadedEjj
+.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern _ZN5Actor10SetUnk_11bEv
 .extern _ZN5Actor10SetUnk_11cEc
 .extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -65,7 +69,6 @@
 .extern _ZN9SysObjectdlEPv
 .extern _ZN9SysObjectnwEmPjj
 .extern __register_global_object
-.extern gSinCosTable
 .extern data_02063e4c
 .extern data_027e0618
 .extern data_027e0764
@@ -75,11 +78,7 @@
 .extern data_027e0e58
 .extern data_027e0f68
 .extern data_027e0f78
-.extern gPlayerVel
-.extern gPlayerControl
-.extern gPlayerLink
 .extern data_027e0fe0
-.extern gActorManager
 .extern data_027e0fe8
 .extern data_027e0fec
 .extern data_027e0ff8
@@ -93,8 +92,6 @@
 .extern data_ov09_0211f5b4
 .extern func_01ff80d4
 .extern func_01ff8214
-.extern Vec3p_Add
-.extern Vec3p_Length
 .extern func_01ffbe34
 .extern func_020078f4
 .extern func_020196bc
@@ -140,7 +137,6 @@
 .extern func_ov00_020c0c08
 .extern func_ov00_020c0cc8
 .extern func_ov00_020c0e04
-.extern _ZN19Actor_UnkStruct_020C1Ev
 .extern func_ov00_020c3348
 .extern func_ov00_020c4048
 .extern func_ov00_020c4588
@@ -167,7 +163,6 @@
 .extern func_ov05_021082e4
 .extern func_ov09_0211c724
 .extern func_ov09_0211c808
-.extern GiveShipPart
 .extern func_ov09_0211cac0
 .extern func_ov14_021448f4
 .extern func_ov14_02144a90
@@ -206,7 +201,12 @@
 .extern func_ov14_02145f0c
 .extern func_ov14_0214a92c
 .extern func_ov14_0214aa0c
+.extern gActorManager
 .extern gAdventureFlags
 .extern gMapManager
 .extern gOverlayManager
+.extern gPlayerControl
+.extern gPlayerLink
+.extern gPlayerVel
+.extern gSinCosTable
 .extern strcpy

asm/ov57.inc

@@ -52,7 +52,7 @@
 .extern func_0202af4c
 .extern func_0202b2f8
 .extern func_0202d95c
-.extern func_ov00_0207a188
+.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
 .extern func_ov00_0207bb1c
 .extern func_ov00_0207c1f8
 .extern func_ov00_0207c444

asm/ov57.s

@@ -1811,7 +1811,7 @@ func_ov57_0219a460: ; 0x0219a460
 	str r2, [sp]
 	add r0, r4, #0x18c
 	mov r3, r1
-	blx func_ov00_0207a188
+	blx _ZN19Actor_UnkStruct_0a4C1Eiiii
 	add r0, r4, #0x8c
 	bl func_ov14_0212382c
 	bl func_ov14_0212384c