diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2026-08-14 00:40:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-13 18:40:56 -0400 |
| commit | 253eec1fdcbb288d31cd4b9f11f3e6b32c1b54ac (patch) | |
| tree | 1c55a19dc7ef0fc725f2a8374e04c7f3baa03ebb /assets/xml/objects | |
| parent | e77acba9c4fce64cbf1e5a62b45ee2d9814445b1 (diff) | |
[assets] Add most missing `TLUTOffset`s (#1890)
* [assets] Add TlutOffset to CI textures: misc, gkeeps, `object_[ab]*`
* [assets] Add TlutOffset to CI textures: `object_[c-i]*`
* remove extra space before TlutOffset
* [assets] Add TlutOffset to CI textures: `object_[j-n]*`
* [assets] Add TlutOffset to CI textures: `object_[o-z]*`
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Diffstat (limited to 'assets/xml/objects')
167 files changed, 1067 insertions, 1067 deletions
diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml index bacc9a21c..58967aa39 100644 --- a/assets/xml/objects/gameplay_field_keep.xml +++ b/assets/xml/objects/gameplay_field_keep.xml @@ -21,8 +21,8 @@ <Limb Name="gameplay_field_keep_Standardlimb_002F78" Type="Standard" EnumName="BUTTERFLY_LIMB_07" Offset="0x2F78" /> <Skeleton Name="gameplay_field_keep_Skel_002FA0" Type="Normal" LimbType="Standard" LimbNone="BUTTERFLY_LIMB_NONE" LimbMax="BUTTERFLY_LIMB_MAX" EnumName="ButterflyLimb" Offset="0x2FA0" /> <Texture Name="gameplay_field_keep_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="4" Height="4" Offset="0x2FB0" /> - <Texture Name="gameplay_field_keep_Tex_002FD0" OutName="tex_002FD0" Format="ci4" Width="32" Height="64" Offset="0x2FD0" /> - <Texture Name="gameplay_field_keep_Tex_0033D0" OutName="tex_0033D0" Format="ci4" Width="32" Height="64" Offset="0x33D0" /> + <Texture Name="gameplay_field_keep_Tex_002FD0" OutName="tex_002FD0" Format="ci4" Width="32" Height="64" Offset="0x2FD0" TlutOffset="0x2FB0"/> + <Texture Name="gameplay_field_keep_Tex_0033D0" OutName="tex_0033D0" Format="ci4" Width="32" Height="64" Offset="0x33D0" TlutOffset="0x2FB0"/> <DList Name="gameplay_field_keep_DL_003870" Offset="0x3870" /> <!-- Original name is "c_bombwallbefore_model" --> <DList Name="gameplay_field_keep_DL_003938" Offset="0x3938" /> <!-- Original name is "c_bombwallafter_model" --> <Collision Name="gameplay_field_keep_Colheader_003A60" Offset="0x3A60" /> <!-- Original name is "c_bombwallbefore_bgdatainfo" --> @@ -33,7 +33,7 @@ <Texture Name="gameplay_field_keep_Tex_004600" OutName="tex_004600" Format="rgba16" Width="16" Height="16" Offset="0x4600" /> <Texture Name="gFieldWoodDoorTex" OutName="wood_door" Format="i4" Width="64" Height="128" Offset="0x4800" /> <Texture Name="gFieldSilverBoulderTLUT" OutName="silver_boulder_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5800" /> - <Texture Name="gFieldSilverBoulderTex" OutName="silver_boulder" Format="ci4" Width="64" Height="64" Offset="0x5828" /> + <Texture Name="gFieldSilverBoulderTex" OutName="silver_boulder" Format="ci4" Width="64" Height="64" Offset="0x5828" TlutOffset="0x5800"/> <DList Name="gFieldSilverBoulderDL" Offset="0x61E8" /> <!-- Original name is "obj_ginbure_model" --> <DList Name="gFieldSilverBoulderDebrisDL" Offset="0x6420" /> <!-- Original name is "obj_ginbure_h_model" --> <DList Name="gFieldSmallRockOpaDL" Offset="0x66B0" /> <!-- Original name is "obj_isi01_model" --> diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 4f1aee935..7fa171005 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -39,7 +39,7 @@ <Texture Name="gKokiriSwordHandleTLUT" OutName="kokiri_sword_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2908" /> <Texture Name="gKokiriSwordHandlePommelTex" OutName="kokiri_sword_handle_pommel" Format="rgba16" Width="8" Height="8" Offset="0x2B08" /> <Texture Name="gRazorSwordHandleGripTex" OutName="razor_sword_handle_grip" Format="rgba16" Width="16" Height="16" Offset="0x2B88" /> - <Texture Name="gKokiriSwordHandleCrossGuardTex" OutName="kokiri_sword_handle_cross_gaurd" Format="ci8" Width="8" Height="8" Offset="0x2D88" /> + <Texture Name="gKokiriSwordHandleCrossGuardTex" OutName="kokiri_sword_handle_cross_gaurd" Format="ci8" Width="8" Height="8" Offset="0x2D88" TlutOffset="0x2908"/> <Texture Name="gKokiriSwordHandleGripTex" OutName="kokiri_sword_handle_grip" Format="i8" Width="8" Height="8" Offset="0x2DC8" /> <Texture Name="gRazorSwordHandleDesignTex" OutName="razor_sword_handle_design" Format="rgba16" Width="16" Height="16" Offset="0x2E08" /> <Texture Name="gSwordMetalTex" OutName="sword_metal" Format="i8" Width="8" Height="8" Offset="0x3008" /> @@ -59,27 +59,27 @@ <Texture Name="gLinkMaskTLUT" OutName="link_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DB8" /> <!-- Unused, leftover remnant same as the vertices --> <Texture Name="gGoronMaskTLUT" OutName="goron_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5FB8" /> <Texture Name="gZoraMaskTLUT" OutName="zora_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x61B8" /> - <Texture Name="gGoronMaskMouthTex" OutName="goron_mask_mouth" Format="ci8" Width="64" Height="32" Offset="0x63B8" /> - <Texture Name="gGoronMaskInsideEyeTex" OutName="goron_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x6BB8" /> - <Texture Name="gGoronMaskNoseEyebrowTex" OutName="goron_mask_nose_eyebrow" Format="ci8" Width="8" Height="8" Offset="0x6FB8" /> - <Texture Name="gGoronMaskHairTex" OutName="goron_mask_hair" Format="ci8" Width="16" Height="16" Offset="0x6FF8" /> + <Texture Name="gGoronMaskMouthTex" OutName="goron_mask_mouth" Format="ci8" Width="64" Height="32" Offset="0x63B8" TlutOffset="0x5FB8"/> + <Texture Name="gGoronMaskInsideEyeTex" OutName="goron_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x6BB8" TlutOffset="0x5FB8"/> + <Texture Name="gGoronMaskNoseEyebrowTex" OutName="goron_mask_nose_eyebrow" Format="ci8" Width="8" Height="8" Offset="0x6FB8" TlutOffset="0x5FB8"/> + <Texture Name="gGoronMaskHairTex" OutName="goron_mask_hair" Format="ci8" Width="16" Height="16" Offset="0x6FF8" TlutOffset="0x5FB8"/> <Texture Name="gGoronMaskEyeTex" OutName="goron_mask_eye" Format="rgba32" Width="32" Height="32" Offset="0x70F8" /> <Texture Name="gDekuMaskEyeTex" OutName="deku_mask_eye" Format="rgba16" Width="64" Height="32" Offset="0x80F8" /> <Texture Name="gDekuMaskFaceTex" OutName="deku_mask_face" Format="rgba16" Width="16" Height="16" Offset="0x90F8" /> <Texture Name="gDekuMaskHairTex" OutName="deku_mask_hair" Format="rgba16" Width="32" Height="32" Offset="0x92F8" /> - <Texture Name="gZoraMaskInsideEyeTex" OutName="zora_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x9AF8" /> - <Texture Name="gZoraMaskMouthTex" OutName="zora_mask_mouth" Format="ci8" Width="32" Height="32" Offset="0x9EF8" /> - <Texture Name="gZoraMaskNoseTex" OutName="zora_mask_nose" Format="ci8" Width="8" Height="8" Offset="0xA2F8" /> - <Texture Name="gZoraMaskSpotsTex" OutName="zora_mask_spots" Format="ci8" Width="16" Height="32" Offset="0xA338" /> + <Texture Name="gZoraMaskInsideEyeTex" OutName="zora_mask_inside_eye" Format="ci8" Width="32" Height="32" Offset="0x9AF8" TlutOffset="0x61B8"/> + <Texture Name="gZoraMaskMouthTex" OutName="zora_mask_mouth" Format="ci8" Width="32" Height="32" Offset="0x9EF8" TlutOffset="0x61B8"/> + <Texture Name="gZoraMaskNoseTex" OutName="zora_mask_nose" Format="ci8" Width="8" Height="8" Offset="0xA2F8" TlutOffset="0x61B8"/> + <Texture Name="gZoraMaskSpotsTex" OutName="zora_mask_spots" Format="ci8" Width="16" Height="32" Offset="0xA338" TlutOffset="0x61B8"/> <Texture Name="gZoraMaskEyeTex" OutName="zora_mask_eye" Format="i8" Width="32" Height="32" Offset="0xA538" /> <!-- Fierce Deity Mask--> <DList Name="gFierceDeityMaskDL" Offset="0xB260" /> <Texture Name="gFierceDeityMaskTLUT" OutName="fierce_deity_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0xB6B0" /> - <Texture Name="gFierceDeityMaskHairTex" OutName="fierce_deity_mask_hair" Format="ci8" Width="32" Height="32" Offset="0xB8B0" /> - <Texture Name="gFierceDeityMaskEyesTex" OutName="fierce_deity_mask_eyes" Format="ci8" Width="64" Height="32" Offset="0xBCB0" /> - <Texture Name="gFierceDeityMaskMouthTex" OutName="fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0xC4B0" /> - <Texture Name="gFierceDeityMaskEarTex" OutName="fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0xC6B0" /> + <Texture Name="gFierceDeityMaskHairTex" OutName="fierce_deity_mask_hair" Format="ci8" Width="32" Height="32" Offset="0xB8B0" TlutOffset="0xB6B0"/> + <Texture Name="gFierceDeityMaskEyesTex" OutName="fierce_deity_mask_eyes" Format="ci8" Width="64" Height="32" Offset="0xBCB0" TlutOffset="0xB6B0"/> + <Texture Name="gFierceDeityMaskMouthTex" OutName="fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0xC4B0" TlutOffset="0xB6B0"/> + <Texture Name="gFierceDeityMaskEarTex" OutName="fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0xC6B0" TlutOffset="0xB6B0"/> <Texture Name="gFierceDeityMaskHatTex" OutName="fierce_deity_mask_hat" Format="rgba16" Width="8" Height="8" Offset="0xC7B0" /> <Texture Name="gameplay_keep_Tex_00C830" OutName="tex_00C830" Format="rgba16" Width="16" Height="16" Offset="0xC830" /> @@ -1142,24 +1142,24 @@ <!-- Goron Elegy of Emptiness Shell --> <DList Name="gElegyShellGoronDL" Offset="0x48DF0" /> <!-- Original name is "pgs_zo_model" --> <Texture Name="gElegyShellGoronTLUT" OutName="elegy_shell_goron_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4A460" /> - <Texture Name="gElegyShellGoronSkinTex" OutName="elegy_shell_goron_skin" Format="ci8" Width="16" Height="16" Offset="0x4A660" /> - <Texture Name="gElegyShellGoronHairTex" OutName="elegy_shell_goron_hair" Format="ci8" Width="16" Height="32" Offset="0x4A760" /> - <Texture Name="gElegyShellGoronSideburnsAndBeardTex" OutName="elegy_shell_goron_sideburns_and_beard" Format="ci8" Width="16" Height="16" Offset="0x4A960" /> - <Texture Name="gElegyShellGoronNostrilTex" OutName="elegy_shell_goron_nostril" Format="ci8" Width="8" Height="8" Offset="0x4AA60" /> - <Texture Name="gElegyShellGoronLipsTex" OutName="elegy_shell_goron_lips" Format="ci8" Width="8" Height="8" Offset="0x4AAA0" /> - <Texture Name="gElegyShellGoronGlovePalmTex" OutName="elegy_shell_goron_glove_palm" Format="ci8" Width="16" Height="16" Offset="0x4AAE0" /> - <Texture Name="gElegyShellGoronGloveBackTex" OutName="elegy_shell_goron_glove_back" Format="ci8" Width="8" Height="16" Offset="0x4ABE0" /> - <Texture Name="gElegyShellGoronFingerAndToeTex" OutName="elegy_shell_goron_finger_and_toe" Format="ci8" Width="8" Height="16" Offset="0x4AC60" /> - <Texture Name="gElegyShellGoronSandalTopAndSideTex" OutName="elegy_shell_goron_sandal_top_and_side" Format="ci8" Width="8" Height="8" Offset="0x4ACE0" /> - <Texture Name="gElegyShellGoronChestTex" OutName="elegy_shell_goron_chest" Format="ci8" Width="32" Height="32" Offset="0x4AD20" /> - <Texture Name="gElegyShellGoronBackTex" OutName="elegy_shell_goron_back" Format="ci8" Width="32" Height="64" Offset="0x4B120" /> - <Texture Name="gElegyShellGoronGoronsRubyTattooTex" OutName="elegy_shell_goron_gorons_ruby_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4B920" /> - <Texture Name="gElegyShellGoronTribalTattooTex" OutName="elegy_shell_goron_tribal_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4C120" /> - <Texture Name="gElegyShellGoronLoinclothTex" OutName="elegy_shell_goron_loincloth" Format="ci8" Width="8" Height="16" Offset="0x4C920" /> - <Texture Name="gElegyShellGoronEyeTex" OutName="elegy_shell_goron_eye" Format="ci8" Width="32" Height="32" Offset="0x4C9A0" /> + <Texture Name="gElegyShellGoronSkinTex" OutName="elegy_shell_goron_skin" Format="ci8" Width="16" Height="16" Offset="0x4A660" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronHairTex" OutName="elegy_shell_goron_hair" Format="ci8" Width="16" Height="32" Offset="0x4A760" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronSideburnsAndBeardTex" OutName="elegy_shell_goron_sideburns_and_beard" Format="ci8" Width="16" Height="16" Offset="0x4A960" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronNostrilTex" OutName="elegy_shell_goron_nostril" Format="ci8" Width="8" Height="8" Offset="0x4AA60" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronLipsTex" OutName="elegy_shell_goron_lips" Format="ci8" Width="8" Height="8" Offset="0x4AAA0" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronGlovePalmTex" OutName="elegy_shell_goron_glove_palm" Format="ci8" Width="16" Height="16" Offset="0x4AAE0" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronGloveBackTex" OutName="elegy_shell_goron_glove_back" Format="ci8" Width="8" Height="16" Offset="0x4ABE0" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronFingerAndToeTex" OutName="elegy_shell_goron_finger_and_toe" Format="ci8" Width="8" Height="16" Offset="0x4AC60" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronSandalTopAndSideTex" OutName="elegy_shell_goron_sandal_top_and_side" Format="ci8" Width="8" Height="8" Offset="0x4ACE0" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronChestTex" OutName="elegy_shell_goron_chest" Format="ci8" Width="32" Height="32" Offset="0x4AD20" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronBackTex" OutName="elegy_shell_goron_back" Format="ci8" Width="32" Height="64" Offset="0x4B120" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronGoronsRubyTattooTex" OutName="elegy_shell_goron_gorons_ruby_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4B920" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronTribalTattooTex" OutName="elegy_shell_goron_tribal_tattoo" Format="ci8" Width="32" Height="64" Offset="0x4C120" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronLoinclothTex" OutName="elegy_shell_goron_loincloth" Format="ci8" Width="8" Height="16" Offset="0x4C920" TlutOffset="0x4A460"/> + <Texture Name="gElegyShellGoronEyeTex" OutName="elegy_shell_goron_eye" Format="ci8" Width="32" Height="32" Offset="0x4C9A0" TlutOffset="0x4A460"/> <Texture Name="gElegyShellGoronScarTex" OutName="elegy_shell_goron_scar" Format="rgba16" Width="32" Height="64" Offset="0x4CDA0" /> <Texture Name="gElegyShellGoronNecklaceTex" OutName="elegy_shell_goron_necklace" Format="i8" Width="32" Height="32" Offset="0x4DDA0" /> - <Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1A0" /> + <Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1A0" TlutOffset="0x4A460"/> <Texture Name="gHookshotReticleTex" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" /> <DList Name="gHookshotReticleDL" Offset="0x4F250" /> <!-- Original name might be "pointer_modelT" --> @@ -1484,17 +1484,17 @@ <Texture Name="gElegyShellZoraGuitarTeethTex" OutName="elegy_shell_zora_guitar_teeth" Format="rgba16" Width="16" Height="16" Offset="0x8AA20" /> <Texture Name="gElegyShellZoraGuitarSpinousTex" OutName="elegy_shell_zora_guitar_spinous" Format="rgba16" Width="16" Height="32" Offset="0x8AC20" /> <Texture Name="gElegyShellZoraGuitarBoneTex" OutName="elegy_shell_zora_guitar_bone" Format="rgba16" Width="16" Height="32" Offset="0x8B020" /> - <Texture Name="gElegyShellZoraSkinTex" OutName="elegy_shell_zora_skin" Format="ci8" Width="8" Height="8" Offset="0x8B420" /> - <Texture Name="gElegyShellZoraSpottedSkinTex" OutName="elegy_shell_zora_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8B460" /> - <Texture Name="gElegyShellZoraFingersTex" OutName="elegy_shell_zora_fingers" Format="ci8" Width="16" Height="16" Offset="0x8B860" /> - <Texture Name="gElegyShellZoraBackAndHipSpottedSkinTex" OutName="elegy_shell_zora_back_and_hip_spotted_skin" Format="ci8" Width="32" Height="64" Offset="0x8B960" /> - <Texture Name="gElegyShellZoraWristbandTex" OutName="elegy_shell_zora_wristband" Format="ci8" Width="8" Height="16" Offset="0x8C160" /> - <Texture Name="gElegyShellZoraFinTex" OutName="elegy_shell_zora_fin" Format="ci8" Width="16" Height="16" Offset="0x8C1E0" /> - <Texture Name="gElegyShellZoraEyeTex" OutName="elegy_shell_zora_eye" Format="ci8" Width="32" Height="32" Offset="0x8C2E0" /> - <Texture Name="gElegyShellZoraMouthTex" OutName="elegy_shell_zora_mouth" Format="ci8" Width="32" Height="32" Offset="0x8C6E0" /> - <Texture Name="gElegyShellZoraRibsTattooTex" OutName="elegy_shell_zora_ribs_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CAE0" /> - <Texture Name="gElegyShellZoraArrowTattooTex" OutName="elegy_shell_zora_arrow_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CCE0" /> - <Texture Name="gElegyShellZoraRightShoulderTattooTex" OutName="elegy_shell_zora_right_shoulder_tattoo" Format="ci8" Width="32" Height="32" Offset="0x8CEE0" /> + <Texture Name="gElegyShellZoraSkinTex" OutName="elegy_shell_zora_skin" Format="ci8" Width="8" Height="8" Offset="0x8B420" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraSpottedSkinTex" OutName="elegy_shell_zora_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8B460" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraFingersTex" OutName="elegy_shell_zora_fingers" Format="ci8" Width="16" Height="16" Offset="0x8B860" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraBackAndHipSpottedSkinTex" OutName="elegy_shell_zora_back_and_hip_spotted_skin" Format="ci8" Width="32" Height="64" Offset="0x8B960" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraWristbandTex" OutName="elegy_shell_zora_wristband" Format="ci8" Width="8" Height="16" Offset="0x8C160" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraFinTex" OutName="elegy_shell_zora_fin" Format="ci8" Width="16" Height="16" Offset="0x8C1E0" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraEyeTex" OutName="elegy_shell_zora_eye" Format="ci8" Width="32" Height="32" Offset="0x8C2E0" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraMouthTex" OutName="elegy_shell_zora_mouth" Format="ci8" Width="32" Height="32" Offset="0x8C6E0" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraRibsTattooTex" OutName="elegy_shell_zora_ribs_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CAE0" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraArrowTattooTex" OutName="elegy_shell_zora_arrow_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CCE0" TlutOffset="0x8A420"/> + <Texture Name="gElegyShellZoraRightShoulderTattooTex" OutName="elegy_shell_zora_right_shoulder_tattoo" Format="ci8" Width="32" Height="32" Offset="0x8CEE0" TlutOffset="0x8A420"/> <Texture Name="gElegyShellZoraPlatformTex" OutName="elegy_shell_zora_platform" Format="rgba16" Width="8" Height="16" Offset="0x8D2E0" /> <Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D3E0" /> diff --git a/assets/xml/objects/object_ah.xml b/assets/xml/objects/object_ah.xml index 71b031a01..a27bcb692 100644 --- a/assets/xml/objects/object_ah.xml +++ b/assets/xml/objects/object_ah.xml @@ -20,17 +20,17 @@ <DList Name="object_ah_DL_006090" Offset="0x6090" /> <DList Name="object_ah_DL_0061B8" Offset="0x61B8" /> <Texture Name="object_ah_TLUT_0064B0" OutName="tlut_0064B0" Format="rgba16" Width="16" Height="16" Offset="0x64B0" /> - <Texture Name="object_ah_Tex_0066B0" OutName="tex_0066B0" Format="ci8" Width="16" Height="16" Offset="0x66B0" /> - <Texture Name="object_ah_Tex_0067B0" OutName="tex_0067B0" Format="ci8" Width="16" Height="16" Offset="0x67B0" /> - <Texture Name="object_ah_Tex_0068B0" OutName="tex_0068B0" Format="ci8" Width="8" Height="8" Offset="0x68B0" /> - <Texture Name="object_ah_Tex_0068F0" OutName="tex_0068F0" Format="ci8" Width="8" Height="8" Offset="0x68F0" /> - <Texture Name="object_ah_Tex_006930" OutName="tex_006930" Format="ci8" Width="8" Height="8" Offset="0x6930" /> - <Texture Name="object_ah_Tex_006970" OutName="tex_006970" Format="ci8" Width="16" Height="16" Offset="0x6970" /> - <Texture Name="object_ah_Tex_006A70" OutName="tex_006A70" Format="ci8" Width="8" Height="8" Offset="0x6A70" /> - <Texture Name="object_ah_Tex_006AB0" OutName="tex_006AB0" Format="ci8" Width="16" Height="16" Offset="0x6AB0" /> - <Texture Name="object_ah_Tex_006BB0" OutName="tex_006BB0" Format="ci8" Width="8" Height="16" Offset="0x6BB0" /> + <Texture Name="object_ah_Tex_0066B0" OutName="tex_0066B0" Format="ci8" Width="16" Height="16" Offset="0x66B0" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_0067B0" OutName="tex_0067B0" Format="ci8" Width="16" Height="16" Offset="0x67B0" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_0068B0" OutName="tex_0068B0" Format="ci8" Width="8" Height="8" Offset="0x68B0" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_0068F0" OutName="tex_0068F0" Format="ci8" Width="8" Height="8" Offset="0x68F0" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_006930" OutName="tex_006930" Format="ci8" Width="8" Height="8" Offset="0x6930" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_006970" OutName="tex_006970" Format="ci8" Width="16" Height="16" Offset="0x6970" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_006A70" OutName="tex_006A70" Format="ci8" Width="8" Height="8" Offset="0x6A70" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_006AB0" OutName="tex_006AB0" Format="ci8" Width="16" Height="16" Offset="0x6AB0" TlutOffset="0x64B0"/> + <Texture Name="object_ah_Tex_006BB0" OutName="tex_006BB0" Format="ci8" Width="8" Height="16" Offset="0x6BB0" TlutOffset="0x64B0"/> <Texture Name="object_ah_Tex_006C30" OutName="tex_006C30" Format="i8" Width="8" Height="8" Offset="0x6C30" /> - <Texture Name="object_ah_Tex_006C70" OutName="tex_006C70" Format="ci8" Width="16" Height="16" Offset="0x6C70" /> + <Texture Name="object_ah_Tex_006C70" OutName="tex_006C70" Format="ci8" Width="16" Height="16" Offset="0x6C70" TlutOffset="0x64B0"/> <Texture Name="object_ah_Tex_006D70" OutName="tex_006D70" Format="rgba16" Width="32" Height="32" Offset="0x6D70" /> <Texture Name="object_ah_Tex_007570" OutName="tex_007570" Format="rgba16" Width="32" Height="32" Offset="0x7570" /> <Texture Name="object_ah_Tex_007D70" OutName="tex_007D70" Format="rgba16" Width="32" Height="32" Offset="0x7D70" /> diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml index 8233a5b27..87bcc90e3 100644 --- a/assets/xml/objects/object_ahg.xml +++ b/assets/xml/objects/object_ahg.xml @@ -2,18 +2,18 @@ <!-- Assets for the bearded man from OOT, body is reused in MM for Cured Swamp Spider House Man (head substituted from overlay data). --> <File Name="object_ahg" Segment="6"> <Texture Name="gAhgTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" /> - <Texture Name="gAhgHairLineTex" OutName="hair_line" Format="ci8" Width="16" Height="16" Offset="0x200" /> - <Texture Name="gAhgHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x300" /> - <Texture Name="gAhgEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x400" /> - <Texture Name="gAhgSkinGradientTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x440"/> + <Texture Name="gAhgHairLineTex" OutName="hair_line" Format="ci8" Width="16" Height="16" Offset="0x200" TlutOffset="0x0"/> + <Texture Name="gAhgHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x300" TlutOffset="0x0"/> + <Texture Name="gAhgEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x400" TlutOffset="0x0"/> + <Texture Name="gAhgSkinGradientTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x440" TlutOffset="0x0"/> <Texture Name="gAhgEyeOpenTex" OutName="eye_open" Format="ci8" Width="16" Height="16" Offset="0x480" TlutOffset="0x0"/> <Texture Name="gAhgEyeHalfTex" OutName="eye_half" Format="ci8" Width="16" Height="16" Offset="0x580" TlutOffset="0x0"/> <Texture Name="gAhgEyeClosedTex" OutName="eye_closed" Format="ci8" Width="16" Height="16" Offset="0x680" TlutOffset="0x0"/> - <Texture Name="gAhgFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x780" /> + <Texture Name="gAhgFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x780" TlutOffset="0x0"/> <Texture Name="gAhgShirtTex" OutName="shirt" Format="i8" Width="8" Height="8" Offset="0x880" /> <Texture Name="gAhgShoesTex" OutName="shoes" Format="i8" Width="8" Height="8" Offset="0x8C0" /> - <Texture Name="gAhgBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="32" Height="16" Offset="0x900" /> - <Texture Name="gAhgBeltLoopTex" OutName="belt_loop" Format="ci8" Width="16" Height="16" Offset="0xB00" /> + <Texture Name="gAhgBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="32" Height="16" Offset="0x900" TlutOffset="0x0"/> + <Texture Name="gAhgBeltLoopTex" OutName="belt_loop" Format="ci8" Width="16" Height="16" Offset="0xB00" TlutOffset="0x0"/> <!-- This head is overwritten in EnSth draw. --> <DList Name="gAhgBeardedHeadDL" Offset="0x2FF0" /> diff --git a/assets/xml/objects/object_al.xml b/assets/xml/objects/object_al.xml index 790ca3d8a..64acd4d80 100644 --- a/assets/xml/objects/object_al.xml +++ b/assets/xml/objects/object_al.xml @@ -27,16 +27,16 @@ <DList Name="gMadameAromaNecklaceDL" Offset="0x64E0" /> <DList Name="gMadameAromaShawlMiddleDL" Offset="0x6598" /> <Texture Name="gMadameAromaTLUT" OutName="madame_aroma_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6638" /> - <Texture Name="gMadameAromaSkinBlotchTex" OutName="madame_aroma_skin_blotch" Format="ci8" Width="8" Height="8" Offset="0x6838" /> - <Texture Name="gMadameAromaEarsTex" OutName="madame_aroma_ears" Format="ci8" Width="8" Height="8" Offset="0x6878" /> - <Texture Name="gMadameAromaHairToSkinTex" OutName="madame_aroma_hair_to_skin" Format="ci8" Width="16" Height="16" Offset="0x68B8" /> + <Texture Name="gMadameAromaSkinBlotchTex" OutName="madame_aroma_skin_blotch" Format="ci8" Width="8" Height="8" Offset="0x6838" TlutOffset="0x6638"/> + <Texture Name="gMadameAromaEarsTex" OutName="madame_aroma_ears" Format="ci8" Width="8" Height="8" Offset="0x6878" TlutOffset="0x6638"/> + <Texture Name="gMadameAromaHairToSkinTex" OutName="madame_aroma_hair_to_skin" Format="ci8" Width="16" Height="16" Offset="0x68B8" TlutOffset="0x6638"/> <Texture Name="gMadameAromaMouthTex" OutName="madame_aroma_mouth" Format="rgba16" Width="64" Height="32" Offset="0x69B8" /> <Texture Name="gMadameAromaEyesTex" OutName="madame_aroma_eyes" Format="rgba16" Width="32" Height="32" Offset="0x79B8" /> - <Texture Name="gMadameAromaShoeTex" OutName="madame_aroma_shoe" Format="ci8" Width="32" Height="16" Offset="0x81B8" /> + <Texture Name="gMadameAromaShoeTex" OutName="madame_aroma_shoe" Format="ci8" Width="32" Height="16" Offset="0x81B8" TlutOffset="0x6638"/> <Texture Name="gMadameAromaDressLowerTex" OutName="madame_aroma_dress_lower" Format="rgba16" Width="32" Height="32" Offset="0x83B8" /> <Texture Name="gMadameAromaHairHolderTex" OutName="madame_aroma_hair_holder" Format="rgba16" Width="8" Height="8" Offset="0x8BB8" /> - <Texture Name="gMadameAromaFingersTex" OutName="madame_aroma_fingers" Format="ci8" Width="16" Height="16" Offset="0x8C38" /> - <Texture Name="gMadameAromaChestTex" OutName="madame_aroma_chest" Format="ci8" Width="16" Height="16" Offset="0x8D38" /> + <Texture Name="gMadameAromaFingersTex" OutName="madame_aroma_fingers" Format="ci8" Width="16" Height="16" Offset="0x8C38" TlutOffset="0x6638"/> + <Texture Name="gMadameAromaChestTex" OutName="madame_aroma_chest" Format="ci8" Width="16" Height="16" Offset="0x8D38" TlutOffset="0x6638"/> <Texture Name="gMadameAromaEarringsTex" OutName="madame_aroma_earrings" Format="rgba16" Width="32" Height="64" Offset="0x8E38" /> <Texture Name="gMadameAromaRingTex" OutName="madame_aroma_ring" Format="rgba16" Width="8" Height="16" Offset="0x9E38" /> <Limb Name="gMadameAromaRootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_ROOT" Offset="0x9F38" /> diff --git a/assets/xml/objects/object_an1.xml b/assets/xml/objects/object_an1.xml index 186659d46..d85bc06c4 100644 --- a/assets/xml/objects/object_an1.xml +++ b/assets/xml/objects/object_an1.xml @@ -41,16 +41,16 @@ <Texture Name="gAnju1MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDF20" /> <!-- Skeleton's textures --> - <Texture Name="gAnju1SkinTex" OutName="anju_skin" Format="ci8" Width="8" Height="8" Offset="0xE120" /> - <Texture Name="gAnju1HairTex" OutName="anju_hair" Format="ci8" Width="8" Height="16" Offset="0xE160" /> + <Texture Name="gAnju1SkinTex" OutName="anju_skin" Format="ci8" Width="8" Height="8" Offset="0xE120" TlutOffset="0xDB20"/> + <Texture Name="gAnju1HairTex" OutName="anju_hair" Format="ci8" Width="8" Height="16" Offset="0xE160" TlutOffset="0xDB20"/> <Texture Name="gAnju1EyeOpenTex" OutName="anju_eye_open" Format="ci8" Width="32" Height="32" Offset="0xE1E0" TlutOffset="0xDD20" /> - <Texture Name="gAnju1EarTex" OutName="anju_ear" Format="ci8" Width="16" Height="16" Offset="0xE5E0" /> + <Texture Name="gAnju1EarTex" OutName="anju_ear" Format="ci8" Width="16" Height="16" Offset="0xE5E0" TlutOffset="0xDB20"/> <Texture Name="gAnju1MouthClosedTex" OutName="anju_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xE6E0" TlutOffset="0xDF20" /> - <Texture Name="gAnju1ShirtButtonTex" OutName="anju_shirt_button" Format="ci8" Width="8" Height="8" Offset="0xE8E0" /> - <Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" /> - <Texture Name="gAnju1SkirtTex" OutName="anju_skirt" Format="ci8" Width="32" Height="32" Offset="0xEA20" /> - <Texture Name="gAnju1ShirtTex" OutName="anju_shirt" Format="ci8" Width="16" Height="16" Offset="0xEE20" /> - <Texture Name="gAnju1SleeveTex" OutName="anju_sleeve" Format="ci8" Width="8" Height="16" Offset="0xEF20" /> + <Texture Name="gAnju1ShirtButtonTex" OutName="anju_shirt_button" Format="ci8" Width="8" Height="8" Offset="0xE8E0" TlutOffset="0xDB20"/> + <Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" TlutOffset="0xDB20"/> + <Texture Name="gAnju1SkirtTex" OutName="anju_skirt" Format="ci8" Width="32" Height="32" Offset="0xEA20" TlutOffset="0xDB20"/> + <Texture Name="gAnju1ShirtTex" OutName="anju_shirt" Format="ci8" Width="16" Height="16" Offset="0xEE20" TlutOffset="0xDB20"/> + <Texture Name="gAnju1SleeveTex" OutName="anju_sleeve" Format="ci8" Width="8" Height="16" Offset="0xEF20" TlutOffset="0xDB20"/> <Texture Name="gAnju1EyeHalfTex" OutName="anju_eye_half" Format="ci8" Width="32" Height="32" Offset="0xEFA0" TlutOffset="0xDD20" /> <Texture Name="gAnju1EyeClosedTex" OutName="anju_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF3A0" TlutOffset="0xDD20" /> <Texture Name="gAnju1MouthHappyTex" OutName="anju_mouth_happy" Format="ci8" Width="32" Height="16" Offset="0xF7A0" TlutOffset="0xDF20" /> diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml index 8bc8aa5e3..5f6b1f115 100644 --- a/assets/xml/objects/object_ani.xml +++ b/assets/xml/objects/object_ani.xml @@ -37,17 +37,17 @@ <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="gAniUnkGradientTex" OutName="ani_unk_gradient1" Format="ci8" Width="8" Height="8" Offset="0x6058" TlutOffset="0x5E58"/> + <Texture Name="gAniFingersTex" OutName="ani_fingers" Format="ci8" Width="8" Height="8" Offset="0x6098" TlutOffset="0x5E58"/> <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="gAniSandleBuckleTex" OutName="ani_sandle_buckle" Format="ci8" Width="16" Height="16" Offset="0x6118" TlutOffset="0x5E58"/> + <Texture Name="gAniPantsTex" OutName="ani_pants" Format="ci8" Width="16" Height="16" Offset="0x6218" TlutOffset="0x5E58"/> <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="gAniMouthTex" OutName="ani_mouth" Format="ci8" Width="16" Height="16" Offset="0x6898" TlutOffset="0x6318"/> + <Texture Name="gAniUnkGradient2Tex" OutName="ani_unk_gradient2" Format="ci8" Width="8" Height="8" Offset="0x6998" TlutOffset="0x6318"/> + <Texture Name="gAniEarTex" OutName="ani_ear" Format="ci8" Width="8" Height="8" Offset="0x69D8" TlutOffset="0x6318"/> + <Texture Name="gAniHairTex" OutName="ani_hair" Format="ci8" Width="16" Height="16" Offset="0x6A18" TlutOffset="0x6318"/> <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" /> diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml index 50de06ea0..6b2b5ab0c 100644 --- a/assets/xml/objects/object_aob.xml +++ b/assets/xml/objects/object_aob.xml @@ -26,17 +26,17 @@ <!-- Mamamu Yan Textures --> <Texture Name="gMamamuYanTLUT" OutName="mamamu_yan_tlut" Format="rgba16" Width="16" Height="16" Offset="0x198" /> - <Texture Name="gMamamuYanHairTex" OutName="mamamu_yan_hair" Format="ci8" Width="16" Height="16" Offset="0x398" /> - <Texture Name="gMamamuYanSkinTex" OutName="mamamu_yan_skin" Format="ci8" Width="8" Height="8" Offset="0x498" /> - <Texture Name="gMamamuYanEarTex" OutName="mamamu_yan_ear" Format="ci8" Width="16" Height="16" Offset="0x4D8" /> - <Texture Name="gMamamuYanLipsTex" OutName="mamamu_yan_lips" Format="ci8" Width="8" Height="8" Offset="0x5D8" /> - <Texture Name="gMamamuYanNostrilTex" OutName="mamamu_yan_nostril" Format="ci8" Width="8" Height="8" Offset="0x618" /> + <Texture Name="gMamamuYanHairTex" OutName="mamamu_yan_hair" Format="ci8" Width="16" Height="16" Offset="0x398" TlutOffset="0x198"/> + <Texture Name="gMamamuYanSkinTex" OutName="mamamu_yan_skin" Format="ci8" Width="8" Height="8" Offset="0x498" TlutOffset="0x198"/> + <Texture Name="gMamamuYanEarTex" OutName="mamamu_yan_ear" Format="ci8" Width="16" Height="16" Offset="0x4D8" TlutOffset="0x198"/> + <Texture Name="gMamamuYanLipsTex" OutName="mamamu_yan_lips" Format="ci8" Width="8" Height="8" Offset="0x5D8" TlutOffset="0x198"/> + <Texture Name="gMamamuYanNostrilTex" OutName="mamamu_yan_nostril" Format="ci8" Width="8" Height="8" Offset="0x618" TlutOffset="0x198"/> <Texture Name="gMamamuYanEyeOpenTex" OutName="mamamu_yan_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x658" /> <Texture Name="gMamamuYanEyeHalfTex" OutName="mamamu_yan_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xE58" /> <Texture Name="gMamamuYanEyeClosedTex" OutName="mamamu_yan_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x1658" /> - <Texture Name="gMamamuYanFingersTex" OutName="mamamu_yan_fingers" Format="ci8" Width="16" Height="16" Offset="0x1E58" /> - <Texture Name="gMamamuYanSleevesTex" OutName="mamamu_yan_sleeves" Format="ci8" Width="8" Height="8" Offset="0x1F58" /> - <Texture Name="gMamamuYanDressTex" OutName="mamamu_yan_dress" Format="ci8" Width="8" Height="8" Offset="0x1F98" /> + <Texture Name="gMamamuYanFingersTex" OutName="mamamu_yan_fingers" Format="ci8" Width="16" Height="16" Offset="0x1E58" TlutOffset="0x198"/> + <Texture Name="gMamamuYanSleevesTex" OutName="mamamu_yan_sleeves" Format="ci8" Width="8" Height="8" Offset="0x1F58" TlutOffset="0x198"/> + <Texture Name="gMamamuYanDressTex" OutName="mamamu_yan_dress" Format="ci8" Width="8" Height="8" Offset="0x1F98" TlutOffset="0x198"/> <!-- Mamamu Yan Limb DisplayLists --> <DList Name="gMamamuYanHeadDL" Offset="0x3D18" /> diff --git a/assets/xml/objects/object_astr_obj.xml b/assets/xml/objects/object_astr_obj.xml index 99228eddc..ddf6b6c17 100644 --- a/assets/xml/objects/object_astr_obj.xml +++ b/assets/xml/objects/object_astr_obj.xml @@ -2,7 +2,7 @@ <File Name="object_astr_obj" Segment="6"> <Texture Name="object_astr_obj_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" /> <Texture Name="object_astr_obj_Tex_000020" OutName="tex_000020" Format="rgba16" Width="32" Height="32" Offset="0x20" /> - <Texture Name="object_astr_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="64" Height="64" Offset="0x820" /> + <Texture Name="object_astr_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="64" Height="64" Offset="0x820" TlutOffset="0x0"/> <Texture Name="object_astr_obj_Tex_001020" OutName="tex_001020" Format="ia8" Width="64" Height="64" Offset="0x1020" /> <DList Name="object_astr_obj_DL_002170" Offset="0x2170" /> <DList Name="gAstralObservatoryBombWallFragmentDL" Offset="0x2178" /> <!-- Original name is "z2_tennmondai_hahen_model" ("tennmondai" = "astronomical observatory", "hahen" = "fragment") --> diff --git a/assets/xml/objects/object_bai.xml b/assets/xml/objects/object_bai.xml index 419f37b29..f8b4e949e 100644 --- a/assets/xml/objects/object_bai.xml +++ b/assets/xml/objects/object_bai.xml @@ -19,14 +19,14 @@ <DList Name="object_bai_DL_006518" Offset="0x6518" /> <DList Name="object_bai_DL_006740" Offset="0x6740" /> <Texture Name="object_bai_TLUT_006858" OutName="tlut_006858" Format="rgba16" Width="16" Height="16" Offset="0x6858" /> - <Texture Name="object_bai_Tex_006A58" OutName="tex_006A58" Format="ci8" Width="32" Height="64" Offset="0x6A58" /> - <Texture Name="object_bai_Tex_007258" OutName="tex_007258" Format="ci8" Width="8" Height="8" Offset="0x7258" /> - <Texture Name="object_bai_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" /> - <Texture Name="object_bai_Tex_0072D8" OutName="tex_0072D8" Format="ci8" Width="8" Height="8" Offset="0x72D8" /> - <Texture Name="object_bai_Tex_007318" OutName="tex_007318" Format="ci8" Width="8" Height="16" Offset="0x7318" /> - <Texture Name="object_bai_Tex_007398" OutName="tex_007398" Format="ci8" Width="8" Height="8" Offset="0x7398" /> - <Texture Name="object_bai_Tex_0073D8" OutName="tex_0073D8" Format="ci8" Width="16" Height="16" Offset="0x73D8" /> - <Texture Name="object_bai_Tex_0074D8" OutName="tex_0074D8" Format="ci8" Width="16" Height="16" Offset="0x74D8" /> + <Texture Name="object_bai_Tex_006A58" OutName="tex_006A58" Format="ci8" Width="32" Height="64" Offset="0x6A58" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_007258" OutName="tex_007258" Format="ci8" Width="8" Height="8" Offset="0x7258" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_0072D8" OutName="tex_0072D8" Format="ci8" Width="8" Height="8" Offset="0x72D8" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_007318" OutName="tex_007318" Format="ci8" Width="8" Height="16" Offset="0x7318" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_007398" OutName="tex_007398" Format="ci8" Width="8" Height="8" Offset="0x7398" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_0073D8" OutName="tex_0073D8" Format="ci8" Width="16" Height="16" Offset="0x73D8" TlutOffset="0x6858"/> + <Texture Name="object_bai_Tex_0074D8" OutName="tex_0074D8" Format="ci8" Width="16" Height="16" Offset="0x74D8" TlutOffset="0x6858"/> <Texture Name="object_bai_Tex_0075D8" OutName="tex_0075D8" Format="rgba16" Width="16" Height="16" Offset="0x75D8" /> <Limb Name="object_bai_Standardlimb_0077D8" Type="Standard" EnumName="OBJECT_BAI_LIMB_01" Offset="0x77D8" /> <Limb Name="object_bai_Standardlimb_0077E4" Type="Standard" EnumName="OBJECT_BAI_LIMB_02" Offset="0x77E4" /> diff --git a/assets/xml/objects/object_bal.xml b/assets/xml/objects/object_bal.xml index c98ffb43d..61bd2aca0 100644 --- a/assets/xml/objects/object_bal.xml +++ b/assets/xml/objects/object_bal.xml @@ -41,7 +41,7 @@ <Texture Name="gTingleNoseSideTex" OutName="tingle_nose" Format="rgba16" Width="16" Height="32" Offset="0x82D0" /> <Texture Name="gTingleHandTex" OutName="tingle_hand" Format="rgba16" Width="32" Height="16" Offset="0x86D0" /> <Texture Name="gTinglePenTopTex" OutName="tingle_pen_top" Format="rgba16" Width="16" Height="16" Offset="0x8AD0" /> - <Texture Name="gTingleMapTex" OutName="tingle_map" Format="ci4" Width="64" Height="64" Offset="0x8CD0" /> + <Texture Name="gTingleMapTex" OutName="tingle_map" Format="ci4" Width="64" Height="64" Offset="0x8CD0" TlutOffset="0x53B0"/> <Texture Name="gTingleEyeClosedTex" OutName="tingle_eye_closed" Format="rgba16" Width="32" Height="64" Offset="0x94D0" /> <!-- Skeleton --> diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml index 408ad74d6..6edd06663 100644 --- a/assets/xml/objects/object_bba.xml +++ b/assets/xml/objects/object_bba.xml @@ -66,17 +66,17 @@ <Texture Name="gBombShopLadySkirt2Tex" OutName="bomb_shop_lady_skirt_2" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" /> <!-- Textures --> - <Texture Name="gBombShopLadySkinTex" OutName="bomb_shop_lady_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" /> - <Texture Name="gBombShopLadyWrinklesTex" OutName="bomb_shop_lady_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x8720" /> - <Texture Name="gBombShopLadyHairSkinTex" OutName="bomb_shop_lady_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x8B20" /> - <Texture Name="gBombShopLadyNostrilTex" OutName="bomb_shop_lady_nostril" Format="ci8" Width="8" Height="8" Offset="0x8F20" /> - <Texture Name="gBombShopLadyEarTex" OutName="bomb_shop_lady_ear" Format="ci8" Width="8" Height="8" Offset="0x8F60" /> - <Texture Name="gBombShopLadyFingersTex" OutName="bomb_shop_lady_fingers" Format="ci8" Width="16" Height="16" Offset="0x8FA0" /> - <Texture Name="gBombShopLadyBagTex" OutName="bomb_shop_lady_bag" Format="ci8" Width="16" Height="16" Offset="0x90A0" /> - <Texture Name="gBombShopLadySkirtTex" OutName="bomb_shop_lady_skirt" Format="ci8" Width="16" Height="16" Offset="0x91A0" /> + <Texture Name="gBombShopLadySkinTex" OutName="bomb_shop_lady_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyWrinklesTex" OutName="bomb_shop_lady_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x8720" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyHairSkinTex" OutName="bomb_shop_lady_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x8B20" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyNostrilTex" OutName="bomb_shop_lady_nostril" Format="ci8" Width="8" Height="8" Offset="0x8F20" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyEarTex" OutName="bomb_shop_lady_ear" Format="ci8" Width="8" Height="8" Offset="0x8F60" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyFingersTex" OutName="bomb_shop_lady_fingers" Format="ci8" Width="16" Height="16" Offset="0x8FA0" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyBagTex" OutName="bomb_shop_lady_bag" Format="ci8" Width="16" Height="16" Offset="0x90A0" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadySkirtTex" OutName="bomb_shop_lady_skirt" Format="ci8" Width="16" Height="16" Offset="0x91A0" TlutOffset="0x6B20"/> <Texture Name="gBombShopLadyEyeTex" OutName="bomb_shop_lady_eye" Format="rgba16" Width="32" Height="32" Offset="0x92A0" /> - <Texture Name="gBombShopLadyCheekTex" OutName="bomb_shop_lady_cheek" Format="ci8" Width="16" Height="16" Offset="0x9AA0" /> - <Texture Name="gBombShopLadyForeheadTex" OutName="bomb_shop_lady_forehead" Format="ci8" Width="32" Height="32" Offset="0x9BA0" /> - <Texture Name="gBombShopLadyShirtTex" OutName="bomb_shop_lady_shirt" Format="ci8" Width="16" Height="16" Offset="0x9FA0" /> + <Texture Name="gBombShopLadyCheekTex" OutName="bomb_shop_lady_cheek" Format="ci8" Width="16" Height="16" Offset="0x9AA0" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyForeheadTex" OutName="bomb_shop_lady_forehead" Format="ci8" Width="32" Height="32" Offset="0x9BA0" TlutOffset="0x6B20"/> + <Texture Name="gBombShopLadyShirtTex" OutName="bomb_shop_lady_shirt" Format="ci8" Width="16" Height="16" Offset="0x9FA0" TlutOffset="0x6B20"/> </File> </Root> diff --git a/assets/xml/objects/object_bee.xml b/assets/xml/objects/object_bee.xml index ab9699e84..3da9fe572 100644 --- a/assets/xml/objects/object_bee.xml +++ b/assets/xml/objects/object_bee.xml @@ -16,10 +16,10 @@ <Texture Name="gBeeHeadTLUT" OutName="bee_head_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAA8" /> <Texture Name="gBeeBodyTLUT" OutName="bee_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAC8" /> <Texture Name="gBeeAntennaeTLUT" OutName="bee_antennae_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAE8" /> - <Texture Name="gBeeWingTex" OutName="bee_wing" Format="ci4" Width="32" Height="32" Offset="0xB08" /> - <Texture Name="gBeeHeadTex" OutName="bee_head" Format="ci4" Width="32" Height="32" Offset="0xD08" /> - <Texture Name="gBeeBodyTex" OutName="bee_body" Format="ci4" Width="32" Height="32" Offset="0xF08" /> - <Texture Name="gBeeAntennaeTex" OutName="bee_antennae" Format="ci4" Width="32" Height="32" Offset="0x1108" /> + <Texture Name="gBeeWingTex" OutName="bee_wing" Format="ci4" Width="32" Height="32" Offset="0xB08" TlutOffset="0xA88"/> + <Texture Name="gBeeHeadTex" OutName="bee_head" Format="ci4" Width="32" Height="32" Offset="0xD08" TlutOffset="0xAA8"/> + <Texture Name="gBeeBodyTex" OutName="bee_body" Format="ci4" Width="32" Height="32" Offset="0xF08" TlutOffset="0xAC8"/> + <Texture Name="gBeeAntennaeTex" OutName="bee_antennae" Format="ci4" Width="32" Height="32" Offset="0x1108" TlutOffset="0xAE8"/> <!-- Bee Limbs --> <Limb Name="gBeeRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ROOT" Offset="0x1308" /> diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml index 9008fb381..bd12e989f 100644 --- a/assets/xml/objects/object_bg.xml +++ b/assets/xml/objects/object_bg.xml @@ -25,18 +25,18 @@ <!-- Treasure Chest Shop Gal Textures --> <Texture Name="gTreasureChestShopGalTLUT" OutName="treasure_cheat_shop_gal_tlut" Format="rgba16" Width="16" Height="16" Offset="0x68D8" /> - <Texture Name="gTreasureChestShopGalHairTex" OutName="treasure_cheat_shop_gal_hair" Format="ci8" Width="32" Height="32" Offset="0x6AD8" /> - <Texture Name="gTreasureChestShopGalHair2Tex" OutName="treasure_cheat_shop_gal_hair2" Format="ci8" Width="8" Height="16" Offset="0x6ED8" /> + <Texture Name="gTreasureChestShopGalHairTex" OutName="treasure_cheat_shop_gal_hair" Format="ci8" Width="32" Height="32" Offset="0x6AD8" TlutOffset="0x68D8"/> + <Texture Name="gTreasureChestShopGalHair2Tex" OutName="treasure_cheat_shop_gal_hair2" Format="ci8" Width="8" Height="16" Offset="0x6ED8" TlutOffset="0x68D8"/> <Texture Name="gTreasureChestShopGalEyeOpenUpTex" OutName="treasure_cheat_shop_gal_eye_open_up" Format="ci8" Width="32" Height="32" Offset="0x6F58" /> <Texture Name="gTreasureChestShopGalEyeHalfUpTex" OutName="treasure_cheat_shop_gal_eye_half_up" Format="ci8" Width="32" Height="32" Offset="0x7358" /> <Texture Name="gTreasureChestShopGalEyeClosedTex" OutName="treasure_cheat_shop_gal_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7758" /> <Texture Name="gTreasureChestShopGalEyeOpenDownTex" OutName="treasure_cheat_shop_gal_eye_open_down" Format="ci8" Width="32" Height="32" Offset="0x7B58" /> <Texture Name="gTreasureChestShopGalEyeHalfDownTex" OutName="treasure_cheat_shop_gal_eye_half_down" Format="ci8" Width="32" Height="32" Offset="0x7F58" /> - <Texture Name="gTreasureChestShopGalMouthTex" OutName="treasure_cheat_shop_gal_mouth" Format="ci8" Width="32" Height="32" Offset="0x8358" /> - <Texture Name="gTreasureChestShopGalEarAndBellyButtonTex" OutName="treasure_cheat_shop_gal_ear_and_belly_button" Format="ci8" Width="16" Height="16" Offset="0x8758" /> - <Texture Name="gTreasureChestShopGalSkinTex" OutName="treasure_cheat_shop_gal_skin" Format="ci8" Width="16" Height="16" Offset="0x8858" /> - <Texture Name="gTreasureChestShopGalClothesTex" OutName="treasure_cheat_shop_gal_clothes" Format="ci8" Width="32" Height="32" Offset="0x8958" /> - <Texture Name="gTreasureChestShopGalFingersTex" OutName="treasure_cheat_shop_gal_fingers" Format="ci8" Width="16" Height="16" Offset="0x8D58" /> + <Texture Name="gTreasureChestShopGalMouthTex" OutName="treasure_cheat_shop_gal_mouth" Format="ci8" Width="32" Height="32" Offset="0x8358" TlutOffset="0x68D8"/> + <Texture Name="gTreasureChestShopGalEarAndBellyButtonTex" OutName="treasure_cheat_shop_gal_ear_and_belly_button" Format="ci8" Width="16" Height="16" Offset="0x8758" TlutOffset="0x68D8"/> + <Texture Name="gTreasureChestShopGalSkinTex" OutName="treasure_cheat_shop_gal_skin" Format="ci8" Width="16" Height="16" Offset="0x8858" TlutOffset="0x68D8"/> + <Texture Name="gTreasureChestShopGalClothesTex" OutName="treasure_cheat_shop_gal_clothes" Format="ci8" Width="32" Height="32" Offset="0x8958" TlutOffset="0x68D8"/> + <Texture Name="gTreasureChestShopGalFingersTex" OutName="treasure_cheat_shop_gal_fingers" Format="ci8" Width="16" Height="16" Offset="0x8D58" TlutOffset="0x68D8"/> <!-- Treasure Chest Shop Gal Limbs --> <Limb Name="gTreasureChestShopGalRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_ROOT" Offset="0x8E58" /> @@ -96,13 +96,13 @@ <Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" /> <Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" /> <Texture Name="object_bg_Tex_0100F0" OutName="tex_0100F0" Format="ci8" Width="32" Height="32" Offset="0x100F0" /> - <Texture Name="object_bg_Tex_0104F0" OutName="tex_0104F0" Format="ci8" Width="16" Height="32" Offset="0x104F0" /> - <Texture Name="object_bg_Tex_0106F0" OutName="tex_0106F0" Format="ci8" Width="16" Height="16" Offset="0x106F0" /> - <Texture Name="object_bg_Tex_0107F0" OutName="tex_0107F0" Format="ci8" Width="64" Height="32" Offset="0x107F0" /> - <Texture Name="object_bg_Tex_010FF0" OutName="tex_010FF0" Format="ci8" Width="16" Height="16" Offset="0x10FF0" /> - <Texture Name="object_bg_Tex_0110F0" OutName="tex_0110F0" Format="ci8" Width="32" Height="32" Offset="0x110F0" /> - <Texture Name="object_bg_Tex_0114F0" OutName="tex_0114F0" Format="ci8" Width="16" Height="16" Offset="0x114F0" /> - <Texture Name="object_bg_Tex_0115F0" OutName="tex_0115F0" Format="ci8" Width="32" Height="32" Offset="0x115F0" /> + <Texture Name="object_bg_Tex_0104F0" OutName="tex_0104F0" Format="ci8" Width="16" Height="32" Offset="0x104F0" TlutOffset="0xF6F0"/> + <Texture Name="object_bg_Tex_0106F0" OutName="tex_0106F0" Format="ci8" Width="16" Height="16" Offset="0x106F0" TlutOffset="0xF6F0"/> + <Texture Name="object_bg_Tex_0107F0" OutName="tex_0107F0" Format="ci8" Width="64" Height="32" Offset="0x107F0" TlutOffset="0xF6F0"/> + <Texture Name="object_bg_Tex_010FF0" OutName="tex_010FF0" Format="ci8" Width="16" Height="16" Offset="0x10FF0" TlutOffset="0xF6F0"/> + <Texture Name="object_bg_Tex_0110F0" OutName="tex_0110F0" Format="ci8" Width="32" Height="32" Offset="0x110F0" TlutOffset="0xF6F0"/> + <Texture Name="object_bg_Tex_0114F0" OutName="tex_0114F0" Format="ci8" Width="16" Height="16" Offset="0x114F0" TlutOffset="0xF6F0"/> + <Texture Name="object_bg_Tex_0115F0" OutName="tex_0115F0" Format="ci8" Width="32" Height="32" Offset="0x115F0" TlutOffset="0xF6F0"/> <!-- Mayor's receptionist Limbs --> <Limb Name="object_bg_Standardlimb_0119F0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_01" Offset="0x119F0" /> diff --git a/assets/xml/objects/object_bigslime.xml b/assets/xml/objects/object_bigslime.xml index d238a306a..227c00ee9 100644 --- a/assets/xml/objects/object_bigslime.xml +++ b/assets/xml/objects/object_bigslime.xml @@ -57,13 +57,13 @@ <Texture Name="gGekkoEyeTex" OutName="gekko_eye" Format="rgba16" Width="16" Height="16" Offset="0xC6A8" /> <Texture Name="gGekkoSpots1Tex" OutName="gekko_spots_1" Format="rgba16" Width="16" Height="16" Offset="0xC8A8" /> <Texture Name="gGekkoBellyTex" OutName="gekko_belly" Format="rgba16" Width="16" Height="32" Offset="0xCAA8" /> - <Texture Name="gGekkoSpots2Tex" OutName="gekko_spots_2" Format="ci8" Width="16" Height="32" Offset="0xCEA8" /> + <Texture Name="gGekkoSpots2Tex" OutName="gekko_spots_2" Format="ci8" Width="16" Height="32" Offset="0xCEA8" TlutOffset="0xC028"/> <Texture Name="gGekkoToothTex" OutName="gekko_tooth" Format="rgba16" Width="16" Height="16" Offset="0xD0A8" /> <Texture Name="gGekkoMouthTex" OutName="gekko_mouth" Format="rgba16" Width="16" Height="8" Offset="0xD2A8" /> <Texture Name="gGekkoEyebrowTex" OutName="gekko_eyebrow" Format="rgba16" Width="8" Height="8" Offset="0xD3A8" /> <Texture Name="gGekkoFinTex" OutName="gekko_fin" Format="rgba16" Width="32" Height="16" Offset="0xD428" /> - <Texture Name="gGekkoSpots3Tex" OutName="gekko_spots_3" Format="ci8" Width="32" Height="32" Offset="0xD828" /> - <Texture Name="gGekkoSwirlTex" OutName="gekko_swirl" Format="ci8" Width="16" Height="32" Offset="0xDC28" /> + <Texture Name="gGekkoSpots3Tex" OutName="gekko_spots_3" Format="ci8" Width="32" Height="32" Offset="0xD828" TlutOffset="0xC228"/> + <Texture Name="gGekkoSwirlTex" OutName="gekko_swirl" Format="ci8" Width="16" Height="32" Offset="0xDC28" TlutOffset="0xC428"/> <Limb Name="gGekkoRootLimb" Type="Standard" EnumName="GEKKO_LIMB_ROOT" Offset="0xDE28" /> <Limb Name="gGekkoWaistLimb" Type="Standard" EnumName="GEKKO_LIMB_WAIST" Offset="0xDE34" /> diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml index 697ee565c..937687bbd 100644 --- a/assets/xml/objects/object_bji.xml +++ b/assets/xml/objects/object_bji.xml @@ -28,14 +28,14 @@ <Texture Name="object_bji_Tex_004130" OutName="tex_004130" Format="rgba16" Width="16" Height="16" Offset="0x4130" /> <Texture Name="object_bji_TLUT_004330" OutName="tlut_004330" Format="rgba16" Width="16" Height="16" Offset="0x4330" /> <Texture Name="object_bji_TLUT_004530" OutName="tlut_004530" Format="rgba16" Width="16" Height="16" Offset="0x4530" /> - <Texture Name="object_bji_Tex_004730" OutName="tex_004730" Format="ci8" Width="8" Height="8" Offset="0x4730" /> - <Texture Name="object_bji_Tex_004770" OutName="tex_004770" Format="ci8" Width="16" Height="16" Offset="0x4770" /> - <Texture Name="object_bji_Tex_004870" OutName="tex_004870" Format="ci8" Width="8" Height="8" Offset="0x4870" /> - <Texture Name="object_bji_Tex_0048B0" OutName="tex_0048B0" Format="ci8" Width="16" Height="16" Offset="0x48B0" /> - <Texture Name="object_bji_Tex_0049B0" OutName="tex_0049B0" Format="ci8" Width="8" Height="8" Offset="0x49B0" /> + <Texture Name="object_bji_Tex_004730" OutName="tex_004730" Format="ci8" Width="8" Height="8" Offset="0x4730" TlutOffset="0x3730"/> + <Texture Name="object_bji_Tex_004770" OutName="tex_004770" Format="ci8" Width="16" Height="16" Offset="0x4770" TlutOffset="0x3930"/> + <Texture Name="object_bji_Tex_004870" OutName="tex_004870" Format="ci8" Width="8" Height="8" Offset="0x4870" TlutOffset="0x3B30"/> + <Texture Name="object_bji_Tex_0048B0" OutName="tex_0048B0" Format="ci8" Width="16" Height="16" Offset="0x48B0" TlutOffset="0x3D30"/> + <Texture Name="object_bji_Tex_0049B0" OutName="tex_0049B0" Format="ci8" Width="8" Height="8" Offset="0x49B0" TlutOffset="0x3F30"/> <Texture Name="object_bji_Tex_0049F0" OutName="tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" /> - <Texture Name="object_bji_Tex_004DF0" OutName="tex_004DF0" Format="ci8" Width="8" Height="8" Offset="0x4DF0" /> - <Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" /> + <Texture Name="object_bji_Tex_004DF0" OutName="tex_004DF0" Format="ci8" Width="8" Height="8" Offset="0x4DF0" TlutOffset="0x4330"/> + <Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" TlutOffset="0x4530"/> <Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" /> <Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" /> diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml index 2eb08a1ef..f5882302f 100644 --- a/assets/xml/objects/object_boj.xml +++ b/assets/xml/objects/object_boj.xml @@ -16,16 +16,16 @@ <Animation Name="object_boj_Anim_005CE4" Offset="0x5CE4" /> <!-- Original name is "Boj_juggling" --> <Animation Name="object_boj_Anim_005D9C" Offset="0x5D9C" /> <!-- Original name is "Boj_matsu" ("to wait") --> <Texture Name="object_boj_TLUT_005DB0" OutName="tlut_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5DB0" /> - <Texture Name="object_boj_Tex_005FB0" OutName="tex_005FB0" Format="ci8" Width="8" Height="16" Offset="0x5FB0" /> - <Texture Name="object_boj_Tex_006030" OutName="tex_006030" Format="ci8" Width="8" Height="8" Offset="0x6030" /> - <Texture Name="object_boj_Tex_006070" OutName="tex_006070" Format="ci8" Width="32" Height="16" Offset="0x6070" /> - <Texture Name="object_boj_Tex_006270" OutName="tex_006270" Format="ci8" Width="8" Height="8" Offset="0x6270" /> + <Texture Name="object_boj_Tex_005FB0" OutName="tex_005FB0" Format="ci8" Width="8" Height="16" Offset="0x5FB0" TlutOffset="0x5DB0"/> + <Texture Name="object_boj_Tex_006030" OutName="tex_006030" Format="ci8" Width="8" Height="8" Offset="0x6030" TlutOffset="0x5DB0"/> + <Texture Name="object_boj_Tex_006070" OutName="tex_006070" Format="ci8" Width="32" Height="16" Offset="0x6070" TlutOffset="0x5DB0"/> + <Texture Name="object_boj_Tex_006270" OutName="tex_006270" Format="ci8" Width="8" Height="8" Offset="0x6270" TlutOffset="0x5DB0"/> <Texture Name="object_boj_Tex_0062B0" OutName="tex_0062B0" Format="ci8" Width="16" Height="16" Offset="0x62B0" /> <Texture Name="object_boj_Tex_0063B0" OutName="tex_0063B0" Format="ci8" Width="16" Height="16" Offset="0x63B0" /> <Texture Name="object_boj_Tex_0064B0" OutName="tex_0064B0" Format="ci8" Width="16" Height="16" Offset="0x64B0" /> - <Texture Name="object_boj_Tex_0065B0" OutName="tex_0065B0" Format="ci8" Width="8" Height="8" Offset="0x65B0" /> + <Texture Name="object_boj_Tex_0065B0" OutName="tex_0065B0" Format="ci8" Width="8" Height="8" Offset="0x65B0" TlutOffset="0x5DB0"/> <Texture Name="object_boj_Tex_0065F0" OutName="tex_0065F0" Format="i8" Width="16" Height="16" Offset="0x65F0" /> - <Texture Name="object_boj_Tex_0066F0" OutName="tex_0066F0" Format="ci8" Width="8" Height="8" Offset="0x66F0" /> + <Texture Name="object_boj_Tex_0066F0" OutName="tex_0066F0" Format="ci8" Width="8" Height="8" Offset="0x66F0" TlutOffset="0x5DB0"/> <Texture Name="object_boj_Tex_006730" OutName="tex_006730" Format="i8" Width="8" Height="8" Offset="0x6730" /> <DList Name="object_boj_DL_0083A0" Offset="0x83A0" /> <DList Name="object_boj_DL_008778" Offset="0x8778" /> @@ -43,13 +43,13 @@ <DList Name="object_boj_DL_009558" Offset="0x9558" /> <DList Name="object_boj_DL_009660" Offset="0x9660" /> <!-- <Blob Name="object_boj_Blob_009848" Size="0x1F8" Offset="0x9848" /> --> - <Texture Name="object_boj_Tex_009A40" OutName="tex_009A40" Format="ci8" Width="8" Height="8" Offset="0x9A40" /> - <Texture Name="object_boj_Tex_009A80" OutName="tex_009A80" Format="ci8" Width="16" Height="16" Offset="0x9A80" /> - <Texture Name="object_boj_Tex_009B80" OutName="tex_009B80" Format="ci8" Width="16" Height="16" Offset="0x9B80" /> - <Texture Name="object_boj_Tex_009C80" OutName="tex_009C80" Format="ci8" Width="8" Height="16" Offset="0x9C80" /> - <Texture Name="object_boj_Tex_009D00" OutName="tex_009D00" Format="ci8" Width="16" Height="16" Offset="0x9D00" /> - <Texture Name="object_boj_Tex_009E00" OutName="tex_009E00" Format="ci8" Width="16" Height="16" Offset="0x9E00" /> - <Texture Name="object_boj_Tex_009F00" OutName="tex_009F00" Format="ci8" Width="16" Height="16" Offset="0x9F00" /> + <Texture Name="object_boj_Tex_009A40" OutName="tex_009A40" Format="ci8" Width="8" Height="8" Offset="0x9A40" TlutOffset="0x9848"/> + <Texture Name="object_boj_Tex_009A80" OutName="tex_009A80" Format="ci8" Width="16" Height="16" Offset="0x9A80" TlutOffset="0x9848"/> + <Texture Name="object_boj_Tex_009B80" OutName="tex_009B80" Format="ci8" Width="16" Height="16" Offset="0x9B80" TlutOffset="0x9848"/> + <Texture Name="object_boj_Tex_009C80" OutName="tex_009C80" Format="ci8" Width="8" Height="16" Offset="0x9C80" TlutOffset="0x9848"/> + <Texture Name="object_boj_Tex_009D00" OutName="tex_009D00" Format="ci8" Width="16" Height="16" Offset="0x9D00" TlutOffset="0x9848"/> + <Texture Name="object_boj_Tex_009E00" OutName="tex_009E00" Format="ci8" Width="16" Height="16" Offset="0x9E00" TlutOffset="0x9848"/> + <Texture Name="object_boj_Tex_009F00" OutName="tex_009F00" Format="ci8" Width="16" Height="16" Offset="0x9F00" TlutOffset="0x9848"/> <DList Name="object_boj_DL_00AF90" Offset="0xAF90" /> <DList Name="object_boj_DL_00B1D8" Offset="0xB1D8" /> <!-- object_ginko_limb15_dlist --> <DList Name="object_boj_DL_00B3E8" Offset="0xB3E8" /> @@ -89,6 +89,6 @@ <Animation Name="object_boj_Anim_012E84" Offset="0x12E84" /> <!-- Original name is "scm_yarare" ("to suffer damage") --> <DList Name="gBombShopBagDL" Offset="0x13380" /> <!-- Original name is "seb_model" --> <Texture Name="gBombShopBagTLUT" OutName="bomb_shop_bag_tlut" Format="rgba16" Width="16" Height="16" Offset="0x134C0" /> - <Texture Name="gBombShopBagTex" OutName="bomb_shop_bag" Format="ci8" Width="16" Height="16" Offset="0x136C0" /> + <Texture Name="gBombShopBagTex" OutName="bomb_shop_bag" Format="ci8" Width="16" Height="16" Offset="0x136C0" TlutOffset="0x134C0"/> </File> </Root> diff --git a/assets/xml/objects/object_bombiwa.xml b/assets/xml/objects/object_bombiwa.xml index 903d5bd40..b45351831 100644 --- a/assets/xml/objects/object_bombiwa.xml +++ b/assets/xml/objects/object_bombiwa.xml @@ -1,7 +1,7 @@ <Root> <File Name="object_bombiwa" Segment="6"> <Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" /> - <Texture Name="object_bombiwa_Tex_000020" OutName="tex_000020" Format="ci4" Width="64" Height="64" Offset="0x20" /> + <Texture Name="object_bombiwa_Tex_000020" OutName="tex_000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/> <DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0" /> <!-- Original name is "obj_18b_stone_model" --> <DList Name="object_bombiwa_DL_000AF0" Offset="0xAF0" /> <Texture Name="object_bombiwa_Tex_000C00" OutName="tex_000C00" Format="i4" Width="64" Height="64" Offset="0xC00" /> diff --git a/assets/xml/objects/object_boss01.xml b/assets/xml/objects/object_boss01.xml index ff37d2bc9..9e3440595 100644 --- a/assets/xml/objects/object_boss01.xml +++ b/assets/xml/objects/object_boss01.xml @@ -45,14 +45,14 @@ <Texture Name="gOdolwaEarBangleAndShieldTLUT" OutName="odolwa_ear_bangle_and_shield_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86D8" /> <Texture Name="gOdolwaClothTLUT" OutName="odolwa_cloth_tlut" Format="rgba16" Width="4" Height="4" Offset="0x86F8" /> <Texture Name="gOdolwaTorsoTLUT" OutName="odolwa_torso_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8718" /> - <Texture Name="gOdolwaPantsAndSwordHiltTex" OutName="odolwa_pants_and_sword_hilt" Format="ci4" Width="64" Height="64" Offset="0x8738" /> - <Texture Name="gOdolwaFaceAndShoeTex" OutName="odolwa_face_and_shoe" Format="ci4" Width="64" Height="64" Offset="0x8F38" /> - <Texture Name="gOdolwaSkinTex" OutName="odolwa_skin" Format="ci4" Width="64" Height="64" Offset="0x9738" /> - <Texture Name="gOdolwaEarBangleAndShieldTex" OutName="odolwa_ear_bangle_and_shield" Format="ci4" Width="64" Height="64" Offset="0x9F38" /> + <Texture Name="gOdolwaPantsAndSwordHiltTex" OutName="odolwa_pants_and_sword_hilt" Format="ci4" Width="64" Height="64" Offset="0x8738" TlutOffset="0x8678"/> + <Texture Name="gOdolwaFaceAndShoeTex" OutName="odolwa_face_and_shoe" Format="ci4" Width="64" Height="64" Offset="0x8F38" TlutOffset="0x8698"/> + <Texture Name="gOdolwaSkinTex" OutName="odolwa_skin" Format="ci4" Width="64" Height="64" Offset="0x9738" TlutOffset="0x86B8"/> + <Texture Name="gOdolwaEarBangleAndShieldTex" OutName="odolwa_ear_bangle_and_shield" Format="ci4" Width="64" Height="64" Offset="0x9F38" TlutOffset="0x86D8"/> <Texture Name="gOdolwaEarringTex" OutName="odolwa_earring" Format="rgba16" Width="16" Height="16" Offset="0xA738" /> <Texture Name="gOdolwaPlumeTex" OutName="odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0xA938" /> - <Texture Name="gOdolwaClothTex" OutName="odolwa_cloth" Format="ci4" Width="64" Height="64" Offset="0xAB38" /> - <Texture Name="gOdolwaTorsoTex" OutName="odolwa_torso" Format="ci4" Width="64" Height="64" Offset="0xB338" /> + <Texture Name="gOdolwaClothTex" OutName="odolwa_cloth" Format="ci4" Width="64" Height="64" Offset="0xAB38" TlutOffset="0x86F8"/> + <Texture Name="gOdolwaTorsoTex" OutName="odolwa_torso" Format="ci4" Width="64" Height="64" Offset="0xB338" TlutOffset="0x8718"/> <Texture Name="gOdolwaSwordBladeTex" OutName="odolwa_sword_blade" Format="rgba16" Width="16" Height="16" Offset="0xBB38" /> <!-- Assets for the trail that follows Odolwa's sword when he slashes --> @@ -82,7 +82,7 @@ <!-- Assets for the blocks that fall from the ceiling during the Odolwa fight --> <DList Name="gOdolwaFallingBlockDL" Offset="0xE3E8" /> <!-- Original name is "iwa01_model" ("rock; boulder") --> <Texture Name="gOdolwaFallingBlockTLUT" OutName="odolwa_falling_block_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE558" /> - <Texture Name="gOdolwaFallingBlockTex" OutName="odolwa_falling_block" Format="ci4" Width="64" Height="64" Offset="0xE578" /> + <Texture Name="gOdolwaFallingBlockTex" OutName="odolwa_falling_block" Format="ci4" Width="64" Height="64" Offset="0xE578" TlutOffset="0xE558"/> <!-- Odolwa Limbs --> <Limb Name="gOdolwaRootLimb" Type="Standard" EnumName="ODOLWA_LIMB_ROOT" Offset="0xED78" /> @@ -193,7 +193,7 @@ <!-- Odolwa Bug Textures --> <Texture Name="gOdolwaBugUndersideTLUT" OutName="odolwa_bug_underside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x21700" /> - <Texture Name="gOdolwaBugUndersideTex" OutName="odolwa_bug_underside" Format="ci4" Width="16" Height="32" Offset="0x21720" /> + <Texture Name="gOdolwaBugUndersideTex" OutName="odolwa_bug_underside" Format="ci4" Width="16" Height="32" Offset="0x21720" TlutOffset="0x21700"/> <Texture Name="gOdolwaBugBodyTex" OutName="odolwa_bug_body" Format="rgba16" Width="32" Height="32" Offset="0x21820" /> <Texture Name="gOdolwaBugLegTex" OutName="odolwa_bug_leg" Format="rgba16" Width="8" Height="8" Offset="0x22020" /> diff --git a/assets/xml/objects/object_boss02.xml b/assets/xml/objects/object_boss02.xml index c4987796d..bf06a9e84 100644 --- a/assets/xml/objects/object_boss02.xml +++ b/assets/xml/objects/object_boss02.xml @@ -14,11 +14,11 @@ <Texture Name="gTwinmoldSpikeAndMandibleTLUT" OutName="twinmold_spike_and_mandible_tlut" Format="rgba16" Width="4" Height="4" Offset="0x380" /> <Texture Name="gTwinmoldRedSkinTex" OutName="twinmold_red_skin" Format="ci4" Width="64" Height="64" Offset="0x3A0" TlutOffset="0x300" /> <Texture Name="gTwinmoldEyeTex" OutName="twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0xBA0" /> - <Texture Name="gTwinmoldSnoutTex" OutName="twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13A0" /> - <Texture Name="gTwinmoldVeinsTex" OutName="twinmold_veins" Format="ci4" Width="64" Height="64" Offset="0x1BA0" /> + <Texture Name="gTwinmoldSnoutTex" OutName="twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13A0" TlutOffset="0x320"/> + <Texture Name="gTwinmoldVeinsTex" OutName="twinmold_veins" Format="ci4" Width="64" Height="64" Offset="0x1BA0" TlutOffset="0x340"/> <Texture Name="gTwinmoldTeethTex" OutName="twinmold_teeth" Format="rgba16" Width="16" Height="32" Offset="0x23A0" /> - <Texture Name="gTwinmoldUndersideTex" OutName="twinmold_underside" Format="ci4" Width="64" Height="64" Offset="0x27A0" /> - <Texture Name="gTwinmoldSpikeAndMandibleTex" OutName="twinmold_spike_and_mandible" Format="ci4" Width="64" Height="64" Offset="0x2FA0" /> + <Texture Name="gTwinmoldUndersideTex" OutName="twinmold_underside" Format="ci4" Width="64" Height="64" Offset="0x27A0" TlutOffset="0x360"/> + <Texture Name="gTwinmoldSpikeAndMandibleTex" OutName="twinmold_spike_and_mandible" Format="ci4" Width="64" Height="64" Offset="0x2FA0" TlutOffset="0x380"/> <Texture Name="gTwinmoldAntennaTex" OutName="twinmold_antenna" Format="rgba16" Width="16" Height="16" Offset="0x37A0" /> <Texture Name="gTwinmoldTailGemTex" OutName="twinmold_tail_gem" Format="rgba16" Width="32" Height="32" Offset="0x39A0" /> <Texture Name="gTwinmoldBlueSkinTex" OutName="twinmold_blue_skin" Format="ci4" Width="64" Height="64" Offset="0x41A0" TlutOffset="0x300"/> @@ -41,11 +41,11 @@ <!-- DisplayLists and Textures for the destructible props in Twinmold's arena --> <DList Name="gTwinmoldRuinPyramidDL" Offset="0x6FD0" /> <Texture Name="gTwinmoldRuinPyramidTLUT" OutName="ruin_pyramid_tlut" Format="rgba16" Width="4" Height="4" Offset="0x7158" /> - <Texture Name="gTwinmoldRuinPyramidTex" OutName="ruin_pyramid" Format="ci4" Width="64" Height="64" Offset="0x7178" /> + <Texture Name="gTwinmoldRuinPyramidTex" OutName="ruin_pyramid" Format="ci4" Width="64" Height="64" Offset="0x7178" TlutOffset="0x7158"/> <DList Name="gRuinFragmentDL" Offset="0x7A88" /> <DList Name="gTwinmoldRuinPillarDL" Offset="0x7D18" /> <Texture Name="gTwinmoldRuinPillarTLUT" OutName="ruin_pillar_tlut" Format="rgba16" Width="4" Height="4" Offset="0x7E30" /> - <Texture Name="gTwinmoldRuinPillarTex" OutName="ruin_pillar" Format="ci4" Width="64" Height="64" Offset="0x7E50" /> + <Texture Name="gTwinmoldRuinPillarTex" OutName="ruin_pillar" Format="ci4" Width="64" Height="64" Offset="0x7E50" TlutOffset="0x7E30"/> <!-- Twinmold Title Card --> <Texture Name="gTwinmoldTitleCardTex" OutName="twinmold_title_card" Format="ia8" Width="128" Height="40" Offset="0x8650" /> diff --git a/assets/xml/objects/object_boss03.xml b/assets/xml/objects/object_boss03.xml index e1dab018d..60849f442 100644 --- a/assets/xml/objects/object_boss03.xml +++ b/assets/xml/objects/object_boss03.xml @@ -35,10 +35,10 @@ <Texture Name="gGyorgMouthAndSpikeBacksideTLUT" OutName="gyorg_mouth_and_spike_backside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53D0" /> <Texture Name="gGyorgBellyAndFinFleshTLUT" OutName="gyorg_belly_and_fin_flesh_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53F0" /> <Texture Name="gGyorgEyeTex" OutName="gyorg_eye" Format="rgba16" Width="32" Height="32" Offset="0x5410" /> - <Texture Name="gGyorgFinsSpikesAndJawTex" OutName="gyorg_fins_spikes_and_jaw" Format="ci4" Width="64" Height="64" Offset="0x5C10" /> - <Texture Name="gGyorgSidesTex" OutName="gyorg_sides" Format="ci4" Width="64" Height="64" Offset="0x6410" /> - <Texture Name="gGyorgMouthAndSpikeBacksideTex" OutName="gyorg_mouth_and_spike_backside" Format="ci4" Width="64" Height="64" Offset="0x6C10" /> - <Texture Name="gGyorgBellyAndFinFleshTex" OutName="gyorg_belly_and_fin_flesh" Format="ci4" Width="64" Height="64" Offset="0x7410" /> + <Texture Name="gGyorgFinsSpikesAndJawTex" OutName="gyorg_fins_spikes_and_jaw" Format="ci4" Width="64" Height="64" Offset="0x5C10" TlutOffset="0x5390"/> + <Texture Name="gGyorgSidesTex" OutName="gyorg_sides" Format="ci4" Width="64" Height="64" Offset="0x6410" TlutOffset="0x53B0"/> + <Texture Name="gGyorgMouthAndSpikeBacksideTex" OutName="gyorg_mouth_and_spike_backside" Format="ci4" Width="64" Height="64" Offset="0x6C10" TlutOffset="0x53D0"/> + <Texture Name="gGyorgBellyAndFinFleshTex" OutName="gyorg_belly_and_fin_flesh" Format="ci4" Width="64" Height="64" Offset="0x7410" TlutOffset="0x53F0"/> <Texture Name="gGyorgHornsTeethAndClawsTex" OutName="gyorg_horns_teeth_claws" Format="rgba16" Width="16" Height="16" Offset="0x7C10" /> <!-- Bubble DisplayLists (texture comes from gameplay_keep) --> @@ -88,8 +88,8 @@ <!-- Seaweed Textures --> <Texture Name="gGyorgSeaweedTopTLUT" OutName="gyorg_seaweed_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAC0" /> <Texture Name="gGyorgSeaweedTLUT" OutName="gyord_seaweed_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAE0" /> - <Texture Name="gGyorgSeaweedTopTex" OutName="gyorg_seaweed_top" Format="ci4" Width="64" Height="64" Offset="0xAB00" /> - <Texture Name="gGyorgSeaweedTex" OutName="gyorg_seaweed" Format="ci4" Width="64" Height="64" Offset="0xB300" /> + <Texture Name="gGyorgSeaweedTopTex" OutName="gyorg_seaweed_top" Format="ci4" Width="64" Height="64" Offset="0xAB00" TlutOffset="0xAAC0"/> + <Texture Name="gGyorgSeaweedTex" OutName="gyorg_seaweed" Format="ci4" Width="64" Height="64" Offset="0xB300" TlutOffset="0xAAE0"/> <!-- Unused Empty Texture Animation --> <TextureAnimation Name="gGyorgEmpty2TexAnim" Offset="0xBB00" /> @@ -104,7 +104,7 @@ <!-- Unused Duplicate of Small Fish Textures --> <Texture Name="gUnusedGyorgSmallFishTLUT" OutName="unused_small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xC230" /> - <Texture Name="gUnusedGyorgSmallFishTex" OutName="unused_small_fish" Format="ci4" Width="64" Height="64" Offset="0xC250" /> + <Texture Name="gUnusedGyorgSmallFishTex" OutName="unused_small_fish" Format="ci4" Width="64" Height="64" Offset="0xC250" TlutOffset="0xC230"/> <!-- Small Fishes Limb DisplayLists --> <DList Name="gGyorgSmallFishHeadDL" Offset="0xCCC0" /> @@ -116,7 +116,7 @@ <!-- Small Fishes Textures --> <Texture Name="gGyorgSmallFishTLUT" OutName="small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD170" /> - <Texture Name="gGyorgSmallFishTex" OutName="small_fish" Format="ci4" Width="64" Height="64" Offset="0xD190" /> + <Texture Name="gGyorgSmallFishTex" OutName="small_fish" Format="ci4" Width="64" Height="64" Offset="0xD190" TlutOffset="0xD170"/> <!-- Small Fishes Limbs --> <Limb Name="gGyorgSmallFishRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_ROOT" Offset="0xD990" /> diff --git a/assets/xml/objects/object_boss04.xml b/assets/xml/objects/object_boss04.xml index d98083a64..987d3c8b7 100644 --- a/assets/xml/objects/object_boss04.xml +++ b/assets/xml/objects/object_boss04.xml @@ -13,8 +13,8 @@ <!-- Wart Textures --> <Texture Name="gWartShellTLUT" OutName="wart_shell_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2328" /> <Texture Name="gWartRidgesTLUT" OutName="wart_ridges_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2348" /> - <Texture Name="gWartShellTex" OutName="wart_shell" Format="ci4" Width="64" Height="64" Offset="0x2368" /> - <Texture Name="gWartRidgesTex" OutName="wart_ridges" Format="ci4" Width="8" Height="16" Offset="0x2B68" /> + <Texture Name="gWartShellTex" OutName="wart_shell" Format="ci4" Width="64" Height="64" Offset="0x2368" TlutOffset="0x2328"/> + <Texture Name="gWartRidgesTex" OutName="wart_ridges" Format="ci4" Width="8" Height="16" Offset="0x2B68" TlutOffset="0x2348"/> <Texture Name="gWartEyeTex" OutName="wart_eye" Format="rgba16" Width="32" Height="32" Offset="0x2BA8" /> <!-- Unused DisplayList that can be used to make Bubbles opaque --> diff --git a/assets/xml/objects/object_boss07.xml b/assets/xml/objects/object_boss07.xml index 7c5d702c8..fee4e1675 100644 --- a/assets/xml/objects/object_boss07.xml +++ b/assets/xml/objects/object_boss07.xml @@ -99,23 +99,23 @@ <Texture Name="gBossMaskOdolwaFaceTLUT" OutName="boss_mask_odolwa_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0xCFB0" /> <Texture Name="gBossMaskOdolwaEarTLUT" OutName="boss_mask_odolwa_ear_tlut" Format="rgba16" Width="4" Height="4" Offset="0xCFD0" /> <Texture Name="gBossMaskOdolwaPlumeTex" OutName="boss_mask_odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0xCFF0" /> - <Texture Name="gBossMaskOdolwaFaceTex" OutName="boss_mask_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0xD1F0" /> - <Texture Name="gBossMaskOdolwaEarTex" OutName="boss_mask_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0xD9F0" /> + <Texture Name="gBossMaskOdolwaFaceTex" OutName="boss_mask_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0xD1F0" TlutOffset="0xCFB0"/> + <Texture Name="gBossMaskOdolwaEarTex" OutName="boss_mask_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0xD9F0" TlutOffset="0xCFD0"/> <Texture Name="gBossMaskGyorgSkinTLUT" OutName="boss_mask_gyorg_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE1F0" /> <Texture Name="gBossMaskGyorgMouthTLUT" OutName="boss_mask_gyorg_mouth_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE210" /> <Texture Name="gBossMaskGyorgToothHornTLUT" OutName="boss_mask_gyorg_tooth_horn_tlut" Format="rgba16" Width="4" Height="4" Offset="0xE230" /> <Texture Name="gBossMaskGyorgTwinmoldEyeTex" OutName="boss_mask_gyorg_twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0xE250" /> - <Texture Name="gBossMaskGyorgSkinTex" OutName="boss_mask_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0xEA50" /> - <Texture Name="gBossMaskGyorgMouthTex" OutName="boss_mask_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0xF250" /> - <Texture Name="gBossMaskGyorgToothHornTex" OutName="boss_mask_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xFA50" /> + <Texture Name="gBossMaskGyorgSkinTex" OutName="boss_mask_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0xEA50" TlutOffset="0xE1F0"/> + <Texture Name="gBossMaskGyorgMouthTex" OutName="boss_mask_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0xF250" TlutOffset="0xE210"/> + <Texture Name="gBossMaskGyorgToothHornTex" OutName="boss_mask_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xFA50" TlutOffset="0xE230"/> <Texture Name="gBossMaskGohtEyeTex" OutName="boss_mask_goht_eye" Format="rgba16" Width="32" Height="64" Offset="0xFAD0" /> <Texture Name="gBossMaskGohtTopPatternTex" OutName="boss_mask_goht_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0x10AD0" /> <Texture Name="gBossMaskGohtTwinmoldPatternTex" OutName="boss_mask_goht_twinmold_pattern" Format="rgba16" Width="32" Height="64" Offset="0x11AD0" /> <!-- Used for the lower part of Goht's mask and for the mouth of Twinmold's mask --> <Texture Name="gBossMaskGohtSpikeTwinmoldMandibleTex" OutName="boss_mask_goht_spike_twinmold_mandible" Format="rgba16" Width="32" Height="32" Offset="0x12AD0" /> <Texture Name="gBossMaskTwinmoldSkinTLUT" OutName="boss_mask_twinmold_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x132D0" /> <Texture Name="gBossMaskTwinmoldSnoutTLUT" OutName="boss_mask_twinmold_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x132F0" /> - <Texture Name="gBossMaskTwinmoldSkinTex" OutName="boss_mask_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0x13310" /> - <Texture Name="gBossMaskTwinmoldSnoutTex" OutName="boss_mask_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13B10" /> + <Texture Name="gBossMaskTwinmoldSkinTex" OutName="boss_mask_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0x13310" TlutOffset="0x132D0"/> + <Texture Name="gBossMaskTwinmoldSnoutTex" OutName="boss_mask_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0x13B10" TlutOffset="0x132F0"/> <!-- Boss Mask DisplayLists --> <DList Name="gBossMaskOdolwaDL" Offset="0x149A0" /> diff --git a/assets/xml/objects/object_bsmask.xml b/assets/xml/objects/object_bsmask.xml index 92e8148e9..d219137f4 100644 --- a/assets/xml/objects/object_bsmask.xml +++ b/assets/xml/objects/object_bsmask.xml @@ -19,18 +19,18 @@ <!-- Boss Remains Textures --> <Texture Name="gRemainsOdolwaPlumeTex" OutName="remains_odolwa_plume" Format="rgba16" Width="16" Height="16" Offset="0x5910" /> - <Texture Name="gRemainsOdolwaFaceTex" OutName="remains_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0x5B10" /> - <Texture Name="gRemainsOdolwaEarTex" OutName="remains_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0x6310" /> + <Texture Name="gRemainsOdolwaFaceTex" OutName="remains_odolwa_face" Format="ci4" Width="64" Height="64" Offset="0x5B10" TlutOffset="0x5830"/> + <Texture Name="gRemainsOdolwaEarTex" OutName="remains_odolwa_ear" Format="ci4" Width="64" Height="64" Offset="0x6310" TlutOffset="0x5850"/> <Texture Name="gRemainsGyorgTwinmoldEyeTex" OutName="remains_gyorg_twinmold_eye" Format="rgba16" Width="32" Height="32" Offset="0x6B10" /> - <Texture Name="gRemainsGyorgSkinTex" OutName="remains_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0x7310" /> - <Texture Name="gRemainsGyorgMouthTex" OutName="remains_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0x7B10" /> - <Texture Name="gRemainsGyorgToothHornTex" OutName="remains_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0x8310" /> + <Texture Name="gRemainsGyorgSkinTex" OutName="remains_gyorg_skin" Format="ci4" Width="64" Height="64" Offset="0x7310" TlutOffset="0x5870"/> + <Texture Name="gRemainsGyorgMouthTex" OutName="remains_gyorg_mouth" Format="ci4" Width="64" Height="64" Offset="0x7B10" TlutOffset="0x5890"/> + <Texture Name="gRemainsGyorgToothHornTex" OutName="remains_gyorg_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0x8310" TlutOffset="0x58B0"/> <Texture Name="gRemainsGohtEyeTex" OutName="remains_goht_eye" Format="rgba16" Width="32" Height="64" Offset="0x8390" /> <Texture Name="gRemainsGohtTopPatternTex" OutName="remains_goht_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0x9390" /> <!-- Used for the lower part of Goht's Remains for the mouth of Twinmold's Remains --> <Texture Name="gRemainsGohtTwinmoldPatternTex" OutName="remains_goht_twinmold_pattern" Format="rgba16" Width="32" Height="64" Offset="0xA390" /> <Texture Name="gRemainsGohtSpikeTwinmoldMandibleTex" OutName="remains_goht_spike_twinmold_mandible" Format="rgba16" Width="32" Height="32" Offset="0xB390" /> - <Texture Name="gRemainsTwinmoldSkinTex" OutName="remains_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0xBB90" /> - <Texture Name="gRemainsTwinmoldSnoutTex" OutName="remains_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0xC390" /> + <Texture Name="gRemainsTwinmoldSkinTex" OutName="remains_twinmold_skin" Format="ci4" Width="64" Height="64" Offset="0xBB90" TlutOffset="0x58D0"/> + <Texture Name="gRemainsTwinmoldSnoutTex" OutName="remains_twinmold_snout" Format="ci4" Width="64" Height="64" Offset="0xC390" TlutOffset="0x58F0"/> </File> </Root> diff --git a/assets/xml/objects/object_cha.xml b/assets/xml/objects/object_cha.xml index 79b008353..6b6af9765 100644 --- a/assets/xml/objects/object_cha.xml +++ b/assets/xml/objects/object_cha.xml @@ -3,10 +3,10 @@ <DList Name="object_cha_DL_000710" Offset="0x710" /> <!-- Original name is "cha_ki_model" --> <DList Name="object_cha_DL_000958" Offset="0x958" /> <!-- Original name is "cha_kane_model" --> <Texture Name="object_cha_TLUT_000B08" OutName="tlut_000B08" Format="rgba16" Width="16" Height="16" Offset="0xB08" /> - <Texture Name="object_cha_Tex_000D08" OutName="tex_000D08" Format="ci8" Width="32" Height="32" Offset="0xD08" /> - <Texture Name="object_cha_Tex_001108" OutName="tex_001108" Format="ci8" Width="32" Height="32" Offset="0x1108" /> - <Texture Name="object_cha_Tex_001508" OutName="tex_001508" Format="ci8" Width="16" Height="16" Offset="0x1508" /> - <Texture Name="object_cha_Tex_001608" OutName="tex_001608" Format="ci8" Width="32" Height="32" Offset="0x1608" /> + <Texture Name="object_cha_Tex_000D08" OutName="tex_000D08" Format="ci8" Width="32" Height="32" Offset="0xD08" TlutOffset="0xB08"/> + <Texture Name="object_cha_Tex_001108" OutName="tex_001108" Format="ci8" Width="32" Height="32" Offset="0x1108" TlutOffset="0xB08"/> + <Texture Name="object_cha_Tex_001508" OutName="tex_001508" Format="ci8" Width="16" Height="16" Offset="0x1508" TlutOffset="0xB08"/> + <Texture Name="object_cha_Tex_001608" OutName="tex_001608" Format="ci8" Width="32" Height="32" Offset="0x1608" TlutOffset="0xB08"/> <Texture Name="object_cha_Tex_001A08" OutName="tex_001A08" Format="rgba16" Width="16" Height="32" Offset="0x1A08" /> </File> </Root> diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml index 24753a6ab..e7eb49f5e 100644 --- a/assets/xml/objects/object_cne.xml +++ b/assets/xml/objects/object_cne.xml @@ -22,13 +22,13 @@ <!-- 32-bit aligned textures. --> <Texture Name="gHylianYoungWomanTLUT" OutName="hylian_young_woman_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/> - <Texture Name="gHylianYoungWomanSkinTex" OutName="hylian_young_woman_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC"/> - <Texture Name="gHylianYoungWomanBrownHairTex" OutName="hylian_young_woman_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C"/> - <Texture Name="gHylianYoungWomanHandTex" OutName="hylian_young_woman_hand" Format="ci8" Width="8" Height="8" Offset="0x37C"/> - <Texture Name="gHylianYoungWomanBrownHairSkinTex" OutName="hylian_young_woman_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC"/> - <Texture Name="gHylianYoungWomanBrownHairFaceTex" OutName="hylian_young_woman_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC"/> + <Texture Name="gHylianYoungWomanSkinTex" OutName="hylian_young_woman_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC" TlutOffset="0xFC"/> + <Texture Name="gHylianYoungWomanBrownHairTex" OutName="hylian_young_woman_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C" TlutOffset="0xFC"/> + <Texture Name="gHylianYoungWomanHandTex" OutName="hylian_young_woman_hand" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/> + <Texture Name="gHylianYoungWomanBrownHairSkinTex" OutName="hylian_young_woman_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC" TlutOffset="0xFC"/> + <Texture Name="gHylianYoungWomanBrownHairFaceTex" OutName="hylian_young_woman_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC" TlutOffset="0xFC"/> <Texture Name="gHylianYoungWomanDressTex" OutName="hylian_young_woman_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/> - <Texture Name="gHylianYoungWomanDressNeckTex" OutName="hylian_young_woman_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC"/> + <Texture Name="gHylianYoungWomanDressNeckTex" OutName="hylian_young_woman_dress_neck" Format="ci8" Width="8" Height="8" Offset="0x4BC" TlutOffset="0xFC"/> <DList Name="gHylianYoungWomanHeadBrownHairDL" Offset="0x1300"/> <DList Name="gHylianYoungWomanRightHandDL" Offset="0x1608"/> diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml index 6895d6217..2d7648814 100644 --- a/assets/xml/objects/object_cow.xml +++ b/assets/xml/objects/object_cow.xml @@ -14,13 +14,13 @@ <Texture Name="gCowTLUT" OutName="cow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2880" /> <!-- Cow Textures --> - <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" /> - <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" /> - <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" /> + <Texture Name="gCowUdderTex" OutName="cow_udder" Format="ci8" Width="16" Height="16" Offset="0x2A80" TlutOffset="0x2880"/> + <Texture Name="gCowNoseRingTex" OutName="cow_nose_ring" Format="ci8" Width="8" Height="8" Offset="0x2B80" TlutOffset="0x2880"/> + <Texture Name="gCowNoseTex" OutName="cow_nose" Format="ci8" Width="16" Height="16" Offset="0x2BC0" TlutOffset="0x2880"/> <Texture Name="gCowSpotsTex" OutName="cow_spots" Format="i8" Width="64" Height="64" Offset="0x2CC0" /> - <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" /> + <Texture Name="gCowEarTex" OutName="cow_ear" Format="ci8" Width="8" Height="16" Offset="0x3CC0" TlutOffset="0x2880"/> <Texture Name="gCowEyelidTex" OutName="cow_eyelid" Format="rgba16" Width="16" Height="16" Offset="0x3D40" /> - <Texture Name="gCowLegAndTailTex" OutName="cow_leg_and_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" /> + <Texture Name="gCowLegAndTailTex" OutName="cow_leg_and_tail" Format="ci8" Width="8" Height="16" Offset="0x3F40" TlutOffset="0x2880"/> <!-- Cow Limb DisplayLists --> <Limb Name="gCowBodyLimb" Type="Standard" EnumName="COW_LIMB_BODY" Offset="0x3FC0" /> diff --git a/assets/xml/objects/object_crace_object.xml b/assets/xml/objects/object_crace_object.xml index 63dd9913d..3de55ae99 100644 --- a/assets/xml/objects/object_crace_object.xml +++ b/assets/xml/objects/object_crace_object.xml @@ -3,7 +3,7 @@ <File Name="object_crace_object" Segment="6"> <DList Name="gDekuShrineSlidingDoorDL" Offset="0x3A0" /> <!-- Original name is "Y2_DANPEI_shutter_model" --> <Texture Name="gDekuShrineSlidingDoorTLUT" OutName="deku_shrine_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x540" /> - <Texture Name="gDekuShrineSlidingDoorTex" OutName="deku_shrine_sliding_door" Format="ci4" Width="32" Height="128" Offset="0x560" /> + <Texture Name="gDekuShrineSlidingDoorTex" OutName="deku_shrine_sliding_door" Format="ci4" Width="32" Height="128" Offset="0x560" TlutOffset="0x540"/> <Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" /> <!-- Original name is "Y2_DANPEI_shutter_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml index 393a3b587..ddbd3854d 100644 --- a/assets/xml/objects/object_cs.xml +++ b/assets/xml/objects/object_cs.xml @@ -42,20 +42,20 @@ <Texture Name="object_cs_TLUT_00B020" OutName="tlut_00B020" Format="rgba16" Width="16" Height="16" Offset="0xB020" /> <Texture Name="object_cs_TLUT_00B220" OutName="tlut_00B220" Format="rgba16" Width="16" Height="16" Offset="0xB220" /> <Texture Name="object_cs_TLUT_00B420" OutName="tlut_00B420" Format="rgba16" Width="16" Height="16" Offset="0xB420" /> - <Texture Name="object_cs_Tex_00B620" OutName="tex_00B620" Format="ci8" Width="32" Height="16" Offset="0xB620" /> - <Texture Name="object_cs_Tex_00B820" OutName="tex_00B820" Format="ci8" Width="8" Height="8" Offset="0xB820" /> - <Texture Name="object_cs_Tex_00B860" OutName="tex_00B860" Format="ci8" Width="8" Height="8" Offset="0xB860" /> - <Texture Name="object_cs_Tex_00B8A0" OutName="tex_00B8A0" Format="ci8" Width="16" Height="16" Offset="0xB8A0" /> - <Texture Name="object_cs_Tex_00B9A0" OutName="tex_00B9A0" Format="ci8" Width="8" Height="8" Offset="0xB9A0" /> - <Texture Name="object_cs_Tex_00B9E0" OutName="tex_00B9E0" Format="ci8" Width="16" Height="16" Offset="0xB9E0" /> - <Texture Name="object_cs_Tex_00BAE0" OutName="tex_00BAE0" Format="ci8" Width="16" Height="16" Offset="0xBAE0" /> + <Texture Name="object_cs_Tex_00B620" OutName="tex_00B620" Format="ci8" Width="32" Height="16" Offset="0xB620" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00B820" OutName="tex_00B820" Format="ci8" Width="8" Height="8" Offset="0xB820" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00B860" OutName="tex_00B860" Format="ci8" Width="8" Height="8" Offset="0xB860" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00B8A0" OutName="tex_00B8A0" Format="ci8" Width="16" Height="16" Offset="0xB8A0" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00B9A0" OutName="tex_00B9A0" Format="ci8" Width="8" Height="8" Offset="0xB9A0" TlutOffset="0xB220"/> + <Texture Name="object_cs_Tex_00B9E0" OutName="tex_00B9E0" Format="ci8" Width="16" Height="16" Offset="0xB9E0" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00BAE0" OutName="tex_00BAE0" Format="ci8" Width="16" Height="16" Offset="0xBAE0" TlutOffset="0xB020"/> <Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" /> - <Texture Name="object_cs_Tex_00BFE0" OutName="tex_00BFE0" Format="ci8" Width="8" Height="8" Offset="0xBFE0" /> - <Texture Name="object_cs_Tex_00C020" OutName="tex_00C020" Format="ci8" Width="8" Height="8" Offset="0xC020" /> - <Texture Name="object_cs_Tex_00C060" OutName="tex_00C060" Format="ci8" Width="8" Height="8" Offset="0xC060" /> - <Texture Name="object_cs_Tex_00C0A0" OutName="tex_00C0A0" Format="ci8" Width="8" Height="16" Offset="0xC0A0" /> + <Texture Name="object_cs_Tex_00BFE0" OutName="tex_00BFE0" Format="ci8" Width="8" Height="8" Offset="0xBFE0" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00C020" OutName="tex_00C020" Format="ci8" Width="8" Height="8" Offset="0xC020" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00C060" OutName="tex_00C060" Format="ci8" Width="8" Height="8" Offset="0xC060" TlutOffset="0xB020"/> + <Texture Name="object_cs_Tex_00C0A0" OutName="tex_00C0A0" Format="ci8" Width="8" Height="16" Offset="0xC0A0" TlutOffset="0xB020"/> <Texture Name="object_cs_Tex_00C120" OutName="tex_00C120" Format="i8" Width="16" Height="16" Offset="0xC120" /> - <Texture Name="object_cs_Tex_00C220" OutName="tex_00C220" Format="ci8" Width="16" Height="16" Offset="0xC220" /> + <Texture Name="object_cs_Tex_00C220" OutName="tex_00C220" Format="ci8" Width="16" Height="16" Offset="0xC220" TlutOffset="0xB420"/> <Blob Name="object_cs_Blob_00C320" Size="0x200" Offset="0xC320" /> <Texture Name="gBomberEyeOpenTex" OutName="tex_00C520" Format="rgba16" Width="32" Height="32" Offset="0xC520" /> <Texture Name="gBomberEyeHalfTex" OutName="tex_00CD20" Format="rgba16" Width="32" Height="32" Offset="0xCD20" /> diff --git a/assets/xml/objects/object_ctower_rot.xml b/assets/xml/objects/object_ctower_rot.xml index 044443c98..b5c43be88 100644 --- a/assets/xml/objects/object_ctower_rot.xml +++ b/assets/xml/objects/object_ctower_rot.xml @@ -11,27 +11,27 @@ <!-- Textures --> <!-- CeilingCog --> - <Texture Name="gClockTowerCeilingCogWoodTex" OutName="clocktower_ceiling_cog_wood" Format="ci4" Width="64" Height="64" Offset="0x460" /> - <Texture Name="gClockTowerCeilingCogWoodMetalTex" OutName="clocktower_ceiling_cog_wood_metal" Format="ci4" Width="64" Height="64" Offset="0xC60" /> + <Texture Name="gClockTowerCeilingCogWoodTex" OutName="clocktower_ceiling_cog_wood" Format="ci4" Width="64" Height="64" Offset="0x460" TlutOffset="0x0"/> + <Texture Name="gClockTowerCeilingCogWoodMetalTex" OutName="clocktower_ceiling_cog_wood_metal" Format="ci4" Width="64" Height="64" Offset="0xC60" TlutOffset="0x20"/> <!-- Corridor --> - <Texture Name="gClockTowerCorridorStonePath1Tex" OutName="clocktower_corridor_stone_path_1" Format="ci8" Width="32" Height="32" Offset="0x1460" /> - <Texture Name="gClockTowerCorridorStonePath2Tex" OutName="clocktower_corridor_stone_path_2" Format="ci8" Width="32" Height="32" Offset="0x1860" /> - <Texture Name="gClockTowerCorridorStoneWallTex" OutName="clocktower_corridor_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x1C60" /> - <Texture Name="gClockTowerCorridorGrassyStoneWallTex" OutName="clocktower_corridor_grassy_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x2460" /> - <Texture Name="gClockTowerCorridorStonePillarTex" OutName="clocktower_corridor_stone_pillar" Format="ci8" Width="32" Height="64" Offset="0x2C60" /> - <Texture Name="gClockTowerCorridorStoneCeilingTex" OutName="clocktower_corridor_stone_ceiling" Format="ci8" Width="32" Height="64" Offset="0x3460" /> - <Texture Name="gClockTowerCorridorDirtPathTex" OutName="clocktower_corridor_dirt_path" Format="ci8" Width="32" Height="32" Offset="0x3C60" /> + <Texture Name="gClockTowerCorridorStonePath1Tex" OutName="clocktower_corridor_stone_path_1" Format="ci8" Width="32" Height="32" Offset="0x1460" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorStonePath2Tex" OutName="clocktower_corridor_stone_path_2" Format="ci8" Width="32" Height="32" Offset="0x1860" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorStoneWallTex" OutName="clocktower_corridor_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x1C60" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorGrassyStoneWallTex" OutName="clocktower_corridor_grassy_stone_wall" Format="ci8" Width="32" Height="64" Offset="0x2460" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorStonePillarTex" OutName="clocktower_corridor_stone_pillar" Format="ci8" Width="32" Height="64" Offset="0x2C60" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorStoneCeilingTex" OutName="clocktower_corridor_stone_ceiling" Format="ci8" Width="32" Height="64" Offset="0x3460" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorDirtPathTex" OutName="clocktower_corridor_dirt_path" Format="ci8" Width="32" Height="32" Offset="0x3C60" TlutOffset="0x40"/> <Texture Name="gClockTowerCooridorFoliageTex" OutName="clocktower_corridor_foliage" Format="rgba16" Width="32" Height="64" Offset="0x4060" /> - <Texture Name="gClockTowerCorridorWoodPillarTex" OutName="clocktower_corridor_wood_pillar" Format="ci8" Width="16" Height="64" Offset="0x5060" /> - <Texture Name="gClockTowerCorridorWoodWallTex" OutName="clocktower_corridor_wood_wall" Format="ci8" Width="64" Height="32" Offset="0x5460" /> - <Texture Name="gClockTowerCorridorGrassyCeilingTex" OutName="clocktower_corridor_grassy_ceiling" Format="ci8" Width="8" Height="64" Offset="0x5C60" /> - <Texture Name="gClockTowerCorridorDirtTex" OutName="clocktower_corridor_dirt" Format="ci8" Width="32" Height="32" Offset="0x5E60" /> + <Texture Name="gClockTowerCorridorWoodPillarTex" OutName="clocktower_corridor_wood_pillar" Format="ci8" Width="16" Height="64" Offset="0x5060" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorWoodWallTex" OutName="clocktower_corridor_wood_wall" Format="ci8" Width="64" Height="32" Offset="0x5460" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorGrassyCeilingTex" OutName="clocktower_corridor_grassy_ceiling" Format="ci8" Width="8" Height="64" Offset="0x5C60" TlutOffset="0x40"/> + <Texture Name="gClockTowerCorridorDirtTex" OutName="clocktower_corridor_dirt" Format="ci8" Width="32" Height="32" Offset="0x5E60" TlutOffset="0x40"/> <!-- Organ --> - <Texture Name="gClockTowerOrganBackTex" OutName="clocktower_organ_back" Format="ci8" Width="16" Height="128" Offset="0x6260" /> + <Texture Name="gClockTowerOrganBackTex" OutName="clocktower_organ_back" Format="ci8" Width="16" Height="128" Offset="0x6260" TlutOffset="0x240"/> <Texture Name="gClockTowerOrganSeatLegsTex" OutName="clocktower_organ_seat_legs" Format="ia16" Width="32" Height="32" Offset="0x6A60" /> - <Texture Name="gClockTowerOrganSeatCushionTex" OutName="clocktower_organ_seat_cushion" Format="ci8" Width="16" Height="16" Offset="0x7260" /> + <Texture Name="gClockTowerOrganSeatCushionTex" OutName="clocktower_organ_seat_cushion" Format="ci8" Width="16" Height="16" Offset="0x7260" TlutOffset="0x240"/> <Texture Name="gClockTowerOrganSeatBackTex" OutName="clocktower_organ_seat_back" Format="ia16" Width="32" Height="64" Offset="0x7360" /> <Texture Name="gClockTowerOrganPedalTex" OutName="clocktower_organ_pedal" Format="ia16" Width="16" Height="16" Offset="0x8360" /> <Texture Name="gClockTowerOrganWoodTex" OutName="clocktower_organ_wood" Format="i8" Width="32" Height="32" Offset="0x8560" /> @@ -47,7 +47,7 @@ <Texture Name="gClockTowerCenterCogTex" OutName="clocktower_center_cog" Format="ia8" Width="64" Height="64" Offset="0xCD60" /> <!-- StoneDoors --> - <Texture Name="gClockTowerStoneDoorTex" OutName="clocktower_stone_door" Format="ci4" Width="64" Height="64" Offset="0xDD60" /> + <Texture Name="gClockTowerStoneDoorTex" OutName="clocktower_stone_door" Format="ci4" Width="64" Height="64" Offset="0xDD60" TlutOffset="0x440"/> <!-- Waterwheel --> <Texture Name="gClockTowerWaterWheelWoodTex" OutName="clocktower_water_wheel_wood" Format="rgba16" Width="32" Height="32" Offset="0xE560" /> diff --git a/assets/xml/objects/object_dai.xml b/assets/xml/objects/object_dai.xml index 927e3f1e1..14ddfa5d2 100644 --- a/assets/xml/objects/object_dai.xml +++ b/assets/xml/objects/object_dai.xml @@ -22,11 +22,11 @@ <DList Name="object_dai_DL_0089D8" Offset="0x89D8" /> <DList Name="object_dai_DL_008B00" Offset="0x8B00" /> <Texture Name="object_dai_TLUT_008C58" OutName="tlut_008C58" Format="rgba16" Width="16" Height="16" Offset="0x8C58" /> - <Texture Name="object_dai_Tex_008E58" OutName="tex_008E58" Format="ci8" Width="32" Height="32" Offset="0x8E58" /> - <Texture Name="object_dai_Tex_009258" OutName="tex_009258" Format="ci8" Width="8" Height="8" Offset="0x9258" /> - <Texture Name="object_dai_Tex_009298" OutName="tex_009298" Format="ci8" Width="32" Height="16" Offset="0x9298" /> + <Texture Name="object_dai_Tex_008E58" OutName="tex_008E58" Format="ci8" Width="32" Height="32" Offset="0x8E58" TlutOffset="0x8C58"/> + <Texture Name="object_dai_Tex_009258" OutName="tex_009258" Format="ci8" Width="8" Height="8" Offset="0x9258" TlutOffset="0x8C58"/> + <Texture Name="object_dai_Tex_009298" OutName="tex_009298" Format="ci8" Width="32" Height="16" Offset="0x9298" TlutOffset="0x8C58"/> <Texture Name="object_dai_Tex_009498" OutName="tex_009498" Format="rgba16" Width="16" Height="16" Offset="0x9498" /> - <Texture Name="object_dai_Tex_009698" OutName="tex_009698" Format="ci8" Width="8" Height="8" Offset="0x9698" /> + <Texture Name="object_dai_Tex_009698" OutName="tex_009698" Format="ci8" Width="8" Height="8" Offset="0x9698" TlutOffset="0x8C58"/> <DList Name="object_dai_DL_00C538" Offset="0xC538" /> <DList Name="object_dai_DL_00C5D8" Offset="0xC5D8" /> <DList Name="object_dai_DL_00C9B8" Offset="0xC9B8" /> @@ -45,15 +45,15 @@ <DList Name="object_dai_DL_00E560" Offset="0xE560" /> <DList Name="object_dai_DL_00E698" Offset="0xE698" /> <Texture Name="object_dai_TLUT_00E8F0" OutName="tlut_00E8F0" Format="rgba16" Width="16" Height="16" Offset="0xE8F0" /> - <Texture Name="object_dai_Tex_00EAF0" OutName="tex_00EAF0" Format="ci8" Width="16" Height="16" Offset="0xEAF0" /> - <Texture Name="object_dai_Tex_00EBF0" OutName="tex_00EBF0" Format="ci8" Width="16" Height="16" Offset="0xEBF0" /> - <Texture Name="object_dai_Tex_00ECF0" OutName="tex_00ECF0" Format="ci8" Width="32" Height="32" Offset="0xECF0" /> - <Texture Name="object_dai_Tex_00F0F0" OutName="tex_00F0F0" Format="ci8" Width="32" Height="16" Offset="0xF0F0" /> - <Texture Name="object_dai_Tex_00F2F0" OutName="tex_00F2F0" Format="ci8" Width="32" Height="32" Offset="0xF2F0" /> - <Texture Name="object_dai_Tex_00F6F0" OutName="tex_00F6F0" Format="ci8" Width="8" Height="8" Offset="0xF6F0" /> - <Texture Name="object_dai_Tex_00F730" OutName="tex_00F730" Format="ci8" Width="8" Height="16" Offset="0xF730" /> - <Texture Name="object_dai_Tex_00F7B0" OutName="tex_00F7B0" Format="ci8" Width="32" Height="64" Offset="0xF7B0" /> - <Texture Name="object_dai_Tex_00FFB0" OutName="tex_00FFB0" Format="ci8" Width="16" Height="16" Offset="0xFFB0" /> + <Texture Name="object_dai_Tex_00EAF0" OutName="tex_00EAF0" Format="ci8" Width="16" Height="16" Offset="0xEAF0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00EBF0" OutName="tex_00EBF0" Format="ci8" Width="16" Height="16" Offset="0xEBF0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00ECF0" OutName="tex_00ECF0" Format="ci8" Width="32" Height="32" Offset="0xECF0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00F0F0" OutName="tex_00F0F0" Format="ci8" Width="32" Height="16" Offset="0xF0F0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00F2F0" OutName="tex_00F2F0" Format="ci8" Width="32" Height="32" Offset="0xF2F0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00F6F0" OutName="tex_00F6F0" Format="ci8" Width="8" Height="8" Offset="0xF6F0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00F730" OutName="tex_00F730" Format="ci8" Width="8" Height="16" Offset="0xF730" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00F7B0" OutName="tex_00F7B0" Format="ci8" Width="32" Height="64" Offset="0xF7B0" TlutOffset="0xE8F0"/> + <Texture Name="object_dai_Tex_00FFB0" OutName="tex_00FFB0" Format="ci8" Width="16" Height="16" Offset="0xFFB0" TlutOffset="0xE8F0"/> <Texture Name="object_dai_Tex_0100B0" OutName="tex_0100B0" Format="rgba16" Width="8" Height="8" Offset="0x100B0" /> <Texture Name="object_dai_Tex_010130" OutName="tex_010130" Format="rgba16" Width="16" Height="16" Offset="0x10130" /> <Texture Name="object_dai_Tex_010330" OutName="tex_010330" Format="rgba16" Width="8" Height="8" Offset="0x10330" /> diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml index 0152a6e7d..9cd299cea 100644 --- a/assets/xml/objects/object_daiku.xml +++ b/assets/xml/objects/object_daiku.xml @@ -7,18 +7,18 @@ <Animation Name="object_daiku_Anim_002134" Offset="0x2134" /> <!-- Original name is "dk2_kowasu2wait" --> <Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" /> <!-- Original name is "dk2_matsu" ("to wait") --> <Texture Name="object_daiku_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="16" Height="16" Offset="0x2FB0" /> - <Texture Name="object_daiku_Tex_0031B0" OutName="tex_0031B0" Format="ci8" Width="8" Height="8" Offset="0x31B0" /> - <Texture Name="object_daiku_Tex_0031F0" OutName="tex_0031F0" Format="ci8" Width="16" Height="16" Offset="0x31F0" /> + <Texture Name="object_daiku_Tex_0031B0" OutName="tex_0031B0" Format="ci8" Width="8" Height="8" Offset="0x31B0" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_0031F0" OutName="tex_0031F0" Format="ci8" Width="16" Height="16" Offset="0x31F0" TlutOffset="0x2FB0"/> <Texture Name="object_daiku_Tex_0032F0" OutName="tex_0032F0" Format="rgba16" Width="4" Height="4" Offset="0x32F0" /> - <Texture Name="object_daiku_Tex_003310" OutName="tex_003310" Format="ci8" Width="8" Height="16" Offset="0x3310" /> - <Texture Name="object_daiku_Tex_003390" OutName="tex_003390" Format="ci8" Width="8" Height="8" Offset="0x3390" /> - <Texture Name="object_daiku_Tex_0033D0" OutName="tex_0033D0" Format="ci8" Width="16" Height="16" Offset="0x33D0" /> - <Texture Name="object_daiku_Tex_0034D0" OutName="tex_0034D0" Format="ci8" Width="8" Height="8" Offset="0x34D0" /> + <Texture Name="object_daiku_Tex_003310" OutName="tex_003310" Format="ci8" Width="8" Height="16" Offset="0x3310" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_003390" OutName="tex_003390" Format="ci8" Width="8" Height="8" Offset="0x3390" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_0033D0" OutName="tex_0033D0" Format="ci8" Width="16" Height="16" Offset="0x33D0" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_0034D0" OutName="tex_0034D0" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x2FB0"/> <Texture Name="object_daiku_Tex_003510" OutName="tex_003510" Format="rgba16" Width="32" Height="32" Offset="0x3510" /> - <Texture Name="object_daiku_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" /> - <Texture Name="object_daiku_Tex_003E10" OutName="tex_003E10" Format="ci8" Width="8" Height="8" Offset="0x3E10" /> - <Texture Name="object_daiku_Tex_003E50" OutName="tex_003E50" Format="ci8" Width="8" Height="8" Offset="0x3E50" /> - <Texture Name="object_daiku_Tex_003E90" OutName="tex_003E90" Format="ci8" Width="8" Height="8" Offset="0x3E90" /> + <Texture Name="object_daiku_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_003E10" OutName="tex_003E10" Format="ci8" Width="8" Height="8" Offset="0x3E10" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_003E50" OutName="tex_003E50" Format="ci8" Width="8" Height="8" Offset="0x3E50" TlutOffset="0x2FB0"/> + <Texture Name="object_daiku_Tex_003E90" OutName="tex_003E90" Format="ci8" Width="8" Height="8" Offset="0x3E90" TlutOffset="0x2FB0"/> <DList Name="object_daiku_DL_006980" Offset="0x6980" /> <DList Name="object_daiku_DL_006D70" Offset="0x6D70" /> <DList Name="object_daiku_DL_006E80" Offset="0x6E80" /> @@ -41,14 +41,14 @@ <DList Name="object_daiku_DL_008C30" Offset="0x8C30" /> <DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" /> <!-- Original name is "dk2_hashira_model" --> <Texture Name="object_daiku_TLUT_008FA8" OutName="tlut_008FA8" Format="rgba16" Width="16" Height="16" Offset="0x8FA8" /> - <Texture Name="object_daiku_Tex_0091A8" OutName="tex_0091A8" Format="ci8" Width="16" Height="16" Offset="0x91A8" /> + <Texture Name="object_daiku_Tex_0091A8" OutName="tex_0091A8" Format="ci8" Width="16" Height="16" Offset="0x91A8" TlutOffset="0x8FA8"/> <DList Name="object_daiku_DL_009638" Offset="0x9638" /> <!-- Original name is "dk2_2_turuhashi_model" --> <Texture Name="object_daiku_TLUT_0097B0" OutName="tlut_0097B0" Format="rgba16" Width="16" Height="16" Offset="0x97B0" /> <Texture Name="object_daiku_Tex_0099B0" OutName="tex_0099B0" Format="i8" Width="32" Height="32" Offset="0x99B0" /> - <Texture Name="object_daiku_Tex_009DB0" OutName="tex_009DB0" Format="ci8" Width="16" Height="16" Offset="0x9DB0" /> + <Texture Name="object_daiku_Tex_009DB0" OutName="tex_009DB0" Format="ci8" Width="16" Height="16" Offset="0x9DB0" TlutOffset="0x97B0"/> <DList Name="object_daiku_DL_00A390" Offset="0xA390" /> <Texture Name="object_daiku_TLUT_00A4D0" OutName="tlut_00A4D0" Format="rgba16" Width="16" Height="16" Offset="0xA4D0" /> - <Texture Name="object_daiku_Tex_00A6D0" OutName="tex_00A6D0" Format="ci8" Width="8" Height="16" Offset="0xA6D0" /> + <Texture Name="object_daiku_Tex_00A6D0" OutName="tex_00A6D0" Format="ci8" Width="8" Height="16" Offset="0xA6D0" TlutOffset="0xA4D0"/> <Limb Name="object_daiku_Standardlimb_00A750" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_01" Offset="0xA750" /> <Limb Name="object_daiku_Standardlimb_00A75C" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_02" Offset="0xA75C" /> <Limb Name="object_daiku_Standardlimb_00A768" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_03" Offset="0xA768" /> diff --git a/assets/xml/objects/object_danpei_object.xml b/assets/xml/objects/object_danpei_object.xml index 8e86f2f79..2f8211441 100644 --- a/assets/xml/objects/object_danpei_object.xml +++ b/assets/xml/objects/object_danpei_object.xml @@ -2,14 +2,14 @@ <File Name="object_danpei_object" Segment="6"> <DList Name="object_danpei_object_DL_000300" Offset="0x300" /> <Texture Name="object_danpei_object_TLUT_000438" OutName="tlut_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" /> - <Texture Name="object_danpei_object_Tex_000458" OutName="tex_000458" Format="ci4" Width="64" Height="64" Offset="0x458" /> + <Texture Name="object_danpei_object_Tex_000458" OutName="tex_000458" Format="ci4" Width="64" Height="64" Offset="0x458" TlutOffset="0x438"/> <Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" /> <!-- Original name is "y2_kanokefuta_bgdatainfo" --> <DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" /> <!-- Original name is "Y2_DP2_RASENsita_model" ("rasen" = "spiral", "sita" = "below") --> <DList Name="object_danpei_object_DL_002110" Offset="0x2110" /> <!-- Original name is "Y2_DP2_RASENue_model" ("ue" = "above") --> <Texture Name="object_danpei_object_TLUT_002B10" OutName="tlut_002B10" Format="rgba16" Width="16" Height="16" Offset="0x2B10" /> - <Texture Name="object_danpei_object_Tex_002D10" OutName="tex_002D10" Format="ci8" Width="32" Height="64" Offset="0x2D10" /> - <Texture Name="object_danpei_object_Tex_003510" OutName="tex_003510" Format="ci8" Width="32" Height="32" Offset="0x3510" /> - <Texture Name="object_danpei_object_Tex_003910" OutName="tex_003910" Format="ci8" Width="32" Height="32" Offset="0x3910" /> - <Texture Name="object_danpei_object_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" /> + <Texture Name="object_danpei_object_Tex_002D10" OutName="tex_002D10" Format="ci8" Width="32" Height="64" Offset="0x2D10" TlutOffset="0x2B10"/> + <Texture Name="object_danpei_object_Tex_003510" OutName="tex_003510" Format="ci8" Width="32" Height="32" Offset="0x3510" TlutOffset="0x2B10"/> + <Texture Name="object_danpei_object_Tex_003910" OutName="tex_003910" Format="ci8" Width="32" Height="32" Offset="0x3910" TlutOffset="0x2B10"/> + <Texture Name="object_danpei_object_Tex_003D10" OutName="tex_003D10" Format="ci8" Width="16" Height="16" Offset="0x3D10" TlutOffset="0x2B10"/> </File> </Root> diff --git a/assets/xml/objects/object_dblue_object.xml b/assets/xml/objects/object_dblue_object.xml index 63d28bd33..c7cd812bb 100644 --- a/assets/xml/objects/object_dblue_object.xml +++ b/assets/xml/objects/object_dblue_object.xml @@ -126,13 +126,13 @@ <Texture Name="gGreatBayTempleObjectGearTex" OutName="great_bay_temple_object_gear" Format="rgba16" Width="16" Height="32" Offset="0xFDD0" /> <Texture Name="gGreatBayTempleObjectPaddleTex" OutName="great_bay_temple_object_paddle" Format="rgba16" Width="32" Height="64" Offset="0x101D0" /> <Texture Name="gGreatBayTempleObjectSwitchKnobTex" OutName="great_bay_temple_object_switch_knob" Format="rgba16" Width="32" Height="32" Offset="0x111D0" /> - <Texture Name="gGreatBayTempleObjectOneWaySwitchTex" OutName="great_bay_temple_object_one_way_switch" Format="ci4" Width="8" Height="16" Offset="0x119D0" /> + <Texture Name="gGreatBayTempleObjectOneWaySwitchTex" OutName="great_bay_temple_object_one_way_switch" Format="ci4" Width="8" Height="16" Offset="0x119D0" TlutOffset="0xD410"/> <Texture Name="gGreatBayTempleObjectSwitchSideTex" OutName="great_bay_temple_object_switch_side" Format="rgba16" Width="32" Height="32" Offset="0x11A10" /> <Texture Name="gGreatBayTempleObjectUnusedGearTex" OutName="great_bay_temple_object_unused_gear" Format="ci4" Width="48" Height="36" Offset="0x12210" TlutOffset="0xD530" /> <Texture Name="gGreatBayTempleObjectUnusedDarkMetalTex" OutName="great_bay_temple_object_unused_dark_metal" Format="ci4" Width="32" Height="32" Offset="0x12570" TlutOffset="0xD630" /> <Texture Name="gGreatBayTempleObjectUnusedShaftTex" OutName="great_bay_temple_object_unused_shaft" Format="rgba16" Width="32" Height="64" Offset="0x12770" /> <Texture Name="gGreatBayTempleObjectUnusedPaddleTex" OutName="great_bay_temple_object_unused_paddle" Format="ci4" Width="32" Height="128" Offset="0x13770" TlutOffset="0xD670" /> - <Texture Name="gGreatBayTempleObjectLargeSeesawPlatformTex" OutName="great_bay_temple_object_large_seesaw_platform" Format="ci4" Width="64" Height="64" Offset="0x13F70" /> + <Texture Name="gGreatBayTempleObjectLargeSeesawPlatformTex" OutName="great_bay_temple_object_large_seesaw_platform" Format="ci4" Width="64" Height="64" Offset="0x13F70" TlutOffset="0xD850"/> <Texture Name="gGreatBayTempleObjectHorizontalWaterFoamTex" OutName="great_bay_temple_object_horizontal_water_foam" Format="rgba16" Width="32" Height="32" Offset="0x14770" /> <Texture Name="gGreatBayTempleObjectIceTex" OutName="great_bay_temple_object_ice" Format="rgba16" Width="32" Height="32" Offset="0x14F70" /> <Texture Name="gGreatBayTempleObjectIceStalactiteRimMaskTex" OutName="great_bay_temple_object_ice_stalactite_rim_mask" Format="ia8" Width="32" Height="64" Offset="0x15770" /> diff --git a/assets/xml/objects/object_dhouse.xml b/assets/xml/objects/object_dhouse.xml index a5894a4df..2788d1e75 100644 --- a/assets/xml/objects/object_dhouse.xml +++ b/assets/xml/objects/object_dhouse.xml @@ -2,10 +2,10 @@ <File Name="object_dhouse" Segment="6"> <Texture Name="object_dhouse_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" /> <Texture Name="object_dhouse_TLUT_000020" OutName="tlut_000020" Format="rgba16" Width="4" Height="4" Offset="0x20" /> - <Texture Name="object_dhouse_Tex_000040" OutName="tex_000040" Format="ci4" Width="64" Height="64" Offset="0x40" /> + <Texture Name="object_dhouse_Tex_000040" OutName="tex_000040" Format="ci4" Width="64" Height="64" Offset="0x40" TlutOffset="0x0"/> <Texture Name="object_dhouse_Tex_000840" OutName="tex_000840" Format="rgba16" Width="32" Height="32" Offset="0x840" /> <Texture Name="object_dhouse_Tex_001040" OutName="tex_001040" Format="rgba16" Width="64" Height="32" Offset="0x1040" /> - <Texture Name="object_dhouse_Tex_002040" OutName="tex_002040" Format="ci4" Width="64" Height="64" Offset="0x2040" /> + <Texture Name="object_dhouse_Tex_002040" OutName="tex_002040" Format="ci4" Width="64" Height="64" Offset="0x2040" TlutOffset="0x20"/> <Texture Name="object_dhouse_Tex_002840" OutName="tex_002840" Format="rgba16" Width="32" Height="32" Offset="0x2840" /> <Texture Name="object_dhouse_Tex_003040" OutName="tex_003040" Format="i4" Width="64" Height="64" Offset="0x3040" /> <DList Name="object_dhouse_DL_004920" Offset="0x4920" /> diff --git a/assets/xml/objects/object_dinofos.xml b/assets/xml/objects/object_dinofos.xml index c3c575b0f..4660cc8e8 100644 --- a/assets/xml/objects/object_dinofos.xml +++ b/assets/xml/objects/object_dinofos.xml @@ -32,7 +32,7 @@ <DList Name="gDinolfosLeftClawsDL" Offset="0x8058" /> <Texture Name="gDinolfosTLUT" OutName="dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x81B0" /> - <Texture Name="gDinolfosSkinTex" OutName="dinolfos_skin" Format="ci8" Width="16" Height="16" Offset="0x83B0" /> + <Texture Name="gDinolfosSkinTex" OutName="dinolfos_skin" Format="ci8" Width="16" Height="16" Offset="0x83B0" TlutOffset="0x81B0"/> <Texture Name="gDinolfosScaleTex" OutName="dinolfos_scale" Format="rgba16" Width="16" Height="16" Offset="0x84B0" /> <Texture Name="gDinolfosArmorTex" OutName="dinolfos_armor" Format="rgba16" Width="16" Height="16" Offset="0x86B0" /> <Texture Name="gDinolfosSpikeTex" OutName="dinolfos_spike" Format="rgba16" Width="8" Height="8" Offset="0x88B0" /> diff --git a/assets/xml/objects/object_driftice.xml b/assets/xml/objects/object_driftice.xml index c380c09c1..a9c99ce3c 100644 --- a/assets/xml/objects/object_driftice.xml +++ b/assets/xml/objects/object_driftice.xml @@ -3,8 +3,8 @@ <Texture Name="object_driftice_Tex_000000" OutName="tex_000000" Format="rgba16" Width="64" Height="8" Offset="0x0" /> <Texture Name="object_driftice_TLUT_000400" OutName="tlut_000400" Format="rgba16" Width="4" Height="4" Offset="0x400" /> <Texture Name="object_driftice_TLUT_000420" OutName="tlut_000420" Format="rgba16" Width="4" Height="4" Offset="0x420" /> - <Texture Name="object_driftice_Tex_000440" OutName="tex_000440" Format="ci4" Width="64" Height="64" Offset="0x440" /> - <Texture Name="object_driftice_Tex_000C40" OutName="tex_000C40" Format="ci4" Width="64" Height="64" Offset="0xC40" /> + <Texture Name="object_driftice_Tex_000440" OutName="tex_000440" Format="ci4" Width="64" Height="64" Offset="0x440" TlutOffset="0x400"/> + <Texture Name="object_driftice_Tex_000C40" OutName="tex_000C40" Format="ci4" Width="64" Height="64" Offset="0xC40" TlutOffset="0x420"/> <DList Name="object_driftice_DL_0016A0" Offset="0x16A0" /> <!-- Original name is "obj_iceblock_model" --> <Collision Name="object_driftice_Colheader_001AA8" Offset="0x1AA8" /> <!-- Original name is "obj_iceblock_bgdatainfo" --> </File> diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml index 95108d727..d1a263a8c 100644 --- a/assets/xml/objects/object_ds2.xml +++ b/assets/xml/objects/object_ds2.xml @@ -10,17 +10,17 @@ <DList Name="object_ds2_DL_002738" Offset="0x2738" /> <DList Name="object_ds2_DL_002908" Offset="0x2908" /> <Texture Name="object_ds2_TLUT_002A98" OutName="tlut_002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98" /> - <Texture Name="object_ds2_Tex_002C98" OutName="tex_002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" /> - <Texture Name="object_ds2_Tex_002D98" OutName="tex_002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" /> - <Texture Name="object_ds2_Tex_002DD8" OutName="tex_002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" /> - <Texture Name="object_ds2_Tex_002ED8" OutName="tex_002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" /> + <Texture Name="object_ds2_Tex_002C98" OutName="tex_002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/> + <Texture Name="object_ds2_Tex_002D98" OutName="tex_002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/> + <Texture Name="object_ds2_Tex_002DD8" OutName="tex_002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/> + <Texture Name="object_ds2_Tex_002ED8" OutName="tex_002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/> <Texture Name="object_ds2_Tex_0030D8" OutName="tex_0030D8" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98" /> <Texture Name="object_ds2_Tex_0034D8" OutName="tex_0034D8" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98" /> <Texture Name="object_ds2_Tex_0038D8" OutName="tex_0038D8" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98" /> - <Texture Name="object_ds2_Tex_003CD8" OutName="tex_003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" /> - <Texture Name="object_ds2_Tex_003DD8" OutName="tex_003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" /> - <Texture Name="object_ds2_Tex_003ED8" OutName="tex_003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" /> - <Texture Name="object_ds2_Tex_003FD8" OutName="tex_003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" /> + <Texture Name="object_ds2_Tex_003CD8" OutName="tex_003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/> + <Texture Name="object_ds2_Tex_003DD8" OutName="tex_003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/> + <Texture Name="object_ds2_Tex_003ED8" OutName="tex_003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/> + <Texture Name="object_ds2_Tex_003FD8" OutName="tex_003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/> <Limb Name="object_ds2_Standardlimb_0041D8" Type="Standard" EnumName="OBJECT_DS2_LIMB_01" Offset="0x41D8" /> <Limb Name="object_ds2_Standardlimb_0041E4" Type="Standard" EnumName="OBJECT_DS2_LIMB_02" Offset="0x41E4" /> <Limb Name="object_ds2_Standardlimb_0041F0" Type="Standard" EnumName="OBJECT_DS2_LIMB_03" Offset="0x41F0" /> diff --git a/assets/xml/objects/object_ds2n.xml b/assets/xml/objects/object_ds2n.xml index 1640f71f4..829c9dd0f 100644 --- a/assets/xml/objects/object_ds2n.xml +++ b/assets/xml/objects/object_ds2n.xml @@ -36,12 +36,12 @@ <Texture Name="gDs2nEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x50D8" TlutOffset="0x40D8"/> <Texture Name="gDs2nFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x54D8" TlutOffset="0x3ED8" /> - <Texture Name="gDs2nSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x55D8" /> + <Texture Name="gDs2nSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x55D8" TlutOffset="0x3CD8"/> <Texture Name="gDs2nHairTex" OutName="hair" Format="rgba16" Width="16" Height="16" Offset="0x5618" /> - <Texture Name="gDs2nHairlineTex" OutName="hairline" Format="ci8" Width="16" Height="16" Offset="0x5818" /> - <Texture Name="gDs2nShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="16" Height="32" Offset="0x5918" /> + <Texture Name="gDs2nHairlineTex" OutName="hairline" Format="ci8" Width="16" Height="16" Offset="0x5818" TlutOffset="0x3CD8"/> + <Texture Name="gDs2nShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="16" Height="32" Offset="0x5918" TlutOffset="0x3CD8"/> <Texture Name="gDs2nVestTex" OutName="vest" Format="rgba16" Width="16" Height="16" Offset="0x5B18" /> - <Texture Name="gDs2nShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0x5D18" /> + <Texture Name="gDs2nShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0x5D18" TlutOffset="0x3CD8"/> <Texture Name="gDs2nEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x5E18" TlutOffset="0x40D8" /> <Texture Name="gDs2nMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6218" TlutOffset="0x3CD8" /> diff --git a/assets/xml/objects/object_dt.xml b/assets/xml/objects/object_dt.xml index 6c4f5c68e..2d1e5d5ce 100644 --- a/assets/xml/objects/object_dt.xml +++ b/assets/xml/objects/object_dt.xml @@ -22,19 +22,19 @@ <Texture Name="object_dt_TLUT_006A50" OutName="tlut_006A50" Format="rgba16" Width="16" Height="16" Offset="0x6A50" /> <Texture Name="object_dt_TLUT_006C50" OutName="tlut_006C50" Format="rgba16" Width="16" Height="16" Offset="0x6C50" /> <Texture Name="object_dt_TLUT_006E50" OutName="tlut_006E50" Format="rgba16" Width="16" Height="16" Offset="0x6E50" /> - <Texture Name="object_dt_Tex_007050" OutName="tex_007050" Format="ci8" Width="8" Height="8" Offset="0x7050" /> - <Texture Name="object_dt_Tex_007090" OutName="tex_007090" Format="ci8" Width="16" Height="16" Offset="0x7090" /> - <Texture Name="object_dt_Tex_007190" OutName="tex_007190" Format="ci8" Width="8" Height="8" Offset="0x7190" /> - <Texture Name="object_dt_Tex_0071D0" OutName="tex_0071D0" Format="ci8" Width="8" Height="8" Offset="0x71D0" /> + <Texture Name="object_dt_Tex_007050" OutName="tex_007050" Format="ci8" Width="8" Height="8" Offset="0x7050" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_007090" OutName="tex_007090" Format="ci8" Width="16" Height="16" Offset="0x7090" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_007190" OutName="tex_007190" Format="ci8" Width="8" Height="8" Offset="0x7190" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_0071D0" OutName="tex_0071D0" Format="ci8" Width="8" Height="8" Offset="0x71D0" TlutOffset="0x6A50"/> <Texture Name="object_dt_Tex_007210" OutName="tex_007210" Format="rgba16" Width="8" Height="16" Offset="0x7210" /> - <Texture Name="object_dt_Tex_007310" OutName="tex_007310" Format="ci8" Width="8" Height="8" Offset="0x7310" /> + <Texture Name="object_dt_Tex_007310" OutName="tex_007310" Format="ci8" Width="8" Height="8" Offset="0x7310" TlutOffset="0x6A50"/> <Texture Name="gDotourEyeShockTex" OutName="dotour_eye_shock" Format="ci8" Width="32" Height="32" Offset="0x7350" TlutOffset="0x6C50" /> <Texture Name="gDotourEyebrowHighTex" OutName="dotour_eyebrow_high" Format="ci8" Width="16" Height="16" Offset="0x7750" TlutOffset="0x6E50" /> - <Texture Name="object_dt_Tex_007850" OutName="tex_007850" Format="ci8" Width="32" Height="32" Offset="0x7850" /> - <Texture Name="object_dt_Tex_007C50" OutName="tex_007C50" Format="ci8" Width="16" Height="16" Offset="0x7C50" /> - <Texture Name="object_dt_Tex_007D50" OutName="tex_007D50" Format="ci8" Width="32" Height="32" Offset="0x7D50" /> - <Texture Name="object_dt_Tex_008150" OutName="tex_008150" Format="ci8" Width="8" Height="8" Offset="0x8150" /> - <Texture Name="object_dt_Tex_008190" OutName="tex_008190" Format="ci8" Width="32" Height="16" Offset="0x8190" /> + <Texture Name="object_dt_Tex_007850" OutName="tex_007850" Format="ci8" Width="32" Height="32" Offset="0x7850" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_007C50" OutName="tex_007C50" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_007D50" OutName="tex_007D50" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_008150" OutName="tex_008150" Format="ci8" Width="8" Height="8" Offset="0x8150" TlutOffset="0x6A50"/> + <Texture Name="object_dt_Tex_008190" OutName="tex_008190" Format="ci8" Width="32" Height="16" Offset="0x8190" TlutOffset="0x6A50"/> <Texture Name="object_dt_Tex_008390" OutName="tex_008390" Format="rgba16" Width="32" Height="64" Offset="0x8390" /> <Texture Name="object_dt_Tex_009390" OutName="tex_009390" Format="rgba16" Width="16" Height="16" Offset="0x9390" /> <Texture Name="gDotourEyeOpenTex" OutName="dotour_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9590" TlutOffset="0x6C50" /> diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml index b321240cc..a22307763 100644 --- a/assets/xml/objects/object_dy_obj.xml +++ b/assets/xml/objects/object_dy_obj.xml @@ -58,13 +58,13 @@ <!-- Textures --> <Texture Name="object_dy_obj_TLUT_0165C8" OutName="tlut_0165C8" Format="rgba16" Width="16" Height="16" Offset="0x165C8" /> - <Texture Name="object_dy_obj_Tex_0167C8" OutName="tex_0167C8" Format="ci8" Width="8" Height="8" Offset="0x167C8" /> - <Texture Name="object_dy_obj_Tex_016808" OutName="tex_016808" Format="ci8" Width="8" Height="8" Offset="0x16808" /> - <Texture Name="object_dy_obj_Tex_016848" OutName="tex_016848" Format="ci8" Width="32" Height="64" Offset="0x16848" /> - <Texture Name="object_dy_obj_Tex_017048" OutName="tex_017048" Format="ci8" Width="8" Height="8" Offset="0x17048" /> - <Texture Name="object_dy_obj_Tex_017088" OutName="tex_017088" Format="ci8" Width="32" Height="32" Offset="0x17088" /> - <Texture Name="object_dy_obj_Tex_017488" OutName="tex_017488" Format="ci8" Width="32" Height="32" Offset="0x17488" /> - <Texture Name="object_dy_obj_Tex_017888" OutName="tex_017888" Format="ci8" Width="16" Height="16" Offset="0x17888" /> + <Texture Name="object_dy_obj_Tex_0167C8" OutName="tex_0167C8" Format="ci8" Width="8" Height="8" Offset="0x167C8" TlutOffset="0x165C8"/> + <Texture Name="object_dy_obj_Tex_016808" OutName="tex_016808" Format="ci8" Width="8" Height="8" Offset="0x16808" TlutOffset="0x165C8"/> + <Texture Name="object_dy_obj_Tex_016848" OutName="tex_016848" Format="ci8" Width="32" Height="64" Offset="0x16848" TlutOffset="0x165C8"/> + <Texture Name="object_dy_obj_Tex_017048" OutName="tex_017048" Format="ci8" Width="8" Height="8" Offset="0x17048" TlutOffset="0x165C8"/> + <Texture Name="object_dy_obj_Tex_017088" OutName="tex_017088" Format="ci8" Width="32" Height="32" Offset="0x17088" TlutOffset="0x165C8"/> + <Texture Name="object_dy_obj_Tex_017488" OutName="tex_017488" Format="ci8" Width="32" Height="32" Offset="0x17488" TlutOffset="0x165C8"/> + <Texture Name="object_dy_obj_Tex_017888" OutName="tex_017888" Format="ci8" Width="16" Height="16" Offset="0x17888" TlutOffset="0x165C8"/> <Texture Name="object_dy_obj_Tex_017988" OutName="tex_017988" Format="rgba16" Width="32" Height="16" Offset="0x17988" /> <Texture Name="object_dy_obj_Tex_017D88" OutName="tex_017D88" Format="rgba16" Width="32" Height="32" Offset="0x17D88" /> diff --git a/assets/xml/objects/object_fall.xml b/assets/xml/objects/object_fall.xml index 04c1ff058..50fdb14fd 100644 --- a/assets/xml/objects/object_fall.xml +++ b/assets/xml/objects/object_fall.xml @@ -50,7 +50,7 @@ <Texture Name="gMoonFaceTLUT" OutName="moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8318" /> <Texture Name="gMoonEyeTex" OutName="moon_eye" Format="rgba16" Width="32" Height="32" Offset="0x8338" /> <Texture Name="gMoonTeethTex" OutName="moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x8B38" /> - <Texture Name="gMoonFarSideTex" OutName="moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x9B38" /> - <Texture Name="gMoonFaceTex" OutName="moon_face" Format="ci4" Width="64" Height="64" Offset="0xA338" /> + <Texture Name="gMoonFarSideTex" OutName="moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x9B38" TlutOffset="0x82F8"/> + <Texture Name="gMoonFaceTex" OutName="moon_face" Format="ci4" Width="64" Height="64" Offset="0xA338" TlutOffset="0x8318"/> </File> </Root> diff --git a/assets/xml/objects/object_fall2.xml b/assets/xml/objects/object_fall2.xml index 1ad99a8a3..7395eeeb4 100644 --- a/assets/xml/objects/object_fall2.xml +++ b/assets/xml/objects/object_fall2.xml @@ -8,8 +8,8 @@ <Texture Name="gOpenMouthMoonFarSideTLUT" OutName="open_mouth_moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34A8" /> <Texture Name="gOpenMouthMoonFaceTLUT" OutName="open_mouth_moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34C8" /> <Texture Name="gOpenMouthMoonEyesTex" OutName="open_mouth_moon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x34E8" /> - <Texture Name="gOpenMouthMoonFarSideTex" OutName="open_mouth_moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3CE8" /> - <Texture Name="gOpenMouthMoonFaceTex" OutName="open_mouth_moon_face" Format="ci4" Width="64" Height="64" Offset="0x44E8" /> + <Texture Name="gOpenMouthMoonFarSideTex" OutName="open_mouth_moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3CE8" TlutOffset="0x34A8"/> + <Texture Name="gOpenMouthMoonFaceTex" OutName="open_mouth_moon_face" Format="ci4" Width="64" Height="64" Offset="0x44E8" TlutOffset="0x34C8"/> <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 --> <KeyFrameAnimation Name="object_fall2_KFAnim_005EF4" Skel="0x8898" Offset="0x5EF4"/> <!-- Original name is "moon_start_anm" --> diff --git a/assets/xml/objects/object_famos.xml b/assets/xml/objects/object_famos.xml index f62604424..c126acd58 100644 --- a/assets/xml/objects/object_famos.xml +++ b/assets/xml/objects/object_famos.xml @@ -11,10 +11,10 @@ <Texture Name="gFamosBottomTLUT" OutName="bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2088" /> <Texture Name="gFamosShieldTLUT" OutName="shield_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20A8" /> <Texture Name="gFamosSwordHiltTLUT" OutName="sword_hilt_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20C8" /> - <Texture Name="gFamosMainBodyTex" OutName="famos_main_body" Format="ci4" Width="64" Height="64" Offset="0x20E8" /> - <Texture Name="gFamosBottomTex" OutName="famos_bottom" Format="ci4" Width="32" Height="32" Offset="0x28E8" /> - <Texture Name="gFamosShieldTex" OutName="famos_shield" Format="ci4" Width="64" Height="64" Offset="0x2AE8" /> - <Texture Name="gFamosSwordHiltTex" OutName="famos_sword_hilt" Format="ci4" Width="32" Height="32" Offset="0x32E8" /> + <Texture Name="gFamosMainBodyTex" OutName="famos_main_body" Format="ci4" Width="64" Height="64" Offset="0x20E8" TlutOffset="0x2068"/> + <Texture Name="gFamosBottomTex" OutName="famos_bottom" Format="ci4" Width="32" Height="32" Offset="0x28E8" TlutOffset="0x2088"/> + <Texture Name="gFamosShieldTex" OutName="famos_shield" Format="ci4" Width="64" Height="64" Offset="0x2AE8" TlutOffset="0x20A8"/> + <Texture Name="gFamosSwordHiltTex" OutName="famos_sword_hilt" Format="ci4" Width="32" Height="32" Offset="0x32E8" TlutOffset="0x20C8"/> <Texture Name="gFamosLightSwitchTex" OutName="famos_light_switch" Format="rgba16" Width="32" Height="32" Offset="0x34E8" /> <Limb Name="gFamosBodyLimb" Type="Standard" EnumName="FAMOS_LIMB_BODY" Offset="0x3CE8" /> diff --git a/assets/xml/objects/object_fsn.xml b/assets/xml/objects/object_fsn.xml index 5ca67c207..6f0472637 100644 --- a/assets/xml/objects/object_fsn.xml +++ b/assets/xml/objects/object_fsn.xml @@ -31,17 +31,17 @@ <Texture Name="gFsnNostrilTLUT" OutName="fsn_nostril_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300" /> <!-- Textures --> - <Texture Name="gFsnHandTex" OutName="fsn_hand" Format="ci8" Width="16" Height="16" Offset="0x5500" /> - <Texture Name="gFsnSkinTex" OutName="fsn_skin" Format="ci8" Width="8" Height="8" Offset="0x5600" /> - <Texture Name="gFsnShirtTex" OutName="fsn_shirt" Format="ci8" Width="8" Height="16" Offset="0x5640" /> + <Texture Name="gFsnHandTex" OutName="fsn_hand" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x4300"/> + <Texture Name="gFsnSkinTex" OutName="fsn_skin" Format="ci8" Width="8" Height="8" Offset="0x5600" TlutOffset="0x4500"/> + <Texture Name="gFsnShirtTex" OutName="fsn_shirt" Format="ci8" Width="8" Height="16" Offset="0x5640" TlutOffset="0x4700"/> <Texture Name="gFsnPantsTex" OutName="fsn_pants" Format="rgba16" Width="16" Height="16" Offset="0x56C0" /> <Texture Name="gFsnBootsTex" OutName="fsn_boots" Format="rgba16" Width="16" Height="16" Offset="0x58C0" /> - <Texture Name="gFsnHairTex" OutName="fsn_hair" Format="ci8" Width="16" Height="16" Offset="0x5AC0" /> + <Texture Name="gFsnHairTex" OutName="fsn_hair" Format="ci8" Width="16" Height="16" Offset="0x5AC0" TlutOffset="0x4900"/> <Texture Name="gFsnEyeOpenTex" OutName="fsn_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5BC0" /> - <Texture Name="gFsnEarTex" OutName="fsn_ear" Format="ci8" Width="8" Height="8" Offset="0x5FC0" /> - <Texture Name="gFsnHairSkinTex" OutName="fsn_hair_and_skin" Format="ci8" Width="16" Height="16" Offset="0x6000" /> - <Texture Name="gFsnMouthTex" OutName="fsn_mouth" Format="ci8" Width="32" Height="32" Offset="0x6100" /> - <Texture Name="gFsnNostrilTex" OutName="fsn_nostril" Format="ci8" Width="8" Height="8" Offset="0x6500" /> + <Texture Name="gFsnEarTex" OutName="fsn_ear" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x4D00"/> + <Texture Name="gFsnHairSkinTex" OutName="fsn_hair_and_skin" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x4F00"/> + <Texture Name="gFsnMouthTex" OutName="fsn_mouth" Format="ci8" Width="32" Height="32" Offset="0x6100" TlutOffset="0x5100"/> + <Texture Name="gFsnNostrilTex" OutName="fsn_nostril" Format="ci8" Width="8" Height="8" Offset="0x6500" TlutOffset="0x5300"/> <Texture Name="gFsnVestTex" OutName="fsn_vest" Format="rgba16" Width="32" Height="32" Offset="0x6540" /> <Texture Name="gFsnEyeHalfTex" OutName="fsn_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6D40" /> <Texture Name="gFsnEyeClosedTex" OutName="fsn_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7140" /> diff --git a/assets/xml/objects/object_fu_kaiten.xml b/assets/xml/objects/object_fu_kaiten.xml index d87c78912..f51aa83c0 100644 --- a/assets/xml/objects/object_fu_kaiten.xml +++ b/assets/xml/objects/object_fu_kaiten.xml @@ -2,7 +2,7 @@ <File Name="object_fu_kaiten" Segment="6"> <DList Name="object_fu_kaiten_DL_0005D0" Offset="0x5D0" /> <!-- Original name is "dai_model" --> <Texture Name="object_fu_kaiten_TLUT_000858" OutName="tlut_000858" Format="rgba16" Width="4" Height="4" Offset="0x858" /> - <Texture Name="object_fu_kaiten_Tex_000878" OutName="tex_000878" Format="ci4" Width="64" Height="64" Offset="0x878" /> + <Texture Name="object_fu_kaiten_Tex_000878" OutName="tex_000878" Format="ci4" Width="64" Height="64" Offset="0x878" TlutOffset="0x858"/> <Texture Name="object_fu_kaiten_Tex_001078" OutName="tex_001078" Format="rgba16" Width="16" Height="64" Offset="0x1078" /> <Texture Name="object_fu_kaiten_Tex_001878" OutName="tex_001878" Format="rgba16" Width="32" Height="32" Offset="0x1878" /> <Texture Name="object_fu_kaiten_Tex_002078" OutName="tex_002078" Format="rgba16" Width="32" Height="32" Offset="0x2078" /> diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml index 3b5dfa4ea..c95b22e67 100644 --- a/assets/xml/objects/object_geldb.xml +++ b/assets/xml/objects/object_geldb.xml @@ -14,7 +14,7 @@ <Texture Name="gGerudoRed1TLUT" OutName="gerudo_red_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x28B0" /> <Texture Name="gGerudoRedSkinShadowTex" OutName="gerudo_red_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x2AB0" TlutOffset="0x28B0" /> <Texture Name="gGerudoRedDarkRedFabricTex" OutName="gerudo_red_dark_red_fabric" Format="ci8" Width="8" Height="8" Offset="0x2AF0" TlutOffset="0x28B0" /> - <Texture Name="gGerudoRedYellowJewel1Tex" OutName="gerudo_red_yellow_jewel_1" Format="ci8" Width="16" Height="16" Offset="0x2B30" /> <!-- also used for gauntlets and greaves --> + <Texture Name="gGerudoRedYellowJewel1Tex" OutName="gerudo_red_yellow_jewel_1" Format="ci8" Width="16" Height="16" Offset="0x2B30" TlutOffset="0x28B0"/> <!-- also used for gauntlets and greaves --> <Texture Name="gGerudoRedGerudoPatternFabricTex" OutName="gerudo_red_gerudo_pattern_fabric" Format="i8" Width="16" Height="16" Offset="0x2C30" /> <Texture Name="gGerudoRedMidriffTex" OutName="gerudo_red_midriff" Format="ci8" Width="16" Height="16" Offset="0x2D30" TlutOffset="0x28B0" /> <Texture Name="gGerudoTrousersTex" OutName="gerudo_red_trousers" Format="i8" Width="16" Height="16" Offset="0x2E30" /> @@ -30,17 +30,17 @@ <DList Name="gGerudoRedLeftThighDL" Offset="0x5D60" /> <DList Name="gGerudoRedLeftLowerLegDL" Offset="0x5E60" /> <Texture Name="gGerudoRed2TLUT" OutName="gerudo_red_2_tlut" Format="rgba16" Width="18" Height="14" Offset="0x60E0" /> - <Texture Name="gGerudoRedSkinGradientTex" OutName="gerudo_red_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x62D8" /> <!-- also used on head --> - <Texture Name="gGerudoRedEarTex" OutName="gerudo_red_ear" Format="ci8" Width="8" Height="16" Offset="0x6318" /> + <Texture Name="gGerudoRedSkinGradientTex" OutName="gerudo_red_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x62D8" TlutOffset="0x60E0"/> <!-- also used on head --> + <Texture Name="gGerudoRedEarTex" OutName="gerudo_red_ear" Format="ci8" Width="8" Height="16" Offset="0x6318" TlutOffset="0x60E0"/> <Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6398" TlutOffset="0x60E0" /> <Texture Name="gGerudoRedVeilFabricTex" OutName="gerudo_red_veil_fabric" Format="i8" Width="16" Height="16" Offset="0x6798" /> - <Texture Name="gGerudoRedShoeUpperTex" OutName="gerudo_red_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x6898" /> - <Texture Name="gGerudoRedShoeSoleTex" OutName="gerudo_red_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x6918" /> + <Texture Name="gGerudoRedShoeUpperTex" OutName="gerudo_red_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x6898" TlutOffset="0x60E0"/> + <Texture Name="gGerudoRedShoeSoleTex" OutName="gerudo_red_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x6918" TlutOffset="0x60E0"/> <Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6958" TlutOffset="0x60E0" /> <Texture Name="gGerudoRedMail2Tex" OutName="gerudo_red_mail_2" Format="i8" Width="8" Height="16" Offset="0x6D58" /> - <Texture Name="gGerudoRedHairTex" OutName="gerudo_red_hair" Format="ci8" Width="16" Height="16" Offset="0x6DD8" /> - <Texture Name="gGerudoRedFingersTex" OutName="gerudo_red_fingers" Format="ci8" Width="16" Height="16" Offset="0x6ED8" /> - <Texture Name="gGerudoRedYellowJewel2Tex" OutName="gerudo_red_yellow_jewel_2" Format="ci8" Width="16" Height="16" Offset="0x6FD8" /> <!-- used for head and sword guards --> + <Texture Name="gGerudoRedHairTex" OutName="gerudo_red_hair" Format="ci8" Width="16" Height="16" Offset="0x6DD8" TlutOffset="0x60E0"/> + <Texture Name="gGerudoRedFingersTex" OutName="gerudo_red_fingers" Format="ci8" Width="16" Height="16" Offset="0x6ED8" TlutOffset="0x60E0"/> + <Texture Name="gGerudoRedYellowJewel2Tex" OutName="gerudo_red_yellow_jewel_2" Format="ci8" Width="16" Height="16" Offset="0x6FD8" TlutOffset="0x60E0"/> <!-- used for head and sword guards --> <Texture Name="gGerudoRedEyeClosedTex" OutName="gerudo_red_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x70D8" TlutOffset="0x60E0" /> <DList Name="gGerudoRedLeftFootDL" Offset="0x92F8" /> <DList Name="gGerudoRedRightFootDL" Offset="0x94B8" /> diff --git a/assets/xml/objects/object_gi_bigbomb.xml b/assets/xml/objects/object_gi_bigbomb.xml index 042736edc..df0205a8c 100644 --- a/assets/xml/objects/object_gi_bigbomb.xml +++ b/assets/xml/objects/object_gi_bigbomb.xml @@ -11,7 +11,7 @@ <!-- Powder Keg Textures --> <Texture Name="gGiPowderKegGoronSkullTex" OutName="gi_powder_keg_goron_skull" Format="ia8" Width="16" Height="32" Offset="0x1130" /> - <Texture Name="gGiPowderKegBarrelTex" OutName="gi_powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x1330" /> + <Texture Name="gGiPowderKegBarrelTex" OutName="gi_powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x1330" TlutOffset="0xF30"/> <Texture Name="gGiPowderKegFuseTex" OutName="gi_powder_keg_fuse" Format="i8" Width="32" Height="16" Offset="0x1730" /> </File> </Root> diff --git a/assets/xml/objects/object_gi_mask03.xml b/assets/xml/objects/object_gi_mask03.xml index 3bc62ba8e..426a1e9a0 100644 --- a/assets/xml/objects/object_gi_mask03.xml +++ b/assets/xml/objects/object_gi_mask03.xml @@ -11,9 +11,9 @@ <Texture Name="gGiFierceDeityMaskEyeTLUT" OutName="gi_fierce_deity_mask_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1170" /> <!-- Fierce Deity Mask Textures --> - <Texture Name="gGiFierceDeityMaskMouthTex" OutName="gi_fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0x1370" /> - <Texture Name="gGiFierceDeityMaskEarTex" OutName="gi_fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0x1570" /> - <Texture Name="gGiFierceDeityMaskEyeTex" OutName="gi_fierce_deity_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1670" /> + <Texture Name="gGiFierceDeityMaskMouthTex" OutName="gi_fierce_deity_mask_mouth" Format="ci8" Width="32" Height="16" Offset="0x1370" TlutOffset="0xF70"/> + <Texture Name="gGiFierceDeityMaskEarTex" OutName="gi_fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0x1570" TlutOffset="0xF70"/> + <Texture Name="gGiFierceDeityMaskEyeTex" OutName="gi_fierce_deity_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1670" TlutOffset="0x1170"/> <Texture Name="gGiFierceDeityMaskHatTex" OutName="gi_fierce_deity_mask_hat" Format="i8" Width="8" Height="8" Offset="0x1A70" /> <Texture Name="gGiFierceDeityMaskHairTex" OutName="gi_fierce_deity_mask_hair" Format="i8" Width="32" Height="32" Offset="0x1AB0" /> </File> diff --git a/assets/xml/objects/object_gi_mask05.xml b/assets/xml/objects/object_gi_mask05.xml index c6bf0baad..da5dcb89e 100644 --- a/assets/xml/objects/object_gi_mask05.xml +++ b/assets/xml/objects/object_gi_mask05.xml @@ -10,9 +10,9 @@ <Texture Name="gGiKafeiMaskTLUT" OutName="gi_kafei_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1638" /> <!-- Kafei's Mask Textures --> - <Texture Name="gGiKafeiMaskLowerHairTex" OutName="gi_kafei_mask_lower_hair" Format="ci8" Width="8" Height="16" Offset="0x1838" /> - <Texture Name="gGiKafeiMaskUpperHairTex" OutName="gi_kafei_mask_upper_hair" Format="ci8" Width="8" Height="16" Offset="0x18B8" /> - <Texture Name="gGiKafeiMaskEyeMouthTex" OutName="gi_kafei_mask_eye_mouth" Format="ci8" Width="16" Height="16" Offset="0x1938" /> - <Texture Name="gGiKafeiMaskEyebrowTex" OutName="gi_kafei_mask_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x1A38" /> + <Texture Name="gGiKafeiMaskLowerHairTex" OutName="gi_kafei_mask_lower_hair" Format="ci8" Width="8" Height="16" Offset="0x1838" TlutOffset="0x1638"/> + <Texture Name="gGiKafeiMaskUpperHairTex" OutName="gi_kafei_mask_upper_hair" Format="ci8" Width="8" Height="16" Offset="0x18B8" TlutOffset="0x1638"/> + <Texture Name="gGiKafeiMaskEyeMouthTex" OutName="gi_kafei_mask_eye_mouth" Format="ci8" Width="16" Height="16" Offset="0x1938" TlutOffset="0x1638"/> + <Texture Name="gGiKafeiMaskEyebrowTex" OutName="gi_kafei_mask_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x1A38" TlutOffset="0x1638"/> </File> </Root> diff --git a/assets/xml/objects/object_gi_mask06.xml b/assets/xml/objects/object_gi_mask06.xml index 7d24b1d92..db348ee4e 100644 --- a/assets/xml/objects/object_gi_mask06.xml +++ b/assets/xml/objects/object_gi_mask06.xml @@ -10,7 +10,7 @@ <Texture Name="gGiAllNightMaskEyeTLUT" OutName="gi_all_night_mask_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAD8" /> <!-- All Night's Mask Textures --> - <Texture Name="gGiAllNightMaskEyeTex" OutName="gi_all_night_mask_eye" Format="ci8" Width="32" Height="32" Offset="0xCD8" /> + <Texture Name="gGiAllNightMaskEyeTex" OutName="gi_all_night_mask_eye" Format="ci8" Width="32" Height="32" Offset="0xCD8" TlutOffset="0xAD8"/> <Texture Name="gGiAllNightMaskFacePattern1Tex" OutName="gi_all_night_mask_face_pattern_1" Format="i8" Width="32" Height="32" Offset="0x10D8" /> <Texture Name="gGiAllNightMaskFacePattern2Tex" OutName="gi_all_night_mask_face_pattern_2" Format="i4" Width="64" Height="32" Offset="0x14D8" /> </File> diff --git a/assets/xml/objects/object_gi_mask09.xml b/assets/xml/objects/object_gi_mask09.xml index 76efc6922..db3f2b065 100644 --- a/assets/xml/objects/object_gi_mask09.xml +++ b/assets/xml/objects/object_gi_mask09.xml @@ -11,9 +11,9 @@ <!-- Garo's Mask Texture --> <Texture Name="gGiGarosMaskEyeTex" OutName="gi_garo_mask_eye" Format="i8" Width="16" Height="16" Offset="0xFA0" /> - <Texture Name="gGiGarosMaskUpperSidePatternTex" OutName="gi_garo_mask_upper_side_pattern" Format="ci8" Width="16" Height="8" Offset="0x10A0" /> - <Texture Name="gGiGarosMaskFrontPatternTex" OutName="gi_garo_mask_front_pattern" Format="ci8" Width="16" Height="32" Offset="0x1120" /> - <Texture Name="gGiGarosMaskLowerSidePatternTex" OutName="gi_garo_mask_lower_side_pattern" Format="ci8" Width="32" Height="32" Offset="0x1320" /> - <Texture Name="gGiGarosMaskTopPatternTex" OutName="gi_garo_mask_top_pattern" Format="ci8" Width="8" Height="8" Offset="0x1720" /> + <Texture Name="gGiGarosMaskUpperSidePatternTex" OutName="gi_garo_mask_upper_side_pattern" Format="ci8" Width="16" Height="8" Offset="0x10A0" TlutOffset="0xDA0"/> + <Texture Name="gGiGarosMaskFrontPatternTex" OutName="gi_garo_mask_front_pattern" Format="ci8" Width="16" Height="32" Offset="0x1120" TlutOffset="0xDA0"/> + <Texture Name="gGiGarosMaskLowerSidePatternTex" OutName="gi_garo_mask_lower_side_pattern" Format="ci8" Width="32" Height="32" Offset="0x1320" TlutOffset="0xDA0"/> + <Texture Name="gGiGarosMaskTopPatternTex" OutName="gi_garo_mask_top_pattern" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xDA0"/> </File> </Root> diff --git a/assets/xml/objects/object_gi_mask11.xml b/assets/xml/objects/object_gi_mask11.xml index e7b175b4d..9f11b21dc 100644 --- a/assets/xml/objects/object_gi_mask11.xml +++ b/assets/xml/objects/object_gi_mask11.xml @@ -11,11 +11,11 @@ <!-- Circus Leader Mask Textures --> <Texture Name="gGiCircusLeaderMaskEyebrowTex" OutName="gi_circus_leader_mask_eyebrow" Format="rgba32" Width="16" Height="16" Offset="0x13D0" /> - <Texture Name="gGiCircusLeaderMaskHairTex" OutName="gi_circus_leader_mask_hair" Format="ci8" Width="8" Height="8" Offset="0x17D0" /> - <Texture Name="gGiCircusLeaderMaskEarTex" OutName="gi_circus_leader_mask_ear" Format="ci8" Width="8" Height="8" Offset="0x1810" /> - <Texture Name="gGiCircusLeaderMaskEyeTex" OutName="gi_circus_leader_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1850" /> - <Texture Name="gGiCircusLeaderMaskHairlineTex" OutName="gi_circus_leader_mask_hairline" Format="ci8" Width="16" Height="16" Offset="0x1C50" /> - <Texture Name="gGiCircusLeaderMaskSideBurnTex" OutName="gi_circus_leader_mask_sideburn" Format="ci8" Width="16" Height="16" Offset="0x1D50" /> - <Texture Name="gGiCircusLeaderMaskSkinTex" OutName="gi_circus_leader_mask_skin" Format="ci8" Width="8" Height="8" Offset="0x1E50" /> + <Texture Name="gGiCircusLeaderMaskHairTex" OutName="gi_circus_leader_mask_hair" Format="ci8" Width="8" Height="8" Offset="0x17D0" TlutOffset="0x11D0"/> + <Texture Name="gGiCircusLeaderMaskEarTex" OutName="gi_circus_leader_mask_ear" Format="ci8" Width="8" Height="8" Offset="0x1810" TlutOffset="0x11D0"/> + <Texture Name="gGiCircusLeaderMaskEyeTex" OutName="gi_circus_leader_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1850" TlutOffset="0x11D0"/> + <Texture Name="gGiCircusLeaderMaskHairlineTex" OutName="gi_circus_leader_mask_hairline" Format="ci8" Width="16" Height="16" Offset="0x1C50" TlutOffset="0x11D0"/> + <Texture Name="gGiCircusLeaderMaskSideBurnTex" OutName="gi_circus_leader_mask_sideburn" Format="ci8" Width="16" Height="16" Offset="0x1D50" TlutOffset="0x11D0"/> + <Texture Name="gGiCircusLeaderMaskSkinTex" OutName="gi_circus_leader_mask_skin" Format="ci8" Width="8" Height="8" Offset="0x1E50" TlutOffset="0x11D0"/> </File> </Root> diff --git a/assets/xml/objects/object_gi_mask17.xml b/assets/xml/objects/object_gi_mask17.xml index a4df99986..f9e5e8687 100644 --- a/assets/xml/objects/object_gi_mask17.xml +++ b/assets/xml/objects/object_gi_mask17.xml @@ -10,11 +10,11 @@ <Texture Name="gGiKamaroMaskTLUT" OutName="kamaro_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1650" /> <!-- Kamaro Mask Textures --> - <Texture Name="gGiKamaroMaskStitchesTex" OutName="gi_kamaro_mask_stitches" Format="ci8" Width="16" Height="16" Offset="0x1850" /> - <Texture Name="gGiKamaroMaskEyeTex" OutName="gi_kamaro_mask_eye" Format="ci8" Width="16" Height="16" Offset="0x1950" /> - <Texture Name="gGiKamaroMaskSpotTex" OutName="gi_kamaro_mask_spot" Format="ci8" Width="8" Height="8" Offset="0x1A50" /> - <Texture Name="gGiKamaroMaskHairChinTex" OutName="gi_kamaro_mask_hair_chin" Format="ci8" Width="16" Height="16" Offset="0x1A90" /> - <Texture Name="gGiKamaroMaskNoseEarTex" OutName="gi_kamaro_mask_nose_ear" Format="ci8" Width="8" Height="8" Offset="0x1B90" /> - <Texture Name="gGiKamaroMaskPonytailTex" OutName="gi_kamaro_mask_ponytail" Format="ci8" Width="8" Height="16" Offset="0x1BD0" /> + <Texture Name="gGiKamaroMaskStitchesTex" OutName="gi_kamaro_mask_stitches" Format="ci8" Width="16" Height="16" Offset="0x1850" TlutOffset="0x1650"/> + <Texture Name="gGiKamaroMaskEyeTex" OutName="gi_kamaro_mask_eye" Format="ci8" Width="16" Height="16" Offset="0x1950" TlutOffset="0x1650"/> + <Texture Name="gGiKamaroMaskSpotTex" OutName="gi_kamaro_mask_spot" Format="ci8" Width="8" Height="8" Offset="0x1A50" TlutOffset="0x1650"/> + <Texture Name="gGiKamaroMaskHairChinTex" OutName="gi_kamaro_mask_hair_chin" Format="ci8" Width="16" Height="16" Offset="0x1A90" TlutOffset="0x1650"/> + <Texture Name="gGiKamaroMaskNoseEarTex" OutName="gi_kamaro_mask_nose_ear" Format="ci8" Width="8" Height="8" Offset="0x1B90" TlutOffset="0x1650"/> + <Texture Name="gGiKamaroMaskPonytailTex" OutName="gi_kamaro_mask_ponytail" Format="ci8" Width="8" Height="16" Offset="0x1BD0" TlutOffset="0x1650"/> </File> </Root> diff --git a/assets/xml/objects/object_gi_mask18.xml b/assets/xml/objects/object_gi_mask18.xml index ad0364290..6f1dda23a 100644 --- a/assets/xml/objects/object_gi_mask18.xml +++ b/assets/xml/objects/object_gi_mask18.xml @@ -10,9 +10,9 @@ <Texture Name="gGiCaptainsHatBodyTLUT" OutName="gi_captains_hat_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12F8" /> <!-- Captains Hat Textures --> - <Texture Name="gGiCaptainsHatHoodTex" OutName="gi_captains_hat_hood" Format="ci8" Width="16" Height="16" Offset="0x14F8" /> - <Texture Name="gGiCaptainsHatHandTex" OutName="gi_captains_hat_hand" Format="ci8" Width="8" Height="16" Offset="0x15F8" /> - <Texture Name="gGiCaptainsHatArmTex" OutName="gi_captains_hat_arm" Format="ci8" Width="8" Height="8" Offset="0x1678" /> + <Texture Name="gGiCaptainsHatHoodTex" OutName="gi_captains_hat_hood" Format="ci8" Width="16" Height="16" Offset="0x14F8" TlutOffset="0x12F8"/> + <Texture Name="gGiCaptainsHatHandTex" OutName="gi_captains_hat_hand" Format="ci8" Width="8" Height="16" Offset="0x15F8" TlutOffset="0x12F8"/> + <Texture Name="gGiCaptainsHatArmTex" OutName="gi_captains_hat_arm" Format="ci8" Width="8" Height="8" Offset="0x1678" TlutOffset="0x12F8"/> <Texture Name="gGiCaptainsHatRibTex" OutName="gi_captains_hat_rib" Format="rgba16" Width="8" Height="16" Offset="0x16B8" /> <Texture Name="gGiCaptainsHatFaceTex" OutName="gi_captains_hat_face" Format="i4" Width="16" Height="32" Offset="0x17B8" /> </File> diff --git a/assets/xml/objects/object_gi_mask20.xml b/assets/xml/objects/object_gi_mask20.xml index f04bb157e..26e0a92e0 100644 --- a/assets/xml/objects/object_gi_mask20.xml +++ b/assets/xml/objects/object_gi_mask20.xml @@ -11,8 +11,8 @@ <!-- Bremen Mask Textures --> <Texture Name="gGiBremenMaskFeathersTex" OutName="gi_bremen_mask_feathers" Format="ia8" Width="48" Height="24" Offset="0xE80" /> - <Texture Name="gGiBremenMaskBeakBaseTex" OutName="gi_bremen_mask_beak_base" Format="ci8" Width="16" Height="16" Offset="0x1300" /> - <Texture Name="gGiBremenMaskBeakNostrilTex" OutName="gi_bremen_mask_beak_nostril" Format="ci8" Width="8" Height="8" Offset="0x1400" /> - <Texture Name="gGiBremenMaskEyeTex" OutName="gi_bremen_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1440" /> + <Texture Name="gGiBremenMaskBeakBaseTex" OutName="gi_bremen_mask_beak_base" Format="ci8" Width="16" Height="16" Offset="0x1300" TlutOffset="0xC80"/> + <Texture Name="gGiBremenMaskBeakNostrilTex" OutName="gi_bremen_mask_beak_nostril" Format="ci8" Width="8" Height="8" Offset="0x1400" TlutOffset="0xC80"/> + <Texture Name="gGiBremenMaskEyeTex" OutName="gi_bremen_mask_eye" Format="ci8" Width="32" Height="32" Offset="0x1440" TlutOffset="0xC80"/> </File> </Root> diff --git a/assets/xml/objects/object_gi_mask22.xml b/assets/xml/objects/object_gi_mask22.xml index 54b0c5595..ad81471e8 100644 --- a/assets/xml/objects/object_gi_mask22.xml +++ b/assets/xml/objects/object_gi_mask22.xml @@ -10,10 +10,10 @@ <Texture Name="gGiMaskOfScentsTLUT" OutName="gi_mask_of_scents_tlut" Format="rgba16" Width="16" Height="16" Offset="0xD58" /> <!-- Mask of Scents Textures --> - <Texture Name="gGiMaskOfScentsSpotTex" OutName="gi_mask_of_scents_spot" Format="ci8" Width="8" Height="8" Offset="0xF58" /> - <Texture Name="gGiMaskOfScentsEyeShadowTex" OutName="gi_mask_of_scents_eye_shadow" Format="ci8" Width="16" Height="16" Offset="0xF98" /> - <Texture Name="gGiMaskOfScentsNostrilTex" OutName="gi_mask_of_scents_nostril" Format="ci8" Width="16" Height="32" Offset="0x1098" /> - <Texture Name="gGiMaskOfScentsMouthTex" OutName="gi_mask_of_scents_mouth" Format="ci8" Width="8" Height="8" Offset="0x1298" /> + <Texture Name="gGiMaskOfScentsSpotTex" OutName="gi_mask_of_scents_spot" Format="ci8" Width="8" Height="8" Offset="0xF58" TlutOffset="0xD58"/> + <Texture Name="gGiMaskOfScentsEyeShadowTex" OutName="gi_mask_of_scents_eye_shadow" Format="ci8" Width="16" Height="16" Offset="0xF98" TlutOffset="0xD58"/> + <Texture Name="gGiMaskOfScentsNostrilTex" OutName="gi_mask_of_scents_nostril" Format="ci8" Width="16" Height="32" Offset="0x1098" TlutOffset="0xD58"/> + <Texture Name="gGiMaskOfScentsMouthTex" OutName="gi_mask_of_scents_mouth" Format="ci8" Width="8" Height="8" Offset="0x1298" TlutOffset="0xD58"/> <Texture Name="gGiMaskOfScentsEyeTex" OutName="gi_mask_of_scents_eye" Format="rgba16" Width="16" Height="16" Offset="0x12D8" /> <Texture Name="gGiMaskOfScentsToothTex" OutName="gi_mask_of_scents_tooth" Format="i8" Width="16" Height="32" Offset="0x14D8" /> </File> diff --git a/assets/xml/objects/object_giant.xml b/assets/xml/objects/object_giant.xml index 491cd0cb0..2926e96cd 100644 --- a/assets/xml/objects/object_giant.xml +++ b/assets/xml/objects/object_giant.xml @@ -32,16 +32,16 @@ <!-- Giant Textures --> <Texture Name="gGiantTLUT" OutName="giant_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5380" /> - <Texture Name="gGiantFootTex" OutName="giant_foot" Format="ci8" Width="16" Height="16" Offset="0x5580" /> - <Texture Name="gGiantShinTex" OutName="giant_shin" Format="ci8" Width="16" Height="16" Offset="0x5680" /> - <Texture Name="gGiantForearmAndKneeTex" OutName="giant_forearm_and_knee" Format="ci8" Width="16" Height="16" Offset="0x5780" /> - <Texture Name="gGiantUpperArmAndThighTex" OutName="giant_upper_arm_and_thigh" Format="ci8" Width="16" Height="16" Offset="0x5880" /> - <Texture Name="gGiantHandTex" OutName="giant_hand" Format="ci8" Width="16" Height="16" Offset="0x5980" /> + <Texture Name="gGiantFootTex" OutName="giant_foot" Format="ci8" Width="16" Height="16" Offset="0x5580" TlutOffset="0x5380"/> + <Texture Name="gGiantShinTex" OutName="giant_shin" Format="ci8" Width="16" Height="16" Offset="0x5680" TlutOffset="0x5380"/> + <Texture Name="gGiantForearmAndKneeTex" OutName="giant_forearm_and_knee" Format="ci8" Width="16" Height="16" Offset="0x5780" TlutOffset="0x5380"/> + <Texture Name="gGiantUpperArmAndThighTex" OutName="giant_upper_arm_and_thigh" Format="ci8" Width="16" Height="16" Offset="0x5880" TlutOffset="0x5380"/> + <Texture Name="gGiantHandTex" OutName="giant_hand" Format="ci8" Width="16" Height="16" Offset="0x5980" TlutOffset="0x5380"/> <Texture Name="gGiantFaceEyeOpenTex" OutName="giant_face_eye_open" Format="ci8" Width="32" Height="64" Offset="0x5A80" TlutOffset="0x5380" /> <Texture Name="gGiantFaceEyeHalfTex" OutName="giant_face_eye_half" Format="ci8" Width="32" Height="64" Offset="0x6280" TlutOffset="0x5380" /> <Texture Name="gGiantFaceEyeClosedTex" OutName="giant_face_eye_closed" Format="ci8" Width="32" Height="64" Offset="0x6A80" TlutOffset="0x5380" /> - <Texture Name="gGiantGroinTex" OutName="giant_groin" Format="ci8" Width="16" Height="16" Offset="0x7280" /> - <Texture Name="gGiantHairTex" OutName="giant_hair" Format="ci8" Width="16" Height="32" Offset="0x7380" /> + <Texture Name="gGiantGroinTex" OutName="giant_groin" Format="ci8" Width="16" Height="16" Offset="0x7280" TlutOffset="0x5380"/> + <Texture Name="gGiantHairTex" OutName="giant_hair" Format="ci8" Width="16" Height="32" Offset="0x7380" TlutOffset="0x5380"/> <!-- Giant Beard Vertices, DisplayList, and Texture --> <Array Name="gGiantBeardVtx" Count="9" Offset="0x7580"> diff --git a/assets/xml/objects/object_gk.xml b/assets/xml/objects/object_gk.xml index 730c1412a..268d7c511 100644 --- a/assets/xml/objects/object_gk.xml +++ b/assets/xml/objects/object_gk.xml @@ -66,15 +66,15 @@ <Texture Name="object_gk_Tex_00D720" OutName="tex_00D720" Format="ci8" Width="16" Height="16" Offset="0xD720" TlutOffset="00C320" /> <Texture Name="object_gk_Tex_00D820" OutName="tex_00D820" Format="ci8" Width="16" Height="32" Offset="0xD820" TlutOffset="00C320" /> <Texture Name="object_gk_Tex_00DA20" OutName="tex_00DA20" Format="ci8" Width="32" Height="32" Offset="0xDA20" TlutOffset="00C320" /> - <Texture Name="object_gk_Tex_00DE20" OutName="tex_00DE20" Format="ci8" Width="8" Height="8" Offset="0xDE20" /> - <Texture Name="object_gk_Tex_00DE60" OutName="tex_00DE60" Format="ci8" Width="16" Height="16" Offset="0xDE60" /> - <Texture Name="object_gk_Tex_00DF60" OutName="tex_00DF60" Format="ci8" Width="16" Height="32" Offset="0xDF60" /> - <Texture Name="object_gk_Tex_00E160" OutName="tex_00E160" Format="ci8" Width="32" Height="16" Offset="0xE160" /> - <Texture Name="object_gk_Tex_00E360" OutName="tex_00E360" Format="ci8" Width="32" Height="32" Offset="0xE360" /> - <Texture Name="object_gk_Tex_00E760" OutName="tex_00E760" Format="ci8" Width="8" Height="8" Offset="0xE760" /> - <Texture Name="object_gk_Tex_00E7A0" OutName="tex_00E7A0" Format="ci8" Width="32" Height="64" Offset="0xE7A0" /> - <Texture Name="object_gk_Tex_00EFA0" OutName="tex_00EFA0" Format="ci8" Width="16" Height="16" Offset="0xEFA0" /> - <Texture Name="object_gk_Tex_00F0A0" OutName="tex_00F0A0" Format="ci8" Width="32" Height="32" Offset="0xF0A0" /> + <Texture Name="object_gk_Tex_00DE20" OutName="tex_00DE20" Format="ci8" Width="8" Height="8" Offset="0xDE20" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00DE60" OutName="tex_00DE60" Format="ci8" Width="16" Height="16" Offset="0xDE60" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00DF60" OutName="tex_00DF60" Format="ci8" Width="16" Height="32" Offset="0xDF60" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00E160" OutName="tex_00E160" Format="ci8" Width="32" Height="16" Offset="0xE160" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00E360" OutName="tex_00E360" Format="ci8" Width="32" Height="32" Offset="0xE360" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00E760" OutName="tex_00E760" Format="ci8" Width="8" Height="8" Offset="0xE760" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00E7A0" OutName="tex_00E7A0" Format="ci8" Width="32" Height="64" Offset="0xE7A0" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00EFA0" OutName="tex_00EFA0" Format="ci8" Width="16" Height="16" Offset="0xEFA0" TlutOffset="0xC320"/> + <Texture Name="object_gk_Tex_00F0A0" OutName="tex_00F0A0" Format="ci8" Width="32" Height="32" Offset="0xF0A0" TlutOffset="0xC320"/> <Texture Name="object_gk_Tex_00F4A0" OutName="tex_00F4A0" Format="rgba16" Width="8" Height="8" Offset="0xF4A0" /> <Texture Name="object_gk_Tex_00F520" OutName="tex_00F520" Format="rgba16" Width="16" Height="16" Offset="0xF520" /> <Texture Name="object_gk_Tex_00F720" OutName="tex_00F720" Format="rgba16" Width="32" Height="32" Offset="0xF720" /> diff --git a/assets/xml/objects/object_gmo.xml b/assets/xml/objects/object_gmo.xml index eaee120b3..628e64730 100644 --- a/assets/xml/objects/object_gmo.xml +++ b/assets/xml/objects/object_gmo.xml @@ -5,7 +5,7 @@ <DList Name="gNejironBodyDL" Offset="0xB70" /> <DList Name="gNejironEyesDL" Offset="0xE38" /> <Texture Name="gNejironBodyTLUT" OutName="nejiron_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC8" /> - <Texture Name="gNejironBodyTex" OutName="nejiron_body" Format="ci8" Width="32" Height="32" Offset="0x10C8" /> + <Texture Name="gNejironBodyTex" OutName="nejiron_body" Format="ci8" Width="32" Height="32" Offset="0x10C8" TlutOffset="0xEC8"/> <Texture Name="gNejironEyeOpenTex" OutName="nejiron_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x14C8" /> <Texture Name="gNejironEyeHalfTex" OutName="nejiron_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x18C8" /> <Texture Name="gNejironEyeClosedTex" OutName="nejiron_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x1CC8" /> diff --git a/assets/xml/objects/object_goroiwa.xml b/assets/xml/objects/object_goroiwa.xml index df6aa04bb..17e9910d2 100644 --- a/assets/xml/objects/object_goroiwa.xml +++ b/assets/xml/objects/object_goroiwa.xml @@ -14,8 +14,8 @@ <DList Name="object_goroiwa_DL_005C20" Offset="0x5C20" /> <!-- Original name is "Z2_newgoroiwa_model" --> <Texture Name="object_goroiwa_TLUT_005EE0" OutName="tlut_005EE0" Format="rgba16" Width="4" Height="4" Offset="0x5EE0" /> <Texture Name="object_goroiwa_TLUT_005F00" OutName="tlut_005F00" Format="rgba16" Width="4" Height="4" Offset="0x5F00" /> - <Texture Name="object_goroiwa_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" /> - <Texture Name="object_goroiwa_Tex_006720" OutName="tex_006720" Format="ci4" Width="64" Height="64" Offset="0x6720" /> + <Texture Name="object_goroiwa_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" TlutOffset="0x5EE0"/> + <Texture Name="object_goroiwa_Tex_006720" OutName="tex_006720" Format="ci4" Width="64" Height="64" Offset="0x6720" TlutOffset="0x5F00"/> <DList Name="object_goroiwa_DL_0072F0" Offset="0x72F0" /> <!-- Original name is "Z2_snow_hahenA_model" --> <DList Name="object_goroiwa_DL_0077D0" Offset="0x77D0" /> <!-- Original name is "Z2_snow_hahenB_model" --> <DList Name="object_goroiwa_DL_007C60" Offset="0x7C60" /> <!-- Original name is "Z2_snow_hahenC_model" --> diff --git a/assets/xml/objects/object_goronswitch.xml b/assets/xml/objects/object_goronswitch.xml index 2f7592664..23ff57806 100644 --- a/assets/xml/objects/object_goronswitch.xml +++ b/assets/xml/objects/object_goronswitch.xml @@ -8,7 +8,7 @@ <Texture Name="object_goronswitch_TLUT_000970" OutName="tlut_000970" Format="rgba16" Width="4" Height="4" Offset="0x970" /> <Texture Name="object_goronswitch_TLUT_000990" OutName="tlut_000990" Format="rgba16" Width="4" Height="4" Offset="0x990" /> <Texture Name="object_goronswitch_Tex_0009B0" OutName="tex_0009B0" Format="i8" Width="64" Height="64" Offset="0x9B0" /> - <Texture Name="object_goronswitch_Tex_0019B0" OutName="tex_0019B0" Format="ci4" Width="64" Height="64" Offset="0x19B0" /> - <Texture Name="object_goronswitch_Tex_0021B0" OutName="tex_0021B0" Format="ci4" Width="64" Height="64" Offset="0x21B0" /> + <Texture Name="object_goronswitch_Tex_0019B0" OutName="tex_0019B0" Format="ci4" Width="64" Height="64" Offset="0x19B0" TlutOffset="0x970"/> + <Texture Name="object_goronswitch_Tex_0021B0" OutName="tex_0021B0" Format="ci4" Width="64" Height="64" Offset="0x21B0" TlutOffset="0x990"/> </File> </Root> diff --git a/assets/xml/objects/object_ha.xml b/assets/xml/objects/object_ha.xml index 860b592df..42475a926 100644 --- a/assets/xml/objects/object_ha.xml +++ b/assets/xml/objects/object_ha.xml @@ -36,18 +36,18 @@ <!-- Gorman Brothers' Horses' Textures --> <Texture Name="gHorseBanditTLUT" OutName="horse_bandit_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6E58" /> - <Texture Name="gHorseBanditMaskTex" OutName="horse_bandit_mask" Format="ci8" Width="16" Height="16" Offset="0x7058" /> - <Texture Name="gHorseBanditSpottedDetailTex" OutName="horse_bandit_spotted_detail" Format="ci8" Width="16" Height="32" Offset="0x7158" /> + <Texture Name="gHorseBanditMaskTex" OutName="horse_bandit_mask" Format="ci8" Width="16" Height="16" Offset="0x7058" TlutOffset="0x6E58"/> + <Texture Name="gHorseBanditSpottedDetailTex" OutName="horse_bandit_spotted_detail" Format="ci8" Width="16" Height="32" Offset="0x7158" TlutOffset="0x6E58"/> <Texture Name="gHorseBanditEyebrowTex" OutName="horse_bandit_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x7358" /> - <Texture Name="gHorseBanditTeethTex" OutName="horse_bandit_teeth" Format="ci8" Width="16" Height="16" Offset="0x7558" /> - <Texture Name="gHorseBanditTailAndFeetTex" OutName="horse_bandit_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x7658" /> + <Texture Name="gHorseBanditTeethTex" OutName="horse_bandit_teeth" Format="ci8" Width="16" Height="16" Offset="0x7558" TlutOffset="0x6E58"/> + <Texture Name="gHorseBanditTailAndFeetTex" OutName="horse_bandit_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x7658" TlutOffset="0x6E58"/> <Texture Name="gHorseBanditEyeTex" OutName="horse_bandit_eye" Format="rgba16" Width="32" Height="32" Offset="0x7758" /> - <Texture Name="gHorseBanditMouthTex" OutName="horse_bandit_mouth" Format="ci8" Width="32" Height="32" Offset="0x7F58" /> - <Texture Name="gHorseBanditSpottedSkinTex" OutName="horse_bandit_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8358" /> + <Texture Name="gHorseBanditMouthTex" OutName="horse_bandit_mouth" Format="ci8" Width="32" Height="32" Offset="0x7F58" TlutOffset="0x6E58"/> + <Texture Name="gHorseBanditSpottedSkinTex" OutName="horse_bandit_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x8358" TlutOffset="0x6E58"/> <Texture Name="gHorseBanditTasselTex" OutName="horse_bandit_tassel" Format="rgba16" Width="8" Height="16" Offset="0x8758" /> - <Texture Name="gHorseBanditSaddleSideTex" OutName="horse_bandit_saddle_side" Format="ci8" Width="16" Height="16" Offset="0x8858" /> - <Texture Name="gHorseBanditSaddleTopTex" OutName="horse_bandit_saddle_top" Format="ci8" Width="16" Height="16" Offset="0x8958" /> - <Texture Name="gHorseBanditSaddleBackTex" OutName="horse_bandit_saddle_back" Format="ci8" Width="8" Height="16" Offset="0x8A58" /> + <Texture Name="gHorseBanditSaddleSideTex" OutName="horse_bandit_saddle_side" Format="ci8" Width="16" Height="16" Offset="0x8858" TlutOffset="0x6E58"/> + <Texture Name="gHorseBanditSaddleTopTex" OutName="horse_bandit_saddle_top" Format="ci8" Width="16" Height="16" Offset="0x8958" TlutOffset="0x6E58"/> + <Texture Name="gHorseBanditSaddleBackTex" OutName="horse_bandit_saddle_back" Format="ci8" Width="8" Height="16" Offset="0x8A58" TlutOffset="0x6E58"/> <!-- Gorman Brothers' Horses' Limbs and Skel --> @@ -122,13 +122,13 @@ <!-- Cremia's Donkey Textures --> <Texture Name="gDonkeyTLUT" OutName="donkey_tlut" Format="rgba16" Width="16" Height="16" Offset="0x12D48" /> - <Texture Name="gDonkeyMouthTex" OutName="donkey_mouth" Format="ci8" Width="32" Height="32" Offset="0x12F48" /> - <Texture Name="gDonkeyHeadTex" OutName="donkey_head" Format="ci8" Width="32" Height="32" Offset="0x13348" /> + <Texture Name="gDonkeyMouthTex" OutName="donkey_mouth" Format="ci8" Width="32" Height="32" Offset="0x12F48" TlutOffset="0x12D48"/> + <Texture Name="gDonkeyHeadTex" OutName="donkey_head" Format="ci8" Width="32" Height="32" Offset="0x13348" TlutOffset="0x12D48"/> <Texture Name="gDonkeyEyeTex" OutName="donkey_eye" Format="rgba32" Width="32" Height="32" Offset="0x13748" /> - <Texture Name="gDonkeyManeTex" OutName="donkey_mane" Format="ci8" Width="16" Height="32" Offset="0x14748" /> - <Texture Name="gDonkeySkinTex" OutName="donkey_skin" Format="ci8" Width="32" Height="32" Offset="0x14948" /> - <Texture Name="gDonkeyHarnessTex" OutName="donkey_harness" Format="ci8" Width="16" Height="16" Offset="0x14D48" /> - <Texture Name="gDonkeyTailAndFeetTex" OutName="donkey_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x14E48" /> + <Texture Name="gDonkeyManeTex" OutName="donkey_mane" Format="ci8" Width="16" Height="32" Offset="0x14748" TlutOffset="0x12D48"/> + <Texture Name="gDonkeySkinTex" OutName="donkey_skin" Format="ci8" Width="32" Height="32" Offset="0x14948" TlutOffset="0x12D48"/> + <Texture Name="gDonkeyHarnessTex" OutName="donkey_harness" Format="ci8" Width="16" Height="16" Offset="0x14D48" TlutOffset="0x12D48"/> + <Texture Name="gDonkeyTailAndFeetTex" OutName="donkey_tail_and_feet" Format="ci8" Width="16" Height="16" Offset="0x14E48" TlutOffset="0x12D48"/> <!-- Cremia's Donkey Limbs and Skel--> diff --git a/assets/xml/objects/object_haka_obj.xml b/assets/xml/objects/object_haka_obj.xml index 2746eb690..15ffd76fa 100644 --- a/assets/xml/objects/object_haka_obj.xml +++ b/assets/xml/objects/object_haka_obj.xml @@ -13,13 +13,13 @@ <Texture Name="object_haka_obj_TLUT_001A00" OutName="tlut_001A00" Format="rgba16" Width="4" Height="4" Offset="0x1A00" /> <Texture Name="object_haka_obj_TLUT_001A20" OutName="tlut_001A20" Format="rgba16" Width="4" Height="4" Offset="0x1A20" /> <Texture Name="object_haka_obj_TLUT_001A40" OutName="tlut_001A40" Format="rgba16" Width="16" Height="16" Offset="0x1A40" /> - <Texture Name="object_haka_obj_Tex_001C40" OutName="tex_001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" /> - <Texture Name="object_haka_obj_Tex_002040" OutName="tex_002040" Format="ci8" Width="32" Height="32" Offset="0x2040" /> + <Texture Name="object_haka_obj_Tex_001C40" OutName="tex_001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1800"/> + <Texture Name="object_haka_obj_Tex_002040" OutName="tex_002040" Format="ci8" Width="32" Height="32" Offset="0x2040" TlutOffset="0x1800"/> <Texture Name="object_haka_obj_Tex_002440" OutName="tex_002440" Format="rgba16" Width="32" Height="32" Offset="0x2440" /> - <Texture Name="object_haka_obj_Tex_002C40" OutName="tex_002C40" Format="ci4" Width="64" Height="64" Offset="0x2C40" /> - <Texture Name="object_haka_obj_Tex_003440" OutName="tex_003440" Format="ci4" Width="64" Height="64" Offset="0x3440" /> - <Texture Name="object_haka_obj_Tex_003C40" OutName="tex_003C40" Format="ci8" Width="32" Height="64" Offset="0x3C40" /> - <Texture Name="object_haka_obj_Tex_004440" OutName="tex_004440" Format="ci8" Width="32" Height="32" Offset="0x4440" /> + <Texture Name="object_haka_obj_Tex_002C40" OutName="tex_002C40" Format="ci4" Width="64" Height="64" Offset="0x2C40" TlutOffset="0x1A00"/> + <Texture Name="object_haka_obj_Tex_003440" OutName="tex_003440" Format="ci4" Width="64" Height="64" Offset="0x3440" TlutOffset="0x1A20"/> + <Texture Name="object_haka_obj_Tex_003C40" OutName="tex_003C40" Format="ci8" Width="32" Height="64" Offset="0x3C40" TlutOffset="0x1A40"/> + <Texture Name="object_haka_obj_Tex_004440" OutName="tex_004440" Format="ci8" Width="32" Height="32" Offset="0x4440" TlutOffset="0x1A40"/> <Texture Name="object_haka_obj_Tex_004840" OutName="tex_004840" Format="rgba16" Width="64" Height="8" Offset="0x4840" /> <Texture Name="object_haka_obj_Tex_004C40" OutName="tex_004C40" Format="rgba16" Width="16" Height="16" Offset="0x4C40" /> <Texture Name="object_haka_obj_Tex_004E40" OutName="tex_004E40" Format="rgba16" Width="32" Height="32" Offset="0x4E40" /> diff --git a/assets/xml/objects/object_hakugin_obj.xml b/assets/xml/objects/object_hakugin_obj.xml index 883a954a6..c8c667a61 100644 --- a/assets/xml/objects/object_hakugin_obj.xml +++ b/assets/xml/objects/object_hakugin_obj.xml @@ -3,22 +3,22 @@ <DList Name="object_hakugin_obj_DL_000120" Offset="0x120" /> <DList Name="object_hakugin_obj_DL_000128" Offset="0x128" /> <!-- Original name is "i2_H_shutter1_model" --> <Texture Name="object_hakugin_obj_TLUT_000310" OutName="tlut_000310" Format="rgba16" Width="4" Height="4" Offset="0x310" /> - <Texture Name="object_hakugin_obj_Tex_000330" OutName="tex_000330" Format="ci4" Width="64" Height="64" Offset="0x330" /> + <Texture Name="object_hakugin_obj_Tex_000330" OutName="tex_000330" Format="ci4" Width="64" Height="64" Offset="0x330" TlutOffset="0x310"/> <DList Name="object_hakugin_obj_DL_000D30" Offset="0xD30" /> <DList Name="object_hakugin_obj_DL_000D38" Offset="0xD38" /> <TextureAnimation Name="object_hakugin_obj_Matanimheader_000E48" Offset="0xE48" /> <Texture Name="object_hakugin_obj_TLUT_000E50" OutName="tlut_000E50" Format="rgba16" Width="4" Height="4" Offset="0xE50" /> - <Texture Name="object_hakugin_obj_Tex_000E70" OutName="tex_000E70" Format="ci4" Width="64" Height="64" Offset="0xE70" /> + <Texture Name="object_hakugin_obj_Tex_000E70" OutName="tex_000E70" Format="ci4" Width="64" Height="64" Offset="0xE70" TlutOffset="0xE50"/> <DList Name="object_hakugin_obj_DL_0016D0" Offset="0x16D0" /> <DList Name="object_hakugin_obj_DL_0016D8" Offset="0x16D8" /> <!-- Original name is "i2_haku041_model" --> <TextureAnimation Name="object_hakugin_obj_Matanimheader_0017A8" Offset="0x17A8" /> <Texture Name="object_hakugin_obj_TLUT_0017B0" OutName="tlut_0017B0" Format="rgba16" Width="4" Height="4" Offset="0x17B0" /> - <Texture Name="object_hakugin_obj_Tex_0017D0" OutName="tex_0017D0" Format="ci4" Width="64" Height="64" Offset="0x17D0" /> + <Texture Name="object_hakugin_obj_Tex_0017D0" OutName="tex_0017D0" Format="ci4" Width="64" Height="64" Offset="0x17D0" TlutOffset="0x17B0"/> <DList Name="object_hakugin_obj_DL_002010" Offset="0x2010" /> <DList Name="object_hakugin_obj_DL_002018" Offset="0x2018" /> <!-- Original name is "i2_haku071_model" --> <TextureAnimation Name="object_hakugin_obj_Matanimheader_0020E8" Offset="0x20E8" /> <Texture Name="object_hakugin_obj_TLUT_0020F0" OutName="tlut_0020F0" Format="rgba16" Width="4" Height="4" Offset="0x20F0" /> - <Texture Name="object_hakugin_obj_Tex_002110" OutName="tex_002110" Format="ci4" Width="64" Height="64" Offset="0x2110" /> + <Texture Name="object_hakugin_obj_Tex_002110" OutName="tex_002110" Format="ci4" Width="64" Height="64" Offset="0x2110" TlutOffset="0x20F0"/> <DList Name="object_hakugin_obj_DL_002970" Offset="0x2970" /> <DList Name="object_hakugin_obj_DL_002978" Offset="0x2978" /> <!-- Original name is "i2_haku081_model" --> <TextureAnimation Name="object_hakugin_obj_Matanimheader_002A58" Offset="0x2A58" /> @@ -27,28 +27,28 @@ <TextureAnimation Name="object_hakugin_obj_Matanimheader_003888" Offset="0x3888" /> <Texture Name="object_hakugin_obj_TLUT_003890" OutName="tlut_003890" Format="rgba16" Width="4" Height="4" Offset="0x3890" /> <Texture Name="object_hakugin_obj_TLUT_0038B0" OutName="tlut_0038B0" Format="rgba16" Width="4" Height="4" Offset="0x38B0" /> - <Texture Name="object_hakugin_obj_Tex_0038D0" OutName="tex_0038D0" Format="ci4" Width="64" Height="64" Offset="0x38D0" /> - <Texture Name="object_hakugin_obj_Tex_0040D0" OutName="tex_0040D0" Format="ci4" Width="64" Height="64" Offset="0x40D0" /> + <Texture Name="object_hakugin_obj_Tex_0038D0" OutName="tex_0038D0" Format="ci4" Width="64" Height="64" Offset="0x38D0" TlutOffset="0x3890"/> + <Texture Name="object_hakugin_obj_Tex_0040D0" OutName="tex_0040D0" Format="ci4" Width="64" Height="64" Offset="0x40D0" TlutOffset="0x38B0"/> <DList Name="object_hakugin_obj_DL_004920" Offset="0x4920" /> <DList Name="object_hakugin_obj_DL_004928" Offset="0x4928" /> <!-- Original name is "i2_haku0a1_model" --> <TextureAnimation Name="object_hakugin_obj_Matanimheader_0049F8" Offset="0x49F8" /> <Texture Name="object_hakugin_obj_TLUT_004A00" OutName="tlut_004A00" Format="rgba16" Width="4" Height="4" Offset="0x4A00" /> - <Texture Name="object_hakugin_obj_Tex_004A20" OutName="tex_004A20" Format="ci4" Width="64" Height="64" Offset="0x4A20" /> + <Texture Name="object_hakugin_obj_Tex_004A20" OutName="tex_004A20" Format="ci4" Width="64" Height="64" Offset="0x4A20" TlutOffset="0x4A00"/> <DList Name="object_hakugin_obj_DL_005260" Offset="0x5260" /> <DList Name="object_hakugin_obj_DL_005268" Offset="0x5268" /> <TextureAnimation Name="object_hakugin_obj_Matanimheader_005338" Offset="0x5338" /> <Texture Name="object_hakugin_obj_TLUT_005340" OutName="tlut_005340" Format="rgba16" Width="4" Height="4" Offset="0x5340" /> - <Texture Name="object_hakugin_obj_Tex_005360" OutName="tex_005360" Format="ci4" Width="64" Height="64" Offset="0x5360" /> + <Texture Name="object_hakugin_obj_Tex_005360" OutName="tex_005360" Format="ci4" Width="64" Height="64" Offset="0x5360" TlutOffset="0x5340"/> <DList Name="object_hakugin_obj_DL_006120" Offset="0x6120" /> <DList Name="object_hakugin_obj_DL_006128" Offset="0x6128" /> <!-- Original name is "i2_H_RASENsita_model" --> <Texture Name="object_hakugin_obj_TLUT_0064C0" OutName="tlut_0064C0" Format="rgba16" Width="4" Height="4" Offset="0x64C0" /> <Texture Name="object_hakugin_obj_TLUT_0064E0" OutName="tlut_0064E0" Format="rgba16" Width="4" Height="4" Offset="0x64E0" /> <Texture Name="object_hakugin_obj_TLUT_006500" OutName="tlut_006500" Format="rgba16" Width="4" Height="4" Offset="0x6500" /> - <Texture Name="object_hakugin_obj_Tex_006520" OutName="tex_006520" Format="ci4" Width="64" Height="64" Offset="0x6520" /> - <Texture Name="object_hakugin_obj_Tex_006D20" OutName="tex_006D20" Format="ci4" Width="64" Height="64" Offset="0x6D20" /> + <Texture Name="object_hakugin_obj_Tex_006520" OutName="tex_006520" Format="ci4" Width="64" Height="64" Offset="0x6520" TlutOffset="0x64C0"/> + <Texture Name="object_hakugin_obj_Tex_006D20" OutName="tex_006D20" Format="ci4" Width="64" Height="64" Offset="0x6D20" TlutOffset="0x64E0"/> <Texture Name="object_hakugin_obj_Tex_007520" OutName="tex_007520" Format="rgba16" Width="32" Height="32" Offset="0x7520" /> <Texture Name="object_hakugin_obj_Tex_007D20" OutName="tex_007D20" Format="rgba16" Width="32" Height="32" Offset="0x7D20" /> - <Texture Name="object_hakugin_obj_Tex_008520" OutName="tex_008520" Format="ci4" Width="64" Height="64" Offset="0x8520" /> + <Texture Name="object_hakugin_obj_Tex_008520" OutName="tex_008520" Format="ci4" Width="64" Height="64" Offset="0x8520" TlutOffset="0x6500"/> <DList Name="object_hakugin_obj_DL_009270" Offset="0x9270" /> <DList Name="object_hakugin_obj_DL_009278" Offset="0x9278" /> <!-- Original name is "i2_H_RASENue_model" --> <DList Name="object_hakugin_obj_DL_009650" Offset="0x9650" /> @@ -60,14 +60,14 @@ <Collision Name="object_hakugin_obj_Colheader_009AF0" Offset="0x9AF0" /> <Texture Name="object_hakugin_obj_TLUT_009B20" OutName="tlut_009B20" Format="rgba16" Width="4" Height="4" Offset="0x9B20" /> <Texture Name="object_hakugin_obj_TLUT_009B40" OutName="tlut_009B40" Format="rgba16" Width="4" Height="4" Offset="0x9B40" /> - <Texture Name="object_hakugin_obj_Tex_009B60" OutName="tex_009B60" Format="ci4" Width="64" Height="64" Offset="0x9B60" /> - <Texture Name="object_hakugin_obj_Tex_00A360" OutName="tex_00A360" Format="ci4" Width="64" Height="64" Offset="0xA360" /> + <Texture Name="object_hakugin_obj_Tex_009B60" OutName="tex_009B60" Format="ci4" Width="64" Height="64" Offset="0x9B60" TlutOffset="0x9B20"/> + <Texture Name="object_hakugin_obj_Tex_00A360" OutName="tex_00A360" Format="ci4" Width="64" Height="64" Offset="0xA360" TlutOffset="0x9B40"/> <DList Name="object_hakugin_obj_DL_00ACB0" Offset="0xACB0" /> <DList Name="object_hakugin_obj_DL_00ACB8" Offset="0xACB8" /> <!-- Original name is "i2_elvH1_model" --> <Texture Name="object_hakugin_obj_TLUT_00AE18" OutName="tlut_00AE18" Format="rgba16" Width="4" Height="4" Offset="0xAE18" /> <Texture Name="object_hakugin_obj_TLUT_00AE38" OutName="tlut_00AE38" Format="rgba16" Width="4" Height="4" Offset="0xAE38" /> - <Texture Name="object_hakugin_obj_Tex_00AE58" OutName="tex_00AE58" Format="ci4" Width="64" Height="64" Offset="0xAE58" /> - <Texture Name="object_hakugin_obj_Tex_00B658" OutName="tex_00B658" Format="ci4" Width="64" Height="64" Offset="0xB658" /> + <Texture Name="object_hakugin_obj_Tex_00AE58" OutName="tex_00AE58" Format="ci4" Width="64" Height="64" Offset="0xAE58" TlutOffset="0xAE18"/> + <Texture Name="object_hakugin_obj_Tex_00B658" OutName="tex_00B658" Format="ci4" Width="64" Height="64" Offset="0xB658" TlutOffset="0xAE38"/> <Collision Name="object_hakugin_obj_Colheader_00BF40" Offset="0xBF40" /> <!-- Original name is "i2_elvH1_bgdatainfo" --> <DList Name="object_hakugin_obj_DL_00C1A0" Offset="0xC1A0" /> <DList Name="object_hakugin_obj_DL_00C1A8" Offset="0xC1A8" /> <!-- Original name is "i2_icecol1_model" --> @@ -83,7 +83,7 @@ <Texture Name="object_hakugin_obj_TLUT_00D3E0" OutName="tlut_00D3E0" Format="rgba16" Width="4" Height="4" Offset="0xD3E0" /> <!-- <Blob Name="object_hakugin_obj_Blob_00D400" Size="0x40" Offset="0xD400" /> --> <Texture Name="object_hakugin_obj_Tex_00D440" OutName="tex_00D440" Format="rgba16" Width="64" Height="32" Offset="0xD440" /> - <Texture Name="object_hakugin_obj_Tex_00E440" OutName="tex_00E440" Format="ci4" Width="64" Height="64" Offset="0xE440" /> + <Texture Name="object_hakugin_obj_Tex_00E440" OutName="tex_00E440" Format="ci4" Width="64" Height="64" Offset="0xE440" TlutOffset="0xD3E0"/> <Texture Name="object_hakugin_obj_Tex_00EC40" OutName="tex_00EC40" Format="i4" Width="64" Height="64" Offset="0xEC40" /> <Texture Name="object_hakugin_obj_Tex_00F440" OutName="tex_00F440" Format="i4" Width="64" Height="64" Offset="0xF440" /> <Texture Name="object_hakugin_obj_Tex_00FC40" OutName="tex_00FC40" Format="rgba16" Width="32" Height="32" Offset="0xFC40" /> diff --git a/assets/xml/objects/object_harfgibud.xml b/assets/xml/objects/object_harfgibud.xml index 437e3b70d..4cbca9dae 100644 --- a/assets/xml/objects/object_harfgibud.xml +++ b/assets/xml/objects/object_harfgibud.xml @@ -29,16 +29,16 @@ <Texture Name="gPamelasFatherGibdoTLUT" OutName="pamelas_father_gibdo__tlut" Format="rgba16" Width="16" Height="16" Offset="0x70A0" /> <Texture Name="gPamelasFatherGibdoBandageWrappingsTex" OutName="gibdo_bandage_wrappings" Format="i8" Width="64" Height="32" Offset="0x72A0" /> - <Texture Name="gPamelasFatherGibdoSkinGradientTex" OutName="gibdo_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x7AA0" /> - <Texture Name="gPamelasFatherGibdoSideHairTex" OutName="gibdo_side_hair" Format="ci8" Width="8" Height="16" Offset="0x7AE0" /> - <Texture Name="gPamelasFatherGibdoEarTex" OutName="gibdo_ear" Format="ci8" Width="8" Height="8" Offset="0x7B60" /> - <Texture Name="gPamelasFatherGibdoLipTex" OutName="gibdo_lip" Format="ci8" Width="8" Height="8" Offset="0x7BA0" /> - <Texture Name="gPamelasFatherGibdoBloodshotEyeTex" OutName="gibdo_bloodshot_eye" Format="ci8" Width="32" Height="32" Offset="0x7BE0" /> - <Texture Name="gPamelasFatherGibdoHairTex" OutName="gibdo_hair" Format="ci8" Width="16" Height="16" Offset="0x7FE0" /> + <Texture Name="gPamelasFatherGibdoSkinGradientTex" OutName="gibdo_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x7AA0" TlutOffset="0x70A0"/> + <Texture Name="gPamelasFatherGibdoSideHairTex" OutName="gibdo_side_hair" Format="ci8" Width="8" Height="16" Offset="0x7AE0" TlutOffset="0x70A0"/> + <Texture Name="gPamelasFatherGibdoEarTex" OutName="gibdo_ear" Format="ci8" Width="8" Height="8" Offset="0x7B60" TlutOffset="0x70A0"/> + <Texture Name="gPamelasFatherGibdoLipTex" OutName="gibdo_lip" Format="ci8" Width="8" Height="8" Offset="0x7BA0" TlutOffset="0x70A0"/> + <Texture Name="gPamelasFatherGibdoBloodshotEyeTex" OutName="gibdo_bloodshot_eye" Format="ci8" Width="32" Height="32" Offset="0x7BE0" TlutOffset="0x70A0"/> + <Texture Name="gPamelasFatherGibdoHairTex" OutName="gibdo_hair" Format="ci8" Width="16" Height="16" Offset="0x7FE0" TlutOffset="0x70A0"/> <Texture Name="gPamelasFatherGibdoEyebrowTex" OutName="gibdo_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x80E0" /> <Texture Name="gPamelasFatherGibdoLabCoatSleeveTex" OutName="gibdo_lab_coat_sleeve" Format="i8" Width="8" Height="8" Offset="0x82E0" /> <Texture Name="gPamelasFatherGibdoShirtPieceTex" OutName="gibdo_shirt_piece" Format="rgba16" Width="8" Height="8" Offset="0x8320" /> - <Texture Name="gPamelasFatherGibdoFingernailTex" OutName="gibdo_fingernail" Format="ci8" Width="16" Height="8" Offset="0x83A0" /> + <Texture Name="gPamelasFatherGibdoFingernailTex" OutName="gibdo_fingernail" Format="ci8" Width="16" Height="8" Offset="0x83A0" TlutOffset="0x70A0"/> <Texture Name="gPamelasFatherGibdoLabCoatCuffTex" OutName="gibdo_lab_coat_cuff" Format="i8" Width="8" Height="8" Offset="0x8420" /> <Limb Name="gPamelasFatherGibdoRootLimb" Type="Standard" EnumName="PAMELAS_FATHER_GIBDO_LIMB_ROOT" Offset="0x8460" /> @@ -86,12 +86,12 @@ <DList Name="gPamelasFatherHumanAbdomenDL" Offset="0x103C0" /> <Texture Name="gPamelasFatherHumanTLUT" OutName="human_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10578" /> - <Texture Name="gPamelasFatherHumanSkinGradientTex" OutName="human_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x10778" /> - <Texture Name="gPamelasFatherHumanHandTex" OutName="human_hand" Format="ci8" Width="16" Height="16" Offset="0x107B8" /> - <Texture Name="gPamelasFatherHumanSideHairTex" OutName="human_side_hair" Format="ci8" Width="8" Height="16" Offset="0x108B8" /> - <Texture Name="gPamelasFatherHumanEarTex" OutName="human_ear" Format="ci8" Width="8" Height="8" Offset="0x10938" /> - <Texture Name="gPamelasFatherHumanBeltTex" OutName="human_belt" Format="ci8" Width="32" Height="16" Offset="0x10978" /> - <Texture Name="gPamelasFatherHumanLipTex" OutName="human_lip" Format="ci8" Width="8" Height="8" Offset="0x10B78" /> + <Texture Name="gPamelasFatherHumanSkinGradientTex" OutName="human_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x10778" TlutOffset="0x10578"/> + <Texture Name="gPamelasFatherHumanHandTex" OutName="human_hand" Format="ci8" Width="16" Height="16" Offset="0x107B8" TlutOffset="0x10578"/> + <Texture Name="gPamelasFatherHumanSideHairTex" OutName="human_side_hair" Format="ci8" Width="8" Height="16" Offset="0x108B8" TlutOffset="0x10578"/> + <Texture Name="gPamelasFatherHumanEarTex" OutName="human_ear" Format="ci8" Width="8" Height="8" Offset="0x10938" TlutOffset="0x10578"/> + <Texture Name="gPamelasFatherHumanBeltTex" OutName="human_belt" Format="ci8" Width="32" Height="16" Offset="0x10978" TlutOffset="0x10578"/> + <Texture Name="gPamelasFatherHumanLipTex" OutName="human_lip" Format="ci8" Width="8" Height="8" Offset="0x10B78" TlutOffset="0x10578"/> <Texture Name="gPamelasFatherHumanShirtTex" OutName="human_shirt" Format="rgba16" Width="8" Height="16" Offset="0x10BB8" /> <Texture Name="gPamelasFatherHumanEyebrowTex" OutName="human_eyebrow" Format="rgba16" Width="16" Height="16" Offset="0x10CB8" /> <Texture Name="gPamelasFatherHumanLabCoatTex" OutName="human_lab_coat" Format="i8" Width="8" Height="8" Offset="0x10EB8" /> diff --git a/assets/xml/objects/object_hs.xml b/assets/xml/objects/object_hs.xml index be333f1dc..af330a77d 100644 --- a/assets/xml/objects/object_hs.xml +++ b/assets/xml/objects/object_hs.xml @@ -17,17 +17,17 @@ <DList Name="gHsEndDL" Offset="0x4CF0" /> <DList Name="object_hs_DL_004CF8" Offset="0x4CF8" /> <Texture Name="object_hs_TLUT_004E50" OutName="tlut_004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50" /> - <Texture Name="gHsRibsTex" OutName="ribs" Format="ci8" Width="16" Height="32" Offset="0x5050" /> - <Texture Name="gHsEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x5250" /> - <Texture Name="gHsMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x5290" /> + <Texture Name="gHsRibsTex" OutName="ribs" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/> + <Texture Name="gHsEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/> + <Texture Name="gHsMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/> <Texture Name="gHsEyeTex" OutName="eye" Format="rgba16" Width="32" Height="16" Offset="0x5490" /> - <Texture Name="gHsPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5890" /> - <Texture Name="gHsFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x5990" /> + <Texture Name="gHsPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/> + <Texture Name="gHsFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/> <Texture Name="gHsBraceletTex" OutName="bracelet" Format="rgba16" Width="4" Height="4" Offset="0x5A90" /> - <Texture Name="gHsCuccoFeedBagTex" OutName="cucco_feed_bag" Format="ci8" Width="8" Height="8" Offset="0x5AB0" /> - <Texture Name="gHsChairBoxTex" OutName="chair_box" Format="ci8" Width="32" Height="32" Offset="0x5AF0" /> - <Texture Name="gHsAbsTex" OutName="abs" Format="ci8" Width="8" Height="16" Offset="0x5EF0" /> - <Texture Name="gHsBackTex" OutName="back" Format="ci8" Width="16" Height="32" Offset="0x5F70" /> + <Texture Name="gHsCuccoFeedBagTex" OutName="cucco_feed_bag" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/> + <Texture Name="gHsChairBoxTex" OutName="chair_box" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/> + <Texture Name="gHsAbsTex" OutName="abs" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/> + <Texture Name="gHsBackTex" OutName="back" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/> <Limb Name="gHsRootLimb" Type="Standard" EnumName="HS_LIMB_ROOT" Offset="0x6170" /> <Limb Name="gHsLeftUpperArmLimb" Type="Standard" EnumName="HS_LIMB_LEFT_UPPER_ARM" Offset="0x617C" /> <Limb Name="gHsLeftForearmLimb" Type="Standard" EnumName="HS_LIMB_LEFT_FOREARM" Offset="0x6188" /> diff --git a/assets/xml/objects/object_hsstump.xml b/assets/xml/objects/object_hsstump.xml index f8e466603..329e1a6e9 100644 --- a/assets/xml/objects/object_hsstump.xml +++ b/assets/xml/objects/object_hsstump.xml @@ -4,7 +4,7 @@ <DList Name="object_hsstump_DL_0003B8" Offset="0x3B8" /> <!-- Original name is "z2_miki_model" --> <Texture Name="object_hsstump_Tex_0005A0" OutName="tex_0005A0" Format="rgba16" Width="16" Height="16" Offset="0x5A0" /> <Texture Name="object_hsstump_TLUT_0007A0" OutName="tlut_0007A0" Format="rgba16" Width="4" Height="4" Offset="0x7A0" /> - <Texture Name="object_hsstump_Tex_0007C0" OutName="tex_0007C0" Format="ci4" Width="64" Height="64" Offset="0x7C0" /> + <Texture Name="object_hsstump_Tex_0007C0" OutName="tex_0007C0" Format="ci4" Width="64" Height="64" Offset="0x7C0" TlutOffset="0x7A0"/> <Collision Name="object_hsstump_Colheader_0011B0" Offset="0x11B0" /> <!-- Original name is "z2_miki_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_ikana_obj.xml b/assets/xml/objects/object_ikana_obj.xml index 0b67e7757..487bb5a0b 100644 --- a/assets/xml/objects/object_ikana_obj.xml +++ b/assets/xml/objects/object_ikana_obj.xml @@ -37,7 +37,7 @@ <!-- <Blob Name="object_ikana_obj_Blob_008550" Size="0x40" Offset="0x8550" /> --> <Texture Name="object_ikana_obj_TLUT_008590" OutName="tlut_008590" Format="rgba16" Width="4" Height="4" Offset="0x8590" /> <Texture Name="object_ikana_obj_Tex_0085B0" OutName="tex_0085B0" Format="rgba16" Width="16" Height="16" Offset="0x85B0" /> - <Texture Name="object_ikana_obj_Tex_0087B0" OutName="tex_0087B0" Format="ci4" Width="64" Height="64" Offset="0x87B0" /> + <Texture Name="object_ikana_obj_Tex_0087B0" OutName="tex_0087B0" Format="ci4" Width="64" Height="64" Offset="0x87B0" TlutOffset="0x8530"/> <Texture Name="gStoneTowerTemplePunchablePillarTex" OutName="stone_tower_temple_punchable_pillar" Format="rgba16" Width="32" Height="64" Offset="0x8FB0" /> <Texture Name="gStoneTowerTempleMirrorFrameTex" OutName="stone_tower_temple_mirror_frame" Format="rgba16" Width="16" Height="16" Offset="0x9FB0" /> <Texture Name="object_ikana_obj_Tex_00A1B0" OutName="tex_00A1B0" Format="rgba16" Width="16" Height="16" Offset="0xA1B0" /> @@ -45,7 +45,7 @@ <Texture Name="object_ikana_obj_Tex_00ABB0" OutName="tex_00ABB0" Format="rgba16" Width="32" Height="32" Offset="0xABB0" /> <Texture Name="object_ikana_obj_Tex_00B3B0" OutName="tex_00B3B0" Format="rgba16" Width="16" Height="16" Offset="0xB3B0" /> <Texture Name="object_ikana_obj_Tex_00B5B0" OutName="tex_00B5B0" Format="rgba16" Width="32" Height="32" Offset="0xB5B0" /> - <Texture Name="object_ikana_obj_Tex_00BDB0" OutName="tex_00BDB0" Format="ci4" Width="16" Height="128" Offset="0xBDB0" /> + <Texture Name="object_ikana_obj_Tex_00BDB0" OutName="tex_00BDB0" Format="ci4" Width="16" Height="128" Offset="0xBDB0" TlutOffset="0x8590"/> <Texture Name="object_ikana_obj_Tex_00C1B0" OutName="tex_00C1B0" Format="rgba16" Width="16" Height="64" Offset="0xC1B0" /> <Texture Name="object_ikana_obj_Tex_00C9B0" OutName="tex_00C9B0" Format="ia8" Width="32" Height="64" Offset="0xC9B0" /> <Texture Name="object_ikana_obj_Tex_00D1B0" OutName="tex_00D1B0" Format="rgba16" Width="16" Height="64" Offset="0xD1B0" /> diff --git a/assets/xml/objects/object_ikninside_obj.xml b/assets/xml/objects/object_ikninside_obj.xml index 26d1e1206..7a2aaf182 100644 --- a/assets/xml/objects/object_ikninside_obj.xml +++ b/assets/xml/objects/object_ikninside_obj.xml @@ -7,8 +7,8 @@ <Texture Name="object_ikninside_obj_Tex_003120" OutName="tex_003120" Format="rgba16" Width="32" Height="64" Offset="0x3120" /> <DList Name="object_ikninside_obj_DL_004440" Offset="0x4440" /> <!-- Original name is "w2_ikn_marutobira_model" --> <Texture Name="object_ikninside_obj_TLUT_004620" OutName="tlut_004620" Format="rgba16" Width="16" Height="16" Offset="0x4620" /> - <Texture Name="object_ikninside_obj_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="64" Offset="0x4820" /> - <Texture Name="object_ikninside_obj_Tex_005020" OutName="tex_005020" Format="ci8" Width="16" Height="32" Offset="0x5020" /> + <Texture Name="object_ikninside_obj_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="64" Offset="0x4820" TlutOffset="0x4620"/> + <Texture Name="object_ikninside_obj_Tex_005020" OutName="tex_005020" Format="ci8" Width="16" Height="32" Offset="0x5020" TlutOffset="0x4620"/> <DList Name="object_ikninside_obj_DL_005260" Offset="0x5260" /> <!-- Original name is "w2_ikn_zenetu_model" --> <Texture Name="object_ikninside_obj_Tex_0052F0" OutName="tex_0052F0" Format="ia16" Width="16" Height="64" Offset="0x52F0" /> <!-- <Blob Name="object_ikninside_obj_Blob_005AF0" Size="0x220" Offset="0x5AF0" /> --> diff --git a/assets/xml/objects/object_iknv_obj.xml b/assets/xml/objects/object_iknv_obj.xml index d5685b53f..cd2df5ed9 100644 --- a/assets/xml/objects/object_iknv_obj.xml +++ b/assets/xml/objects/object_iknv_obj.xml @@ -2,7 +2,7 @@ <File Name="object_iknv_obj" Segment="6"> <Texture Name="object_iknv_obj_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" /> <Texture Name="object_iknv_obj_Tex_000020" OutName="tex_000020" Format="rgba16" Width="32" Height="32" Offset="0x20" /> - <Texture Name="object_iknv_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="32" Height="128" Offset="0x820" /> + <Texture Name="object_iknv_obj_Tex_000820" OutName="tex_000820" Format="ci4" Width="32" Height="128" Offset="0x820" TlutOffset="0x0"/> <Texture Name="object_iknv_obj_Tex_001020" OutName="tex_001020" Format="rgba16" Width="64" Height="32" Offset="0x1020" /> <Texture Name="object_iknv_obj_Tex_002020" OutName="tex_002020" Format="rgba16" Width="32" Height="32" Offset="0x2020" /> <Texture Name="object_iknv_obj_Tex_002820" OutName="tex_002820" Format="rgba16" Width="16" Height="16" Offset="0x2820" /> @@ -18,7 +18,7 @@ <Texture Name="object_iknv_obj_Tex_004A60" OutName="tex_004A60" Format="rgba16" Width="32" Height="32" Offset="0x4A60" /> <Texture Name="object_iknv_obj_Tex_005260" OutName="tex_005260" Format="i4" Width="64" Height="64" Offset="0x5260" /> <Texture Name="object_iknv_obj_Tex_005A60" OutName="tex_005A60" Format="i4" Width="64" Height="64" Offset="0x5A60" /> - <Texture Name="object_iknv_obj_Tex_006260" OutName="tex_006260" Format="ci4" Width="32" Height="128" Offset="0x6260" /> + <Texture Name="object_iknv_obj_Tex_006260" OutName="tex_006260" Format="ci4" Width="32" Height="128" Offset="0x6260" TlutOffset="0x4240"/> <Texture Name="object_iknv_obj_Tex_006A60" OutName="tex_006A60" Format="i8" Width="16" Height="16" Offset="0x6A60" /> <Texture Name="object_iknv_obj_Tex_006B60" OutName="tex_006B60" Format="rgba16" Width="32" Height="32" Offset="0x6B60" /> <Texture Name="object_iknv_obj_Tex_007360" OutName="tex_007360" Format="i8" Width="32" Height="64" Offset="0x7360" /> diff --git a/assets/xml/objects/object_jg.xml b/assets/xml/objects/object_jg.xml index c3e1ac18a..4226c937e 100644 --- a/assets/xml/objects/object_jg.xml +++ b/assets/xml/objects/object_jg.xml @@ -50,22 +50,22 @@ <!-- Goron Elder Textures --> <Texture Name="gGoronElderTLUT" OutName="goron_elder_palette" Format="rgba16" Width="16" Height="16" Offset="0x14380" /> - <Texture Name="gGoronElderSkinTex" OutName="goron_elder_skin" Format="ci8" Width="8" Height="8" Offset="0x14580" /> - <Texture Name="gGoronElderToesTex" OutName="goron_elder_toes" Format="ci8" Width="32" Height="16" Offset="0x145C0" /> - <Texture Name="gGoronElderFootBottomTex" OutName="goron_elder_foot_bottom" Format="ci8" Width="32" Height="32" Offset="0x147C0" /> - <Texture Name="gGoronElderVeinsTex" OutName="goron_elder_veins" Format="ci8" Width="32" Height="32" Offset="0x14BC0" /> - <Texture Name="gGoronElderSpotsTex" OutName="goron_elder_spots" Format="ci8" Width="16" Height="16" Offset="0x14FC0" /> + <Texture Name="gGoronElderSkinTex" OutName="goron_elder_skin" Format="ci8" Width="8" Height="8" Offset="0x14580" TlutOffset="0x14380"/> + <Texture Name="gGoronElderToesTex" OutName="goron_elder_toes" Format="ci8" Width="32" Height="16" Offset="0x145C0" TlutOffset="0x14380"/> + <Texture Name="gGoronElderFootBottomTex" OutName="goron_elder_foot_bottom" Format="ci8" Width="32" Height="32" Offset="0x147C0" TlutOffset="0x14380"/> + <Texture Name="gGoronElderVeinsTex" OutName="goron_elder_veins" Format="ci8" Width="32" Height="32" Offset="0x14BC0" TlutOffset="0x14380"/> + <Texture Name="gGoronElderSpotsTex" OutName="goron_elder_spots" Format="ci8" Width="16" Height="16" Offset="0x14FC0" TlutOffset="0x14380"/> <Texture Name="gGoronElderLowerLipTex" OutName="goron_elder_lower_lip" Format="rgba16" Width="8" Height="16" Offset="0x150C0" /> <Texture Name="gGoronElderLipTex" OutName="goron_elder_lip" Format="rgba16" Width="8" Height="8" Offset="0x151C0" /> <Texture Name="gGoronElderHairTex" OutName="goron_elder_hair" Format="rgba16" Width="16" Height="32" Offset="0x15240" /> - <Texture Name="gGoronElderNostrilAndBellyButtonTex" OutName="goron_elder_nostril_and_belly_button" Format="ci8" Width="8" Height="8" Offset="0x15640" /> - <Texture Name="gGoronElderCheekTex" OutName="goron_elder_cheek" Format="ci8" Width="8" Height="8" Offset="0x15680" /> - <Texture Name="gGoronElderBrowTex" OutName="goron_elder_brow" Format="ci8" Width="8" Height="8" Offset="0x156C0" /> + <Texture Name="gGoronElderNostrilAndBellyButtonTex" OutName="goron_elder_nostril_and_belly_button" Format="ci8" Width="8" Height="8" Offset="0x15640" TlutOffset="0x14380"/> + <Texture Name="gGoronElderCheekTex" OutName="goron_elder_cheek" Format="ci8" Width="8" Height="8" Offset="0x15680" TlutOffset="0x14380"/> + <Texture Name="gGoronElderBrowTex" OutName="goron_elder_brow" Format="ci8" Width="8" Height="8" Offset="0x156C0" TlutOffset="0x14380"/> <Texture Name="gGoronElderHairEndTex" OutName="goron_elder_hair_end" Format="rgba16" Width="32" Height="64" Offset="0x15700" /> - <Texture Name="gGoronElderFingersTex" OutName="goron_elder_fingers" Format="ci8" Width="16" Height="16" Offset="0x16700" /> - <Texture Name="gGoronElderGoronRubyTattooTex" OutName="goron_elder_goron_ruby_tattoo" Format="ci8" Width="16" Height="32" Offset="0x16800" /> - <Texture Name="gGoronElderChestTex" OutName="goron_elder_chest" Format="ci8" Width="32" Height="32" Offset="0x16A00" /> - <Texture Name="gGoronElderBackTex" OutName="goron_elder_back" Format="ci8" Width="32" Height="64" Offset="0x16E00" /> + <Texture Name="gGoronElderFingersTex" OutName="goron_elder_fingers" Format="ci8" Width="16" Height="16" Offset="0x16700" TlutOffset="0x14380"/> + <Texture Name="gGoronElderGoronRubyTattooTex" OutName="goron_elder_goron_ruby_tattoo" Format="ci8" Width="16" Height="32" Offset="0x16800" TlutOffset="0x14380"/> + <Texture Name="gGoronElderChestTex" OutName="goron_elder_chest" Format="ci8" Width="32" Height="32" Offset="0x16A00" TlutOffset="0x14380"/> + <Texture Name="gGoronElderBackTex" OutName="goron_elder_back" Format="ci8" Width="32" Height="64" Offset="0x16E00" TlutOffset="0x14380"/> <!-- Goron Elder Animations --> <Animation Name="gGoronElderDepressedAnim" Offset="0x18CE4" /> <!-- Original name is "jg_u_m_loop" --> diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml index e8d34729f..52a45a3d0 100644 --- a/assets/xml/objects/object_js.xml +++ b/assets/xml/objects/object_js.xml @@ -17,16 +17,16 @@ <DList Name="object_js_DL_005408" Offset="0x5408" /> <DList Name="object_js_DL_0055B0" Offset="0x55B0" /> <Texture Name="object_js_TLUT_005710" OutName="tlut_005710" Format="rgba16" Width="16" Height="16" Offset="0x5710" /> - <Texture Name="object_js_Tex_005910" OutName="tex_005910" Format="ci8" Width="8" Height="16" Offset="0x5910" /> - <Texture Name="object_js_Tex_005990" OutName="tex_005990" Format="ci8" Width="16" Height="16" Offset="0x5990" /> - <Texture Name="object_js_Tex_005A90" OutName="tex_005A90" Format="ci8" Width="32" Height="16" Offset="0x5A90" /> - <Texture Name="object_js_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="8" Height="8" Offset="0x5C90" /> - <Texture Name="object_js_Tex_005CD0" OutName="tex_005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" /> - <Texture Name="object_js_Tex_0060D0" OutName="tex_0060D0" Format="ci8" Width="16" Height="16" Offset="0x60D0" /> - <Texture Name="object_js_Tex_0061D0" OutName="tex_0061D0" Format="ci8" Width="16" Height="32" Offset="0x61D0" /> - <Texture Name="object_js_Tex_0063D0" OutName="tex_0063D0" Format="ci8" Width="16" Height="32" Offset="0x63D0" /> - <Texture Name="object_js_Tex_0065D0" OutName="tex_0065D0" Format="ci8" Width="16" Height="32" Offset="0x65D0" /> - <Texture Name="object_js_Tex_0067D0" OutName="tex_0067D0" Format="ci8" Width="16" Height="16" Offset="0x67D0" /> + <Texture Name="object_js_Tex_005910" OutName="tex_005910" Format="ci8" Width="8" Height="16" Offset="0x5910" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_005990" OutName="tex_005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_005A90" OutName="tex_005A90" Format="ci8" Width="32" Height="16" Offset="0x5A90" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="8" Height="8" Offset="0x5C90" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_005CD0" OutName="tex_005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_0060D0" OutName="tex_0060D0" Format="ci8" Width="16" Height="16" Offset="0x60D0" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_0061D0" OutName="tex_0061D0" Format="ci8" Width="16" Height="32" Offset="0x61D0" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_0063D0" OutName="tex_0063D0" Format="ci8" Width="16" Height="32" Offset="0x63D0" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_0065D0" OutName="tex_0065D0" Format="ci8" Width="16" Height="32" Offset="0x65D0" TlutOffset="0x5710"/> + <Texture Name="object_js_Tex_0067D0" OutName="tex_0067D0" Format="ci8" Width="16" Height="16" Offset="0x67D0" TlutOffset="0x5710"/> <Limb Name="object_js_Standardlimb_0068D0" Type="Standard" EnumName="OBJECT_JS_LIMB_01" Offset="0x68D0" /> <Limb Name="object_js_Standardlimb_0068DC" Type="Standard" EnumName="OBJECT_JS_LIMB_02" Offset="0x68DC" /> <Limb Name="object_js_Standardlimb_0068E8" Type="Standard" EnumName="OBJECT_JS_LIMB_03" Offset="0x68E8" /> diff --git a/assets/xml/objects/object_jso.xml b/assets/xml/objects/object_jso.xml index d94ffdafe..ee0943d11 100644 --- a/assets/xml/objects/object_jso.xml +++ b/assets/xml/objects/object_jso.xml @@ -33,8 +33,8 @@ <Texture Name="gGaroMasterRobeTex" OutName="garo_master_robe" Format="rgba16" Width="8" Height="32" Offset="0x2658" /> <Texture Name="gGaroMasterClothingTLUT" OutName="garo_master_clothing_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2858" /> <Texture Name="gGaroMasterMaskTLUT" OutName="garo_master_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2A58" /> - <Texture Name="gGaroMasterClothingTex" OutName="garo_master_clothing" Format="ci8" Width="16" Height="16" Offset="0x2C58" /> - <Texture Name="gGaroMasterMaskTex" OutName="garo_master_mask" Format="ci8" Width="16" Height="16" Offset="0x2D58" /> + <Texture Name="gGaroMasterClothingTex" OutName="garo_master_clothing" Format="ci8" Width="16" Height="16" Offset="0x2C58" TlutOffset="0x2858"/> + <Texture Name="gGaroMasterMaskTex" OutName="garo_master_mask" Format="ci8" Width="16" Height="16" Offset="0x2D58" TlutOffset="0x2A58"/> <!-- Garo Master Eyes Texture and DisplayList --> <DList Name="gGaroMasterEyesDL" Offset="0x2ED8" /> diff --git a/assets/xml/objects/object_kaizoku_obj.xml b/assets/xml/objects/object_kaizoku_obj.xml index c13f32125..d1b2df69b 100644 --- a/assets/xml/objects/object_kaizoku_obj.xml +++ b/assets/xml/objects/object_kaizoku_obj.xml @@ -15,18 +15,18 @@ <DList Name="gPirateGratedShutterDL" Offset="0x5720" /> <!-- Original name is "Y2_AMIshutter_model" --> <Collision Name="gPirateGratedShutterCol" Offset="0x5EC8" /> <!-- Original name is "Y2_AMIshutter_bgdatainfo" --> <Texture Name="object_kaizoku_obj_TLUT_005F00" OutName="tlut_005F00" Format="rgba16" Width="4" Height="4" Offset="0x5F00" /> - <Texture Name="object_kaizoku_obj_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" /> + <Texture Name="object_kaizoku_obj_Tex_005F20" OutName="tex_005F20" Format="ci4" Width="64" Height="64" Offset="0x5F20" TlutOffset="0x5F00"/> <DList Name="object_kaizoku_obj_DL_007630" Offset="0x7630" /> <!-- Original name is "Y2_boat_model" --> <Texture Name="object_kaizoku_obj_TLUT_0083C8" OutName="tlut_0083C8" Format="rgba16" Width="16" Height="16" Offset="0x83C8" /> <Texture Name="object_kaizoku_obj_TLUT_0085C8" OutName="tlut_0085C8" Format="rgba16" Width="4" Height="4" Offset="0x85C8" /> <Texture Name="object_kaizoku_obj_TLUT_0085E8" OutName="tlut_0085E8" Format="rgba16" Width="4" Height="4" Offset="0x85E8" /> - <Texture Name="object_kaizoku_obj_Tex_008608" OutName="tex_008608" Format="ci8" Width="16" Height="32" Offset="0x8608" /> - <Texture Name="object_kaizoku_obj_Tex_008808" OutName="tex_008808" Format="ci8" Width="32" Height="16" Offset="0x8808" /> - <Texture Name="object_kaizoku_obj_Tex_008A08" OutName="tex_008A08" Format="ci8" Width="16" Height="16" Offset="0x8A08" /> - <Texture Name="object_kaizoku_obj_Tex_008B08" OutName="tex_008B08" Format="ci4" Width="32" Height="32" Offset="0x8B08" /> - <Texture Name="object_kaizoku_obj_Tex_008D08" OutName="tex_008D08" Format="ci8" Width="32" Height="32" Offset="0x8D08" /> - <Texture Name="object_kaizoku_obj_Tex_009108" OutName="tex_009108" Format="ci8" Width="32" Height="32" Offset="0x9108" /> - <Texture Name="object_kaizoku_obj_Tex_009508" OutName="tex_009508" Format="ci4" Width="4" Height="4" Offset="0x9508" /> + <Texture Name="object_kaizoku_obj_Tex_008608" OutName="tex_008608" Format="ci8" Width="16" Height="32" Offset="0x8608" TlutOffset="0x83C8"/> + <Texture Name="object_kaizoku_obj_Tex_008808" OutName="tex_008808" Format="ci8" Width="32" Height="16" Offset="0x8808" TlutOffset="0x83C8"/> + <Texture Name="object_kaizoku_obj_Tex_008A08" OutName="tex_008A08" Format="ci8" Width="16" Height="16" Offset="0x8A08" TlutOffset="0x83C8"/> + <Texture Name="object_kaizoku_obj_Tex_008B08" OutName="tex_008B08" Format="ci4" Width="32" Height="32" Offset="0x8B08" TlutOffset="0x85C8"/> + <Texture Name="object_kaizoku_obj_Tex_008D08" OutName="tex_008D08" Format="ci8" Width="32" Height="32" Offset="0x8D08" TlutOffset="0x83C8"/> + <Texture Name="object_kaizoku_obj_Tex_009108" OutName="tex_009108" Format="ci8" Width="32" Height="32" Offset="0x9108" TlutOffset="0x83C8"/> + <Texture Name="object_kaizoku_obj_Tex_009508" OutName="tex_009508" Format="ci4" Width="4" Height="4" Offset="0x9508" TlutOffset="0x85E8"/> <Collision Name="object_kaizoku_obj_Colheader_009A88" Offset="0x9A88" /> <!-- Original name is "Y2_boat_bgdatainfo" --> <DList Name="gPiratesFortressDoorDL" Offset="0x9F20" /> <!-- Original name is "Y2_KaizokuDoor_model" --> <Texture Name="gPiratesFortressDoorTex" OutName="door" Format="rgba16" Width="16" Height="64" Offset="0xA210" /> @@ -34,8 +34,8 @@ <DList Name="object_kaizoku_obj_DL_00AD50" Offset="0xAD50" /> <!-- Original name is "Y2_kibako_model" --> <Texture Name="object_kaizoku_obj_TLUT_00AF38" OutName="tlut_00AF38" Format="rgba16" Width="4" Height="4" Offset="0xAF38" /> <Texture Name="object_kaizoku_obj_TLUT_00AF58" OutName="tlut_00AF58" Format="rgba16" Width="4" Height="4" Offset="0xAF58" /> - <Texture Name="object_kaizoku_obj_Tex_00AF78" OutName="tex_00AF78" Format="ci4" Width="32" Height="64" Offset="0xAF78" /> - <Texture Name="object_kaizoku_obj_Tex_00B378" OutName="tex_00B378" Format="ci4" Width="32" Height="64" Offset="0xB378" /> + <Texture Name="object_kaizoku_obj_Tex_00AF78" OutName="tex_00AF78" Format="ci4" Width="32" Height="64" Offset="0xAF78" TlutOffset="0xAF38"/> + <Texture Name="object_kaizoku_obj_Tex_00B378" OutName="tex_00B378" Format="ci4" Width="32" Height="64" Offset="0xB378" TlutOffset="0xAF58"/> <Collision Name="object_kaizoku_obj_Colheader_00B868" Offset="0xB868" /> <!-- Original name is "Y2_kibako_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_kamejima.xml b/assets/xml/objects/object_kamejima.xml index 569683821..7994b24c8 100644 --- a/assets/xml/objects/object_kamejima.xml +++ b/assets/xml/objects/object_kamejima.xml @@ -24,8 +24,8 @@ <DList Name="gTurtleAsleepDL" Offset="0x4E70" /> <!-- When asleep, the turtle looks like a giant rock. Original name is "kam_sima_3_model" --> <Texture Name="gTurtleAsleepTLUT" OutName="turtle_asleep_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5248" /> - <Texture Name="gTurtleAsleepGrassTex" OutName="turtle_asleep_grass" Format="ci8" Width="32" Height="32" Offset="0x5448" /> - <Texture Name="gTurtleAsleepGrassDirtTex" OutName="turtle_asleep_grass_dirt" Format="ci8" Width="64" Height="32" Offset="0x5848" /> + <Texture Name="gTurtleAsleepGrassTex" OutName="turtle_asleep_grass" Format="ci8" Width="32" Height="32" Offset="0x5448" TlutOffset="0x5248"/> + <Texture Name="gTurtleAsleepGrassDirtTex" OutName="turtle_asleep_grass_dirt" Format="ci8" Width="64" Height="32" Offset="0x5848" TlutOffset="0x5248"/> <TextureAnimation Name="gTurtleEmpty2TexAnim" Offset="0x6050" /> @@ -48,11 +48,11 @@ <Texture Name="gTurtleSkinTLUT" OutName="turtle_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" /> <Texture Name="gTurtleTLUT" OutName="turtle_tlut" Format="rgba16" Width="16" Height="16" Offset="0xACD8" /> - <Texture Name="gTurtleNostrilTex" OutName="turtle_nostril" Format="ci8" Width="32" Height="32" Offset="0xAED8" /> - <Texture Name="gTurtleInsideUpperMouthTex" OutName="turtle_inside_upper_mouth" Format="ci8" Width="16" Height="16" Offset="0xB2D8" /> - <Texture Name="gTurtleInsideLowerMouthTex" OutName="turtle_inside_lower_mouth" Format="ci8" Width="16" Height="32" Offset="0xB3D8"/> - <Texture Name="gTurtleSpottedSkinTex" OutName="turtle_spotted_skin" Format="ci8" Width="64" Height="32" Offset="0xB5D8"/> - <Texture Name="gTurtleSkinTex" OutName="turtle_skin" Format="ci8" Width="16" Height="16" Offset="0xBDD8" /> + <Texture Name="gTurtleNostrilTex" OutName="turtle_nostril" Format="ci8" Width="32" Height="32" Offset="0xAED8" TlutOffset="0xAAD8"/> + <Texture Name="gTurtleInsideUpperMouthTex" OutName="turtle_inside_upper_mouth" Format="ci8" Width="16" Height="16" Offset="0xB2D8" TlutOffset="0xACD8"/> + <Texture Name="gTurtleInsideLowerMouthTex" OutName="turtle_inside_lower_mouth" Format="ci8" Width="16" Height="32" Offset="0xB3D8" TlutOffset="0xACD8"/> + <Texture Name="gTurtleSpottedSkinTex" OutName="turtle_spotted_skin" Format="ci8" Width="64" Height="32" Offset="0xB5D8" TlutOffset="0xAAD8"/> + <Texture Name="gTurtleSkinTex" OutName="turtle_skin" Format="ci8" Width="16" Height="16" Offset="0xBDD8" TlutOffset="0xAAD8"/> <Texture Name="gTurtleEyeOpenStraightTex" OutName="turtle_eye_open_straight" Format="ci8" Width="32" Height="32" Offset="0xBED8" TlutOffset="0xAAD8"/> <Texture Name="gTurtleEyeHalfStraightTex" OutName="turtle_eye_half_straight" Format="ci8" Width="32" Height="32" Offset="0xC2D8" TlutOffset="0xAAD8"/> <Texture Name="gTurtleEyeClosedTex" OutName="turtle_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xC6D8" TlutOffset="0xAAD8"/> @@ -60,10 +60,10 @@ <Texture Name="gTurtleEyeOpenRightTex" OutName="turtle_eye_half_right" Format="ci8" Width="32" Height="32" Offset="0xCED8" TlutOffset="0xAAD8"/> <Texture Name="gTurtleEyeOpenLeftTex" OutName="turtle_eye_half_left_2" Format="ci8" Width="32" Height="32" Offset="0xD2D8" TlutOffset="0xAAD8"/> - <Texture Name="gTurtleHeadTex" OutName="turtle_head" Format="ci8" Width="16" Height="16" Offset="0xD6D8"/> - <Texture Name="gTurtleShellGrassTex" OutName="turtle_shell_grass" Format="ci8" Width="32" Height="64" Offset="0xD7D8" /> - <Texture Name="gTurtleShellScutesTex" OutName="turtle_shell_scutes" Format="ci8" Width="32" Height="32" Offset="0xDFD8"/> - <Texture Name="gTurtleShellBottomTex" OutName="turtle_shell_bottom" Format="ci8" Width="16" Height="32" Offset="0xE3D8"/> + <Texture Name="gTurtleHeadTex" OutName="turtle_head" Format="ci8" Width="16" Height="16" Offset="0xD6D8" TlutOffset="0xAAD8"/> + <Texture Name="gTurtleShellGrassTex" OutName="turtle_shell_grass" Format="ci8" Width="32" Height="64" Offset="0xD7D8" TlutOffset="0xACD8"/> + <Texture Name="gTurtleShellScutesTex" OutName="turtle_shell_scutes" Format="ci8" Width="32" Height="32" Offset="0xDFD8" TlutOffset="0xACD8"/> + <Texture Name="gTurtleShellBottomTex" OutName="turtle_shell_bottom" Format="ci8" Width="16" Height="32" Offset="0xE3D8" TlutOffset="0xAAD8"/> <Limb Name="gTurtleRootLimb" Type="Standard" EnumName="TURTLE_LIMB_ROOT" Offset="0xE5D8" /> <Limb Name="gTurtleShellLimb" Type="Standard" EnumName="TURTLE_LIMB_SHELL" Offset="0xE5E4" /> diff --git a/assets/xml/objects/object_kbt.xml b/assets/xml/objects/object_kbt.xml index bf6078da8..567a38c67 100644 --- a/assets/xml/objects/object_kbt.xml +++ b/assets/xml/objects/object_kbt.xml @@ -29,19 +29,19 @@ <DList Name="object_kbt_DL_008E98" Offset="0x8E98" /> <Texture Name="object_kbt_TLUT_009078" OutName="tlut_009078" Format="rgba16" Width="16" Height="16" Offset="0x9078" /> <Texture Name="object_kbt_Tex_009278" OutName="tex_009278" Format="i8" Width="16" Height="16" Offset="0x9278" /> - <Texture Name="object_kbt_Tex_009378" OutName="tex_009378" Format="ci8" Width="16" Height="16" Offset="0x9378" /> + <Texture Name="object_kbt_Tex_009378" OutName="tex_009378" Format="ci8" Width="16" Height="16" Offset="0x9378" TlutOffset="0x9078"/> <Texture Name="object_kbt_Tex_009478" OutName="tex_009478" Format="rgba16" Width="16" Height="16" Offset="0x9478" /> <Texture Name="object_kbt_Tex_009678" OutName="tex_009678" Format="rgba16" Width="32" Height="32" Offset="0x9678" /> - <Texture Name="object_kbt_Tex_009E78" OutName="tex_009E78" Format="ci8" Width="8" Height="8" Offset="0x9E78" /> - <Texture Name="object_kbt_Tex_009EB8" OutName="tex_009EB8" Format="ci8" Width="8" Height="8" Offset="0x9EB8" /> + <Texture Name="object_kbt_Tex_009E78" OutName="tex_009E78" Format="ci8" Width="8" Height="8" Offset="0x9E78" TlutOffset="0x9078"/> + <Texture Name="object_kbt_Tex_009EB8" OutName="tex_009EB8" Format="ci8" Width="8" Height="8" Offset="0x9EB8" TlutOffset="0x9078"/> <Texture Name="object_kbt_Tex_009EF8" OutName="tex_009EF8" Format="rgba16" Width="8" Height="8" Offset="0x9EF8" /> - <Texture Name="object_kbt_Tex_009F78" OutName="tex_009F78" Format="ci8" Width="16" Height="16" Offset="0x9F78" /> + <Texture Name="object_kbt_Tex_009F78" OutName="tex_009F78" Format="ci8" Width="16" Height="16" Offset="0x9F78" TlutOffset="0x9078"/> <Texture Name="object_kbt_Tex_00A078" OutName="tex_00A078" Format="rgba16" Width="8" Height="8" Offset="0xA078" /> - <Texture Name="object_kbt_Tex_00A0F8" OutName="tex_00A0F8" Format="ci8" Width="16" Height="16" Offset="0xA0F8" /> - <Texture Name="object_kbt_Tex_00A1F8" OutName="tex_00A1F8" Format="ci8" Width="16" Height="16" Offset="0xA1F8" /> - <Texture Name="object_kbt_Tex_00A2F8" OutName="tex_00A2F8" Format="ci8" Width="8" Height="8" Offset="0xA2F8" /> + <Texture Name="object_kbt_Tex_00A0F8" OutName="tex_00A0F8" Format="ci8" Width="16" Height="16" Offset="0xA0F8" TlutOffset="0x9078"/> + <Texture Name="object_kbt_Tex_00A1F8" OutName="tex_00A1F8" Format="ci8" Width="16" Height="16" Offset="0xA1F8" TlutOffset="0x9078"/> + <Texture Name="object_kbt_Tex_00A2F8" OutName="tex_00A2F8" Format="ci8" Width="8" Height="8" Offset="0xA2F8" TlutOffset="0x9078"/> <Texture Name="object_kbt_Tex_00A338" OutName="tex_00A338" Format="rgba16" Width="8" Height="8" Offset="0xA338" /> - <Texture Name="object_kbt_Tex_00A3B8" OutName="tex_00A3B8" Format="ci8" Width="16" Height="32" Offset="0xA3B8" /> + <Texture Name="object_kbt_Tex_00A3B8" OutName="tex_00A3B8" Format="ci8" Width="16" Height="32" Offset="0xA3B8" TlutOffset="0x9078"/> <Texture Name="object_kbt_Tex_00A5B8" OutName="tex_00A5B8" Format="rgba16" Width="32" Height="32" Offset="0xA5B8" /> <Texture Name="object_kbt_Tex_00ADB8" OutName="tex_00ADB8" Format="rgba16" Width="32" Height="32" Offset="0xADB8" /> <Texture Name="object_kbt_Tex_00B5B8" OutName="tex_00B5B8" Format="rgba16" Width="32" Height="32" Offset="0xB5B8" /> diff --git a/assets/xml/objects/object_kepn_koya.xml b/assets/xml/objects/object_kepn_koya.xml index cc14f0556..89aacad47 100644 --- a/assets/xml/objects/object_kepn_koya.xml +++ b/assets/xml/objects/object_kepn_koya.xml @@ -3,16 +3,16 @@ <DList Name="object_kepn_koya_DL_003470" Offset="0x3470" /> <!-- Original name is "w2_kepn_koya_modelT" --> <DList Name="object_kepn_koya_DL_003478" Offset="0x3478" /> <!-- Original name is "w2_kepn_koya_model" --> <Texture Name="object_kepn_koya_TLUT_005118" OutName="tlut_005118" Format="rgba16" Width="16" Height="16" Offset="0x5118" /> - <Texture Name="object_kepn_koya_Tex_005318" OutName="tex_005318" Format="ci8" Width="16" Height="16" Offset="0x5318" /> - <Texture Name="object_kepn_koya_Tex_005418" OutName="tex_005418" Format="ci8" Width="64" Height="32" Offset="0x5418" /> - <Texture Name="object_kepn_koya_Tex_005C18" OutName="tex_005C18" Format="ci8" Width="32" Height="64" Offset="0x5C18" /> - <Texture Name="object_kepn_koya_Tex_006418" OutName="tex_006418" Format="ci8" Width="16" Height="32" Offset="0x6418" /> - <Texture Name="object_kepn_koya_Tex_006618" OutName="tex_006618" Format="ci8" Width="16" Height="32" Offset="0x6618" /> - <Texture Name="object_kepn_koya_Tex_006818" OutName="tex_006818" Format="ci8" Width="32" Height="16" Offset="0x6818" /> - <Texture Name="object_kepn_koya_Tex_006A18" OutName="tex_006A18" Format="ci8" Width="64" Height="16" Offset="0x6A18" /> - <Texture Name="object_kepn_koya_Tex_006E18" OutName="tex_006E18" Format="ci8" Width="32" Height="32" Offset="0x6E18" /> + <Texture Name="object_kepn_koya_Tex_005318" OutName="tex_005318" Format="ci8" Width="16" Height="16" Offset="0x5318" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_005418" OutName="tex_005418" Format="ci8" Width="64" Height="32" Offset="0x5418" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_005C18" OutName="tex_005C18" Format="ci8" Width="32" Height="64" Offset="0x5C18" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_006418" OutName="tex_006418" Format="ci8" Width="16" Height="32" Offset="0x6418" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_006618" OutName="tex_006618" Format="ci8" Width="16" Height="32" Offset="0x6618" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_006818" OutName="tex_006818" Format="ci8" Width="32" Height="16" Offset="0x6818" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_006A18" OutName="tex_006A18" Format="ci8" Width="64" Height="16" Offset="0x6A18" TlutOffset="0x5118"/> + <Texture Name="object_kepn_koya_Tex_006E18" OutName="tex_006E18" Format="ci8" Width="32" Height="32" Offset="0x6E18" TlutOffset="0x5118"/> <Texture Name="object_kepn_koya_Tex_007218" OutName="tex_007218" Format="rgba16" Width="8" Height="8" Offset="0x7218" /> - <Texture Name="object_kepn_koya_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" /> + <Texture Name="object_kepn_koya_Tex_007298" OutName="tex_007298" Format="ci8" Width="8" Height="8" Offset="0x7298" TlutOffset="0x5118"/> <Collision Name="object_kepn_koya_Colheader_00805C" Offset="0x805C" /> <!-- Original name is "w2_kepn_koya_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_kgy.xml b/assets/xml/objects/object_kgy.xml index b83234b8c..3591d47dc 100644 --- a/assets/xml/objects/object_kgy.xml +++ b/assets/xml/objects/object_kgy.xml @@ -28,16 +28,16 @@ <DList Name="object_kgy_DL_00B978" Offset="0xB978" /> <Texture Name="object_kgy_TLUT_00BC28" OutName="tlut_00BC28" Format="rgba16" Width="16" Height="16" Offset="0xBC28" /> <Texture Name="object_kgy_Tex_00BE28" OutName="tex_00BE28" Format="rgba16" Width="32" Height="32" Offset="0xBE28" /> - <Texture Name="object_kgy_Tex_00C628" OutName="tex_00C628" Format="ci8" Width="16" Height="16" Offset="0xC628" /> - <Texture Name="object_kgy_Tex_00C728" OutName="tex_00C728" Format="ci8" Width="16" Height="16" Offset="0xC728" /> - <Texture Name="object_kgy_Tex_00C828" OutName="tex_00C828" Format="ci8" Width="32" Height="32" Offset="0xC828" /> - <Texture Name="object_kgy_Tex_00CC28" OutName="tex_00CC28" Format="ci8" Width="32" Height="32" Offset="0xCC28" /> + <Texture Name="object_kgy_Tex_00C628" OutName="tex_00C628" Format="ci8" Width="16" Height="16" Offset="0xC628" TlutOffset="0xBC28"/> + <Texture Name="object_kgy_Tex_00C728" OutName="tex_00C728" Format="ci8" Width="16" Height="16" Offset="0xC728" TlutOffset="0xBC28"/> + <Texture Name="object_kgy_Tex_00C828" OutName="tex_00C828" Format="ci8" Width="32" Height="32" Offset="0xC828" TlutOffset="0xBC28"/> + <Texture Name="object_kgy_Tex_00CC28" OutName="tex_00CC28" Format="ci8" Width="32" Height="32" Offset="0xCC28" TlutOffset="0xBC28"/> <Texture Name="object_kgy_Tex_00D028" OutName="tex_00D028" Format="rgba16" Width="32" Height="32" Offset="0xD028" /> - <Texture Name="object_kgy_Tex_00D828" OutName="tex_00D828" Format="ci8" Width="16" Height="16" Offset="0xD828" /> + <Texture Name="object_kgy_Tex_00D828" OutName="tex_00D828" Format="ci8" Width="16" Height="16" Offset="0xD828" TlutOffset="0xBC28"/> <Texture Name="object_kgy_Tex_00D928" OutName="tex_00D928" Format="rgba16" Width="32" Height="32" Offset="0xD928" /> - <Texture Name="object_kgy_Tex_00E128" OutName="tex_00E128" Format="ci8" Width="16" Height="16" Offset="0xE128" /> + <Texture Name="object_kgy_Tex_00E128" OutName="tex_00E128" Format="ci8" Width="16" Height="16" Offset="0xE128" TlutOffset="0xBC28"/> <Texture Name="object_kgy_Tex_00E228" OutName="tex_00E228" Format="i8" Width="32" Height="32" Offset="0xE228" /> - <Texture Name="object_kgy_Tex_00E628" OutName="tex_00E628" Format="ci8" Width="16" Height="16" Offset="0xE628" /> + <Texture Name="object_kgy_Tex_00E628" OutName="tex_00E628" Format="ci8" Width="16" Height="16" Offset="0xE628" TlutOffset="0xBC28"/> <DList Name="object_kgy_DL_00E8E8" Offset="0xE8E8" /> <DList Name="object_kgy_DL_00E8F0" Offset="0xE8F0" /> <!-- Original name is "swordA_model" --> <TextureAnimation Name="object_kgy_Matanimheader_00EE58" Offset="0xEE58" /> diff --git a/assets/xml/objects/object_kibako2.xml b/assets/xml/objects/object_kibako2.xml index 180038e82..9a5b6669e 100644 --- a/assets/xml/objects/object_kibako2.xml +++ b/assets/xml/objects/object_kibako2.xml @@ -2,12 +2,12 @@ <!-- Object for large wooden crate --> <File Name="object_kibako2" Segment="6"> <Texture Name="gLargeCrateTLUT" OutName="large_crate_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" /> - <Texture Name="gLargeCrateTopTex" OutName="large_crate_top" Format="ci4" Width="32" Height="64" Offset="0x20" /> - <Texture Name="gLargeCrateSidesTex" OutName="large_crate_sides" Format="ci4" Width="32" Height="64" Offset="0x420" /> + <Texture Name="gLargeCrateTopTex" OutName="large_crate_top" Format="ci4" Width="32" Height="64" Offset="0x20" TlutOffset="0x0"/> + <Texture Name="gLargeCrateSidesTex" OutName="large_crate_sides" Format="ci4" Width="32" Height="64" Offset="0x420" TlutOffset="0x0"/> <DList Name="gLargeCrateDL" Offset="0x960" /> <!-- Original name is "CIkibako_model" --> <Collision Name="gLargeCrateCol" Offset="0xB70" /> <!-- Original name is "CIkibako_bgdatainfo" --> <Texture Name="gLargeCrateFragmentTLUT" OutName="large_crate_fragment_tlut" Format="rgba16" Width="4" Height="4" Offset="0xBA0" /> - <Texture Name="gLargeCrateFragmentTex" OutName="large_crate_fragment" Format="ci4" Width="32" Height="64" Offset="0xBC0" /> + <Texture Name="gLargeCrateFragmentTex" OutName="large_crate_fragment" Format="ci4" Width="32" Height="64" Offset="0xBC0" TlutOffset="0xBA0"/> <DList Name="gLargeCrateFragment1DL" Offset="0x1040" /> <!-- Original name is "CIkibako_hahen_model" --> <DList Name="gLargeCrateFragment2DL" Offset="0x1100" /> <!-- Original name is "CIkibako_hahen2_model" --> </File> diff --git a/assets/xml/objects/object_kin2_obj.xml b/assets/xml/objects/object_kin2_obj.xml index 6e63f19cd..ae393ed48 100644 --- a/assets/xml/objects/object_kin2_obj.xml +++ b/assets/xml/objects/object_kin2_obj.xml @@ -34,7 +34,7 @@ <Texture Name="gOceanSpiderHouseBombableWallCrackTex" OutName="ocean_spider_house_bombable_wall_crack" Format="ia8" Width="64" Height="64" Offset="0x13C0" /> <Texture Name="gOceanSpiderHouseBookshelfWoodTex" OutName="ocean_spider_house_bookshelf_wood" Format="rgba16" Width="32" Height="32" Offset="0x23C0" /> <Texture Name="gOceanSpiderHouseFireplaceGrateTex" OutName="ocean_spider_house_fireplace_grate" Format="rgba16" Width="32" Height="32" Offset="0x2BC0" /> - <Texture Name="gOceanSpiderHouseSkullkidPaintingTex" OutName="ocean_spider_house_skullkid_painting" Format="ci4" Width="64" Height="64" Offset="0x33C0" /> + <Texture Name="gOceanSpiderHouseSkullkidPaintingTex" OutName="ocean_spider_house_skullkid_painting" Format="ci4" Width="64" Height="64" Offset="0x33C0" TlutOffset="0x1380"/> <Texture Name="gOceanSpiderHouseChestOfDrawersFrontTex" OutName="ocean_spider_house_chest_of_drawers_front" Format="rgba16" Width="32" Height="64" Offset="0x3BC0" /> <Texture Name="gOceanSpiderHouseChestOfDrawersBackTex" OutName="ocean_spider_house_chest_of_drawers_back" Format="rgba16" Width="32" Height="64" Offset="0x4BC0" /> diff --git a/assets/xml/objects/object_kitan.xml b/assets/xml/objects/object_kitan.xml index 002198680..8f8bfdf18 100644 --- a/assets/xml/objects/object_kitan.xml +++ b/assets/xml/objects/object_kitan.xml @@ -25,11 +25,11 @@ <DList Name="object_kitan_DL_0070F0" Offset="0x70F0" /> <DList Name="object_kitan_DL_007470" Offset="0x7470" /> <Texture Name="object_kitan_TLUT_007668" OutName="tlut_007668" Format="rgba16" Width="16" Height="16" Offset="0x7668" /> - <Texture Name="object_kitan_Tex_007868" OutName="tex_007868" Format="ci8" Width="32" Height="16" Offset="0x7868" /> - <Texture Name="object_kitan_Tex_007A68" OutName="tex_007A68" Format="ci8" Width="16" Height="16" Offset="0x7A68" /> - <Texture Name="object_kitan_Tex_007B68" OutName="tex_007B68" Format="ci8" Width="16" Height="16" Offset="0x7B68" /> - <Texture Name="object_kitan_Tex_007C68" OutName="tex_007C68" Format="ci8" Width="16" Height="16" Offset="0x7C68" /> - <Texture Name="object_kitan_Tex_007D68" OutName="tex_007D68" Format="ci8" Width="16" Height="16" Offset="0x7D68" /> + <Texture Name="object_kitan_Tex_007868" OutName="tex_007868" Format="ci8" Width="32" Height="16" Offset="0x7868" TlutOffset="0x7668"/> + <Texture Name="object_kitan_Tex_007A68" OutName="tex_007A68" Format="ci8" Width="16" Height="16" Offset="0x7A68" TlutOffset="0x7668"/> + <Texture Name="object_kitan_Tex_007B68" OutName="tex_007B68" Format="ci8" Width="16" Height="16" Offset="0x7B68" TlutOffset="0x7668"/> + <Texture Name="object_kitan_Tex_007C68" OutName="tex_007C68" Format="ci8" Width="16" Height="16" Offset="0x7C68" TlutOffset="0x7668"/> + <Texture Name="object_kitan_Tex_007D68" OutName="tex_007D68" Format="ci8" Width="16" Height="16" Offset="0x7D68" TlutOffset="0x7668"/> <Limb Name="gKeatonLowerBodyLimb" Type="Standard" EnumName="KEATON_LIMB_LOWER_BODY" Offset="0x7E68" /> <Limb Name="gKeatonUpperBodyLimb" Type="Standard" EnumName="KEATON_LIMB_UPPER_BODY" Offset="0x7E74" /> <Limb Name="gKeatonHeadLimb" Type="Standard" EnumName="KEATON_LIMB_HEAD" Offset="0x7E80" /> diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml index d0730ab7e..39121c027 100644 --- a/assets/xml/objects/object_kz.xml +++ b/assets/xml/objects/object_kz.xml @@ -18,11 +18,11 @@ <Texture Name="gFighterPirate1TLUT" OutName="tlut1" Format="rgba16" Width="16" Height="16" Offset="0x58D0" /> <!-- This is the same skin texture as below, but this one is her arms and back --> <Texture Name="gFighterPirateSkin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x5AD0" TlutOffset="0x58D0" /> - <Texture Name="gFighterPirateShirtTopRedGradientTex" OutName="shirt_red" Format="ci8" Width="8" Height="8" Offset="0x5B10" /> + <Texture Name="gFighterPirateShirtTopRedGradientTex" OutName="shirt_red" Format="ci8" Width="8" Height="8" Offset="0x5B10" TlutOffset="0x58D0"/> <!-- Gold armor plates on her shin, forearms, belt. Similar texture as Emblem, but slightly darker. --> - <Texture Name="gFighterPirateArmor1Tex" OutName="armor" Format="ci8" Width="16" Height="16" Offset="0x5B50" /> + <Texture Name="gFighterPirateArmor1Tex" OutName="armor" Format="ci8" Width="16" Height="16" Offset="0x5B50" TlutOffset="0x58D0"/> <Texture Name="gFighterPirateShirtBottomPatternAndVeilTex" OutName="shirt_pattern1" Format="i8" Width="16" Height="16" Offset="0x5C50" /> - <Texture Name="gFighterPirateBellyButtonTex" OutName="navel" Format="ci8" Width="16" Height="16" Offset="0x5D50" /> + <Texture Name="gFighterPirateBellyButtonTex" OutName="navel" Format="ci8" Width="16" Height="16" Offset="0x5D50" TlutOffset="0x58D0"/> <Texture Name="gFighterPiratePantsTex" OutName="pants" Format="i8" Width="16" Height="16" Offset="0x5E50" /> <!-- This is the texture at the back of her boots and pants belt center. --> <Texture Name="gFighterPirateZipper1Tex" OutName="zipper1" Format="i8" Width="8" Height="16" Offset="0x5F50" /> @@ -40,8 +40,8 @@ <Texture Name="gFighterPirate2TLUT" OutName="tlut2" Format="rgba16" Width="4" Height="63" Offset="0x9100" /> <!-- This is the same skin texture as above, but this one is for her head and feet --> - <Texture Name="gFighterPirateSkin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x92F8" TlutOffset="0x9100"/> - <Texture Name="gFighterPirateEarTex" OutName="ear" Format="ci8" Width="8" Height="16" Offset="0x9338" /> + <Texture Name="gFighterPirateSkin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x92F8" TlutOffset="0x9100"/> + <Texture Name="gFighterPirateEarTex" OutName="ear" Format="ci8" Width="8" Height="16" Offset="0x9338" TlutOffset="0x9100"/> <Texture Name="gFighterPirateEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x93B8" TlutOffset="0x9100" /> <Texture Name="gFighterPirateShirtBottomPatternAndVeil2Tex" OutName="shirt_pattern2" Format="i8" Width="16" Height="16" Offset="0x97B8" /> <Texture Name="gFighterPirateShoesTex" OutName="shoe_sides" Format="ci8" Width="8" Height="16" Offset="0x98B8" TlutOffset="0x9100"/> @@ -52,7 +52,7 @@ <Texture Name="gFighterPirateHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x9DF8" TlutOffset="0x9100" /> <Texture Name="gFighterPirateFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x9EF8" TlutOffset="0x9100" /> <!-- Similar to Armor above, but slightly brighter and used in different spots: used for sword guard and her forhead emblem --> - <Texture Name="gFighterPirateYellowSwordGuardAndEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="16" Offset="0x9FF8" /> + <Texture Name="gFighterPirateYellowSwordGuardAndEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9100"/> <Texture Name="gFighterPirateEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9100" /> <DList Name="gFighterPirateLeftFootDL" Offset="0xC318" /> diff --git a/assets/xml/objects/object_last_obj.xml b/assets/xml/objects/object_last_obj.xml index bd452a408..bd28bc355 100644 --- a/assets/xml/objects/object_last_obj.xml +++ b/assets/xml/objects/object_last_obj.xml @@ -14,7 +14,7 @@ <!-- <Blob Name="object_last_obj_Blob_001720" Size="0x180" Offset="0x1720" /> --> <Texture Name="object_last_obj_Tex_0018A0" OutName="tex_0018A0" Format="rgba16" Width="32" Height="32" Offset="0x18A0" /> <!-- <Blob Name="object_last_obj_Blob_0020A0" Size="0x1000" Offset="0x20A0" /> --> - <Texture Name="object_last_obj_Tex_0030A0" OutName="tex_0030A0" Format="ci4" Width="64" Height="64" Offset="0x30A0" /> + <Texture Name="object_last_obj_Tex_0030A0" OutName="tex_0030A0" Format="ci4" Width="64" Height="64" Offset="0x30A0" TlutOffset="0x1700"/> <DList Name="object_last_obj_DL_0039C0" Offset="0x39C0" /> <!-- Original name is "i2_L_shutter1_model" --> <Texture Name="object_last_obj_Tex_003B20" OutName="tex_003B20" Format="rgba16" Width="32" Height="64" Offset="0x3B20" /> </File> diff --git a/assets/xml/objects/object_lightblock.xml b/assets/xml/objects/object_lightblock.xml index 07c5da688..ff89c82d4 100644 --- a/assets/xml/objects/object_lightblock.xml +++ b/assets/xml/objects/object_lightblock.xml @@ -4,7 +4,7 @@ <DList Name="gSunBlockEmptyDL" Offset="0x170" /> <!-- Original name is "z2_brick_light_modelT" --> <DList Name="gSunBlockDL" Offset="0x178" /> <!-- Original name is "z2_brick_light_model" --> <Texture Name="gSunBlockTLUT" OutName="sun_block_tlut" Format="rgba16" Width="4" Height="4" Offset="0x258" /> - <Texture Name="gSunBlockTex" OutName="sun_block" Format="ci4" Width="64" Height="64" Offset="0x278" /> + <Texture Name="gSunBlockTex" OutName="sun_block" Format="ci4" Width="64" Height="64" Offset="0x278" TlutOffset="0x258"/> <Collision Name="gSunBlockCol" Offset="0xB80" /> <!-- Original name is "z2_brick_light_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml index f225ba87f..79275a198 100644 --- a/assets/xml/objects/object_link_child.xml +++ b/assets/xml/objects/object_link_child.xml @@ -18,9 +18,9 @@ <Texture Name="gLinkHumanMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5200" /> <Texture Name="object_link_child_Tex_005400" OutName="tex_005400" Format="rgba16" Width="8" Height="16" Offset="0x5400" /> - <Texture Name="object_link_child_Tex_005500" OutName="tex_005500" Format="ci8" Width="8" Height="8" Offset="0x5500" /> - <Texture Name="object_link_child_Tex_005540" OutName="tex_005540" Format="ci8" Width="16" Height="16" Offset="0x5540" /> - <Texture Name="gLinkHumanEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5640" /> + <Texture Name="object_link_child_Tex_005500" OutName="tex_005500" Format="ci8" Width="8" Height="8" Offset="0x5500" TlutOffset="0x5000"/> + <Texture Name="object_link_child_Tex_005540" OutName="tex_005540" Format="ci8" Width="16" Height="16" Offset="0x5540" TlutOffset="0x5000"/> + <Texture Name="gLinkHumanEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5640" TlutOffset="0x5000"/> <Texture Name="gLinkHumanBeltClaspTex" OutName="belt_clasp" Format="rgba16" Width="32" Height="16" Offset="0x5740" /> <Texture Name="gLinkHumanBeltTex" OutName="belt" Format="rgba16" Width="8" Height="16" Offset="0x5B40" /> <Texture Name="object_link_child_Tex_005C40" OutName="tex_005C40" Format="i8" Width="16" Height="16" Offset="0x5C40" /> @@ -28,7 +28,7 @@ <Texture Name="object_link_child_Tex_005D80" OutName="tex_005D80" Format="i8" Width="8" Height="16" Offset="0x5D80" /> <Texture Name="object_link_child_Tex_005E00" OutName="tex_005E00" Format="rgba16" Width="16" Height="32" Offset="0x5E00" /> <Texture Name="object_link_child_Tex_006200" OutName="tex_006200" Format="rgba16" Width="32" Height="32" Offset="0x6200" /> - <Texture Name="object_link_child_Tex_006A00" OutName="tex_006A00" Format="ci8" Width="16" Height="16" Offset="0x6A00" /> + <Texture Name="object_link_child_Tex_006A00" OutName="tex_006A00" Format="ci8" Width="16" Height="16" Offset="0x6A00" TlutOffset="0x5000"/> <Texture Name="object_link_child_Tex_006B00" OutName="tex_006B00" Format="rgba16" Width="16" Height="16" Offset="0x6B00" /> <!-- <Blob Name="object_link_child_Blob_006D00" Size="0xA00" Offset="0x6D00" /> --> <Texture Name="object_link_child_Tex_007700" OutName="tex_007700" Format="rgba16" Width="16" Height="16" Offset="0x7700" /> @@ -55,7 +55,7 @@ <Texture Name="gLinkHumanOcarinaTex" OutName="ocarina" Format="rgba16" Width="32" Height="16" Offset="0xD680" /> <Texture Name="object_link_child_TLUT_00DA80" OutName="tlut_00DA80" Format="rgba16" Width="68" Height="1" Offset="0xDA80"/> - <Texture Name="object_link_child_Tex_00DB08" OutName="tex_00DB08" Format="ci8" Width="16" Height="16" Offset="0xDB08" /> + <Texture Name="object_link_child_Tex_00DB08" OutName="tex_00DB08" Format="ci8" Width="16" Height="16" Offset="0xDB08" TlutOffset="0xDA80"/> <!-- <Blob Name="object_link_child_Blob_00DC08" Size="0x360" Offset="0xDC08" /> --> <DList Name="gLinkHumanLeftHandClosedDL" Offset="0xE1C8" /> @@ -113,12 +113,12 @@ <Texture Name="gLinkHumanHerosShieldFrontTLUT" OutName="hylian_shield_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18C40" /> <Texture Name="gLinkHumanHerosShieldBackTLUT" OutName="hylian_shield_back_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18E40" /> <Texture Name="gLinkHumanShieldHandleTLUT" OutName="shield_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x19040" /> - <Texture Name="object_link_child_Tex_019240" OutName="tex_019240" Format="ci8" Width="8" Height="8" Offset="0x19240" /> + <Texture Name="object_link_child_Tex_019240" OutName="tex_019240" Format="ci8" Width="8" Height="8" Offset="0x19240" TlutOffset="0x18A40"/> <Texture Name="gLinkHumanHerosShieldFrontUpperTex" OutName="hylian_shield_front_upper" Format="ci8" Width="64" Height="32" Offset="0x19280" TlutOffset="0x18C40" /> - <Texture Name="object_link_child_Tex_019A80" OutName="tex_019A80" Format="ci8" Width="32" Height="64" Offset="0x19A80" /> - <Texture Name="object_link_child_Tex_01A280" OutName="tex_01A280" Format="ci8" Width="16" Height="16" Offset="0x1A280" /> + <Texture Name="object_link_child_Tex_019A80" OutName="tex_019A80" Format="ci8" Width="32" Height="64" Offset="0x19A80" TlutOffset="0x18A40"/> + <Texture Name="object_link_child_Tex_01A280" OutName="tex_01A280" Format="ci8" Width="16" Height="16" Offset="0x1A280" TlutOffset="0x18A40"/> <Texture Name="object_link_child_Tex_01A380" OutName="tex_01A380" Format="rgba16" Width="64" Height="32" Offset="0x1A380" /> - <Texture Name="object_link_child_Tex_01B380" OutName="tex_01B380" Format="ci8" Width="16" Height="16" Offset="0x1B380" /> + <Texture Name="object_link_child_Tex_01B380" OutName="tex_01B380" Format="ci8" Width="16" Height="16" Offset="0x1B380" TlutOffset="0x18A40"/> <Texture Name="gLinkHumanHerosShieldFrontLowerTex" OutName="hylian_shield_front_lower" Format="ci8" Width="64" Height="32" Offset="0x1B480" TlutOffset="0x18C40" /> <Texture Name="gLinkHumanHerosShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0x1BC80" TlutOffset="0x18E40" /> <Texture Name="gLinkHumanShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0x1BE80" TlutOffset="0x19040" /> diff --git a/assets/xml/objects/object_link_goron.xml b/assets/xml/objects/object_link_goron.xml index 3e001520b..e949a8983 100644 --- a/assets/xml/objects/object_link_goron.xml +++ b/assets/xml/objects/object_link_goron.xml @@ -9,18 +9,18 @@ <Texture Name="gLinkGoronSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2200" /> <Texture Name="object_link_goron_Tex_002400" OutName="tex_002400" Format="rgba16" Width="8" Height="32" Offset="0x2400" /> - <Texture Name="object_link_goron_Tex_002600" OutName="tex_002600" Format="ci8" Width="16" Height="16" Offset="0x2600" /> + <Texture Name="object_link_goron_Tex_002600" OutName="tex_002600" Format="ci8" Width="16" Height="16" Offset="0x2600" TlutOffset="0x2000"/> <Texture Name="object_link_goron_Tex_002700" OutName="tex_002700" Format="rgba16" Width="8" Height="8" Offset="0x2700" /> <Texture Name="object_link_goron_Tex_002780" OutName="tex_002780" Format="rgba16" Width="8" Height="16" Offset="0x2780" /> <Texture Name="object_link_goron_Tex_002880" OutName="tex_002880" Format="rgba16" Width="8" Height="8" Offset="0x2880" /> - <Texture Name="object_link_goron_Tex_002900" OutName="tex_002900" Format="ci8" Width="8" Height="8" Offset="0x2900" /> + <Texture Name="object_link_goron_Tex_002900" OutName="tex_002900" Format="ci8" Width="8" Height="8" Offset="0x2900" TlutOffset="0x2000"/> <Texture Name="object_link_goron_Tex_002940" OutName="tex_002940" Format="rgba16" Width="32" Height="16" Offset="0x2940" /> <Texture Name="object_link_goron_Tex_002D40" OutName="tex_002D40" Format="rgba16" Width="16" Height="32" Offset="0x2D40" /> - <Texture Name="object_link_goron_Tex_003140" OutName="tex_003140" Format="ci8" Width="32" Height="64" Offset="0x3140" /> - <Texture Name="object_link_goron_Tex_003940" OutName="tex_003940" Format="ci8" Width="16" Height="16" Offset="0x3940" /> - <Texture Name="object_link_goron_Tex_003A40" OutName="tex_003A40" Format="ci8" Width="32" Height="32" Offset="0x3A40" /> - <Texture Name="object_link_goron_Tex_003E40" OutName="tex_003E40" Format="ci8" Width="32" Height="32" Offset="0x3E40" /> - <Texture Name="object_link_goron_Tex_004240" OutName="tex_004240" Format="ci8" Width="8" Height="32" Offset="0x4240" /> + <Texture Name="object_link_goron_Tex_003140" OutName="tex_003140" Format="ci8" Width="32" Height="64" Offset="0x3140" TlutOffset="0x2000"/> + <Texture Name="object_link_goron_Tex_003940" OutName="tex_003940" Format="ci8" Width="16" Height="16" Offset="0x3940" TlutOffset="0x2000"/> + <Texture Name="object_link_goron_Tex_003A40" OutName="tex_003A40" Format="ci8" Width="32" Height="32" Offset="0x3A40" TlutOffset="0x2000"/> + <Texture Name="object_link_goron_Tex_003E40" OutName="tex_003E40" Format="ci8" Width="32" Height="32" Offset="0x3E40" TlutOffset="0x2000"/> + <Texture Name="object_link_goron_Tex_004240" OutName="tex_004240" Format="ci8" Width="8" Height="32" Offset="0x4240" TlutOffset="0x2000"/> <Texture Name="object_link_goron_Tex_004340" OutName="tex_004340" Format="i8" Width="8" Height="8" Offset="0x4340" /> <DList Name="gLinkGoronRightThighDL" Offset="0x8140" /> @@ -44,9 +44,9 @@ <DList Name="gLinkGoronCurledDL" Offset="0xBDD8" /> <DList Name="object_link_goron_DL_00C540" Offset="0xC540" /> <!-- Original name is "lg_spike_model" --> - <Texture Name="object_link_goron_Tex_00C6B8" OutName="tex_00C6B8" Format="ci8" Width="32" Height="64" Offset="0xC6B8" /> + <Texture Name="object_link_goron_Tex_00C6B8" OutName="tex_00C6B8" Format="ci8" Width="32" Height="64" Offset="0xC6B8" TlutOffset="0x2000"/> <Texture Name="object_link_goron_Tex_00CEB8" OutName="tex_00CEB8" Format="rgba16" Width="8" Height="16" Offset="0xCEB8" /> - <Texture Name="object_link_goron_Tex_00CFB8" OutName="tex_00CFB8" Format="ci8" Width="16" Height="16" Offset="0xCFB8" /> + <Texture Name="object_link_goron_Tex_00CFB8" OutName="tex_00CFB8" Format="ci8" Width="16" Height="16" Offset="0xCFB8" TlutOffset="0x2000"/> <Texture Name="object_link_goron_Tex_00D0B8" OutName="tex_00D0B8" Format="rgba16" Width="16" Height="16" Offset="0xD0B8" /> <Texture Name="object_link_goron_Tex_00D2B8" OutName="tex_00D2B8" Format="rgba16" Width="8" Height="16" Offset="0xD2B8" /> <Texture Name="object_link_goron_Tex_00D3B8" OutName="tex_00D3B8" Format="rgba16" Width="8" Height="16" Offset="0xD3B8" /> @@ -62,12 +62,12 @@ <DList Name="object_link_goron_DL_010368" Offset="0x10368" /> <DList Name="object_link_goron_DL_010590" Offset="0x10590" /> <Texture Name="object_link_goron_TLUT_0107B8" OutName="tlut_0107B8" Format="rgba16" Width="16" Height="16" Offset="0x107B8" /> - <Texture Name="object_link_goron_Tex_0109B8" OutName="tex_0109B8" Format="ci8" Width="16" Height="16" Offset="0x109B8" /> - <Texture Name="object_link_goron_Tex_010AB8" OutName="tex_010AB8" Format="ci8" Width="16" Height="8" Offset="0x10AB8" /> - <Texture Name="object_link_goron_Tex_010B38" OutName="tex_010B38" Format="ci8" Width="16" Height="16" Offset="0x10B38" /> - <Texture Name="object_link_goron_Tex_010C38" OutName="tex_010C38" Format="ci8" Width="32" Height="32" Offset="0x10C38" /> + <Texture Name="object_link_goron_Tex_0109B8" OutName="tex_0109B8" Format="ci8" Width="16" Height="16" Offset="0x109B8" TlutOffset="0x107B8"/> + <Texture Name="object_link_goron_Tex_010AB8" OutName="tex_010AB8" Format="ci8" Width="16" Height="8" Offset="0x10AB8" TlutOffset="0x107B8"/> + <Texture Name="object_link_goron_Tex_010B38" OutName="tex_010B38" Format="ci8" Width="16" Height="16" Offset="0x10B38" TlutOffset="0x107B8"/> + <Texture Name="object_link_goron_Tex_010C38" OutName="tex_010C38" Format="ci8" Width="32" Height="32" Offset="0x10C38" TlutOffset="0x107B8"/> <DList Name="gLinkGoronLeftHandHoldBottleDL" Offset="0x11468" /> - <Texture Name="object_link_goron_Tex_011628" OutName="tex_011628" Format="ci8" Width="16" Height="16" Offset="0x11628" /> + <Texture Name="object_link_goron_Tex_011628" OutName="tex_011628" Format="ci8" Width="16" Height="16" Offset="0x11628" TlutOffset="0x2000"/> <Texture Name="object_link_goron_Tex_011728" OutName="tex_011728" Format="rgba16" Width="8" Height="32" Offset="0x11728" /> <DList Name="gLinkGoronGoronPunchEffectDL" Offset="0x11AB8" /> <Texture Name="object_link_goron_Tex_011C10" OutName="tex_011C10" Format="i4" Width="32" Height="32" Offset="0x11C10" /> diff --git a/assets/xml/objects/object_link_nuts.xml b/assets/xml/objects/object_link_nuts.xml index 9247d3db4..2b1bdb725 100644 --- a/assets/xml/objects/object_link_nuts.xml +++ b/assets/xml/objects/object_link_nuts.xml @@ -21,13 +21,13 @@ <Texture Name="object_link_nuts_TLUT_003CB0" OutName="tlut_003CB0" Format="rgba16" Width="16" Height="16" Offset="0x3CB0" /> <Texture Name="object_link_nuts_TLUT_003EB0" OutName="tlut_003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0" /> - <Texture Name="object_link_nuts_Tex_0040B0" OutName="tex_0040B0" Format="ci8" Width="16" Height="16" Offset="0x40B0" /> - <Texture Name="object_link_nuts_Tex_0041B0" OutName="tex_0041B0" Format="ci8" Width="16" Height="16" Offset="0x41B0" /> - <Texture Name="object_link_nuts_Tex_0042B0" OutName="tex_0042B0" Format="ci8" Width="16" Height="16" Offset="0x42B0" /> - <Texture Name="object_link_nuts_Tex_0043B0" OutName="tex_0043B0" Format="ci8" Width="16" Height="16" Offset="0x43B0" /> - <Texture Name="object_link_nuts_Tex_0044B0" OutName="tex_0044B0" Format="ci8" Width="32" Height="32" Offset="0x44B0" /> + <Texture Name="object_link_nuts_Tex_0040B0" OutName="tex_0040B0" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3CB0"/> + <Texture Name="object_link_nuts_Tex_0041B0" OutName="tex_0041B0" Format="ci8" Width="16" Height="16" Offset="0x41B0" TlutOffset="0x3CB0"/> + <Texture Name="object_link_nuts_Tex_0042B0" OutName="tex_0042B0" Format="ci8" Width="16" Height="16" Offset="0x42B0" TlutOffset="0x3EB0"/> + <Texture Name="object_link_nuts_Tex_0043B0" OutName="tex_0043B0" Format="ci8" Width="16" Height="16" Offset="0x43B0" TlutOffset="0x3EB0"/> + <Texture Name="object_link_nuts_Tex_0044B0" OutName="tex_0044B0" Format="ci8" Width="32" Height="32" Offset="0x44B0" TlutOffset="0x3EB0"/> <Texture Name="object_link_nuts_Tex_0048B0" OutName="tex_0048B0" Format="rgba16" Width="64" Height="32" Offset="0x48B0" /> - <Texture Name="object_link_nuts_Tex_0058B0" OutName="tex_0058B0" Format="ci8" Width="16" Height="16" Offset="0x58B0" /> + <Texture Name="object_link_nuts_Tex_0058B0" OutName="tex_0058B0" Format="ci8" Width="16" Height="16" Offset="0x58B0" TlutOffset="0x3CB0"/> <DList Name="object_link_nuts_DL_007390" Offset="0x7390" /> <DList Name="object_link_nuts_DL_007548" Offset="0x7548" /> <DList Name="object_link_nuts_DL_0076A0" Offset="0x76A0" /> @@ -53,7 +53,7 @@ <DList Name="object_link_nuts_DL_00A348" Offset="0xA348" /> <Texture Name="object_link_nuts_Tex_00A4E0" OutName="tex_00A4E0" Format="rgba16" Width="32" Height="64" Offset="0xA4E0" /> <DList Name="object_link_nuts_DL_00B690" Offset="0xB690" /> - <Texture Name="object_link_nuts_Tex_00B780" OutName="tex_00B780" Format="ci8" Width="16" Height="16" Offset="0xB780" /> + <Texture Name="object_link_nuts_Tex_00B780" OutName="tex_00B780" Format="ci8" Width="16" Height="16" Offset="0xB780" TlutOffset="0x3EB0"/> <Limb Name="gLinkDekuRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_ROOT" Offset="0xB880" /> <Limb Name="gLinkDekuWaistLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_WAIST" Offset="0xB890" /> diff --git a/assets/xml/objects/object_link_zora.xml b/assets/xml/objects/object_link_zora.xml index 08936791a..81cb50254 100644 --- a/assets/xml/objects/object_link_zora.xml +++ b/assets/xml/objects/object_link_zora.xml @@ -17,18 +17,18 @@ <Texture Name="object_link_zora_TLUT_005000" OutName="tlut_005000" Format="rgba16" Width="16" Height="16" Offset="0x5000" /> <Texture Name="gLinkZoraSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5200" /> - <Texture Name="object_link_zora_Tex_005400" OutName="tex_005400" Format="ci8" Width="32" Height="32" Offset="0x5400" /> - <Texture Name="object_link_zora_Tex_005800" OutName="tex_005800" Format="ci8" Width="16" Height="16" Offset="0x5800" /> - <Texture Name="object_link_zora_Tex_005900" OutName="tex_005900" Format="ci8" Width="16" Height="16" Offset="0x5900" /> - <Texture Name="object_link_zora_Tex_005A00" OutName="tex_005A00" Format="ci8" Width="8" Height="16" Offset="0x5A00" /> - <Texture Name="object_link_zora_Tex_005A80" OutName="tex_005A80" Format="ci8" Width="8" Height="16" Offset="0x5A80" /> - <Texture Name="object_link_zora_Tex_005B00" OutName="tex_005B00" Format="ci8" Width="32" Height="16" Offset="0x5B00" /> - <Texture Name="object_link_zora_Tex_005D00" OutName="tex_005D00" Format="ci8" Width="16" Height="32" Offset="0x5D00" /> - <Texture Name="object_link_zora_Tex_005F00" OutName="tex_005F00" Format="ci8" Width="16" Height="16" Offset="0x5F00" /> - <Texture Name="object_link_zora_Tex_006000" OutName="tex_006000" Format="ci8" Width="16" Height="16" Offset="0x6000" /> - <Texture Name="object_link_zora_Tex_006100" OutName="tex_006100" Format="ci8" Width="8" Height="16" Offset="0x6100" /> - <Texture Name="object_link_zora_Tex_006180" OutName="tex_006180" Format="ci8" Width="8" Height="8" Offset="0x6180" /> - <Texture Name="object_link_zora_Tex_0061C0" OutName="tex_0061C0" Format="ci8" Width="16" Height="16" Offset="0x61C0" /> + <Texture Name="object_link_zora_Tex_005400" OutName="tex_005400" Format="ci8" Width="32" Height="32" Offset="0x5400" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005800" OutName="tex_005800" Format="ci8" Width="16" Height="16" Offset="0x5800" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005900" OutName="tex_005900" Format="ci8" Width="16" Height="16" Offset="0x5900" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005A00" OutName="tex_005A00" Format="ci8" Width="8" Height="16" Offset="0x5A00" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005A80" OutName="tex_005A80" Format="ci8" Width="8" Height="16" Offset="0x5A80" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005B00" OutName="tex_005B00" Format="ci8" Width="32" Height="16" Offset="0x5B00" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005D00" OutName="tex_005D00" Format="ci8" Width="16" Height="32" Offset="0x5D00" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_005F00" OutName="tex_005F00" Format="ci8" Width="16" Height="16" Offset="0x5F00" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_006000" OutName="tex_006000" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_006100" OutName="tex_006100" Format="ci8" Width="8" Height="16" Offset="0x6100" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_006180" OutName="tex_006180" Format="ci8" Width="8" Height="8" Offset="0x6180" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_0061C0" OutName="tex_0061C0" Format="ci8" Width="16" Height="16" Offset="0x61C0" TlutOffset="0x5000"/> <DList Name="gLinkZoraRightThighDL" Offset="0x9E00" /> <DList Name="gLinkZoraRightShinDL" Offset="0xA108" /> @@ -50,15 +50,15 @@ <DList Name="gLinkZoraLeftHandClosedDL" Offset="0xC270" /> <Texture Name="object_link_zora_TLUT_00C578" OutName="tlut_00C578" Format="rgba16" Width="16" Height="16" Offset="0xC578" /> - <Texture Name="object_link_zora_Tex_00C778" OutName="tex_00C778" Format="ci8" Width="16" Height="32" Offset="0xC778" /> - <Texture Name="object_link_zora_Tex_00C978" OutName="tex_00C978" Format="ci8" Width="16" Height="16" Offset="0xC978" /> + <Texture Name="object_link_zora_Tex_00C778" OutName="tex_00C778" Format="ci8" Width="16" Height="32" Offset="0xC778" TlutOffset="0xC578"/> + <Texture Name="object_link_zora_Tex_00C978" OutName="tex_00C978" Format="ci8" Width="16" Height="16" Offset="0xC978" TlutOffset="0xC578"/> <DList Name="object_link_zora_DL_00CC38" Offset="0xCC38" /> <DList Name="object_link_zora_DL_00CDA0" Offset="0xCDA0" /> <DList Name="object_link_zora_DL_00E088" Offset="0xE088" /> <DList Name="object_link_zora_DL_00E2A0" Offset="0xE2A0" /> - <Texture Name="object_link_zora_Tex_00E678" OutName="tex_00E678" Format="ci8" Width="16" Height="16" Offset="0xE678" /> - <Texture Name="object_link_zora_Tex_00E778" OutName="tex_00E778" Format="ci8" Width="16" Height="16" Offset="0xE778" /> - <Texture Name="object_link_zora_Tex_00E878" OutName="tex_00E878" Format="ci8" Width="8" Height="16" Offset="0xE878" /> + <Texture Name="object_link_zora_Tex_00E678" OutName="tex_00E678" Format="ci8" Width="16" Height="16" Offset="0xE678" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_00E778" OutName="tex_00E778" Format="ci8" Width="16" Height="16" Offset="0xE778" TlutOffset="0x5000"/> + <Texture Name="object_link_zora_Tex_00E878" OutName="tex_00E878" Format="ci8" Width="8" Height="16" Offset="0xE878" TlutOffset="0x5000"/> <Texture Name="object_link_zora_Tex_00E8F8" OutName="tex_00E8F8" Format="rgba16" Width="16" Height="16" Offset="0xE8F8" /> <Texture Name="object_link_zora_Tex_00EAF8" OutName="tex_00EAF8" Format="rgba16" Width="16" Height="16" Offset="0xEAF8" /> <Texture Name="object_link_zora_Tex_00ECF8" OutName="tex_00ECF8" Format="rgba16" Width="16" Height="16" Offset="0xECF8" /> diff --git a/assets/xml/objects/object_lodmoon.xml b/assets/xml/objects/object_lodmoon.xml index 0756c3300..d641a1d3c 100644 --- a/assets/xml/objects/object_lodmoon.xml +++ b/assets/xml/objects/object_lodmoon.xml @@ -7,7 +7,7 @@ <Texture Name="gLodmoonFarSideTLUT" OutName="lodmoon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15F8" /> <Texture Name="gLodmoonEyesTex" OutName="lodmoon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x1618" /> <Texture Name="gLodmoonTeethTex" OutName="lodmoon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x1E18" /> - <Texture Name="gLodmoonFaceTex" OutName="lodmoon_face" Format="ci4" Width="64" Height="64" Offset="0x2E18" /> - <Texture Name="gLodmoonFarSideTex" OutName="lodmoon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3618" /> + <Texture Name="gLodmoonFaceTex" OutName="lodmoon_face" Format="ci4" Width="64" Height="64" Offset="0x2E18" TlutOffset="0x15D8"/> + <Texture Name="gLodmoonFarSideTex" OutName="lodmoon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3618" TlutOffset="0x15F8"/> </File> </Root> diff --git a/assets/xml/objects/object_lotus.xml b/assets/xml/objects/object_lotus.xml index 923218811..5cd287212 100644 --- a/assets/xml/objects/object_lotus.xml +++ b/assets/xml/objects/object_lotus.xml @@ -3,7 +3,7 @@ <File Name="object_lotus" Segment="6"> <DList Name="gLilyPadDL" Offset="0x40" /> <!-- Original name is "z2_hasu_model" ("lotus") --> <Texture Name="gLilyPadTLUT" OutName="lily_pad_tlut" Format="rgba16" Width="4" Height="4" Offset="0x100" /> - <Texture Name="gLilyPadTex" OutName="lily_pad" Format="ci4" Width="64" Height="64" Offset="0x120" /> + <Texture Name="gLilyPadTex" OutName="lily_pad" Format="ci4" Width="64" Height="64" Offset="0x120" TlutOffset="0x100"/> <Collision Name="gLilyPadCol" Offset="0xA20" /> <!-- Original name is "z2_hasu_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml index b0b1435bc..2c2e9f051 100644 --- a/assets/xml/objects/object_ma1.xml +++ b/assets/xml/objects/object_ma1.xml @@ -4,8 +4,8 @@ <!-- Romani's Bow DisplayList and Textures --> <DList Name="gRomaniBowDL" Offset="0x3B0" /> <Texture Name="gRomaniBowTLUT" OutName="romani_bow_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E0" /> - <Texture Name="gRomaniBowHandleTex" OutName="romani_bow_handle" Format="ci8" Width="16" Height="16" Offset="0x7E0" /> - <Texture Name="gRomaniBowLimbTex" OutName="romani_bow_limb" Format="ci8" Width="8" Height="8" Offset="0x8E0" /> + <Texture Name="gRomaniBowHandleTex" OutName="romani_bow_handle" Format="ci8" Width="16" Height="16" Offset="0x7E0" TlutOffset="0x5E0"/> + <Texture Name="gRomaniBowLimbTex" OutName="romani_bow_limb" Format="ci8" Width="8" Height="8" Offset="0x8E0" TlutOffset="0x5E0"/> <!-- Romani's Wooden Box DisplayList and Textures. She sits on it after being abducted by the aliens. --> <DList Name="gRomaniWoodenBoxDL" Offset="0xA20" /> @@ -17,12 +17,12 @@ <!-- Romani Sleeping DisplayList and Textures --> <DList Name="gRomaniSleepingDL" Offset="0x43A0" /> <Texture Name="gRomaniSleepingTLUT" OutName="romani_sleeping_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4CF8" /> - <Texture Name="gRomaniSleepingDressTex" OutName="romani_sleeping_dress" Format="ci8" Width="16" Height="16" Offset="0x4EF8" /> - <Texture Name="gRomaniSleepingSkinTex" OutName="romani_sleeping_skin" Format="ci8" Width="8" Height="8" Offset="0x4FF8" /> - <Texture Name="gRomaniSleepingEarTex" OutName="romani_sleeping_ear" Format="ci8" Width="8" Height="8" Offset="0x5038" /> - <Texture Name="gRomaniSleepingHairTex" OutName="romani_sleeping_hair" Format="ci8" Width="16" Height="16" Offset="0x5078" /> - <Texture Name="gRomaniSleepingHandTex" OutName="romani_sleeping_hand" Format="ci8" Width="16" Height="16" Offset="0x5178" /> - <Texture Name="gRomaniSleepingDressPatternAndPillowTex" OutName="romani_sleeping_dress_pattern_and_pillow" Format="ci8" Width="8" Height="16" Offset="0x5278" /> + <Texture Name="gRomaniSleepingDressTex" OutName="romani_sleeping_dress" Format="ci8" Width="16" Height="16" Offset="0x4EF8" TlutOffset="0x4CF8"/> + <Texture Name="gRomaniSleepingSkinTex" OutName="romani_sleeping_skin" Format="ci8" Width="8" Height="8" Offset="0x4FF8" TlutOffset="0x4CF8"/> + <Texture Name="gRomaniSleepingEarTex" OutName="romani_sleeping_ear" Format="ci8" Width="8" Height="8" Offset="0x5038" TlutOffset="0x4CF8"/> + <Texture Name="gRomaniSleepingHairTex" OutName="romani_sleeping_hair" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4CF8"/> + <Texture Name="gRomaniSleepingHandTex" OutName="romani_sleeping_hand" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4CF8"/> + <Texture Name="gRomaniSleepingDressPatternAndPillowTex" OutName="romani_sleeping_dress_pattern_and_pillow" Format="ci8" Width="8" Height="16" Offset="0x5278" TlutOffset="0x4CF8"/> <Texture Name="gRomaniSleepingEyeTex" OutName="romani_sleeping_eye" Format="rgba16" Width="32" Height="32" Offset="0x52F8" /> <Texture Name="gRomaniSleepingBlanketTex" OutName="romani_sleeping_blanket" Format="rgba16" Width="16" Height="128" Offset="0x5AF8" /> <Texture Name="gRomaniSleepingMouthTex" OutName="romani_sleeping_mouth" Format="rgba16" Width="32" Height="16" Offset="0x6AF8" /> @@ -59,15 +59,15 @@ <!-- Romani Textures --> <Texture Name="gRomaniTLUT" OutName="romani_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF188" /> - <Texture Name="gRomaniDressTex" OutName="romani_dress" Format="ci8" Width="16" Height="16" Offset="0xF388" /> - <Texture Name="gRomaniSkinTex" OutName="romani_skin" Format="ci8" Width="8" Height="8" Offset="0xF488" /> - <Texture Name="gRomaniEarTex" OutName="romani_ear" Format="ci8" Width="8" Height="8" Offset="0xF4C8" /> - <Texture Name="gRomaniHairTex" OutName="romani_hair" Format="ci8" Width="16" Height="16" Offset="0xF508" /> - <Texture Name="gRomaniShawlTex" OutName="romani_shawl" Format="ci8" Width="8" Height="8" Offset="0xF608" /> + <Texture Name="gRomaniDressTex" OutName="romani_dress" Format="ci8" Width="16" Height="16" Offset="0xF388" TlutOffset="0xF188"/> + <Texture Name="gRomaniSkinTex" OutName="romani_skin" Format="ci8" Width="8" Height="8" Offset="0xF488" TlutOffset="0xF188"/> + <Texture Name="gRomaniEarTex" OutName="romani_ear" Format="ci8" Width="8" Height="8" Offset="0xF4C8" TlutOffset="0xF188"/> + <Texture Name="gRomaniHairTex" OutName="romani_hair" Format="ci8" Width="16" Height="16" Offset="0xF508" TlutOffset="0xF188"/> + <Texture Name="gRomaniShawlTex" OutName="romani_shawl" Format="ci8" Width="8" Height="8" Offset="0xF608" TlutOffset="0xF188"/> <Texture Name="gRomaniBroochTex" OutName="romani_brooch" Format="rgba16" Width="16" Height="32" Offset="0xF648" /> - <Texture Name="gRomaniHandTex" OutName="romani_hand" Format="ci8" Width="16" Height="16" Offset="0xFA48" /> - <Texture Name="gRomaniBootTex" OutName="romani_boot" Format="ci8" Width="64" Height="16" Offset="0xFB48" /> - <Texture Name="gRomaniDressPatternTex" OutName="romani_dress_pattern" Format="ci8" Width="8" Height="16" Offset="0xFF48" /> + <Texture Name="gRomaniHandTex" OutName="romani_hand" Format="ci8" Width="16" Height="16" Offset="0xFA48" TlutOffset="0xF188"/> + <Texture Name="gRomaniBootTex" OutName="romani_boot" Format="ci8" Width="64" Height="16" Offset="0xFB48" TlutOffset="0xF188"/> + <Texture Name="gRomaniDressPatternTex" OutName="romani_dress_pattern" Format="ci8" Width="8" Height="16" Offset="0xFF48" TlutOffset="0xF188"/> <Texture Name="gRomaniEyeOpenTex" OutName="romani_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" /> <Texture Name="gRomaniEyeHalfTex" OutName="romani_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x107C8" /> <Texture Name="gRomaniEyeClosedTex" OutName="romani_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10FC8" /> diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml index 0d528b37b..d0a7ebf23 100644 --- a/assets/xml/objects/object_ma2.xml +++ b/assets/xml/objects/object_ma2.xml @@ -46,16 +46,16 @@ <Texture Name="gCremiaTLUT" OutName="cremia_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10018" /> <Texture Name="gCremiaSkinArmsTex" OutName="cremia_skin_arms" Format="rgba16" Width="8" Height="8" Offset="0x10218" /> <Texture Name="gCremiaSkinHeadTex" OutName="cremia_skin_head" Format="rgba16" Width="8" Height="8" Offset="0x10298" /> - <Texture Name="gCremiaBootTex" OutName="cremia_boot" Format="ci8" Width="64" Height="16" Offset="0x10318" /> + <Texture Name="gCremiaBootTex" OutName="cremia_boot" Format="ci8" Width="64" Height="16" Offset="0x10318" TlutOffset="0x10018"/> <Texture Name="gCremiaEarTex" OutName="cremia_ear" Format="rgba16" Width="16" Height="16" Offset="0x10718" /> - <Texture Name="gCremiaHairTex" OutName="cremia_hair" Format="ci8" Width="16" Height="16" Offset="0x10918" /> - <Texture Name="gCremiaShawlTex" OutName="cremia_shawl" Format="ci8" Width="8" Height="8" Offset="0x10A18" /> + <Texture Name="gCremiaHairTex" OutName="cremia_hair" Format="ci8" Width="16" Height="16" Offset="0x10918" TlutOffset="0x10018"/> + <Texture Name="gCremiaShawlTex" OutName="cremia_shawl" Format="ci8" Width="8" Height="8" Offset="0x10A18" TlutOffset="0x10018"/> <Texture Name="gCremiaBroochTex" OutName="cremia_brooch" Format="rgba16" Width="16" Height="32" Offset="0x10A58" /> - <Texture Name="gCremiaShirtTex" OutName="cremia_shirt" Format="ci8" Width="16" Height="16" Offset="0x10E58" /> - <Texture Name="gCremiaSleevesTex" OutName="cremia_sleeves" Format="ci8" Width="8" Height="16" Offset="0x10F58" /> - <Texture Name="gCremiaBeltTex" OutName="cremia_belt" Format="ci8" Width="32" Height="16" Offset="0x10FD8" /> - <Texture Name="gCremiaDressPatternTex" OutName="cremia_dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x111D8" /> - <Texture Name="gCremiaDressTex" OutName="cremia_dress" Format="ci8" Width="16" Height="16" Offset="0x113D8" /> + <Texture Name="gCremiaShirtTex" OutName="cremia_shirt" Format="ci8" Width="16" Height="16" Offset="0x10E58" TlutOffset="0x10018"/> + <Texture Name="gCremiaSleevesTex" OutName="cremia_sleeves" Format="ci8" Width="8" Height="16" Offset="0x10F58" TlutOffset="0x10018"/> + <Texture Name="gCremiaBeltTex" OutName="cremia_belt" Format="ci8" Width="32" Height="16" Offset="0x10FD8" TlutOffset="0x10018"/> + <Texture Name="gCremiaDressPatternTex" OutName="cremia_dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x111D8" TlutOffset="0x10018"/> + <Texture Name="gCremiaDressTex" OutName="cremia_dress" Format="ci8" Width="16" Height="16" Offset="0x113D8" TlutOffset="0x10018"/> <Texture Name="gCremiaApronTex" OutName="cremia_apron" Format="rgba16" Width="16" Height="32" Offset="0x114D8" /> <Texture Name="gCremiaHandTex" OutName="cremia_hand" Format="rgba16" Width="16" Height="16" Offset="0x118D8" /> <Texture Name="gCremiaEyeOpenTex" OutName="cremia_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x11AD8" /> diff --git a/assets/xml/objects/object_market_obj.xml b/assets/xml/objects/object_market_obj.xml index 8ad9436cc..8d0d70707 100644 --- a/assets/xml/objects/object_market_obj.xml +++ b/assets/xml/objects/object_market_obj.xml @@ -22,31 +22,31 @@ <Texture Name="gWestClockTownMarketCowFrontTLUT" OutName="west_clock_town_market_cow_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x220" /> <Texture Name="gWestClockTownMarketCuriosityShopSignTex" OutName="west_clock_town_market_curiosity_shop_sign" Format="rgba16" Width="32" Height="64" Offset="0x420" /> <Texture Name="gWestClockTownMarketBombShopSignTex" OutName="west_clock_town_market_bomb_shop_sign" Format="rgba16" Width="32" Height="64" Offset="0x1420" /> - <Texture Name="gWestClockTownMarketWhitePlasterTex" OutName="west_clock_town_market_white_plaster" Format="ci4" Width="64" Height="64" Offset="0x2420" /> + <Texture Name="gWestClockTownMarketWhitePlasterTex" OutName="west_clock_town_market_white_plaster" Format="ci4" Width="64" Height="64" Offset="0x2420" TlutOffset="0x0"/> <Texture Name="gWestClockTownMarketClockTownBankSignTex" OutName="west_clock_town_market_clock_town_bank_sign" Format="rgba16" Width="32" Height="63" Offset="0x2C20" /> <Texture Name="gWestClockTownMarketTradingPostSignTex" OutName="west_clock_town_market_trading_post_sign" Format="rgba16" Width="32" Height="64" Offset="0x3BE0" /> - <Texture Name="gWestClockTownMarketYellowPlasterTex" OutName="west_clock_town_market_yellow_plaster" Format="ci4" Width="64" Height="64" Offset="0x4BE0" /> - <Texture Name="gWestClockTownMarketBrownPlasterTex" OutName="west_clock_town_market_brown_plaster" Format="ci4" Width="64" Height="64" Offset="0x53E0" /> + <Texture Name="gWestClockTownMarketYellowPlasterTex" OutName="west_clock_town_market_yellow_plaster" Format="ci4" Width="64" Height="64" Offset="0x4BE0" TlutOffset="0x20"/> + <Texture Name="gWestClockTownMarketBrownPlasterTex" OutName="west_clock_town_market_brown_plaster" Format="ci4" Width="64" Height="64" Offset="0x53E0" TlutOffset="0x40"/> <Texture Name="gWestClockTownMarketBankAndDoorFrameTex" OutName="west_clock_town_market_bank_and_door_frame" Format="rgba16" Width="32" Height="32" Offset="0x5BE0" /> <Texture Name="gWestClockTownMarketGroundTex" OutName="west_clock_town_market_ground" Format="rgba16" Width="32" Height="32" Offset="0x63E0" /> <Texture Name="gWestClockTownBrickBelowWhitePlasterTex" OutName="west_clock_town_market_brick_below_white_plaster" Format="rgba16" Width="64" Height="32" Offset="0x6BE0" /> - <Texture Name="gWestClockTownMarketStrawTex" OutName="west_clock_town_market_straw" Format="ci4" Width="64" Height="64" Offset="0x7BE0" /> + <Texture Name="gWestClockTownMarketStrawTex" OutName="west_clock_town_market_straw" Format="ci4" Width="64" Height="64" Offset="0x7BE0" TlutOffset="0x60"/> <Texture Name="gWestClockTownBrickBelowYellowPlasterTex" OutName="west_clock_town_market_brick_below_yellow_plaster" Format="rgba16" Width="64" Height="32" Offset="0x83E0" /> <Texture Name="gWestClockTownBrickBelowBrownPlasterTex" OutName="west_clock_town_market_brick_below_brown_plaster" Format="rgba16" Width="64" Height="32" Offset="0x93E0" /> - <Texture Name="gWestClockTownMarketStrawFringeTex" OutName="west_clock_town_market_straw_fringe" Format="ci4" Width="64" Height="32" Offset="0xA3E0" /> + <Texture Name="gWestClockTownMarketStrawFringeTex" OutName="west_clock_town_market_straw_fringe" Format="ci4" Width="64" Height="32" Offset="0xA3E0" TlutOffset="0x80"/> <Texture Name="gWestClockTownMarketBankDoorTex" OutName="west_clock_town_market_bank_door" Format="i4" Width="32" Height="32" Offset="0xA7E0" /> - <Texture Name="gWestClockTownMarketBrownPatternedPlasterTex" OutName="west_clock_town_market_brown_patterned_plaster" Format="ci4" Width="32" Height="64" Offset="0xA9E0" /> - <Texture Name="gWestClockTownMarketYellowPatternedPlaster1Tex" OutName="west_clock_town_market_yellow_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xADE0" /> - <Texture Name="gWestClockTownMarketYellowPatternedPlaster2Tex" OutName="west_clock_town_market_yellow_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xB5E0" /> - <Texture Name="gWestClockTownMarketWhitePatternedPlaster1Tex" OutName="west_clock_town_market_white_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xBDE0" /> - <Texture Name="gWestClockTownMarketWhitePatternedPlaster2Tex" OutName="west_clock_town_market_white_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xC5E0" /> - <Texture Name="gWestClockTownMarketYellowPatternedPlaster3Tex" OutName="west_clock_town_market_yellow_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xCDE0" /> - <Texture Name="gWestClockTownMarketYellowPatternedPlaster4Tex" OutName="west_clock_town_market_yellow_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xD5E0" /> - <Texture Name="gWestClockTownMarketYellowPatternedPlaster5Tex" OutName="west_clock_town_market_yellow_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xDDE0" /> - <Texture Name="gWestClockTownMarketWhitePatternedPlaster3Tex" OutName="west_clock_town_market_white_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xE5E0" /> - <Texture Name="gWestClockTownMarketWhitePatternedPlaster4Tex" OutName="west_clock_town_market_white_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xEDE0" /> - <Texture Name="gWestClockTownMarketWhitePatternedPlaster5Tex" OutName="west_clock_town_market_white_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xF5E0" /> - <Texture Name="gWestClockTownMarketWhitePatternedPlaster6Tex" OutName="west_clock_town_market_white_patterned_plaster_6" Format="ci4" Width="64" Height="64" Offset="0xFDE0" /> + <Texture Name="gWestClockTownMarketBrownPatternedPlasterTex" OutName="west_clock_town_market_brown_patterned_plaster" Format="ci4" Width="32" Height="64" Offset="0xA9E0" TlutOffset="0xA0"/> + <Texture Name="gWestClockTownMarketYellowPatternedPlaster1Tex" OutName="west_clock_town_market_yellow_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xADE0" TlutOffset="0xC0"/> + <Texture Name="gWestClockTownMarketYellowPatternedPlaster2Tex" OutName="west_clock_town_market_yellow_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xB5E0" TlutOffset="0xE0"/> + <Texture Name="gWestClockTownMarketWhitePatternedPlaster1Tex" OutName="west_clock_town_market_white_patterned_plaster_1" Format="ci4" Width="64" Height="64" Offset="0xBDE0" TlutOffset="0x100"/> + <Texture Name="gWestClockTownMarketWhitePatternedPlaster2Tex" OutName="west_clock_town_market_white_patterned_plaster_2" Format="ci4" Width="64" Height="64" Offset="0xC5E0" TlutOffset="0x120"/> + <Texture Name="gWestClockTownMarketYellowPatternedPlaster3Tex" OutName="west_clock_town_market_yellow_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xCDE0" TlutOffset="0x140"/> + <Texture Name="gWestClockTownMarketYellowPatternedPlaster4Tex" OutName="west_clock_town_market_yellow_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xD5E0" TlutOffset="0x160"/> + <Texture Name="gWestClockTownMarketYellowPatternedPlaster5Tex" OutName="west_clock_town_market_yellow_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xDDE0" TlutOffset="0x180"/> + <Texture Name="gWestClockTownMarketWhitePatternedPlaster3Tex" OutName="west_clock_town_market_white_patterned_plaster_3" Format="ci4" Width="64" Height="64" Offset="0xE5E0" TlutOffset="0x1A0"/> + <Texture Name="gWestClockTownMarketWhitePatternedPlaster4Tex" OutName="west_clock_town_market_white_patterned_plaster_4" Format="ci4" Width="64" Height="64" Offset="0xEDE0" TlutOffset="0x1C0"/> + <Texture Name="gWestClockTownMarketWhitePatternedPlaster5Tex" OutName="west_clock_town_market_white_patterned_plaster_5" Format="ci4" Width="64" Height="64" Offset="0xF5E0" TlutOffset="0x1E0"/> + <Texture Name="gWestClockTownMarketWhitePatternedPlaster6Tex" OutName="west_clock_town_market_white_patterned_plaster_6" Format="ci4" Width="64" Height="64" Offset="0xFDE0" TlutOffset="0x200"/> <Texture Name="gWestClockTownMarketPoleTex" OutName="west_clock_town_market_pole" Format="rgba16" Width="32" Height="16" Offset="0x105E0" /> <Texture Name="gWestClockTownMarketBrickEdgedGroundTex" OutName="west_clock_town_market_brick_edged_ground" Format="rgba16" Width="32" Height="64" Offset="0x109E0" /> <Texture Name="gWestClockTownMarketStairRiserTex" OutName="west_clock_town_market_stair_riser" Format="rgba16" Width="32" Height="16" Offset="0x119E0" /> @@ -55,7 +55,7 @@ <Texture Name="gWestClockTownMarketSafeTex" OutName="west_clock_town_market_safe" Format="rgba16" Width="32" Height="32" Offset="0x12DE0" /> <Texture Name="gWestClockTownMarketRugTex" OutName="west_clock_town_market_rug" Format="rgba16" Width="64" Height="16" Offset="0x135E0" /> <Texture Name="gWestClockTownMarketBankCurtainTex" OutName="west_clock_town_market_bank_curtain" Format="ia8" Width="32" Height="32" Offset="0x13DE0" /> - <Texture Name="gWestClockTownMarketCowFrontTex" OutName="west_clock_town_market_cow_front" Format="ci8" Width="8" Height="8" Offset="0x141E0" /> + <Texture Name="gWestClockTownMarketCowFrontTex" OutName="west_clock_town_market_cow_front" Format="ci8" Width="8" Height="8" Offset="0x141E0" TlutOffset="0x220"/> <Texture Name="gWestClockTownMarketCowBodyTex" OutName="west_clock_town_market_cow_body" Format="i8" Width="8" Height="8" Offset="0x14220" /> <Texture Name="gWestClockTownMarketBankAdvertisementsTex" OutName="west_clock_town_market_bank_advertisements" Format="i4" Width="64" Height="32" Offset="0x14260" /> <Texture Name="gWestClockTownMarketSafeWheelAndHandleTex" OutName="west_clock_town_market_safe_wheel_and_handle" Format="rgba16" Width="16" Height="16" Offset="0x14660" /> diff --git a/assets/xml/objects/object_mask_bigelf.xml b/assets/xml/objects/object_mask_bigelf.xml index 762d11808..d1a4cf7ae 100644 --- a/assets/xml/objects/object_mask_bigelf.xml +++ b/assets/xml/objects/object_mask_bigelf.xml @@ -2,11 +2,11 @@ <File Name="object_mask_bigelf" Segment="10"> <DList Name="object_mask_bigelf_DL_0016F0" Offset="0x16F0" /> <Texture Name="object_mask_bigelf_TLUT_002130" OutName="tlut_002130" Format="rgba16" Width="16" Height="16" Offset="0x2130" /> - <Texture Name="object_mask_bigelf_Tex_002330" OutName="tex_002330" Format="ci8" Width="8" Height="8" Offset="0x2330" /> - <Texture Name="object_mask_bigelf_Tex_002370" OutName="tex_002370" Format="ci8" Width="32" Height="32" Offset="0x2370" /> - <Texture Name="object_mask_bigelf_Tex_002770" OutName="tex_002770" Format="ci8" Width="64" Height="32" Offset="0x2770" /> - <Texture Name="object_mask_bigelf_Tex_002F70" OutName="tex_002F70" Format="ci8" Width="16" Height="16" Offset="0x2F70" /> - <Texture Name="object_mask_bigelf_Tex_003070" OutName="tex_003070" Format="ci8" Width="8" Height="8" Offset="0x3070" /> + <Texture Name="object_mask_bigelf_Tex_002330" OutName="tex_002330" Format="ci8" Width="8" Height="8" Offset="0x2330" TlutOffset="0x2130"/> + <Texture Name="object_mask_bigelf_Tex_002370" OutName="tex_002370" Format="ci8" Width="32" Height="32" Offset="0x2370" TlutOffset="0x2130"/> + <Texture Name="object_mask_bigelf_Tex_002770" OutName="tex_002770" Format="ci8" Width="64" Height="32" Offset="0x2770" TlutOffset="0x2130"/> + <Texture Name="object_mask_bigelf_Tex_002F70" OutName="tex_002F70" Format="ci8" Width="16" Height="16" Offset="0x2F70" TlutOffset="0x2130"/> + <Texture Name="object_mask_bigelf_Tex_003070" OutName="tex_003070" Format="ci8" Width="8" Height="8" Offset="0x3070" TlutOffset="0x2130"/> <Texture Name="object_mask_bigelf_Tex_0030B0" OutName="tex_0030B0" Format="rgba16" Width="32" Height="16" Offset="0x30B0" /> </File> </Root> diff --git a/assets/xml/objects/object_mask_boy.xml b/assets/xml/objects/object_mask_boy.xml index e0f93797e..513536602 100644 --- a/assets/xml/objects/object_mask_boy.xml +++ b/assets/xml/objects/object_mask_boy.xml @@ -2,10 +2,10 @@ <File Name="object_mask_boy" Segment="10"> <DList Name="object_mask_boy_DL_000900" Offset="0x900" /> <Texture Name="object_mask_boy_TLUT_000D50" OutName="tlut_000D50" Format="rgba16" Width="16" Height="16" Offset="0xD50" /> - <Texture Name="object_mask_boy_Tex_000F50" OutName="tex_000F50" Format="ci8" Width="32" Height="32" Offset="0xF50" /> - <Texture Name="object_mask_boy_Tex_001350" OutName="tex_001350" Format="ci8" Width="64" Height="32" Offset="0x1350" /> - <Texture Name="object_mask_boy_Tex_001B50" OutName="tex_001B50" Format="ci8" Width="32" Height="32" Offset="0x1B50" /> - <Texture Name="object_mask_boy_Tex_001F50" OutName="tex_001F50" Format="ci8" Width="16" Height="16" Offset="0x1F50" /> + <Texture Name="object_mask_boy_Tex_000F50" OutName="tex_000F50" Format="ci8" Width="32" Height="32" Offset="0xF50" TlutOffset="0xD50"/> + <Texture Name="object_mask_boy_Tex_001350" OutName="tex_001350" Format="ci8" Width="64" Height="32" Offset="0x1350" TlutOffset="0xD50"/> + <Texture Name="object_mask_boy_Tex_001B50" OutName="tex_001B50" Format="ci8" Width="32" Height="32" Offset="0x1B50" TlutOffset="0xD50"/> + <Texture Name="object_mask_boy_Tex_001F50" OutName="tex_001F50" Format="ci8" Width="16" Height="16" Offset="0x1F50" TlutOffset="0xD50"/> <Texture Name="object_mask_boy_Tex_002050" OutName="tex_002050" Format="rgba16" Width="8" Height="8" Offset="0x2050" /> </File> </Root> diff --git a/assets/xml/objects/object_mask_bree.xml b/assets/xml/objects/object_mask_bree.xml index 9fda443c8..d814f99bd 100644 --- a/assets/xml/objects/object_mask_bree.xml +++ b/assets/xml/objects/object_mask_bree.xml @@ -2,9 +2,9 @@ <File Name="object_mask_bree" Segment="10"> <DList Name="object_mask_bree_DL_0003C0" Offset="0x3C0" /> <Texture Name="object_mask_bree_TLUT_000658" OutName="tlut_000658" Format="rgba16" Width="16" Height="16" Offset="0x658" /> - <Texture Name="object_mask_bree_Tex_000858" OutName="tex_000858" Format="ci8" Width="32" Height="32" Offset="0x858" /> - <Texture Name="object_mask_bree_Tex_000C58" OutName="tex_000C58" Format="ci8" Width="16" Height="16" Offset="0xC58" /> - <Texture Name="object_mask_bree_Tex_000D58" OutName="tex_000D58" Format="ci8" Width="8" Height="8" Offset="0xD58" /> + <Texture Name="object_mask_bree_Tex_000858" OutName="tex_000858" Format="ci8" Width="32" Height="32" Offset="0x858" TlutOffset="0x658"/> + <Texture Name="object_mask_bree_Tex_000C58" OutName="tex_000C58" Format="ci8" Width="16" Height="16" Offset="0xC58" TlutOffset="0x658"/> + <Texture Name="object_mask_bree_Tex_000D58" OutName="tex_000D58" Format="ci8" Width="8" Height="8" Offset="0xD58" TlutOffset="0x658"/> <Texture Name="object_mask_bree_Tex_000D98" OutName="tex_000D98" Format="rgba16" Width="64" Height="32" Offset="0xD98" /> </File> </Root> diff --git a/assets/xml/objects/object_mask_bu_san.xml b/assets/xml/objects/object_mask_bu_san.xml index 621e748ed..509e1c641 100644 --- a/assets/xml/objects/object_mask_bu_san.xml +++ b/assets/xml/objects/object_mask_bu_san.xml @@ -2,11 +2,11 @@ <File Name="object_mask_bu_san" Segment="10"> <DList Name="object_mask_bu_san_DL_000710" Offset="0x710" /> <Texture Name="object_mask_bu_san_TLUT_000B68" OutName="tlut_000B68" Format="rgba16" Width="16" Height="16" Offset="0xB68" /> - <Texture Name="object_mask_bu_san_Tex_000D68" OutName="tex_000D68" Format="ci8" Width="8" Height="8" Offset="0xD68" /> + <Texture Name="object_mask_bu_san_Tex_000D68" OutName="tex_000D68" Format="ci8" Width="8" Height="8" Offset="0xD68" TlutOffset="0xB68"/> <Texture Name="object_mask_bu_san_Tex_000DA8" OutName="tex_000DA8" Format="rgba16" Width="8" Height="16" Offset="0xDA8" /> - <Texture Name="object_mask_bu_san_Tex_000EA8" OutName="tex_000EA8" Format="ci8" Width="16" Height="16" Offset="0xEA8" /> - <Texture Name="object_mask_bu_san_Tex_000FA8" OutName="tex_000FA8" Format="ci8" Width="16" Height="32" Offset="0xFA8" /> - <Texture Name="object_mask_bu_san_Tex_0011A8" OutName="tex_0011A8" Format="ci8" Width="8" Height="8" Offset="0x11A8" /> + <Texture Name="object_mask_bu_san_Tex_000EA8" OutName="tex_000EA8" Format="ci8" Width="16" Height="16" Offset="0xEA8" TlutOffset="0xB68"/> + <Texture Name="object_mask_bu_san_Tex_000FA8" OutName="tex_000FA8" Format="ci8" Width="16" Height="32" Offset="0xFA8" TlutOffset="0xB68"/> + <Texture Name="object_mask_bu_san_Tex_0011A8" OutName="tex_0011A8" Format="ci8" Width="8" Height="8" Offset="0x11A8" TlutOffset="0xB68"/> <Texture Name="object_mask_bu_san_Tex_0011E8" OutName="tex_0011E8" Format="rgba16" Width="16" Height="16" Offset="0x11E8" /> </File> </Root> diff --git a/assets/xml/objects/object_mask_dancer.xml b/assets/xml/objects/object_mask_dancer.xml index a2a37c958..43d8b1869 100644 --- a/assets/xml/objects/object_mask_dancer.xml +++ b/assets/xml/objects/object_mask_dancer.xml @@ -2,11 +2,11 @@ <File Name="object_mask_dancer" Segment="10"> <DList Name="object_mask_dancer_DL_000EF0" Offset="0xEF0" /> <Texture Name="object_mask_dancer_TLUT_001548" OutName="tlut_001548" Format="rgba16" Width="16" Height="16" Offset="0x1548" /> - <Texture Name="object_mask_dancer_Tex_001748" OutName="tex_001748" Format="ci8" Width="16" Height="16" Offset="0x1748" /> - <Texture Name="object_mask_dancer_Tex_001848" OutName="tex_001848" Format="ci8" Width="8" Height="8" Offset="0x1848" /> - <Texture Name="object_mask_dancer_Tex_001888" OutName="tex_001888" Format="ci8" Width="16" Height="16" Offset="0x1888" /> - <Texture Name="object_mask_dancer_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="8" Offset="0x1988" /> - <Texture Name="object_mask_dancer_Tex_0019C8" OutName="tex_0019C8" Format="ci8" Width="16" Height="16" Offset="0x19C8" /> - <Texture Name="object_mask_dancer_Tex_001AC8" OutName="tex_001AC8" Format="ci8" Width="8" Height="16" Offset="0x1AC8" /> + <Texture Name="object_mask_dancer_Tex_001748" OutName="tex_001748" Format="ci8" Width="16" Height="16" Offset="0x1748" TlutOffset="0x1548"/> + <Texture Name="object_mask_dancer_Tex_001848" OutName="tex_001848" Format="ci8" Width="8" Height="8" Offset="0x1848" TlutOffset="0x1548"/> + <Texture Name="object_mask_dancer_Tex_001888" OutName="tex_001888" Format="ci8" Width="16" Height="16" Offset="0x1888" TlutOffset="0x1548"/> + <Texture Name="object_mask_dancer_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="8" Offset="0x1988" TlutOffset="0x1548"/> + <Texture Name="object_mask_dancer_Tex_0019C8" OutName="tex_0019C8" Format="ci8" Width="16" Height="16" Offset="0x19C8" TlutOffset="0x1548"/> + <Texture Name="object_mask_dancer_Tex_001AC8" OutName="tex_001AC8" Format="ci8" Width="8" Height="16" Offset="0x1AC8" TlutOffset="0x1548"/> </File> </Root> diff --git a/assets/xml/objects/object_mask_gero.xml b/assets/xml/objects/object_mask_gero.xml index b6f4a6117..11d4e6e62 100644 --- a/assets/xml/objects/object_mask_gero.xml +++ b/assets/xml/objects/object_mask_gero.xml @@ -3,11 +3,11 @@ <File Name="object_mask_gero" Segment="10"> <DList Name="gDonGeroMaskDL" Offset="0xDC0" /> <Texture Name="gDonGeroMaskTLUT" OutName="don_gero_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1388" /> - <Texture Name="gDonGeroMaskBottomTex" OutName="don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x1588" /> + <Texture Name="gDonGeroMaskBottomTex" OutName="don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x1588" TlutOffset="0x1388"/> <Texture Name="gDonGeroMaskToesTex" OutName="don_gero_mask_toes" Format="rgba16" Width="32" Height="32" Offset="0x1688" /> - <Texture Name="gDonGeroMaskTopTex" OutName="don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x1E88" /> - <Texture Name="gDonGeroMaskNostrilTex" OutName="don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x1F88" /> - <Texture Name="gDonGeroMaskMouthTex" OutName="don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x2388" /> + <Texture Name="gDonGeroMaskTopTex" OutName="don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x1E88" TlutOffset="0x1388"/> + <Texture Name="gDonGeroMaskNostrilTex" OutName="don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x1F88" TlutOffset="0x1388"/> + <Texture Name="gDonGeroMaskMouthTex" OutName="don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x1388"/> <Texture Name="gDonGeroMaskFrillsTex" OutName="don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x2488" /> <Texture Name="gDonGeroMaskEyeTex" OutName="don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x2C88" /> </File> diff --git a/assets/xml/objects/object_mask_goron.xml b/assets/xml/objects/object_mask_goron.xml index 56a67218e..380f0f022 100644 --- a/assets/xml/objects/object_mask_goron.xml +++ b/assets/xml/objects/object_mask_goron.xml @@ -1,10 +1,10 @@ <Root> <File Name="object_mask_goron" Segment="10"> <Texture Name="object_mask_goron_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" /> - <Texture Name="object_mask_goron_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="64" Offset="0x200" /> - <Texture Name="object_mask_goron_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="8" Height="8" Offset="0xA00" /> - <Texture Name="object_mask_goron_Tex_000A40" OutName="tex_000A40" Format="ci8" Width="16" Height="16" Offset="0xA40" /> - <Texture Name="object_mask_goron_Tex_000B40" OutName="tex_000B40" Format="ci8" Width="32" Height="32" Offset="0xB40" /> + <Texture Name="object_mask_goron_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="64" Offset="0x200" TlutOffset="0x0"/> + <Texture Name="object_mask_goron_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="8" Height="8" Offset="0xA00" TlutOffset="0x0"/> + <Texture Name="object_mask_goron_Tex_000A40" OutName="tex_000A40" Format="ci8" Width="16" Height="16" Offset="0xA40" TlutOffset="0x0"/> + <Texture Name="object_mask_goron_Tex_000B40" OutName="tex_000B40" Format="ci8" Width="32" Height="32" Offset="0xB40" TlutOffset="0x0"/> <DList Name="object_mask_goron_DL_0014A0" Offset="0x14A0" /> </File> </Root> diff --git a/assets/xml/objects/object_mask_json.xml b/assets/xml/objects/object_mask_json.xml index 1a5c10eb1..bebd6818a 100644 --- a/assets/xml/objects/object_mask_json.xml +++ b/assets/xml/objects/object_mask_json.xml @@ -3,9 +3,9 @@ <DList Name="object_mask_json_DL_0004C0" Offset="0x4C0" /> <Texture Name="object_mask_json_TLUT_0008A0" OutName="tlut_0008A0" Format="rgba16" Width="16" Height="16" Offset="0x8A0" /> <Texture Name="object_mask_json_Tex_000AA0" OutName="tex_000AA0" Format="rgba16" Width="16" Height="16" Offset="0xAA0" /> - <Texture Name="object_mask_json_Tex_000CA0" OutName="tex_000CA0" Format="ci8" Width="16" Height="8" Offset="0xCA0" /> - <Texture Name="object_mask_json_Tex_000D20" OutName="tex_000D20" Format="ci8" Width="16" Height="32" Offset="0xD20" /> - <Texture Name="object_mask_json_Tex_000F20" OutName="tex_000F20" Format="ci8" Width="32" Height="32" Offset="0xF20" /> - <Texture Name="object_mask_json_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" /> + <Texture Name="object_mask_json_Tex_000CA0" OutName="tex_000CA0" Format="ci8" Width="16" Height="8" Offset="0xCA0" TlutOffset="0x8A0"/> + <Texture Name="object_mask_json_Tex_000D20" OutName="tex_000D20" Format="ci8" Width="16" Height="32" Offset="0xD20" TlutOffset="0x8A0"/> + <Texture Name="object_mask_json_Tex_000F20" OutName="tex_000F20" Format="ci8" Width="32" Height="32" Offset="0xF20" TlutOffset="0x8A0"/> + <Texture Name="object_mask_json_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" TlutOffset="0x8A0"/> </File> </Root> diff --git a/assets/xml/objects/object_mask_ki_tan.xml b/assets/xml/objects/object_mask_ki_tan.xml index f0322cc83..3ab5cdc43 100644 --- a/assets/xml/objects/object_mask_ki_tan.xml +++ b/assets/xml/objects/object_mask_ki_tan.xml @@ -2,7 +2,7 @@ <File Name="object_mask_ki_tan" Segment="10"> <DList Name="object_mask_ki_tan_DL_0004A0" Offset="0x4A0" /> <Texture Name="object_mask_ki_tan_TLUT_000688" OutName="tlut_000688" Format="rgba16" Width="16" Height="16" Offset="0x688" /> - <Texture Name="object_mask_ki_tan_Tex_000888" OutName="tex_000888" Format="ci8" Width="32" Height="16" Offset="0x888" /> - <Texture Name="object_mask_ki_tan_Tex_000A88" OutName="tex_000A88" Format="ci8" Width="8" Height="8" Offset="0xA88" /> + <Texture Name="object_mask_ki_tan_Tex_000888" OutName="tex_000888" Format="ci8" Width="32" Height="16" Offset="0x888" TlutOffset="0x688"/> + <Texture Name="object_mask_ki_tan_Tex_000A88" OutName="tex_000A88" Format="ci8" Width="8" Height="8" Offset="0xA88" TlutOffset="0x688"/> </File> </Root> diff --git a/assets/xml/objects/object_mask_posthat.xml b/assets/xml/objects/object_mask_posthat.xml index bccbfb301..d389273ed 100644 --- a/assets/xml/objects/object_mask_posthat.xml +++ b/assets/xml/objects/object_mask_posthat.xml @@ -3,7 +3,7 @@ <DList Name="object_mask_posthat_DL_000290" Offset="0x290" /> <Texture Name="object_mask_posthat_TLUT_000488" OutName="tlut_000488" Format="rgba16" Width="16" Height="16" Offset="0x488" /> <Texture Name="object_mask_posthat_Tex_000688" OutName="tex_000688" Format="i4" Width="16" Height="16" Offset="0x688" /> - <Texture Name="object_mask_posthat_Tex_000708" OutName="tex_000708" Format="ci8" Width="32" Height="32" Offset="0x708" /> - <Texture Name="object_mask_posthat_Tex_000B08" OutName="tex_000B08" Format="ci8" Width="8" Height="8" Offset="0xB08" /> + <Texture Name="object_mask_posthat_Tex_000708" OutName="tex_000708" Format="ci8" Width="32" Height="32" Offset="0x708" TlutOffset="0x488"/> + <Texture Name="object_mask_posthat_Tex_000B08" OutName="tex_000B08" Format="ci8" Width="8" Height="8" Offset="0xB08" TlutOffset="0x488"/> </File> </Root> diff --git a/assets/xml/objects/object_mask_romerny.xml b/assets/xml/objects/object_mask_romerny.xml index 603feef0d..da8f17e5f 100644 --- a/assets/xml/objects/object_mask_romerny.xml +++ b/assets/xml/objects/object_mask_romerny.xml @@ -3,9 +3,9 @@ <DList Name="object_mask_romerny_DL_0007A0" Offset="0x7A0" /> <Texture Name="object_mask_romerny_TLUT_000B88" OutName="tlut_000B88" Format="rgba16" Width="16" Height="16" Offset="0xB88" /> <Texture Name="object_mask_romerny_Tex_000D88" OutName="tex_000D88" Format="i4" Width="64" Height="64" Offset="0xD88" /> - <Texture Name="object_mask_romerny_Tex_001588" OutName="tex_001588" Format="ci8" Width="16" Height="16" Offset="0x1588" /> - <Texture Name="object_mask_romerny_Tex_001688" OutName="tex_001688" Format="ci8" Width="16" Height="16" Offset="0x1688" /> + <Texture Name="object_mask_romerny_Tex_001588" OutName="tex_001588" Format="ci8" Width="16" Height="16" Offset="0x1588" TlutOffset="0xB88"/> + <Texture Name="object_mask_romerny_Tex_001688" OutName="tex_001688" Format="ci8" Width="16" Height="16" Offset="0x1688" TlutOffset="0xB88"/> <Texture Name="object_mask_romerny_Tex_001788" OutName="tex_001788" Format="rgba16" Width="16" Height="16" Offset="0x1788" /> - <Texture Name="object_mask_romerny_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="16" Offset="0x1988" /> + <Texture Name="object_mask_romerny_Tex_001988" OutName="tex_001988" Format="ci8" Width="8" Height="16" Offset="0x1988" TlutOffset="0xB88"/> </File> </Root> diff --git a/assets/xml/objects/object_mask_skj.xml b/assets/xml/objects/object_mask_skj.xml index 457cd94f2..dba0319bb 100644 --- a/assets/xml/objects/object_mask_skj.xml +++ b/assets/xml/objects/object_mask_skj.xml @@ -2,10 +2,10 @@ <File Name="object_mask_skj" Segment="10"> <DList Name="object_mask_skj_DL_0009F0" Offset="0x9F0" /> <Texture Name="object_mask_skj_TLUT_000FA0" OutName="tlut_000FA0" Format="rgba16" Width="16" Height="16" Offset="0xFA0" /> - <Texture Name="object_mask_skj_Tex_0011A0" OutName="tex_0011A0" Format="ci8" Width="16" Height="16" Offset="0x11A0" /> - <Texture Name="object_mask_skj_Tex_0012A0" OutName="tex_0012A0" Format="ci8" Width="8" Height="16" Offset="0x12A0" /> - <Texture Name="object_mask_skj_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" /> - <Texture Name="object_mask_skj_Tex_001360" OutName="tex_001360" Format="ci8" Width="16" Height="16" Offset="0x1360" /> + <Texture Name="object_mask_skj_Tex_0011A0" OutName="tex_0011A0" Format="ci8" Width="16" Height="16" Offset="0x11A0" TlutOffset="0xFA0"/> + <Texture Name="object_mask_skj_Tex_0012A0" OutName="tex_0012A0" Format="ci8" Width="8" Height="16" Offset="0x12A0" TlutOffset="0xFA0"/> + <Texture Name="object_mask_skj_Tex_001320" OutName="tex_001320" Format="ci8" Width="8" Height="8" Offset="0x1320" TlutOffset="0xFA0"/> + <Texture Name="object_mask_skj_Tex_001360" OutName="tex_001360" Format="ci8" Width="16" Height="16" Offset="0x1360" TlutOffset="0xFA0"/> <Texture Name="object_mask_skj_Tex_001460" OutName="tex_001460" Format="rgba16" Width="8" Height="16" Offset="0x1460" /> <Texture Name="object_mask_skj_Tex_001560" OutName="tex_001560" Format="rgba16" Width="16" Height="8" Offset="0x1560" /> <Texture Name="object_mask_skj_Tex_001660" OutName="tex_001660" Format="rgba16" Width="8" Height="8" Offset="0x1660" /> diff --git a/assets/xml/objects/object_mask_zacho.xml b/assets/xml/objects/object_mask_zacho.xml index ae63753de..a30b5101e 100644 --- a/assets/xml/objects/object_mask_zacho.xml +++ b/assets/xml/objects/object_mask_zacho.xml @@ -3,11 +3,11 @@ <DList Name="object_mask_zacho_DL_000700" Offset="0x700" /> <Texture Name="object_mask_zacho_TLUT_000BC8" OutName="tlut_000BC8" Format="rgba16" Width="16" Height="16" Offset="0xBC8" /> <Texture Name="object_mask_zacho_Tex_000DC8" OutName="tex_000DC8" Format="rgba16" Width="16" Height="16" Offset="0xDC8" /> - <Texture Name="object_mask_zacho_Tex_000FC8" OutName="tex_000FC8" Format="ci8" Width="8" Height="8" Offset="0xFC8" /> - <Texture Name="object_mask_zacho_Tex_001008" OutName="tex_001008" Format="ci8" Width="8" Height="8" Offset="0x1008" /> - <Texture Name="object_mask_zacho_Tex_001048" OutName="tex_001048" Format="ci8" Width="32" Height="32" Offset="0x1048" /> - <Texture Name="object_mask_zacho_Tex_001448" OutName="tex_001448" Format="ci8" Width="16" Height="16" Offset="0x1448" /> - <Texture Name="object_mask_zacho_Tex_001548" OutName="tex_001548" Format="ci8" Width="16" Height="16" Offset="0x1548" /> - <Texture Name="object_mask_zacho_Tex_001648" OutName="tex_001648" Format="ci8" Width="8" Height="8" Offset="0x1648" /> + <Texture Name="object_mask_zacho_Tex_000FC8" OutName="tex_000FC8" Format="ci8" Width="8" Height="8" Offset="0xFC8" TlutOffset="0xBC8"/> + <Texture Name="object_mask_zacho_Tex_001008" OutName="tex_001008" Format="ci8" Width="8" Height="8" Offset="0x1008" TlutOffset="0xBC8"/> + <Texture Name="object_mask_zacho_Tex_001048" OutName="tex_001048" Format="ci8" Width="32" Height="32" Offset="0x1048" TlutOffset="0xBC8"/> + <Texture Name="object_mask_zacho_Tex_001448" OutName="tex_001448" Format="ci8" Width="16" Height="16" Offset="0x1448" TlutOffset="0xBC8"/> + <Texture Name="object_mask_zacho_Tex_001548" OutName="tex_001548" Format="ci8" Width="16" Height="16" Offset="0x1548" TlutOffset="0xBC8"/> + <Texture Name="object_mask_zacho_Tex_001648" OutName="tex_001648" Format="ci8" Width="8" Height="8" Offset="0x1648" TlutOffset="0xBC8"/> </File> </Root> diff --git a/assets/xml/objects/object_mask_zora.xml b/assets/xml/objects/object_mask_zora.xml index c2e07cde2..3d66b43bf 100644 --- a/assets/xml/objects/object_mask_zora.xml +++ b/assets/xml/objects/object_mask_zora.xml @@ -1,10 +1,10 @@ <Root> <File Name="object_mask_zora" Segment="10"> <Texture Name="object_mask_zora_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" /> - <Texture Name="object_mask_zora_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="32" Offset="0x200" /> - <Texture Name="object_mask_zora_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" /> - <Texture Name="object_mask_zora_Tex_000800" OutName="tex_000800" Format="ci8" Width="8" Height="8" Offset="0x800" /> - <Texture Name="object_mask_zora_Tex_000840" OutName="tex_000840" Format="ci8" Width="16" Height="32" Offset="0x840" /> + <Texture Name="object_mask_zora_Tex_000200" OutName="tex_000200" Format="ci8" Width="32" Height="32" Offset="0x200" TlutOffset="0x0"/> + <Texture Name="object_mask_zora_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" TlutOffset="0x0"/> + <Texture Name="object_mask_zora_Tex_000800" OutName="tex_000800" Format="ci8" Width="8" Height="8" Offset="0x800" TlutOffset="0x0"/> + <Texture Name="object_mask_zora_Tex_000840" OutName="tex_000840" Format="ci8" Width="16" Height="32" Offset="0x840" TlutOffset="0x0"/> <DList Name="object_mask_zora_DL_000DB0" Offset="0xDB0" /> </File> </Root> diff --git a/assets/xml/objects/object_milkbar.xml b/assets/xml/objects/object_milkbar.xml index f3e732514..e64752e25 100644 --- a/assets/xml/objects/object_milkbar.xml +++ b/assets/xml/objects/object_milkbar.xml @@ -51,7 +51,7 @@ <Texture Name="object_milkbar_Tex_00E3A0" OutName="tex_00E3A0" Format="i8" Width="8" Height="8" Offset="0xE3A0" /> <Texture Name="object_milkbar_TLUT_00E3E0" OutName="tlut_00E3E0" Format="rgba16" Width="16" Height="16" Offset="0xE3E0" /> <Texture Name="object_milkbar_Tex_00E5E0" OutName="tex_00E5E0" Format="rgba16" Width="32" Height="32" Offset="0xE5E0" /> - <Texture Name="object_milkbar_Tex_00EDE0" OutName="tex_00EDE0" Format="ci8" Width="32" Height="32" Offset="0xEDE0" /> + <Texture Name="object_milkbar_Tex_00EDE0" OutName="tex_00EDE0" Format="ci8" Width="32" Height="32" Offset="0xEDE0" TlutOffset="0xE3E0"/> <Texture Name="object_milkbar_Tex_00F1E0" OutName="tex_00F1E0" Format="ia16" Width="32" Height="32" Offset="0xF1E0" /> <Texture Name="object_milkbar_Tex_00F9E0" OutName="tex_00F9E0" Format="i4" Width="64" Height="64" Offset="0xF9E0" /> <Texture Name="object_milkbar_Tex_0101E0" OutName="tex_0101E0" Format="i8" Width="32" Height="32" Offset="0x101E0" /> diff --git a/assets/xml/objects/object_mk.xml b/assets/xml/objects/object_mk.xml index 0db6c703d..f7417a6da 100644 --- a/assets/xml/objects/object_mk.xml +++ b/assets/xml/objects/object_mk.xml @@ -19,16 +19,16 @@ <DList Name="gMarineResearcherLeftHandDL" Offset="0x5B10" /> <DList Name="gMarineResearcherLowerTorsoDL" Offset="0x5C60" /> <Texture Name="gMarineResearcherTLUT" OutName="marine_researcher_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5DE0" /> - <Texture Name="gMarineResearcherChestSkinTex" OutName="marine_researcher_chest_skin" Format="ci8" Width="8" Height="8" Offset="0x5FE0" /> - <Texture Name="gMarineResearcherMouthTex" OutName="marine_researcher_mouth" Format="ci8" Width="16" Height="16" Offset="0x6020" /> - <Texture Name="gMarineResearcherLipsTex" OutName="marine_researcher_lips" Format="ci8" Width="8" Height="8" Offset="0x6120" /> - <Texture Name="gMarineResearcherJacketTex" OutName="marine_researcher_jacket" Format="ci8" Width="8" Height="8" Offset="0x6160" /> - <Texture Name="gMarineResearcherHairTex" OutName="marine_researcher_hair" Format="ci8" Width="8" Height="16" Offset="0x61A0" /> + <Texture Name="gMarineResearcherChestSkinTex" OutName="marine_researcher_chest_skin" Format="ci8" Width="8" Height="8" Offset="0x5FE0" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherMouthTex" OutName="marine_researcher_mouth" Format="ci8" Width="16" Height="16" Offset="0x6020" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherLipsTex" OutName="marine_researcher_lips" Format="ci8" Width="8" Height="8" Offset="0x6120" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherJacketTex" OutName="marine_researcher_jacket" Format="ci8" Width="8" Height="8" Offset="0x6160" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherHairTex" OutName="marine_researcher_hair" Format="ci8" Width="8" Height="16" Offset="0x61A0" TlutOffset="0x5DE0"/> <Texture Name="gMarineResearcherEyeTex" OutName="marine_researcher_eye" Format="rgba16" Width="32" Height="32" Offset="0x6220" /> - <Texture Name="gMarineResearcherNostrilTex" OutName="marine_researcher_nostril" Format="ci8" Width="8" Height="8" Offset="0x6A20" /> - <Texture Name="gMarineResearcherEarTex" OutName="marine_researcher_ear" Format="ci8" Width="8" Height="8" Offset="0x6A60" /> - <Texture Name="gMarineResearcherShirtTex" OutName="marine_researcher_shirt" Format="ci8" Width="8" Height="8" Offset="0x6AA0" /> - <Texture Name="gMarineResearcherFingersTex" OutName="marine_researcher_fingers" Format="ci8" Width="16" Height="16" Offset="0x6AE0" /> + <Texture Name="gMarineResearcherNostrilTex" OutName="marine_researcher_nostril" Format="ci8" Width="8" Height="8" Offset="0x6A20" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherEarTex" OutName="marine_researcher_ear" Format="ci8" Width="8" Height="8" Offset="0x6A60" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherShirtTex" OutName="marine_researcher_shirt" Format="ci8" Width="8" Height="8" Offset="0x6AA0" TlutOffset="0x5DE0"/> + <Texture Name="gMarineResearcherFingersTex" OutName="marine_researcher_fingers" Format="ci8" Width="16" Height="16" Offset="0x6AE0" TlutOffset="0x5DE0"/> <Limb Name="gMarineResearcherLowerTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LOWER_TORSO" Offset="0x6BE0" /> <Limb Name="gMarineResearcherMidTorsoLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_MID_TORSO" Offset="0x6BEC" /> <Limb Name="gMarineResearcherLeftShoulderLimb" Type="Standard" EnumName="MARINE_RESEARCHER_LIMB_LEFT_SHOULDER" Offset="0x6BF8" /> diff --git a/assets/xml/objects/object_mnk.xml b/assets/xml/objects/object_mnk.xml index a98e0e4f4..73abc33f6 100644 --- a/assets/xml/objects/object_mnk.xml +++ b/assets/xml/objects/object_mnk.xml @@ -3,10 +3,10 @@ <DList Name="object_mnk_DL_000F50" Offset="0xF50" /> <DList Name="object_mnk_DL_000F58" Offset="0xF58" /> <!-- Original name is "z2_25_tubo_model" --> <Texture Name="object_mnk_TLUT_001620" OutName="tlut_001620" Format="rgba16" Width="16" Height="16" Offset="0x1620" /> - <Texture Name="object_mnk_Tex_001820" OutName="tex_001820" Format="ci8" Width="16" Height="64" Offset="0x1820" /> - <Texture Name="object_mnk_Tex_001C20" OutName="tex_001C20" Format="ci8" Width="16" Height="16" Offset="0x1C20" /> - <Texture Name="object_mnk_Tex_001D20" OutName="tex_001D20" Format="ci8" Width="16" Height="16" Offset="0x1D20" /> - <Texture Name="object_mnk_Tex_001E20" OutName="tex_001E20" Format="ci8" Width="16" Height="128" Offset="0x1E20" /> + <Texture Name="object_mnk_Tex_001820" OutName="tex_001820" Format="ci8" Width="16" Height="64" Offset="0x1820" TlutOffset="0x1620"/> + <Texture Name="object_mnk_Tex_001C20" OutName="tex_001C20" Format="ci8" Width="16" Height="16" Offset="0x1C20" TlutOffset="0x1620"/> + <Texture Name="object_mnk_Tex_001D20" OutName="tex_001D20" Format="ci8" Width="16" Height="16" Offset="0x1D20" TlutOffset="0x1620"/> + <Texture Name="object_mnk_Tex_001E20" OutName="tex_001E20" Format="ci8" Width="16" Height="128" Offset="0x1E20" TlutOffset="0x1620"/> <Texture Name="object_mnk_Tex_002620" OutName="tex_002620" Format="rgba16" Width="32" Height="32" Offset="0x2620" /> <TextureAnimation Name="object_mnk_Matanimheader_002E28" Offset="0x2E28" /> <Collision Name="object_mnk_Colheader_0033E8" Offset="0x33E8" /> <!-- Original name is "z2_25_tubo_bgdatainfo" --> @@ -70,22 +70,22 @@ <DList Name="object_mnk_DL_014590" Offset="0x14590" /> <DList Name="object_mnk_DL_014790" Offset="0x14790" /> <Texture Name="object_mnk_TLUT_014A20" OutName="tlut_014A20" Format="rgba16" Width="16" Height="16" Offset="0x14A20" /> - <Texture Name="object_mnk_Tex_014C20" OutName="tex_014C20" Format="ci8" Width="32" Height="32" Offset="0x14C20" /> - <Texture Name="object_mnk_Tex_015020" OutName="tex_015020" Format="ci8" Width="32" Height="64" Offset="0x15020" /> - <Texture Name="object_mnk_Tex_015820" OutName="tex_015820" Format="ci8" Width="16" Height="16" Offset="0x15820" /> + <Texture Name="object_mnk_Tex_014C20" OutName="tex_014C20" Format="ci8" Width="32" Height="32" Offset="0x14C20" TlutOffset="0x14A20"/> + <Texture Name="object_mnk_Tex_015020" OutName="tex_015020" Format="ci8" Width="32" Height="64" Offset="0x15020" TlutOffset="0x14A20"/> + <Texture Name="object_mnk_Tex_015820" OutName="tex_015820" Format="ci8" Width="16" Height="16" Offset="0x15820" TlutOffset="0x14A20"/> <Texture Name="object_mnk_Tex_015920" OutName="tex_015920" Format="ci8" Width="32" Height="64" Offset="0x15920" /> <Texture Name="object_mnk_Tex_016120" OutName="tex_016120" Format="ci8" Width="32" Height="64" Offset="0x16120" /> <Texture Name="object_mnk_Tex_016920" OutName="tex_016920" Format="ci8" Width="32" Height="64" Offset="0x16920" /> <Texture Name="object_mnk_Tex_017120" OutName="tex_017120" Format="ci8" Width="32" Height="64" Offset="0x17120" /> <Texture Name="object_mnk_Tex_017920" OutName="tex_017920" Format="ci8" Width="32" Height="64" Offset="0x17920" /> <Texture Name="object_mnk_Tex_018120" OutName="tex_018120" Format="ci8" Width="32" Height="64" Offset="0x18120" /> - <Texture Name="object_mnk_Tex_018920" OutName="tex_018920" Format="ci8" Width="16" Height="16" Offset="0x18920" /> - <Texture Name="object_mnk_Tex_018A20" OutName="tex_018A20" Format="ci8" Width="32" Height="32" Offset="0x18A20" /> - <Texture Name="object_mnk_Tex_018E20" OutName="tex_018E20" Format="ci8" Width="16" Height="16" Offset="0x18E20" /> + <Texture Name="object_mnk_Tex_018920" OutName="tex_018920" Format="ci8" Width="16" Height="16" Offset="0x18920" TlutOffset="0x14A20"/> + <Texture Name="object_mnk_Tex_018A20" OutName="tex_018A20" Format="ci8" Width="32" Height="32" Offset="0x18A20" TlutOffset="0x14A20"/> + <Texture Name="object_mnk_Tex_018E20" OutName="tex_018E20" Format="ci8" Width="16" Height="16" Offset="0x18E20" TlutOffset="0x14A20"/> <Texture Name="object_mnk_Tex_018F20" OutName="tex_018F20" Format="rgba16" Width="32" Height="32" Offset="0x18F20" /> - <Texture Name="object_mnk_Tex_019720" OutName="tex_019720" Format="ci8" Width="16" Height="16" Offset="0x19720" /> - <Texture Name="object_mnk_Tex_019820" OutName="tex_019820" Format="ci8" Width="16" Height="16" Offset="0x19820" /> - <Texture Name="object_mnk_Tex_019920" OutName="tex_019920" Format="ci8" Width="16" Height="16" Offset="0x19920" /> + <Texture Name="object_mnk_Tex_019720" OutName="tex_019720" Format="ci8" Width="16" Height="16" Offset="0x19720" TlutOffset="0x14A20"/> + <Texture Name="object_mnk_Tex_019820" OutName="tex_019820" Format="ci8" Width="16" Height="16" Offset="0x19820" TlutOffset="0x14A20"/> + <Texture Name="object_mnk_Tex_019920" OutName="tex_019920" Format="ci8" Width="16" Height="16" Offset="0x19920" TlutOffset="0x14A20"/> <TextureAnimation Name="object_mnk_Matanimheader_019A20" Offset="0x19A20" /> <!-- Empty TexAnim --> <Limb Name="object_mnk_Standardlimb_019A28" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_01" Offset="0x19A28" /> <Limb Name="object_mnk_Standardlimb_019A34" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_02" Offset="0x19A34" /> diff --git a/assets/xml/objects/object_moonend.xml b/assets/xml/objects/object_moonend.xml index 9b9e078a2..cdb4ec029 100644 --- a/assets/xml/objects/object_moonend.xml +++ b/assets/xml/objects/object_moonend.xml @@ -14,8 +14,8 @@ <Texture Name="object_moonend_TLUT_006D10" OutName="tlut_006D10" Format="rgba16" Width="4" Height="4" Offset="0x6D10" /> <Texture Name="object_moonend_Tex_006D30" OutName="tex_006D30" Format="rgba16" Width="32" Height="32" Offset="0x6D30" /> <Texture Name="object_moonend_Tex_007530" OutName="tex_007530" Format="rgba16" Width="64" Height="32" Offset="0x7530" /> - <Texture Name="object_moonend_Tex_008530" OutName="tex_008530" Format="ci4" Width="64" Height="64" Offset="0x8530" /> - <Texture Name="object_moonend_Tex_008D30" OutName="tex_008D30" Format="ci4" Width="64" Height="64" Offset="0x8D30" /> + <Texture Name="object_moonend_Tex_008530" OutName="tex_008530" Format="ci4" Width="64" Height="64" Offset="0x8530" TlutOffset="0x6CF0"/> + <Texture Name="object_moonend_Tex_008D30" OutName="tex_008D30" Format="ci4" Width="64" Height="64" Offset="0x8D30" TlutOffset="0x6D10"/> <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" /> diff --git a/assets/xml/objects/object_mtoride.xml b/assets/xml/objects/object_mtoride.xml index 145fcd33f..01dcea3e5 100644 --- a/assets/xml/objects/object_mtoride.xml +++ b/assets/xml/objects/object_mtoride.xml @@ -5,7 +5,7 @@ <Texture Name="gWoodfallSceneryUnusedTLUT" OutName="woodfall_scenery_unused_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" /> <Texture Name="gWoodfallSceneryBranchAndLeavesTLUT" OutName="woodfall_scenery_branch_and_leaves_tlut" Format="rgba16" Width="4" Height="4" Offset="0x200" /> <Texture Name="gWoodfallSceneryTreeRingTex" OutName="woodfall_scenery_tree_ring" Format="rgba16" Width="16" Height="16" Offset="0x220" /> - <Texture Name="gWoodfallSceneryBranchAndLeavesTex" OutName="woodfall_scenery_branch_and_leaves" Format="ci4" Width="32" Height="128" Offset="0x420" /> + <Texture Name="gWoodfallSceneryBranchAndLeavesTex" OutName="woodfall_scenery_branch_and_leaves" Format="ci4" Width="32" Height="128" Offset="0x420" TlutOffset="0x200"/> <Texture Name="gWoodfallSceneryEntranceGradientTex" OutName="woodfall_scenery_entrance_gradient" Format="ia8" Width="32" Height="8" Offset="0xC20" /> <Texture Name="gWoodfallSceneryTempleEdgeAndRampAndPlatformTopTex" OutName="woodfall_scenery_temple_edges_and_ramp_and_platform_top" Format="rgba16" Width="32" Height="32" Offset="0xD20" /> <Texture Name="gWoodfallSceneryTempleEntranceAndRampSidesTex" OutName="woodfall_scenery_temple_entrance_and_ramp_sides" Format="rgba16" Width="32" Height="64" Offset="0x1520" /> diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml index a72b184c1..6f2f34eed 100644 --- a/assets/xml/objects/object_mu.xml +++ b/assets/xml/objects/object_mu.xml @@ -8,16 +8,16 @@ <Animation Name="gHoneyAndDarlingIdleAnim" Offset="0x53E0" /> <!-- Original name is "tg_matsu" --> <Texture Name="gHoneyAndDarlingTLUT" OutName="honey_and_darling_tlut" Format="rgba16" Width="16" Height="16" Offset="0x53F0" /> <Texture Name="gHoneyAndDarlingShirtsAndShoesTex" OutName="honey_and_darling_shirts_and_shoes" Format="i8" Width="16" Height="16" Offset="0x55F0" /> - <Texture Name="gHoneyAndDarlingWomanDressTex" OutName="honey_and_darling_woman_dress" Format="ci8" Width="16" Height="16" Offset="0x56F0" /> + <Texture Name="gHoneyAndDarlingWomanDressTex" OutName="honey_and_darling_woman_dress" Format="ci8" Width="16" Height="16" Offset="0x56F0" TlutOffset="0x53F0"/> <Texture Name="gHoneyAndDarlingJointShadeTex" OutName="honey_and_darling_joint_shade" Format="i8" Width="8" Height="8" Offset="0x57F0" /> <!-- For the man's shoulders, elbows, and knees, and the woman's elbows --> - <Texture Name="gHoneyAndDarlingHeadSkinTex" OutName="honey_and_darling_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5830" /> <!-- For their necks, under chin, noses, cheeks, and foreheads --> - <Texture Name="gHoneyAndDarlingManHairTex" OutName="honey_and_darling_man_hair" Format="ci8" Width="16" Height="16" Offset="0x5870" /> - <Texture Name="gHoneyAndDarlingEarTex" OutName="honey_and_darling_ear" Format="ci8" Width="8" Height="8" Offset="0x5970" /> - <Texture Name="gHoneyAndDarlingMouthTex" OutName="honey_and_darling_mouth" Format="ci8" Width="32" Height="16" Offset="0x59B0" /> - <Texture Name="gHoneyAndDarlingManEyeTex" OutName="honey_and_darling_man_eye" Format="ci8" Width="32" Height="32" Offset="0x5BB0" /> - <Texture Name="gHoneyAndDarlingHandTex" OutName="honey_and_darling_hand" Format="ci8" Width="8" Height="8" Offset="0x5FB0" /> - <Texture Name="gHoneyAndDarlingWomanHairTex" OutName="honey_and_darling_woman_hair" Format="ci8" Width="8" Height="16" Offset="0x5FF0" /> - <Texture Name="gHoneyAndDarlingWomanEyeTex" OutName="honey_and_darling_woman_eye" Format="ci8" Width="32" Height="32" Offset="0x6070" /> + <Texture Name="gHoneyAndDarlingHeadSkinTex" OutName="honey_and_darling_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5830" TlutOffset="0x53F0"/> <!-- For their necks, under chin, noses, cheeks, and foreheads --> + <Texture Name="gHoneyAndDarlingManHairTex" OutName="honey_and_darling_man_hair" Format="ci8" Width="16" Height="16" Offset="0x5870" TlutOffset="0x53F0"/> + <Texture Name="gHoneyAndDarlingEarTex" OutName="honey_and_darling_ear" Format="ci8" Width="8" Height="8" Offset="0x5970" TlutOffset="0x53F0"/> + <Texture Name="gHoneyAndDarlingMouthTex" OutName="honey_and_darling_mouth" Format="ci8" Width="32" Height="16" Offset="0x59B0" TlutOffset="0x53F0"/> + <Texture Name="gHoneyAndDarlingManEyeTex" OutName="honey_and_darling_man_eye" Format="ci8" Width="32" Height="32" Offset="0x5BB0" TlutOffset="0x53F0"/> + <Texture Name="gHoneyAndDarlingHandTex" OutName="honey_and_darling_hand" Format="ci8" Width="8" Height="8" Offset="0x5FB0" TlutOffset="0x53F0"/> + <Texture Name="gHoneyAndDarlingWomanHairTex" OutName="honey_and_darling_woman_hair" Format="ci8" Width="8" Height="16" Offset="0x5FF0" TlutOffset="0x53F0"/> + <Texture Name="gHoneyAndDarlingWomanEyeTex" OutName="honey_and_darling_woman_eye" Format="ci8" Width="32" Height="32" Offset="0x6070" TlutOffset="0x53F0"/> <DList Name="gHoneyAndDarlingLegsDL" Offset="0x9370" /> <DList Name="gHoneyAndDarlingWomanHeadDL" Offset="0x96C8" /> <DList Name="gHoneyAndDarlingWomanRightHandDL" Offset="0x9BC8" /> diff --git a/assets/xml/objects/object_nnh.xml b/assets/xml/objects/object_nnh.xml index 3a806c792..b04565dc2 100644 --- a/assets/xml/objects/object_nnh.xml +++ b/assets/xml/objects/object_nnh.xml @@ -6,8 +6,8 @@ <Texture Name="gButlerSonTLUT" OutName="tlut_001AA0" Format="rgba16" Width="16" Height="16" Offset="0x1AA0" /> <!-- Similar to MainBodyTex but with dark green mold under the roots --> - <Texture Name="gButlerSonRootTex" OutName="roots" Format="ci8" Width="16" Height="16" Offset="0x1CA0" /> - <Texture Name="gButlerSonMainBodyTex" OutName="body" Format="ci8" Width="16" Height="16" Offset="0x1DA0" /> + <Texture Name="gButlerSonRootTex" OutName="roots" Format="ci8" Width="16" Height="16" Offset="0x1CA0" TlutOffset="0x1AA0"/> + <Texture Name="gButlerSonMainBodyTex" OutName="body" Format="ci8" Width="16" Height="16" Offset="0x1DA0" TlutOffset="0x1AA0"/> <Texture Name="gButlerSonWholeLeafTex" OutName="whole_leaf" Format="rgba16" Width="32" Height="32" Offset="0x1EA0" /> <!-- Only his top left leaf has this circular cutout --> <Texture Name="gButlerSonCutoutLeafTex" OutName="cutout_leaf" Format="rgba16" Width="32" Height="32" Offset="0x26A0" /> diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml index 27270fb7f..8812c7fdc 100644 --- a/assets/xml/objects/object_oF1d_map.xml +++ b/assets/xml/objects/object_oF1d_map.xml @@ -39,11 +39,11 @@ <!-- Don Gero's Mask --> <DList Name="gGoronDonGeroMaskDL" Offset="0x4DB0" /> <Texture Name="gGoronDonGeroMaskTLUT" OutName="goron_don_gero_mask_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5340" /> - <Texture Name="gGoronDonGeroMaskBottomTex" OutName="goron_don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x5540" /> + <Texture Name="gGoronDonGeroMaskBottomTex" OutName="goron_don_gero_mask_bottom" Format="ci8" Width="16" Height="16" Offset="0x5540" TlutOffset="0x5340"/> <Texture Name="gGoronDonGeroMaskToesTex" OutName="goron_don_gero_mask_toes" Format="rgba16" Width="32" Height="32" Offset="0x5640" /> - <Texture Name="gGoronDonGeroMaskTopTex" OutName="goron_don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x5E40" /> - <Texture Name="gGoronDonGeroMaskNostrilTex" OutName="goron_don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x5F40" /> - <Texture Name="gGoronDonGeroMaskMouthTex" OutName="goron_don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x6340" /> + <Texture Name="gGoronDonGeroMaskTopTex" OutName="goron_don_gero_mask_top" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5340"/> + <Texture Name="gGoronDonGeroMaskNostrilTex" OutName="goron_don_gero_mask_nostril" Format="ci8" Width="32" Height="32" Offset="0x5F40" TlutOffset="0x5340"/> + <Texture Name="gGoronDonGeroMaskMouthTex" OutName="goron_don_gero_mask_mouth" Format="ci8" Width="16" Height="16" Offset="0x6340" TlutOffset="0x5340"/> <Texture Name="gGoronDonGeroMaskFrillsTex" OutName="goron_don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x6440" /> <Texture Name="gGoronDonGeroMaskEyeTex" OutName="goron_don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x6C40" /> @@ -52,20 +52,20 @@ <DList Name="gGoronEmptyDL" Offset="0x7A60" /> <DList Name="gGoronScaredDL" Offset="0x7A68" /> <Texture Name="gGoronScaredTLUT" OutName="goron_scared_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7EF0" /> - <Texture Name="gGoronScaredSkinTex" OutName="goron_scared_skin" Format="ci8" Width="16" Height="16" Offset="0x80F0" /> - <Texture Name="gGoronScaredBellyButtonTex" OutName="goron_scared_belly_button" Format="ci8" Width="8" Height="8" Offset="0x81F0" /> - <Texture Name="gGoronScaredBottomTex" OutName="goron_scared_bottom" Format="ci8" Width="8" Height="16" Offset="0x8230" /> - <Texture Name="gGoronScaredRocksTex" OutName="goron_scared_rocks" Format="ci8" Width="32" Height="64" Offset="0x82B0" /> - <Texture Name="gGoronScaredHairTex" OutName="goron_scared_hair" Format="ci8" Width="16" Height="16" Offset="0x8AB0" /> + <Texture Name="gGoronScaredSkinTex" OutName="goron_scared_skin" Format="ci8" Width="16" Height="16" Offset="0x80F0" TlutOffset="0x7EF0"/> + <Texture Name="gGoronScaredBellyButtonTex" OutName="goron_scared_belly_button" Format="ci8" Width="8" Height="8" Offset="0x81F0" TlutOffset="0x7EF0"/> + <Texture Name="gGoronScaredBottomTex" OutName="goron_scared_bottom" Format="ci8" Width="8" Height="16" Offset="0x8230" TlutOffset="0x7EF0"/> + <Texture Name="gGoronScaredRocksTex" OutName="goron_scared_rocks" Format="ci8" Width="32" Height="64" Offset="0x82B0" TlutOffset="0x7EF0"/> + <Texture Name="gGoronScaredHairTex" OutName="goron_scared_hair" Format="ci8" Width="16" Height="16" Offset="0x8AB0" TlutOffset="0x7EF0"/> <!-- Rolled Up --> <DList Name="gGoronEmpty2DL" Offset="0x91A0" /> <DList Name="gGoronRolledUpDL" Offset="0x91A8" /> <!-- Original name is "oF1d_iwa2_model" --> <Texture Name="gGoronRolledUpTLUT" OutName="goron_rolled_up_tlut" Format="rgba16" Width="16" Height="16" Offset="0x94E0" /> - <Texture Name="gGoronRolledUpSkinTex" OutName="goron_rolled_up_skin" Format="ci8" Width="16" Height="16" Offset="0x96E0" /> - <Texture Name="gGoronRolledUpBellyButtonTex" OutName="goron_rolled_up_belly_button" Format="ci8" Width="8" Height="8" Offset="0x97E0" /> - <Texture Name="gGoronRolledUpBottomTex" OutName="goron_rolled_up_bottom" Format="ci8" Width="8" Height="16" Offset="0x9820" /> - <Texture Name="gGoronRolledUpRocksTex" OutName="goron_rolled_up_rocks" Format="ci8" Width="32" Height="64" Offset="0x98A0" /> + <Texture Name="gGoronRolledUpSkinTex" OutName="goron_rolled_up_skin" Format="ci8" Width="16" Height="16" Offset="0x96E0" TlutOffset="0x94E0"/> + <Texture Name="gGoronRolledUpBellyButtonTex" OutName="goron_rolled_up_belly_button" Format="ci8" Width="8" Height="8" Offset="0x97E0" TlutOffset="0x94E0"/> + <Texture Name="gGoronRolledUpBottomTex" OutName="goron_rolled_up_bottom" Format="ci8" Width="8" Height="16" Offset="0x9820" TlutOffset="0x94E0"/> + <Texture Name="gGoronRolledUpRocksTex" OutName="goron_rolled_up_rocks" Format="ci8" Width="32" Height="64" Offset="0x98A0" TlutOffset="0x94E0"/> <!-- Animation --> <Animation Name="gGoronTPoseAnim" Offset="0xA118" /> <!-- Original name is "ng_kihon" --> @@ -90,21 +90,21 @@ <!-- Textures --> <Texture Name="gGoronTLUT" OutName="goron_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEA78" /> <Texture Name="gGoronEyeTLUT" OutName="goron_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xEC78" /> - <Texture Name="gGoronSkinTex" OutName="goron_skin" Format="ci8" Width="16" Height="16" Offset="0xEE78" /> - <Texture Name="gGoronFingersTex" OutName="goron_fingers" Format="ci8" Width="16" Height="16" Offset="0xEF78" /> - <Texture Name="gGoronTatooTex" OutName="goron_tatoo" Format="ci8" Width="32" Height="32" Offset="0xF078" /> - <Texture Name="gGoronToesTex" OutName="goron_toes" Format="ci8" Width="32" Height="16" Offset="0xF478" /> - <Texture Name="gGoronFootTex" OutName="goron_foot" Format="ci8" Width="32" Height="32" Offset="0xF678" /> - <Texture Name="gGoronNostrilTex" OutName="goron_nostril" Format="ci8" Width="8" Height="8" Offset="0xFA78" /> - <Texture Name="gGoronBottomTex" OutName="goron_bottom" Format="ci8" Width="8" Height="16" Offset="0xFAB8" /> - <Texture Name="gGoronsRocksTex" OutName="goron_rocks" Format="ci8" Width="32" Height="64" Offset="0xFB38" /> - <Texture Name="gGoronHairTex" OutName="goron_hair" Format="ci8" Width="16" Height="16" Offset="0x10338" /> + <Texture Name="gGoronSkinTex" OutName="goron_skin" Format="ci8" Width="16" Height="16" Offset="0xEE78" TlutOffset="0xEA78"/> + <Texture Name="gGoronFingersTex" OutName="goron_fingers" Format="ci8" Width="16" Height="16" Offset="0xEF78" TlutOffset="0xEA78"/> + <Texture Name="gGoronTatooTex" OutName="goron_tatoo" Format="ci8" Width="32" Height="32" Offset="0xF078" TlutOffset="0xEA78"/> + <Texture Name="gGoronToesTex" OutName="goron_toes" Format="ci8" Width="32" Height="16" Offset="0xF478" TlutOffset="0xEA78"/> + <Texture Name="gGoronFootTex" OutName="goron_foot" Format="ci8" Width="32" Height="32" Offset="0xF678" TlutOffset="0xEA78"/> + <Texture Name="gGoronNostrilTex" OutName="goron_nostril" Format="ci8" Width="8" Height="8" Offset="0xFA78" TlutOffset="0xEA78"/> + <Texture Name="gGoronBottomTex" OutName="goron_bottom" Format="ci8" Width="8" Height="16" Offset="0xFAB8" TlutOffset="0xEA78"/> + <Texture Name="gGoronsRocksTex" OutName="goron_rocks" Format="ci8" Width="32" Height="64" Offset="0xFB38" TlutOffset="0xEA78"/> + <Texture Name="gGoronHairTex" OutName="goron_hair" Format="ci8" Width="16" Height="16" Offset="0x10338" TlutOffset="0xEA78"/> <Texture Name="gGoronEyeOpenTex" OutName="goron_eye_open" Format="ci8" Width="32" Height="32" Offset="0x10438" /> <Texture Name="gGoronEyeClosed2Tex" OutName="goron_eye_closed2" Format="ci8" Width="32" Height="32" Offset="0x10838" /> <Texture Name="gGoronEyeHalfTex" OutName="goron_eye_half" Format="ci8" Width="32" Height="32" Offset="0x10C38" /> <Texture Name="gGoronEyeClosedTex" OutName="goron_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x11038" /> <Texture Name="gGoronLipsTex" OutName="goron_lips" Format="rgba16" Width="8" Height="8" Offset="0x11438" /> - <Texture Name="gGoronDimpleTex" OutName="goron_dimple" Format="ci8" Width="16" Height="16" Offset="0x114B8" /> + <Texture Name="gGoronDimpleTex" OutName="goron_dimple" Format="ci8" Width="16" Height="16" Offset="0x114B8" TlutOffset="0xEA78"/> <Texture Name="gGoronBeardTex" OutName="goron_beard" Format="rgba16" Width="32" Height="16" Offset="0x115B8" /> <!-- Skeleton --> diff --git a/assets/xml/objects/object_ob.xml b/assets/xml/objects/object_ob.xml index 1d4447de5..798e1cfb0 100644 --- a/assets/xml/objects/object_ob.xml +++ b/assets/xml/objects/object_ob.xml @@ -26,18 +26,18 @@ <Texture Name="gMoonChildTwinmoldsMaskSkinTLUT" OutName="moonchild_twinmolds_mask_skin_tlut" Format="rgba16" Width="4" Height="4" Offset="0x9080" /> <Texture Name="gMoonChildTwinmoldsMaskSnoutTLUT" OutName="moonchild_twinmolds_snout_tlut" Format="rgba16" Width="4" Height="4" Offset="0x90A0" /> <Texture Name="gMoonChildOdolwasMaskPlumeTex" OutName="moonchild_odolwas_mask_plume" Format="rgba16" Width="16" Height="16" Offset="0x90C0" /> - <Texture Name="gMoonChildOdolwasMaskFaceTex" OutName="moonchild_odolwas_mask_face" Format="ci4" Width="64" Height="64" Offset="0x92C0" /> - <Texture Name="gMoonChildOdolwasMaskEarTex" OutName="moonchild_odolwas_mask_ear" Format="ci4" Width="64" Height="64" Offset="0x9AC0" /> + <Texture Name="gMoonChildOdolwasMaskFaceTex" OutName="moonchild_odolwas_mask_face" Format="ci4" Width="64" Height="64" Offset="0x92C0" TlutOffset="0x8FE0"/> + <Texture Name="gMoonChildOdolwasMaskEarTex" OutName="moonchild_odolwas_mask_ear" Format="ci4" Width="64" Height="64" Offset="0x9AC0" TlutOffset="0x9000"/> <Texture Name="gMoonChildGyorgsTwinmoldsMaskEyeTex" OutName="moonchild_gyorgs_twinmolds_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0xA2C0" /> - <Texture Name="gMoonChildGyorgsMaskSkinTex" OutName="moonchild_gyorgs_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xAAC0" /> - <Texture Name="gMoonChildGyorgsMaskMouthTex" OutName="moonchild_gyorgs_mask_mouth" Format="ci4" Width="64" Height="64" Offset="0xB2C0" /> - <Texture Name="gMoonChildGyorgsMaskToothHornTex" OutName="moonchild_gyorgs_mask_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xBAC0" /> + <Texture Name="gMoonChildGyorgsMaskSkinTex" OutName="moonchild_gyorgs_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xAAC0" TlutOffset="0x9020"/> + <Texture Name="gMoonChildGyorgsMaskMouthTex" OutName="moonchild_gyorgs_mask_mouth" Format="ci4" Width="64" Height="64" Offset="0xB2C0" TlutOffset="0x9040"/> + <Texture Name="gMoonChildGyorgsMaskToothHornTex" OutName="moonchild_gyorgs_mask_tooth_horn" Format="ci4" Width="16" Height="16" Offset="0xBAC0" TlutOffset="0x9060"/> <Texture Name="gMoonChildGohtsMaskEyeTex" OutName="moonchild_gohts_mask_eye" Format="rgba16" Width="32" Height="64" Offset="0xBB40" /> <Texture Name="gMoonChildGohtsMaskTopPatternTex" OutName="moonchild_gohts_mask_top_pattern" Format="rgba16" Width="32" Height="64" Offset="0xCB40" /> <Texture Name="gMoonChildGohtsTwinmoldsMaskPatternTex" OutName="moonchild_goht_twinmold_mask_pattern" Format="rgba16" Width="32" Height="64" Offset="0xDB40" /> <Texture Name="gMoonChildGohtsMaskSpikeTwinmoldsMaskMandibleTex" OutName="moonchild_gohts_mask_spike_twinmolds_mask_mandible" Format="rgba16" Width="32" Height="32" Offset="0xEB40" /> - <Texture Name="gMoonChildTwinmoldsMaskSkinTex" OutName="moonchild_twinmolds_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xF340" /> - <Texture Name="gMoonChildTwinmoldsMaskSnoutTex" OutName="moonchild_twinmolds_mask_snout" Format="ci4" Width="64" Height="64" Offset="0xFB40" /> + <Texture Name="gMoonChildTwinmoldsMaskSkinTex" OutName="moonchild_twinmolds_mask_skin" Format="ci4" Width="64" Height="64" Offset="0xF340" TlutOffset="0x9080"/> + <Texture Name="gMoonChildTwinmoldsMaskSnoutTex" OutName="moonchild_twinmolds_mask_snout" Format="ci4" Width="64" Height="64" Offset="0xFB40" TlutOffset="0x90A0"/> <!-- Moonchild Moving Animations --> <Animation Name="gMoonChildWalkingAnim" Offset="0x10880" /> <!-- Original name is "mjk_run" --> @@ -63,13 +63,13 @@ <!-- Moonchild Textures --> <Texture Name="gMoonChildTLUT" OutName="moonchild_tlut" Format="rgba16" Width="16" Height="16" Offset="0x15B28" /> - <Texture Name="gMoonChildFingersTex" OutName="moonchild_fingers" Format="ci8" Width="16" Height="16" Offset="0x15D28" /> - <Texture Name="gMoonChildThighSkinTex" OutName="moonchild_thigh_skin" Format="ci8" Width="8" Height="8" Offset="0x15E28" /> - <Texture Name="gMoonChildTshirtDetailTex" OutName="moonchild_tshirt_detail" Format="ci8" Width="16" Height="32" Offset="0x15E68" /> - <Texture Name="gMoonChildHairTex" OutName="moonchild_hair" Format="ci8" Width="8" Height="16" Offset="0x16068" /> - <Texture Name="gMoonChildEarTex" OutName="moonchild_ear" Format="ci8" Width="8" Height="8" Offset="0x160E8" /> - <Texture Name="gMoonChildBackHairTex" OutName="moonchild_back_hair" Format="ci8" Width="8" Height="16" Offset="0x16128" /> - <Texture Name="gMoonChildTshirtNecklineTex" OutName="moonchild_tshirt_neckline" Format="ci8" Width="16" Height="32" Offset="0x161A8" /> + <Texture Name="gMoonChildFingersTex" OutName="moonchild_fingers" Format="ci8" Width="16" Height="16" Offset="0x15D28" TlutOffset="0x15B28"/> + <Texture Name="gMoonChildThighSkinTex" OutName="moonchild_thigh_skin" Format="ci8" Width="8" Height="8" Offset="0x15E28" TlutOffset="0x15B28"/> + <Texture Name="gMoonChildTshirtDetailTex" OutName="moonchild_tshirt_detail" Format="ci8" Width="16" Height="32" Offset="0x15E68" TlutOffset="0x15B28"/> + <Texture Name="gMoonChildHairTex" OutName="moonchild_hair" Format="ci8" Width="8" Height="16" Offset="0x16068" TlutOffset="0x15B28"/> + <Texture Name="gMoonChildEarTex" OutName="moonchild_ear" Format="ci8" Width="8" Height="8" Offset="0x160E8" TlutOffset="0x15B28"/> + <Texture Name="gMoonChildBackHairTex" OutName="moonchild_back_hair" Format="ci8" Width="8" Height="16" Offset="0x16128" TlutOffset="0x15B28"/> + <Texture Name="gMoonChildTshirtNecklineTex" OutName="moonchild_tshirt_neckline" Format="ci8" Width="16" Height="32" Offset="0x161A8" TlutOffset="0x15B28"/> <!-- Moonchild Limbs --> <Limb Name="gMoonChildRootLimb" Type="Standard" EnumName="MOONCHILD_LIMB_ROOT" Offset="0x163A8" /> diff --git a/assets/xml/objects/object_obj_milk_bin.xml b/assets/xml/objects/object_obj_milk_bin.xml index e67e0b15f..66e788c0c 100644 --- a/assets/xml/objects/object_obj_milk_bin.xml +++ b/assets/xml/objects/object_obj_milk_bin.xml @@ -2,8 +2,8 @@ <File Name="object_obj_milk_bin" Segment="6"> <DList Name="gMilkBinMilkJarDL" Offset="0x4B0" /> <!-- Original name is "obj_mlk_simplebin_model" --> <Texture Name="object_obj_milk_bin_TLUT_0007C0" OutName="tlut_0007C0" Format="rgba16" Width="16" Height="16" Offset="0x7C0" /> - <Texture Name="object_obj_milk_bin_Tex_0009C0" OutName="tex_0009C0" Format="ci8" Width="8" Height="8" Offset="0x9C0" /> - <Texture Name="object_obj_milk_bin_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="32" Height="64" Offset="0xA00" /> + <Texture Name="object_obj_milk_bin_Tex_0009C0" OutName="tex_0009C0" Format="ci8" Width="8" Height="8" Offset="0x9C0" TlutOffset="0x7C0"/> + <Texture Name="object_obj_milk_bin_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="32" Height="64" Offset="0xA00" TlutOffset="0x7C0"/> <Texture Name="object_obj_milk_bin_Tex_001200" OutName="tex_001200" Format="rgba16" Width="32" Height="32" Offset="0x1200" /> </File> </Root> diff --git a/assets/xml/objects/object_obj_tokeidai.xml b/assets/xml/objects/object_obj_tokeidai.xml index 9822eb149..08b3640d6 100644 --- a/assets/xml/objects/object_obj_tokeidai.xml +++ b/assets/xml/objects/object_obj_tokeidai.xml @@ -21,8 +21,8 @@ <Texture Name="gClockTowerMinuteRingFace2Tex" OutName="clock_tower_minute_ring_face_2" Format="rgba16" Width="32" Height="16" Offset="0x4640" /> <Texture Name="gClockTowerMinuteRingFace3Tex" OutName="clock_tower_minute_ring_face_3" Format="rgba16" Width="32" Height="16" Offset="0x4A40" /> <Texture Name="gClockTowerMinuteRingSidesTex" OutName="clock_tower_minute_ring_sides" Format="rgba16" Width="32" Height="16" Offset="0x4E40" /> - <Texture Name="gClockTowerClockFaceTopTex" OutName="clock_tower_clock_face_top" Format="ci4" Width="64" Height="64" Offset="0x5240" /> - <Texture Name="gClockTowerClockFaceBottomTex" OutName="clock_tower_clock_face_bottom" Format="ci4" Width="64" Height="64" Offset="0x5A40" /> + <Texture Name="gClockTowerClockFaceTopTex" OutName="clock_tower_clock_face_top" Format="ci4" Width="64" Height="64" Offset="0x5240" TlutOffset="0x0"/> + <Texture Name="gClockTowerClockFaceBottomTex" OutName="clock_tower_clock_face_bottom" Format="ci4" Width="64" Height="64" Offset="0x5A40" TlutOffset="0x20"/> <Texture Name="gClockTowerClockFacePanelBarTex" OutName="clock_tower_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x6240" /> <Texture Name="gClockTowerUnusedBrickTex" OutName="clock_tower_unused_bricks" Format="rgba16" Width="32" Height="32" Offset="0x62C0" /> <Texture Name="gClockTowerUnusedMaskTex" OutName="clock_tower_unused_mask" Format="i4" Width="64" Height="64" Offset="0x6AC0" /> diff --git a/assets/xml/objects/object_obj_usiyane.xml b/assets/xml/objects/object_obj_usiyane.xml index 99e6e0cb1..862f57800 100644 --- a/assets/xml/objects/object_obj_usiyane.xml +++ b/assets/xml/objects/object_obj_usiyane.xml @@ -6,7 +6,7 @@ <DList Name="object_obj_usiyane_DL_000830" Offset="0x830" /> <!-- Original name is "z2_usiyane_modelT" --> <DList Name="object_obj_usiyane_DL_000838" Offset="0x838" /> <!-- Original name is "z2_usiyane_model" --> <Texture Name="object_obj_usiyane_TLUT_0009C8" OutName="tlut_0009C8" Format="rgba16" Width="4" Height="4" Offset="0x9C8" /> - <Texture Name="object_obj_usiyane_Tex_0009E8" OutName="tex_0009E8" Format="ci4" Width="64" Height="64" Offset="0x9E8" /> + <Texture Name="object_obj_usiyane_Tex_0009E8" OutName="tex_0009E8" Format="ci4" Width="64" Height="64" Offset="0x9E8" TlutOffset="0x9C8"/> <Texture Name="object_obj_usiyane_Tex_0011E8" OutName="tex_0011E8" Format="rgba16" Width="64" Height="32" Offset="0x11E8" /> <Collision Name="object_obj_usiyane_Colheader_0022AC" Offset="0x22AC" /> <!-- Original name is "z2_usiyane_bgdatainfo" --> </File> diff --git a/assets/xml/objects/object_obj_yasi.xml b/assets/xml/objects/object_obj_yasi.xml index 5971fc744..085783b8c 100644 --- a/assets/xml/objects/object_obj_yasi.xml +++ b/assets/xml/objects/object_obj_yasi.xml @@ -3,7 +3,7 @@ <File Name="object_obj_yasi" Segment="6"> <DList Name="gPalmTreeDL" Offset="0x360" /> <!-- Original name is "z2_yasi_model" --> <Texture Name="gPalmTreeTLUT" OutName="palm_tree_tlut" Format="rgba16" Width="4" Height="4" Offset="0x630" /> - <Texture Name="gPalmTreeFrondTex" OutName="palm_tree_frond" Format="ci4" Width="32" Height="128" Offset="0x650" /> + <Texture Name="gPalmTreeFrondTex" OutName="palm_tree_frond" Format="ci4" Width="32" Height="128" Offset="0x650" TlutOffset="0x630"/> <Texture Name="gPalmTreeDekuNutTex" OutName="palm_tree_deku_nut" Format="rgba16" Width="16" Height="16" Offset="0xE50" /> <Texture Name="gPalmTreeScarredWoodTex" OutName="palm_tree_scarred_wood" Format="rgba16" Width="16" Height="16" Offset="0x1050" /> <Texture Name="gPalmTreeWoodTex" OutName="palm_tree_wood" Format="rgba16" Width="8" Height="8" Offset="0x1250" /> diff --git a/assets/xml/objects/object_omoya_obj.xml b/assets/xml/objects/object_omoya_obj.xml index e5483bd19..ab2fa60c1 100644 --- a/assets/xml/objects/object_omoya_obj.xml +++ b/assets/xml/objects/object_omoya_obj.xml @@ -3,6 +3,6 @@ <DList Name="object_omoya_obj_DL_0001A0" Offset="0x1A0" /> <!-- Original name is "yane_model" --> <Texture Name="object_omoya_obj_TLUT_0002D8" OutName="tlut_0002D8" Format="rgba16" Width="4" Height="4" Offset="0x2D8" /> <Texture Name="object_omoya_obj_Tex_0002F8" OutName="tex_0002F8" Format="rgba16" Width="64" Height="32" Offset="0x2F8" /> - <Texture Name="object_omoya_obj_Tex_0012F8" OutName="tex_0012F8" Format="ci4" Width="64" Height="64" Offset="0x12F8" /> + <Texture Name="object_omoya_obj_Tex_0012F8" OutName="tex_0012F8" Format="ci4" Width="64" Height="64" Offset="0x12F8" TlutOffset="0x2D8"/> </File> </Root> diff --git a/assets/xml/objects/object_osn.xml b/assets/xml/objects/object_osn.xml index d1082686d..afc496ffd 100644 --- a/assets/xml/objects/object_osn.xml +++ b/assets/xml/objects/object_osn.xml @@ -51,41 +51,41 @@ <Texture Name="gHappyMaskSalesmanBackpackTLUT" OutName="happy_mask_salesman_mask_backpack_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13078" /> <Texture Name="gHappyMaskSalesmanMask1TLUT" OutName="happy_mask_salesman_mask_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13278" /> <!-- Shared between multiple masks --> <Texture Name="gHappyMaskSalesmanMask2TLUT" OutName="happy_mask_salesman_mask_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13478" /> <!-- Shared between multiple masks --> - <Texture Name="gHappyMaskSalesmanSkinTex" OutName="happy_mask_salesman_skin" Format="ci8" Width="8" Height="8" Offset="0x13678" /> - <Texture Name="gHappyMaskSalesmanEarTex" OutName="happy_mask_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x136B8" /> - <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="happy_mask_salesman_nostril" Format="ci8" Width="8" Height="8" Offset="0x136F8" /> - <Texture Name="gHappyMaskSalesmanHairTex" OutName="happy_mask_salesman_hair" Format="ci8" Width="8" Height="16" Offset="0x13738" /> - <Texture Name="gHappyMaskSalesmanGoldFabric1Tex" OutName="happy_mask_salesman_gold_fabric_1" Format="ci8" Width="8" Height="16" Offset="0x137B8" /> <!-- Main neck piece and back of the cuffs --> - <Texture Name="gHappyMaskSalesmanGoldFabric2Tex" OutName="happy_mask_salesman_gold_fabric_2" Format="ci8" Width="8" Height="16" Offset="0x13838" /> <!-- Collar and front of the cuffs --> - <Texture Name="gHappyMaskSalesmanRobeFrontTex" OutName="happy_mask_salesman_robe_front" Format="ci8" Width="16" Height="16" Offset="0x138B8" /> - <Texture Name="gHappyMaskSalesmanFootTex" OutName="happy_mask_salesman_foot" Format="ci8" Width="8" Height="8" Offset="0x139B8" /> - <Texture Name="gHappyMaskSalesmanFingersTex" OutName="happy_mask_salesman_fingers" Format="ci8" Width="16" Height="16" Offset="0x139F8" /> - <Texture Name="gHappyMaskSalesmaeClothesTex" OutName="happy_mask_salesman_clothes" Format="ci8" Width="16" Height="16" Offset="0x13AF8" /> + <Texture Name="gHappyMaskSalesmanSkinTex" OutName="happy_mask_salesman_skin" Format="ci8" Width="8" Height="8" Offset="0x13678" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanEarTex" OutName="happy_mask_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x136B8" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanNostrilTex" OutName="happy_mask_salesman_nostril" Format="ci8" Width="8" Height="8" Offset="0x136F8" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanHairTex" OutName="happy_mask_salesman_hair" Format="ci8" Width="8" Height="16" Offset="0x13738" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanGoldFabric1Tex" OutName="happy_mask_salesman_gold_fabric_1" Format="ci8" Width="8" Height="16" Offset="0x137B8" TlutOffset="0x12E78"/> <!-- Main neck piece and back of the cuffs --> + <Texture Name="gHappyMaskSalesmanGoldFabric2Tex" OutName="happy_mask_salesman_gold_fabric_2" Format="ci8" Width="8" Height="16" Offset="0x13838" TlutOffset="0x12E78"/> <!-- Collar and front of the cuffs --> + <Texture Name="gHappyMaskSalesmanRobeFrontTex" OutName="happy_mask_salesman_robe_front" Format="ci8" Width="16" Height="16" Offset="0x138B8" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanFootTex" OutName="happy_mask_salesman_foot" Format="ci8" Width="8" Height="8" Offset="0x139B8" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanFingersTex" OutName="happy_mask_salesman_fingers" Format="ci8" Width="16" Height="16" Offset="0x139F8" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmaeClothesTex" OutName="happy_mask_salesman_clothes" Format="ci8" Width="16" Height="16" Offset="0x13AF8" TlutOffset="0x12E78"/> <Texture Name="gHappyMaskSalesmanHairlineTex" OutName="happy_mask_salesman_hairline" Format="rgba16" Width="8" Height="16" Offset="0x13BF8" /> - <Texture Name="gHappyMaskSalesmanShoeTex" OutName="happy_mask_salesman_shoe" Format="ci8" Width="16" Height="8" Offset="0x13CF8" /> - <Texture Name="gHappyMaskSalesmanRobeBackTex" OutName="happy_mask_salesman_robe_back" Format="ci8" Width="16" Height="16" Offset="0x13D78" /> - <Texture Name="gHappyMaskSalesmanShirtTex" OutName="happy_mask_salesman_shirt" Format="ci8" Width="16" Height="16" Offset="0x13E78" /> - <Texture Name="gHappyMaskSalesmaeClothesEndTex" OutName="happy_mask_salesman_clothes_ends" Format="ci8" Width="8" Height="8" Offset="0x13F78" /> + <Texture Name="gHappyMaskSalesmanShoeTex" OutName="happy_mask_salesman_shoe" Format="ci8" Width="16" Height="8" Offset="0x13CF8" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanRobeBackTex" OutName="happy_mask_salesman_robe_back" Format="ci8" Width="16" Height="16" Offset="0x13D78" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmanShirtTex" OutName="happy_mask_salesman_shirt" Format="ci8" Width="16" Height="16" Offset="0x13E78" TlutOffset="0x12E78"/> + <Texture Name="gHappyMaskSalesmaeClothesEndTex" OutName="happy_mask_salesman_clothes_ends" Format="ci8" Width="8" Height="8" Offset="0x13F78" TlutOffset="0x12E78"/> <!-- Happy Mask Salesman Backpack Textures, TLUTs are above --> - <Texture Name="gHappyMaskSalesmanBackpackTopTex" OutName="happy_mask_salesman_backpack_top" Format="ci8" Width="16" Height="32" Offset="0x13FB8" /> - <Texture Name="gHappyMaskSalesmanBackpackPocketTex" OutName="happy_mask_salesman_backpack_pocket" Format="ci8" Width="16" Height="32" Offset="0x141B8" /> - <Texture Name="gHappyMaskSalesmanBackpackPocketTopTex" OutName="happy_mask_salesman_backpack_pocket_top" Format="ci8" Width="16" Height="16" Offset="0x143B8" /> - <Texture Name="gHappyMaskSalesmanBackpackBottomTex" OutName="happy_mask_salesman_backpack_bottom" Format="ci8" Width="32" Height="64" Offset="0x144B8" /> - <Texture Name="gHappyMaskSalesmanBackpackRollTex" OutName="happy_mask_salesman_backpack_roll" Format="ci8" Width="32" Height="16" Offset="0x14CB8" /> - <Texture Name="gHappyMaskSalesmanBackpackRollEndTex" OutName="happy_mask_salesman_backpack_roll_end" Format="ci8" Width="16" Height="16" Offset="0x14EB8" /> - <Texture Name="gHappyMaskSalesmanBackpackStrapTex" OutName="happy_mask_salesman_backpack_strap" Format="ci8" Width="8" Height="8" Offset="0x14FB8" /> - <Texture Name="gHappyMaskSalesmanMask01Tex" OutName="happy_mask_salesman_mask_01" Format="ci8" Width="16" Height="32" Offset="0x14FF8" /> - <Texture Name="gHappyMaskSalesmanMask02Tex" OutName="happy_mask_salesman_mask_02" Format="ci8" Width="16" Height="32" Offset="0x151F8" /> + <Texture Name="gHappyMaskSalesmanBackpackTopTex" OutName="happy_mask_salesman_backpack_top" Format="ci8" Width="16" Height="32" Offset="0x13FB8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanBackpackPocketTex" OutName="happy_mask_salesman_backpack_pocket" Format="ci8" Width="16" Height="32" Offset="0x141B8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanBackpackPocketTopTex" OutName="happy_mask_salesman_backpack_pocket_top" Format="ci8" Width="16" Height="16" Offset="0x143B8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanBackpackBottomTex" OutName="happy_mask_salesman_backpack_bottom" Format="ci8" Width="32" Height="64" Offset="0x144B8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanBackpackRollTex" OutName="happy_mask_salesman_backpack_roll" Format="ci8" Width="32" Height="16" Offset="0x14CB8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanBackpackRollEndTex" OutName="happy_mask_salesman_backpack_roll_end" Format="ci8" Width="16" Height="16" Offset="0x14EB8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanBackpackStrapTex" OutName="happy_mask_salesman_backpack_strap" Format="ci8" Width="8" Height="8" Offset="0x14FB8" TlutOffset="0x13078"/> + <Texture Name="gHappyMaskSalesmanMask01Tex" OutName="happy_mask_salesman_mask_01" Format="ci8" Width="16" Height="32" Offset="0x14FF8" TlutOffset="0x13278"/> + <Texture Name="gHappyMaskSalesmanMask02Tex" OutName="happy_mask_salesman_mask_02" Format="ci8" Width="16" Height="32" Offset="0x151F8" TlutOffset="0x13478"/> <Texture Name="gHappyMaskSalesmanScrollTex" OutName="happy_mask_salesman_scroll" Format="i8" Width="16" Height="16" Offset="0x153F8" /> - <Texture Name="gHappyMaskSalesmanMask03Tex" OutName="happy_mask_salesman_mask_03" Format="ci8" Width="16" Height="32" Offset="0x154F8" /> <!-- Mario Mask --> - <Texture Name="gHappyMaskSalesmanMask04Tex" OutName="happy_mask_salesman_mask_04" Format="ci8" Width="16" Height="32" Offset="0x156F8" /> + <Texture Name="gHappyMaskSalesmanMask03Tex" OutName="happy_mask_salesman_mask_03" Format="ci8" Width="16" Height="32" Offset="0x154F8" TlutOffset="0x13278"/> <!-- Mario Mask --> + <Texture Name="gHappyMaskSalesmanMask04Tex" OutName="happy_mask_salesman_mask_04" Format="ci8" Width="16" Height="32" Offset="0x156F8" TlutOffset="0x13478"/> <Texture Name="gHappyMaskSalesmanMask05Tex" OutName="happy_mask_salesman_mask_05" Format="i8" Width="16" Height="32" Offset="0x158F8" /> <!-- Mayor's Mask, frowning version of the one on the Mayor's chair --> <Texture Name="gHappyMaskSalesmanMask06Tex" OutName="happy_mask_salesman_mask_06" Format="rgba16" Width="16" Height="32" Offset="0x15AF8" /> - <Texture Name="gHappyMaskSalesmanMask07Tex" OutName="happy_mask_salesman_mask_07" Format="ci8" Width="16" Height="32" Offset="0x15EF8" /> - <Texture Name="gHappyMaskSalesmanMask08Tex" OutName="happy_mask_salesman_mask_08" Format="ci8" Width="16" Height="32" Offset="0x160F8" /> - <Texture Name="gHappyMaskSalesmanMask09Tex" OutName="happy_mask_salesman_mask_09" Format="ci8" Width="16" Height="32" Offset="0x162F8" /> - <Texture Name="gHappyMaskSalesmanMask10Tex" OutName="happy_mask_salesman_mask_10" Format="ci8" Width="16" Height="32" Offset="0x164F8" /> <!-- Mirror Shield Mask, same face as on mirror shield --> + <Texture Name="gHappyMaskSalesmanMask07Tex" OutName="happy_mask_salesman_mask_07" Format="ci8" Width="16" Height="32" Offset="0x15EF8" TlutOffset="0x13278"/> + <Texture Name="gHappyMaskSalesmanMask08Tex" OutName="happy_mask_salesman_mask_08" Format="ci8" Width="16" Height="32" Offset="0x160F8" TlutOffset="0x13478"/> + <Texture Name="gHappyMaskSalesmanMask09Tex" OutName="happy_mask_salesman_mask_09" Format="ci8" Width="16" Height="32" Offset="0x162F8" TlutOffset="0x13478"/> + <Texture Name="gHappyMaskSalesmanMask10Tex" OutName="happy_mask_salesman_mask_10" Format="ci8" Width="16" Height="32" Offset="0x164F8" TlutOffset="0x13278"/> <!-- Mirror Shield Mask, same face as on mirror shield --> <!-- Happy Mask Salesman Face Textures --> <Texture Name="gHappyMaskSalesmanEyeClosedHappyTex" OutName="happy_mask_salesman_eye_closed_happy" Format="rgba16" Width="32" Height="32" Offset="0x166F8" /> diff --git a/assets/xml/objects/object_ot.xml b/assets/xml/objects/object_ot.xml index 1b99fb071..c39355080 100644 --- a/assets/xml/objects/object_ot.xml +++ b/assets/xml/objects/object_ot.xml @@ -24,12 +24,12 @@ <DList Name="object_ot_DL_0026F8" Offset="0x26F8" /> <DList Name="object_ot_DL_0027F0" Offset="0x27F0" /> <Texture Name="object_ot_TLUT_0028E0" OutName="tlut_0028E0" Format="rgba16" Width="16" Height="16" Offset="0x28E0" /> - <Texture Name="object_ot_Tex_002AE0" OutName="tex_002AE0" Format="ci8" Width="32" Height="32" Offset="0x2AE0" /> - <Texture Name="object_ot_Tex_002EE0" OutName="tex_002EE0" Format="ci8" Width="32" Height="64" Offset="0x2EE0" /> - <Texture Name="object_ot_Tex_0036E0" OutName="tex_0036E0" Format="ci8" Width="32" Height="32" Offset="0x36E0" /> - <Texture Name="object_ot_Tex_003AE0" OutName="tex_003AE0" Format="ci8" Width="32" Height="32" Offset="0x3AE0" /> - <Texture Name="object_ot_Tex_003EE0" OutName="tex_003EE0" Format="ci8" Width="32" Height="32" Offset="0x3EE0" /> - <Texture Name="object_ot_Tex_0042E0" OutName="tex_0042E0" Format="ci8" Width="32" Height="32" Offset="0x42E0" /> + <Texture Name="object_ot_Tex_002AE0" OutName="tex_002AE0" Format="ci8" Width="32" Height="32" Offset="0x2AE0" TlutOffset="0x28E0"/> + <Texture Name="object_ot_Tex_002EE0" OutName="tex_002EE0" Format="ci8" Width="32" Height="64" Offset="0x2EE0" TlutOffset="0x28E0"/> + <Texture Name="object_ot_Tex_0036E0" OutName="tex_0036E0" Format="ci8" Width="32" Height="32" Offset="0x36E0" TlutOffset="0x28E0"/> + <Texture Name="object_ot_Tex_003AE0" OutName="tex_003AE0" Format="ci8" Width="32" Height="32" Offset="0x3AE0" TlutOffset="0x28E0"/> + <Texture Name="object_ot_Tex_003EE0" OutName="tex_003EE0" Format="ci8" Width="32" Height="32" Offset="0x3EE0" TlutOffset="0x28E0"/> + <Texture Name="object_ot_Tex_0042E0" OutName="tex_0042E0" Format="ci8" Width="32" Height="32" Offset="0x42E0" TlutOffset="0x28E0"/> <Limb Name="object_ot_Standardlimb_0046E0" Type="Standard" EnumName="OBJECT_OT_LIMB_01" Offset="0x46E0" /> <Limb Name="object_ot_Standardlimb_0046EC" Type="Standard" EnumName="OBJECT_OT_LIMB_02" Offset="0x46EC" /> <Limb Name="object_ot_Standardlimb_0046F8" Type="Standard" EnumName="OBJECT_OT_LIMB_03" Offset="0x46F8" /> diff --git a/assets/xml/objects/object_pamera.xml b/assets/xml/objects/object_pamera.xml index fc2da0bea..1af9406fe 100644 --- a/assets/xml/objects/object_pamera.xml +++ b/assets/xml/objects/object_pamera.xml @@ -24,10 +24,10 @@ <DList Name="gPamelaRightFootDL" Offset="0x5D70" /> <Texture Name="object_pamera_TLUT_0060E8" OutName="tlut_0060E8" Format="rgba16" Width="16" Height="16" Offset="0x60E8" /> - <Texture Name="object_pamera_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" /> - <Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" /> - <Texture Name="object_pamera_Tex_0064E8" OutName="tex_0064E8" Format="ci8" Width="16" Height="16" Offset="0x64E8" /> - <Texture Name="object_pamera_Tex_0065E8" OutName="tex_0065E8" Format="ci8" Width="16" Height="16" Offset="0x65E8" /> + <Texture Name="object_pamera_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_0064E8" OutName="tex_0064E8" Format="ci8" Width="16" Height="16" Offset="0x64E8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_0065E8" OutName="tex_0065E8" Format="ci8" Width="16" Height="16" Offset="0x65E8" TlutOffset="0x60E8"/> <Texture Name="object_pamera_Tex_0066E8" OutName="tex_0066E8" Format="ci8" Width="32" Height="32" Offset="0x66E8" /> <Texture Name="object_pamera_Tex_006AE8" OutName="tex_006AE8" Format="ci8" Width="32" Height="32" Offset="0x6AE8" /> <Texture Name="object_pamera_Tex_006EE8" OutName="tex_006EE8" Format="ci8" Width="32" Height="32" Offset="0x6EE8" /> @@ -35,11 +35,11 @@ <Texture Name="object_pamera_Tex_0073E8" OutName="tex_0073E8" Format="ci8" Width="16" Height="16" Offset="0x73E8" /> <Texture Name="object_pamera_Tex_0074E8" OutName="tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" /> <Texture Name="object_pamera_Tex_0078E8" OutName="tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" /> - <Texture Name="object_pamera_Tex_007CE8" OutName="tex_007CE8" Format="ci8" Width="16" Height="16" Offset="0x7CE8" /> - <Texture Name="object_pamera_Tex_007DE8" OutName="tex_007DE8" Format="ci8" Width="32" Height="16" Offset="0x7DE8" /> - <Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" /> - <Texture Name="object_pamera_Tex_0080E8" OutName="tex_0080E8" Format="ci8" Width="16" Height="16" Offset="0x80E8" /> - <Texture Name="object_pamera_Tex_0081E8" OutName="tex_0081E8" Format="ci8" Width="16" Height="16" Offset="0x81E8" /> + <Texture Name="object_pamera_Tex_007CE8" OutName="tex_007CE8" Format="ci8" Width="16" Height="16" Offset="0x7CE8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_007DE8" OutName="tex_007DE8" Format="ci8" Width="32" Height="16" Offset="0x7DE8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_0080E8" OutName="tex_0080E8" Format="ci8" Width="16" Height="16" Offset="0x80E8" TlutOffset="0x60E8"/> + <Texture Name="object_pamera_Tex_0081E8" OutName="tex_0081E8" Format="ci8" Width="16" Height="16" Offset="0x81E8" TlutOffset="0x60E8"/> <Limb Name="gPamelaRootLimb" Type="Standard" EnumName="PAMELA_LIMB_ROOT" Offset="0x82E8" /> <Limb Name="gPamelaUpperBodyRootLimb" Type="Standard" EnumName="PAMELA_LIMB_UPPER_BODY_ROOT" Offset="0x82F4" /> diff --git a/assets/xml/objects/object_po_fusen.xml b/assets/xml/objects/object_po_fusen.xml index 04336224d..e19e6b9ee 100644 --- a/assets/xml/objects/object_po_fusen.xml +++ b/assets/xml/objects/object_po_fusen.xml @@ -18,7 +18,7 @@ <Texture Name="gPoeBalloonTatteredChinTex" OutName="tattered_chin" Format="rgba16" Width="16" Height="16" Offset="0x12E0" /> <Texture Name="gPoeBalloonLanternTopTex" OutName="lantern_top" Format="rgba16" Width="16" Height="16" Offset="0x14E0" /> <Texture Name="gPoeBalloonLanternStandTex" OutName="lantern_stand" Format="rgba16" Width="16" Height="16" Offset="0x16E0" /> - <Texture Name="gPoeBalloonLanternGlassTex" OutName="lantern_glass" Format="ci8" Width="16" Height="16" Offset="0x18E0" /> + <Texture Name="gPoeBalloonLanternGlassTex" OutName="lantern_glass" Format="ci8" Width="16" Height="16" Offset="0x18E0" TlutOffset="0x10E0"/> <Texture Name="gPoeBalloonHandTex" OutName="the_hand" Format="i4" Width="16" Height="16" Offset="0x19E0" /> <Texture Name="gPoeBalloonOrangeSkinTex" OutName="orange_skin" Format="rgba16" Width="16" Height="16" Offset="0x1A60" /> <Texture Name="gPoeBalloonFaceTex" OutName="face" Format="rgba16" Width="32" Height="16" Offset="0x1C60" /> diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml index 41ab3323b..8970a08c2 100644 --- a/assets/xml/objects/object_ps.xml +++ b/assets/xml/objects/object_ps.xml @@ -15,13 +15,13 @@ <!-- <Blob Name="object_ps_Blob_002E80" Size="0x1080" Offset="0x2E80" /> --> <Texture Name="object_ps_Tex_003F00" OutName="tex_003F00" Format="rgba16" Width="16" Height="16" Offset="0x3F00" /> <!-- <Blob Name="object_ps_Blob_004100" Size="0x21C0" Offset="0x4100" /> --> - <Texture Name="object_ps_Tex_0062C0" OutName="tex_0062C0" Format="ci8" Width="8" Height="8" Offset="0x62C0" /> - <Texture Name="object_ps_Tex_006300" OutName="tex_006300" Format="ci8" Width="32" Height="32" Offset="0x6300" /> - <Texture Name="object_ps_Tex_006700" OutName="tex_006700" Format="ci8" Width="8" Height="8" Offset="0x6700" /> - <Texture Name="object_ps_Tex_006740" OutName="tex_006740" Format="ci8" Width="8" Height="8" Offset="0x6740" /> - <Texture Name="object_ps_Tex_006780" OutName="tex_006780" Format="ci8" Width="32" Height="32" Offset="0x6780" /> + <Texture Name="object_ps_Tex_0062C0" OutName="tex_0062C0" Format="ci8" Width="8" Height="8" Offset="0x62C0" TlutOffset="0x2C80"/> + <Texture Name="object_ps_Tex_006300" OutName="tex_006300" Format="ci8" Width="32" Height="32" Offset="0x6300" TlutOffset="0x2C80"/> + <Texture Name="object_ps_Tex_006700" OutName="tex_006700" Format="ci8" Width="8" Height="8" Offset="0x6700" TlutOffset="0x2C80"/> + <Texture Name="object_ps_Tex_006740" OutName="tex_006740" Format="ci8" Width="8" Height="8" Offset="0x6740" TlutOffset="0x2C80"/> + <Texture Name="object_ps_Tex_006780" OutName="tex_006780" Format="ci8" Width="32" Height="32" Offset="0x6780" TlutOffset="0x2C80"/> <Texture Name="object_ps_Tex_006B80" OutName="tex_006B80" Format="rgba16" Width="16" Height="16" Offset="0x6B80" /> - <Texture Name="object_ps_Tex_006D80" OutName="tex_006D80" Format="ci8" Width="32" Height="32" Offset="0x6D80" /> + <Texture Name="object_ps_Tex_006D80" OutName="tex_006D80" Format="ci8" Width="32" Height="32" Offset="0x6D80" TlutOffset="0x2C80"/> <Limb Name="object_ps_Standardlimb_007180" Type="Standard" EnumName="OBJECT_PS_LIMB_01" Offset="0x7180" /> <Limb Name="object_ps_Standardlimb_00718C" Type="Standard" EnumName="OBJECT_PS_LIMB_02" Offset="0x718C" /> <Limb Name="object_ps_Standardlimb_007198" Type="Standard" EnumName="OBJECT_PS_LIMB_03" Offset="0x7198" /> diff --git a/assets/xml/objects/object_redead_obj.xml b/assets/xml/objects/object_redead_obj.xml index 9bd976f2a..8b3ed3b55 100644 --- a/assets/xml/objects/object_redead_obj.xml +++ b/assets/xml/objects/object_redead_obj.xml @@ -3,6 +3,6 @@ <File Name="object_redead_obj" Segment="6"> <DList Name="gBeneathTheWellSlidingDoorDL" Offset="0x1A0" /> <!-- Original name is "i2_R_shutter1_model" --> <Texture Name="gBeneathTheWellSlidingDoorTLUT" OutName="beneath_the_well_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x390" /> - <Texture Name="gBeneathTheWellSlidingDoorTex" OutName="beneath_the_well_sliding_door" Format="ci4" Width="64" Height="64" Offset="0x3B0" /> + <Texture Name="gBeneathTheWellSlidingDoorTex" OutName="beneath_the_well_sliding_door" Format="ci4" Width="64" Height="64" Offset="0x3B0" TlutOffset="0x390"/> </File> </Root> diff --git a/assets/xml/objects/object_rotlift.xml b/assets/xml/objects/object_rotlift.xml index 4c9090083..05c561253 100644 --- a/assets/xml/objects/object_rotlift.xml +++ b/assets/xml/objects/object_rotlift.xml @@ -4,7 +4,7 @@ <!-- Rotating Platforms --> <DList Name="gDekuMoonDungeonRotatingPlatformsDL" Offset="0x400" /> <!-- Original name is "i2_last02a1_model" --> <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_platforms_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x590" /> - <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTex" OutName="deku_moon_dungeon_rotating_platforms_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x790" /> + <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTex" OutName="deku_moon_dungeon_rotating_platforms_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x790" TlutOffset="0x590"/> <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodTex" OutName="deku_moon_dungeon_rotating_platforms_wood" Format="rgba16" Width="32" Height="64" Offset="0xF90" /> <TextureAnimation Name="gDekuMoonDungeonRotatingPlatformsUnusedTexAnim" Offset="0x1F98" /> <Collision Name="gDekuMoonDungeonRotatingPlatformsCol" Offset="0x2190" /> <!-- Original name is "i2_last02a1_bgdatainfo" --> @@ -12,7 +12,7 @@ <!-- Rotating Spikes --> <DList Name="gDekuMoonDungeonRotatingSpikesDL" Offset="0x2CE0" /> <!-- Original name is "i2_last02b1_model" --> <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_spikes_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2FF8" /> - <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTex" OutName="deku_moon_dungeon_rotating_spikes_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x31F8" /> + <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTex" OutName="deku_moon_dungeon_rotating_spikes_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x31F8" TlutOffset="0x2FF8"/> <Texture Name="gDekuMoonDungeonRotatingSpikesWoodTex" OutName="deku_moon_dungeon_rotating_spikes_wood" Format="rgba16" Width="32" Height="64" Offset="0x39F8" /> <TextureAnimation Name="gDekuMoonDungeonRotatingSpikesUnusedTexAnim" Offset="0x4A08" /> <Collision Name="gDekuMoonDungeonRotatingSpikesCol" Offset="0x4DF0" /> <!-- Original name is "i2_last02b1_bgdatainfo" --> diff --git a/assets/xml/objects/object_rsn.xml b/assets/xml/objects/object_rsn.xml index 1a33a0a93..2d4a618e5 100644 --- a/assets/xml/objects/object_rsn.xml +++ b/assets/xml/objects/object_rsn.xml @@ -24,17 +24,17 @@ <!-- Textures --> <Texture Name="gBombShopkeeperTLUT" OutName="bomb_shopkeeper_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4FD8" /> - <Texture Name="gBombShopkeeperEarTex" OutName="bomb_shopkeeper_ear" Format="ci8" Width="8" Height="8" Offset="0x51D8" /> - <Texture Name="gBombShopkeeperSkinTex" OutName="bomb_shopkeeper_skin" Format="ci8" Width="8" Height="8" Offset="0x5218" /> - <Texture Name="gBombShopkeeperTorsoTex" OutName="bomb_shopkeeper_torso" Format="ci8" Width="8" Height="32" Offset="0x5258" /> - <Texture Name="gBombShopkeeperFingersTex" OutName="bomb_shopkeeper_fingers" Format="ci8" Width="16" Height="16" Offset="0x5358" /> + <Texture Name="gBombShopkeeperEarTex" OutName="bomb_shopkeeper_ear" Format="ci8" Width="8" Height="8" Offset="0x51D8" TlutOffset="0x4FD8"/> + <Texture Name="gBombShopkeeperSkinTex" OutName="bomb_shopkeeper_skin" Format="ci8" Width="8" Height="8" Offset="0x5218" TlutOffset="0x4FD8"/> + <Texture Name="gBombShopkeeperTorsoTex" OutName="bomb_shopkeeper_torso" Format="ci8" Width="8" Height="32" Offset="0x5258" TlutOffset="0x4FD8"/> + <Texture Name="gBombShopkeeperFingersTex" OutName="bomb_shopkeeper_fingers" Format="ci8" Width="16" Height="16" Offset="0x5358" TlutOffset="0x4FD8"/> <Texture Name="gBombShopkeeperEyeTex" OutName="bomb_shopkeeper_eye" Format="rgba16" Width="32" Height="32" Offset="0x5458" /> - <Texture Name="gBombShopkeeperTatooTex" OutName="bomb_shopkeeper_tatoo" Format="ci8" Width="32" Height="64" Offset="0x5C58" /> + <Texture Name="gBombShopkeeperTatooTex" OutName="bomb_shopkeeper_tatoo" Format="ci8" Width="32" Height="64" Offset="0x5C58" TlutOffset="0x4FD8"/> <Texture Name="gBombShopkeeperShortsTex" OutName="bomb_shopkeeper_shorts" Format="rgba16" Width="16" Height="16" Offset="0x6458" /> <Texture Name="gBombShopkeeperSandalsTex" OutName="bomb_shopkeeper_sandals" Format="rgba16" Width="8" Height="8" Offset="0x6658" /> <Texture Name="gBombShopkeeperVestTex" OutName="bomb_shopkeeper_vest" Format="rgba16" Width="16" Height="16" Offset="0x66D8" /> - <Texture Name="gBombShopkeeperToesTex" OutName="bomb_shopkeeper_toes" Format="ci8" Width="16" Height="16" Offset="0x68D8" /> - <Texture Name="gBombShopkeeperWristBandTex" OutName="bomb_shopkeeper_wrist_band" Format="ci8" Width="32" Height="32" Offset="0x69D8" /> + <Texture Name="gBombShopkeeperToesTex" OutName="bomb_shopkeeper_toes" Format="ci8" Width="16" Height="16" Offset="0x68D8" TlutOffset="0x4FD8"/> + <Texture Name="gBombShopkeeperWristBandTex" OutName="bomb_shopkeeper_wrist_band" Format="ci8" Width="32" Height="32" Offset="0x69D8" TlutOffset="0x4FD8"/> <!-- Animations --> <Animation Name="gBombShopkeeperSwayAnim" Offset="0x788C" /> <!-- Original name is "rsn_ending" --> diff --git a/assets/xml/objects/object_rz.xml b/assets/xml/objects/object_rz.xml index d1c30a5f5..9e62bdbcd 100644 --- a/assets/xml/objects/object_rz.xml +++ b/assets/xml/objects/object_rz.xml @@ -28,14 +28,14 @@ <DList Name="object_rz_DL_00B288" Offset="0xB288" /> <Texture Name="object_rz_TLUT_00B450" OutName="tlut_00B450" Format="rgba16" Width="16" Height="16" Offset="0xB450" /> <Texture Name="object_rz_Tex_00B650" OutName="tex_00B650" Format="rgba16" Width="16" Height="16" Offset="0xB650" /> - <Texture Name="object_rz_Tex_00B850" OutName="tex_00B850" Format="ci8" Width="8" Height="8" Offset="0xB850" /> - <Texture Name="object_rz_Tex_00B890" OutName="tex_00B890" Format="ci8" Width="8" Height="8" Offset="0xB890" /> - <Texture Name="object_rz_Tex_00B8D0" OutName="tex_00B8D0" Format="ci8" Width="16" Height="16" Offset="0xB8D0" /> - <Texture Name="object_rz_Tex_00B9D0" OutName="tex_00B9D0" Format="ci8" Width="16" Height="16" Offset="0xB9D0" /> - <Texture Name="object_rz_Tex_00BAD0" OutName="tex_00BAD0" Format="ci8" Width="16" Height="16" Offset="0xBAD0" /> - <Texture Name="object_rz_Tex_00BBD0" OutName="tex_00BBD0" Format="ci8" Width="8" Height="16" Offset="0xBBD0" /> + <Texture Name="object_rz_Tex_00B850" OutName="tex_00B850" Format="ci8" Width="8" Height="8" Offset="0xB850" TlutOffset="0xB450"/> + <Texture Name="object_rz_Tex_00B890" OutName="tex_00B890" Format="ci8" Width="8" Height="8" Offset="0xB890" TlutOffset="0xB450"/> + <Texture Name="object_rz_Tex_00B8D0" OutName="tex_00B8D0" Format="ci8" Width="16" Height="16" Offset="0xB8D0" TlutOffset="0xB450"/> + <Texture Name="object_rz_Tex_00B9D0" OutName="tex_00B9D0" Format="ci8" Width="16" Height="16" Offset="0xB9D0" TlutOffset="0xB450"/> + <Texture Name="object_rz_Tex_00BAD0" OutName="tex_00BAD0" Format="ci8" Width="16" Height="16" Offset="0xBAD0" TlutOffset="0xB450"/> + <Texture Name="object_rz_Tex_00BBD0" OutName="tex_00BBD0" Format="ci8" Width="8" Height="16" Offset="0xBBD0" TlutOffset="0xB450"/> <Texture Name="object_rz_Tex_00BC50" OutName="tex_00BC50" Format="ci8" Width="32" Height="32" Offset="0xBC50" /> - <Texture Name="object_rz_Tex_00C050" OutName="tex_00C050" Format="ci8" Width="16" Height="16" Offset="0xC050" /> + <Texture Name="object_rz_Tex_00C050" OutName="tex_00C050" Format="ci8" Width="16" Height="16" Offset="0xC050" TlutOffset="0xB450"/> <Texture Name="object_rz_Tex_00C150" OutName="tex_00C150" Format="i8" Width="8" Height="8" Offset="0xC150" /> <Texture Name="object_rz_Tex_00C190" OutName="tex_00C190" Format="ci8" Width="32" Height="32" Offset="0xC190" /> <Texture Name="object_rz_Tex_00C590" OutName="tex_00C590" Format="ci8" Width="32" Height="32" Offset="0xC590" /> diff --git a/assets/xml/objects/object_sdn.xml b/assets/xml/objects/object_sdn.xml index 10a29560c..d0f9ca82e 100644 --- a/assets/xml/objects/object_sdn.xml +++ b/assets/xml/objects/object_sdn.xml @@ -33,17 +33,17 @@ <DList Name="gSoldierLeftFootDL" Offset="0xBEB8" /> <Texture Name="gSoldierSkinTLUT" OutName="soldier_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC000" /> <Texture Name="gSoldierGeneralTLUT" OutName="soldier_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC200" /> - <Texture Name="gSoldierArmorStrapTex" OutName="soldier_armor_strap" Format="ci8" Width="32" Height="32" Offset="0xC400" /> + <Texture Name="gSoldierArmorStrapTex" OutName="soldier_armor_strap" Format="ci8" Width="32" Height="32" Offset="0xC400" TlutOffset="0xC200"/> <Texture Name="gSoldierArmorPlate1Tex" OutName="soldier_armor_plate1" Format="i8" Width="16" Height="16" Offset="0xC800" /> <Texture Name="gSoldierArmorEmblemTex" OutName="soldier_armor_emblem" Format="i8" Width="32" Height="32" Offset="0xC900" /> - <Texture Name="gSoldierSkinShadowGradient2Tex" OutName="soldier_skin_shadow_gradient2" Format="ci8" Width="8" Height="8" Offset="0xCD00" /> - <Texture Name="gSoldierShortsToLegTex" OutName="soldier_shorts_to_leg" Format="ci8" Width="16" Height="16" Offset="0xCD40" /> - <Texture Name="gSoldierArmorTex" OutName="soldier_armor" Format="ci8" Width="8" Height="8" Offset="0xCE40" /> - <Texture Name="gSoldierSkinShadowGradient1Tex" OutName="soldier_skin_shadow_gradient1" Format="ci8" Width="8" Height="8" Offset="0xCE80" /> - <Texture Name="gSoldierLipsTex" OutName="soldier_lips" Format="ci8" Width="16" Height="16" Offset="0xCEC0" /> - <Texture Name="gSoldierArmorCoatOfArmsTex" OutName="soldier_armor_coat_of_arms" Format="ci8" Width="32" Height="32" Offset="0xCFC0" /> + <Texture Name="gSoldierSkinShadowGradient2Tex" OutName="soldier_skin_shadow_gradient2" Format="ci8" Width="8" Height="8" Offset="0xCD00" TlutOffset="0xC200"/> + <Texture Name="gSoldierShortsToLegTex" OutName="soldier_shorts_to_leg" Format="ci8" Width="16" Height="16" Offset="0xCD40" TlutOffset="0xC000"/> + <Texture Name="gSoldierArmorTex" OutName="soldier_armor" Format="ci8" Width="8" Height="8" Offset="0xCE40" TlutOffset="0xC200"/> + <Texture Name="gSoldierSkinShadowGradient1Tex" OutName="soldier_skin_shadow_gradient1" Format="ci8" Width="8" Height="8" Offset="0xCE80" TlutOffset="0xC200"/> + <Texture Name="gSoldierLipsTex" OutName="soldier_lips" Format="ci8" Width="16" Height="16" Offset="0xCEC0" TlutOffset="0xC200"/> + <Texture Name="gSoldierArmorCoatOfArmsTex" OutName="soldier_armor_coat_of_arms" Format="ci8" Width="32" Height="32" Offset="0xCFC0" TlutOffset="0xC200"/> <Texture Name="gSoldierArmorPlate2Tex" OutName="soldier_armor_plate2" Format="i8" Width="16" Height="8" Offset="0xD3C0" /> - <Texture Name="gSoldierFingersTex" OutName="soldier_fingers" Format="ci8" Width="16" Height="16" Offset="0xD440" /> + <Texture Name="gSoldierFingersTex" OutName="soldier_fingers" Format="ci8" Width="16" Height="16" Offset="0xD440" TlutOffset="0xC200"/> <Limb Name="gSoldierRootLimb" Type="Standard" EnumName="SOLDIER_LIMB_ROOT" Offset="0xD540" /> <Limb Name="gSoldierPelvisLimb" Type="Standard" EnumName="SOLDIER_LIMB_PELVIS" Offset="0xD54C" /> <Limb Name="gSoldierLeftThighLimb" Type="Standard" EnumName="SOLDIER_LIMB_LEFT_THIGH" Offset="0xD558" /> diff --git a/assets/xml/objects/object_sek.xml b/assets/xml/objects/object_sek.xml index 5ca0ad287..3a19000e1 100644 --- a/assets/xml/objects/object_sek.xml +++ b/assets/xml/objects/object_sek.xml @@ -1,18 +1,18 @@ <Root> <File Name="object_sek" Segment="6"> <DList Name="gOwlStatueClosedDL" Offset="0x1D0" /> <!-- Original name is "sek_close_model" --> - <Texture Name="object_sek_Tex_0003F0" OutName="tex_0003F0" Format="ci8" Width="32" Height="32" Offset="0x3F0" /> - <Texture Name="object_sek_Tex_0007F0" OutName="tex_0007F0" Format="ci8" Width="32" Height="32" Offset="0x7F0" /> + <Texture Name="object_sek_Tex_0003F0" OutName="tex_0003F0" Format="ci8" Width="32" Height="32" Offset="0x3F0" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_0007F0" OutName="tex_0007F0" Format="ci8" Width="32" Height="32" Offset="0x7F0" TlutOffset="0x1610"/> <DList Name="object_sek_DL_001110" Offset="0x1110" /> <!-- Original name is "sek_head_model" --> <Texture Name="object_sek_TLUT_001610" OutName="tlut_001610" Format="rgba16" Width="16" Height="16" Offset="0x1610" /> - <Texture Name="object_sek_Tex_001810" OutName="tex_001810" Format="ci8" Width="32" Height="32" Offset="0x1810" /> - <Texture Name="object_sek_Tex_001C10" OutName="tex_001C10" Format="ci8" Width="32" Height="32" Offset="0x1C10" /> - <Texture Name="object_sek_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" /> - <Texture Name="object_sek_Tex_002410" OutName="tex_002410" Format="ci8" Width="32" Height="32" Offset="0x2410" /> - <Texture Name="object_sek_Tex_002810" OutName="tex_002810" Format="ci8" Width="32" Height="32" Offset="0x2810" /> - <Texture Name="object_sek_Tex_002C10" OutName="tex_002C10" Format="ci8" Width="32" Height="32" Offset="0x2C10" /> + <Texture Name="object_sek_Tex_001810" OutName="tex_001810" Format="ci8" Width="32" Height="32" Offset="0x1810" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_001C10" OutName="tex_001C10" Format="ci8" Width="32" Height="32" Offset="0x1C10" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_002410" OutName="tex_002410" Format="ci8" Width="32" Height="32" Offset="0x2410" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_002810" OutName="tex_002810" Format="ci8" Width="32" Height="32" Offset="0x2810" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_002C10" OutName="tex_002C10" Format="ci8" Width="32" Height="32" Offset="0x2C10" TlutOffset="0x1610"/> <DList Name="gOwlStatueOpenedDL" Offset="0x3770" /> <!-- Original name is "sek_open_model" --> - <Texture Name="object_sek_Tex_003A70" OutName="tex_003A70" Format="ci8" Width="32" Height="64" Offset="0x3A70" /> - <Texture Name="object_sek_Tex_004270" OutName="tex_004270" Format="ci8" Width="32" Height="64" Offset="0x4270" /> + <Texture Name="object_sek_Tex_003A70" OutName="tex_003A70" Format="ci8" Width="32" Height="64" Offset="0x3A70" TlutOffset="0x1610"/> + <Texture Name="object_sek_Tex_004270" OutName="tex_004270" Format="ci8" Width="32" Height="64" Offset="0x4270" TlutOffset="0x1610"/> </File> </Root> diff --git a/assets/xml/objects/object_sekihig.xml b/assets/xml/objects/object_sekihig.xml index de104df55..d2dfe9b4e 100644 --- a/assets/xml/objects/object_sekihig.xml +++ b/assets/xml/objects/object_sekihig.xml @@ -11,7 +11,7 @@ <Texture Name="gSunsSongGraveGoronTriforceTLUT" OutName="suns_song_grave_goron_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" /> <Texture Name="gSunsSongGraveGoronGraniteTex" OutName="sun_song_grave_goron_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" /> <Texture Name="gSunsSongGraveGoronMarbleTex" OutName="sun_song_grave_goron_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" /> - <Texture Name="gSunsSongGraveGoronSymbolTex" OutName="sun_song_grave_goron_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" /> + <Texture Name="gSunsSongGraveGoronSymbolTex" OutName="sun_song_grave_goron_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" TlutOffset="0x5E0"/> <Texture Name="gSunsSongGraveGoronStoneInscriptionTex" OutName="sun_song_grave_goron_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" /> <Texture Name="gSunsSongGraveGoronStaffNotesTex" OutName="sun_song_grave_goron_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" /> <Collision Name="gSunsSongGraveGoronCol" Offset="0x33D8" /> diff --git a/assets/xml/objects/object_sekihil.xml b/assets/xml/objects/object_sekihil.xml index 3dbb57774..54cd0aa6c 100644 --- a/assets/xml/objects/object_sekihil.xml +++ b/assets/xml/objects/object_sekihil.xml @@ -12,7 +12,7 @@ <Texture Name="gSunsSongGraveTriforceGraniteTex" OutName="sun_song_grave_triforce_granite" Format="rgba16" Width="32" Height="32" Offset="0x678" /> <Texture Name="gSunsSongGraveTriforceMarbleTex" OutName="sun_song_grave_triforce_marble" Format="rgba16" Width="32" Height="64" Offset="0xE78" /> <Texture Name="gSunsSongGraveTriforceSymbolTex" OutName="sun_song_grave_triforce_symbol" Format="ia4" Width="128" Height="16" Offset="0x1E78" /> - <Texture Name="gSunsSongGraveTriforceStoneInscriptionTex" OutName="sun_song_grave_triforce_stone_inscription" Format="ci4" Width="64" Height="64" Offset="0x2278" /> + <Texture Name="gSunsSongGraveTriforceStoneInscriptionTex" OutName="sun_song_grave_triforce_stone_inscription" Format="ci4" Width="64" Height="64" Offset="0x2278" TlutOffset="0x658"/> <Texture Name="gSunsSongGraveTriforceStaffNotesTex" OutName="sun_song_grave_triforce_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A78" /> <Collision Name="gSunsSongGraveTriforceCol" Offset="0x33F8" /> </File> diff --git a/assets/xml/objects/object_sekihin.xml b/assets/xml/objects/object_sekihin.xml index 300a9ad58..aebd67f5c 100644 --- a/assets/xml/objects/object_sekihin.xml +++ b/assets/xml/objects/object_sekihin.xml @@ -11,7 +11,7 @@ <Texture Name="gSunsSongGraveKokiriTriforceTLUT" OutName="suns_song_grave_kokiri_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" /> <Texture Name="gSunsSongGraveKokiriGraniteTex" OutName="suns_song_grave_kokiri_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" /> <Texture Name="gSunsSongGraveKokiriMarbleTex" OutName="suns_song_grave_kokiri_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" /> - <Texture Name="gSunsSongGraveKokiriSymbolTex" OutName="suns_song_grave_kokiri_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" /> + <Texture Name="gSunsSongGraveKokiriSymbolTex" OutName="suns_song_grave_kokiri_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" TlutOffset="0x600"/> <Texture Name="gSunsSongGraveKokiriStoneInscriptionTex" OutName="suns_song_grave_kokiri_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" /> <Texture Name="gSunsSongGraveKokiriStaffNotesTex" OutName="suns_song_grave_kokiri_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" /> <Collision Name="gSunsSongGraveKokiriCol" Offset="0x33D8" /> diff --git a/assets/xml/objects/object_shn.xml b/assets/xml/objects/object_shn.xml index a1f78cc2c..4acd3c8b8 100644 --- a/assets/xml/objects/object_shn.xml +++ b/assets/xml/objects/object_shn.xml @@ -21,19 +21,19 @@ <!-- Textures for Burly Guy's body, as well as the Swamp Shooting Gallery Man's head --> <Texture Name="gSwampShootingGalleryManNoseTLUT" OutName="swamp_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5688" /> <Texture Name="gBurlyGuyTLUT" OutName="shooting_gallery_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5888" /> - <Texture Name="gBurlyGuySkinTex" OutName="shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x5A88" /> + <Texture Name="gBurlyGuySkinTex" OutName="shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x5A88" TlutOffset="0x5888"/> <Texture Name="gSwampShootingGalleryManEyeOpenTex" OutName="swamp_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x5AC8" /> <Texture Name="gSwampShootingGalleryManEyeHalfTex" OutName="swamp_shooting_gallery_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x62C8" /> <Texture Name="gSwampShootingGalleryManEyeClosedTex" OutName="swamp_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x6AC8" /> - <Texture Name="gSwampShootingGalleryManEarTex" OutName="swamp_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x72C8" /> - <Texture Name="gSwampShootingGalleryManNoseTex" OutName="swamp_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x73C8" /> - <Texture Name="gSwampShootingGalleryManBeardAndLipsTex" OutName="swamp_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x7408" /> - <Texture Name="gSwampShootingGalleryManHairTex" OutName="swamp_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x7808" /> - <Texture Name="gBurlyGuyHandTex" OutName="shooting_gallery_man_hand" Format="ci8" Width="16" Height="16" Offset="0x7908" /> - <Texture Name="gBurlyGuyBodyHairTex" OutName="shooting_gallery_man_body_hair" Format="ci8" Width="32" Height="32" Offset="0x7A08" /> - <Texture Name="gBurlyGuyVestTex" OutName="shooting_gallery_man_vest" Format="ci8" Width="16" Height="16" Offset="0x7E08" /> - <Texture Name="gBurlyGuyPantsTex" OutName="shooting_gallery_man_pants" Format="ci8" Width="8" Height="8" Offset="0x7F08" /> - <Texture Name="gBurlyGuyShoesTex" OutName="shooting_gallery_man_shoes" Format="ci8" Width="16" Height="16" Offset="0x7F48" /> + <Texture Name="gSwampShootingGalleryManEarTex" OutName="swamp_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x72C8" TlutOffset="0x5888"/> + <Texture Name="gSwampShootingGalleryManNoseTex" OutName="swamp_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x73C8" TlutOffset="0x5688"/> + <Texture Name="gSwampShootingGalleryManBeardAndLipsTex" OutName="swamp_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x7408" TlutOffset="0x5888"/> + <Texture Name="gSwampShootingGalleryManHairTex" OutName="swamp_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x7808" TlutOffset="0x5888"/> + <Texture Name="gBurlyGuyHandTex" OutName="shooting_gallery_man_hand" Format="ci8" Width="16" Height="16" Offset="0x7908" TlutOffset="0x5888"/> + <Texture Name="gBurlyGuyBodyHairTex" OutName="shooting_gallery_man_body_hair" Format="ci8" Width="32" Height="32" Offset="0x7A08" TlutOffset="0x5888"/> + <Texture Name="gBurlyGuyVestTex" OutName="shooting_gallery_man_vest" Format="ci8" Width="16" Height="16" Offset="0x7E08" TlutOffset="0x5888"/> + <Texture Name="gBurlyGuyPantsTex" OutName="shooting_gallery_man_pants" Format="ci8" Width="8" Height="8" Offset="0x7F08" TlutOffset="0x5888"/> + <Texture Name="gBurlyGuyShoesTex" OutName="shooting_gallery_man_shoes" Format="ci8" Width="16" Height="16" Offset="0x7F48" TlutOffset="0x5888"/> <!-- Unused Empty Texture Animation --> <TextureAnimation Name="gBurlyGuyEmpty1TexAnim" Offset="0x8050" /> @@ -53,12 +53,12 @@ <Texture Name="gUnusedTownShootingGalleryManNoseTLUT" OutName="unused_town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x97D8" /> <Texture Name="gUnusedTownShootingGalleryManEyeTLUT" OutName="unused_town_shooting_gallery_man_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x99D8" /> <Texture Name="gUnusedTownShootingGalleryManSkinTLUT" OutName="unused_town_shooting_gallery_man_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9BD8" /> - <Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTex" OutName="unused_town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x9DD8" /> <!-- Used only for the lips --> - <Texture Name="gUnusedTownShootingGalleryManHairTex" OutName="unused_town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0xA1D8" /> - <Texture Name="gUnusedTownShootingGalleryManEarTex" OutName="unused_town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0xA2D8" /> - <Texture Name="gUnusedTownShootingGalleryManNoseTex" OutName="unused_town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0xA3D8" /> - <Texture Name="gUnusedTownShootingGalleryManEyeTex" OutName="unused_town_shooting_gallery_man_eye" Format="ci8" Width="32" Height="32" Offset="0xA418" /> - <Texture Name="gUnusedTownShootingGalleryManSkinTex" OutName="unused_town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0xA818" /> + <Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTex" OutName="unused_town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x9DD8" TlutOffset="0x91D8"/> <!-- Used only for the lips --> + <Texture Name="gUnusedTownShootingGalleryManHairTex" OutName="unused_town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0xA1D8" TlutOffset="0x93D8"/> + <Texture Name="gUnusedTownShootingGalleryManEarTex" OutName="unused_town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0xA2D8" TlutOffset="0x95D8"/> + <Texture Name="gUnusedTownShootingGalleryManNoseTex" OutName="unused_town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0xA3D8" TlutOffset="0x97D8"/> + <Texture Name="gUnusedTownShootingGalleryManEyeTex" OutName="unused_town_shooting_gallery_man_eye" Format="ci8" Width="32" Height="32" Offset="0xA418" TlutOffset="0x99D8"/> + <Texture Name="gUnusedTownShootingGalleryManSkinTex" OutName="unused_town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0xA818" TlutOffset="0x9BD8"/> <!-- Unused Empty DisplayList --> <DList Name="gBurlyGuyEmptyDL" Offset="0xB730" /> @@ -69,14 +69,14 @@ <!-- Textures for the Swamp Guide's head --> <Texture Name="gSwampGuideHairFabricAndSkinTLUT" OutName="swamp_guide_hair_fabric_and_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" /> <Texture Name="gSwampGuideMouthGoggleAndEyeTLUT" OutName="swamp_guide_mouth_goggle_and_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBED8" /> - <Texture Name="gSwampGuideSkinTex" OutName="swamp_guide_skin" Format="ci8" Width="8" Height="8" Offset="0xC0D8" /> - <Texture Name="gSwampGuideHatFabricTex" OutName="swamp_guide_hat_fabric" Format="ci8" Width="16" Height="16" Offset="0xC118" /> - <Texture Name="gSwampGuideHairAndBeardTex" OutName="swamp_guide_hair_and_beard" Format="ci8" Width="16" Height="16" Offset="0xC218" /> - <Texture Name="gSwampGuideHatAndGogglesMetalTex" OutName="swamp_guide_hat_and_goggles_metal" Format="ci8" Width="32" Height="16" Offset="0xC318" /> - <Texture Name="gSwampGuideEyeTex" OutName="swamp_guide_eye" Format="ci8" Width="32" Height="32" Offset="0xC518" /> - <Texture Name="gSwampGuideGoggleStrapTex" OutName="swamp_guide_goggle_strap" Format="ci8" Width="16" Height="16" Offset="0xC918" /> + <Texture Name="gSwampGuideSkinTex" OutName="swamp_guide_skin" Format="ci8" Width="8" Height="8" Offset="0xC0D8" TlutOffset="0xBCD8"/> + <Texture Name="gSwampGuideHatFabricTex" OutName="swamp_guide_hat_fabric" Format="ci8" Width="16" Height="16" Offset="0xC118" TlutOffset="0xBCD8"/> + <Texture Name="gSwampGuideHairAndBeardTex" OutName="swamp_guide_hair_and_beard" Format="ci8" Width="16" Height="16" Offset="0xC218" TlutOffset="0xBCD8"/> + <Texture Name="gSwampGuideHatAndGogglesMetalTex" OutName="swamp_guide_hat_and_goggles_metal" Format="ci8" Width="32" Height="16" Offset="0xC318" TlutOffset="0xBED8"/> + <Texture Name="gSwampGuideEyeTex" OutName="swamp_guide_eye" Format="ci8" Width="32" Height="32" Offset="0xC518" TlutOffset="0xBED8"/> + <Texture Name="gSwampGuideGoggleStrapTex" OutName="swamp_guide_goggle_strap" Format="ci8" Width="16" Height="16" Offset="0xC918" TlutOffset="0xBED8"/> <Texture Name="gSwampGuideNoseTex" OutName="swamp_guide_nose" Format="rgba16" Width="8" Height="8" Offset="0xCA18" /> - <Texture Name="gSwampGuideMouthTex" OutName="swamp_guide_mouth" Format="ci8" Width="16" Height="32" Offset="0xCA98" /> + <Texture Name="gSwampGuideMouthTex" OutName="swamp_guide_mouth" Format="ci8" Width="16" Height="32" Offset="0xCA98" TlutOffset="0xBED8"/> <!-- Burly Guy Animations --> <Animation Name="gBurlyGuyHeadScratchEndAnim" Offset="0xD2F8" /> <!-- Original name is "shn_w02TOw01" ("wait02 to wait01"?) --> @@ -113,11 +113,11 @@ <Texture Name="gTownShootingGalleryManHeadTLUT" OutName="town_shooting_gallery_man_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF990" /> <Texture Name="gTownShootingGalleryManEyeOpenTex" OutName="town_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFB90" /> <Texture Name="gTownShootingGalleryManEyeClosedTex" OutName="town_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10390" /> - <Texture Name="gTownShootingGalleryManBeardAndLipsTex" OutName="town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x10B90" /> <!-- Used only for the lips --> - <Texture Name="gTownShootingGalleryManNoseTex" OutName="town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x10F90" /> - <Texture Name="gTownShootingGalleryManEarTex" OutName="town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x10FD0" /> - <Texture Name="gTownShootingGalleryManHairTex" OutName="town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x110D0" /> - <Texture Name="gTownShootingGalleryManSkinTex" OutName="town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x111D0" /> + <Texture Name="gTownShootingGalleryManBeardAndLipsTex" OutName="town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x10B90" TlutOffset="0xF990"/> <!-- Used only for the lips --> + <Texture Name="gTownShootingGalleryManNoseTex" OutName="town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x10F90" TlutOffset="0xF790"/> + <Texture Name="gTownShootingGalleryManEarTex" OutName="town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x10FD0" TlutOffset="0xF990"/> + <Texture Name="gTownShootingGalleryManHairTex" OutName="town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x110D0" TlutOffset="0xF990"/> + <Texture Name="gTownShootingGalleryManSkinTex" OutName="town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x111D0" TlutOffset="0xF990"/> <!-- Unused Empty Texture Animation --> <TextureAnimation Name="gBurlyGuyEmpty2TexAnim" Offset="0x11210" /> diff --git a/assets/xml/objects/object_spot11_obj.xml b/assets/xml/objects/object_spot11_obj.xml index 354a0b4cc..9302f5037 100644 --- a/assets/xml/objects/object_spot11_obj.xml +++ b/assets/xml/objects/object_spot11_obj.xml @@ -6,8 +6,8 @@ <Collision Name="gGoronDoorCol" Offset="0x11C0" /> <!-- Original name is "z2_11_tobira01_bgdatainfo" --> <DList Name="gWoodStepDL" Offset="0x13F0" /> <!-- Original name is "z2_11_dai_model" --> <Texture Name="gWoodTLUT" OutName="wood_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1560" /> - <Texture Name="gWoodStepTopTex" OutName="wood_step_top" Format="ci8" Width="32" Height="32" Offset="0x1760" /> - <Texture Name="gWoodStepSideTex" OutName="wood_step_side" Format="ci8" Width="32" Height="16" Offset="0x1B60" /> + <Texture Name="gWoodStepTopTex" OutName="wood_step_top" Format="ci8" Width="32" Height="32" Offset="0x1760" TlutOffset="0x1560"/> + <Texture Name="gWoodStepSideTex" OutName="wood_step_side" Format="ci8" Width="32" Height="16" Offset="0x1B60" TlutOffset="0x1560"/> <Collision Name="gWoodStepCol" Offset="0x1EB8" /> <!-- Original name is "z2_11_dai_bgdatainfo" --> </File> </Root> diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml index 83469eacb..43fb39f6a 100644 --- a/assets/xml/objects/object_ssh.xml +++ b/assets/xml/objects/object_ssh.xml @@ -5,14 +5,14 @@ <Texture Name="object_ssh_Tex_000190" OutName="tex_000190" Format="rgba16" Width="32" Height="64" Offset="0x190" /> <Animation Name="object_ssh_Anim_001494" Offset="0x1494" /> <!-- Original name is "st_matsu" --> <Texture Name="object_ssh_TLUT_0014B0" OutName="tlut_0014B0" Format="rgba16" Width="16" Height="16" Offset="0x14B0" /> - <Texture Name="object_ssh_Tex_0016B0" OutName="tex_0016B0" Format="ci8" Width="8" Height="8" Offset="0x16B0" /> - <Texture Name="object_ssh_Tex_0016F0" OutName="tex_0016F0" Format="ci8" Width="16" Height="8" Offset="0x16F0" /> - <Texture Name="object_ssh_Tex_001770" OutName="tex_001770" Format="ci8" Width="8" Height="8" Offset="0x1770" /> + <Texture Name="object_ssh_Tex_0016B0" OutName="tex_0016B0" Format="ci8" Width="8" Height="8" Offset="0x16B0" TlutOffset="0x14B0"/> + <Texture Name="object_ssh_Tex_0016F0" OutName="tex_0016F0" Format="ci8" Width="16" Height="8" Offset="0x16F0" TlutOffset="0x14B0"/> + <Texture Name="object_ssh_Tex_001770" OutName="tex_001770" Format="ci8" Width="8" Height="8" Offset="0x1770" TlutOffset="0x14B0"/> <Texture Name="object_ssh_Tex_0017B0" OutName="tex_0017B0" Format="i8" Width="16" Height="16" Offset="0x17B0" /> - <Texture Name="object_ssh_Tex_0018B0" OutName="tex_0018B0" Format="ci8" Width="8" Height="16" Offset="0x18B0" /> - <Texture Name="object_ssh_Tex_001930" OutName="tex_001930" Format="ci8" Width="8" Height="8" Offset="0x1930" /> + <Texture Name="object_ssh_Tex_0018B0" OutName="tex_0018B0" Format="ci8" Width="8" Height="16" Offset="0x18B0" TlutOffset="0x14B0"/> + <Texture Name="object_ssh_Tex_001930" OutName="tex_001930" Format="ci8" Width="8" Height="8" Offset="0x1930" TlutOffset="0x14B0"/> <Texture Name="object_ssh_Tex_001970" OutName="tex_001970" Format="ci8" Width="32" Height="32" Offset="0x1970" /> - <Texture Name="object_ssh_Tex_001D70" OutName="tex_001D70" Format="ci8" Width="8" Height="16" Offset="0x1D70" /> + <Texture Name="object_ssh_Tex_001D70" OutName="tex_001D70" Format="ci8" Width="8" Height="16" Offset="0x1D70" TlutOffset="0x14B0"/> <Texture Name="object_ssh_Tex_001DF0" OutName="tex_001DF0" Format="ci8" Width="32" Height="32" Offset="0x1DF0" /> <Texture Name="object_ssh_Tex_0021F0" OutName="tex_0021F0" Format="ci8" Width="32" Height="32" Offset="0x21F0" /> <DList Name="object_ssh_DL_004E60" Offset="0x4E60" /> diff --git a/assets/xml/objects/object_sth.xml b/assets/xml/objects/object_sth.xml index 53040ae05..edb6c8e70 100644 --- a/assets/xml/objects/object_sth.xml +++ b/assets/xml/objects/object_sth.xml @@ -25,11 +25,11 @@ <DList Name="gSthPelvisDL" Offset="0x2B20" /> <Texture Name="gSthTLUT" OutName="sth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2D08" /> - <Texture Name="gSthSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x2F08" /> - <Texture Name="gSthFingerTex" OutName="figer" Format="ci8" Width="8" Height="8" Offset="0x2F48" /> + <Texture Name="gSthSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x2F08" TlutOffset="0x2D08"/> + <Texture Name="gSthFingerTex" OutName="figer" Format="ci8" Width="8" Height="8" Offset="0x2F48" TlutOffset="0x2D08"/> <!-- Shirt and pants get painted with color in the draw func. --> <Texture Name="gSthShirtTex" OutName="shirt" Format="i8" Width="16" Height="16" Offset="0x2F88" /> - <Texture Name="gSthBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0x3088" /> + <Texture Name="gSthBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0x3088" TlutOffset="0x2D08"/> <Texture Name="gSthPantsTex" OutName="pants" Format="i8" Width="8" Height="8" Offset="0x30C8" /> <Limb Name="gSthPelvisLimb" Type="Standard" EnumName="STH_LIMB_PELVIS" Offset="0x3108" /> diff --git a/assets/xml/objects/object_tab.xml b/assets/xml/objects/object_tab.xml index 00137b2dd..4305c3cd6 100644 --- a/assets/xml/objects/object_tab.xml +++ b/assets/xml/objects/object_tab.xml @@ -20,21 +20,21 @@ <DList Name="gBartenRightFootDL" Offset="0x5B60" /> <Texture Name="gBartenTLUT" OutName="barten_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5CA8" /> <Texture Name="gBartenEyeTLUT" OutName="barten_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5EA8" /> - <Texture Name="gBartenBeardTex" OutName="barten_beard" Format="ci8" Width="8" Height="16" Offset="0x60A8" /> - <Texture Name="gBartenArmTex" OutName="barten_arm" Format="ci8" Width="16" Height="32" Offset="0x6128" /> - <Texture Name="gBartenMouthTex" OutName="barten_mouth" Format="ci8" Width="8" Height="8" Offset="0x6328" /> - <Texture Name="gBartenHairTex" OutName="barten_hair" Format="ci8" Width="8" Height="16" Offset="0x6368" /> - <Texture Name="gBartenEarTex" OutName="barten_ear" Format="ci8" Width="8" Height="8" Offset="0x63E8" /> + <Texture Name="gBartenBeardTex" OutName="barten_beard" Format="ci8" Width="8" Height="16" Offset="0x60A8" TlutOffset="0x5CA8"/> + <Texture Name="gBartenArmTex" OutName="barten_arm" Format="ci8" Width="16" Height="32" Offset="0x6128" TlutOffset="0x5CA8"/> + <Texture Name="gBartenMouthTex" OutName="barten_mouth" Format="ci8" Width="8" Height="8" Offset="0x6328" TlutOffset="0x5CA8"/> + <Texture Name="gBartenHairTex" OutName="barten_hair" Format="ci8" Width="8" Height="16" Offset="0x6368" TlutOffset="0x5CA8"/> + <Texture Name="gBartenEarTex" OutName="barten_ear" Format="ci8" Width="8" Height="8" Offset="0x63E8" TlutOffset="0x5CA8"/> <Texture Name="gBartenEyeOpenTex" OutName="barten_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6428" /> - <Texture Name="gBartenHandTex" OutName="barten_hand" Format="ci8" Width="16" Height="16" Offset="0x6828" /> + <Texture Name="gBartenHandTex" OutName="barten_hand" Format="ci8" Width="16" Height="16" Offset="0x6828" TlutOffset="0x5CA8"/> <Texture Name="gBartenEyeHalfOpenTex" OutName="barten_eye_half_open" Format="ci8" Width="32" Height="32" Offset="0x6928" /> <Texture Name="gBartenEyeClosedTex" OutName="barten_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x6D28" /> - <Texture Name="gBartenBroomTex" OutName="barten_broom" Format="ci8" Width="16" Height="16" Offset="0x7128" /> - <Texture Name="gBartenBroomHeadTex" OutName="barten_broom_head" Format="ci8" Width="16" Height="16" Offset="0x7228" /> + <Texture Name="gBartenBroomTex" OutName="barten_broom" Format="ci8" Width="16" Height="16" Offset="0x7128" TlutOffset="0x5CA8"/> + <Texture Name="gBartenBroomHeadTex" OutName="barten_broom_head" Format="ci8" Width="16" Height="16" Offset="0x7228" TlutOffset="0x5CA8"/> <Texture Name="gBartenPantsTex" OutName="barten_pants" Format="i8" Width="32" Height="32" Offset="0x7328" /> <Texture Name="gBartenBowtieTex" OutName="barten_bowtie" Format="rgba16" Width="8" Height="16" Offset="0x7728" /> - <Texture Name="gBartenSkinTex" OutName="barten_skin" Format="ci8" Width="8" Height="8" Offset="0x7828" /> - <Texture Name="gBartenCollarTex" OutName="barten_collar" Format="ci8" Width="8" Height="16" Offset="0x7868" /> + <Texture Name="gBartenSkinTex" OutName="barten_skin" Format="ci8" Width="8" Height="8" Offset="0x7828" TlutOffset="0x5CA8"/> + <Texture Name="gBartenCollarTex" OutName="barten_collar" Format="ci8" Width="8" Height="16" Offset="0x7868" TlutOffset="0x5CA8"/> <Texture Name="gBartenSleeveTex" OutName="barten_sleeve" Format="i8" Width="16" Height="16" Offset="0x78E8" /> <Texture Name="gBartenJacketTex" OutName="barten_jacket" Format="i8" Width="8" Height="8" Offset="0x79E8" /> <Texture Name="gBartenFootTex" OutName="barten_foot" Format="rgba16" Width="16" Height="16" Offset="0x7A28" /> diff --git a/assets/xml/objects/object_takaraya_objects.xml b/assets/xml/objects/object_takaraya_objects.xml index cf9811555..e6870ed66 100644 --- a/assets/xml/objects/object_takaraya_objects.xml +++ b/assets/xml/objects/object_takaraya_objects.xml @@ -3,7 +3,7 @@ <File Name="object_takaraya_objects" Segment="6"> <Texture Name="gTreasureChestShopWallWhiteTLUT" OutName="treasure_chest_shop_wall_white_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" /> <Texture Name="gTreasureChestShopWallBlackTex" OutName="treasure_chest_shop_wall_black" Format="rgba16" Width="32" Height="32" Offset="0x20" /> - <Texture Name="gTreasureChestShopWallWhiteTex" OutName="treasure_chest_shop_wall_white" Format="ci4" Width="32" Height="32" Offset="0x820" /> + <Texture Name="gTreasureChestShopWallWhiteTex" OutName="treasure_chest_shop_wall_white" Format="ci4" Width="32" Height="32" Offset="0x820" TlutOffset="0x0"/> <DList Name="gTreasureChestShopWallBlackDL" Offset="0xB70" /> <!-- Original name is "z2_takara_box_b_model" --> <DList Name="gTreasureChestShopWallWhiteDL" Offset="0xD60" /> <!-- Original name is "z2_takara_box_w_model" --> </File> diff --git a/assets/xml/objects/object_tanron2.xml b/assets/xml/objects/object_tanron2.xml index 950621c19..b507a2832 100644 --- a/assets/xml/objects/object_tanron2.xml +++ b/assets/xml/objects/object_tanron2.xml @@ -9,9 +9,9 @@ <Texture Name="object_tanron2_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" /> <Texture Name="object_tanron2_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" /> <Texture Name="object_tanron2_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" /> - <Texture Name="object_tanron2_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" /> - <Texture Name="object_tanron2_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" /> - <Texture Name="object_tanron2_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" /> - <Texture Name="object_tanron2_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" /> + <Texture Name="object_tanron2_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" TlutOffset="0xA18"/> + <Texture Name="object_tanron2_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" TlutOffset="0xA38"/> + <Texture Name="object_tanron2_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" TlutOffset="0xA58"/> + <Texture Name="object_tanron2_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" TlutOffset="0xA78"/> </File> </Root> diff --git a/assets/xml/objects/object_tanron3.xml b/assets/xml/objects/object_tanron3.xml index 05ef078d7..c20dabc42 100644 --- a/assets/xml/objects/object_tanron3.xml +++ b/assets/xml/objects/object_tanron3.xml @@ -9,9 +9,9 @@ <Texture Name="object_tanron3_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" /> <Texture Name="object_tanron3_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" /> <Texture Name="object_tanron3_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" /> - <Texture Name="object_tanron3_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" /> - <Texture Name="object_tanron3_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" /> - <Texture Name="object_tanron3_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" /> - <Texture Name="object_tanron3_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" /> + <Texture Name="object_tanron3_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" TlutOffset="0xA18"/> + <Texture Name="object_tanron3_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" TlutOffset="0xA38"/> + <Texture Name="object_tanron3_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" TlutOffset="0xA58"/> + <Texture Name="object_tanron3_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" TlutOffset="0xA78"/> </File> </Root> diff --git a/assets/xml/objects/object_tanron5.xml b/assets/xml/objects/object_tanron5.xml index e64a11d5d..c92c1ac69 100644 --- a/assets/xml/objects/object_tanron5.xml +++ b/assets/xml/objects/object_tanron5.xml @@ -9,9 +9,9 @@ <Texture Name="object_tanron5_TLUT_000A38" OutName="tlut_000A38" Format="rgba16" Width="4" Height="4" Offset="0xA38" /> <Texture Name="object_tanron5_TLUT_000A58" OutName="tlut_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" /> <Texture Name="object_tanron5_TLUT_000A78" OutName="tlut_000A78" Format="rgba16" Width="4" Height="4" Offset="0xA78" /> - <Texture Name="object_tanron5_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" /> - <Texture Name="object_tanron5_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" /> - <Texture Name="object_tanron5_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" /> - <Texture Name="object_tanron5_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" /> + <Texture Name="object_tanron5_Tex_000A98" OutName="tex_000A98" Format="ci4" Width="32" Height="32" Offset="0xA98" TlutOffset="0xA18"/> + <Texture Name="object_tanron5_Tex_000C98" OutName="tex_000C98" Format="ci4" Width="32" Height="32" Offset="0xC98" TlutOffset="0xA38"/> + <Texture Name="object_tanron5_Tex_000E98" OutName="tex_000E98" Format="ci4" Width="32" Height="32" Offset="0xE98" TlutOffset="0xA58"/> + <Texture Name="object_tanron5_Tex_001098" OutName="tex_001098" Format="ci4" Width="32" Height="32" Offset="0x1098" TlutOffset="0xA78"/> </File> </Root> diff --git a/assets/xml/objects/object_test3.xml b/assets/xml/objects/object_test3.xml index 1af50c0a7..b556ef0f7 100644 --- a/assets/xml/objects/object_test3.xml +++ b/assets/xml/objects/object_test3.xml @@ -6,20 +6,20 @@ <Texture Name="gKafeiBody2TLUT" OutName="kafei_body_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x200" /> <Texture Name="gKafeiMouthTLUT" OutName="kafei_mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400" /> <Texture Name="gKafeiEyesTLUT" OutName="kafei_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x600" /> - <Texture Name="gKafeiSkinTex" OutName="kafei_skin" Format="ci8" Width="8" Height="8" Offset="0x800" /> - <Texture Name="gKafeiHairTex" OutName="kafei_hair" Format="ci8" Width="8" Height="16" Offset="0x840" /> - <Texture Name="gKafeiNoseTex" OutName="kafei_nose" Format="ci8" Width="16" Height="16" Offset="0x8C0" /> + <Texture Name="gKafeiSkinTex" OutName="kafei_skin" Format="ci8" Width="8" Height="8" Offset="0x800" TlutOffset="0x0"/> + <Texture Name="gKafeiHairTex" OutName="kafei_hair" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x200"/> + <Texture Name="gKafeiNoseTex" OutName="kafei_nose" Format="ci8" Width="16" Height="16" Offset="0x8C0" TlutOffset="0x0"/> <Texture Name="gKafeiMouthClosedTex" OutName="kafei_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x9C0" TlutOffset="0x400" /> <Texture Name="gKafeiEyesOpenTex" OutName="kafei_eyes_open" Format="ci8" Width="64" Height="32" Offset="0xDC0" TlutOffset="0x600" /> - <Texture Name="gKafeiHairPartAndUndersideTex" OutName="kafei_hair_part_and_underside" Format="ci8" Width="8" Height="16" Offset="0x15C0" /> - <Texture Name="gKafeiFingersTex" OutName="kafei_fingers" Format="ci8" Width="16" Height="16" Offset="0x1640" /> - <Texture Name="gKafeiBootTex" OutName="kafei_boot" Format="ci8" Width="32" Height="32" Offset="0x1740" /> - <Texture Name="gKafeiSleevePatternTex" OutName="kafei_sleeve_pattern" Format="ci8" Width="32" Height="32" Offset="0x1B40" /> - <Texture Name="gKafeiInnerSleeveTex" OutName="kafei_inner_sleeve" Format="ci8" Width="8" Height="8" Offset="0x1F40" /> - <Texture Name="gKafeiClothesNeckOpeningTex" OutName="kafei_clothes_neck_opening" Format="ci8" Width="32" Height="16" Offset="0x1F80" /> + <Texture Name="gKafeiHairPartAndUndersideTex" OutName="kafei_hair_part_and_underside" Format="ci8" Width="8" Height="16" Offset="0x15C0" TlutOffset="0x200"/> + <Texture Name="gKafeiFingersTex" OutName="kafei_fingers" Format="ci8" Width="16" Height="16" Offset="0x1640" TlutOffset="0x0"/> + <Texture Name="gKafeiBootTex" OutName="kafei_boot" Format="ci8" Width="32" Height="32" Offset="0x1740" TlutOffset="0x0"/> + <Texture Name="gKafeiSleevePatternTex" OutName="kafei_sleeve_pattern" Format="ci8" Width="32" Height="32" Offset="0x1B40" TlutOffset="0x200"/> + <Texture Name="gKafeiInnerSleeveTex" OutName="kafei_inner_sleeve" Format="ci8" Width="8" Height="8" Offset="0x1F40" TlutOffset="0x200"/> + <Texture Name="gKafeiClothesNeckOpeningTex" OutName="kafei_clothes_neck_opening" Format="ci8" Width="32" Height="16" Offset="0x1F80" TlutOffset="0x0"/> <Texture Name="gKafeiPendantOfMemoriesTex" OutName="kafei_pendant_of_memories" Format="rgba16" Width="32" Height="64" Offset="0x2180" /> - <Texture Name="gKafeiClothesPatternTex" OutName="kafei_clothes_pattern" Format="ci8" Width="16" Height="64" Offset="0x3180" /> - <Texture Name="gKafeiTrouserHemTex" OutName="kafei_trouser_hem" Format="ci8" Width="16" Height="16" Offset="0x3580" /> + <Texture Name="gKafeiClothesPatternTex" OutName="kafei_clothes_pattern" Format="ci8" Width="16" Height="64" Offset="0x3180" TlutOffset="0x0"/> + <Texture Name="gKafeiTrouserHemTex" OutName="kafei_trouser_hem" Format="ci8" Width="16" Height="16" Offset="0x3580" TlutOffset="0x200"/> <Texture Name="gKafeiEyesHalfTex" OutName="kafei_eyes_half" Format="ci8" Width="64" Height="32" Offset="0x3680" TlutOffset="0x600" /> <Texture Name="gKafeiEyesClosedTex" OutName="kafei_eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x3E80" TlutOffset="0x600" /> <Texture Name="gKafeiEyesRightTex" OutName="kafei_eyes_right" Format="ci8" Width="64" Height="32" Offset="0x4680" TlutOffset="0x600" /> diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml index 6af814d5b..a70f8e03f 100644 --- a/assets/xml/objects/object_tk.xml +++ b/assets/xml/objects/object_tk.xml @@ -8,18 +8,18 @@ <Animation Name="object_tk_Anim_003B10" Offset="0x3B10" /> <!-- Original name is "tk_odorokuloop" --> <Animation Name="object_tk_Anim_003FB8" Offset="0x3FB8" /> <!-- Original name is "tk_run" --> <Texture Name="object_tk_TLUT_003FD0" OutName="tlut_003FD0" Format="rgba16" Width="16" Height="16" Offset="0x3FD0" /> - <Texture Name="object_tk_Tex_0041D0" OutName="tex_0041D0" Format="ci8" Width="8" Height="8" Offset="0x41D0" /> - <Texture Name="object_tk_Tex_004210" OutName="tex_004210" Format="ci8" Width="8" Height="8" Offset="0x4210" /> - <Texture Name="object_tk_Tex_004250" OutName="tex_004250" Format="ci8" Width="8" Height="8" Offset="0x4250" /> - <Texture Name="object_tk_Tex_004290" OutName="tex_004290" Format="ci8" Width="16" Height="16" Offset="0x4290" /> + <Texture Name="object_tk_Tex_0041D0" OutName="tex_0041D0" Format="ci8" Width="8" Height="8" Offset="0x41D0" TlutOffset="0x3FD0"/> + <Texture Name="object_tk_Tex_004210" OutName="tex_004210" Format="ci8" Width="8" Height="8" Offset="0x4210" TlutOffset="0x3FD0"/> + <Texture Name="object_tk_Tex_004250" OutName="tex_004250" Format="ci8" Width="8" Height="8" Offset="0x4250" TlutOffset="0x3FD0"/> + <Texture Name="object_tk_Tex_004290" OutName="tex_004290" Format="ci8" Width="16" Height="16" Offset="0x4290" TlutOffset="0x3FD0"/> <Texture Name="object_tk_Tex_004390" OutName="tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x4390" /> <Texture Name="object_tk_Tex_004B90" OutName="tex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" /> <Texture Name="object_tk_Tex_005390" OutName="tex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" /> - <Texture Name="object_tk_Tex_005B90" OutName="tex_005B90" Format="ci8" Width="16" Height="16" Offset="0x5B90" /> - <Texture Name="object_tk_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="16" Height="16" Offset="0x5C90" /> + <Texture Name="object_tk_Tex_005B90" OutName="tex_005B90" Format="ci8" Width="16" Height="16" Offset="0x5B90" TlutOffset="0x3FD0"/> + <Texture Name="object_tk_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="16" Height="16" Offset="0x5C90" TlutOffset="0x3FD0"/> <Texture Name="object_tk_Tex_005D90" OutName="tex_005D90" Format="ci8" Width="16" Height="16" Offset="0x5D90" TlutOffset="0x3FD0" /> <Texture Name="object_tk_Tex_005E90" OutName="tex_005E90" Format="ci8" Width="8" Height="16" Offset="0x5E90" TlutOffset="0x3FD0" /> - <Texture Name="object_tk_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="16" Height="16" Offset="0x5F10" /> + <Texture Name="object_tk_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="16" Height="16" Offset="0x5F10" TlutOffset="0x3FD0"/> <DList Name="object_tk_DL_008870" Offset="0x8870" /> <DList Name="object_tk_DL_0089B0" Offset="0x89B0" /> <DList Name="object_tk_DL_008B40" Offset="0x8B40" /> @@ -36,8 +36,8 @@ <DList Name="object_tk_DL_00A068" Offset="0xA068" /> <DList Name="object_tk_DL_00A220" Offset="0xA220" /> <Texture Name="object_tk_TLUT_00A300" OutName="tlut_00A300" Format="rgba16" Width="40" Height="1" Offset="0xA300" /> - <Texture Name="object_tk_Tex_00A350" OutName="tex_00A350" Format="ci8" Width="16" Height="16" Offset="0xA350" /> - <Texture Name="object_tk_Tex_00A450" OutName="tex_00A450" Format="ci8" Width="8" Height="16" Offset="0xA450" /> + <Texture Name="object_tk_Tex_00A350" OutName="tex_00A350" Format="ci8" Width="16" Height="16" Offset="0xA350" TlutOffset="0xA300"/> + <Texture Name="object_tk_Tex_00A450" OutName="tex_00A450" Format="ci8" Width="8" Height="16" Offset="0xA450" TlutOffset="0xA300"/> <Texture Name="object_tk_Tex_00A4D0" OutName="tex_00A4D0" Format="i8" Width="8" Height="8" Offset="0xA4D0" /> <Texture Name="object_tk_Tex_00A510" OutName="tex_00A510" Format="rgba16" Width="8" Height="8" Offset="0xA510" /> <Texture Name="object_tk_Tex_00A590" OutName="tex_00A590" Format="i4" Width="16" Height="32" Offset="0xA590" /> diff --git a/assets/xml/objects/object_tokei_turret.xml b/assets/xml/objects/object_tokei_turret.xml index 70e4179b0..8929e7522 100644 --- a/assets/xml/objects/object_tokei_turret.xml +++ b/assets/xml/objects/object_tokei_turret.xml @@ -2,7 +2,7 @@ <!-- Object for the turret in South Clock Town that the carpenters build during the 3 day period. --> <File Name="object_tokei_turret" Segment="6"> <Texture Name="gClockTownTurretTLUT" OutName="clock_town_turret_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" /> - <Texture Name="gClockTownTurretTextTex" OutName="clock_town_turret_text" Format="ci4" Width="64" Height="64" Offset="0x20" /> + <Texture Name="gClockTownTurretTextTex" OutName="clock_town_turret_text" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/> <Texture Name="gClockTownTurretFabricTex" OutName="clock_town_turret_fabric" Format="rgba16" Width="32" Height="32" Offset="0x820" /> <Texture Name="gClockTownTurretWoodTex" OutName="clock_town_turret_wood" Format="rgba16" Width="16" Height="32" Offset="0x1020" /> <Texture Name="gClockTownFlagsTex" OutName="clock_town_flags" Format="rgba16" Width="128" Height="16" Offset="0x1420" /> diff --git a/assets/xml/objects/object_toryo.xml b/assets/xml/objects/object_toryo.xml index bbc87e0c4..58655ef0a 100644 --- a/assets/xml/objects/object_toryo.xml +++ b/assets/xml/objects/object_toryo.xml @@ -2,20 +2,20 @@ <File Name="object_toryo" Segment="6"> <Animation Name="object_toryo_Anim_000E50" Offset="0xE50" /> <!-- Original name is "dk1_matsu" --> <Texture Name="object_toryo_TLUT_000E60" OutName="tlut_000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60" /> - <Texture Name="object_toryo_Tex_001060" OutName="tex_001060" Format="ci8" Width="16" Height="16" Offset="0x1060" /> - <Texture Name="object_toryo_Tex_001160" OutName="tex_001160" Format="ci8" Width="8" Height="4" Offset="0x1160" /> - <Texture Name="object_toryo_Tex_001180" OutName="tex_001180" Format="ci8" Width="8" Height="8" Offset="0x1180" /> - <Texture Name="object_toryo_Tex_0011C0" OutName="tex_0011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" /> - <Texture Name="object_toryo_Tex_001200" OutName="tex_001200" Format="ci8" Width="8" Height="8" Offset="0x1200" /> - <Texture Name="object_toryo_Tex_001240" OutName="tex_001240" Format="ci8" Width="8" Height="16" Offset="0x1240" /> + <Texture Name="object_toryo_Tex_001060" OutName="tex_001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001160" OutName="tex_001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001180" OutName="tex_001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_0011C0" OutName="tex_0011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001200" OutName="tex_001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001240" OutName="tex_001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/> <Texture Name="object_toryo_Tex_0012C0" OutName="tex_0012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0" /> - <Texture Name="object_toryo_Tex_0016C0" OutName="tex_0016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" /> - <Texture Name="object_toryo_Tex_0017C0" OutName="tex_0017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" /> - <Texture Name="object_toryo_Tex_0018C0" OutName="tex_0018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" /> - <Texture Name="object_toryo_Tex_0019C0" OutName="tex_0019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" /> - <Texture Name="object_toryo_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" /> - <Texture Name="object_toryo_Tex_001A80" OutName="tex_001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" /> - <Texture Name="object_toryo_Tex_001B80" OutName="tex_001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" /> + <Texture Name="object_toryo_Tex_0016C0" OutName="tex_0016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_0017C0" OutName="tex_0017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_0018C0" OutName="tex_0018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_0019C0" OutName="tex_0019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001A80" OutName="tex_001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/> + <Texture Name="object_toryo_Tex_001B80" OutName="tex_001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/> <DList Name="object_toryo_DL_004B20" Offset="0x4B20" /> <DList Name="object_toryo_DL_004F20" Offset="0x4F20" /> <DList Name="object_toryo_DL_005438" Offset="0x5438" /> diff --git a/assets/xml/objects/object_tro.xml b/assets/xml/objects/object_tro.xml index 9ee03d413..e7f39b645 100644 --- a/assets/xml/objects/object_tro.xml +++ b/assets/xml/objects/object_tro.xml @@ -5,10 +5,10 @@ <Texture Name="gKoumeKioskNoseTLUT" OutName="koume_kiosk_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAE0" /> <Texture Name="gKoumeKioskNostrilsTLUT" OutName="koume_kiosk_nostrils_tlut" Format="rgba16" Width="16" Height="16" Offset="0xCE0" /> <Texture Name="gKoumeKioskShadowedSkinTex" OutName="koume_kiosk_shadowed_skin" Format="rgba16" Width="2" Height="8" Offset="0xEE0" /> - <Texture Name="gKoumeKioskNoseTex" OutName="koume_kiosk_nose" Format="ci8" Width="16" Height="8" Offset="0xF00" /> + <Texture Name="gKoumeKioskNoseTex" OutName="koume_kiosk_nose" Format="ci8" Width="16" Height="8" Offset="0xF00" TlutOffset="0xAE0"/> <Texture Name="gKoumeKioskJewelHolderTex" OutName="koume_kiosk_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0xF80" /> <Texture Name="gKoumeKioskJewelTex" OutName="koume_kiosk_jewel" Format="rgba16" Width="8" Height="8" Offset="0x1080" /> - <Texture Name="gKoumeKioskNostrilsTex" OutName="koume_kiosk_nostrils" Format="ci8" Width="8" Height="8" Offset="0x1100" /> + <Texture Name="gKoumeKioskNostrilsTex" OutName="koume_kiosk_nostrils" Format="ci8" Width="8" Height="8" Offset="0x1100" TlutOffset="0xCE0"/> <Texture Name="gKoumeKioskEyeOpenTex" OutName="koume_kiosk_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x1140"/> <Texture Name="gKoumeKioskEyeHalfTex" OutName="koume_kiosk_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1940"/> <Texture Name="gKoumeKioskEyeClosedTex" OutName="koume_kiosk_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2140"/> diff --git a/assets/xml/objects/object_trt.xml b/assets/xml/objects/object_trt.xml index 10d8312ca..bb5f35df0 100644 --- a/assets/xml/objects/object_trt.xml +++ b/assets/xml/objects/object_trt.xml @@ -48,18 +48,18 @@ <Texture Name="gKotakeRobeTex" OutName="kotake_robe" Format="rgba16" Width="16" Height="16" Offset="0xA078" /> <Texture Name="gKotakeRobePatternTex" OutName="kotake_robe_pattern" Format="rgba16" Width="16" Height="16" Offset="0xA278" /> <Texture Name="gKotakeRobeTrimTex" OutName="kotake_robe_trim" Format="rgba16" Width="16" Height="16" Offset="0xA478" /> - <Texture Name="gKotakeSkinTex" OutName="kotake_skin" Format="ci8" Width="16" Height="8" Offset="0xA678" /> - <Texture Name="gKotakeMouthTex" OutName="kotake_mouth" Format="ci8" Width="8" Height="8" Offset="0xA6F8" /> + <Texture Name="gKotakeSkinTex" OutName="kotake_skin" Format="ci8" Width="16" Height="8" Offset="0xA678" TlutOffset="0x8C78"/> + <Texture Name="gKotakeMouthTex" OutName="kotake_mouth" Format="ci8" Width="8" Height="8" Offset="0xA6F8" TlutOffset="0x8E78"/> <Texture Name="gKotakeHairTex" OutName="kotake_hair" Format="rgba16" Width="8" Height="32" Offset="0xA738" /> <Texture Name="gKotakeBraidEndTex" OutName="kotake_braid_end" Format="rgba16" Width="8" Height="8" Offset="0xA938" /> - <Texture Name="gKotakeEarTex" OutName="kotake_ear" Format="ci8" Width="8" Height="8" Offset="0xA9B8" /> + <Texture Name="gKotakeEarTex" OutName="kotake_ear" Format="ci8" Width="8" Height="8" Offset="0xA9B8" TlutOffset="0x9078"/> <Texture Name="gKotakeCollarNeckTex" OutName="kotake_collar_neck" Format="rgba16" Width="4" Height="8" Offset="0xA9F8" /> - <Texture Name="gKotakeFingerTex" OutName="kotake_finger" Format="ci8" Width="8" Height="16" Offset="0xAA38" /> + <Texture Name="gKotakeFingerTex" OutName="kotake_finger" Format="ci8" Width="8" Height="16" Offset="0xAA38" TlutOffset="0x9278"/> <Texture Name="gKotakeBroomHandleTex" OutName="kotake_broom_handle" Format="rgba16" Width="8" Height="8" Offset="0xAAB8" />-> <Texture Name="gKotakeBroomHeadTex" OutName="kotake_broom_head" Format="rgba16" Width="16" Height="32" Offset="0xAB38" /> <Texture Name="gKotakeJewelHolderTex" OutName="kotake_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0xAF38" /> - <Texture Name="gKotakeNeckTex" OutName="kotake_neck" Format="ci8" Width="8" Height="8" Offset="0xB038" /> - <Texture Name="gKotakeNostrilsTex" OutName="kotake_nostrils" Format="ci8" Width="8" Height="8" Offset="0xB078" /> + <Texture Name="gKotakeNeckTex" OutName="kotake_neck" Format="ci8" Width="8" Height="8" Offset="0xB038" TlutOffset="0x9478"/> + <Texture Name="gKotakeNostrilsTex" OutName="kotake_nostrils" Format="ci8" Width="8" Height="8" Offset="0xB078" TlutOffset="0x9678"/> <Texture Name="gKotakeEyeOpenTex" OutName="kotake_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB0B8" /> <Texture Name="gKotakeEyeHalfTex" OutName="kotake_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xB8B8" /> <Texture Name="gKotakeEyeClosedTex" OutName="kotake_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0B8" /> diff --git a/assets/xml/objects/object_tru.xml b/assets/xml/objects/object_tru.xml index 68a80ee38..4612a8bdd 100644 --- a/assets/xml/objects/object_tru.xml +++ b/assets/xml/objects/object_tru.xml @@ -64,18 +64,18 @@ <Texture Name="gKoumeRobeTex" OutName="koume_robe" Format="rgba16" Width="16" Height="16" Offset="0x17F60" /> <Texture Name="gKoumeRobePatternTex" OutName="koume_robe_pattern" Format="rgba16" Width="16" Height="16" Offset="0x18160" /> <Texture Name="gKoumeRobeTrimTex" OutName="koume_robe_trim" Format="rgba16" Width="16" Height="16" Offset="0x18360" /> - <Texture Name="gKoumeSkinTex" OutName="koume_skin" Format="ci8" Width="16" Height="8" Offset="0x18560" /> - <Texture Name="gKoumeMouthTex" OutName="koume_mouth" Format="ci8" Width="8" Height="8" Offset="0x185E0" /> + <Texture Name="gKoumeSkinTex" OutName="koume_skin" Format="ci8" Width="16" Height="8" Offset="0x18560" TlutOffset="0x16B60"/> + <Texture Name="gKoumeMouthTex" OutName="koume_mouth" Format="ci8" Width="8" Height="8" Offset="0x185E0" TlutOffset="0x16D60"/> <Texture Name="gKoumeHairTex" OutName="koume_hair" Format="rgba16" Width="8" Height="32" Offset="0x18620" /> <Texture Name="gKoumeBraidEndTex" OutName="koume_braid_end" Format="rgba16" Width="8" Height="8" Offset="0x18820" /> - <Texture Name="gKoumeEarTex" OutName="koume_ear" Format="ci8" Width="8" Height="8" Offset="0x188A0" /> + <Texture Name="gKoumeEarTex" OutName="koume_ear" Format="ci8" Width="8" Height="8" Offset="0x188A0" TlutOffset="0x16F60"/> <Texture Name="gKoumeCollarNeckTex" OutName="koume_collar_neck" Format="rgba16" Width="4" Height="8" Offset="0x188E0" /> - <Texture Name="gKoumeFingerTex" OutName="koume_finger" Format="ci8" Width="8" Height="16" Offset="0x18920" /> + <Texture Name="gKoumeFingerTex" OutName="koume_finger" Format="ci8" Width="8" Height="16" Offset="0x18920" TlutOffset="0x17160"/> <Texture Name="gKoumeBroomHandleTex" OutName="koume_broom_handle" Format="rgba16" Width="8" Height="8" Offset="0x189A0" /> <Texture Name="gKoumeBroomHeadTex" OutName="koume_broom_head" Format="rgba16" Width="16" Height="32" Offset="0x18A20" /> <Texture Name="gKoumeJewelHolderTex" OutName="koume_jewel_holder" Format="rgba16" Width="16" Height="8" Offset="0x18E20" /> - <Texture Name="gKoumeNeckTex" OutName="koume_neck" Format="ci8" Width="8" Height="8" Offset="0x18F20" /> - <Texture Name="gKoumeNostrilsTex" OutName="koume_nostrils" Format="ci8" Width="8" Height="8" Offset="0x18F60" /> + <Texture Name="gKoumeNeckTex" OutName="koume_neck" Format="ci8" Width="8" Height="8" Offset="0x18F20" TlutOffset="0x17360"/> + <Texture Name="gKoumeNostrilsTex" OutName="koume_nostrils" Format="ci8" Width="8" Height="8" Offset="0x18F60" TlutOffset="0x17560"/> <Texture Name="gKoumeEyeOpenTex" OutName="koume_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x18FA0" /> <Texture Name="gKoumeEyeHalfTex" OutName="koume_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x197A0" /> <Texture Name="gKoumeEyeClosedTex" OutName="koume_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x19FA0" /> diff --git a/assets/xml/objects/object_tsn.xml b/assets/xml/objects/object_tsn.xml index 170a226a4..90e7553d4 100644 --- a/assets/xml/objects/object_tsn.xml +++ b/assets/xml/objects/object_tsn.xml @@ -19,13 +19,13 @@ <DList Name="object_tsn_DL_005F88" Offset="0x5F88" /> <DList Name="object_tsn_DL_006108" Offset="0x6108" /> <Texture Name="object_tsn_TLUT_0061F8" OutName="tlut_0061F8" Format="rgba16" Width="16" Height="16" Offset="0x61F8" /> - <Texture Name="object_tsn_Tex_0063F8" OutName="tex_0063F8" Format="ci8" Width="32" Height="64" Offset="0x63F8" /> - <Texture Name="object_tsn_Tex_006BF8" OutName="tex_006BF8" Format="ci8" Width="8" Height="8" Offset="0x6BF8" /> - <Texture Name="object_tsn_Tex_006C38" OutName="tex_006C38" Format="ci8" Width="8" Height="8" Offset="0x6C38" /> - <Texture Name="object_tsn_Tex_006C78" OutName="tex_006C78" Format="ci8" Width="8" Height="8" Offset="0x6C78" /> - <Texture Name="object_tsn_Tex_006CB8" OutName="tex_006CB8" Format="ci8" Width="32" Height="32" Offset="0x6CB8" /> + <Texture Name="object_tsn_Tex_0063F8" OutName="tex_0063F8" Format="ci8" Width="32" Height="64" Offset="0x63F8" TlutOffset="0x61F8"/> + <Texture Name="object_tsn_Tex_006BF8" OutName="tex_006BF8" Format="ci8" Width="8" Height="8" Offset="0x6BF8" TlutOffset="0x61F8"/> + <Texture Name="object_tsn_Tex_006C38" OutName="tex_006C38" Format="ci8" Width="8" Height="8" Offset="0x6C38" TlutOffset="0x61F8"/> + <Texture Name="object_tsn_Tex_006C78" OutName="tex_006C78" Format="ci8" Width="8" Height="8" Offset="0x6C78" TlutOffset="0x61F8"/> + <Texture Name="object_tsn_Tex_006CB8" OutName="tex_006CB8" Format="ci8" Width="32" Height="32" Offset="0x6CB8" TlutOffset="0x61F8"/> <Texture Name="object_tsn_Tex_0070B8" OutName="tex_0070B8" Format="rgba16" Width="16" Height="16" Offset="0x70B8" /> - <Texture Name="object_tsn_Tex_0072B8" OutName="tex_0072B8" Format="ci8" Width="16" Height="16" Offset="0x72B8" /> + <Texture Name="object_tsn_Tex_0072B8" OutName="tex_0072B8" Format="ci8" Width="16" Height="16" Offset="0x72B8" TlutOffset="0x61F8"/> <Texture Name="object_tsn_Tex_0073B8" OutName="tex_0073B8" Format="ci8" Width="32" Height="32" Offset="0x73B8" /> <Texture Name="object_tsn_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="16" Height="32" Offset="0x77B8" /> <Texture Name="object_tsn_Tex_007BB8" OutName="tex_007BB8" Format="rgba16" Width="16" Height="16" Offset="0x7BB8" /> diff --git a/assets/xml/objects/object_uch.xml b/assets/xml/objects/object_uch.xml index d82bf5b10..37c8ca0fd 100644 --- a/assets/xml/objects/object_uch.xml +++ b/assets/xml/objects/object_uch.xml @@ -37,10 +37,10 @@ <!-- Alien Textures --> <Texture Name="gAlienTLUT" OutName="alien_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3D80" /> - <Texture Name="gAlienTorsoTex" OutName="alien_torso" Format="ci8" Width="16" Height="16" Offset="0x3F80" /> - <Texture Name="gAlienHandsAndTorsoUndersideTex" OutName="alien_hands_and_torso_underside" Format="ci8" Width="16" Height="16" Offset="0x4080" /> - <Texture Name="gAlienHeadFrontAndArmsTex" OutName="alien_head_front_and_arms" Format="ci8" Width="16" Height="32" Offset="0x4180" /> - <Texture Name="gAlienHeadBackTex" OutName="alien_head_back" Format="ci8" Width="16" Height="32" Offset="0x4380" /> + <Texture Name="gAlienTorsoTex" OutName="alien_torso" Format="ci8" Width="16" Height="16" Offset="0x3F80" TlutOffset="0x3D80"/> + <Texture Name="gAlienHandsAndTorsoUndersideTex" OutName="alien_hands_and_torso_underside" Format="ci8" Width="16" Height="16" Offset="0x4080" TlutOffset="0x3D80"/> + <Texture Name="gAlienHeadFrontAndArmsTex" OutName="alien_head_front_and_arms" Format="ci8" Width="16" Height="32" Offset="0x4180" TlutOffset="0x3D80"/> + <Texture Name="gAlienHeadBackTex" OutName="alien_head_back" Format="ci8" Width="16" Height="32" Offset="0x4380" TlutOffset="0x3D80"/> <Texture Name="gAlienEyeTex" OutName="alien_eye" Format="rgba16" Width="32" Height="32" Offset="0x4580" /> <!-- Alien Limbs --> diff --git a/assets/xml/objects/object_um.xml b/assets/xml/objects/object_um.xml index 1799f3caa..fa159f045 100644 --- a/assets/xml/objects/object_um.xml +++ b/assets/xml/objects/object_um.xml @@ -21,13 +21,13 @@ <Texture Name="object_um_Tex_004C80" OutName="tex_004C80" Format="i8" Width="32" Height="32" Offset="0x4C80" /> <DList Name="gUmBrokenMinigamePotDL" Offset="0x52B0" /> <Texture Name="object_um_TLUT_0054D0" OutName="tlut_0054D0" Format="rgba16" Width="16" Height="16" Offset="0x54D0" /> - <Texture Name="object_um_Tex_0056D0" OutName="tex_0056D0" Format="ci8" Width="8" Height="8" Offset="0x56D0" /> - <Texture Name="object_um_Tex_005710" OutName="tex_005710" Format="ci8" Width="32" Height="64" Offset="0x5710" /> - <Texture Name="object_um_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="32" Height="32" Offset="0x5F10" /> + <Texture Name="object_um_Tex_0056D0" OutName="tex_0056D0" Format="ci8" Width="8" Height="8" Offset="0x56D0" TlutOffset="0x54D0"/> + <Texture Name="object_um_Tex_005710" OutName="tex_005710" Format="ci8" Width="32" Height="64" Offset="0x5710" TlutOffset="0x54D0"/> + <Texture Name="object_um_Tex_005F10" OutName="tex_005F10" Format="ci8" Width="32" Height="32" Offset="0x5F10" TlutOffset="0x54D0"/> <DList Name="object_um_DL_0067C0" Offset="0x67C0" /> <!-- pre-minigame pot? --> <Texture Name="object_um_TLUT_006AD0" OutName="tlut_006AD0" Format="rgba16" Width="16" Height="16" Offset="0x6AD0" /> - <Texture Name="object_um_Tex_006CD0" OutName="tex_006CD0" Format="ci8" Width="8" Height="8" Offset="0x6CD0" /> - <Texture Name="object_um_Tex_006D10" OutName="tex_006D10" Format="ci8" Width="32" Height="64" Offset="0x6D10" /> + <Texture Name="object_um_Tex_006CD0" OutName="tex_006CD0" Format="ci8" Width="8" Height="8" Offset="0x6CD0" TlutOffset="0x6AD0"/> + <Texture Name="object_um_Tex_006D10" OutName="tex_006D10" Format="ci8" Width="32" Height="64" Offset="0x6D10" TlutOffset="0x6AD0"/> <Texture Name="object_um_Tex_007510" OutName="tex_007510" Format="rgba16" Width="32" Height="32" Offset="0x7510" /> <TextureAnimation Name="object_um_Matanimheader_007D10" Offset="0x7D10" /> <!-- Empty TexAnim --> @@ -87,12 +87,12 @@ <Texture Name="object_um_TLUT_012ED0" OutName="tlut_012ED0" Format="rgba16" Width="16" Height="16" Offset="0x12ED0" /> <Texture Name="object_um_TLUT_0130D0" OutName="tlut_0130D0" Format="rgba16" Width="16" Height="16" Offset="0x130D0" /> <Texture Name="object_um_TLUT_0132D0" OutName="tlut_0132D0" Format="rgba16" Width="16" Height="16" Offset="0x132D0" /> - <Texture Name="object_um_Tex_0134D0" OutName="tex_0134D0" Format="ci8" Width="32" Height="32" Offset="0x134D0" /> - <Texture Name="object_um_Tex_0138D0" OutName="tex_0138D0" Format="ci8" Width="32" Height="32" Offset="0x138D0" /> + <Texture Name="object_um_Tex_0134D0" OutName="tex_0134D0" Format="ci8" Width="32" Height="32" Offset="0x134D0" TlutOffset="0x12CD0"/> + <Texture Name="object_um_Tex_0138D0" OutName="tex_0138D0" Format="ci8" Width="32" Height="32" Offset="0x138D0" TlutOffset="0x12CD0"/> <Texture Name="object_um_Tex_013CD0" OutName="tex_013CD0" Format="rgba16" Width="32" Height="32" Offset="0x13CD0" /> - <Texture Name="object_um_Tex_0144D0" OutName="tex_0144D0" Format="ci8" Width="32" Height="64" Offset="0x144D0" /> - <Texture Name="object_um_Tex_014CD0" OutName="tex_014CD0" Format="ci8" Width="32" Height="64" Offset="0x14CD0" /> - <Texture Name="object_um_Tex_0154D0" OutName="tex_0154D0" Format="ci8" Width="32" Height="64" Offset="0x154D0" /> + <Texture Name="object_um_Tex_0144D0" OutName="tex_0144D0" Format="ci8" Width="32" Height="64" Offset="0x144D0" TlutOffset="0x12CD0"/> + <Texture Name="object_um_Tex_014CD0" OutName="tex_014CD0" Format="ci8" Width="32" Height="64" Offset="0x14CD0" TlutOffset="0x12ED0"/> + <Texture Name="object_um_Tex_0154D0" OutName="tex_0154D0" Format="ci8" Width="32" Height="64" Offset="0x154D0" TlutOffset="0x12ED0"/> <Texture Name="object_um_Tex_015CD0" OutName="tex_015CD0" Format="rgba16" Width="32" Height="32" Offset="0x15CD0" /> <Texture Name="gUmCremiaEyeOpenTex" OutName="cremia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x164D0" TlutOffset="0x130D0" /> @@ -107,20 +107,20 @@ <Texture Name="gUmMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="16" Offset="0x180D0" TlutOffset="0x130D0" /> <Texture Name="gUmMouthHangingOpenTex" OutName="mouth_hanging_open" Format="ci8" Width="32" Height="16" Offset="0x182D0" TlutOffset="0x130D0" /> - <Texture Name="object_um_Tex_0184D0" OutName="tex_0184D0" Format="ci8" Width="8" Height="8" Offset="0x184D0" /> - <Texture Name="object_um_Tex_018510" OutName="tex_018510" Format="ci8" Width="16" Height="16" Offset="0x18510" /> - <Texture Name="object_um_Tex_018610" OutName="tex_018610" Format="ci8" Width="16" Height="16" Offset="0x18610" /> - <Texture Name="object_um_Tex_018710" OutName="tex_018710" Format="ci8" Width="8" Height="8" Offset="0x18710" /> - <Texture Name="object_um_Tex_018750" OutName="tex_018750" Format="ci8" Width="16" Height="16" Offset="0x18750" /> - <Texture Name="object_um_Tex_018850" OutName="tex_018850" Format="ci8" Width="16" Height="16" Offset="0x18850" /> - <Texture Name="object_um_Tex_018950" OutName="tex_018950" Format="ci8" Width="8" Height="16" Offset="0x18950" /> - <Texture Name="object_um_Tex_0189D0" OutName="tex_0189D0" Format="ci8" Width="8" Height="8" Offset="0x189D0" /> + <Texture Name="object_um_Tex_0184D0" OutName="tex_0184D0" Format="ci8" Width="8" Height="8" Offset="0x184D0" TlutOffset="0x130D0"/> + <Texture Name="object_um_Tex_018510" OutName="tex_018510" Format="ci8" Width="16" Height="16" Offset="0x18510" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_018610" OutName="tex_018610" Format="ci8" Width="16" Height="16" Offset="0x18610" TlutOffset="0x130D0"/> + <Texture Name="object_um_Tex_018710" OutName="tex_018710" Format="ci8" Width="8" Height="8" Offset="0x18710" TlutOffset="0x130D0"/> + <Texture Name="object_um_Tex_018750" OutName="tex_018750" Format="ci8" Width="16" Height="16" Offset="0x18750" TlutOffset="0x130D0"/> + <Texture Name="object_um_Tex_018850" OutName="tex_018850" Format="ci8" Width="16" Height="16" Offset="0x18850" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_018950" OutName="tex_018950" Format="ci8" Width="8" Height="16" Offset="0x18950" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_0189D0" OutName="tex_0189D0" Format="ci8" Width="8" Height="8" Offset="0x189D0" TlutOffset="0x132D0"/> <Texture Name="object_um_Tex_018A10" OutName="tex_018A10" Format="rgba16" Width="16" Height="32" Offset="0x18A10" /> - <Texture Name="object_um_Tex_018E10" OutName="tex_018E10" Format="ci8" Width="32" Height="16" Offset="0x18E10" /> - <Texture Name="object_um_Tex_019010" OutName="tex_019010" Format="ci8" Width="16" Height="32" Offset="0x19010" /> - <Texture Name="object_um_Tex_019210" OutName="tex_019210" Format="ci8" Width="16" Height="16" Offset="0x19210" /> - <Texture Name="object_um_Tex_019310" OutName="tex_019310" Format="ci8" Width="16" Height="32" Offset="0x19310" /> - <Texture Name="object_um_Tex_019510" OutName="tex_019510" Format="ci8" Width="64" Height="16" Offset="0x19510" /> + <Texture Name="object_um_Tex_018E10" OutName="tex_018E10" Format="ci8" Width="32" Height="16" Offset="0x18E10" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_019010" OutName="tex_019010" Format="ci8" Width="16" Height="32" Offset="0x19010" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_019210" OutName="tex_019210" Format="ci8" Width="16" Height="16" Offset="0x19210" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_019310" OutName="tex_019310" Format="ci8" Width="16" Height="32" Offset="0x19310" TlutOffset="0x132D0"/> + <Texture Name="object_um_Tex_019510" OutName="tex_019510" Format="ci8" Width="64" Height="16" Offset="0x19510" TlutOffset="0x132D0"/> <Animation Name="gUmIdleAnim" Offset="0x19E10" /> <!-- Original name is "um_wait" --> </File> </Root> diff --git a/assets/xml/objects/object_utubo.xml b/assets/xml/objects/object_utubo.xml index 4ce3d64f0..cef7d522c 100644 --- a/assets/xml/objects/object_utubo.xml +++ b/assets/xml/objects/object_utubo.xml @@ -19,10 +19,10 @@ <Texture Name="gDeepPythonHeadAndCollarTLUT" OutName="deep_python_head_and_collar_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E48" /> <Texture Name="gDeepPythonBodySegment1FrontTLUT" OutName="deep_python_body_segment_1_front_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E68" /> <Texture Name="gDeepPythonBodyTLUT" OutName="deep_python_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2E88" /> - <Texture Name="gDeepPythonHeadAndCollarTex" OutName="deep_python_head_and_collar" Format="ci4" Width="64" Height="64" Offset="0x2EA8" /> + <Texture Name="gDeepPythonHeadAndCollarTex" OutName="deep_python_head_and_collar" Format="ci4" Width="64" Height="64" Offset="0x2EA8" TlutOffset="0x2E48"/> <Texture Name="gDeepPythonEyeTex" OutName="deep_python_eye" Format="rgba16" Width="32" Height="32" Offset="0x36A8" /> - <Texture Name="gDeepPythonBodySegment1FrontTex" OutName="deep_python_body_segment_1_front" Format="ci4" Width="32" Height="32" Offset="0x3EA8" /> - <Texture Name="gDeepPythonBodyTex" OutName="deep_python_body" Format="ci4" Width="32" Height="32" Offset="0x40A8" /> + <Texture Name="gDeepPythonBodySegment1FrontTex" OutName="deep_python_body_segment_1_front" Format="ci4" Width="32" Height="32" Offset="0x3EA8" TlutOffset="0x2E68"/> + <Texture Name="gDeepPythonBodyTex" OutName="deep_python_body" Format="ci4" Width="32" Height="32" Offset="0x40A8" TlutOffset="0x2E88"/> <!-- Deep Python Limbs --> <Limb Name="gDeepPythonRootLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_ROOT" Offset="0x42A8" /> diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml index 0f6fe168b..3b1401576 100644 --- a/assets/xml/objects/object_warp1.xml +++ b/assets/xml/objects/object_warp1.xml @@ -72,8 +72,8 @@ <DList Name="gWarpBossWarpPlatformDL" Offset="0x76C0" /> <!-- Original name is "m2_BossWarp_model" --> <Texture Name="gWarpBossWarpPlatformBottomTLUT" OutName="warp_boss_warp_platform_bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x78A0" /> <Texture Name="gWarpBossWarpPlatformTopTLUT" OutName="warp_boss_warp_platform_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0x78C0" /> - <Texture Name="gWarpBossWarpPlatformBottomTex" OutName="warp_boss_warp_platform_bottom" Format="ci4" Width="64" Height="64" Offset="0x78E0" /> - <Texture Name="gWarpBossWarpPlatformTopTex" OutName="warp_boss_warp_platform_top" Format="ci4" Width="64" Height="64" Offset="0x80E0" /> + <Texture Name="gWarpBossWarpPlatformBottomTex" OutName="warp_boss_warp_platform_bottom" Format="ci4" Width="64" Height="64" Offset="0x78E0" TlutOffset="0x78A0"/> + <Texture Name="gWarpBossWarpPlatformTopTex" OutName="warp_boss_warp_platform_top" Format="ci4" Width="64" Height="64" Offset="0x80E0" TlutOffset="0x78C0"/> <Collision Name="gWarpBossWarpPlatformCol" Offset="0x8BD4" /> </File> </Root> diff --git a/assets/xml/objects/object_warp_uzu.xml b/assets/xml/objects/object_warp_uzu.xml index 2f7f013a9..7ff52c6b4 100644 --- a/assets/xml/objects/object_warp_uzu.xml +++ b/assets/xml/objects/object_warp_uzu.xml @@ -3,8 +3,8 @@ <DList Name="object_warp_uzu_DL_000EC0" Offset="0xEC0" /> <!-- Original name is "Y2_telescope_model" --> <Texture Name="object_warp_uzu_TLUT_0019D0" OutName="tlut_0019D0" Format="rgba16" Width="16" Height="16" Offset="0x19D0" /> <Texture Name="object_warp_uzu_Tex_001BD0" OutName="tex_001BD0" Format="rgba16" Width="16" Height="32" Offset="0x1BD0" /> - <Texture Name="object_warp_uzu_Tex_001FD0" OutName="tex_001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" /> - <Texture Name="object_warp_uzu_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" /> - <Texture Name="object_warp_uzu_Tex_002410" OutName="tex_002410" Format="ci8" Width="8" Height="8" Offset="0x2410" /> + <Texture Name="object_warp_uzu_Tex_001FD0" OutName="tex_001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x19D0"/> + <Texture Name="object_warp_uzu_Tex_002010" OutName="tex_002010" Format="ci8" Width="32" Height="32" Offset="0x2010" TlutOffset="0x19D0"/> + <Texture Name="object_warp_uzu_Tex_002410" OutName="tex_002410" Format="ci8" Width="8" Height="8" Offset="0x2410" TlutOffset="0x19D0"/> </File> </Root> diff --git a/assets/xml/objects/object_yb.xml b/assets/xml/objects/object_yb.xml index edecb571e..57b65300f 100644 --- a/assets/xml/objects/object_yb.xml +++ b/assets/xml/objects/object_yb.xml @@ -27,14 +27,14 @@ <DList Name="gYbLeftForearmDL" Offset="0x4EC0" /> <DList Name="gYbLeftHandDL" Offset="0x4FE0" /> <Texture Name="gYbTLUT" OutName="yb_tlut" Format="rgba16" Width="16" Height="16" Offset="0x51B8" /> - <Texture Name="gYbForeheadBlotchTex" OutName="yb_forhead_blotch" Format="ci8" Width="8" Height="8" Offset="0x53B8" /> - <Texture Name="gYbPonytailTex" OutName="yb_ponytail" Format="ci8" Width="8" Height="16" Offset="0x53F8" /> - <Texture Name="gYbFingersTex" OutName="yb_fingers" Format="ci8" Width="16" Height="16" Offset="0x5478" /> - <Texture Name="gYbToesTex" OutName="yb_toes" Format="ci8" Width="16" Height="16" Offset="0x5578" /> - <Texture Name="gYbHairlineTex" OutName="yb_hairline" Format="ci8" Width="16" Height="16" Offset="0x5678" /> - <Texture Name="gYbBellybuttonTex" OutName="yb_bellybutton" Format="ci8" Width="8" Height="16" Offset="0x5778" /> - <Texture Name="gYbNoseTex" OutName="yb_nose" Format="ci8" Width="16" Height="16" Offset="0x57F8" /> - <Texture Name="gYbEyeTex" OutName="yb_eye" Format="ci8" Width="32" Height="32" Offset="0x58F8" /> + <Texture Name="gYbForeheadBlotchTex" OutName="yb_forhead_blotch" Format="ci8" Width="8" Height="8" Offset="0x53B8" TlutOffset="0x51B8"/> + <Texture Name="gYbPonytailTex" OutName="yb_ponytail" Format="ci8" Width="8" Height="16" Offset="0x53F8" TlutOffset="0x51B8"/> + <Texture Name="gYbFingersTex" OutName="yb_fingers" Format="ci8" Width="16" Height="16" Offset="0x5478" TlutOffset="0x51B8"/> + <Texture Name="gYbToesTex" OutName="yb_toes" Format="ci8" Width="16" Height="16" Offset="0x5578" TlutOffset="0x51B8"/> + <Texture Name="gYbHairlineTex" OutName="yb_hairline" Format="ci8" Width="16" Height="16" Offset="0x5678" TlutOffset="0x51B8"/> + <Texture Name="gYbBellybuttonTex" OutName="yb_bellybutton" Format="ci8" Width="8" Height="16" Offset="0x5778" TlutOffset="0x51B8"/> + <Texture Name="gYbNoseTex" OutName="yb_nose" Format="ci8" Width="16" Height="16" Offset="0x57F8" TlutOffset="0x51B8"/> + <Texture Name="gYbEyeTex" OutName="yb_eye" Format="ci8" Width="32" Height="32" Offset="0x58F8" TlutOffset="0x51B8"/> <Texture Name="gYbPantsTex" OutName="yb_pants" Format="i8" Width="16" Height="16" Offset="0x5CF8" /> <!-- some limbs wont highlight in z64utils, some guesswork here --> <Limb Name="gYbMainRootLimb" Type="Standard" EnumName="YB_LIMB_MAIN_ROOT" Offset="0x5DF8" /> diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml index 1632cec91..17224f5ea 100644 --- a/assets/xml/objects/object_zl4.xml +++ b/assets/xml/objects/object_zl4.xml @@ -6,24 +6,24 @@ <Texture Name="gDmZl4DressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x670" /> <Texture Name="gDmZl4EyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x870" /> <Texture Name="gDmZl4MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA70" /> - <Texture Name="gDmZl4DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0xC70" /> - <Texture Name="gDmZl4DressPurpleTex" OutName="purple_dress_patern" Format="ci8" Width="16" Height="16" Offset="0xCB0" /> - <Texture Name="gDmZl4TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0xDB0" /> + <Texture Name="gDmZl4DressGradientTex" OutName="dress_gradient" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670"/> + <Texture Name="gDmZl4DressPurpleTex" OutName="purple_dress_patern" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670"/> + <Texture Name="gDmZl4TriforceSashTex" OutName="triforce_sash" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670"/> <Texture Name="gDmZl4BootLacesTex" OutName="boot_laces" Format="rgba16" Width="8" Height="8" Offset="0x15B0" /> <Texture Name="gDmZl4BootTex" OutName="boot" Format="rgba16" Width="8" Height="8" Offset="0x1630" /> - <Texture Name="gDmZl4AltDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x16B0" /> - <Texture Name="gDmZl4AltDressTex" OutName="alternate_dress_patern" Format="ci8" Width="8" Height="8" Offset="0x17B0" /> - <Texture Name="gDmZl4DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x17F0" /> + <Texture Name="gDmZl4AltDressBeltTex" OutName="alternate_dress_belt" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670"/> + <Texture Name="gDmZl4AltDressTex" OutName="alternate_dress_patern" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670"/> + <Texture Name="gDmZl4DressWrinklesTex" OutName="dress_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670"/> <Texture Name="gDmZl4AltDressLiningTex" OutName="alternate_dress_lining" Format="rgba16" Width="8" Height="16" Offset="0x1BF0" /> - <Texture Name="gDmZl4AltDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x1CF0" /> + <Texture Name="gDmZl4AltDressGradientTex" OutName="alternate_dress_gradient" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670"/> <!-- not named in OOT, some blue blemish center --> - <Texture Name="gDmZl4_001DF0_Tex" OutName="tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" /> + <Texture Name="gDmZl4_001DF0_Tex" OutName="tex_001DF0" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670"/> <Texture Name="gDmZl4HeadressTriforceEmblemTex" OutName="headdress_triforce_emblem" Format="rgba16" Width="16" Height="32" Offset="0x1E30" /> - <Texture Name="gDmZl4HeadressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x2230" /> + <Texture Name="gDmZl4HeadressGradientTex" OutName="headdress_gradient" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670"/> <!-- not named in OOT, gradient with dark blotch bottom--> - <Texture Name="gDmZl4_002270_Tex" OutName="tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" /> - <Texture Name="gDmZl4HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0x22F0" /> + <Texture Name="gDmZl4_002270_Tex" OutName="tex_002270" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670"/> + <Texture Name="gDmZl4HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670"/> <Texture Name="gDmZl4EarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x24F0" /> <Texture Name="gDmZl4HairOnSideTex" OutName="hair_on_side" Format="rgba16" Width="16" Height="16" Offset="0x26F0" /> <Texture Name="gDmZl4SkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x28F0" /> @@ -47,11 +47,11 @@ <Texture Name="gZl4MouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x52F0" TlutOffset="0xA70"/> <Texture Name="gDmZl4FingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x56F0" /> - <Texture Name="gDmZl4BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x58F0" /> + <Texture Name="gDmZl4BraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670"/> <Texture Name="gDmZl4BlueUndershirtGradient1Tex" OutName="blue_undershirt_gradient" Format="rgba16" Width="8" Height="8" Offset="0x59F0" /> <Texture Name="gDmZl4BlueUndershirtGradient2Tex" OutName="blue_undershirt_gradient_2" Format="rgba16" Width="16" Height="16" Offset="0x5A70" /> - <Texture Name="gDmZl4StripedShoulderTex" OutName="striped_shoulder_patern" Format="ci8" Width="8" Height="8" Offset="0x5C70" /> - <Texture Name="gDmZl4UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x5CB0" /> + <Texture Name="gDmZl4StripedShoulderTex" OutName="striped_shoulder_patern" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670"/> + <Texture Name="gDmZl4UndershirtWrinklesTex" OutName="undershirt_wrinkles" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670"/> <Texture Name="gDmZl4PendantTex" OutName="pendant" Format="rgba16" Width="32" Height="32" Offset="0x5DB0" /> <DList Name="gDmZl4ChestDL" Offset="0xA630" /> diff --git a/assets/xml/objects/object_zm.xml b/assets/xml/objects/object_zm.xml index 61163d50b..bbfbad1d1 100644 --- a/assets/xml/objects/object_zm.xml +++ b/assets/xml/objects/object_zm.xml @@ -25,17 +25,17 @@ <DList Name="object_zm_DL_007E60" Offset="0x7E60" /> <DList Name="object_zm_DL_007F80" Offset="0x7F80" /> <Texture Name="object_zm_TLUT_0080A8" OutName="tlut_0080A8" Format="rgba16" Width="16" Height="16" Offset="0x80A8" /> - <Texture Name="object_zm_Tex_0082A8" OutName="tex_0082A8" Format="ci8" Width="8" Height="8" Offset="0x82A8" /> - <Texture Name="object_zm_Tex_0082E8" OutName="tex_0082E8" Format="ci8" Width="32" Height="32" Offset="0x82E8" /> - <Texture Name="object_zm_Tex_0086E8" OutName="tex_0086E8" Format="ci8" Width="32" Height="32" Offset="0x86E8" /> + <Texture Name="object_zm_Tex_0082A8" OutName="tex_0082A8" Format="ci8" Width="8" Height="8" Offset="0x82A8" TlutOffset="0x80A8"/> + <Texture Name="object_zm_Tex_0082E8" OutName="tex_0082E8" Format="ci8" Width="32" Height="32" Offset="0x82E8" TlutOffset="0x80A8"/> + <Texture Name="object_zm_Tex_0086E8" OutName="tex_0086E8" Format="ci8" Width="32" Height="32" Offset="0x86E8" TlutOffset="0x80A8"/> <Texture Name="gTotoEyesOpenTex" OutName="toto_eyes_open" Format="ci8" Width="32" Height="32" Offset="0x8AE8" TlutOffset="0x80A8" /> - <Texture Name="object_zm_Tex_008EE8" OutName="tex_008EE8" Format="ci8" Width="16" Height="16" Offset="0x8EE8" /> + <Texture Name="object_zm_Tex_008EE8" OutName="tex_008EE8" Format="ci8" Width="16" Height="16" Offset="0x8EE8" TlutOffset="0x80A8"/> <Texture Name="object_zm_Tex_008FE8" OutName="tex_008FE8" Format="rgba16" Width="32" Height="32" Offset="0x8FE8" /> <Texture Name="object_zm_Tex_0097E8" OutName="tex_0097E8" Format="rgba16" Width="8" Height="8" Offset="0x97E8" /> - <Texture Name="object_zm_Tex_009868" OutName="tex_009868" Format="ci8" Width="16" Height="16" Offset="0x9868" /> - <Texture Name="object_zm_Tex_009968" OutName="tex_009968" Format="ci8" Width="16" Height="16" Offset="0x9968" /> + <Texture Name="object_zm_Tex_009868" OutName="tex_009868" Format="ci8" Width="16" Height="16" Offset="0x9868" TlutOffset="0x80A8"/> + <Texture Name="object_zm_Tex_009968" OutName="tex_009968" Format="ci8" Width="16" Height="16" Offset="0x9968" TlutOffset="0x80A8"/> <Texture Name="object_zm_Tex_009A68" OutName="tex_009A68" Format="rgba16" Width="16" Height="16" Offset="0x9A68" /> - <Texture Name="object_zm_Tex_009C68" OutName="tex_009C68" Format="ci8" Width="32" Height="32" Offset="0x9C68" /> + <Texture Name="object_zm_Tex_009C68" OutName="tex_009C68" Format="ci8" Width="32" Height="32" Offset="0x9C68" TlutOffset="0x80A8"/> <Texture Name="gTotoEyesHalfTex" OutName="toto_eyes_half" Format="ci8" Width="32" Height="32" Offset="0xA068" TlutOffset="0x80A8" /> <Texture Name="gTotoEyesClosedTex" OutName="toto_eyes_closed" Format="ci8" Width="32" Height="32" Offset="0xA468" TlutOffset="0x80A8" /> <Limb Name="object_zm_Standardlimb_00A868" Type="Standard" EnumName="OBJECT_ZM_LIMB_01" Offset="0xA868" /> diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml index 66f665de8..5399e7642 100644 --- a/assets/xml/objects/object_zo.xml +++ b/assets/xml/objects/object_zo.xml @@ -23,15 +23,15 @@ <!-- Textures --> <Texture Name="gZoraTLUT" OutName="zora_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4260" /> - <Texture Name="gZoraFinTex" OutName="zora_fin" Format="ci8" Width="32" Height="32" Offset="0x4460" /> - <Texture Name="gZoraBackAndHeadTailTex" OutName="zora_back_head_tail" Format="ci8" Width="32" Height="64" Offset="0x4860" /> - <Texture Name="gZoraSkinTex" OutName="zora_skin" Format="ci8" Width="8" Height="8" Offset="0x5060" /> + <Texture Name="gZoraFinTex" OutName="zora_fin" Format="ci8" Width="32" Height="32" Offset="0x4460" TlutOffset="0x4260"/> + <Texture Name="gZoraBackAndHeadTailTex" OutName="zora_back_head_tail" Format="ci8" Width="32" Height="64" Offset="0x4860" TlutOffset="0x4260"/> + <Texture Name="gZoraSkinTex" OutName="zora_skin" Format="ci8" Width="8" Height="8" Offset="0x5060" TlutOffset="0x4260"/> <Texture Name="gZoraEyeOpenTex" OutName="zora_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x50A0" /> <Texture Name="gZoraEyeHalfTex" OutName="zora_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x58A0" /> <Texture Name="gZoraEyeClosedTex" OutName="zora_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x60A0" /> <Texture Name="gZoraMouthTex" OutName="zora_mouth" Format="rgba16" Width="32" Height="32" Offset="0x68A0" /> - <Texture Name="gZoraHandTex" OutName="zora_hand" Format="ci8" Width="16" Height="16" Offset="0x70A0" /> - <Texture Name="gZoraKneeTex" OutName="zora_knee" Format="ci8" Width="8" Height="8" Offset="0x71A0" /> + <Texture Name="gZoraHandTex" OutName="zora_hand" Format="ci8" Width="16" Height="16" Offset="0x70A0" TlutOffset="0x4260"/> + <Texture Name="gZoraKneeTex" OutName="zora_knee" Format="ci8" Width="8" Height="8" Offset="0x71A0" TlutOffset="0x4260"/> <!-- DLists --> <DList Name="gZoraPelvisDL" Offset="0xA2A0" /> diff --git a/assets/xml/objects/object_zob.xml b/assets/xml/objects/object_zob.xml index 54ed45136..85b6f603d 100644 --- a/assets/xml/objects/object_zob.xml +++ b/assets/xml/objects/object_zob.xml @@ -32,12 +32,12 @@ <DList Name="object_zob_DL_00CB98" Offset="0xCB98" /> <Texture Name="object_zob_TLUT_00CE20" OutName="tlut_00CE20" Format="rgba16" Width="16" Height="16" Offset="0xCE20" /> <Texture Name="object_zob_TLUT_00D020" OutName="tlut_00D020" Format="rgba16" Width="16" Height="16" Offset="0xD020" /> - <Texture Name="object_zob_Tex_00D220" OutName="tex_00D220" Format="ci8" Width="8" Height="8" Offset="0xD220" /> - <Texture Name="object_zob_Tex_00D260" OutName="tex_00D260" Format="ci8" Width="32" Height="32" Offset="0xD260" /> + <Texture Name="object_zob_Tex_00D220" OutName="tex_00D220" Format="ci8" Width="8" Height="8" Offset="0xD220" TlutOffset="0xCE20"/> + <Texture Name="object_zob_Tex_00D260" OutName="tex_00D260" Format="ci8" Width="32" Height="32" Offset="0xD260" TlutOffset="0xCE20"/> <Texture Name="object_zob_Tex_00D660" OutName="tex_00D660" Format="rgba16" Width="16" Height="16" Offset="0xD660" /> <Texture Name="object_zob_Tex_00D860" OutName="tex_00D860" Format="rgba16" Width="16" Height="16" Offset="0xD860" /> <Texture Name="object_zob_Tex_00DA60" OutName="tex_00DA60" Format="rgba16" Width="32" Height="32" Offset="0xDA60" /> - <Texture Name="object_zob_Tex_00E260" OutName="tex_00E260" Format="ci8" Width="8" Height="8" Offset="0xE260" /> + <Texture Name="object_zob_Tex_00E260" OutName="tex_00E260" Format="ci8" Width="8" Height="8" Offset="0xE260" TlutOffset="0xD020"/> <Texture Name="object_zob_Tex_00E2A0" OutName="tex_00E2A0" Format="rgba16" Width="32" Height="32" Offset="0xE2A0" /> <Texture Name="object_zob_Tex_00EAA0" OutName="tex_00EAA0" Format="rgba16" Width="32" Height="32" Offset="0xEAA0" /> <Texture Name="object_zob_Tex_00F2A0" OutName="tex_00F2A0" Format="rgba16" Width="32" Height="32" Offset="0xF2A0" /> diff --git a/assets/xml/objects/object_zog.xml b/assets/xml/objects/object_zog.xml index b3f93fde7..c13229854 100644 --- a/assets/xml/objects/object_zog.xml +++ b/assets/xml/objects/object_zog.xml @@ -63,17 +63,17 @@ <DList Name="object_zog_DL_0224E8" Offset="0x224E8" /> <Texture Name="object_zog_TLUT_022790" OutName="tlut_022790" Format="rgba16" Width="16" Height="16" Offset="0x22790" /> <Texture Name="object_zog_TLUT_022990" OutName="tlut_022990" Format="rgba16" Width="16" Height="16" Offset="0x22990" /> - <Texture Name="object_zog_Tex_022B90" OutName="tex_022B90" Format="ci8" Width="8" Height="8" Offset="0x22B90" /> - <Texture Name="object_zog_Tex_022BD0" OutName="tex_022BD0" Format="ci8" Width="32" Height="32" Offset="0x22BD0" /> - <Texture Name="object_zog_Tex_022FD0" OutName="tex_022FD0" Format="ci8" Width="32" Height="32" Offset="0x22FD0" /> + <Texture Name="object_zog_Tex_022B90" OutName="tex_022B90" Format="ci8" Width="8" Height="8" Offset="0x22B90" TlutOffset="0x22790"/> + <Texture Name="object_zog_Tex_022BD0" OutName="tex_022BD0" Format="ci8" Width="32" Height="32" Offset="0x22BD0" TlutOffset="0x22790"/> + <Texture Name="object_zog_Tex_022FD0" OutName="tex_022FD0" Format="ci8" Width="32" Height="32" Offset="0x22FD0" TlutOffset="0x22990"/> <Texture Name="object_zog_Tex_0233D0" OutName="tex_0233D0" Format="rgba16" Width="16" Height="16" Offset="0x233D0" /> - <Texture Name="object_zog_Tex_0235D0" OutName="tex_0235D0" Format="ci8" Width="32" Height="64" Offset="0x235D0" /> - <Texture Name="object_zog_Tex_023DD0" OutName="tex_023DD0" Format="ci8" Width="8" Height="16" Offset="0x23DD0" /> + <Texture Name="object_zog_Tex_0235D0" OutName="tex_0235D0" Format="ci8" Width="32" Height="64" Offset="0x235D0" TlutOffset="0x22790"/> + <Texture Name="object_zog_Tex_023DD0" OutName="tex_023DD0" Format="ci8" Width="8" Height="16" Offset="0x23DD0" TlutOffset="0x22790"/> <Texture Name="object_zog_Tex_023E50" OutName="tex_023E50" Format="rgba16" Width="16" Height="16" Offset="0x23E50" /> - <Texture Name="object_zog_Tex_024050" OutName="tex_024050" Format="ci8" Width="16" Height="16" Offset="0x24050" /> + <Texture Name="object_zog_Tex_024050" OutName="tex_024050" Format="ci8" Width="16" Height="16" Offset="0x24050" TlutOffset="0x22790"/> <Texture Name="object_zog_Tex_024150" OutName="tex_024150" Format="rgba16" Width="16" Height="16" Offset="0x24150" /> - <Texture Name="object_zog_Tex_024350" OutName="tex_024350" Format="ci8" Width="16" Height="32" Offset="0x24350" /> - <Texture Name="object_zog_Tex_024550" OutName="tex_024550" Format="ci8" Width="16" Height="32" Offset="0x24550" /> + <Texture Name="object_zog_Tex_024350" OutName="tex_024350" Format="ci8" Width="16" Height="32" Offset="0x24350" TlutOffset="0x22790"/> + <Texture Name="object_zog_Tex_024550" OutName="tex_024550" Format="ci8" Width="16" Height="32" Offset="0x24550" TlutOffset="0x22790"/> <Texture Name="object_zog_Tex_024750" OutName="tex_024750" Format="rgba16" Width="32" Height="32" Offset="0x24750" /> <Texture Name="object_zog_Tex_024F50" OutName="tex_024F50" Format="rgba16" Width="32" Height="32" Offset="0x24F50" /> <Texture Name="object_zog_Tex_025750" OutName="tex_025750" Format="rgba16" Width="32" Height="32" Offset="0x25750" /> diff --git a/assets/xml/objects/object_zoraegg.xml b/assets/xml/objects/object_zoraegg.xml index 3fc2e8375..1dc6c0d5f 100644 --- a/assets/xml/objects/object_zoraegg.xml +++ b/assets/xml/objects/object_zoraegg.xml @@ -15,11 +15,11 @@ <!-- Zora Baby Textures --> <Texture Name="gZoraBabyTLUT" OutName="zora_baby_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" /> - <Texture Name="gZoraBabyTailFinTex" OutName="zora_baby_tail_fin" Format="ci8" Width="32" Height="32" Offset="0x2FF0" /> - <Texture Name="gZoraBabySkinTex" OutName="zora_baby_skin" Format="ci8" Width="8" Height="8" Offset="0x33F0" /> + <Texture Name="gZoraBabyTailFinTex" OutName="zora_baby_tail_fin" Format="ci8" Width="32" Height="32" Offset="0x2FF0" TlutOffset="0x2DF0"/> + <Texture Name="gZoraBabySkinTex" OutName="zora_baby_skin" Format="ci8" Width="8" Height="8" Offset="0x33F0" TlutOffset="0x2DF0"/> <Texture Name="gZoraBabyEyeOpenTex" OutName="zora_baby_eye_open" Format="ci8" Width="32" Height="32" Offset="0x3430" /> - <Texture Name="gZoraBabySkinPatternTex" OutName="zora_baby_skin_pattern" Format="ci8" Width="32" Height="64" Offset="0x3830" /> - <Texture Name="gZoraBabyPectoralFinTex" OutName="zora_baby_pectoral_fin" Format="ci8" Width="32" Height="32" Offset="0x4030" /> + <Texture Name="gZoraBabySkinPatternTex" OutName="zora_baby_skin_pattern" Format="ci8" Width="32" Height="64" Offset="0x3830" TlutOffset="0x2DF0"/> + <Texture Name="gZoraBabyPectoralFinTex" OutName="zora_baby_pectoral_fin" Format="ci8" Width="32" Height="32" Offset="0x4030" TlutOffset="0x2DF0"/> <Texture Name="gZoraBabyEyeHalfTex" OutName="zora_baby_eye_half" Format="ci8" Width="32" Height="32" Offset="0x4430" /> <Texture Name="gZoraBabyEyeClosedTex" OutName="zora_baby_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4830" /> @@ -43,6 +43,6 @@ <!-- Zora Egg --> <DList Name="gZoraEggDL" Offset="0x5250" /> <Texture Name="gZoraEggTLUT" OutName="zora_egg_tlut" Format="rgba16" Width="16" Height="16" Offset="0x53B0" /> - <Texture Name="gZoraEggTex" OutName="zora_egg" Format="ci8" Width="32" Height="32" Offset="0x55B0" /> + <Texture Name="gZoraEggTex" OutName="zora_egg" Format="ci8" Width="32" Height="32" Offset="0x55B0" TlutOffset="0x53B0"/> </File> </Root> diff --git a/assets/xml/objects/object_zos.xml b/assets/xml/objects/object_zos.xml index 5b3b12345..861f1fa57 100644 --- a/assets/xml/objects/object_zos.xml +++ b/assets/xml/objects/object_zos.xml @@ -34,7 +34,7 @@ <!-- Evan Textures --> <Texture Name="gEvanFingersTLUT" OutName="evan_fingers_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF018" /> <Texture Name="gEvanSpottedSkinTex" OutName="evan_spotted_skin" Format="rgba16" Width="32" Height="32" Offset="0xF218" /> - <Texture Name="gEvanFingersTex" OutName="evan_fingers" Format="ci8" Width="16" Height="16" Offset="0xFA18" /> + <Texture Name="gEvanFingersTex" OutName="evan_fingers" Format="ci8" Width="16" Height="16" Offset="0xFA18" TlutOffset="0xF018"/> <Texture Name="gEvanMouthEdgeTex" OutName="evan_mouth_edge" Format="rgba16" Width="8" Height="8" Offset="0xFB18" /> <Texture Name="gEvanMouthAndFinsTex" OutName="evan_mouth_and_fins" Format="rgba16" Width="8" Height="8" Offset="0xFB98" /> <Texture Name="gEvanSkinTex" OutName="evan_skin" Format="rgba16" Width="8" Height="8" Offset="0xFC18" /> diff --git a/assets/xml/objects/object_zov.xml b/assets/xml/objects/object_zov.xml index d90bea119..db081e79b 100644 --- a/assets/xml/objects/object_zov.xml +++ b/assets/xml/objects/object_zov.xml @@ -42,25 +42,25 @@ <!-- Lulu Textures --> <Texture Name="gLuluTLUT" OutName="lulu_tlut" Format="rgba16" Width="16" Height="16" Offset="0x13278" /> <Texture Name="gLuluEarringTex" OutName="lulu_earring" Format="rgba16" Width="8" Height="16" Offset="0x13478" /> - <Texture Name="gLuluSkinTex" OutName="lulu_skin" Format="ci8" Width="8" Height="8" Offset="0x13578" /> - <Texture Name="gLuluNostrilTex" OutName="lulu_nostril" Format="ci8" Width="8" Height="8" Offset="0x135B8" /> + <Texture Name="gLuluSkinTex" OutName="lulu_skin" Format="ci8" Width="8" Height="8" Offset="0x13578" TlutOffset="0x13278"/> + <Texture Name="gLuluNostrilTex" OutName="lulu_nostril" Format="ci8" Width="8" Height="8" Offset="0x135B8" TlutOffset="0x13278"/> <Texture Name="gLuluMouthClosedTex" OutName="lulu_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x135F8" /> - <Texture Name="gLuluHeadSkinTex" OutName="lulu_head_skin" Format="ci8" Width="16" Height="16" Offset="0x139F8" /> - <Texture Name="gLuluEarCavityTex" OutName="lulu_ear_cavity" Format="ci8" Width="8" Height="8" Offset="0x13AF8" /> - <Texture Name="gLuluHeadHoleTex" OutName="lulu_head_hole" Format="ci8" Width="16" Height="16" Offset="0x13B38" /> + <Texture Name="gLuluHeadSkinTex" OutName="lulu_head_skin" Format="ci8" Width="16" Height="16" Offset="0x139F8" TlutOffset="0x13278"/> + <Texture Name="gLuluEarCavityTex" OutName="lulu_ear_cavity" Format="ci8" Width="8" Height="8" Offset="0x13AF8" TlutOffset="0x13278"/> + <Texture Name="gLuluHeadHoleTex" OutName="lulu_head_hole" Format="ci8" Width="16" Height="16" Offset="0x13B38" TlutOffset="0x13278"/> <Texture Name="gLuluEyeOpenTex" OutName="lulu_eye_open" Format="ci8" Width="32" Height="32" Offset="0x13C38" /> - <Texture Name="gLuluEarTex" OutName="lulu_ear" Format="ci8" Width="16" Height="16" Offset="0x14038" /> + <Texture Name="gLuluEarTex" OutName="lulu_ear" Format="ci8" Width="16" Height="16" Offset="0x14038" TlutOffset="0x13278"/> <Texture Name="gLuluEyeClosedTex" OutName="lulu_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x14138" /> <Texture Name="gLuluMouthOpenTex" OutName="lulu_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x14538" /> - <Texture Name="gLuluSpottedSkinTex" OutName="lulu_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x14938" /> + <Texture Name="gLuluSpottedSkinTex" OutName="lulu_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x14938" TlutOffset="0x13278"/> <Texture Name="gLuluMouthOpenFullTex" OutName="lulu_mouth_open_full" Format="ci8" Width="32" Height="32" Offset="0x14D38" /> <Texture Name="gLuluEyeHalfTex" OutName="lulu_eye_half" Format="ci8" Width="32" Height="32" Offset="0x15138" /> - <Texture Name="gLuluSkinShadowTex" OutName="lulu_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x15538" /> - <Texture Name="gLuluKneeAndElbowTex" OutName="lulu_knee_and_elbow" Format="ci8" Width="16" Height="16" Offset="0x15578" /> - <Texture Name="gLuluFingersTex" OutName="lulu_fingers" Format="ci8" Width="16" Height="16" Offset="0x15678" /> + <Texture Name="gLuluSkinShadowTex" OutName="lulu_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x15538" TlutOffset="0x13278"/> + <Texture Name="gLuluKneeAndElbowTex" OutName="lulu_knee_and_elbow" Format="ci8" Width="16" Height="16" Offset="0x15578" TlutOffset="0x13278"/> + <Texture Name="gLuluFingersTex" OutName="lulu_fingers" Format="ci8" Width="16" Height="16" Offset="0x15678" TlutOffset="0x13278"/> <Texture Name="gLuluDressPatternTex" OutName="lulu_dress_pattern" Format="rgba16" Width="32" Height="32" Offset="0x15778" /> - <Texture Name="gLuluDressStringTex" OutName="lulu_dress_string" Format="ci8" Width="16" Height="16" Offset="0x15F78" /> - <Texture Name="gLuluDressLoopTex" OutName="lulu_dress_loop" Format="ci8" Width="8" Height="16" Offset="0x16078" /> + <Texture Name="gLuluDressStringTex" OutName="lulu_dress_string" Format="ci8" Width="16" Height="16" Offset="0x15F78" TlutOffset="0x13278"/> + <Texture Name="gLuluDressLoopTex" OutName="lulu_dress_loop" Format="ci8" Width="8" Height="16" Offset="0x16078" TlutOffset="0x13278"/> <!-- Lulu Limbs and Skeleton --> <Limb Name="gLuluRootLimb" Type="Standard" EnumName="LULU_LIMB_ROOT" Offset="0x160F8" /> |