From e7558cc3050e5bb58a9e4c9beaf65efb8deda360 Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:57:32 -0400
Subject: [PATCH] Fix mori_tex object (#1380)

* Update object_mori_tex.xml

* Update object_mori_objects.xml

* Update object_mori_objects.xml

* Update object_mori_hineri1.xml

* Update object_mori_hineri1a.xml

* Update object_mori_hineri2.xml

* Update object_mori_hineri2a.xml

* fixed segment

* Update assets/xml/objects/object_mori_tex.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Change water_tex to water

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---
 assets/xml/objects/object_mori_hineri1.xml  |  1 +
 assets/xml/objects/object_mori_hineri1a.xml |  1 +
 assets/xml/objects/object_mori_hineri2.xml  |  1 +
 assets/xml/objects/object_mori_hineri2a.xml |  1 +
 assets/xml/objects/object_mori_objects.xml  |  1 +
 assets/xml/objects/object_mori_tex.xml      | 29 +++++++++++++++++++--
 spec                                        |  2 +-
 7 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/assets/xml/objects/object_mori_hineri1.xml b/assets/xml/objects/object_mori_hineri1.xml
index 517c02780b..a2033a6f97 100644
--- a/assets/xml/objects/object_mori_hineri1.xml
+++ b/assets/xml/objects/object_mori_hineri1.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
     <File Name="object_mori_hineri1" Segment="6">
         <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
         <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>
diff --git a/assets/xml/objects/object_mori_hineri1a.xml b/assets/xml/objects/object_mori_hineri1a.xml
index fb20482ddf..d7e3489044 100644
--- a/assets/xml/objects/object_mori_hineri1a.xml
+++ b/assets/xml/objects/object_mori_hineri1a.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
     <File Name="object_mori_hineri1a" Segment="6">
         <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
         <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>
diff --git a/assets/xml/objects/object_mori_hineri2.xml b/assets/xml/objects/object_mori_hineri2.xml
index a23d9060c0..9f1c892afb 100644
--- a/assets/xml/objects/object_mori_hineri2.xml
+++ b/assets/xml/objects/object_mori_hineri2.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
     <File Name="object_mori_hineri2" Segment="6">
         <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
         <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>
diff --git a/assets/xml/objects/object_mori_hineri2a.xml b/assets/xml/objects/object_mori_hineri2a.xml
index 282fd267f6..6fd6818562 100644
--- a/assets/xml/objects/object_mori_hineri2a.xml
+++ b/assets/xml/objects/object_mori_hineri2a.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
     <File Name="object_mori_hineri2a" Segment="6">
         <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
         <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>
diff --git a/assets/xml/objects/object_mori_objects.xml b/assets/xml/objects/object_mori_objects.xml
index bef9686f5c..aa24a38d70 100644
--- a/assets/xml/objects/object_mori_objects.xml
+++ b/assets/xml/objects/object_mori_objects.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
     <File Name="object_mori_objects" Segment="6">
         <Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
         <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
diff --git a/assets/xml/objects/object_mori_tex.xml b/assets/xml/objects/object_mori_tex.xml
index ad4ba38e34..89fb06d354 100644
--- a/assets/xml/objects/object_mori_tex.xml
+++ b/assets/xml/objects/object_mori_tex.xml
@@ -1,5 +1,30 @@
 <Root>
-    <File Name="object_mori_tex" Segment="6">
-        <Blob Name="object_moriTex_Blob_000000" Size="0x9E00" Offset="0x0"/>
+    <File Name="object_mori_tex" Segment="8">
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
+        <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
+
+        <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
+        <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+
+        <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
+        <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
+
+        <Texture Name="gMoriHashiraPlatformsTex" OutName="hashira_platform" Format="rgba16" Height="32" Width="32" Offset="0x4A00"/>
+
+        <!-- This is just a guess since its unused -->
+        <Texture Name="gMoriWaterTex" OutName="water" Format="rgba16" Height="8" Width="32" Offset="0x5200"/> 
+
+        <Texture Name="gMoriHashigoLadderTex" OutName="ladder" Format="rgba16" Height="32" Width="32" Offset="0x5400"/>
+
+        <Texture Name="gForestTwistedHallwayPillarTex" OutName="twisted_hall_pillar" Format="rgba16" Height="64" Width="16" Offset="0x5C00"/>
+        <Texture Name="gForestTwistedHallwayWallAndFloorTex" OutName="twisted_hall_wall_and_floor" Format="rgba16" Width="32" Height="32" Offset="0x6400"/>
+        <Texture Name="gForestTwistedHallwayWallDesignTex" OutName="twisted_hall_design" Format="rgba16" Width="64" Height="32" Offset="0x6C00"/>
+        <Texture Name="gForestTwistedHallCarpetTex" OutName="twisted_hall_carpet" Format="rgba16" Width="16" Height="16" Offset="0x7C00"/>
+        <Texture Name="gForestTwistedHallLadderTex" OutName="twisted_hall_ladder" Format="rgba16" Height="32" Width="32" Offset="0x7E00"/>
+        <Texture Name="gForestTwistedHallBrickTex" OutName="twisted_hall_brick" Format="rgba16" Width="32" Height="32" Offset="0x8600"/>
+
+        <Texture Name="gMoriHashiraGateTex" OutName="hashira_gate" Format="rgba16" Width="32" Height="64" Offset="0x8E00"/>
     </File>
 </Root>
diff --git a/spec b/spec
index 871b242804..fdd90baba3 100644
--- a/spec
+++ b/spec
@@ -4124,7 +4124,7 @@ beginseg
     name "object_mori_tex"
     romalign 0x1000
     include "build/assets/objects/object_mori_tex/object_mori_tex.o"
-    number 6
+    number 8
 endseg
 
 beginseg