Further Attention Docs (#1732)

* more attention docs

* more docs

* cleanup

* more cleanup

* spacing

* more attention docs

* small cleanup

* consistency

tools/disasm/functions.txt

@@ -671,7 +671,7 @@
     0x800B4EDC:("Actor_GetProjectedPos",),
     0x800B4F40:("Attention_SetReticlePos",),
     0x800B4F78:("Attention_InitReticle",),
-    0x800B5040:("Attention_SetFairyState",),
+    0x800B5040:("Attention_SetTatlState",),
     0x800B51A4:("Attention_Init",),
     0x800B5208:("Attention_Draw",),
     0x800B5814:("Attention_Update",),
@@ -766,9 +766,9 @@
     0x800B81E0:("Actor_GetFocus",),
     0x800B8214:("Actor_GetWorld",),
     0x800B8248:("Actor_GetWorldPosShapeRot",),
-    0x800B82EC:("Attention_GetAdjustedDistSq",),
-    0x800B83BC:("Attention_IsActorInRange",),
-    0x800B83F8:("Attention_OutsideLeashRange",),
+    0x800B82EC:("Attention_WeightedDistToPlayerSq",),
+    0x800B83BC:("Attention_ActorIsInRange",),
+    0x800B83F8:("Attention_ShouldReleaseLockOn",),
     0x800B84D0:("Actor_TalkOfferAccepted",),
     0x800B8500:("Actor_OfferTalkExchange",),
     0x800B85E0:("Actor_OfferTalkExchangeEquiCylinder",),
@@ -840,9 +840,9 @@
     0x800BB140:("Actor_SpawnTransitionActors",),
     0x800BB2D0:("Actor_SpawnEntry",),
     0x800BB498:("Actor_Delete",),
-    0x800BB59C:("Attention_InTargetableScreenRegion",),
-    0x800BB604:("Attention_FindTargetableActorForCategory",),
-    0x800BB8EC:("Attention_GetTargetActor",),
+    0x800BB59C:("Attention_ActorOnScreen",),
+    0x800BB604:("Attention_FindActorInCategory",),
+    0x800BB8EC:("Attention_FindActor",),
     0x800BBA88:("Enemy_StartFinishingBlow",),
     0x800BBAC0:("func_800BBAC0",),
     0x800BBB74:("func_800BBB74",),
@@ -1169,7 +1169,7 @@
     0x800CD3E4:("Camera_BgCheckCorner",),
     0x800CD44C:("func_800CD44C",),
     0x800CD634:("Camera_CalcSlopeYAdj",),
-    0x800CD6CC:("func_800CD6CC",),
+    0x800CD6CC:("Camera_GetAttentionActorRange",),
     0x800CD6F8:("Camera_CalcAtDefault",),
     0x800CD834:("Camera_CalcAtForScreen",),
     0x800CDA14:("Camera_CalcAtForNormal1",),

tools/disasm/variables.txt

@@ -419,13 +419,13 @@
     0x801AEC74:("sCurrentBit","u32","",0x4),
     0x801AEC78:("sTimer","s32","",0x4),
     0x801AEC80:("D_801AEC80","Color_RGBA8","",0x4),
-    0x801AEC84:("sTatlColorList","TatlColor","[13]",0x68),
+    0x801AEC84:("sAttentionColors","TatlColor","[13]",0x68),
     0x801AECEC:("sActorMovementScale","f32","",0x4),
     0x801AECF0:("gAttentionRanges","f32","[]",0x58),
     0x801AED48:("D_801AED48","s16","[8]",0x10),
     0x801AED58:("sCategoryFreezeMasks","UNK_TYPE4","",0x4),
     0x801AED88:("actorDefaultHitColor","Color_RGBA8","",0x4),
-    0x801AED8C:("sTargetableActorCategories","UNK_TYPE1","",0x1),
+    0x801AED8C:("sAttentionCategorySearchOrder","UNK_TYPE1","",0x1),
     0x801AED98:("D_801AED98","Vec3f","",0xC),
     0x801AEDA4:("D_801AEDA4","UNK_TYPE4","",0x4),
     0x801AEDB0:("sArrowDmgFlags","UNK_TYPE1","",0x1),
@@ -3744,18 +3744,18 @@
     0x801ED8A0:("sActorFaultClient","UNK_TYPE1","",0x1),
     0x801ED8B0:("D_801ED8B0","UNK_TYPE1","",0x1),
     0x801ED8B4:("D_801ED8B4","UNK_TYPE1","",0x1),
-    0x801ED8B8:("sTargetableNearestActor","UNK_TYPE1","",0x1),
-    0x801ED8BC:("sTargetablePrioritizedActor","UNK_TYPE1","",0x1),
-    0x801ED8C0:("D_801ED8C0","UNK_TYPE1","",0x1),
-    0x801ED8C4:("D_801ED8C4","UNK_TYPE1","",0x1),
-    0x801ED8C8:("sTargetableNearestActorDistSq","f32","",0x4),
+    0x801ED8B8:("sNearestAttentionActor","UNK_TYPE1","",0x1),
+    0x801ED8BC:("sPrioritizedAttentionActor","UNK_TYPE1","",0x1),
+    0x801ED8C0:("sNearestCameraDriftActor","UNK_TYPE1","",0x1),
+    0x801ED8C4:("sPrioritizedCameraDriftActor","UNK_TYPE1","",0x1),
+    0x801ED8C8:("sNearestAttentionActorDistSq","f32","",0x4),
     0x801ED8CC:("sBgmEnemyDistSq","f32","",0x4),
-    0x801ED8D0:("D_801ED8D0","f32","",0x4),
-    0x801ED8D4:("sTargetablePrioritizedPriority","UNK_TYPE1","",0x1),
-    0x801ED8D8:("D_801ED8D8","UNK_TYPE1","",0x1),
-    0x801ED8DC:("sTargetPlayerRotY","UNK_TYPE1","",0x1),
+    0x801ED8D0:("sNearestCameraDriftActorDistSq","f32","",0x4),
+    0x801ED8D4:("sHighestAttentionPriority","UNK_TYPE1","",0x1),
+    0x801ED8D8:("sHighestCameraDriftPriority","UNK_TYPE1","",0x1),
+    0x801ED8DC:("sAttentionPlayerRotY","UNK_TYPE1","",0x1),
     0x801ED8E0:("sActorHiliteMtx","Mtx","",0x40),
-    0x801ED920:("D_801ED920","Actor*","",0x1),
+    0x801ED920:("gCameraDriftActor","Actor*","",0x1),
     0x801ED930:("D_801ED930","FaultClient","",0x10),
     0x801ED940:("sActorOverlayTableFaultAddrConvClient","FaultAddrConvClient","",0xC),
     0x801ED950:("D_801ED950","char","[80]",0x50),