EnAni OK (Man in Tree in South Termina Field) (#566)

* EnAni:Start

* EnAni: done with matching

* EnAni: docs

* EnAni: forgot the display lists, they wouldnt load in z64utils, had to use limb->DL to name them

* EnAni: forgot the spec, so rusty

* Apply suggestions from code review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* EnAni: more requested changes

* EnAni: format pass

* EnAni: remove typedef warning

* EnAni: typdef attempt

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* EnAni: changed ani state flags from enum to defines

* EnAni: formatter no

* EnAni: undefined behavior

* EnAni: chest rot discovered

* EnAni: fixes after merging

* EnAni: flags docs

* EnAni: flags at top using enum

* EnAni: jenkins bait

* EnAni: revert bgcheck flag

* EnAni: single doc

* EnOssan: format after fix to EnAni

* EnAni: requested changes, some documentation changes

* EnAni: forgot to re-extract

* EnAni: better object naming

* EnAni: changed STATE_SUFFERING to STATE_WRITHING to match object docs, removed extra whitespace from defines

* EnAni: removed object comment about z64util not rendering them

* EnAni: flipped actor flag to match OOT

* EnAni: formater pls

* EnAni: Animatation Enum values in Animation_change calls

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Isghj
2022-02-19 10:59:43 -08:00
committed by GitHub
parent 26d1982f19
commit 926b575d13
6 changed files with 416 additions and 128 deletions
+63 -58
View File
@@ -1,62 +1,67 @@
<Root>
<File Name="object_ani" Segment="6">
<Animation Name="object_ani_Anim_0007FC" Offset="0x7FC" />
<Animation Name="object_ani_Anim_000C14" Offset="0xC14" />
<Animation Name="object_ani_Anim_0011CC" Offset="0x11CC" />
<Animation Name="object_ani_Anim_001584" Offset="0x1584" />
<Animation Name="object_ani_Anim_001D48" Offset="0x1D48" />
<Animation Name="object_ani_Anim_0027A0" Offset="0x27A0" />
<Limb Name="object_ani_Standardlimb_0027B0" Type="Standard" Offset="0x27B0" />
<Limb Name="object_ani_Standardlimb_0027BC" Type="Standard" Offset="0x27BC" />
<Limb Name="object_ani_Standardlimb_0027C8" Type="Standard" Offset="0x27C8" />
<Limb Name="object_ani_Standardlimb_0027D4" Type="Standard" Offset="0x27D4" />
<Limb Name="object_ani_Standardlimb_0027E0" Type="Standard" Offset="0x27E0" />
<Limb Name="object_ani_Standardlimb_0027EC" Type="Standard" Offset="0x27EC" />
<Limb Name="object_ani_Standardlimb_0027F8" Type="Standard" Offset="0x27F8" />
<Limb Name="object_ani_Standardlimb_002804" Type="Standard" Offset="0x2804" />
<Limb Name="object_ani_Standardlimb_002810" Type="Standard" Offset="0x2810" />
<Limb Name="object_ani_Standardlimb_00281C" Type="Standard" Offset="0x281C" />
<Limb Name="object_ani_Standardlimb_002828" Type="Standard" Offset="0x2828" />
<Limb Name="object_ani_Standardlimb_002834" Type="Standard" Offset="0x2834" />
<Limb Name="object_ani_Standardlimb_002840" Type="Standard" Offset="0x2840" />
<Limb Name="object_ani_Standardlimb_00284C" Type="Standard" Offset="0x284C" />
<Limb Name="object_ani_Standardlimb_002858" Type="Standard" Offset="0x2858" />
<Skeleton Name="object_ani_Skel_0028A0" Type="Flex" LimbType="Standard" Offset="0x28A0" />
<DList Name="object_ani_DL_004860" Offset="0x4860" />
<DList Name="object_ani_DL_004A50" Offset="0x4A50" />
<DList Name="object_ani_DL_004B38" Offset="0x4B38" />
<DList Name="object_ani_DL_004C30" Offset="0x4C30" />
<DList Name="object_ani_DL_004E20" Offset="0x4E20" />
<DList Name="object_ani_DL_004F08" Offset="0x4F08" />
<DList Name="object_ani_DL_005000" Offset="0x5000" />
<DList Name="object_ani_DL_005270" Offset="0x5270" />
<DList Name="object_ani_DL_005420" Offset="0x5420" />
<DList Name="object_ani_DL_005668" Offset="0x5668" />
<DList Name="object_ani_DL_005778" Offset="0x5778" />
<DList Name="object_ani_DL_005928" Offset="0x5928" />
<DList Name="object_ani_DL_005C50" Offset="0x5C50" />
<DList Name="object_ani_DL_005D60" Offset="0x5D60" />
<Texture Name="object_ani_TLUT_005E58" OutName="tlut_005E58" Format="rgba16" Width="16" Height="16" Offset="0x5E58" />
<Texture Name="object_ani_Tex_006058" OutName="tex_006058" Format="ci8" Width="8" Height="8" Offset="0x6058" />
<Texture Name="object_ani_Tex_006098" OutName="tex_006098" Format="ci8" Width="8" Height="8" Offset="0x6098" />
<Texture Name="object_ani_Tex_0060D8" OutName="tex_0060D8" Format="i8" Width="8" Height="8" Offset="0x60D8" />
<Texture Name="object_ani_Tex_006118" OutName="tex_006118" Format="ci8" Width="16" Height="16" Offset="0x6118" />
<Texture Name="object_ani_Tex_006218" OutName="tex_006218" Format="ci8" Width="16" Height="16" Offset="0x6218" />
<Texture Name="object_ani_Tex_006318" OutName="tlut_006318" Format="rgba16" Width="192" Height="1" Offset="0x6318" />
<Texture Name="object_ani_Tex_006498" OutName="tex_006498" Format="ci8" TlutOffset="0x6318" Width="32" Height="32" Offset="0x6498" />
<Texture Name="object_ani_Tex_006898" OutName="tex_006898" Format="ci8" Width="16" Height="16" Offset="0x6898" />
<Texture Name="object_ani_Tex_006998" OutName="tex_006998" Format="ci8" Width="8" Height="8" Offset="0x6998" />
<Texture Name="object_ani_Tex_0069D8" OutName="tex_0069D8" Format="ci8" Width="8" Height="8" Offset="0x69D8" />
<Texture Name="object_ani_Tex_006A18" OutName="tex_006A18" Format="ci8" Width="16" Height="16" Offset="0x6A18" />
<Texture Name="object_ani_Tex_006B18" OutName="tex_006B18" Format="ci8" TlutOffset="0x6318" Width="32" Height="32" Offset="0x6B18" />
<Texture Name="object_ani_Tex_006F18" OutName="tex_006F18" Format="ci8" TlutOffset="0x6318" Width="32" Height="32" Offset="0x6F18" />
<DList Name="object_ani_DL_007B58" Offset="0x7B58" />
<Animation Name="object_ani_Anim_009220" Offset="0x9220" />
<Animation Name="object_ani_Anim_009734" Offset="0x9734" />
<Animation Name="object_ani_Anim_009D34" Offset="0x9D34" />
<Animation Name="object_ani_Anim_00A460" Offset="0xA460" />
<Animation Name="object_ani_Anim_00A978" Offset="0xA978" />
<Animation Name="object_ani_Anim_00B2B0" Offset="0xB2B0" />
<Animation Name="object_ani_Anim_00B8AC" Offset="0xB8AC" />
<Animation Name="gAniTreeHangLosingBalanceAnim" Offset="0x7FC" />
<Animation Name="gAniFallOverHoldingFootAnim" Offset="0xC14" />
<Animation Name="gAniHoldingFootWrithingInPainAnim" Offset="0x11CC" />
<Animation Name="gAniUnusedSidesteppingAnim" Offset="0x1584" />
<Animation Name="gAniTreeHangingAnim" Offset="0x1D48" />
<Animation Name="gAniTreeHangingReachAnim" Offset="0x27A0" />
<Limb Name="gAniPelvisLimb" Type="Standard" EnumName="ANI_LIMB_PELVIS" Offset="0x27B0" />
<Limb Name="gAniLeftThighLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_THIGH" Offset="0x27BC" />
<Limb Name="gAniLeftCalfLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_CALF" Offset="0x27C8" />
<Limb Name="gAniLeftFootLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FOOT" Offset="0x27D4" />
<Limb Name="gAniRightThighLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_THIGH" Offset="0x27E0" />
<Limb Name="gAniRightCalfLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_CALF" Offset="0x27EC" />
<Limb Name="gAniRightFootLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOOT" Offset="0x27F8" />
<Limb Name="gAniTorsoLimb" Type="Standard" EnumName="ANI_LIMB_TORSO" Offset="0x2804" />
<Limb Name="gAniLeftUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_UPPER_ARM" Offset="0x2810" />
<Limb Name="gAniLeftForArmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FORARM" Offset="0x281C" />
<Limb Name="gAniLeftHandLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_HAND" Offset="0x2828" />
<Limb Name="gAniRightUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_UPPER_ARM" Offset="0x2834" />
<Limb Name="gAniRightForArmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FORARM" Offset="0x2840" />
<Limb Name="gAniRightHandLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_HAND" Offset="0x284C" />
<Limb Name="gAniHeadLimb" Type="Standard" EnumName="ANI_LIMB_HEAD" Offset="0x2858" />
<Skeleton Name="gAniSkeleton" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="ObjectAniLimbs" Offset="0x28A0" />
<DList Name="gAniRightHandDL" Offset="0x4860" />
<DList Name="gAniRightForArmDL" Offset="0x4A50" />
<DList Name="gAniRightUpperArmDL" Offset="0x4B38" />
<DList Name="gAniLeftHandDL" Offset="0x4C30" />
<DList Name="gAniLeftForArmDL" Offset="0x4E20" />
<DList Name="gAniLeftUpperArmDL" Offset="0x4F08" />
<DList Name="gAniTorsoDL" Offset="0x5000" />
<DList Name="gAniRightFootDL" Offset="0x5270" />
<DList Name="gAniRightCalfDL" Offset="0x5420" />
<DList Name="gAniRightThighDL" Offset="0x5668" />
<DList Name="gAniLeftFootDL" Offset="0x5778" />
<DList Name="gAniLeftCalfDL" Offset="0x5928" />
<DList Name="gAniLeftThighDL" Offset="0x5C50" />
<DList Name="gAniPelvisDL" Offset="0x5D60" />
<Texture Name="gAniGeneralTlut" OutName="ani_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E58" />
<Texture Name="gAniUnkGradientTex" OutName="ani_unk_gradient1" Format="ci8" Width="8" Height="8" Offset="0x6058" />
<Texture Name="gAniFingersTex" OutName="ani_fingers" Format="ci8" Width="8" Height="8" Offset="0x6098" />
<Texture Name="gAniShirtEdgeTex" OutName="ani_shirt_edge" Format="i8" Width="8" Height="8" Offset="0x60D8" />
<Texture Name="gAniSandleBuckleTex" OutName="ani_sandle_buckle" Format="ci8" Width="16" Height="16" Offset="0x6118" />
<Texture Name="gAniPantsTex" OutName="ani_pants" Format="ci8" Width="16" Height="16" Offset="0x6218" />
<Texture Name="gAniEyeTlut" OutName="ani_eye_tlut" Format="rgba16" Width="16" Height="12" Offset="0x6318" />
<Texture Name="gAniOpenEyeTex" OutName="ani_open_eye" Format="ci8" Width="32" Height="32" Offset="0x6498" TlutOffset="0x6318" />
<Texture Name="gAniMouthTex" OutName="ani_mouth" Format="ci8" Width="16" Height="16" Offset="0x6898" />
<Texture Name="gAniUnkGradient2Tex" OutName="ani_unk_gradient2" Format="ci8" Width="8" Height="8" Offset="0x6998" />
<Texture Name="gAniEarTex" OutName="ani_ear" Format="ci8" Width="8" Height="8" Offset="0x69D8" />
<Texture Name="gAniHairTex" OutName="ani_hair" Format="ci8" Width="16" Height="16" Offset="0x6A18" />
<Texture Name="gAniClosingEyeTex" OutName="ani_closing_eye" Format="ci8" Width="32" Height="32" Offset="0x6B18" TlutOffset="0x6318"/>
<Texture Name="gAniClosedEyeTex" OutName="ani_closed_eye" Format="ci8" Width="32" Height="32" Offset="0x6F18" TlutOffset="0x6318"/>
<DList Name="gAniHeadDL" Offset="0x7B58" />
<!-- Only the first half of the animation is used by EnAni when knocked out of tree -->
<Animation Name="gAniLandingThenStandingUpAnim" Offset="0x9220" />
<!-- used by EnOssan -->
<Animation Name="gAniHoldUpHandAnim" Offset="0x9734" />
<Animation Name="gAniStandingNormalAnim" Offset="0x9D34" />
<Animation Name="gAniHandBehindHeadApologyAnim" Offset="0xA460" />
<!-- left over from OOT firetemple deathmountain cutscene, unused in MM -->
<Animation Name="gAniKnockBackAnim" Offset="0xA978" />
<Animation Name="gAniKnockBackGettingUpAnim" Offset="0xB2B0" />
<!-- left over from OOT sitting on roof, unused in MM -->
<Animation Name="gAniSittingBackAnim" Offset="0xB8AC" />
</File>
</Root>