mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

object_cne (#1310)

Browse source
This commit is contained in:
Derek Hensley 2022-07-12 19:26:49 -07:00 committed by GitHub
parent 7564502b0b
commit 354a2c29f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
assets/xml/objects/object_cne.xml
View file

@ -1,53 +1,53 @@
<Root> <Root>
<File Name="object_cne" Segment="6"> <File Name="object_cne" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned --> <!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="object_cne_Limb_000000" LimbType="Standard" Offset="0x0"/> <Limb Name="gCnePelvisLimb" LimbType="Standard" Offset="0x0"/>
<Limb Name="object_cne_Limb_00000C" LimbType="Standard" Offset="0xC"/> <Limb Name="gCneLeftThighLimb" LimbType="Standard" Offset="0xC"/>
<Limb Name="object_cne_Limb_000018" LimbType="Standard" Offset="0x18"/> <Limb Name="gCneLeftShinLimb" LimbType="Standard" Offset="0x18"/>
<Limb Name="object_cne_Limb_000024" LimbType="Standard" Offset="0x24"/> <Limb Name="gCneLeftFootLimb" LimbType="Standard" Offset="0x24"/>
<Limb Name="object_cne_Limb_000030" LimbType="Standard" Offset="0x30"/> <Limb Name="gCneRightThighLimb" LimbType="Standard" Offset="0x30"/>
<Limb Name="object_cne_Limb_00003C" LimbType="Standard" Offset="0x3C"/> <Limb Name="gCneRightShinLimb" LimbType="Standard" Offset="0x3C"/>
<Limb Name="object_cne_Limb_000048" LimbType="Standard" Offset="0x48"/> <Limb Name="gCneRightFootLimb" LimbType="Standard" Offset="0x48"/>
<Limb Name="object_cne_Limb_000054" LimbType="Standard" Offset="0x54"/> <Limb Name="gCneTorsoLimb" LimbType="Standard" Offset="0x54"/>
<Limb Name="object_cne_Limb_000060" LimbType="Standard" Offset="0x60"/> <Limb Name="gCneLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
<Limb Name="object_cne_Limb_00006C" LimbType="Standard" Offset="0x6C"/> <Limb Name="gCneLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
<Limb Name="object_cne_Limb_000078" LimbType="Standard" Offset="0x78"/> <Limb Name="gCneLeftHandLimb" LimbType="Standard" Offset="0x78"/>
<Limb Name="object_cne_Limb_000084" LimbType="Standard" Offset="0x84"/> <Limb Name="gCneRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
<Limb Name="object_cne_Limb_000090" LimbType="Standard" Offset="0x90"/> <Limb Name="gCneRightForearmLimb" LimbType="Standard" Offset="0x90"/>
<Limb Name="object_cne_Limb_00009C" LimbType="Standard" Offset="0x9C"/> <Limb Name="gCneRightHandLimb" LimbType="Standard" Offset="0x9C"/>
<Limb Name="object_cne_Limb_0000A8" LimbType="Standard" Offset="0xA8"/> <Limb Name="gCneHeadLimb" LimbType="Standard" Offset="0xA8"/>
<Skeleton Name="object_cne_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/> <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
<!-- 32-bit aligned textures. --> <!-- 32-bit aligned textures. -->
<Texture Name="object_cne_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/> <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
<Texture Name="object_cne_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/> <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
<Texture Name="object_cne_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/> <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
<Texture Name="object_cne_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C"/> <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
<Texture Name="object_cne_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="8" Height="8" Offset="0x3BC"/> <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC"/>
<Texture Name="object_cne_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="8" Height="16" Offset="0x3FC"/> <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
<Texture Name="object_cne_Tex_00047C" OutName="tex_0000047C" Format="i8" Width="8" Height="8" Offset="0x47C"/> <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>
<Texture Name="object_cne_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/> <Texture Name="gCneDressNeckTex" OutName="cne_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
<DList Name="object_cne_DL_001300" Offset="0x1300"/> <DList Name="gCneHeadBrownHairDL" Offset="0x1300"/>
<DList Name="object_cne_DL_001608" Offset="0x1608"/> <DList Name="gCneRightHandDL" Offset="0x1608"/>
<DList Name="object_cne_DL_0016E8" Offset="0x16E8"/> <DList Name="gCneRightForearmDL" Offset="0x16E8"/>
<DList Name="object_cne_DL_001808" Offset="0x1808"/> <DList Name="gCneRightUpperArmDL" Offset="0x1808"/>
<DList Name="object_cne_DL_0018C8" Offset="0x18C8"/> <DList Name="gCneLeftHandDL" Offset="0x18C8"/>
<DList Name="object_cne_DL_0019A8" Offset="0x19A8"/> <DList Name="gCneLeftForearmDL" Offset="0x19A8"/>
<DList Name="object_cne_DL_001AC8" Offset="0x1AC8"/> <DList Name="gCneLeftUpperArmDL" Offset="0x1AC8"/>
<DList Name="object_cne_DL_001B88" Offset="0x1B88"/> <DList Name="gCneTorsoDL" Offset="0x1B88"/>
<DList Name="object_cne_DL_001E50" Offset="0x1E50"/> <DList Name="gCneRightFootDL" Offset="0x1E50"/>
<DList Name="object_cne_DL_001F18" Offset="0x1F18"/> <DList Name="gCneRightShinDL" Offset="0x1F18"/>
<DList Name="object_cne_DL_001FE0" Offset="0x1FE0"/> <DList Name="gCneRightThighDL" Offset="0x1FE0"/>
<DList Name="object_cne_DL_0020A8" Offset="0x20A8"/> <DList Name="gCneLeftFootDL" Offset="0x20A8"/>
<DList Name="object_cne_DL_002170" Offset="0x2170"/> <DList Name="gCneLeftShinDL" Offset="0x2170"/>
<DList Name="object_cne_DL_002238" Offset="0x2238"/> <DList Name="gCneLeftThighDL" Offset="0x2238"/>
<DList Name="object_cne_DL_002300" Offset="0x2300"/> <DList Name="gCnePelvisDL" Offset="0x2300"/>
<Texture Name="object_cne_Tex_0023D0" OutName="tex_000023D0" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/> <Texture Name="gCneOrangeHairFaceTex" OutName="cne_orange_hair_face" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
<Texture Name="object_cne_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/> <Texture Name="gCneOrangeHairSkinTex" OutName="cne_orange_hair_skin" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
<DList Name="object_cne_DL_002860" Offset="0x2860"/> <DList Name="gCneHeadOrangeHairDL" Offset="0x2860"/>
</File> </File>
</Root> </Root>

6
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -111,8 +111,8 @@ static EnHyHeadInfo sHeadInfo[] = {
/* ENHY_HEAD_AHG_8 */ { OBJECT_AHG, object_ahg_DL_005508, NULL }, /* ENHY_HEAD_AHG_8 */ { OBJECT_AHG, object_ahg_DL_005508, NULL },
/* ENHY_HEAD_AHG_9 */ { OBJECT_AHG, object_ahg_DL_005728, NULL }, /* ENHY_HEAD_AHG_9 */ { OBJECT_AHG, object_ahg_DL_005728, NULL },
/* ENHY_HEAD_BBA */ { OBJECT_BBA, object_bba_DL_002948, sEyeTexturesBBA }, /* ENHY_HEAD_BBA */ { OBJECT_BBA, object_bba_DL_002948, sEyeTexturesBBA },
/* ENHY_HEAD_CNE_11 */ { OBJECT_CNE, object_cne_DL_001300, NULL }, /* ENHY_HEAD_CNE_11 */ { OBJECT_CNE, gCneHeadBrownHairDL, NULL },
/* ENHY_HEAD_CNE_12 */ { OBJECT_CNE, object_cne_DL_002860, NULL }, /* ENHY_HEAD_CNE_12 */ { OBJECT_CNE, gCneHeadOrangeHairDL, NULL },
/* ENHY_HEAD_BJI_13 */ { OBJECT_BJI, object_bji_DL_002560, sEyeTexturesBJI13 }, /* ENHY_HEAD_BJI_13 */ { OBJECT_BJI, object_bji_DL_002560, sEyeTexturesBJI13 },
/* ENHY_HEAD_BJI_14 */ { OBJECT_BJI, object_bji_DL_003F68, NULL }, /* ENHY_HEAD_BJI_14 */ { OBJECT_BJI, object_bji_DL_003F68, NULL },
/* ENHY_HEAD_COB */ { OBJECT_COB, object_cob_DL_001300, NULL }, /* ENHY_HEAD_COB */ { OBJECT_COB, object_cob_DL_001300, NULL },
@ -140,7 +140,7 @@ static EnHySkeletonInfo sSkeletonInfo[] = {
/* ENHY_SKEL_BOJ */ { OBJECT_BOJ, &object_boj_Skel_0000F0 }, /* ENHY_SKEL_BOJ */ { OBJECT_BOJ, &object_boj_Skel_0000F0 },
/* ENHY_SKEL_AHG */ { OBJECT_AHG, &object_ahg_Skel_0000F0 }, /* ENHY_SKEL_AHG */ { OBJECT_AHG, &object_ahg_Skel_0000F0 },
/* ENHY_SKEL_BBA */ { OBJECT_BBA, &object_bba_Skel_0000F0 }, /* ENHY_SKEL_BBA */ { OBJECT_BBA, &object_bba_Skel_0000F0 },
/* ENHY_SKEL_CNE */ { OBJECT_CNE, &object_cne_Skel_0000F0 }, /* ENHY_SKEL_CNE */ { OBJECT_CNE, &gCneSkel },
/* ENHY_SKEL_BJI */ { OBJECT_BJI, &object_bji_Skel_0000F0 }, /* ENHY_SKEL_BJI */ { OBJECT_BJI, &object_bji_Skel_0000F0 },
/* ENHY_SKEL_COB */ { OBJECT_COB, &object_cob_Skel_0021F8 }, /* ENHY_SKEL_COB */ { OBJECT_COB, &object_cob_Skel_0021F8 },
}; };