Target -> Attention (System Rename) (#1716)

* attention

* revert flags, too large of a diff

* more revert

3 files changed, 33 insertions, 33 deletions

diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 7b80b2fe2..64c72b97b 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -669,12 +669,12 @@
     0x800B4AEC:("func_800B4AEC",),
     0x800B4B50:("func_800B4B50",),
     0x800B4EDC:("Actor_GetProjectedPos",),
-    0x800B4F40:("Target_SetReticlePos",),
-    0x800B4F78:("Target_InitReticle",),
-    0x800B5040:("Target_SetFairyState",),
-    0x800B51A4:("Target_Init",),
-    0x800B5208:("Target_Draw",),
-    0x800B5814:("Target_Update",),
+    0x800B4F40:("Attention_SetReticlePos",),
+    0x800B4F78:("Attention_InitReticle",),
+    0x800B5040:("Attention_SetFairyState",),
+    0x800B51A4:("Attention_Init",),
+    0x800B5208:("Attention_Draw",),
+    0x800B5814:("Attention_Update",),
     0x800B5BB0:("Flags_GetSwitch",),
     0x800B5BF4:("Flags_SetSwitch",),
     0x800B5C34:("Flags_UnsetSwitch",),
@@ -766,9 +766,9 @@
     0x800B81E0:("Actor_GetFocus",),
     0x800B8214:("Actor_GetWorld",),
     0x800B8248:("Actor_GetWorldPosShapeRot",),
-    0x800B82EC:("Target_GetAdjustedDistSq",),
-    0x800B83BC:("Target_IsActorInRange",),
-    0x800B83F8:("Target_OutsideLeashRange",),
+    0x800B82EC:("Attention_GetAdjustedDistSq",),
+    0x800B83BC:("Attention_IsActorInRange",),
+    0x800B83F8:("Attention_OutsideLeashRange",),
     0x800B84D0:("Actor_TalkOfferAccepted",),
     0x800B8500:("Actor_OfferTalkExchange",),
     0x800B85E0:("Actor_OfferTalkExchangeEquiCylinder",),
@@ -840,9 +840,9 @@
     0x800BB140:("Actor_SpawnTransitionActors",),
     0x800BB2D0:("Actor_SpawnEntry",),
     0x800BB498:("Actor_Delete",),
-    0x800BB59C:("Target_InTargetableScreenRegion",),
-    0x800BB604:("Target_FindTargetableActorForCategory",),
-    0x800BB8EC:("Target_GetTargetActor",),
+    0x800BB59C:("Attention_InTargetableScreenRegion",),
+    0x800BB604:("Attention_FindTargetableActorForCategory",),
+    0x800BB8EC:("Attention_GetTargetActor",),
     0x800BBA88:("Enemy_StartFinishingBlow",),
     0x800BBAC0:("func_800BBAC0",),
     0x800BBB74:("func_800BBB74",),
diff --git a/tools/namefixer.py b/tools/namefixer.py
index b5389b272..769e209fb 100755
--- a/tools/namefixer.py
+++ b/tools/namefixer.py
@@ -1297,15 +1297,15 @@ wordReplace = {
 
     "play->actorCtx.unk3": "play->actorCtx.lensActive",
     "play->actorCtx.unk4": "play->actorCtx.lensMaskSize",
-    "play->actorCtx.targetContext": "play->actorCtx.targetCtx",
-    "play->actorCtx.targetCtx.unk0": "play->actorCtx.targetCtx.fairyPos",
-    "play->actorCtx.targetCtx.unk40": "play->actorCtx.targetCtx.fairyMoveProgressFactor",
-    "play->actorCtx.targetCtx.unk44": "play->actorCtx.targetCtx.lockOnRadius",
-    "play->actorCtx.targetCtx.unk48": "play->actorCtx.targetCtx.lockOnAlpha",
-    "play->actorCtx.targetCtx.unk4B": "play->actorCtx.targetCtx.rotation",
-    "play->actorCtx.targetCtx.unk4C": "play->actorCtx.targetCtx.lockOnIndex",
-    "play->actorCtx.targetCtx.unk50": "play->actorCtx.targetCtx.lockOnTriangleSets",
-    "play->actorCtx.targetCtx.unk8C": "play->actorCtx.targetCtx.nextTarget",
+    "play->actorCtx.targetContext": "play->actorCtx.attention",
+    "play->actorCtx.attention.unk0": "play->actorCtx.attention.fairyPos",
+    "play->actorCtx.attention.unk40": "play->actorCtx.attention.fairyMoveProgressFactor",
+    "play->actorCtx.attention.unk44": "play->actorCtx.attention.lockOnRadius",
+    "play->actorCtx.attention.unk48": "play->actorCtx.attention.lockOnAlpha",
+    "play->actorCtx.attention.unk4B": "play->actorCtx.attention.rotation",
+    "play->actorCtx.attention.unk4C": "play->actorCtx.attention.lockOnIndex",
+    "play->actorCtx.attention.unk50": "play->actorCtx.attention.lockOnTriangleSets",
+    "play->actorCtx.attention.unk8C": "play->actorCtx.attention.nextTarget",
     "play->doorCtx.transitionActorList": "play->transitionActors.list",
     "play->nextEntranceIndex": "play->nextEntrance",
     "play->sceneNum": "play->sceneId",
diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv
index 527af4594..ee16dd9e2 100644
--- a/tools/sizes/code_functions.csv
+++ b/tools/sizes/code_functions.csv
@@ -183,12 +183,12 @@ asm/non_matchings/code/z_actor/Actor_SetFeetPos.s,Actor_SetFeetPos,0x800B4A98,0x
 asm/non_matchings/code/z_actor/func_800B4AEC.s,func_800B4AEC,0x800B4AEC,0x19
 asm/non_matchings/code/z_actor/func_800B4B50.s,func_800B4B50,0x800B4B50,0xE3
 asm/non_matchings/code/z_actor/Actor_GetProjectedPos.s,Actor_GetProjectedPos,0x800B4EDC,0x19
-asm/non_matchings/code/z_actor/Target_SetReticlePos.s,Target_SetReticlePos,0x800B4F40,0xE
-asm/non_matchings/code/z_actor/Target_InitReticle.s,Target_InitReticle,0x800B4F78,0x32
-asm/non_matchings/code/z_actor/Target_SetFairyState.s,Target_SetFairyState,0x800B5040,0x59
-asm/non_matchings/code/z_actor/Target_Init.s,Target_Init,0x800B51A4,0x19
-asm/non_matchings/code/z_actor/Target_Draw.s,Target_Draw,0x800B5208,0x183
-asm/non_matchings/code/z_actor/Target_Update.s,Target_Update,0x800B5814,0xE7
+asm/non_matchings/code/z_actor/Attention_SetReticlePos.s,Attention_SetReticlePos,0x800B4F40,0xE
+asm/non_matchings/code/z_actor/Attention_InitReticle.s,Attention_InitReticle,0x800B4F78,0x32
+asm/non_matchings/code/z_actor/Attention_SetFairyState.s,Attention_SetFairyState,0x800B5040,0x59
+asm/non_matchings/code/z_actor/Attention_Init.s,Attention_Init,0x800B51A4,0x19
+asm/non_matchings/code/z_actor/Attention_Draw.s,Attention_Draw,0x800B5208,0x183
+asm/non_matchings/code/z_actor/Attention_Update.s,Attention_Update,0x800B5814,0xE7
 asm/non_matchings/code/z_actor/Flags_GetSwitch.s,Flags_GetSwitch,0x800B5BB0,0x11
 asm/non_matchings/code/z_actor/Flags_SetSwitch.s,Flags_SetSwitch,0x800B5BF4,0x10
 asm/non_matchings/code/z_actor/Flags_UnsetSwitch.s,Flags_UnsetSwitch,0x800B5C34,0x11
@@ -280,9 +280,9 @@ asm/non_matchings/code/z_actor/func_800B8118.s,func_800B8118,0x800B8118,0x32
 asm/non_matchings/code/z_actor/Actor_GetFocus.s,Actor_GetFocus,0x800B81E0,0xD
 asm/non_matchings/code/z_actor/Actor_GetWorld.s,Actor_GetWorld,0x800B8214,0xD
 asm/non_matchings/code/z_actor/Actor_GetWorldPosShapeRot.s,Actor_GetWorldPosShapeRot,0x800B8248,0x29
-asm/non_matchings/code/z_actor/Target_GetAdjustedDistSq.s,Target_GetAdjustedDistSq,0x800B82EC,0x34
-asm/non_matchings/code/z_actor/Target_IsActorInRange.s,Target_IsActorInRange,0x800B83BC,0xF
-asm/non_matchings/code/z_actor/Target_OutsideLeashRange.s,Target_OutsideLeashRange,0x800B83F8,0x36
+asm/non_matchings/code/z_actor/Attention_GetAdjustedDistSq.s,Attention_GetAdjustedDistSq,0x800B82EC,0x34
+asm/non_matchings/code/z_actor/Attention_IsActorInRange.s,Attention_IsActorInRange,0x800B83BC,0xF
+asm/non_matchings/code/z_actor/Attention_OutsideLeashRange.s,Attention_OutsideLeashRange,0x800B83F8,0x36
 asm/non_matchings/code/z_actor/Actor_TalkOfferAccepted.s,Actor_TalkOfferAccepted,0x800B84D0,0xC
 asm/non_matchings/code/z_actor/Actor_OfferTalkExchange.s,Actor_OfferTalkExchange,0x800B8500,0x38
 asm/non_matchings/code/z_actor/Actor_OfferTalkExchangeEquiCylinder.s,Actor_OfferTalkExchangeEquiCylinder,0x800B85E0,0xD
@@ -354,9 +354,9 @@ asm/non_matchings/code/z_actor/Actor_SpawnAsChild.s,Actor_SpawnAsChild,0x800BB0C
 asm/non_matchings/code/z_actor/Actor_SpawnTransitionActors.s,Actor_SpawnTransitionActors,0x800BB140,0x64
 asm/non_matchings/code/z_actor/Actor_SpawnEntry.s,Actor_SpawnEntry,0x800BB2D0,0x72
 asm/non_matchings/code/z_actor/Actor_Delete.s,Actor_Delete,0x800BB498,0x41
-asm/non_matchings/code/z_actor/Target_InTargetableScreenRegion.s,Target_InTargetableScreenRegion,0x800BB59C,0x1A
-asm/non_matchings/code/z_actor/Target_FindTargetableActorForCategory.s,Target_FindTargetableActorForCategory,0x800BB604,0xBA
-asm/non_matchings/code/z_actor/Target_GetTargetActor.s,Target_GetTargetActor,0x800BB8EC,0x67
+asm/non_matchings/code/z_actor/Attention_InTargetableScreenRegion.s,Attention_InTargetableScreenRegion,0x800BB59C,0x1A
+asm/non_matchings/code/z_actor/Attention_FindTargetableActorForCategory.s,Attention_FindTargetableActorForCategory,0x800BB604,0xBA
+asm/non_matchings/code/z_actor/Attention_GetTargetActor.s,Attention_GetTargetActor,0x800BB8EC,0x67
 asm/non_matchings/code/z_actor/Enemy_StartFinishingBlow.s,Enemy_StartFinishingBlow,0x800BBA88,0xE
 asm/non_matchings/code/z_actor/func_800BBAC0.s,func_800BBAC0,0x800BBAC0,0x2D
 asm/non_matchings/code/z_actor/func_800BBB74.s,func_800BBB74,0x800BBB74,0x2B