From 5e4c8e0506e56e12732aec7faff914ecaac41549 Mon Sep 17 00:00:00 2001
From: Anghelo Carvajal <angheloalf95@gmail.com>
Date: Sat, 22 Jan 2022 17:49:35 -0300
Subject: [PATCH] `scene_texture`s (#550)

* scene texture xml generator

* Create XMLs for every scene_texture except 3 and 7

* Manually add blobs

* add XMLs for not used ones

* update spec

* Add scene_texture as external files to every scene that uses them

* add gsDPLoadTextureBlock_4b

* gsDPLoadMultiBlock

* gsDPLoadTLUT_pal16

* gsDPLoadMultiBlock_4b

* Add back the blob I removed...

* address review

* Fix tluts

* delete script
---
 assets/xml/misc/scene_texture_01.xml          | 35 +++++++++++++++++++
 assets/xml/misc/scene_texture_02.xml          | 14 ++++++++
 assets/xml/misc/scene_texture_03.xml          |  6 ++++
 assets/xml/misc/scene_texture_04.xml          | 14 ++++++++
 assets/xml/misc/scene_texture_05.xml          | 17 +++++++++
 assets/xml/misc/scene_texture_06.xml          | 18 ++++++++++
 assets/xml/misc/scene_texture_07.xml          |  6 ++++
 assets/xml/misc/scene_texture_08.xml          | 21 +++++++++++
 .../xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml  |  1 +
 .../Z2_10YUKIYAMANOMURA.xml                   |  1 +
 .../Z2_10YUKIYAMANOMURA2.xml                  |  1 +
 .../Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml     |  1 +
 .../Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml   |  1 +
 .../Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml       |  1 +
 .../Z2_14YUKIDAMANOMITI.xml                   |  1 +
 .../xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml  |  1 +
 .../scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml    |  1 +
 .../scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml    |  1 +
 .../scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml  |  1 +
 .../scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml    |  1 +
 .../Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml       |  1 +
 .../Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml       |  1 +
 assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml |  1 +
 assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml |  1 +
 .../scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml  |  1 +
 assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml     |  1 +
 assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml     |  1 +
 .../xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml  |  1 +
 assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml     |  1 +
 .../scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml    |  1 +
 assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml     |  1 +
 assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml     |  1 +
 spec                                          | 24 ++++++++-----
 33 files changed, 171 insertions(+), 8 deletions(-)
 create mode 100644 assets/xml/misc/scene_texture_01.xml
 create mode 100644 assets/xml/misc/scene_texture_02.xml
 create mode 100644 assets/xml/misc/scene_texture_03.xml
 create mode 100644 assets/xml/misc/scene_texture_04.xml
 create mode 100644 assets/xml/misc/scene_texture_05.xml
 create mode 100644 assets/xml/misc/scene_texture_06.xml
 create mode 100644 assets/xml/misc/scene_texture_07.xml
 create mode 100644 assets/xml/misc/scene_texture_08.xml

diff --git a/assets/xml/misc/scene_texture_01.xml b/assets/xml/misc/scene_texture_01.xml
new file mode 100644
index 000000000..edbb2d1c4
--- /dev/null
+++ b/assets/xml/misc/scene_texture_01.xml
@@ -0,0 +1,35 @@
+<Root>
+    <File Name="scene_texture_01" Segment="6">
+        <Texture Name="scene_texture_01_Tex_000000" OutName="tex_000000" Format="ci8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="scene_texture_01_Tex_000100" OutName="tex_000100" Format="rgba16" Width="32" Height="32" Offset="0x100"/>
+        <Texture Name="scene_texture_01_Tex_000900" OutName="tex_000900" Format="ci8" Width="64" Height="16" Offset="0x900"/>
+        <Texture Name="scene_texture_01_Tex_000D00" OutName="tex_000D00" Format="ci8" Width="64" Height="16" Offset="0xD00"/>
+        <Texture Name="scene_texture_01_Tex_001100" OutName="tex_001100" Format="ci8" Width="16" Height="16" Offset="0x1100"/>
+        <Texture Name="scene_texture_01_Tex_001200" OutName="tex_001200" Format="ci8" Width="32" Height="16" Offset="0x1200"/>
+        <Texture Name="scene_texture_01_Tex_001400" OutName="tex_001400" Format="ci8" Width="32" Height="32" Offset="0x1400"/>
+        <Texture Name="scene_texture_01_Tex_001800" OutName="tex_001800" Format="rgba16" Width="16" Height="8" Offset="0x1800"/>
+        <Texture Name="scene_texture_01_Tex_001900" OutName="tex_001900" Format="ci8" Width="16" Height="16" Offset="0x1900"/>
+        <Texture Name="scene_texture_01_Tex_001A00" OutName="tex_001A00" Format="ci8" Width="32" Height="32" Offset="0x1A00"/>
+        <Texture Name="scene_texture_01_Tex_001E00" OutName="tex_001E00" Format="ci8" Width="32" Height="32" Offset="0x1E00"/>
+        <Texture Name="scene_texture_01_Tex_002200" OutName="tex_002200" Format="ci8" Width="16" Height="16" Offset="0x2200"/>
+        <Texture Name="scene_texture_01_Tex_002300" OutName="tex_002300" Format="ci8" Width="16" Height="32" Offset="0x2300"/>
+        <Texture Name="scene_texture_01_Tex_002500" OutName="tex_002500" Format="ci8" Width="16" Height="64" Offset="0x2500"/>
+        <Texture Name="scene_texture_01_Tex_002900" OutName="tex_002900" Format="ci8" Width="16" Height="64" Offset="0x2900"/>
+        <Texture Name="scene_texture_01_Tex_002D00" OutName="tex_002D00" Format="i8" Width="8" Height="8" Offset="0x2D00"/>
+        <!-- <Blob Name="scene_texture_01_Blob_002D40" Size="0x100" Offset="0x2D40"/> -->
+        <Texture Name="scene_texture_01_Tex_002E40" OutName="tex_002E40" Format="ci8" Width="16" Height="32" Offset="0x2E40"/>
+        <Texture Name="scene_texture_01_Tex_003040" OutName="tex_003040" Format="ci8" Width="32" Height="16" Offset="0x3040"/>
+        <Texture Name="scene_texture_01_Tex_003240" OutName="tex_003240" Format="ci8" Width="8" Height="8" Offset="0x3240"/>
+        <Texture Name="scene_texture_01_Tex_003280" OutName="tex_003280" Format="ci8" Width="32" Height="32" Offset="0x3280"/>
+        <Texture Name="scene_texture_01_Tex_003680" OutName="tex_003680" Format="ci8" Width="32" Height="32" Offset="0x3680"/>
+        <Texture Name="scene_texture_01_Tex_003A80" OutName="tex_003A80" Format="ci8" Width="16" Height="32" Offset="0x3A80"/>
+        <Texture Name="scene_texture_01_Tex_003C80" OutName="tex_003C80" Format="ci8" Width="32" Height="32" Offset="0x3C80"/>
+        <Texture Name="scene_texture_01_Tex_004080" OutName="tex_004080" Format="ci8" Width="32" Height="32" Offset="0x4080"/>
+        <Texture Name="scene_texture_01_Tex_004480" OutName="tex_004480" Format="ci8" Width="32" Height="8" Offset="0x4480"/>
+        <Texture Name="scene_texture_01_Tex_004580" OutName="tex_004580" Format="ci8" Width="16" Height="8" Offset="0x4580"/>
+        <Texture Name="scene_texture_01_Tex_004600" OutName="tex_004600" Format="ci8" Width="16" Height="16" Offset="0x4600"/>
+        <Texture Name="scene_texture_01_Tex_004700" OutName="tex_004700" Format="ci8" Width="16" Height="16" Offset="0x4700"/>
+        <Texture Name="scene_texture_01_Tex_004800" OutName="tex_004800" Format="ci8" Width="16" Height="64" Offset="0x4800"/>
+        <Texture Name="scene_texture_01_Tex_004C00" OutName="tex_004C00" Format="ci8" Width="16" Height="16" Offset="0x4C00"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_02.xml b/assets/xml/misc/scene_texture_02.xml
new file mode 100644
index 000000000..a7219c31e
--- /dev/null
+++ b/assets/xml/misc/scene_texture_02.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="scene_texture_02" Segment="6">
+        <Texture Name="scene_texture_02_Tex_000000" OutName="tex_000000" Format="ci8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="scene_texture_02_Tex_000400" OutName="tex_000400" Format="ci8" Width="16" Height="32" Offset="0x400"/>
+        <Texture Name="scene_texture_02_Tex_000600" OutName="tex_000600" Format="ci8" Width="32" Height="8" Offset="0x600"/>
+        <Texture Name="scene_texture_02_Tex_000700" OutName="tex_000700" Format="ci8" Width="32" Height="32" Offset="0x700"/>
+        <Texture Name="scene_texture_02_Tex_000B00" OutName="tex_000B00" Format="ci8" Width="32" Height="32" Offset="0xB00"/>
+        <Texture Name="scene_texture_02_Tex_000F00" OutName="tex_000F00" Format="ci8" Width="32" Height="32" Offset="0xF00"/>
+        <Texture Name="scene_texture_02_Tex_001300" OutName="tex_001300" Format="ci8" Width="16" Height="64" Offset="0x1300"/>
+        <Texture Name="scene_texture_02_Tex_001700" OutName="tex_001700" Format="ci8" Width="16" Height="16" Offset="0x1700"/>
+        <Texture Name="scene_texture_02_Tex_001800" OutName="tex_001800" Format="ci8" Width="32" Height="32" Offset="0x1800"/>
+        <Texture Name="scene_texture_02_Tex_001C00" OutName="tex_001C00" Format="ci8" Width="16" Height="16" Offset="0x1C00"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_03.xml b/assets/xml/misc/scene_texture_03.xml
new file mode 100644
index 000000000..fcd10b9a9
--- /dev/null
+++ b/assets/xml/misc/scene_texture_03.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="scene_texture_03" Segment="6">
+        <!-- Seems like various trees in different formats -->
+        <Blob Name="scene_texture_03_Blob_002D40" Size="0x4800" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_04.xml b/assets/xml/misc/scene_texture_04.xml
new file mode 100644
index 000000000..6faf681ac
--- /dev/null
+++ b/assets/xml/misc/scene_texture_04.xml
@@ -0,0 +1,14 @@
+<Root>
+    <File Name="scene_texture_04" Segment="6">
+        <Texture Name="scene_texture_04_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="128" Offset="0x0"/>
+        <Texture Name="scene_texture_04_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="scene_texture_04_Tex_001800" OutName="tex_001800" Format="rgba16" Width="32" Height="32" Offset="0x1800"/>
+        <Texture Name="scene_texture_04_Tex_002000" OutName="tex_002000" Format="rgba16" Width="16" Height="64" Offset="0x2000"/>
+        <Texture Name="scene_texture_04_Tex_002800" OutName="tex_002800" Format="rgba16" Width="16" Height="64" Offset="0x2800"/>
+        <Texture Name="scene_texture_04_Tex_003000" OutName="tex_003000" Format="i4" Width="64" Height="64" Offset="0x3000"/>
+        <Texture Name="scene_texture_04_Tex_003800" OutName="tex_003800" Format="i4" Width="64" Height="64" Offset="0x3800"/>
+        <Texture Name="scene_texture_04_Tex_004000" OutName="tex_004000" Format="i4" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="scene_texture_04_Tex_004200" OutName="tex_004200" Format="rgba16" Width="32" Height="32" Offset="0x4200"/>
+        <Texture Name="scene_texture_04_Tex_004A00" OutName="tex_004A00" Format="rgba16" Width="32" Height="32" Offset="0x4A00"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_05.xml b/assets/xml/misc/scene_texture_05.xml
new file mode 100644
index 000000000..d9ae4f2c3
--- /dev/null
+++ b/assets/xml/misc/scene_texture_05.xml
@@ -0,0 +1,17 @@
+<Root>
+    <File Name="scene_texture_05" Segment="6">
+        <Texture Name="scene_texture_05_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="scene_texture_05_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800"/>
+        <Texture Name="scene_texture_05_Tex_001000" OutName="tex_001000" Format="rgba16" Width="16" Height="64" Offset="0x1000"/>
+        <Texture Name="scene_texture_05_Tex_001800" OutName="tex_001800" Format="i4" Width="64" Height="64" Offset="0x1800"/>
+        <Texture Name="scene_texture_05_Tex_002000" OutName="tex_002000" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="scene_texture_05_Tex_002800" OutName="tex_002800" Format="rgba16" Width="32" Height="32" Offset="0x2800"/>
+        <Texture Name="scene_texture_05_Tex_003000" OutName="tex_003000" Format="rgba16" Width="32" Height="32" Offset="0x3000"/>
+        <Texture Name="scene_texture_05_Tex_003800" OutName="tex_003800" Format="rgba16" Width="32" Height="32" Offset="0x3800"/>
+        <Texture Name="scene_texture_05_Tex_004000" OutName="tex_004000" Format="rgba16" Width="32" Height="32" Offset="0x4000"/>
+        <Texture Name="scene_texture_05_Tex_004800" OutName="tex_004800" Format="rgba16" Width="32" Height="32" Offset="0x4800"/>
+        <Texture Name="scene_texture_05_Tex_005000" OutName="tex_005000" Format="rgba16" Width="32" Height="32" Offset="0x5000"/>
+        <Texture Name="scene_texture_05_Tex_005800" OutName="tex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800"/>
+        <Texture Name="scene_texture_05_Tex_006000" OutName="tex_006000" Format="i4" Width="64" Height="64" Offset="0x6000"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_06.xml b/assets/xml/misc/scene_texture_06.xml
new file mode 100644
index 000000000..1a2dfc2a0
--- /dev/null
+++ b/assets/xml/misc/scene_texture_06.xml
@@ -0,0 +1,18 @@
+<Root>
+    <File Name="scene_texture_06" Segment="6">
+        <Texture Name="scene_texture_06_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
+        <Texture Name="scene_texture_06_Tex_000400" OutName="tex_000400" Format="ci4" Width="128" Height="32" Offset="0x400"/>
+        <Texture Name="scene_texture_06_TLUT_000C00" OutName="tlut_000C00" Format="rgba16" Width="4" Height="4" Offset="0xC00"/>
+        <Texture Name="scene_texture_06_Tex_000C20" OutName="tex_000C20" Format="ci4" Width="64" Height="64" Offset="0xC20"/>
+        <Texture Name="scene_texture_06_TLUT_001420" OutName="tlut_001420" Format="rgba16" Width="4" Height="4" Offset="0x1420"/>
+        <Texture Name="scene_texture_06_Tex_001440" OutName="tex_001440" Format="ci4" Width="64" Height="64" Offset="0x1440"/>
+        <Texture Name="scene_texture_06_TLUT_001C40" OutName="tlut_001C40" Format="rgba16" Width="4" Height="4" Offset="0x1C40"/>
+        <Texture Name="scene_texture_06_Tex_001C60" OutName="tex_001C60" Format="rgba16" Width="32" Height="32" Offset="0x1C60"/>
+        <Texture Name="scene_texture_06_Tex_002460" OutName="tex_002460" Format="rgba16" Width="32" Height="32" Offset="0x2460"/>
+        <Texture Name="scene_texture_06_Tex_002C60" OutName="tex_002C60" Format="rgba16" Width="32" Height="32" Offset="0x2C60"/>
+        <Texture Name="scene_texture_06_Tex_003460" OutName="tex_003460" Format="rgba16" Width="32" Height="32" Offset="0x3460"/>
+        <Texture Name="scene_texture_06_Tex_003C60" OutName="tex_003C60" Format="i4" Width="64" Height="64" Offset="0x3C60"/>
+        <Texture Name="scene_texture_06_Tex_004460" OutName="tex_004460" Format="rgba16" Width="32" Height="32" Offset="0x4460"/>
+        <Texture Name="scene_texture_06_Tex_004C60" OutName="tex_004C60" Format="rgba16" Width="32" Height="32" Offset="0x4C60"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_07.xml b/assets/xml/misc/scene_texture_07.xml
new file mode 100644
index 000000000..22f445990
--- /dev/null
+++ b/assets/xml/misc/scene_texture_07.xml
@@ -0,0 +1,6 @@
+<Root>
+    <File Name="scene_texture_07" Segment="6">
+        <!-- Empty file -->
+        <Blob Name="scene_texture_07_Blob_000" Size="0x10" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/assets/xml/misc/scene_texture_08.xml b/assets/xml/misc/scene_texture_08.xml
new file mode 100644
index 000000000..31e557347
--- /dev/null
+++ b/assets/xml/misc/scene_texture_08.xml
@@ -0,0 +1,21 @@
+<Root>
+    <File Name="scene_texture_08" Segment="6">
+        <Texture Name="scene_texture_08_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="scene_texture_08_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="scene_texture_08_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000"/>
+        <Texture Name="scene_texture_08_Tex_001800" OutName="tex_001800" Format="rgba16" Width="32" Height="32" Offset="0x1800"/>
+        <Texture Name="scene_texture_08_Tex_002000" OutName="tex_002000" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
+        <Texture Name="scene_texture_08_Tex_002800" OutName="tex_002800" Format="i4" Width="64" Height="64" Offset="0x2800"/>
+        <Texture Name="scene_texture_08_Tex_003000" OutName="tex_003000" Format="ia4" Width="64" Height="32" Offset="0x3000"/>
+        <Texture Name="scene_texture_08_Tex_003400" OutName="tex_003400" Format="ia8" Width="64" Height="32" Offset="0x3400"/>
+        <Texture Name="scene_texture_08_Tex_003C00" OutName="tex_003C00" Format="ia4" Width="64" Height="32" Offset="0x3C00"/>
+        <Texture Name="scene_texture_08_Tex_004000" OutName="tex_004000" Format="ia8" Width="64" Height="32" Offset="0x4000"/>
+        <Texture Name="scene_texture_08_Tex_004800" OutName="tex_004800" Format="rgba16" Width="32" Height="32" Offset="0x4800"/>
+        <Texture Name="scene_texture_08_Tex_005000" OutName="tex_005000" Format="ia4" Width="64" Height="64" Offset="0x5000"/>
+        <Texture Name="scene_texture_08_Tex_005800" OutName="tex_005800" Format="rgba16" Width="32" Height="32" Offset="0x5800"/>
+        <Texture Name="scene_texture_08_Tex_006000" OutName="tex_006000" Format="rgba16" Width="32" Height="32" Offset="0x6000"/>
+        <Texture Name="scene_texture_08_Tex_006800" OutName="tex_006800" Format="ia4" Width="64" Height="64" Offset="0x6800"/>
+        <Texture Name="scene_texture_08_Tex_007000" OutName="tex_007000" Format="rgba16" Width="32" Height="32" Offset="0x7000"/>
+        <Texture Name="scene_texture_08_Tex_007800" OutName="tex_007800" Format="rgba16" Width="32" Height="32" Offset="0x7800"/>
+    </File>
+</Root>
diff --git a/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml b/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
index 58d50ee83..3cf73a255 100644
--- a/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
+++ b/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
     <File Name="Z2_00KEIKOKU" Segment="2" Game="MM">
         <Scene Name="Z2_00KEIKOKU" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml b/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
index c48cb9646..9676cbc39 100644
--- a/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
+++ b/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_10YUKIYAMANOMURA" Segment="2" Game="MM">
         <Scene Name="Z2_10YUKIYAMANOMURA" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml b/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
index 565dcc06c..943e58e58 100644
--- a/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
+++ b/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_10YUKIYAMANOMURA2" Segment="2" Game="MM">
         <Scene Name="Z2_10YUKIYAMANOMURA2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml b/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
index 2a948603b..986823c90 100644
--- a/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
+++ b/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_11GORONNOSATO" Segment="2" Game="MM">
         <Scene Name="Z2_11GORONNOSATO" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml b/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
index 40e82522f..9e6925131 100644
--- a/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
+++ b/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_11GORONNOSATO2" Segment="2" Game="MM">
         <Scene Name="Z2_11GORONNOSATO2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml b/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
index ca23dfa17..740f6a15a 100644
--- a/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
+++ b/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_12HAKUGINMAE" Segment="2" Game="MM">
         <Scene Name="Z2_12HAKUGINMAE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml b/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
index 2165e80f5..6c368004f 100644
--- a/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
+++ b/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_14YUKIDAMANOMITI" Segment="2" Game="MM">
         <Scene Name="Z2_14YUKIDAMANOMITI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml b/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
index b5b9f6d77..ed6beb36e 100644
--- a/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
+++ b/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_17SETUGEN" Segment="2" Game="MM">
         <Scene Name="Z2_17SETUGEN" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml b/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
index 357c0b897..1ac9488d7 100644
--- a/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
+++ b/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
     <File Name="Z2_17SETUGEN2" Segment="2" Game="MM">
         <Scene Name="Z2_17SETUGEN2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml b/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
index 73c697f16..d144c9e8e 100644
--- a/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
+++ b/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
     <File Name="Z2_20SICHITAI" Segment="2" Game="MM">
         <Scene Name="Z2_20SICHITAI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml b/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
index fca3e6846..144914621 100644
--- a/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
+++ b/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
     <File Name="Z2_20SICHITAI2" Segment="2" Game="MM">
         <Scene Name="Z2_20SICHITAI2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml b/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
index 1db584d58..77f382ecc 100644
--- a/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
+++ b/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
     <File Name="Z2_22DEKUCITY" Segment="2" Game="MM">
         <Scene Name="Z2_22DEKUCITY" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml b/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
index eb4b353db..f6c852dc9 100644
--- a/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
+++ b/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
     <File Name="Z2_24KEMONOMITI" Segment="2" Game="MM">
         <Scene Name="Z2_24KEMONOMITI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml b/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
index 5055f4ff3..83e362742 100644
--- a/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
+++ b/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
     <File Name="Z2_26SARUNOMORI" Segment="2" Game="MM">
         <Scene Name="Z2_26SARUNOMORI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml b/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
index eca539742..f24a37254 100644
--- a/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
+++ b/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
     <File Name="Z2_30GYOSON" Segment="2" Game="MM">
         <Scene Name="Z2_30GYOSON" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml b/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
index 918dc1ceb..afd35a817 100644
--- a/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
+++ b/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
     <File Name="Z2_31MISAKI" Segment="2" Game="MM">
         <Scene Name="Z2_31MISAKI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml b/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
index c757263f3..3b03e8e5e 100644
--- a/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
+++ b/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
     <File Name="Z2_AYASHIISHOP" Segment="2" Game="MM">
         <Scene Name="Z2_AYASHIISHOP" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml b/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
index 00e6702fa..a6b7a1a6a 100644
--- a/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
+++ b/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
     <File Name="Z2_DOUJOU" Segment="2" Game="MM">
         <Scene Name="Z2_DOUJOU" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml b/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
index 6e73abc32..158669f8f 100644
--- a/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
+++ b/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
     <File Name="Z2_KAJIYA" Segment="2" Game="MM">
         <Scene Name="Z2_KAJIYA" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml b/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
index e49402a10..3ef612381 100644
--- a/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
+++ b/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
     <File Name="Z2_ROMANYMAE" Segment="2" Game="MM">
         <Scene Name="Z2_ROMANYMAE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml b/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
index d2f362453..6a3df8b2e 100644
--- a/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
+++ b/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
     <File Name="Z2_SINKAI" Segment="2" Game="MM">
         <Scene Name="Z2_SINKAI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml b/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
index 36168378b..72f476631 100644
--- a/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
+++ b/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
     <File Name="Z2_SONCHONOIE" Segment="2" Game="MM">
         <Scene Name="Z2_SONCHONOIE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml b/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
index c8e4a16c2..4003e785d 100644
--- a/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
+++ b/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
     <File Name="Z2_TORIDE" Segment="2" Game="MM">
         <Scene Name="Z2_TORIDE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml b/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
index 9a2ad7080..03801385c 100644
--- a/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
+++ b/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
     <File Name="Z2_YADOYA" Segment="2" Game="MM">
         <Scene Name="Z2_YADOYA" Offset="0x0"/>
     </File>
diff --git a/spec b/spec
index 84466c482..a63239519 100644
--- a/spec
+++ b/spec
@@ -9202,56 +9202,64 @@ beginseg
     name "scene_texture_01"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_01.o"
+    number 6
+    include "build/assets/misc/scene_texture_01/scene_texture_01.o"
 endseg
 
 beginseg
     name "scene_texture_02"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_02.o"
+    number 6
+    include "build/assets/misc/scene_texture_02/scene_texture_02.o"
 endseg
 
 beginseg
     name "scene_texture_03"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_03.o"
+    number 6
+    include "build/assets/misc/scene_texture_03/scene_texture_03.o"
 endseg
 
 beginseg
     name "scene_texture_04"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_04.o"
+    number 6
+    include "build/assets/misc/scene_texture_04/scene_texture_04.o"
 endseg
 
 beginseg
     name "scene_texture_05"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_05.o"
+    number 6
+    include "build/assets/misc/scene_texture_05/scene_texture_05.o"
 endseg
 
 beginseg
     name "scene_texture_06"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_06.o"
+    number 6
+    include "build/assets/misc/scene_texture_06/scene_texture_06.o"
 endseg
 
 beginseg
     name "scene_texture_07"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_07.o"
+    number 6
+    include "build/assets/misc/scene_texture_07/scene_texture_07.o"
 endseg
 
 beginseg
     name "scene_texture_08"
     compress
     romalign 0x1000
-    include "build/baserom/scene_texture_08.o"
+    number 6
+    include "build/assets/misc/scene_texture_08/scene_texture_08.o"
 endseg
 
 beginseg