Documentation pass for the Target system (#1281)

* cleanup

* import bss

* sActorHiliteMtx

* some cleanups on func_800BB604

* Actor_IsInTargetableRange

* rematch func_800BB604

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* Name ACTOR_FLAG_UNFRIENDLY and ACTOR_FLAG_FRIENDLY

* Rename some Target_ functions

* cleanusp

* TargetMode enum

* Target_800B82EC

* sNaming

* more

* more naming

* fairyHintPos

* rotation

* ACTOR_FLAG_TARGETABLE

* update namefixer

* remove trailing comma

* bss

* Wall of text for Target_800BB604

* function naming

* cleanups

* Target_GetAdjustedDistSq

* NotLeash

* more comments

* minor comment

* review

* fix

* rotZTick

* review

* name last members

* fix

* review

* review

* more namefixer

* swap members

* comment

* Update src/code/z_actor.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_actor.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* format

* Update src/code/z_actor.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/z64actor.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* review

* fix

* fix

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
2023-09-02 15:16:45 -04:00
committed by GitHub
parent cbf9d98dba
commit 9cceea48f3
304 changed files with 1620 additions and 1501 deletions
+13 -13
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_SetPos.s,Target_SetPos,0x800B4F40,0xE
asm/non_matchings/code/z_actor/func_800B4F78.s,func_800B4F78,0x800B4F78,0x32
asm/non_matchings/code/z_actor/Target_SetColors.s,Target_SetColors,0x800B5040,0x59
asm/non_matchings/code/z_actor/Actor_TargetContextInit.s,Actor_TargetContextInit,0x800B51A4,0x19
asm/non_matchings/code/z_actor/Actor_DrawZTarget.s,Actor_DrawZTarget,0x800B5208,0x183
asm/non_matchings/code/z_actor/func_800B5814.s,func_800B5814,0x800B5814,0xE7
asm/non_matchings/code/z_actor/Target_SetLockOnPos.s,Target_SetLockOnPos,0x800B4F40,0xE
asm/non_matchings/code/z_actor/Target_InitLockOn.s,Target_InitLockOn,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/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/func_800B82EC.s,func_800B82EC,0x800B82EC,0x34
asm/non_matchings/code/z_actor/func_800B83BC.s,func_800B83BC,0x800B83BC,0xF
asm/non_matchings/code/z_actor/func_800B83F8.s,func_800B83F8,0x800B83F8,0x36
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/Actor_ProcessTalkRequest.s,Actor_ProcessTalkRequest,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/func_800BB59C.s,func_800BB59C,0x800BB59C,0x1A
asm/non_matchings/code/z_actor/func_800BB604.s,func_800BB604,0x800BB604,0xBA
asm/non_matchings/code/z_actor/func_800BB8EC.s,func_800BB8EC,0x800BB8EC,0x67
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/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
@@ -1722,7 +1722,7 @@ asm/non_matchings/code/z_player_lib/Player_SetModelGroup.s,Player_SetModelGroup,
asm/non_matchings/code/z_player_lib/func_80123C58.s,func_80123C58,0x80123C58,0xE
asm/non_matchings/code/z_player_lib/Player_SetEquipmentData.s,Player_SetEquipmentData,0x80123C90,0x30
asm/non_matchings/code/z_player_lib/Player_UpdateBottleHeld.s,Player_UpdateBottleHeld,0x80123D50,0x15
asm/non_matchings/code/z_player_lib/func_80123DA4.s,func_80123DA4,0x80123DA4,0x7
asm/non_matchings/code/z_player_lib/Player_Untarget.s,Player_Untarget,0x80123DA4,0x7
asm/non_matchings/code/z_player_lib/func_80123DC0.s,func_80123DC0,0x80123DC0,0x34
asm/non_matchings/code/z_player_lib/func_80123E90.s,func_80123E90,0x80123E90,0x21
asm/non_matchings/code/z_player_lib/func_80123F14.s,func_80123F14,0x80123F14,0x6
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_SetPos.s asm/non_matchings/code/z_actor/Target_SetLockOnPos.s Target_SetPos Target_SetLockOnPos 0x800B4F40 0xE
187 asm/non_matchings/code/z_actor/func_800B4F78.s asm/non_matchings/code/z_actor/Target_InitLockOn.s func_800B4F78 Target_InitLockOn 0x800B4F78 0x32
188 asm/non_matchings/code/z_actor/Target_SetColors.s asm/non_matchings/code/z_actor/Target_SetFairyState.s Target_SetColors Target_SetFairyState 0x800B5040 0x59
189 asm/non_matchings/code/z_actor/Actor_TargetContextInit.s asm/non_matchings/code/z_actor/Target_Init.s Actor_TargetContextInit Target_Init 0x800B51A4 0x19
190 asm/non_matchings/code/z_actor/Actor_DrawZTarget.s asm/non_matchings/code/z_actor/Target_Draw.s Actor_DrawZTarget Target_Draw 0x800B5208 0x183
191 asm/non_matchings/code/z_actor/func_800B5814.s asm/non_matchings/code/z_actor/Target_Update.s func_800B5814 Target_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/func_800B82EC.s asm/non_matchings/code/z_actor/Target_GetAdjustedDistSq.s func_800B82EC Target_GetAdjustedDistSq 0x800B82EC 0x34
284 asm/non_matchings/code/z_actor/func_800B83BC.s asm/non_matchings/code/z_actor/Target_IsActorInRange.s func_800B83BC Target_IsActorInRange 0x800B83BC 0xF
285 asm/non_matchings/code/z_actor/func_800B83F8.s asm/non_matchings/code/z_actor/Target_OutsideLeashRange.s func_800B83F8 Target_OutsideLeashRange 0x800B83F8 0x36
286 asm/non_matchings/code/z_actor/Actor_ProcessTalkRequest.s Actor_ProcessTalkRequest 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/func_800BB59C.s asm/non_matchings/code/z_actor/Target_InTargetableScreenRegion.s func_800BB59C Target_InTargetableScreenRegion 0x800BB59C 0x1A
358 asm/non_matchings/code/z_actor/func_800BB604.s asm/non_matchings/code/z_actor/Target_FindTargetableActorForCategory.s func_800BB604 Target_FindTargetableActorForCategory 0x800BB604 0xBA
359 asm/non_matchings/code/z_actor/func_800BB8EC.s asm/non_matchings/code/z_actor/Target_GetTargetActor.s func_800BB8EC Target_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
1722 asm/non_matchings/code/z_player_lib/func_80123C58.s func_80123C58 0x80123C58 0xE
1723 asm/non_matchings/code/z_player_lib/Player_SetEquipmentData.s Player_SetEquipmentData 0x80123C90 0x30
1724 asm/non_matchings/code/z_player_lib/Player_UpdateBottleHeld.s Player_UpdateBottleHeld 0x80123D50 0x15
1725 asm/non_matchings/code/z_player_lib/func_80123DA4.s asm/non_matchings/code/z_player_lib/Player_Untarget.s func_80123DA4 Player_Untarget 0x80123DA4 0x7
1726 asm/non_matchings/code/z_player_lib/func_80123DC0.s func_80123DC0 0x80123DC0 0x34
1727 asm/non_matchings/code/z_player_lib/func_80123E90.s func_80123E90 0x80123E90 0x21
1728 asm/non_matchings/code/z_player_lib/func_80123F14.s func_80123F14 0x80123F14 0x6