From 9b386a1227a5ecde045f0951b76585241e5e3b56 Mon Sep 17 00:00:00 2001
From: tom-overton <tom.overton@outlook.com>
Date: Mon, 3 Jan 2022 11:51:43 -0800
Subject: [PATCH] Preserve ordering

---
 assets/xml/objects/object_obj_tokeidai.xml | 180 ++++++++++++---------
 1 file changed, 101 insertions(+), 79 deletions(-)

diff --git a/assets/xml/objects/object_obj_tokeidai.xml b/assets/xml/objects/object_obj_tokeidai.xml
index d1396c68fe..72b9b6adc3 100644
--- a/assets/xml/objects/object_obj_tokeidai.xml
+++ b/assets/xml/objects/object_obj_tokeidai.xml
@@ -1,48 +1,12 @@
 <Root>
     <!-- Contains objects related to the Clock Tower and various wall clocks. -->
     <File Name="object_obj_tokeidai" Segment="6">
-        <!-- Clock Tower Clock Face Textures -->
+        <!-- Clock Tower Clock Face TLUTs -->
         <Texture Name="gClockTowerClockFaceTopTLUT" OutName="clock_tower_clock_face_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
         <Texture Name="gClockTowerClockFaceBottomTLUT" OutName="clock_tower_clock_face_bottom_tlut" Format="rgba16" Width="4" Height="4" Offset="0x20" />
-        <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="gClockTowerClockFacePanelBarTex" OutName="clock_tower_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x6240" />
-        <Texture Name="gClockTowerClockFaceBackTex" OutName="clock_tower_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xDAC0" />
 
-        <!-- Clock Tower Clock Face DisplayList -->
-        <DList Name="gClockTowerClockFace" Offset="0xE818" />
-
-        <!-- Clock Tower Exterior Gear Textures (one is also reused for the minute ring) -->
-        <Texture Name="gClockTowerExteriorGearFaceTex" OutName="clock_tower_exterior_gear_face" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
-        <Texture Name="gClockTowerExteriorGearSidesAndMinuteRingBackTex" OutName="clock_tower_exterior_gear_sides_and_minute_ring_back" Format="rgba16" Width="16" Height="32" Offset="0x3040" />
-
-        <!-- Clock Tower Exterior Gear DisplayList -->
-        <DList Name="gClockTowerExteriorGearDL" Offset="0xBA78" />
-
-        <!-- Clock Tower Minute Ring Textures -->
-        <Texture Name="gClockTowerMinuteRingFace1Tex" OutName="clock_tower_minute_ring_face_1" Format="rgba16" Width="32" Height="16" Offset="0x4240" />
-        <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" />
-
-        <!-- Clock Tower Minute Ring DisplayList -->
-        <DList Name="gClockTowerMinuteRingDL" Offset="0xCF28" />
-
-        <!-- Clock Tower Sun and Moon Panel Textures -->
-        <Texture Name="gClockTowerSunAndMoonPanelSidesTex" OutName="clock_tower_sun_and_moon_panel_sides" Format="rgba16" Width="16" Height="16" Offset="0x3A40" />
-        <Texture Name="gClockTowerSunAndMoonPanelMoonTex" OutName="clock_tower_sun_and_moon_panel_moon" Format="rgba16" Width="16" Height="32" Offset="0x3C40" />
-        <Texture Name="gClockTowerSunAndMoonPanelSunTex" OutName="clock_tower_sun_and_moon_panel_sun" Format="rgba16" Width="16" Height="16" Offset="0x4040" />
-
-        <!-- Clock Tower Sun and Moon Panel DisplayList -->
-        <DList Name="gClockTowerSunAndMoonPanelDL" Offset="0xC368" />
-
-        <!-- Clock Tower Center and Hand Textures -->
-        <Texture Name="gClockTowerClockCenterTex" OutName="clock_tower_clock_center" Format="rgba16" Width="8" Height="32" Offset="0x3440" />
-        <Texture Name="gClockTowerClockCenterSidesTex" OutName="clock_tower_clock_center_sides" Format="rgba16" Width="16" Height="16" Offset="0x3640" />
-        <Texture Name="gClockTowerHandTex" OutName="clock_tower_hand" Format="rgba16" Width="16" Height="16" Offset="0x3840" />
-
-        <!-- Clock Tower Center and Hand DisplayList -->
-        <DList Name="gClockTowerClockCenterAndHandDL" Offset="0xBEE8" />
+        <!-- Clock Tower Spotlight Shine Texture -->
+        <Texture Name="gClockTowerSpotlightShineTex" OutName="clock_tower_spotlight_shine" Format="i8" Width="64" Height="64" Offset="0x40" />
 
         <!-- Generic brick texture used for multiple pieces of the Clock Tower (counterweight, unused tower wall, staircase to interior) -->
         <Texture Name="gClockTowerBrickTex" OutName="clock_tower_bricks" Format="rgba16" Width="32" Height="32" Offset="0x1040" />
@@ -50,65 +14,123 @@
         <!-- Clock Tower Counterweight Textures -->
         <Texture Name="gClockTowerCounterweightBeamSide1Tex" OutName="clock_tower_counterweight_beam_side1" Format="rgba16" Width="32" Height="32" Offset="0x1840" />
         <Texture Name="gClockTowerCounterweightBeamSide2Tex" OutName="clock_tower_counterweight_beam_side2" Format="rgba16" Width="32" Height="32" Offset="0x2040" />
-        <Texture Name="gClockTowerCounterweightMaskTex" OutName="clock_tower_counterweight_mask" Format="i4" Width="64" Height="64" Offset="0x7EC0" />
 
-        <!-- Clock Tower Counterweight DisplayList -->
-        <DList Name="gClockTowerCounterweightDL" Offset="0xB208" />
+        <!-- Clock Tower Exterior Gear Textures (one is also reused for the minute ring) -->
+        <Texture Name="gClockTowerExteriorGearFaceTex" OutName="clock_tower_exterior_gear_face" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
+        <Texture Name="gClockTowerExteriorGearSidesAndMinuteRingBackTex" OutName="clock_tower_exterior_gear_sides_and_minute_ring_back" Format="rgba16" Width="16" Height="32" Offset="0x3040" />
 
-        <!-- Clock Tower Spotlight Textures -->
-        <Texture Name="gClockTowerSpotlightShineTex" OutName="clock_tower_spotlight_shine" Format="i8" Width="64" Height="64" Offset="0x40" />
+        <!-- Clock Tower Center and Hand Textures -->
+        <Texture Name="gClockTowerClockCenterTex" OutName="clock_tower_clock_center" Format="rgba16" Width="8" Height="32" Offset="0x3440" />
+        <Texture Name="gClockTowerClockCenterSidesTex" OutName="clock_tower_clock_center_sides" Format="rgba16" Width="16" Height="16" Offset="0x3640" />
+        <Texture Name="gClockTowerHandTex" OutName="clock_tower_hand" Format="rgba16" Width="16" Height="16" Offset="0x3840" />
+
+        <!-- Clock Tower Sun and Moon Panel Textures -->
+        <Texture Name="gClockTowerSunAndMoonPanelSidesTex" OutName="clock_tower_sun_and_moon_panel_sides" Format="rgba16" Width="16" Height="16" Offset="0x3A40" />
+        <Texture Name="gClockTowerSunAndMoonPanelMoonTex" OutName="clock_tower_sun_and_moon_panel_moon" Format="rgba16" Width="16" Height="32" Offset="0x3C40" />
+        <Texture Name="gClockTowerSunAndMoonPanelSunTex" OutName="clock_tower_sun_and_moon_panel_sun" Format="rgba16" Width="16" Height="16" Offset="0x4040" />
+
+        <!-- Clock Tower Minute Ring Textures -->
+        <Texture Name="gClockTowerMinuteRingFace1Tex" OutName="clock_tower_minute_ring_face_1" Format="rgba16" Width="32" Height="16" Offset="0x4240" />
+        <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" />
+
+        <!-- Clock Tower Clock Face Front Textures -->
+        <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="gClockTowerClockFacePanelBarTex" OutName="clock_tower_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x6240" />
+
+        <!-- Unused Textures-->
+        <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" />
+
+        <!-- Clock Tower Spotlight Beam Textures -->
         <Texture Name="gClockTowerSpotlightBeamTex" OutName="clock_tower_spotlight_beam" Format="ia8" Width="32" Height="64" Offset="0x72C0" />
         <Texture Name="gClockTowerSpotlightMaskTex" OutName="clock_tower_spotlight_mask" Format="i8" Width="32" Height="32" Offset="0x7AC0" />
 
-        <!-- Clock Tower Spotlight DisplayList -->
-        <DList Name="gClockTowerSpotlightDL" Offset="0xB0C0" />
+        <!-- Clock Tower Counterweight Mask Texture -->
+        <Texture Name="gClockTowerCounterweightMaskTex" OutName="clock_tower_counterweight_mask" Format="i4" Width="64" Height="64" Offset="0x7EC0" />
+
+        <!-- Clock Tower Unused Tower Wall Texture -->
+        <Texture Name="gClockTowerUnusedTowerWallMaskTex" OutName="clock_tower_unused_tower_wall_mask" Format="i4" Width="64" Height="64" Offset="0x86C0" />
+
+        <!-- Clock Tower Staircase to Interior Texture -->
+        <Texture Name="gClockTowerStaircaseToInteriorMaskTex" OutName="clock_tower_staircase_to_interior_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Termina Field Walls -->
+        <DList Name="gClockTowerUnusedEmptyDL1" Offset="0x9A00" />
+
+        <!-- Clock Tower Termina Field Walls DisplayList -->
+        <DList Name="gClockTowerTerminaFieldWallsDL" Offset="0x9A08" />
 
         <!-- Clock Tower Termina Field Walls Textures -->
         <Texture Name="gClockTowerTerminaFieldWallsBrickTex" OutName="clock_tower_termina_field_walls_brick" Format="rgba16" Width="32" Height="32" Offset="0x9B48" />
         <Texture Name="gClockTowerTerminaFieldWallsMask" OutName="clock_tower_termina_field_walls_mask" Format="i4" Width="64" Height="64" Offset="0xA348" />
 
-        <!-- Clock Tower Termina Field Walls DisplayList -->
-        <DList Name="gClockTowerTerminaFieldWallsDL" Offset="0x9A08" />
+        <!-- Clock Tower Spotlight DisplayList -->
+        <DList Name="gClockTowerSpotlightDL" Offset="0xB0C0" />
 
-        <!-- Clock Tower Staircase to Interior Texture -->
-        <Texture Name="gClockTowerStaircaseToInteriorMaskTex" OutName="clock_tower_staircase_to_interior_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
+        <!-- Clock Tower Counterweight DisplayList -->
+        <DList Name="gClockTowerCounterweightDL" Offset="0xB208" />
+
+        <!-- Unused TextureAnimation -->
+        <TextureAnimation Name="gClockTowerUnusedTexAnim" Offset="0xB4E4" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Exterior Gear -->
+        <DList Name="gClockTowerUnusedEmptyDL2" Offset="0xBA70" />
+
+        <!-- Clock Tower Exterior Gear DisplayList -->
+        <DList Name="gClockTowerExteriorGearDL" Offset="0xBA78" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Center and Hand -->
+        <DList Name="gClockTowerUnusedEmptyDL3" Offset="0xBEE0" />
+
+        <!-- Clock Tower Center and Hand DisplayList -->
+        <DList Name="gClockTowerClockCenterAndHandDL" Offset="0xBEE8" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Sun and Moon Panel -->
+        <DList Name="gClockTowerUnusedEmptyDL4" Offset="0xC360" />
+
+        <!-- Clock Tower Sun and Moon Panel DisplayList -->
+        <DList Name="gClockTowerSunAndMoonPanelDL" Offset="0xC368" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Minute Ring -->
+        <DList Name="gClockTowerUnusedEmptyDL5" Offset="0xCF20" />
+
+        <!-- Clock Tower Minute Ring DisplayList -->
+        <DList Name="gClockTowerMinuteRingDL" Offset="0xCF28" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Unused Tower Wall -->
+        <DList Name="gClockTowerUnusedEmptyDL6" Offset="0xD380" />
+
+        <!-- Clock Tower Unused Tower Wall DisplayList -->
+        <DList Name="gClockTowerUnusedTowerWallDL" Offset="0xD388" />
+
+        <!-- Empty DisplayList used as the xluDList for Staircase to Interior -->
+        <DList Name="gClockTowerEmptyDL" Offset="0xD8E0" />
 
         <!-- Clock Tower Staircase to Interior DisplayList -->
         <DList Name="gClockTowerStaircaseToInteriorDL" Offset="0xD8E8" />
 
+        <!-- Clock Tower Clock Face Back Texture -->
+        <Texture Name="gClockTowerClockFaceBackTex" OutName="clock_tower_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xDAC0" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Clock Face -->
+        <DList Name="gClockTowerUnusedEmptyDL7" Offset="0xE810" />
+
+        <!-- Clock Tower Clock Face DisplayList -->
+        <DList Name="gClockTowerClockFace" Offset="0xE818" />
+
+        <!-- Empty DisplayList, probably intended to be used as the xluDList for Wall Clock Clock Face -->
+        <DList Name="gClockTowerUnusedEmptyDL8" Offset="0xF510" />
+
+        <!-- Wall Clock Clock Face DisplayList -->
+        <DList Name="gWallClockClockFace" Offset="0xF518" />
+
         <!-- Wall Clock Clock Face Textures -->
         <Texture Name="gWallClockClockFaceBackTex" OutName="wall_clock_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xF7F8" />
         <Texture Name="gWallClockClockFaceBottomTex" OutName="wall_clock_clock_face_bottom" Format="rgba16" Width="64" Height="32" Offset="0xFBF8" />
         <Texture Name="gWallClockClockFaceTopTex" OutName="wall_clock_clock_face_top" Format="rgba16" Width="64" Height="32" Offset="0x10BF8" />
         <Texture Name="gWallClockClockFacePanelBarTex" OutName="wall_clock_clock_face_panel_bar" Format="rgba16" Width="8" Height="8" Offset="0x11BF8" />
-
-        <!-- Wall Clock Clock Face DisplayList -->
-        <DList Name="gWallClockClockFace" Offset="0xF518" />
-
-        <!-- Clock Tower Unused Tower Wall Texture -->
-        <Texture Name="gClockTowerUnusedTowerWallMaskTex" OutName="clock_tower_unused_tower_wall_mask" Format="i4" Width="64" Height="64" Offset="0x86C0" />
-
-        <!-- Clock Tower Unused Tower Wall DisplayList -->
-        <DList Name="gClockTowerUnusedTowerWallDL" Offset="0xD388" />
-
-        <!-- Empty DisplayLists. Most of these are unused and marked as such. -->
-        <!-- Probably intended to be used as the xluDList for components that didn't need anything transparent. -->
-        <!-- In the final game, only the Staircase to Interior uses an empty DList like this. -->
-        <DList Name="gClockTowerEmptyDL" Offset="0xD8E0" />
-        <DList Name="gClockTowerUnusedEmptyDL1" Offset="0x9A00" />
-        <DList Name="gClockTowerUnusedEmptyDL2" Offset="0xBA70" />
-        <DList Name="gClockTowerUnusedEmptyDL3" Offset="0xBEE0" />
-        <DList Name="gClockTowerUnusedEmptyDL4" Offset="0xC360" />
-        <DList Name="gClockTowerUnusedEmptyDL5" Offset="0xCF20" />
-        <DList Name="gClockTowerUnusedEmptyDL6" Offset="0xD380" />
-        <DList Name="gClockTowerUnusedEmptyDL7" Offset="0xE810" />
-        <DList Name="gClockTowerUnusedEmptyDL8" Offset="0xF510" />
-
-        <!-- Unused Textures-->
-        <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" />
-
-        <!-- Unused TextureAnimation -->
-        <TextureAnimation Name="gClockTowerUnusedTexAnim" Offset="0xB4E4" />
     </File>
 </Root>