diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-09-20 12:38:06 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 19:38:06 -0700 |
| commit | af22b72e2b0c81c2ecb2eb7d04a6300cae6e21b1 (patch) | |
| tree | 13a7351669c74ddf211e8117b5c0793f3721697c /tools | |
| parent | 5c6310306f0a494c6fa54436b6fce5ef2ff0d715 (diff) | |
Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1692)
* Import Oot Docs
* cleanup
* more cleanup
* cleanup
* small thing
* singular
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/disasm/functions.txt | 34 | ||||
| -rw-r--r-- | tools/disasm/variables.txt | 4 | ||||
| -rwxr-xr-x | tools/namefixer.py | 20 | ||||
| -rw-r--r-- | tools/sizes/code_functions.csv | 34 |
4 files changed, 46 insertions, 46 deletions
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index fa5ee19ec..bc9b7f95c 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2541,23 +2541,23 @@ 0x801353F8:("Animation_GetLengthLegacy",), 0x8013541C:("Animation_GetLastFrameLegacy",), 0x80135448:("SkelAnime_InterpFrameTable",), - 0x801358C8:("AnimationContext_Reset",), - 0x801358D4:("AnimationContext_SetNextQueue",), - 0x801358F4:("AnimationContext_DisableQueue",), - 0x8013591C:("AnimationContext_AddEntry",), - 0x80135954:("AnimationContext_SetLoadFrame",), - 0x80135A28:("AnimationContext_SetCopyAll",), - 0x80135A90:("AnimationContext_SetInterp",), - 0x80135B00:("AnimationContext_SetCopyTrue",), - 0x80135B70:("AnimationContext_SetCopyFalse",), - 0x80135BE0:("AnimationContext_SetMoveActor",), - 0x80135C3C:("AnimationContext_LoadFrame",), - 0x80135C6C:("AnimationContext_CopyAll",), - 0x80135CDC:("AnimationContext_Interp",), - 0x80135D38:("AnimationContext_CopyTrue",), - 0x80135DB8:("AnimationContext_CopyFalse",), - 0x80135E3C:("AnimationContext_MoveActor",), - 0x80135EE8:("AnimationContext_Update",), + 0x801358C8:("AnimTaskQueue_Reset",), + 0x801358D4:("AnimTaskQueue_SetNextGroup",), + 0x801358F4:("AnimTaskQueue_DisableTransformTasksForGroup",), + 0x8013591C:("AnimTaskQueue_NewTask",), + 0x80135954:("AnimTaskQueue_AddLoadPlayerFrame",), + 0x80135A28:("AnimTaskQueue_AddCopy",), + 0x80135A90:("AnimTaskQueue_AddInterp",), + 0x80135B00:("AnimTaskQueue_AddCopyUsingMap",), + 0x80135B70:("AnimTaskQueue_AddCopyUsingMapInverted",), + 0x80135BE0:("AnimTaskQueue_AddActorMove",), + 0x80135C3C:("AnimTask_LoadPlayerFrame",), + 0x80135C6C:("AnimTask_Copy",), + 0x80135CDC:("AnimTask_Interp",), + 0x80135D38:("AnimTask_CopyUsingMap",), + 0x80135DB8:("AnimTask_CopyUsingMapInverted",), + 0x80135E3C:("AnimTask_ActorMove",), + 0x80135EE8:("AnimTaskQueue_Update",), 0x80135F88:("SkelAnime_InitPlayer",), 0x801360A8:("PlayerAnimation_SetUpdateFunction",), 0x801360E0:("PlayerAnimation_Update",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index 80294f706..cd1868966 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -3912,8 +3912,8 @@ 0x801F5AA0:("sMatAnimStep","s32","",0x4), 0x801F5AA4:("sMatAnimFlags","u32","",0x4), 0x801F5AA8:("sMatAnimAlphaRatio","f32","",0x4), - 0x801F5AB0:("sAnimQueueFlags","UNK_TYPE1","",0x1), - 0x801F5AB4:("sDisableAnimQueueFlags","UNK_TYPE1","",0x1), + 0x801F5AB0:("sCurAnimTaskGroup","UNK_TYPE1","",0x1), + 0x801F5AB4:("sDisabledTransformTaskGroups","UNK_TYPE1","",0x1), 0x801F5AC0:("gSkinLimbMatrices","MtxF","[60]",0xF00), 0x801F69C0:("D_801F69C0","UNK_TYPE1","",0x10), 0x801F69D0:("gRumbleMgr","RumbleManager","",0x10E), diff --git a/tools/namefixer.py b/tools/namefixer.py index 33ff23755..ecc918f90 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -247,10 +247,10 @@ wordReplace = { "SkelAnime_GetFrameCount": "Animation_GetLastFrame", "SkelAnime_Draw2": "SkelAnime_Draw", "SkelAnime_DrawSV2": "SkelAnime_DrawFlex", - "SkelAnime_AnimationCtxReset": "AnimationContext_Reset", - "func_801358D4": "AnimationContext_SetNextQueue", - "func_801358F4": "AnimationContext_DisableQueue", - "SkelAnime_LoadLinkAnimetion": "AnimationContext_SetLoadFrame", + "SkelAnime_AnimationCtxReset": "AnimTaskQueue_Reset", + "func_801358D4": "AnimTaskQueue_SetNextGroup", + "func_801358F4": "AnimTaskQueue_DisableTransformTasksForGroup", + "SkelAnime_LoadLinkAnimetion": "AnimTaskQueue_AddLoadPlayerFrame", "play_sound": "Audio_PlaySfx", "func_8019F128": "Audio_PlaySfx_2", "func_8019F170": "Audio_PlaySfx_AtPosWithPresetLowFreqAndHighReverb", @@ -295,12 +295,12 @@ wordReplace = { "func_801000CC": "Lib_PlaySfx_2", "Lib_PlaySfxAtPos": "Lib_PlaySfx_AtPos", - "SkelAnime_AnimationType1Loaded": "AnimationContext_CopyAll", - "SkelAnime_AnimationType2Loaded": "AnimationContext_CopyInterp", - "SkelAnime_AnimationType3Loaded": "AnimationContext_CopyTrue", - "SkelAnime_AnimationType4Loaded": "AnimationContext_CopyFalse", - "SkelAnime_AnimationType5Loaded": "AnimationContext_MoveActor", - "func_80135EE8": "AnimationContext_Update", + "SkelAnime_AnimationType1Loaded": "AnimTask_Copy", + "SkelAnime_AnimationType2Loaded": "AnimTask_Interp", + "SkelAnime_AnimationType3Loaded": "AnimTask_CopyUsingMap", + "SkelAnime_AnimationType4Loaded": "AnimTask_CopyUsingMapInverted", + "SkelAnime_AnimationType5Loaded": "AnimTask_ActorMove", + "func_80135EE8": "AnimTaskQueue_Update", "SkelAnime_InitLink": "SkelAnime_InitPlayer", "LinkAnimation_SetUpdateFunction": "PlayerAnimation_SetUpdateFunction", "LinkAnimation_Update": "PlayerAnimation_Update", diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index 07d083462..0bbb7ee4c 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -2055,23 +2055,23 @@ asm/non_matchings/code/z_skelanime/Animation_GetLimbCountLegacy.s,Animation_GetL asm/non_matchings/code/z_skelanime/SkelAnime_GetTotalFrames2.s,SkelAnime_GetTotalFrames2,0x801353F8,0x9 asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount2.s,SkelAnime_GetFrameCount2,0x8013541C,0xB asm/non_matchings/code/z_skelanime/SkelAnime_InterpFrameTable.s,SkelAnime_InterpFrameTable,0x80135448,0x120 -asm/non_matchings/code/z_skelanime/AnimationContext_Reset.s,AnimationContext_Reset,0x801358C8,0x3 -asm/non_matchings/code/z_skelanime/AnimationContext_SetNextQueue.s,AnimationContext_SetNextQueue,0x801358D4,0x8 -asm/non_matchings/code/z_skelanime/AnimationContext_DisableQueue.s,AnimationContext_DisableQueue,0x801358F4,0xA -asm/non_matchings/code/z_skelanime/AnimationContext_AddEntry.s,AnimationContext_AddEntry,0x8013591C,0xE -asm/non_matchings/code/z_skelanime/AnimationContext_SetLoadFrame.s,AnimationContext_SetLoadFrame,0x80135954,0x35 -asm/non_matchings/code/z_skelanime/AnimationContext_SetCopyAll.s,AnimationContext_SetCopyAll,0x80135A28,0x1A -asm/non_matchings/code/z_skelanime/AnimationContext_SetInterp.s,AnimationContext_SetInterp,0x80135A90,0x1C -asm/non_matchings/code/z_skelanime/AnimationContext_SetCopyTrue.s,AnimationContext_SetCopyTrue,0x80135B00,0x1C -asm/non_matchings/code/z_skelanime/AnimationContext_SetCopyFalse.s,AnimationContext_SetCopyFalse,0x80135B70,0x1C -asm/non_matchings/code/z_skelanime/AnimationContext_SetMoveActor.s,AnimationContext_SetMoveActor,0x80135BE0,0x17 -asm/non_matchings/code/z_skelanime/AnimationContext_LoadFrame.s,AnimationContext_LoadFrame,0x80135C3C,0xC -asm/non_matchings/code/z_skelanime/AnimationContext_CopyAll.s,AnimationContext_CopyAll,0x80135C6C,0x1C -asm/non_matchings/code/z_skelanime/AnimationContext_CopyInterp.s,AnimationContext_CopyInterp,0x80135CDC,0x17 -asm/non_matchings/code/z_skelanime/AnimationContext_CopyTrue.s,AnimationContext_CopyTrue,0x80135D38,0x20 -asm/non_matchings/code/z_skelanime/AnimationContext_CopyFalse.s,AnimationContext_CopyFalse,0x80135DB8,0x21 -asm/non_matchings/code/z_skelanime/AnimationContext_MoveActor.s,AnimationContext_MoveActor,0x80135E3C,0x2B -asm/non_matchings/code/z_skelanime/AnimationContext_Update.s,AnimationContext_Update,0x80135EE8,0x28 +asm/non_matchings/code/z_skelanime/AnimTaskQueue_Reset.s,AnimTaskQueue_Reset,0x801358C8,0x3 +asm/non_matchings/code/z_skelanime/AnimTaskQueue_SetNextGroup.s,AnimTaskQueue_SetNextGroup,0x801358D4,0x8 +asm/non_matchings/code/z_skelanime/AnimTaskQueue_DisableTransformTasksForGroup.s,AnimTaskQueue_DisableTransformTasksForGroup,0x801358F4,0xA +asm/non_matchings/code/z_skelanime/AnimTaskQueue_NewTask.s,AnimTaskQueue_NewTask,0x8013591C,0xE +asm/non_matchings/code/z_skelanime/AnimTaskQueue_AddLoadPlayerFrame.s,AnimTaskQueue_AddLoadPlayerFrame,0x80135954,0x35 +asm/non_matchings/code/z_skelanime/AnimTaskQueue_AddCopy.s,AnimTaskQueue_AddCopy,0x80135A28,0x1A +asm/non_matchings/code/z_skelanime/AnimTaskQueue_AddInterp.s,AnimTaskQueue_AddInterp,0x80135A90,0x1C +asm/non_matchings/code/z_skelanime/AnimTaskQueue_AddCopyUsingMap.s,AnimTaskQueue_AddCopyUsingMap,0x80135B00,0x1C +asm/non_matchings/code/z_skelanime/AnimTaskQueue_AddCopyUsingMapInverted.s,AnimTaskQueue_AddCopyUsingMapInverted,0x80135B70,0x1C +asm/non_matchings/code/z_skelanime/AnimTaskQueue_AddActorMove.s,AnimTaskQueue_AddActorMove,0x80135BE0,0x17 +asm/non_matchings/code/z_skelanime/AnimTask_LoadPlayerFrame.s,AnimTask_LoadPlayerFrame,0x80135C3C,0xC +asm/non_matchings/code/z_skelanime/AnimTask_Copy.s,AnimTask_Copy,0x80135C6C,0x1C +asm/non_matchings/code/z_skelanime/AnimTask_Interp.s,AnimTask_Interp,0x80135CDC,0x17 +asm/non_matchings/code/z_skelanime/AnimTask_CopyUsingMap.s,AnimTask_CopyUsingMap,0x80135D38,0x20 +asm/non_matchings/code/z_skelanime/AnimTask_CopyUsingMapInverted.s,AnimTask_CopyUsingMapInverted,0x80135DB8,0x21 +asm/non_matchings/code/z_skelanime/AnimTask_ActorMove.s,AnimTask_ActorMove,0x80135E3C,0x2B +asm/non_matchings/code/z_skelanime/AnimTaskQueue_Update.s,AnimTaskQueue_Update,0x80135EE8,0x28 asm/non_matchings/code/z_skelanime/SkelAnime_InitPlayerAnimetion.s,SkelAnime_InitPlayerAnimetion,0x80135F88,0x48 asm/non_matchings/code/z_skelanime/PlayerAnimation_SetUpdateFunction.s,PlayerAnimation_SetUpdateFunction,0x801360A8,0xE asm/non_matchings/code/z_skelanime/PlayerAnimation_Update.s,PlayerAnimation_Update,0x801360E0,0x9 |
