Extract Keyframe Assets data (#1664)

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c31c5e9fe"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c31c5e9fe"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* extract keyframe data

* initialize typo

4 files changed, 14 insertions, 33 deletions

diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 5881fcb37..d7c6a9375 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -970,15 +970,12 @@
         <Texture Name="gSwordBeam2Tex" OutName="sword_beam_2" Format="i8" Width="32" Height="64" Offset="0x271E0" />
         <DList Name="gSwordBeamDL" Offset="0x27CA0" />
 
-        <Blob Name="gameplay_keep_Blob_027DD0" Size="0x32C" Offset="0x27DD0" />
-        <Blob Name="gameplay_keep_Blob_0281DC" Size="0x14" Offset="0x281DC" />
-
+        <KeyFrameAnimation Name="gameplay_keep_KFAnim_0281DC" Skel="0x2900C" Offset="0x281DC"/>
         <DList Name="gameplay_keep_DL_0282D0" Offset="0x282D0" />
         <Texture Name="gameplay_keep_Tex_0283B8" OutName="tex_0283B8" Format="i4" Width="64" Height="64" Offset="0x283B8" />
         <Texture Name="gameplay_keep_Tex_028BB8" OutName="tex_028BB8" Format="i8" Width="32" Height="32" Offset="0x28BB8" />
         <TextureAnimation Name="gameplay_keep_Matanimheader_028FEC" Offset="0x28FEC" />
-        <Blob Name="gameplay_keep_Blob_028FFC" Size="0x10" Offset="0x28FFC" />
-        <Blob Name="gameplay_keep_Blob_02900C" Size="0x14" Offset="0x2900C" />
+        <KeyFrameSkel Name="gameplay_keep_KFSkel_02900C" LimbType="Flex" Offset="0x2900C"/>
         <Animation Name="gameplay_keep_Anim_029140" Offset="0x29140" />
         <Texture Name="gameplay_keep_Tex_029150" OutName="tex_029150" Format="i8" Width="32" Height="64" Offset="0x29150" />
         <DList Name="gameplay_keep_DL_029990" Offset="0x29990" />
@@ -1333,10 +1330,7 @@
         <Texture Name="gameplay_keep_Tex_06ABF8" OutName="tex_06ABF8" Format="rgba16" Width="36" Height="36" Offset="0x6ABF8" />
         <TextureAnimation Name="gameplay_keep_Matanimheader_06B6A0" Offset="0x6B6A0" />
         <TextureAnimation Name="gameplay_keep_Matanimheader_06B730" Offset="0x6B730" />
-
-        <Blob Name="gameplay_keep_Blob_06B750" Size="0x3BC" Offset="0x6B750" />
-        <Blob Name="gameplay_keep_Blob_06BB0C" Size="0x14" Offset="0x6BB0C" />
-
+        <KeyFrameAnimation Name="gameplay_keep_KFAnim_06BB0C" Skel="0x6EB70" Offset="0x6BB0C"/>
         <DList Name="gameplay_keep_DL_06BFE0" Offset="0x6BFE0" />
         <DList Name="gameplay_keep_DL_06C098" Offset="0x6C098" />
         <DList Name="gameplay_keep_DL_06C1E8" Offset="0x6C1E8" />
@@ -1345,8 +1339,7 @@
         <Texture Name="gameplay_keep_Tex_06D350" OutName="tex_06D350" Format="i4" Width="64" Height="64" Offset="0x6D350" />
         <Texture Name="gameplay_keep_Tex_06DB50" OutName="tex_06DB50" Format="i4" Width="64" Height="64" Offset="0x6DB50" />
         <Texture Name="gameplay_keep_Tex_06E350" OutName="tex_06E350" Format="i4" Width="64" Height="64" Offset="0x6E350" />
-        <Blob Name="gameplay_keep_Blob_06EB50" Size="0x20" Offset="0x6EB50" />
-        <Blob Name="gameplay_keep_Blob_06EB70" Size="0x10" Offset="0x6EB70" />
+        <KeyFrameSkel Name="gameplay_keep_KFSkel_06EB70" LimbType="Flex" Offset="0x6EB70"/>
         <Texture Name="gameplay_keep_Tex_06EB80" OutName="tex_06EB80" Format="i4" Width="64" Height="64" Offset="0x6EB80" />
         <DList Name="gameplay_keep_DL_06F380" Offset="0x6F380" />
         <DList Name="gameplay_keep_DL_06F9F0" Offset="0x6F9F0" />
@@ -1450,8 +1443,7 @@
         <DList Name="gSoaringWarpCsEmptyDL" Offset="0x81620" />
         <DList Name="gSoaringWarpCsFeatherDL" Offset="0x81628" />
         <Texture Name="gSoaringWarpCsFeatherTex" OutName="soaring_warp_cs_feather" Format="rgba16" Width="16" Height="32" Offset="0x816C0" />
-        <Blob Name="gameplay_keep_Blob_081AC0" Size="0x1A74" Offset="0x81AC0" />
-        <Blob Name="gameplay_keep_Blob_083534" Size="0x1C" Offset="0x83534" /> <!-- Is a `KeyFrameAnimation` struct -->
+        <KeyFrameAnimation Name="gameplay_keep_KFAnim_083534" Skel="0x85640" Offset="0x83534"/>
         <DList Name="gameplay_keep_DL_084790" Offset="0x84790" />
         <DList Name="gameplay_keep_DL_0847E0" Offset="0x847E0" />
         <DList Name="gameplay_keep_DL_084850" Offset="0x84850" />
@@ -1482,8 +1474,7 @@
         <DList Name="gameplay_keep_DL_0853B0" Offset="0x853B0" />
         <DList Name="gameplay_keep_DL_085418" Offset="0x85418" />
         <DList Name="gameplay_keep_DL_085490" Offset="0x85490" />
-        <Blob Name="gameplay_keep_Blob_085510" Size="0x130" Offset="0x85510" />
-        <Blob Name="gameplay_keep_Blob_085640" Size="0x10" Offset="0x85640" /> <!-- Is a `KeyFrameSkeleton` struct -->
+        <KeyFrameSkel Name="gameplay_keep_KFSkel_085640" LimbType="Flex" Offset="0x85640"/>
 
         <!-- Zora Elegy of Emptiness Shell -->
         <DList Name="gElegyShellZoraDL" Offset="0x89070" /> <!-- Original name is "pzs_zo_model" -->
diff --git a/assets/xml/objects/object_fall2.xml b/assets/xml/objects/object_fall2.xml
index 70c8ca2d4..1ad99a8a3 100644
--- a/assets/xml/objects/object_fall2.xml
+++ b/assets/xml/objects/object_fall2.xml
@@ -12,8 +12,7 @@
         <Texture Name="gOpenMouthMoonFaceTex" OutName="open_mouth_moon_face" Format="ci4" Width="64" Height="64" Offset="0x44E8" />
         <Texture Name="gOpenMouthMoonTeethTex" OutName="open_mouth_moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x4CE8" />
         <TextureAnimation Name="object_fall2_Matanimheader_005CF0" Offset="0x5CF0" /> <!-- Empty TexAnim -->
-        <!-- <Blob Name="object_fall2_Blob_005CF8" Size="0x11C" Offset="0x5CF8" /> -->
-        <Blob Name="object_fall2_Blob_005EF4" Size="0x1C" Offset="0x5EF4" /> <!-- Original name might be "moon_start_anm"; needs c_keyframe docs to know if it's this one or the one below. -->
+        <KeyFrameAnimation Name="object_fall2_KFAnim_005EF4" Skel="0x8898" Offset="0x5EF4"/> <!-- Original name is "moon_start_anm" -->
         <Array Name="object_fall2_Vtx_005F10" Count="239" Offset="0x5F10">
             <Vtx />
         </Array>
@@ -30,6 +29,6 @@
         <Texture Name="object_fall2_Tex_007838" OutName="tex_007838" Format="i4" Width="64" Height="64" Offset="0x7838" />
         <Texture Name="object_fall2_Tex_008038" OutName="tex_008038" Format="i4" Width="64" Height="64" Offset="0x8038" />
         <TextureAnimation Name="object_fall2_Matanimheader_008840" Offset="0x8840" />
-        <Blob Name="object_fall2_Blob_008898" Size="0x8" Offset="0x8898" /> <!-- Original name might be "moon_start_anm"; needs c_keyframe docs to know if it's this one or the one above. -->
+        <KeyFrameSkel Name="object_fall2_KFSkel_008898" LimbType="Flex" Offset="0x8898"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_moonend.xml b/assets/xml/objects/object_moonend.xml
index c23659dce..9b9e078a2 100644
--- a/assets/xml/objects/object_moonend.xml
+++ b/assets/xml/objects/object_moonend.xml
@@ -1,8 +1,6 @@
 <Root>
     <File Name="object_moonend" Segment="6">
-        <Blob Name="object_moonend_Blob_000000" Size="0x1214" Offset="0x0" />
-        <Blob Name="object_moonend_Blob_001214" Size="0x1C" Offset="0x1214" />
-
+        <KeyFrameAnimation Name="object_moonened_KFAnim_001214" Skel="0xB5A0" Offset="0x1214"/>
         <DList Name="object_moonend_DL_0055F0" Offset="0x55F0" />
         <DList Name="object_moonend_DL_0061F8" Offset="0x61F8" />
         <DList Name="object_moonend_DL_006460" Offset="0x6460" />
@@ -21,10 +19,8 @@
         <Texture Name="object_moonend_Tex_009530" OutName="tex_009530" Format="i8" Width="64" Height="64" Offset="0x9530" />
         <Texture Name="object_moonend_Tex_00A530" OutName="tex_00A530" Format="i8" Width="64" Height="64" Offset="0xA530" />
         <TextureAnimation Name="object_moonend_Matanimheader_00B540" Offset="0xB540" />
-
-        <Blob Name="object_moonend_Blob_00B550" Size="0x50" Offset="0xB550" />
-        <Blob Name="object_moonend_Blob_00B5A0" Size="0x170" Offset="0xB5A0" />
-
+        <KeyFrameSkel Name="object_moonend_KFSkel_00B5A0" LimbType="Flex" Offset="0xB5A0"/>
+        <KeyFrameAnimation Name="object_moonened_KFAnim_00B6F4" Skel="0xE690" Offset="0xB6F4"/>
         <DList Name="object_moonend_DL_00CCF0" Offset="0xCCF0" />
         <DList Name="object_moonend_DL_00CF58" Offset="0xCF58" />
         <DList Name="object_moonend_DL_00D080" Offset="0xD080" />
@@ -34,7 +30,7 @@
         <DList Name="object_moonend_DL_00D520" Offset="0xD520" />
         <Texture Name="object_moonend_Tex_00D648" OutName="tex_00D648" Format="i8" Width="64" Height="64" Offset="0xD648" />
         <TextureAnimation Name="object_moonend_Matanimheader_00E650" Offset="0xE650" />
-        <!-- <Blob Name="object_moonend_Blob_00E658" Size="0x48" Offset="0xE658" /> -->
+        <KeyFrameSkel Name="object_moonend_KFSkel_00E690" LimbType="Flex" Offset="0xE690"/>
         <DList Name="object_moonend_DL_00EB00" Offset="0xEB00" />
         <Texture Name="object_moonend_Tex_00EC58" OutName="tex_00EC58" Format="i8" Width="64" Height="64" Offset="0xEC58" />
         <DList Name="object_moonend_DL_010C40" Offset="0x10C40" /> <!-- Original name is "rainbow_model" -->
diff --git a/assets/xml/objects/object_syoten.xml b/assets/xml/objects/object_syoten.xml
index 63a061971..251616757 100644
--- a/assets/xml/objects/object_syoten.xml
+++ b/assets/xml/objects/object_syoten.xml
@@ -1,8 +1,6 @@
 <Root>
     <File Name="object_syoten" Segment="6">
-        <Blob Name="object_syoten_Blob_000000" Size="0x23C" Offset="0x0" />
-        <Blob Name="object_syoten_Blob_00023C" Size="0x14" Offset="0x23C" />
-
+        <KeyFrameAnimation Name="object_syoten_KFAnim_00023C" Skel="0x1328" Offset="0x23C"/>
         <DList Name="object_syoten_DL_000450" Offset="0x450" />
         <DList Name="object_syoten_DL_000518" Offset="0x518" />
         <DList Name="object_syoten_DL_0005E0" Offset="0x5E0" />
@@ -14,10 +12,7 @@
         <Texture Name="object_syoten_Tex_000A90" OutName="tex_000A90" Format="i8" Width="32" Height="32" Offset="0xA90" />
         <Texture Name="object_syoten_Tex_000E90" OutName="tex_000E90" Format="i8" Width="32" Height="32" Offset="0xE90" />
         <TextureAnimation Name="object_syoten_Matanimheader_001298" Offset="0x1298" />
-
-        <!-- <Blob Name="object_syoten_Blob_0012A0" Size="0x88" Offset="0x12A0" /> -->
-        <Blob Name="object_syoten_Blob_001328" Size="0x8" Offset="0x1328" />
-
+        <KeyFrameSkel Name="object_syoten_KFSkel_001328" LimbType="Flex" Offset="0x1328"/>
         <DList Name="object_syoten_DL_001370" Offset="0x1370" />
         <TextureAnimation Name="object_syoten_Matanimheader_001448" Offset="0x1448" />
         <DList Name="object_syoten_DL_001730" Offset="0x1730" />