From eed1fe5ff63c9dee7a6799b42090b27d62f60773 Mon Sep 17 00:00:00 2001
From: Tom Overton <tom.overton@outlook.com>
Date: Mon, 17 Jan 2022 00:33:08 -0800
Subject: [PATCH] Split tokeidai into separate files

---
 assets/xml/objects/object_obj_tokeidai.xml    | 41 ++++++++++++++-----
 spec                                          | 12 +++++-
 .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c  | 11 ++++-
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/assets/xml/objects/object_obj_tokeidai.xml b/assets/xml/objects/object_obj_tokeidai.xml
index 09e0702540..a79cc3e74b 100644
--- a/assets/xml/objects/object_obj_tokeidai.xml
+++ b/assets/xml/objects/object_obj_tokeidai.xml
@@ -1,6 +1,6 @@
 <Root>
     <!-- Contains objects related to the Clock Tower and various wall clocks. -->
-    <File Name="object_obj_tokeidai" Segment="6">
+    <File Name="object_obj_tokeidai" OutName="textures" RangeStart="0x0" RangeEnd="0x96C0" Segment="6">
         <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="gClockTowerSpotlightShineTex" OutName="clock_tower_spotlight_shine" Format="i8" Width="64" Height="64" Offset="0x40" />
@@ -31,46 +31,67 @@
         <Texture Name="gClockTowerCounterweightMaskTex" OutName="clock_tower_counterweight_mask" Format="i4" Width="64" Height="64" Offset="0x7EC0" />
         <Texture Name="gClockTowerUnusedTowerWallMaskTex" OutName="clock_tower_unused_tower_wall_mask" Format="i4" Width="64" Height="64" Offset="0x86C0" />
         <Texture Name="gClockTowerStaircaseToRooftopMaskTex" OutName="clock_tower_staircase_to_rooftop_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Termina Field Walls -->
+   <File Name="object_obj_tokeidai" OutName="termina_field_walls" RangeStart="0x96C0" RangeEnd="0xAB48" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty1DL" Offset="0x9A00" />
         <DList Name="gClockTowerTerminaFieldWallsDL" Offset="0x9A08" />
         <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" />
+    </File>
+
+    <File Name="object_obj_tokeidai" OutName="counterweight" RangeStart="0xAB50" RangeEnd="0xB4F4" Segment="6">
         <DList Name="gClockTowerSpotlightDL" Offset="0xB0C0" />
         <DList Name="gClockTowerCounterweightDL" Offset="0xB208" />
         <TextureAnimation Name="gClockTowerUnusedTexAnim" Offset="0xB4E4" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Exterior Gear -->
+    <File Name="object_obj_tokeidai" OutName="exterior_gear" RangeStart="0xB4F4" RangeEnd="0xBC20" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty2DL" Offset="0xBA70" />
         <DList Name="gClockTowerExteriorGearDL" Offset="0xBA78" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Center and Hand -->
+    <File Name="object_obj_tokeidai" OutName="clock_center_and_hand" RangeStart="0xBC20" RangeEnd="0xC058" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty3DL" Offset="0xBEE0" />
         <DList Name="gClockTowerClockCenterAndHandDL" Offset="0xBEE8" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Sun and Moon Panel -->
+    <File Name="object_obj_tokeidai" OutName="sun_and_moon_panel" RangeStart="0xC060" RangeEnd="0xC4F0" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty4DL" Offset="0xC360" />
         <DList Name="gClockTowerSunAndMoonPanelDL" Offset="0xC368" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Minute Ring -->
+    <File Name="object_obj_tokeidai" OutName="minute_ring" RangeStart="0xC4F0" RangeEnd="0xD260" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty5DL" Offset="0xCF20" />
         <DList Name="gClockTowerMinuteRingDL" Offset="0xCF28" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Unused Tower Wall -->
+    <File Name="object_obj_tokeidai" OutName="unused_tower_wall" RangeStart="0xD260" RangeEnd="0xD480" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty6DL" Offset="0xD380" />
         <DList Name="gClockTowerUnusedTowerWallDL" Offset="0xD388" />
+    </File>
 
-        <!-- Used as the xluDList for Staircase to Rooftop -->
+    <File Name="object_obj_tokeidai" OutName="staircase_to_rooftop" RangeStart="0xD480" RangeEnd="0xDAB8" Segment="6">
         <DList Name="gClockTowerEmptyDL" Offset="0xD8E0" />
         <DList Name="gClockTowerStaircaseToRooftopDL" Offset="0xD8E8" />
+    </File>
+
+    <File Name="object_obj_tokeidai" OutName="clock_tower_clock_face" RangeStart="0xDAC0" RangeEnd="0xEBE0" Segment="6">
         <Texture Name="gClockTowerClockFaceBackTex" OutName="clock_tower_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xDAC0" />
 
-        <!-- Probably intended to be used as the xluDList for Clock Tower Clock Face -->
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty7DL" Offset="0xE810" />
         <DList Name="gClockTowerClockFace" Offset="0xE818" />
+    </File>
 
-        <!-- Probably intended to be used as the xluDList for Wall Clock Clock Face -->
+    <File Name="object_obj_tokeidai" OutName="wall_clock_clock_face" RangeStart="0xEBE0" RangeEnd="0x11C78" Segment="6">
+        <!-- Probably intended to be used as the xluDList -->
         <DList Name="gClockTowerUnusedEmpty8DL" Offset="0xF510" />
         <DList Name="gWallClockClockFace" Offset="0xF518" />
         <Texture Name="gWallClockClockFaceBackTex" OutName="wall_clock_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xF7F8" />
diff --git a/spec b/spec
index 20c127ac26..a6c59ec7a5 100644
--- a/spec
+++ b/spec
@@ -7382,7 +7382,17 @@ beginseg
     compress
     romalign 0x1000
     number 6
-    include "build/assets/objects/object_obj_tokeidai/object_obj_tokeidai.o"
+    include "build/assets/objects/object_obj_tokeidai/textures.o"
+    include "build/assets/objects/object_obj_tokeidai/termina_field_walls.o"
+    include "build/assets/objects/object_obj_tokeidai/counterweight.o"
+    include "build/assets/objects/object_obj_tokeidai/exterior_gear.o"
+    include "build/assets/objects/object_obj_tokeidai/clock_center_and_hand.o"
+    include "build/assets/objects/object_obj_tokeidai/sun_and_moon_panel.o"
+    include "build/assets/objects/object_obj_tokeidai/minute_ring.o"
+    include "build/assets/objects/object_obj_tokeidai/unused_tower_wall.o"
+    include "build/assets/objects/object_obj_tokeidai/staircase_to_rooftop.o"
+    include "build/assets/objects/object_obj_tokeidai/clock_tower_clock_face.o"
+    include "build/assets/objects/object_obj_tokeidai/wall_clock_clock_face.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
index ef53d67dba..67207ad6e8 100644
--- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
+++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
@@ -30,7 +30,16 @@
  */
 
 #include "z_obj_tokeidai.h"
-#include "objects/object_obj_tokeidai/object_obj_tokeidai.h"
+#include "objects/object_obj_tokeidai/termina_field_walls.h"
+#include "objects/object_obj_tokeidai/counterweight.h"
+#include "objects/object_obj_tokeidai/exterior_gear.h"
+#include "objects/object_obj_tokeidai/clock_center_and_hand.h"
+#include "objects/object_obj_tokeidai/sun_and_moon_panel.h"
+#include "objects/object_obj_tokeidai/minute_ring.h"
+#include "objects/object_obj_tokeidai/unused_tower_wall.h"
+#include "objects/object_obj_tokeidai/staircase_to_rooftop.h"
+#include "objects/object_obj_tokeidai/clock_tower_clock_face.h"
+#include "objects/object_obj_tokeidai/wall_clock_clock_face.h"
 
 #define FLAGS 0x00000030