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

* attention

* revert flags, too large of a diff

* more revert
This commit is contained in:
engineer124
2024-10-18 14:56:58 +11:00
committed by GitHub
parent 1ddc836c8e
commit 6a0bb0345d
12 changed files with 190 additions and 188 deletions
+12 -12
View File
@@ -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
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
183 asm/non_matchings/code/z_actor/func_800B4AEC.s func_800B4AEC 0x800B4AEC 0x19
184 asm/non_matchings/code/z_actor/func_800B4B50.s func_800B4B50 0x800B4B50 0xE3
185 asm/non_matchings/code/z_actor/Actor_GetProjectedPos.s Actor_GetProjectedPos 0x800B4EDC 0x19
186 asm/non_matchings/code/z_actor/Target_SetReticlePos.s asm/non_matchings/code/z_actor/Attention_SetReticlePos.s Target_SetReticlePos Attention_SetReticlePos 0x800B4F40 0xE
187 asm/non_matchings/code/z_actor/Target_InitReticle.s asm/non_matchings/code/z_actor/Attention_InitReticle.s Target_InitReticle Attention_InitReticle 0x800B4F78 0x32
188 asm/non_matchings/code/z_actor/Target_SetFairyState.s asm/non_matchings/code/z_actor/Attention_SetFairyState.s Target_SetFairyState Attention_SetFairyState 0x800B5040 0x59
189 asm/non_matchings/code/z_actor/Target_Init.s asm/non_matchings/code/z_actor/Attention_Init.s Target_Init Attention_Init 0x800B51A4 0x19
190 asm/non_matchings/code/z_actor/Target_Draw.s asm/non_matchings/code/z_actor/Attention_Draw.s Target_Draw Attention_Draw 0x800B5208 0x183
191 asm/non_matchings/code/z_actor/Target_Update.s asm/non_matchings/code/z_actor/Attention_Update.s Target_Update Attention_Update 0x800B5814 0xE7
192 asm/non_matchings/code/z_actor/Flags_GetSwitch.s Flags_GetSwitch 0x800B5BB0 0x11
193 asm/non_matchings/code/z_actor/Flags_SetSwitch.s Flags_SetSwitch 0x800B5BF4 0x10
194 asm/non_matchings/code/z_actor/Flags_UnsetSwitch.s Flags_UnsetSwitch 0x800B5C34 0x11
280 asm/non_matchings/code/z_actor/Actor_GetFocus.s Actor_GetFocus 0x800B81E0 0xD
281 asm/non_matchings/code/z_actor/Actor_GetWorld.s Actor_GetWorld 0x800B8214 0xD
282 asm/non_matchings/code/z_actor/Actor_GetWorldPosShapeRot.s Actor_GetWorldPosShapeRot 0x800B8248 0x29
283 asm/non_matchings/code/z_actor/Target_GetAdjustedDistSq.s asm/non_matchings/code/z_actor/Attention_GetAdjustedDistSq.s Target_GetAdjustedDistSq Attention_GetAdjustedDistSq 0x800B82EC 0x34
284 asm/non_matchings/code/z_actor/Target_IsActorInRange.s asm/non_matchings/code/z_actor/Attention_IsActorInRange.s Target_IsActorInRange Attention_IsActorInRange 0x800B83BC 0xF
285 asm/non_matchings/code/z_actor/Target_OutsideLeashRange.s asm/non_matchings/code/z_actor/Attention_OutsideLeashRange.s Target_OutsideLeashRange Attention_OutsideLeashRange 0x800B83F8 0x36
286 asm/non_matchings/code/z_actor/Actor_TalkOfferAccepted.s Actor_TalkOfferAccepted 0x800B84D0 0xC
287 asm/non_matchings/code/z_actor/Actor_OfferTalkExchange.s Actor_OfferTalkExchange 0x800B8500 0x38
288 asm/non_matchings/code/z_actor/Actor_OfferTalkExchangeEquiCylinder.s Actor_OfferTalkExchangeEquiCylinder 0x800B85E0 0xD
354 asm/non_matchings/code/z_actor/Actor_SpawnTransitionActors.s Actor_SpawnTransitionActors 0x800BB140 0x64
355 asm/non_matchings/code/z_actor/Actor_SpawnEntry.s Actor_SpawnEntry 0x800BB2D0 0x72
356 asm/non_matchings/code/z_actor/Actor_Delete.s Actor_Delete 0x800BB498 0x41
357 asm/non_matchings/code/z_actor/Target_InTargetableScreenRegion.s asm/non_matchings/code/z_actor/Attention_InTargetableScreenRegion.s Target_InTargetableScreenRegion Attention_InTargetableScreenRegion 0x800BB59C 0x1A
358 asm/non_matchings/code/z_actor/Target_FindTargetableActorForCategory.s asm/non_matchings/code/z_actor/Attention_FindTargetableActorForCategory.s Target_FindTargetableActorForCategory Attention_FindTargetableActorForCategory 0x800BB604 0xBA
359 asm/non_matchings/code/z_actor/Target_GetTargetActor.s asm/non_matchings/code/z_actor/Attention_GetTargetActor.s Target_GetTargetActor Attention_GetTargetActor 0x800BB8EC 0x67
360 asm/non_matchings/code/z_actor/Enemy_StartFinishingBlow.s Enemy_StartFinishingBlow 0x800BBA88 0xE
361 asm/non_matchings/code/z_actor/func_800BBAC0.s func_800BBAC0 0x800BBAC0 0x2D
362 asm/non_matchings/code/z_actor/func_800BBB74.s func_800BBB74 0x800BBB74 0x2B