mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixup asset XMLs (#1363)

Browse Source 
* Some TlutOffset stuff

* make unknown-format texture I8

* Fix object_ani TLUT stuff

* Add some missing `TlutOffset`

* object_owl eyes TLUTs

* fix dims and TlutOffset on unused mido textures

* Add missing `TlutOffset`
This commit is contained in:
Dragorn421 2022-08-28 16:34:49 +02:00 committed by GitHub
parent 20b90a633b
commit 0aaf858df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/xml/objects/object_ani.xml
View File

@ -37,9 +37,9 @@
<DList Name="gRoofManRightHandDL" Offset="0x4A68"/>
<DList Name="gRoofManHeadDL" Offset="0x2CD8"/>
<!-- Kakariko Roof Man Palettes --> <!-- There's something weird going on with the TLUTs here... -->
<!-- Kakariko Roof Man Palettes -->
<Texture Name="gRoofMan1TLUT" OutName="roof_man_1_tlut" Format="rgba16" Width="16" Height="16" Offset="0x00108"/>
<Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="ci8" Width="16" Height="16" Offset="0x1088"/>
<Texture Name="gRoofMan2TLUT" OutName="roof_man_2_tlut" Format="rgba16" Width="21" Height="8" Offset="0x1088"/>
<!-- Roof Man DisplayList Textures -->
<Texture Name="gRoofManHandBackTex" OutName="roof_man_hand_back" Format="ci8" Width="16" Height="16" Offset="0x00C08" TlutOffset="0x00108"/>
@ -47,9 +47,9 @@
<Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
<Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
<Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
<Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8"/>
<Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318"/>
<Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418"/>
<Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
<Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
<Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
<!-- Kakariko Roof Man Eye Textures -->

6
assets/xml/objects/object_md.xml
View File

@ -51,10 +51,10 @@
<Texture Name="gMidoEyeLookingUpTex" OutName="mido_eye_looking_up" Format="rgba16" Width="32" Height="32" Offset="0x520"/>
<!-- Mido DisplayList Textures -->
<Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0"/>
<Texture Name="gMidoGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x4E0" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_D20" OutName="tex_D20" Format="rgba16" Width="8" Height="8" Offset="0xD20"/>
<Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="32" Height="4" Offset="0xDA0"/>
<Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20"/>
<Texture Name="gMidoTex_DA0" OutName="tex_DA0" Format="ci8" Width="8" Height="16" Offset="0xDA0" TlutOffset="0x02E0"/>
<Texture Name="gMidoHairCurl1Tex" OutName="hair_curl_1" Format="ci8" Width="32" Height="32" Offset="0xE20" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_1220" OutName="tex_1220" Format="ci8" Width="8" Height="8" Offset="0x1220" TlutOffset="0x02E0"/>
<Texture Name="gMidoTex_1260" OutName="tex_1260" Format="ci8" Width="8" Height="8" Offset="0x1260" TlutOffset="0x02E0"/>
<Texture Name="gMidoBackOfHandTex" OutName="back_of_hand" Format="ci8" Width="8" Height="8" Offset="0x12A0" TlutOffset="0x02E0"/>

14
assets/xml/objects/object_oF1d_map.xml
View File

@ -21,15 +21,17 @@
<Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
<Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
<!-- Eye textures -->
<Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80"/>
<Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280"/>
<Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680"/>
<Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80"/>
<Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
<Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
<Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
<Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
<!-- Mouth textures -->
<Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80"/>
<Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680"/>
<Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
<Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
</File>
</Root>

12
assets/xml/objects/object_owl.xml
View File

@ -57,9 +57,15 @@
<!-- Owl Perching Skeleton -->
<Skeleton Name="gOwlPerchingSkel" Type="Flex" LimbType="Standard" Offset="0x100B0"/>
<!-- The two following TLUTs are identical and both are used as TLUTs for the eye textures -->
<!-- TLUT used in gOwlPerchingSkel -->
<Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
<!-- TLUT used in gOwlFlyingSkel -->
<Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
<!-- Eye Textures -->
<Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8"/>
<Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8"/>
<Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8"/>
<Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
<Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
<Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
</File>
</Root>

4
assets/xml/objects/object_rl.xml
View File

@ -18,8 +18,8 @@
<Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
<Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
<Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>

4
assets/xml/objects/object_shop_dungen.xml
View File

@ -2,8 +2,8 @@
<File Name="object_shop_dungen" Segment="6">
<DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
<Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgba16" Width="16" Height="1" Offset="0xDE0"/>
<Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
<Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
<Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08" TlutOffset="0xDE0"/>
<Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608" TlutOffset="0xDE0"/>
<DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
<Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgba16" Width="64" Height="32" Offset="0x2A20"/>
</File>

2
assets/xml/objects/object_tk.xml
View File

@ -7,7 +7,7 @@
<Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
<Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
<Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
<Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
<Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540" TlutOffset="0x3780"/>
<DList Name="gDampeShovelDL" Offset="0xACE0"/>
<DList Name="gDampeLanternDL" Offset="0xB838"/>
<DList Name="gDampeHaloDL" Offset="0xBBA0"/>

9
assets/xml/objects/object_xc.xml
View File

@ -8,6 +8,7 @@
<Animation Name="gSheikPlayingHarp3Anim" Offset="0x35C8"/>
<Animation Name="gSheikPlayingHarp4Anim" Offset="0x4570"/>
<Animation Name="gSheikIdleAnim" Offset="0x4828"/>
<Texture Name="object_xc_TLUT_004A40" OutName="tlut_00004A40" Format="rgba16" Width="16" Height="16" Offset="0x4A40"/>
<Animation Name="gSheikWalkingAnim" Offset="0x12FD0"/>
<Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x13AA4"/>
<Animation Name="gSheikFallingFromContortionsAnim" Offset="0x149E4"/>
@ -21,10 +22,10 @@
<Animation Name="gSheikAnim_01A048" Offset="0x1A048"/>
<Animation Name="gSheikPullingOutHarpAnim" Offset="0x1B19C"/>
<Animation Name="gSheikFallingFromSkyAnim" Offset="0x1C0E8"/>
<Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4CC0"/>
<Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x50C0"/>
<Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x54C0"/>
<Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x58C0"/>
<Texture Name="gSheikEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4CC0" TlutOffset="0x4A40"/>
<Texture Name="gSheikEyeHalfClosedTex" OutName="eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x50C0" TlutOffset="0x4A40"/>
<Texture Name="gSheikEyeShutTex" OutName="eye_shut" Format="ci8" Width="32" Height="32" Offset="0x54C0" TlutOffset="0x4A40"/>
<Texture Name="gSheikEyeSquintingTex" OutName="eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x58C0" TlutOffset="0x4A40"/>
<DList Name="gSheikHarpDL" Offset="0x11150"/>
<DList Name="gSheikDL_011620" Offset="0x11620"/>
<DList Name="gSheikDL_012970" Offset="0x12970"/>

2
assets/xml/overlays/ovl_Boss_Ganon.xml
View File

@ -14,7 +14,7 @@
<Texture Name="gDorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18E00" Static="Off"/>
<Texture Name="gDorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19A00" Static="Off"/>
<Texture Name="gDorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
<Texture Name="gDorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
<DList Name="gDorfLightStreak1DL" Offset="0x1FCF0" Static="Off"/>
<DList Name="gDorfLightStreak2DL" Offset="0x1FD28" Static="Off"/>

18
assets/xml/scenes/dungeons/ddan.xml
View File

@ -3,15 +3,15 @@
<Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
<Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
<!-- these need to have TLUTs extract from room 0 at 0x11290-->
<Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
<Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
<Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
<Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
<Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
<Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
<Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
<Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
<!-- These textures are used in room 0 with a TLUT at 0x11290 in room 0, and in room 3 with a TLUT at 0x008630 in room 3 (those two TLUTs are identical, but duplicated) -->
<Texture Name="gDCLavaFloor1Tex" OutName="lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor2Tex" OutName="lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor3Tex" OutName="lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor4Tex" OutName="lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor5Tex" OutName="lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor6Tex" OutName="lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor7Tex" OutName="lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Texture Name="gDCLavaFloor8Tex" OutName="lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78" ExternalTlut="ddan_room_0" ExternalTlutOffset="0x11290"/>
<Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
<Scene Name="ddan_scene" Offset="0x0"/>

2
assets/xml/textures/icon_item_field_static.xml
View File

@ -1,6 +1,6 @@
<Root>
<File Name="icon_item_field_static" Segment="12">
<Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0"/>
<Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0" TlutOffset="0x6C00"/>
<Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
<Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
<Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>