summaryrefslogtreecommitdiff
path: root/assets/xml/objects
diff options
context:
space:
mode:
authorParker Burnett <burnettparker@gmail.com>2022-03-05 10:45:49 -0500
committerGitHub <noreply@github.com>2022-03-05 12:45:49 -0300
commit4a18f3ca4df5727320efd28da4bb3fc9059a94ff (patch)
treeb983095fbc46e7fc79790b7d14abdfa956f06e17 /assets/xml/objects
parent10a1ef8f1dd885835101ee99b537c23127096d82 (diff)
En_shn OK (#638)
* Building on Macs * Add Mac building documentation * Review * Update for new z64compress * Review * getting some matching done * gettting some more matches * actor fixer * almost OK * Shn OK * fixing data and warnings * finishing touches * forgot to update spec * dang comments not being formatted * this should fix things * fixing feedback and other fixes * fixing things * fixing things * addressing PR * format and minor fix * actorfixer * fixing actor * fixing enum * yay format Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Diffstat (limited to 'assets/xml/objects')
-rw-r--r--assets/xml/objects/object_shn.xml34
1 files changed, 17 insertions, 17 deletions
diff --git a/assets/xml/objects/object_shn.xml b/assets/xml/objects/object_shn.xml
index b322641a9..1b94600ab 100644
--- a/assets/xml/objects/object_shn.xml
+++ b/assets/xml/objects/object_shn.xml
@@ -50,7 +50,7 @@
<Texture Name="object_shn_Tex_00A418" OutName="tex_00A418" Format="ci8" Width="32" Height="32" Offset="0xA418" />
<Texture Name="object_shn_Tex_00A818" OutName="tex_00A818" Format="ci8" Width="8" Height="8" Offset="0xA818" />
<DList Name="object_shn_DL_00B730" Offset="0xB730" />
- <DList Name="object_shn_DL_00B738" Offset="0xB738" />
+ <DList Name="gObjectShnSwampGuideHead" Offset="0xB738" />
<Texture Name="object_shn_TLUT_00BCD8" OutName="tlut_00BCD8" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" />
<Texture Name="object_shn_TLUT_00BED8" OutName="tlut_00BED8" Format="rgba16" Width="16" Height="16" Offset="0xBED8" />
<Texture Name="object_shn_Tex_00C0D8" OutName="tex_00C0D8" Format="ci8" Width="8" Height="8" Offset="0xC0D8" />
@@ -66,22 +66,22 @@
<Animation Name="object_shn_Anim_00D9D0" Offset="0xD9D0" />
<Animation Name="object_shn_Anim_00DFEC" Offset="0xDFEC" />
<Animation Name="object_shn_Anim_00E6C4" Offset="0xE6C4" />
- <Limb Name="object_shn_Standardlimb_00E6E0" Type="Standard" Offset="0xE6E0" />
- <Limb Name="object_shn_Standardlimb_00E6EC" Type="Standard" Offset="0xE6EC" />
- <Limb Name="object_shn_Standardlimb_00E6F8" Type="Standard" Offset="0xE6F8" />
- <Limb Name="object_shn_Standardlimb_00E704" Type="Standard" Offset="0xE704" />
- <Limb Name="object_shn_Standardlimb_00E710" Type="Standard" Offset="0xE710" />
- <Limb Name="object_shn_Standardlimb_00E71C" Type="Standard" Offset="0xE71C" />
- <Limb Name="object_shn_Standardlimb_00E728" Type="Standard" Offset="0xE728" />
- <Limb Name="object_shn_Standardlimb_00E734" Type="Standard" Offset="0xE734" />
- <Limb Name="object_shn_Standardlimb_00E740" Type="Standard" Offset="0xE740" />
- <Limb Name="object_shn_Standardlimb_00E74C" Type="Standard" Offset="0xE74C" />
- <Limb Name="object_shn_Standardlimb_00E758" Type="Standard" Offset="0xE758" />
- <Limb Name="object_shn_Standardlimb_00E764" Type="Standard" Offset="0xE764" />
- <Limb Name="object_shn_Standardlimb_00E770" Type="Standard" Offset="0xE770" />
- <Limb Name="object_shn_Standardlimb_00E77C" Type="Standard" Offset="0xE77C" />
- <Limb Name="object_shn_Standardlimb_00E788" Type="Standard" Offset="0xE788" />
- <Skeleton Name="object_shn_Skel_00E7D0" Type="Flex" LimbType="Standard" Offset="0xE7D0" />
+ <Limb Name="gObjectShnLimbWaist" Type="Standard" EnumName="OBJECT_SHN_LIMB_WAIST" Offset="0xE6E0" />
+ <Limb Name="gObjectShnLimbLegLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_LEG_LEFT" Offset="0xE6EC" />
+ <Limb Name="gObjectShnLimbShinLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHIN_LEFT" Offset="0xE6F8" />
+ <Limb Name="gObjectShnLimbFootLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOOT_LEFT" Offset="0xE704" />
+ <Limb Name="gObjectShnLimbLegRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_LEG_RIGHT" Offset="0xE710" />
+ <Limb Name="gObjectShnLimbShinRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHIN_RIGHT" Offset="0xE71C" />
+ <Limb Name="gObjectShnLimbFootRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOOT_RIGHT" Offset="0xE728" />
+ <Limb Name="gObjectShnLimbTorso" Type="Standard" EnumName="OBJECT_SHN_LIMB_TORSO" Offset="0xE734" />
+ <Limb Name="gObjectShnLimbShoulderLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHOULDER_LEFT" Offset="0xE740" />
+ <Limb Name="gObjectShnLimbForearmLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOREARM_LEFT" Offset="0xE74C" />
+ <Limb Name="gObjectShnLimbHandLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_HAND_LEFT" Offset="0xE758" />
+ <Limb Name="gObjectShnLimbShoulderRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHOULDER_RIGHT" Offset="0xE764" />
+ <Limb Name="gObjectShnLimbForearmRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOREARM_RIGHT" Offset="0xE770" />
+ <Limb Name="gObjectShnLimbHandRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_HAND_RIGHT" Offset="0xE77C" />
+ <Limb Name="gObjectShnLimbHead" Type="Standard" EnumName="OBJECT_SHN_LIMB_HEAD" Offset="0xE788" />
+ <Skeleton Name="gObjectShnSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SHN_LIMB_NONE" LimbMax="OBJECT_SHN_LIMB_MAX" EnumName="ObjectShnLimbs" Offset="0xE7D0" />
<DList Name="object_shn_DL_00F2D0" Offset="0xF2D0" />
<Texture Name="object_shn_TLUT_00F790" OutName="tlut_00F790" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
<Texture Name="object_shn_TLUT_00F990" OutName="tlut_00F990" Format="rgba16" Width="16" Height="16" Offset="0xF990" />