mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-29 10:40:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Further Attention Docs (#1732)

Browse Source 
* more attention docs

* more docs

* cleanup

* more cleanup

* spacing

* more attention docs

* small cleanup

* consistency
This commit is contained in:
engineer124
2024-10-24 11:44:44 +11:00
committed by GitHub
parent 5a958cad4d
commit d60a032b11
103 changed files with 482 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+8 -8
View File
@@ -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
+12 -12
View File
@@ -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),
tools/namefixer.py
+2 -2
View File
@@ -1298,8 +1298,8 @@ wordReplace = {
"play->actorCtx.unk3": "play->actorCtx.lensActive",
"play->actorCtx.unk4": "play->actorCtx.lensMaskSize",
"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.unk0": "play->actorCtx.attention.tatlHoverPos",
"play->actorCtx.attention.unk40": "play->actorCtx.attention.tatlMoveProgressFactor",
"play->actorCtx.attention.unk44": "play->actorCtx.attention.lockOnRadius",
"play->actorCtx.attention.unk48": "play->actorCtx.attention.lockOnAlpha",
"play->actorCtx.attention.unk4B": "play->actorCtx.attention.rotation",
tools/sizes/code_functions.csv
+8 -8
View File
@@ -185,7 +185,7 @@ 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/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_SetTatlState.s,Attention_SetTatlState,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
@@ -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/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/Attention_WeightedDistToPlayerSq.s,Attention_WeightedDistToPlayerSq,0x800B82EC,0x34
asm/non_matchings/code/z_actor/Attention_ActorIsInRange.s,Attention_ActorIsInRange,0x800B83BC,0xF
asm/non_matchings/code/z_actor/Attention_ShouldReleaseLockOn.s,Attention_ShouldReleaseLockOn,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/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/Attention_ActorOnScreen.s,Attention_ActorOnScreen,0x800BB59C,0x1A
asm/non_matchings/code/z_actor/Attention_FindActorInCategory.s,Attention_FindActorInCategory,0x800BB604,0xBA
asm/non_matchings/code/z_actor/Attention_FindActor.s,Attention_FindActor,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
@@ -683,7 +683,7 @@ asm/non_matchings/code/z_camera/Camera_UpdateInterface.s,Camera_UpdateInterface,
asm/non_matchings/code/z_camera/Camera_BgCheckCorner.s,Camera_BgCheckCorner,0x800CD3E4,0x1A
asm/non_matchings/code/z_camera/func_800CD44C.s,func_800CD44C,0x800CD44C,0x7A
asm/non_matchings/code/z_camera/Camera_CalcSlopeYAdj.s,Camera_CalcSlopeYAdj,0x800CD634,0x26
asm/non_matchings/code/z_camera/func_800CD6CC.s,func_800CD6CC,0x800CD6CC,0xB
asm/non_matchings/code/z_camera/Camera_GetAttentionActorRange.s,Camera_GetAttentionActorRange,0x800CD6CC,0xB
asm/non_matchings/code/z_camera/Camera_CalcAtDefault.s,Camera_CalcAtDefault,0x800CD6F8,0x4F
asm/non_matchings/code/z_camera/Camera_CalcAtForScreen.s,Camera_CalcAtForScreen,0x800CD834,0x78
asm/non_matchings/code/z_camera/Camera_CalcAtForNormal1.s,Camera_CalcAtForNormal1,0x800CDA14,0x56
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
185 asm/non_matchings/code/z_actor/Actor_GetProjectedPos.s Actor_GetProjectedPos 0x800B4EDC 0x19
186 asm/non_matchings/code/z_actor/Attention_SetReticlePos.s Attention_SetReticlePos 0x800B4F40 0xE
187 asm/non_matchings/code/z_actor/Attention_InitReticle.s Attention_InitReticle 0x800B4F78 0x32
188 asm/non_matchings/code/z_actor/Attention_SetFairyState.s asm/non_matchings/code/z_actor/Attention_SetTatlState.s Attention_SetFairyState Attention_SetTatlState 0x800B5040 0x59
189 asm/non_matchings/code/z_actor/Attention_Init.s Attention_Init 0x800B51A4 0x19
190 asm/non_matchings/code/z_actor/Attention_Draw.s Attention_Draw 0x800B5208 0x183
191 asm/non_matchings/code/z_actor/Attention_Update.s Attention_Update 0x800B5814 0xE7
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/Attention_GetAdjustedDistSq.s asm/non_matchings/code/z_actor/Attention_WeightedDistToPlayerSq.s Attention_GetAdjustedDistSq Attention_WeightedDistToPlayerSq 0x800B82EC 0x34
284 asm/non_matchings/code/z_actor/Attention_IsActorInRange.s asm/non_matchings/code/z_actor/Attention_ActorIsInRange.s Attention_IsActorInRange Attention_ActorIsInRange 0x800B83BC 0xF
285 asm/non_matchings/code/z_actor/Attention_OutsideLeashRange.s asm/non_matchings/code/z_actor/Attention_ShouldReleaseLockOn.s Attention_OutsideLeashRange Attention_ShouldReleaseLockOn 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/Attention_InTargetableScreenRegion.s asm/non_matchings/code/z_actor/Attention_ActorOnScreen.s Attention_InTargetableScreenRegion Attention_ActorOnScreen 0x800BB59C 0x1A
358 asm/non_matchings/code/z_actor/Attention_FindTargetableActorForCategory.s asm/non_matchings/code/z_actor/Attention_FindActorInCategory.s Attention_FindTargetableActorForCategory Attention_FindActorInCategory 0x800BB604 0xBA
359 asm/non_matchings/code/z_actor/Attention_GetTargetActor.s asm/non_matchings/code/z_actor/Attention_FindActor.s Attention_GetTargetActor Attention_FindActor 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
683 asm/non_matchings/code/z_camera/Camera_BgCheckCorner.s Camera_BgCheckCorner 0x800CD3E4 0x1A
684 asm/non_matchings/code/z_camera/func_800CD44C.s func_800CD44C 0x800CD44C 0x7A
685 asm/non_matchings/code/z_camera/Camera_CalcSlopeYAdj.s Camera_CalcSlopeYAdj 0x800CD634 0x26
686 asm/non_matchings/code/z_camera/func_800CD6CC.s asm/non_matchings/code/z_camera/Camera_GetAttentionActorRange.s func_800CD6CC Camera_GetAttentionActorRange 0x800CD6CC 0xB
687 asm/non_matchings/code/z_camera/Camera_CalcAtDefault.s Camera_CalcAtDefault 0x800CD6F8 0x4F
688 asm/non_matchings/code/z_camera/Camera_CalcAtForScreen.s Camera_CalcAtForScreen 0x800CD834 0x78
689 asm/non_matchings/code/z_camera/Camera_CalcAtForNormal1.s Camera_CalcAtForNormal1 0x800CDA14 0x56